|
@@ -51,8 +51,13 @@
|
|
bordered>
|
|
bordered>
|
|
<!-- 货位数量 -->
|
|
<!-- 货位数量 -->
|
|
<template slot="shelfPlaceNum" slot-scope="text, record">
|
|
<template slot="shelfPlaceNum" slot-scope="text, record">
|
|
- <p v-if="record.shelfPlaceBindNum && record.shelfPlaceNum && record.shelfPlaceBindNum != record.shelfPlaceNum" style="margin: 0;"><span style="color: red;">{{ record.shelfPlaceBindNum }}</span> / {{ record.shelfPlaceNum }}</p>
|
|
|
|
- <p v-else style="margin: 0;">{{ record.shelfPlaceNum }}</p>
|
|
|
|
|
|
+ <div v-if="record.finishFlag=='1'">{{ record.shelfPlaceNum }}</div>
|
|
|
|
+ <div v-else>
|
|
|
|
+ <p style="margin: 0;">
|
|
|
|
+ <span style="color: red;">{{ record.shelfPlaceBindNum||record.shelfPlaceBindNum==0 ? record.shelfPlaceBindNum:'' }}</span> /
|
|
|
|
+ {{ record.shelfPlaceNum }}
|
|
|
|
+ </p>
|
|
|
|
+ </div>
|
|
</template>
|
|
</template>
|
|
<!-- 是否设置完成 -->
|
|
<!-- 是否设置完成 -->
|
|
<template slot="finishFlag" slot-scope="text, record">
|
|
<template slot="finishFlag" slot-scope="text, record">
|
|
@@ -61,7 +66,7 @@
|
|
</template>
|
|
</template>
|
|
<!-- 操作 -->
|
|
<!-- 操作 -->
|
|
<template slot="action" slot-scope="text, record">
|
|
<template slot="action" slot-scope="text, record">
|
|
- <a-button size="small" type="link" class="button-primary" @click="handleSet(record)">{{ record.finishFlag?'修改':'设置' }}</a-button>
|
|
|
|
|
|
+ <a-button size="small" type="link" class="button-primary" @click="handleSet(record)">{{ record.finishFlag=='1'?'修改':'设置' }}</a-button>
|
|
</template>
|
|
</template>
|
|
</s-table>
|
|
</s-table>
|
|
</a-spin>
|
|
</a-spin>
|
|
@@ -93,7 +98,7 @@ export default {
|
|
columns: [
|
|
columns: [
|
|
{ title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
|
|
{ title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
|
|
{ title: '货架名称', dataIndex: 'shelfName', width: '25%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
{ title: '货架名称', dataIndex: 'shelfName', width: '25%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
- { title: '关联客户', dataIndex: 'customerName', width: '25%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
|
|
|
+ { title: '关联客户', dataIndex: 'customerEntity.customerName', width: '25%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
{ title: '货位数量', scopedSlots: { customRender: 'shelfPlaceNum' }, width: '15%', align: 'center' },
|
|
{ title: '货位数量', scopedSlots: { customRender: 'shelfPlaceNum' }, width: '15%', align: 'center' },
|
|
{ title: '是否设置完成', scopedSlots: { customRender: 'finishFlag' }, width: '20%', align: 'center' },
|
|
{ title: '是否设置完成', scopedSlots: { customRender: 'finishFlag' }, width: '20%', align: 'center' },
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'left' }
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'left' }
|
|
@@ -189,9 +194,3 @@ export default {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
</script>
|
|
</script>
|
|
-
|
|
|
|
-<style lang="less">
|
|
|
|
- .shelfSetList-wrap{
|
|
|
|
-
|
|
|
|
- }
|
|
|
|
-</style>
|
|
|