diff --git a/src/views/admin/meeting/modules/TicketModal.vue b/src/views/admin/meeting/modules/TicketModal.vue
index 4b53341..4f19f28 100644
--- a/src/views/admin/meeting/modules/TicketModal.vue
+++ b/src/views/admin/meeting/modules/TicketModal.vue
@@ -111,9 +111,11 @@
size='default'
ref='table'
style='width: 100%; padding: 0 20px;'
- :data-source='loadData'
- rowKey='id'
- :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'>
+ :data-source='selectEnterpriseDataList'
+ rowKey='id'>
+
+
+
{{ text }}
删除
@@ -137,9 +139,9 @@
size='default'
ref='table'
rowKey='id'
- :rowSelection='{ selectedRowKeys: selectedCustomerRowKeys, onChange: onCustomerSelectChange }'
+ :rowSelection='{ selectedRowKeys: notSelectEnterpriseIdList, onChange: onCustomerSelectChange }'
:columns='customerColumns'
- :data-source='data'
+ :data-source='notSelectEnterpriseDataList'
>
@@ -188,9 +190,9 @@ export default {
},
ticketId: null,
ticketNum: 0,
- selectedRowKeys: [],
+ selectEnterpriseIdList: [],
selectedRows: [],
- selectedCustomerRowKeys: [],
+ notSelectEnterpriseIdList: [],
selectedCustomerRows: [],
columns: [
{
@@ -227,22 +229,16 @@ export default {
},
{
title: '企业负责人',
- dataIndex: 'user.nickname',
- key: 'age'
+ dataIndex: 'contacts',
},
{
title: '联系电话',
- dataIndex: 'user.mobile'
+ dataIndex: 'phone'
},
- {
- title: '操作',
- dataIndex: 'action',
- scopedSlots: { customRender: 'action' }
- }
],
CompanyList: [],
- data: [],
- loadData: [],
+ notSelectEnterpriseDataList: [],
+ selectEnterpriseDataList: [],
// loadData: parameter => {
// return getTicketByCompany(Object.assign(parameter, this.queryParam))
// },
@@ -262,7 +258,7 @@ export default {
clickNumber(value) {
this.mdl.num = value
// 数值改变
- this.loadData.forEach(item => {
+ this.selectEnterpriseDataList.forEach(item => {
if (!item.moreNum) {
item.moreNum = 0
}
@@ -278,7 +274,7 @@ export default {
// 确定多发优惠券
handleNumSubmit() {
this.numVisible = false
- this.loadData = this.loadData.map(item => {
+ this.selectEnterpriseDataList = this.selectEnterpriseDataList.map(item => {
if (item.id == this.ticketId) {
console.log('this.ticketNum ', this.ticketNum)
console.log('this.mdl.num ', this.mdl.num)
@@ -291,25 +287,25 @@ export default {
customerHandleOk() {
let record = this.selectedCustomerRows
record.forEach(record => {
- this.data = this.data.filter(item => item.id != record.id)
- this.loadData.push(record)
+ this.notSelectEnterpriseDataList = this.notSelectEnterpriseDataList.filter(item => item.id != record.id)
+ this.selectEnterpriseDataList.push(record)
})
this.customerVisible = false
},
deleteRecord(record) {
- this.loadData = this.loadData.filter(item => item.id != record.id)
- this.data.push(record)
+ this.selectEnterpriseDataList = this.selectEnterpriseDataList.filter(item => item.id != record.id)
+ this.notSelectEnterpriseDataList.push(record)
},
onSelectChange(selectedRowKeys, selectedRows) {
console.log(selectedRowKeys, selectedRows)
- this.selectedRowKeys = selectedRowKeys
+ this.selectEnterpriseIdList = selectedRowKeys
this.selectedRows = selectedRows
},
onCustomerSelectChange(selectedRowKeys, selectedRows) {
- this.selectedCustomerRowKeys = selectedRowKeys
+ this.notSelectEnterpriseIdList = selectedRowKeys
this.selectedCustomerRows = selectedRows
},
getCustomer() {
@@ -327,31 +323,39 @@ export default {
},
add() {
this.form.resetFields()
- this.selectedCustomerRowKeys = []
+ this.notSelectEnterpriseIdList = []
this.edit({ id: 0 })
},
edit(record) {
this.mdl = Object.assign(record)
this.visible = true
- // 查询企业
- getTicketByCompany().then(res => {
- console.log('getTicketByCompany', res)
- this.loadData = res.rows.map(item => {
- if (!item.moreNum) {
- item.moreNum = 0
- }
- if (!item.sumNum) {
- item.sumNum = 0
- }
- return item
+ if (record.id > 0) {
+ get(record.id).then(res => {
+ // 选择企业
+ this.selectEnterpriseDataList = res.selectCustomerList
+ // this.selectEnterpriseIdList = res.selectCustomerList.map(item => item.id)
+ // 未选中企业
+ this.notSelectEnterpriseDataList = res.notSelectCustomerList
+ // this.notSelectEnterpriseIdList = res.notSelectCustomerList.map(item => item.id)
})
- })
- get(record.id).then(res => {
- this.selectedRowKeys = res.enterpriseIds
- })
- this.$nextTick(() => {
- this.form.setFieldsValue(pick(this.mdl, 'id', 'title', 'content', 'duration', 'type', 'money', 'address', 'isVerification', 'enterpriseIds', 'isShow', 'startTime', 'endDate', 'remark', 'isDefault', 'version', 'deleteFlag', 'createBy', 'createTime', 'updateBy', 'updateTime'))
- })
+ this.$nextTick(() => {
+ this.form.setFieldsValue(pick(this.mdl, 'id', 'title', 'content', 'duration', 'type', 'money', 'address', 'isVerification', 'enterpriseIds', 'isShow', 'startTime', 'endDate', 'remark', 'isDefault', 'version', 'deleteFlag', 'createBy', 'createTime', 'updateBy', 'updateTime'))
+ })
+ } else {
+ // 查询企业
+ getTicketByCompany().then(res => {
+ console.log('getTicketByCompany', res)
+ this.selectEnterpriseDataList = res.rows.map(item => {
+ if (!item.moreNum) {
+ item.moreNum = 0
+ }
+ if (!item.sumNum) {
+ item.sumNum = 0
+ }
+ return item
+ })
+ })
+ }
},
handleSubmit(e) {
e.preventDefault()
@@ -359,7 +363,7 @@ export default {
if (!err) {
console.log('Received values of form: ', values)
// 选择企业
- values.ticketCustomerVo = this.loadData
+ values.ticketCustomerVo = this.selectEnterpriseDataList
this.confirmLoading = true
saveTicket(values).then(res => {
if (res.code === 0) {