|
@@ -195,11 +195,22 @@
|
|
onChange: onSelectChange
|
|
onChange: onSelectChange
|
|
}"
|
|
}"
|
|
>
|
|
>
|
|
|
|
+ <span slot="items" slot-scope="text, record">
|
|
|
|
+ {{
|
|
|
|
+ text.length > 0
|
|
|
|
+ ? text
|
|
|
|
+ .map(i => {
|
|
|
|
+ return i.itemName
|
|
|
|
+ })
|
|
|
|
+ .join()
|
|
|
|
+ : '-'
|
|
|
|
+ }}
|
|
|
|
+ </span>
|
|
<span slot="state" slot-scope="text, record">
|
|
<span slot="state" slot-scope="text, record">
|
|
<a-switch :checked="text === 1" @change="handleSwitchChang($event, record)" />
|
|
<a-switch :checked="text === 1" @change="handleSwitchChang($event, record)" />
|
|
</span>
|
|
</span>
|
|
<span slot="action" slot-scope="text, records">
|
|
<span slot="action" slot-scope="text, records">
|
|
- <a @click="addNewChannel(records)">查看详情</a>
|
|
|
|
|
|
+ <a @click="addNewChannel(records)" :disabled="!accountId">查看详情</a>
|
|
</span>
|
|
</span>
|
|
</a-table>
|
|
</a-table>
|
|
<a-pagination
|
|
<a-pagination
|
|
@@ -460,10 +471,10 @@ let TTcolumns = [
|
|
},
|
|
},
|
|
{
|
|
{
|
|
title: '关联单品名称',
|
|
title: '关联单品名称',
|
|
- dataIndex: 'itemName',
|
|
|
|
- scopedSlots: { customRender: 'itemName' },
|
|
|
|
|
|
+ dataIndex: 'items',
|
|
|
|
+ scopedSlots: { customRender: 'items' },
|
|
align: 'center',
|
|
align: 'center',
|
|
- key: 'itemName'
|
|
|
|
|
|
+ key: 'items'
|
|
},
|
|
},
|
|
{
|
|
{
|
|
title: '使用层级',
|
|
title: '使用层级',
|
|
@@ -670,6 +681,11 @@ export default {
|
|
this.dataDetailLoading = true
|
|
this.dataDetailLoading = true
|
|
var params = {}
|
|
var params = {}
|
|
params.accountId = localStorage.getItem('channelInfoAccountId')
|
|
params.accountId = localStorage.getItem('channelInfoAccountId')
|
|
|
|
+ ? localStorage.getItem('channelInfoAccountId')
|
|
|
|
+ : null
|
|
|
|
+ params.projectId = localStorage.getItem('channelInfoProjectId')
|
|
|
|
+ ? localStorage.getItem('channelInfoProjectId')
|
|
|
|
+ : null
|
|
params.channelCode = this.channelCode
|
|
params.channelCode = this.channelCode
|
|
params.pageNo = this.ipaginationDetail.current
|
|
params.pageNo = this.ipaginationDetail.current
|
|
params.pageSize = this.ipaginationDetail.pageSize
|
|
params.pageSize = this.ipaginationDetail.pageSize
|
|
@@ -892,7 +908,12 @@ export default {
|
|
let paramsData = {
|
|
let paramsData = {
|
|
channelCode: data.channelCode,
|
|
channelCode: data.channelCode,
|
|
channelName: data.channelName,
|
|
channelName: data.channelName,
|
|
- accountId: localStorage.getItem('channelInfoAccountId'),
|
|
|
|
|
|
+ accountId: localStorage.getItem('channelInfoAccountId')
|
|
|
|
+ ? localStorage.getItem('channelInfoAccountId')
|
|
|
|
+ : null,
|
|
|
|
+ projectId: localStorage.getItem('channelInfoProjectId')
|
|
|
|
+ ? localStorage.getItem('channelInfoProjectId')
|
|
|
|
+ : null,
|
|
pageNo: this.ipagination.current,
|
|
pageNo: this.ipagination.current,
|
|
pageSize: this.ipagination.pageSize
|
|
pageSize: this.ipagination.pageSize
|
|
}
|
|
}
|
|
@@ -990,6 +1011,11 @@ export default {
|
|
mounted() {
|
|
mounted() {
|
|
const paramsData = this.form.getFieldsValue()
|
|
const paramsData = this.form.getFieldsValue()
|
|
this.handleGetTableList(paramsData)
|
|
this.handleGetTableList(paramsData)
|
|
|
|
+ if (localStorage.getItem('channelInfoAccountId')) {
|
|
|
|
+ this.accountId = localStorage.getItem('channelInfoAccountId')
|
|
|
|
+ } else {
|
|
|
|
+ this.accountId = null
|
|
|
|
+ }
|
|
this.getAllOperator()
|
|
this.getAllOperator()
|
|
},
|
|
},
|
|
activated: function() {},
|
|
activated: function() {},
|