修改页面显示，增加查询条件

src/views/ccgl/ckgl/lkckrw/top/akck.vue

@@ -136,40 +136,44 @@
           queryParams: [
             [
               {
-                "label": "仓库",
-                "prop": "ckid",
-                "span": 6,
-                "type": "RelSelect",
-                "value": "",
-                "typeConfig": {
-                  "src": "lxyl/jcsj/uck/ck/queryCjckid",
-                  "match": {
-                    "value": "id",
-                    "label": "name"
+                label: "仓库",
+                prop: "ckid",
+                span: 6,
+                type: "RelSelect",
+                value: "",
+                typeConfig: {
+                    src: "lxyl/jcsj/uck/ck/queryCjckid",
+                    match: {
+                    value: "id",
+                    label: "name"
                   }
                 }
               },
               {
-                label: '物料信息',
-                prop: 'wlxxInfo',
+                label: "巷道",
+                prop: "hjid",
                 span: 6,
-                type: 'input',
-                value: ''
+                type: "RelSelect",
+                value: "",
+                typeConfig: {
+                  src: "wms/jcsj/hj/query",
+                }
               },
               {
-                label: '制令号',
-                prop: 'zlhInfo',
+                label: '容器编码',
+                prop: 'rqCode',
                 span: 6,
                 type: 'input',
                 value: ''
               },
               {
-                label: '容器编码',
-                prop: 'rqCode',
+                label: '物料信息',
+                prop: 'condition',
                 span: 6,
                 type: 'input',
                 value: ''
               },
+              
             ]
           ],
           /* 默认启停用  */

src/views/ccgl/ckgl/lkckrw/top/index.vue

@@ -116,7 +116,7 @@
                 label: '日期',
                 startProp: "start",
                 endProp: "end",
-                span: 8,
+                span: 6,
                 type: 'RelDaterangeV2',
                 startValue: new Date().getTime() - 1000 * 60 * 60 * 24 * 30,
                 endValue: new Date().getTime(),
@@ -124,7 +124,7 @@
               {
                 label: "仓库",
                 prop: "ckid",
-                span: 8,
+                span: 6,
                 type: "RelSelect",
                 value: "",
                 typeConfig: {
@@ -139,33 +139,32 @@
                 }
               },
               {
-                label: '出库单号',
-                prop: 'lydjDjid',
-                span: 8,
-                type: 'input',
-                value: ''
-              }
-
-            ],
-            [{
                 label: '容器',
                 prop: 'rqInfo',
-                span: 8,
+                span: 6,
                 type: 'input',
                 value: ''
               },
-
               {
-                label: '唯一码',
-                prop: 'packInfo',
-                span: 8,
+                label: '任务号',
+                prop: 'djidInfo',
+                span: 6,
+                type: 'input',
+                value: ''
+              }
+            ],
+            [
+              {
+                label: '出库单号',
+                prop: 'lydjDjid',
+                span: 6,
                 type: 'input',
                 value: ''
               },
               {
                 "label": "状态",
                 "prop": "zt",
-                "span": 8,
+                "span": 6,
                 "type": "RelSelect",
                 "value": "",
                 "typeConfig": {

src/views/ccgl/jcsj/cgywh/edit.vue

@@ -20,7 +20,7 @@
       return {
         editColItemList: [
           {
-            label: '货主',
+            label: '工厂',
             prop: 'hzid',
             span: 12,
             required: true,

src/views/ccgl/jcsj/cgywh/index.vue

@@ -21,12 +21,12 @@
           url: 'lxyl/jcsj/ckglysz',
           tableTitle: [
             {
-              title: "货主",
+              title: "工厂名称",
               field: "hzName",
               width: 140
             },
             {
-              title: "货主编码",
+              title: "工厂编码",
               field: "hzCode",
               width: 140
             },

src/views/ccgl/jcsj/kwgl/plcz.vue

@@ -214,6 +214,27 @@
                 type: 'input',
                 value: ''
               }
+            ],
+            [{
+                "label": "状态",
+                "prop": "zt",
+                "span": 6,
+                "type": "RelSelect",
+                "value": "",
+                "typeConfig": {
+                  "src": "wms/jcsj/kw/init/zt",
+                }
+              },
+              {
+                "label": "存储状态",
+                "prop": "kczt",
+                "span": 6,
+                "type": "RelSelect",
+                "value": "",
+                "typeConfig": {
+                  "src": "wms/jcsj/kw/init/kczt",
+                }
+              },
             ]
 
           ],

src/views/ccgl/wcsrwgl/lkrw/index.vue

@@ -188,29 +188,28 @@
                 endValue: new Date().getTime(),
               },
               {
-                label: '任务号',
-                prop: 'djid',
+                label: "巷道",
+                prop: "deviceid",
                 span: 6,
-                type: 'input',
-                value: ''
+                type: "RelSelect",
+                value: "",
+                typeConfig: {
+                  src: "lxyl/wcs/lkrw/init/hj",
+                }
               },
               {
-                label: '业务单号',
-                prop: 'lydjCode',
+                label: '容器',
+                prop: 'rqCode',
                 span: 6,
                 type: 'input',
                 value: ''
               },
               {
-                label: "巷道",
-                prop: "deviceid",
+                label: '起始位置',
+                prop: 'startPos',
                 span: 6,
-                type: "RelSelect",
-                value: "",
-                typeConfig: {
-                  src: "lxyl/wcs/lkrw/init/hj",
+                type: 'input'
               }
-              },
             ],
             [
               {
@@ -230,7 +229,21 @@
                 typeConfig: {
                   src: 'lxyl/wcs/lkrw/init/type'
                 }
-              }
+              },
+              {
+                label: '业务单号',
+                prop: 'lydjCode',
+                span: 6,
+                type: 'input',
+                value: ''
+              },
+              {
+                label: '任务号',
+                prop: 'djid',
+                span: 6,
+                type: 'input',
+                value: ''
+              },
             ]
           ],
         }

src/views/ccgl/wcsrwgl/wcsrw/index.vue

@@ -144,6 +144,11 @@
                 "value": "id"
               }
             },
+            {
+              title: "异常消息",
+              field: "message",
+              width: 200
+            },
             {
               title: "来源单号",
               field: "lydh",
@@ -175,29 +180,28 @@
                 endValue: new Date().getTime(),
               },
               {
-                label: '任务号',
-                prop: 'djid',
+                label: "巷道",
+                prop: "deviceid",
                 span: 6,
-                type: 'input',
-                value: ''
+                type: "RelSelect",
+                value: "",
+                typeConfig: {
+                  src: "lxyl/wcs/wcsTask/init/hj",
+                }
               },
               {
-                label: '立库任务单号',
-                prop: 'lydjDjid',
+                label: '容器',
+                prop: 'rqCode',
                 span: 6,
                 type: 'input',
                 value: ''
               },
               {
-                label: "巷道",
-                prop: "deviceid",
+                label: '起始位置',
+                prop: 'startPos',
                 span: 6,
-                type: "RelSelect",
-                value: "",
-                typeConfig: {
-                  src: "lxyl/wcs/wcsTask/init/hj",
+                type: 'input'
               }
-              },
             ],
             [
               {
@@ -227,7 +231,21 @@
                     "label": "name"
                   }
                 }
-              }
+              },
+              {
+                label: '立库任务号：',
+                prop: 'lydjDjid',
+                span: 6,
+                type: 'input',
+                value: ''
+              },
+              {
+                label: '任务号',
+                prop: 'djid',
+                span: 6,
+                type: 'input',
+                value: ''
+              },
             ]
           ],