最后bug修改

src/views/checkManage/checkOperation.vue

@@ -36,8 +36,8 @@
                                         @change="change"
 
                                     >
-                                    <a-select-option v-for="i in categorys" :key="i">
+                                    <a-select-option v-for="(name, code) in categorys" :key="code">
-                                    {{ i}}
+                                    {{ code+"("+name+")"}}
                                     </a-select-option>
                                     </a-select>
                                 </span>
@@ -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: "盘点任务号",
+                    label: "托盘号",
-                    key: "checkNum",
+                    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;

src/views/historyCheck/index.vue

@@ -58,8 +58,8 @@
                         </a-form-item>
                     </a-col>
                     <a-col :span="4" style="text-align: left">
-                        <a-form-item label="盘点号">
+                        <a-form-item label="托盘号">
-                            <a-input v-model="queryParam.lotnum" placeholder="请输入" />
+                            <a-input v-model="queryParam.wmsTrayCode" placeholder="请输入" />
                         </a-form-item>
                     </a-col>
                     <a-col :span="4">
@@ -165,7 +165,7 @@ export default {
         return {
             statusMap: {0:"未盘点",1:"盘点异常",2:"核对正确",3:"人工核对正确",4: "需要人工核对",},
             queryParam: {
-                lotnum: '',
+                wmsTrayCode: '',
                 side : '',
                 leftRight : ''
             },
@@ -199,6 +199,10 @@ export default {
                     width:200,
                 },
                  
+                {
+                    title: "托盘码",
+                    dataIndex: "wmsTrayCode",
+                },
                 {
                     title: "盘点状态",
                     scopedSlots: {customRender: 'status'},
@@ -240,6 +244,7 @@ export default {
     
         handleOperationCancel() {
             this.operationVisible = false;
+            this.request()
         },
         //获取巷道列表
         getStreetList() {

src/views/historyCheck/operation.vue

@@ -39,12 +39,9 @@
                                         :value="checkObj.category"
                                         @change="change"
                                     >
-                                        <a-select-option
+                                          <a-select-option v-for="(name, code) in categorys" :key="code">
-                                            v-for="i in categorys"
+                                    {{ code+"("+name+")"}}
-                                            :key="i"
+                                    </a-select-option>
-                                        >
-                                            {{ i}}
-                                        </a-select-option>
                                     </a-select>
                                 </span>
                             </li>
@@ -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: "盘点任务号",
+                    label: "托盘号",
-                    key: "checkNum",
+                    key: "wmsTrayCode",
                 },
                 {
                     label: "盘点时间",

src/views/historyMonitoring/index.vue

@@ -17,8 +17,8 @@
                         
                     </a-col>
                     <a-col :span="6" >
-                        <a-form-item label="工单号">
+                        <a-form-item label="托盘号">
-                            <a-input v-model="queryParam.orderNum" placeholder="请输入" style="width:270px;"/>
+                            <a-input v-model="queryParam.code" placeholder="请输入" style="width:270px;"/>
                         </a-form-item>
                     </a-col>
                     <a-col :span="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: "货架类型",
+                    title: "托盘号",
-                    dataIndex: "streetType",
+                    dataIndex: "code",
-                    scopedSlots: {customRender: 'streetType'}
                 },
+                
+                // {
+                //     title: "货架类型",
+                //     dataIndex: "streetType",
+                //     scopedSlots: {customRender: 'streetType'}
+                // },
                 {
                     title: "货位",
                     dataIndex: "goodsLocation",