w

Merge branch 'master' of https://gitlab.hzleaper.com:81/duoji/duoji-frontend

src/views/checkManage/checkOperation.vue

@@ -35,7 +35,7 @@
                 </a-select-option>
             </a-select>
             <span>
-                货架号 : {{ shelveId }}  {{rowCount}}  {{columnCount}}
+                货架号 : {{ shelveId }}
             </span>
         </div>
         <div>
@@ -170,17 +170,29 @@ export default {
             params:[
                 
                 {
-                    label:'工单号',
+                    label:'随行工单号',
                     key: 'orderNum'
                 },
                 {
-                    label:'系统条码号',
+                    label:'盘点任务号',
+                    key: 'checkNum'
+                },
+                {
+                    label:'货物系统条码号',
                     key: 'wmsCode'
                 },
                 {
-                    label:'扫描条码号',
+                    label:'货物扫描条码号',
                     key: 'code'
                 },
+                {
+                    label:'托盘系统条码号',
+                    key: 'wmsTrayCode'
+                },
+                {
+                    label:'托盘扫描条码号',
+                    key: 'trayCode'
+                },
                 {
                     label:'盘点时间',
                     key: 'exportTime'
@@ -499,7 +511,7 @@ export default {
                             height: 25px;
                         }
                         ul {
-                            width: 320px;
+                            width: 400px;
                             height: 100%;
                             margin-bottom: 0;
                             padding-inline-start: 0;
@@ -511,12 +523,12 @@ export default {
                                 font-weight: 600;
                                 color: #494e52;
                                 .img-box-title {
-                                    width: 90px;
+                                    width: 130px;
                                     display: inline-block;
                                 }
                                 .img-box-value {
                                     display: inline-block;
-                                    width: calc(100% - 90px);
+                                    width: calc(100% - 130px);
                                     overflow: hidden;
                                     position: relative;
                                     top: 5px;

src/views/roadwayManage/model.vue

@@ -54,6 +54,7 @@
 
                 <div class="leftType">
                     <h3>左货架</h3>
+                    
                     <a-form-item label="类型" :label-col="formItemVerticalLayout.labelCol">
                         <a-select
                             v-decorator="[
@@ -85,6 +86,7 @@
                             />
                         </a-form-item>
                     </div>
+
                     <div class="across-layout" v-if="leftType =='0'">
                         <a-form-item label="货架号" :label-col="formItemAcrossLayout.labelCol">
                             <a-input
@@ -104,6 +106,18 @@
                             />
                         </a-form-item>
                     </div>
+                    <div class="across-layout">
+                        <a-form-item label="扫码枪IP" :label-col="formItemAcrossLayout.labelCol">
+                            <a-input
+                                v-decorator="['leftSensorGunIp']"
+                            />
+                        </a-form-item>
+                        <a-form-item label="扫码枪PORT" :label-col="formItemAcrossLayout.labelCol">
+                            <a-input
+                                v-decorator="['leftSensorGunPort']"
+                            />
+                        </a-form-item>
+                    </div>
                     <a-divider></a-divider>
                 </div>
 
@@ -159,6 +173,18 @@
                             />
                         </a-form-item>
                     </div>
+                    <div class="across-layout">
+                        <a-form-item label="扫码枪IP" :label-col="formItemAcrossLayout.labelCol">
+                            <a-input
+                                v-decorator="['rightSensorGunIp']"
+                            />
+                        </a-form-item>
+                        <a-form-item label="扫码枪PORT" :label-col="formItemAcrossLayout.labelCol">
+                            <a-input
+                                v-decorator="['rightSensorGunPort']"
+                            />
+                        </a-form-item>
+                    </div>
                     <a-divider></a-divider>
                 </div>
                 <div  v-if="cameraList.length>0">
@@ -268,6 +294,10 @@ export default {
                         rightShelveId: newVal.rightShelveId,
                         rightInsideShelveId:newVal.rightInsideShelveId,
                         rightOutsideShelveId:newVal.rightOutsideShelveId,
+                        leftSensorGunIp:newVal.leftSensorGunIp,
+                        rightSensorGunIp:newVal.rightSensorGunIp,
+                        leftSensorGunPort:newVal.leftSensorGunPort,
+                        rightSensorGunPort:newVal.rightSensorGunPort,
                         camera1Id:newVal.camera1Id,
                         camera2Id:newVal.camera2Id,
                         camera1Name:newVal.camera1Name,