Merge branch 'master' of gitlab.gavelinfo.com:lisu/lxyl-vue

src/views/ccgl/ckgl/dbckd/ckqd.vue

@@ -43,7 +43,7 @@
         },
         config: {
           /* 基本配置*/
-          url: 'lxyl/ckgl/dbck/query/dbckqd',
+          url: 'lxyl/ckgl/cktzqd',
           queryUrl: 'lxyl/ckgl/dbck/query/dbckqd',
           tableTitle: [
               {
@@ -126,7 +126,7 @@
     methods: {
       xzmx(ctx){
         if( ctx.queryParams.mid){
-          ctx.DialogWidth='60vw'
+          ctx.DialogWidth='85vw'
           ctx.DialogTitle='新增明细数据'
           ctx.showDialog=true
         }else{

src/views/ccgl/ckgl/dbckd/mxakck.vue

@@ -159,21 +159,7 @@
                 type: 'input',
                 value: ''
               }
-            ],
-            [{
-              "label": "仓库",
-              "prop": "ckid",
-              "span": 12,
-              "type": "RelSelect",
-              "value": "",
-              "typeConfig": {
-                "src": "lxyl/jcsj/uck/ck/queryCjckid",
-                "match": {
-                  "value": "id",
-                  "label": "name"
-                }
-              }
-            }]
+            ]
           ],
           /* 默认启停用  */
           showqt: false,

src/views/ccgl/kcpd/pdd/top/index.vue

@@ -30,8 +30,9 @@
           queryDetail: true,
           /* 基本配置*/
           url: 'wms/kcgl/kcpd',
-          queryUrl:'lxyl/kcgl/pdgz/query',
-          tableTitle: [{
+          queryUrl:'lxyl/kcgl/kcpd/query',
+          tableTitle: [
+            {
               title: "状态",
               field: "zt",
               width: 70,
@@ -41,6 +42,12 @@
                 "value": "id"
               }
             },
+            {
+              title: "已过账",
+              field: "isSendSap",
+              width: 70,
+              fieldType:"checkbox"
+            },
             {
               title: "盘点单号",
               field: "djid",

src/views/ccgl/zlgl/kccjd/top/index.vue

@@ -136,9 +136,6 @@
                   "match": {
                     "value": "id",
                     "label": "name"
-                  },
-                  params:{
-                    flid:'D'
                   }
                 }
               },

src/views/ccgl/zlgl/kccjd/top/wlxx.vue

@@ -47,11 +47,7 @@
           /* 基本配置*/
           url: 'lxyl/zlgl/kccj/queryKccjKchz',
           queryUrl: 'lxyl/zlgl/kccj/queryKccjKchz',
-          tableTitle: [{
-              title: "仓库编码",
-              field: "ckCode",
-              width: 140
-            },
+          tableTitle: [
             {
               title: "仓库",
               field: "ckName",
@@ -94,31 +90,46 @@
             }
           ],
           queryParams: [
-            [{
+          [
+              {
+                "label": "仓库",
+                "prop": "ckid",
+                "span": 6,
+                "type": "RelSelect",
+                "value": "",
+                "typeConfig": {
+                  "src": "lxyl/jcsj/uck/ck/queryCjckid",
+                  "match": {
+                    "value": "id",
+                    "label": "name"
+                  }
+                }
+              },
+              {
+                label: '物料编码',
+                prop: 'wlxxInfos',
+                span: 12,
+                type: 'input',
+                value: ''
+              },
+              {
                 label: '剩余天数',
                 prop: 'jyts',
-                span: 6,
+                span: 5,
                 type: 'inputNumber',
                 value: 1
-              },
+              }
+            ],
+            [
               {
                 label: '物料批号',
                 prop: 'wlph',
                 span: 6,
                 type: 'input',
                 value: ''
-              },
-              {
-                label: '物料编码',
-                prop: 'wlxxInfos',
-                span: 12,
-                type: 'input',
-                value: ''
               }
-
-
-
             ]
+            
           ],
           /* 默认启停用  */