diff --git a/src/views/checkManage/checkOperation.vue b/src/views/checkManage/checkOperation.vue index 0da3209..d823ade 100644 --- a/src/views/checkManage/checkOperation.vue +++ b/src/views/checkManage/checkOperation.vue @@ -36,8 +36,8 @@ @change="change" > - - {{ i}} + + {{ code+"("+name+")"}} @@ -60,7 +60,7 @@ id="inputNumber" style="width: 50%" v-model="checkObj.countTop" - :min="0" + :min="-120" :max="150" /> ={{getCountAdd()}} @@ -168,7 +168,7 @@ export default { modelData: {}, index: 0, imgUrl: "", - categorys: [""], + categorys: {}, params: [ // { // label:'盘点批次号', @@ -177,8 +177,8 @@ export default { { - label: "盘点任务号", - key: "checkNum", + label: "托盘号", + key: "wmsTrayCode", }, { label: "盘点时间", @@ -285,6 +285,7 @@ export default { }) .then((res) => { if (res.data) { + this.categorys = res.data; console.log(this.categorys); //this.shelveId = res.data.shelveId; diff --git a/src/views/historyCheck/index.vue b/src/views/historyCheck/index.vue index 9dafe87..69684c7 100644 --- a/src/views/historyCheck/index.vue +++ b/src/views/historyCheck/index.vue @@ -58,8 +58,8 @@ - - + + @@ -165,7 +165,7 @@ export default { return { statusMap: {0:"未盘点",1:"盘点异常",2:"核对正确",3:"人工核对正确",4: "需要人工核对",}, queryParam: { - lotnum: '', + wmsTrayCode: '', side : '', leftRight : '' }, @@ -198,7 +198,11 @@ export default { scopedSlots: {customRender: 'goodsLocation'}, width:200, }, - + + { + title: "托盘码", + dataIndex: "wmsTrayCode", + }, { title: "盘点状态", scopedSlots: {customRender: 'status'}, @@ -240,6 +244,7 @@ export default { handleOperationCancel() { this.operationVisible = false; + this.request() }, //获取巷道列表 getStreetList() { diff --git a/src/views/historyCheck/operation.vue b/src/views/historyCheck/operation.vue index cd24239..6daac9c 100644 --- a/src/views/historyCheck/operation.vue +++ b/src/views/historyCheck/operation.vue @@ -39,12 +39,9 @@ :value="checkObj.category" @change="change" > - - {{ i}} - + + {{ code+"("+name+")"}} + @@ -67,7 +64,7 @@ style="width: 50%" :value="checkObj.countTop" @change="handleCountTopChange" - :min="0" + :min="-120" :max="150" /> ={{getCountAdd()}} @@ -235,9 +232,10 @@ export default { // key: 'lotnum' // }, + { - label: "盘点任务号", - key: "checkNum", + label: "托盘号", + key: "wmsTrayCode", }, { label: "盘点时间", diff --git a/src/views/historyMonitoring/index.vue b/src/views/historyMonitoring/index.vue index 3014145..c7e520e 100644 --- a/src/views/historyMonitoring/index.vue +++ b/src/views/historyMonitoring/index.vue @@ -17,8 +17,8 @@ - - + + @@ -109,7 +109,8 @@ export default { return { queryParam: { orderNum: '', - streetId: '' + streetId: '', + code: '' }, listData:[], time:[], @@ -128,20 +129,21 @@ export default { loading: false, imgUrl: imgUrl, columns: [ - { - title: "工单号", - dataIndex: "orderNum", - }, { title: "巷道", dataIndex: "streetName", width: 90 }, { - title: "货架类型", - dataIndex: "streetType", - scopedSlots: {customRender: 'streetType'} + title: "托盘号", + dataIndex: "code", }, + + // { + // title: "货架类型", + // dataIndex: "streetType", + // scopedSlots: {customRender: 'streetType'} + // }, { title: "货位", dataIndex: "goodsLocation",