|
@@ -15,7 +15,7 @@
|
|
<custList ref="custList" id="shelfSetList-custList" @change="custChange" :isEnabled="true"></custList>
|
|
<custList ref="custList" id="shelfSetList-custList" @change="custChange" :isEnabled="true"></custList>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
- <a-col :md="6" :sm="24">
|
|
|
|
|
|
+ <!-- <a-col :md="6" :sm="24">
|
|
<a-form-item label="是否设置完成">
|
|
<a-form-item label="是否设置完成">
|
|
<v-select
|
|
<v-select
|
|
v-model="queryParam.finishFlag"
|
|
v-model="queryParam.finishFlag"
|
|
@@ -25,7 +25,7 @@
|
|
placeholder="请选择"
|
|
placeholder="请选择"
|
|
allowClear></v-select>
|
|
allowClear></v-select>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
- </a-col>
|
|
|
|
|
|
+ </a-col> -->
|
|
<a-col :md="6" :sm="24" style="margin-bottom: 10px">
|
|
<a-col :md="6" :sm="24" style="margin-bottom: 10px">
|
|
<a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="shelfSetList-refresh">查询</a-button>
|
|
<a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="shelfSetList-refresh">查询</a-button>
|
|
<a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="shelfSetList-reset">重置</a-button>
|
|
<a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="shelfSetList-reset">重置</a-button>
|
|
@@ -64,7 +64,7 @@
|
|
</p>
|
|
</p>
|
|
</template>
|
|
</template>
|
|
<!-- 是否设置完成 -->
|
|
<!-- 是否设置完成 -->
|
|
- <template slot="finishFlag" slot-scope="text, record">
|
|
|
|
|
|
+ <!-- <template slot="finishFlag" slot-scope="text, record">
|
|
<a-switch
|
|
<a-switch
|
|
checkedChildren="是"
|
|
checkedChildren="是"
|
|
unCheckedChildren="否"
|
|
unCheckedChildren="否"
|
|
@@ -77,7 +77,7 @@
|
|
<span v-else :style="{ color: record.finishFlag == 1 ? '#00aa00' : '#999' }">
|
|
<span v-else :style="{ color: record.finishFlag == 1 ? '#00aa00' : '#999' }">
|
|
{{ record.finishFlag == 1 ? '是' : (record.finishFlag!=undefined?'否':'--') }}
|
|
{{ record.finishFlag == 1 ? '是' : (record.finishFlag!=undefined?'否':'--') }}
|
|
</span>
|
|
</span>
|
|
- </template>
|
|
|
|
|
|
+ </template> -->
|
|
<!-- 启用禁用 -->
|
|
<!-- 启用禁用 -->
|
|
<template slot="enableFlag" slot-scope="text, record">
|
|
<template slot="enableFlag" slot-scope="text, record">
|
|
<a-switch
|
|
<a-switch
|
|
@@ -157,7 +157,6 @@ export default {
|
|
queryParam: {
|
|
queryParam: {
|
|
shelfSn: undefined, // 货架sn
|
|
shelfSn: undefined, // 货架sn
|
|
customerSn: undefined, // 关联客户sn
|
|
customerSn: undefined, // 关联客户sn
|
|
- finishFlag: undefined, // 是否完成设置
|
|
|
|
customerEntity: { // 关联客户名称
|
|
customerEntity: { // 关联客户名称
|
|
customerName: undefined
|
|
customerName: undefined
|
|
}
|
|
}
|
|
@@ -168,7 +167,7 @@ export default {
|
|
{ title: '货架名称', scopedSlots: { customRender: 'shelfName' }, width: '25%', align: 'left', ellipsis: true },
|
|
{ title: '货架名称', scopedSlots: { customRender: 'shelfName' }, width: '25%', align: 'left', ellipsis: true },
|
|
{ title: '关联客户', dataIndex: 'customerEntity.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: '10%', align: 'center' },
|
|
|
|
|
|
+ // { title: '是否设置完成', scopedSlots: { customRender: 'finishFlag' }, width: '10%', align: 'center' },
|
|
{ title: '启用状态', scopedSlots: { customRender: 'enableFlag' }, width: '10%', align: 'center' },
|
|
{ title: '启用状态', scopedSlots: { customRender: 'enableFlag' }, width: '10%', align: 'center' },
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
|
|
],
|
|
],
|
|
@@ -223,23 +222,23 @@ export default {
|
|
this.queryParam.customerSn = undefined
|
|
this.queryParam.customerSn = undefined
|
|
}
|
|
}
|
|
},
|
|
},
|
|
- // 是否设置完成更改
|
|
|
|
- changeStatus (record) {
|
|
|
|
- const params = {
|
|
|
|
- shelfSn: record.shelfSn,
|
|
|
|
- finishFlag: record.finishFlag == 1 ? '0' : '1'
|
|
|
|
- }
|
|
|
|
- this.spinning = true
|
|
|
|
- modifFinishFlag(params).then(res => {
|
|
|
|
- if (res.status == 200) {
|
|
|
|
- this.$message.success(res.message)
|
|
|
|
- this.$refs.table.refresh()
|
|
|
|
- this.spinning = false
|
|
|
|
- } else {
|
|
|
|
- this.spinning = false
|
|
|
|
- }
|
|
|
|
- })
|
|
|
|
- },
|
|
|
|
|
|
+ // // 是否设置完成更改
|
|
|
|
+ // changeStatus (record) {
|
|
|
|
+ // const params = {
|
|
|
|
+ // shelfSn: record.shelfSn,
|
|
|
|
+ // finishFlag: record.finishFlag == 1 ? '0' : '1'
|
|
|
|
+ // }
|
|
|
|
+ // this.spinning = true
|
|
|
|
+ // modifFinishFlag(params).then(res => {
|
|
|
|
+ // if (res.status == 200) {
|
|
|
|
+ // this.$message.success(res.message)
|
|
|
|
+ // this.$refs.table.refresh()
|
|
|
|
+ // this.spinning = false
|
|
|
|
+ // } else {
|
|
|
|
+ // this.spinning = false
|
|
|
|
+ // }
|
|
|
|
+ // })
|
|
|
|
+ // },
|
|
// 启用禁用
|
|
// 启用禁用
|
|
enableShelf (record) {
|
|
enableShelf (record) {
|
|
const params = {
|
|
const params = {
|
|
@@ -290,7 +289,6 @@ export default {
|
|
this.queryParam.customerSn = undefined
|
|
this.queryParam.customerSn = undefined
|
|
this.queryParam.customerEntity.customerName = undefined
|
|
this.queryParam.customerEntity.customerName = undefined
|
|
this.$refs.custList.resetForm()
|
|
this.$refs.custList.resetForm()
|
|
- this.queryParam.finishFlag = undefined
|
|
|
|
this.$refs.table.refresh(true)
|
|
this.$refs.table.refresh(true)
|
|
},
|
|
},
|
|
// 计算表格高度
|
|
// 计算表格高度
|