拣货单/检验单调整

src/views/ccgl/ckgl/jhd/index.vue

@@ -7,7 +7,7 @@
       </div>
       <div class="bottom flex">
         <div class="full"  >
-            <el-tabs class="full" v-model="activeName" >
+            <el-tabs  @tab-click="handleClick" class="full" v-model="activeName" >
               <el-tab-pane  class="full" label="拣货明细" name="first">
                 <Mx    ref="mx" class="full"  />
               </el-tab-pane>
@@ -49,6 +49,11 @@
       }
     },
     methods: {
+      handleClick(val){
+        val.$children[0].$refs.basePage.$refs['TablePager'].pageQuery({
+          setFirstCurrent:true
+        })
+      },
       topGetRow(row) {
         /* dom赋值*/
         let mid = row.id

src/views/ccgl/ckgl/jhd/jg.vue

@@ -37,19 +37,18 @@
           url: 'wms/ckgl/llck',
           queryUrl: 'wms/ckgl/jhtz/query/jhtzjg',
           tableTitle: [{
-              title: "物料编号",
-              field: "wlcode",
-              fieldType: "upper",
+              title: "物料编码",
+              field: "wlxxCode",
               width: 140
             },
             {
               title: "物料名称",
-              field: "wlmc",
+              field: "wlxxName",
               width: 140
             },
             {
               title: "物料规格",
-              field: "gg",
+              field: "wlxxGg",
               width: 140
             },
             {
@@ -71,7 +70,7 @@
             {
               title: "唯一码",
               field: "packCode",
-              width: 100,
+              width: 140,
             },
             {
               title: "容器",
@@ -80,7 +79,7 @@
             },
             {
               title: "已拣货数量",
-              field: "yjhsl",
+              field: "jhsl",
               width: 100,
             }
           ],

src/views/ccgl/ckgl/jhd/mx.vue

@@ -105,7 +105,7 @@
         if(ctx.singleItem&&ctx.singleItem.id){
           ctx.singleItem.$ckid=this.$ckid
           ctx.singleItem.$id=this.$id
-          ctx.DialogWidth='70vw'
+          ctx.DialogWidth='85vw'
           ctx.DialogTitle='调整清单'
           ctx.showDialog=true
         }else{

src/views/ccgl/ckgl/jhd/qd.vue

@@ -71,7 +71,7 @@
               {
               	title: "唯一码",
               	field: "packCode",
-              	width: 100,
+              	width: 140,
               },
               {
               	title: "容器",

src/views/ccgl/ckgl/jhd/tzqd.vue

@@ -113,7 +113,28 @@
 
         },
         editTableConfig: {
-          editTableTitle: [{
+          editTableTitle: [
+            {
+              label: '拣货数量',
+              prop: 'jhsl',
+              allowEdit: true,
+              type: 'inputNumber',
+              width: 100,
+              blur: toFixed(null),
+              change: (row) => {
+                /* row.jhsl=>拣货数量
+                row.packid=>包装id
+                */
+                this.$refs.basePage.$refs.TablePager.tableData.forEach(item => {
+                  if (item.packid == row.packid) {
+                    /* 判定初始数量*/
+                    this.jsbc(row.jhsl, this.sljl[row.packid], item)
+
+                  }
+                })
+              }
+            },
+            {
               label: '唯一码',
               prop: 'packCode',
               width: 130,
@@ -129,34 +150,21 @@
               width: 100,
             },
             {
-              label: '库位',
-              prop: 'kwName',
+              label: '容器',
+              prop: 'rqCode',
               width: 100,
             },
             {
-              label: '拣货数量',
-              prop: 'jhsl',
-              allowEdit: true,
-              type: 'inputNumber',
+              label: '制令号',
+              prop: 'zlh',
               width: 100,
-              blur: toFixed(null),
-              change: (row) => {
-                /* row.jhsl=>拣货数量
-                row.packid=>包装id
-                */
-                this.$refs.basePage.$refs.TablePager.tableData.forEach(item => {
-                  if (item.packid == row.packid) {
-                    /* 判定初始数量*/
-                    if (this.sljl[row.packid]) {
-                      this.jsbc(row.jhsl, this.sljl[row.packid], item)
-                    } else {
-                      this.sljl[row.packid] = row.jhsl
-                    }
+            },
+            {
+              label: '库位',
+              prop: 'kwName',
+              width: 100,
+            },
 
-                  }
-                })
-              }
-            }
           ],
           editTableData: []
         },
@@ -182,6 +190,11 @@
               field: "wlxxGg",
               width: 140
             },
+            {
+              title: "数量",
+              field: "packmxSl",
+              width: 140
+            },
             {
               title: "制令号",
               field: "zlh",
@@ -202,11 +215,7 @@
               field: "packCode",
               width: 140
             },
-            {
-              title: "数量",
-              field: "packmxSl",
-              width: 140
-            },
+          
             {
               title: "维护人",
               field: "whr"
@@ -256,7 +265,7 @@
       this.editTableConfig.editTableData.forEach(item=>{
         if( originalList.includes(item.packid)){
           /* 如果新数据在源数据也有*/
-          if(item.jhsl==originalMap.jhsl){
+          if(item.jhsl==originalMap[item.packid]){
             noeditArr.push(item)
           }else{
             item.flag='U'
@@ -269,7 +278,16 @@
         }
       })
       let finList=[...delArr,...editArr,...addArr,...noeditArr]
-      console.log(finList)
+      /* 开始保存*/
+      this.$post('wms/ckgl/jhtz/jhtzqd/save',{
+        id:this.app.singleItem.$id,
+        datas:finList
+      }).then(res=>{
+        if(res.success){
+          this.$success('操作成功')
+          this.app.showDialog=false
+        }
+      })
       },
       /* 计算保存
       n为新值
@@ -314,6 +332,7 @@
           this.$warning('已存在该数据')
         } else {
           this.editTableConfig.editTableData.push(_.cloneDeep({
+            zlh:row.zlh,
             packid: row.packid,
             packCode: row.packCode,
             wlph: row.wlph,
@@ -322,6 +341,8 @@
             wlxxName: row.wlxxName,
             kwid: row.kwid,
             kwName: row.kwName,
+            rqCode:row.rqCode,
+            rqid:row.rqid,
             jhsl: 0
           }))
           this.sljl[row.packid] = 0