Skip to content

C
CRM
Commit eefe4c5e authored by 罗超's avatar 罗超
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/huaguohao/crm into master 

# Conflicts:
#	src/components/guestManagement/guestManagement.vue
parents 780fc879 1c5cdff8
Show whitespace changes
Inline Side-by-side
Showing with 487 additions and 482 deletions
src/components/clueManagement/clueManagement.vue
View file @ eefe4c5e
...@@ -61,6 +61,7 @@ ...@@ -61,6 +61,7 @@
</div> </div>
</div> </div>
</div> </div>
<el-select size="mini" popper-class="select-no" slot="reference" v-model="msg.ID" <el-select size="mini" popper-class="select-no" slot="reference" v-model="msg.ID"
placeholder="请选择"> placeholder="请选择">
<el-option v-for="item in SceneEmployeeList" :key="item.ID" :label="item.SceneName" <el-option v-for="item in SceneEmployeeList" :key="item.ID" :label="item.SceneName"
...@@ -360,25 +361,9 @@ ...@@ -360,25 +361,9 @@
WhereType: -1, WhereType: -1,
OrderBy: '', OrderBy: '',
CustomerType: 1, CustomerType: 1,
ID: 29, ID: 33,
}, },
total: 0, total: 0,
WhereTypeList: [{
id: -1,
name: '全部'
}, {
id: 1,
name: '我负责的'
}, {
id: 2,
name: '下属的'
}, {
id: 3,
name: '我参与的'
}, {
id: 4,
name: '我关注的'
}, ],
selectionList: [{ selectionList: [{
name: '转移', name: '转移',
class: 'iconfont iconplus-transfer', class: 'iconfont iconplus-transfer',
...@@ -394,7 +379,7 @@ ...@@ -394,7 +379,7 @@
}], }],
sceneList: [], sceneList: [],
SceneEmployeeList: [], SceneEmployeeList: [],
sceneID: 29, sceneID: 33,
visible: false, visible: false,
isShowImport: false, //是否显示导入弹窗 isShowImport: false, //是否显示导入弹窗
importType: 1, //导入文件类型(1-客户导入,2-直客导入) importType: 1, //导入文件类型(1-客户导入,2-直客导入)
......
src/components/dialogModel/sceneBox.vue
View file @ eefe4c5e
<style> <style>
.sceneBox .el-form{ .sceneBox .el-form {
padding: 20px; padding: 20px;
padding-top: 0; padding-top: 0;
} }
.sceneBox .el-form--label-top .el-form-item__label{
.sceneBox .el-form--label-top .el-form-item__label {
padding: 0; padding: 0;
} }
.sceneBox .el-form-item{
.sceneBox .el-form-item {
margin: 0; margin: 0;
} }
.sceneBox .delete-btn{
.sceneBox .delete-btn {
margin-left: 15px; margin-left: 15px;
} }
.add-tj{
.add-tj {
padding: 0 20px 20px; padding: 0 20px 20px;
} }
.sceneBox .dialog-footer{
.sceneBox .dialog-footer {
text-align: center; text-align: center;
} }
</style> </style>
<template> <template>
<div class="sceneBox"> <div class="sceneBox">
...@@ -28,8 +33,10 @@ ...@@ -28,8 +33,10 @@
<el-form-item label="筛选条件"> <el-form-item label="筛选条件">
<el-row v-for="(item, index) in dataList" :key="index" style="margin-bottom: 15px;"> <el-row v-for="(item, index) in dataList" :key="index" style="margin-bottom: 15px;">
<el-col :span="8"> <el-col :span="8">
<el-select v-model="item.SceneIndex" placeholder="请选择要筛选的字段名" style="width: 100%;" @change="changeScene(item, index)"> <el-select v-model="item.SceneIndex" placeholder="请选择要筛选的字段名" style="width: 100%;"
<el-option v-for="(scene, sIndex) in item.sceneList" :label="scene.Name" :value="sIndex" :key="sIndex"></el-option> @change="changeScene(item, index)">
<el-option v-for="(scene, sIndex) in item.sceneList" :label="scene.Name" :value="sIndex"
:key="sIndex"></el-option>
</el-select> </el-select>
</el-col> </el-col>
<el-col :span="1"> <el-col :span="1">
...@@ -39,37 +46,34 @@ ...@@ -39,37 +46,34 @@
<template v-if="item.regionS && item.regionS.length"> <template v-if="item.regionS && item.regionS.length">
<el-col :span="5"> <el-col :span="5">
<el-select v-model="item.region" placeholder="请选择" @change="changeRegion(item, index)"> <el-select v-model="item.region" placeholder="请选择" @change="changeRegion(item, index)">
<el-option v-for="(r, rx) in item.regionS" :key="rx" :label="r.c" :value="r.n"></el-option> <el-option v-for="(r, rx) in item.regionS" :key="rx" :label="r.c" :value="r.n">
</el-option>
</el-select> </el-select>
</el-col> </el-col>
<el-col :span="1"> <el-col :span="1">
&nbsp; &nbsp;
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-input v-if="!item.Setting.length && item.nameStr !== '负责人' && item.nameStr !== '创建人'" v-model="item.SceneName" placeholder="请输入筛选条件"></el-input> <el-input v-if="!item.Setting.length && item.nameStr !== '负责人' && item.nameStr !== '创建人'"
<el-select v-else-if="item.nameStr === '负责人' || item.nameStr === '创建人'" v-model="item.id" filterable @change="changeFC(index)" placeholder="请选择" style="width: 100%;" > v-model="item.SceneName" placeholder="请输入筛选条件"></el-input>
<el-option
filterable <el-select v-else-if="item.nameStr === '负责人' || item.nameStr === '创建人'" v-model="item.id"
v-for="item in EmployeeList" filterable @change="changeFC(index)" placeholder="请选择" style="width: 100%;">
:label='item.EmName' <el-option filterable v-for="item in EmployeeList" :label='item.EmName'
:value='item.EmployeeId' :value='item.EmployeeId' :key='item.EmployeeId'>
:key='item.EmployeeId'>
</el-option> </el-option>
</el-select> </el-select>
<el-select v-else v-model="item.SceneName" filterable placeholder="请选择" style="width: 100%;" > <el-select v-else v-model="item.SceneName" filterable placeholder="请选择"
<el-option v-for="(select, sIndex) in item.Setting" :label="select" :value="select" :key="sIndex"></el-option> style="width: 100%;">
<el-option v-for="(select, sIndex) in item.Setting" :label="select" :value="select"
:key="sIndex"></el-option>
</el-select> </el-select>
</el-col> </el-col>
</template> </template>
<template v-else> <template v-else>
<el-col :span="14"> <el-col :span="14">
<el-date-picker <el-date-picker style="width: 100%;" v-model="item.time" value-format="yyyy-MM-dd hh:mm:ss"
style="width: 100%;" type="datetimerange" range-separator="至" start-placeholder="开始日期"
v-model="item.time"
value-format="yyyy-MM-dd hh:mm:ss"
type="datetimerange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"> end-placeholder="结束日期">
</el-date-picker> </el-date-picker>
</el-col> </el-col>
...@@ -81,7 +85,8 @@ ...@@ -81,7 +85,8 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="add-tj"> <div class="add-tj">
<p> <span class="font-color-link cp" @click="addRow"><i class="el-icon-circle-plus-outline"></i> 添加筛选条件</span></p> <p> <span class="font-color-link cp" @click="addRow"><i class="el-icon-circle-plus-outline"></i>
添加筛选条件</span></p>
</div> </div>
<div class="add-tj"> <div class="add-tj">
<el-checkbox v-model="checked" v-if="sceneType!==1 && LableType!==6">保存为场景</el-checkbox> <el-checkbox v-model="checked" v-if="sceneType!==1 && LableType!==6">保存为场景</el-checkbox>
...@@ -96,10 +101,10 @@ ...@@ -96,10 +101,10 @@
</div> </div>
</template> </template>
<script> <script>
export default { export default {
props: ['LableType', 'sceneType', 'sceneDataList'], props: ['LableType', 'sceneType', 'sceneDataList'],
data(){ data() {
return{ return {
checked: false, checked: false,
sceneMsg: { sceneMsg: {
SceneName: '', SceneName: '',
...@@ -180,8 +185,7 @@ export default { ...@@ -180,8 +185,7 @@ export default {
}, },
LableType: 1 LableType: 1
}, },
dataList: [ dataList: [{
{
SceneName: '', SceneName: '',
IsDefault: '', IsDefault: '',
region: '', region: '',
...@@ -192,11 +196,9 @@ export default { ...@@ -192,11 +196,9 @@ export default {
time: [], time: [],
WhereDataStr: {}, WhereDataStr: {},
formType: '' formType: ''
} }],
],
region: [], region: [],
optionsNames: [ optionsNames: [{
{
c: "等于", c: "等于",
n: 'is', n: 'is',
t: "t", t: "t",
...@@ -262,11 +264,10 @@ export default { ...@@ -262,11 +264,10 @@ export default {
} }
}, },
watch: { watch: {
LableType:{ LableType: {
handler(val, oldVal){ handler(val, oldVal) {
this.GetSceneList() this.GetSceneList()
this.dataList = [ this.dataList = [{
{
SceneName: '', SceneName: '',
IsDefault: '', IsDefault: '',
region: '', region: '',
...@@ -277,16 +278,14 @@ export default { ...@@ -277,16 +278,14 @@ export default {
time: [], time: [],
WhereDataStr: {}, WhereDataStr: {},
formType: '' formType: ''
} }]
]
}, },
deep:true deep: true
}, },
sceneDataList: { sceneDataList: {
handler(val, oldVal){ handler(val, oldVal) {
this.GetSceneList() this.GetSceneList()
this.dataList = [ this.dataList = [{
{
SceneName: '', SceneName: '',
IsDefault: '', IsDefault: '',
region: '', region: '',
...@@ -297,24 +296,23 @@ export default { ...@@ -297,24 +296,23 @@ export default {
time: [], time: [],
WhereDataStr: {}, WhereDataStr: {},
formType: '' formType: ''
} }]
]
this.sceneMsg = { this.sceneMsg = {
SceneName: '', SceneName: '',
IsDefault: 0, IsDefault: 0,
} }
}, },
deep:true deep: true
} }
}, },
mounted(){ mounted() {
this.userInfo = this.getLocalStorage(); this.userInfo = this.getLocalStorage();
this.GetSceneList() this.GetSceneList()
this.Employee() this.Employee()
}, },
methods:{ methods: {
// 修改组装数据 // 修改组装数据
sceneInitDataList(){ sceneInitDataList() {
this.dataList = [] this.dataList = []
let item = JSON.parse(this.sceneDataList.WhereData) let item = JSON.parse(this.sceneDataList.WhereData)
let i = 0 let i = 0
...@@ -322,9 +320,9 @@ export default { ...@@ -322,9 +320,9 @@ export default {
for (let i in item) { for (let i in item) {
arr.push(item[i]) arr.push(item[i])
} }
arr.map((x, index)=>{ arr.map((x, index) => {
this.sceneList.map((s, sIndex)=>{ this.sceneList.map((s, sIndex) => {
if(x.name === s.FieldName) { if (x.name === s.FieldName) {
let msg = { let msg = {
SceneName: x.value, SceneName: x.value,
IsDefault: '', IsDefault: '',
...@@ -343,20 +341,22 @@ export default { ...@@ -343,20 +341,22 @@ export default {
}) })
}) })
}, },
changeFC(index){ changeFC(index) {
for(let i = 0; i < this.EmployeeList.length; i++){ for (let i = 0; i < this.EmployeeList.length; i++) {
if (this.EmployeeList[i].EmployeeId === this.dataList[index].id){ if (this.EmployeeList[i].EmployeeId === this.dataList[index].id) {
this.dataList[index].SceneName = this.EmployeeList[i].EmployeeId this.dataList[index].SceneName = this.EmployeeList[i].EmployeeId
this.dataList[index].nameFC = this.EmployeeList[i].EmName this.dataList[index].nameFC = this.EmployeeList[i].EmName
break; break;
} }
} }
}, },
sceneAdd(){ sceneAdd() {
let msg = {}, list = [], ok = true; let msg = {},
this.dataList.forEach( item =>{ list = [],
if(item.formType === 'datetime') { ok = true;
if(!item.time.length){ this.dataList.forEach(item => {
if (item.formType === 'datetime') {
if (!item.time.length) {
ok = false ok = false
this.$message.error('筛选内容不能为空！') this.$message.error('筛选内容不能为空！')
return return
...@@ -379,7 +379,7 @@ export default { ...@@ -379,7 +379,7 @@ export default {
nameFC: item.nameFC nameFC: item.nameFC
}) })
} else { } else {
if(!item.SceneName){ if (!item.SceneName) {
ok = false ok = false
this.$message.error('筛选内容不能为空！') this.$message.error('筛选内容不能为空！')
return return
...@@ -403,21 +403,20 @@ export default { ...@@ -403,21 +403,20 @@ export default {
}) })
} }
}) })
if(ok && (this.checked || this.sceneType === 1)) { if (ok && (this.checked || this.sceneType === 1)) {
if(this.sceneMsg.SceneName === '') { if (this.sceneMsg.SceneName === '') {
return this.$message.error('场景名称不能为空！') return this.$message.error('场景名称不能为空！')
} }
this.sceneMsg.WhereDataStr = msg this.sceneMsg.WhereDataStr = msg
this.sceneMsg.LableType = this.LableType this.sceneMsg.LableType = this.LableType
if(this.sceneDataList) { if (this.sceneDataList) {
this.sceneMsg.ID = this.sceneDataList.ID this.sceneMsg.ID = this.sceneDataList.ID
} }
this.apipost('/api/Scene/AddSceneEmployee', this.sceneMsg, res=>{ this.apipost('/api/Scene/AddSceneEmployee', this.sceneMsg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.$message.success('操作成功') this.$message.success('操作成功')
this.MsgBus.$emit('editScene') this.MsgBus.$emit('editScene')
this.dataList = [ this.dataList = [{
{
SceneName: '', SceneName: '',
IsDefault: '', IsDefault: '',
region: '', region: '',
...@@ -428,57 +427,58 @@ export default { ...@@ -428,57 +427,58 @@ export default {
time: [], time: [],
WhereDataStr: {}, WhereDataStr: {},
formType: '' formType: ''
} }]
]
this.checked = false this.checked = false
} }
}) })
} }
if(this.sceneDataList && ok) { if (this.sceneDataList && ok) {
this.MsgBus.$emit('sceneBoxClose') this.MsgBus.$emit('sceneBoxClose')
} else if (ok){ } else if (ok) {
setTimeout(()=>{ setTimeout(() => {
this.MsgBus.$emit('sceneBoxClose') this.MsgBus.$emit('sceneBoxClose')
this.MsgBus.$emit('sceneSave', list) this.MsgBus.$emit('sceneSave', list)
}, 500) }, 500)
} }
}, },
changeRegion(i, index){ changeRegion(i, index) {
this.optionsNames.map(x=>{ this.optionsNames.map(x => {
if(x.n === i.region) { if (x.n === i.region) {
this.dataList[index].regionStr = x.c this.dataList[index].regionStr = x.c
} }
}) })
}, },
changeScene(item, pIndex, type){ changeScene(item, pIndex, type) {
this.dataList[pIndex].regionS = this.dataList[pIndex].sceneList[item.SceneIndex].region this.dataList[pIndex].regionS = this.dataList[pIndex].sceneList[item.SceneIndex].region
this.dataList[pIndex].nameStr = this.dataList[pIndex].sceneList[item.SceneIndex].Name this.dataList[pIndex].nameStr = this.dataList[pIndex].sceneList[item.SceneIndex].Name
this.dataList[pIndex].formType = this.dataList[pIndex].sceneList[item.SceneIndex].FormType this.dataList[pIndex].formType = this.dataList[pIndex].sceneList[item.SceneIndex].FormType
this.dataList[pIndex].region = type ? this.dataList[pIndex].region : '' this.dataList[pIndex].region = type ? this.dataList[pIndex].region : ''
this.dataList[pIndex].FieldName = this.dataList[pIndex].sceneList[item.SceneIndex].FieldName this.dataList[pIndex].FieldName = this.dataList[pIndex].sceneList[item.SceneIndex].FieldName
this.dataList[pIndex].SceneName = type ? this.dataList[pIndex].SceneName : '' this.dataList[pIndex].SceneName = type ? this.dataList[pIndex].SceneName : ''
this.dataList[pIndex].time = type && this.dataList[pIndex].formType === 'datetime' ? this.dataList[pIndex].time : [] this.dataList[pIndex].time = type && this.dataList[pIndex].formType === 'datetime' ? this.dataList[
pIndex].time : []
this.region = this.sceneList[item.SceneIndex].region this.region = this.sceneList[item.SceneIndex].region
if(this.dataList[pIndex].nameStr && type) { if (this.dataList[pIndex].nameStr && type) {
this.dataList[pIndex].id = this.dataList[pIndex].SceneName this.dataList[pIndex].id = this.dataList[pIndex].SceneName
} }
if(this.dataList[pIndex].sceneList[item.SceneIndex].FormType === 'select') { if (this.dataList[pIndex].sceneList[item.SceneIndex].FormType === 'select') {
this.dataList[pIndex].Setting = this.dataList[pIndex].sceneList[item.SceneIndex].Setting this.dataList[pIndex].Setting = this.dataList[pIndex].sceneList[item.SceneIndex].Setting
} else { } else {
this.dataList[pIndex].Setting = [] this.dataList[pIndex].Setting = []
} }
this.$forceUpdate() this.$forceUpdate()
}, },
GetSceneList(){ GetSceneList() {
this.apipost('/api/Scene/GetSceneList', {LableType: this.LableType}, res=>{ this.apipost('/api/Scene/GetSceneList', {
LableType: this.LableType
}, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let arr = res.data.data let arr = res.data.data;
arr.map(x=>{ arr.map(x => {
if (x.Name === '客户名称' || x.Name === '备注' || x.Name === '商机名称' || x.Name === '详细地址' || x.Name === '姓名' || x.Name === '地址' || x.Name === '线索名称') { if (x.Name === '客户名称' || x.Name === '备注' || x.Name === '商机名称' || x.Name ===
x.region = [ '详细地址' || x.Name === '姓名' || x.Name === '地址' || x.Name === '线索名称') {
{ x.region = [{
c: "等于", c: "等于",
n: 'is', n: 'is',
t: 't' t: 't'
...@@ -498,21 +498,28 @@ export default { ...@@ -498,21 +498,28 @@ export default {
}, },
] ]
} else if (x.Name === '手机' || x.Name === '详细地址') { } else if (x.Name === '手机' || x.Name === '详细地址') {
x.region = this.optionsNames.filter(item=>{ x.region = this.optionsNames.filter(item => {
return !item.t return !item.t
}) })
} else if (x.Name === '负责人' || x.Name === '客户类别' || x.Name === '创建人' || x.Name === '线索来源' || x.Name === '客户来源' || x.Name === '客人级别' || x.Name === '经营场所' || x.Name === '性别' || x.Name === '是否关键决策人' || x.Name === '职务' || x.Name === '商机状态组' || x.Name === '交客数' || x.Name === '优惠券数' || x.Name === '交易金额' || x.Name === '幸福存折') { } else if (x.Name === '负责人' || x.Name === '客户类别' || x.Name === '创建人' ||
x.region = this.optionsNames.filter(item=>{ x.Name === '线索来源' || x.Name === '客户来源' || x.Name === '客人级别' ||
x.Name === '经营场所' || x.Name === '性别' || x.Name === '是否关键决策人' ||
x.Name === '职务' || x.Name === '商机状态组' || x.Name === '交客数' ||
x.Name === '优惠券数' || x.Name === '交易金额' || x.Name === '幸福存折' ||
x.Name === '线索状态'
) {
x.region = this.optionsNames.filter(item => {
return (item.c === '等于' || item.c === '不等于') && item.t return (item.c === '等于' || item.c === '不等于') && item.t
}) })
} else if ( x.Name === '商机金额' || x.Name === '累计订单数') { } else if (x.Name === '商机金额' || x.Name === '累计订单数') {
x.region = this.optionsNames.filter(item=>{ x.region = this.optionsNames.filter(item => {
return !item.t || item.c !== '开始于' || item.c !== '结束于' return !item.t || item.c !== '开始于' || item.c !== '结束于'
}) })
} }
}) })
this.sceneList = arr this.sceneList = arr
if (this.sceneDataList){ if (this.sceneDataList) {
this.sceneInitDataList() this.sceneInitDataList()
this.sceneMsg.SceneName = this.sceneDataList.SceneName this.sceneMsg.SceneName = this.sceneDataList.SceneName
this.sceneMsg.IsDefault = this.sceneDataList.IsDefault this.sceneMsg.IsDefault = this.sceneDataList.IsDefault
...@@ -522,9 +529,8 @@ export default { ...@@ -522,9 +529,8 @@ export default {
} }
}) })
}, },
addRow(){ addRow() {
this.dataList.push( this.dataList.push({
{
SceneName: '', SceneName: '',
IsDefault: '', IsDefault: '',
region: '', region: '',
...@@ -535,10 +541,9 @@ export default { ...@@ -535,10 +541,9 @@ export default {
time: [], time: [],
WhereDataStr: {}, WhereDataStr: {},
formType: '' formType: ''
} })
)
}, },
deleteRow(index){ deleteRow(index) {
this.$confirm('您确定要删除这一条数据吗?', '提示', { this.$confirm('您确定要删除这一条数据吗?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
...@@ -556,13 +561,13 @@ export default { ...@@ -556,13 +561,13 @@ export default {
}); });
}); });
}, },
Employee(){ Employee() {
let msg = { let msg = {
RB_Group_id: this.userInfo.RB_Group_id, RB_Group_id: this.userInfo.RB_Group_id,
BranchId:-1, BranchId: -1,
DepartmentId:0, DepartmentId: 0,
PostId:0, PostId: 0,
IsLeave:0, IsLeave: 0,
} }
this.apipost2( this.apipost2(
"admin_get_EmployeeGetList", "admin_get_EmployeeGetList",
...@@ -570,12 +575,11 @@ export default { ...@@ -570,12 +575,11 @@ export default {
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.EmployeeList = res.data.data; this.EmployeeList = res.data.data;
} else { } else {}
}
}, },
err => {} err => {}
); );
}, },
} }
} }
</script> </script>
\ No newline at end of file
src/components/guestManagement/Agreement.vue
View file @ eefe4c5e
...@@ -517,7 +517,6 @@ export default { ...@@ -517,7 +517,6 @@ export default {
}, },
openDetails(scope) { openDetails(scope) {
console.log(scope.row.ID);
this.MsgBus.$emit("busnessDrawerShow", scope.row.ID, 1); this.MsgBus.$emit("busnessDrawerShow", scope.row.ID, 1);
}, },
// 获取出票状态枚举 // 获取出票状态枚举
......
src/components/guestManagement/guestManagement.vue
View file @ eefe4c5e
...@@ -64,7 +64,8 @@ ...@@ -64,7 +64,8 @@
<div style="display: flex;flex-direction: row;align-items: center;"> <div style="display: flex;flex-direction: row;align-items: center;">
<span class="font-size-12" style="padding-right: 10px;flex-shrink: 0;">状态：</span> <span class="font-size-12" style="padding-right: 10px;flex-shrink: 0;">状态：</span>
<el-select size="mini" width="100" v-model="msg.Q_TOrderState" @change="getList"> <el-select size="mini" width="100" v-model="msg.Q_TOrderState" @change="getList">
<el-option v-for="(item,index) in transactionStatusList" :key="index" :label="item.Name" :value="item.Id"> </el-option> <el-option v-for="(item,index) in transactionStatusList" :key="index" :label="item.Name"
:value="item.Id"> </el-option>
</el-select> </el-select>
</div> </div>
</el-col> </el-col>
...@@ -125,7 +126,8 @@ ...@@ -125,7 +126,8 @@
</el-table-column> </el-table-column>
<el-table-column prop="TOrderNum" label="机票数" sortable v-if="queryType[34].show" show-overflow-tooltip> <el-table-column prop="TOrderNum" label="机票数" sortable v-if="queryType[34].show" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column prop="TOrderMoney" label="机票金额" sortable v-if="queryType[35].show" show-overflow-tooltip> <el-table-column prop="TOrderMoney" label="机票金额" sortable v-if="queryType[35].show"
show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column prop="OrderCount" label="订单交易数" sortable v-if="queryType[24].show" <el-table-column prop="OrderCount" label="订单交易数" sortable v-if="queryType[24].show"
show-overflow-tooltip> show-overflow-tooltip>
...@@ -284,11 +286,22 @@ ...@@ -284,11 +286,22 @@
}, },
data() { data() {
return { return {
transactionStatusList:[ transactionStatusList: [{
{Name:"全部",Id:"0"}, Name: "全部",
{Name:"未成交",Id:"1"}, Id: "0"
{Name:"成交",Id:"2"}, },
{Name:"多次成交",Id:"3"}, {
Name: "未成交",
Id: "1"
},
{
Name: "成交",
Id: "2"
},
{
Name: "多次成交",
Id: "3"
},
], ],
ruleList: [], ruleList: [],
queryType2: [{ queryType2: [{
...@@ -496,7 +509,7 @@ ...@@ -496,7 +509,7 @@
}, { }, {
label: "状态", label: "状态",
show: true, show: true,
},], }, ],
CustomerId: 0, CustomerId: 0,
CustomerIdStr: "", CustomerIdStr: "",
transferVisible: false, transferVisible: false,
...@@ -553,15 +566,19 @@ ...@@ -553,15 +566,19 @@
visible: false, visible: false,
}; };
}, },
created() {
this.GetSceneEmployeeList();
this.Employee();
},
mounted() { mounted() {
this.userInfo = this.getLocalStorage(); this.userInfo = this.getLocalStorage();
this.getList(); this.getList();
this.Employee();
let $this = this; let $this = this;
this.MsgBus.$on("closeCustomerDialogBox", function () { this.MsgBus.$on("closeCustomerDialogBox", function () {
$this.dialogTableVisible = false; $this.dialogTableVisible = false;
}); });
this.GetSceneEmployeeList();
//保存场景 //保存场景
this.MsgBus.$on("sceneSave", function (msg) { this.MsgBus.$on("sceneSave", function (msg) {
$this.sceneList = [...msg]; $this.sceneList = [...msg];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment