Compare commits

..

No commits in common. "f65f8d93497b7eea159c84220f56b564f8dc0059" and "ce0211c7db75f525e9d2199aacb0f7dc93376cc6" have entirely different histories.

View File

@ -81,6 +81,12 @@
<template v-else-if="column.key === 'agreementType'">
<dict-tag :options="dict.type.agreement_type" :value="d.row[column.key]"/>
</template>
<template v-else-if="column.key === 'storeId'">
{{ d.row.userName || '-' }}
</template>
<template v-else-if="column.key === 'areaId'">
{{ d.row.areaName || '-' }}
</template>
<template v-else>
{{d.row[column.key]}}
</template>
@ -194,13 +200,12 @@ export default {
//
columns: [
{key: 'id', visible: true, label: 'ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{ key: 'userName', visible: true, label: '商户', sortable: true, align: 'center' },
{ key: 'areaName', visible: true, label: '运营区', sortable: true, align: 'center' },
//{key: 'storeId', visible: true, label: '', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
//{key: 'areaId', visible: true, label: '', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'storeId', visible: true, label: '商户', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'areaId', visible: true, label: '运营区', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'title', visible: true, label: '标题', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'brief', visible: true, label: '简介', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{ key: 'userName', visible: true, label: '商户', sortable: true, align: 'center' },
{ key: 'areaName', visible: true, label: '运营区', sortable: true, align: 'center' },
// {key: 'content', visible: true, label: '', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'agreementType', visible: true, label: '协议类型', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
// {key: 'duration', visible: true, label: '', minWidth: null, sortable: false, overflow: false, align: 'center', width: "100"},