3.13调整

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

@@ -69,16 +69,17 @@
               	field: "yfsl",
                 width: 100,
               },
+              {
+              	title: "拣货数量",
+              	field: "jhsl",
+              	width: 100,
+              },
               {
               	title: "已出库数量",
               	field: "cksl",
                 width: 100,
               },
-              // {
-              // 	title: "库存数量",
-              // 	field: "kcsl",
-              // 	width: 100,
-              // },
+
               {
               	title: "制令号",
               	field: "zlh",

src/views/ccgl/ckgl/ckd/top/kc.vue

@@ -152,8 +152,8 @@
             	value: ''
             },
             {
-            	label: '托盘编码',
-            	prop: 'tpCode',
+            	label: '唯一码',
+            	prop: 'packCode',
             	span: 6,
             	type: 'input',
             	value: ''

src/views/ccgl/thgl/ckth/mx.vue

 <template>
-  <BasePage  @getRow='getRow' ref="basePage" :power='power' :toolButton='false' class="min_full" style="height: 100%;border-top: 0px;" :autoQuery='false'
-    :config="config">
+  <BasePage @getRow='getRow' ref="basePage" :power='power' :toolButton='false' class="min_full"
+    style="height: 100%;border-top: 0px;" :autoQuery='false' :config="config">
     <template #dialog="ctx">
       <!-- 嵌入默认页面额外弹框的插槽 ctx.pagePage来操作默认页面 -->
     </template>
@@ -15,7 +15,7 @@
   import wlsx from 'common/src/mixin/wlsx.js'
   import wlphsx from 'common/src/mixin/wlphsx.js'
   export default {
-    mixins:[wlphsx,wlsx],
+    mixins: [wlphsx, wlsx],
     data() {
       return {
         power: {
@@ -88,6 +88,21 @@
               field: "yssl",
               width: 120,
             },
+            {
+              title: "码盘数量",
+              field: "ztsl",
+              width: 120,
+            },
+            {
+              title: "包装数量",
+              field: "zbsl",
+              width: 120,
+            },
+            {
+              title: "入库数量",
+              field: "rksl",
+              width: 100,
+            },
             {
               title: "制令号",
               field: "zlh",
@@ -136,13 +151,13 @@
 
     },
     methods: {
-      getRow(val){
-        this.$emit('getRow',val)
+      getRow(val) {
+        this.$emit('getRow', val)
       },
-      demo(ctx){
-        if(ctx.singleItem&&ctx.singleItem.id){
+      demo(ctx) {
+        if (ctx.singleItem && ctx.singleItem.id) {
           console.log(ctx.singleItem)
-        }else{
+        } else {
           this.$warning('请选中一条数据')
         }
       }

src/views/ccgl/thgl/ckth/top/index.vue

@@ -5,12 +5,15 @@
       <Sclltldb  v-if="ctx.basePage.showDialog&&ctx.basePage.DialogTitle=='生产领料退料同步'"  :app='ctx.basePage'  />
        <Wxtltb  v-if="ctx.basePage.showDialog&&ctx.basePage.DialogTitle=='外协退料同步'"  :app='ctx.basePage'  />
         <Cbzxtltb  v-if="ctx.basePage.showDialog&&ctx.basePage.DialogTitle=='成本中心退料同步'"  :app='ctx.basePage'  />
+
 		</template>
 		<template #toolbar="ctx">
 
 <el-button @click="sclltldb(ctx.basePage)" size='mini'  type="primary">生产领料退料同步</el-button>
 <el-button @click="wxtltb(ctx.basePage)" size='mini'  type="primary">外协退料同步</el-button>
 <el-button @click="cbzxtltb(ctx.basePage)" size='mini'  type="primary">成本中心退料同步</el-button>
+ <el-button @click="qr(ctx.basePage)" size='mini' type="primary">确认</el-button>
+      <el-button @click="qxqr(ctx.basePage)" size='mini' type="primary">取消确认</el-button>
 
 
 		</template>
@@ -218,6 +221,46 @@
 
 		},
 		methods: {
+      qr(ctx) {
+              if (ctx.singleItem && ctx.singleItem.id) {
+                this.$confirm('是否继续操作, 是否继续?', '提示', {
+                  confirmButtonText: '确定',
+                  cancelButtonText: '取消',
+                  type: 'warning'
+                }).then(res => {
+                  this.$post('lxyl/rkgl/ckthtz/confirm', {
+                    id: ctx.singleItem.id
+                  }).then(res => {
+                    if (res.success) {
+                      this.$success('操作成功')
+                      ctx.refresh()
+                    }
+                  })
+                })
+              } else {
+                this.$warning('请选中一条数据')
+              }
+            },
+            qxqr(ctx) {
+              if (ctx.singleItem && ctx.singleItem.id) {
+                this.$confirm('是否继续操作, 是否继续?', '提示', {
+                  confirmButtonText: '确定',
+                  cancelButtonText: '取消',
+                  type: 'warning'
+                }).then(res => {
+                  this.$post('lxyl/rkgl/ckthtz/unconfirm', {
+                    id: ctx.singleItem.id
+                  }).then(res => {
+                    if (res.success) {
+                      this.$success('操作成功')
+                      ctx.refresh()
+                    }
+                  })
+                })
+              } else {
+                this.$warning('请选中一条数据')
+              }
+            },
       sclltldb(ctx){
         ctx.DialogWidth='35vw'
         ctx.DialogTitle='生产领料退料同步'

src/views/ccgl/thgl/rkth/ckdmx.vue

@@ -74,6 +74,16 @@
               field: "yfsl",
               width: 100,
             },
+            {
+            	title: "拣货数量",
+            	field: "jhsl",
+            	width: 100,
+            },
+            {
+            	title: "已出库数量",
+            	field: "cksl",
+              width: 100,
+            },
             {
               title: "状态",
               field: "zt",

src/views/ccgl/thgl/rkth/top/index.vue

@@ -9,6 +9,8 @@
       <!-- 嵌入默认页面工具栏的插槽 ctx.pagePage来操作默认页面 -->
       <el-button @click="akck(ctx.basePage)" size='mini'  type="primary">按库存开</el-button>
       <el-button @click="cgthtb(ctx.basePage)" size='mini'  type="primary">采购退货单同步</el-button>
+      <el-button @click="qr(ctx.basePage)" size='mini' type="primary">确认</el-button>
+           <el-button @click="qxqr(ctx.basePage)" size='mini' type="primary">取消确认</el-button>
    <!--   <el-button @click="qxqr(ctx.basePage)" size='mini'  type="primary">取消确认</el-button> -->
     </template>
 
@@ -169,6 +171,46 @@
 
     },
     methods: {
+      qr(ctx) {
+              if (ctx.singleItem && ctx.singleItem.id) {
+                this.$confirm('是否继续操作, 是否继续?', '提示', {
+                  confirmButtonText: '确定',
+                  cancelButtonText: '取消',
+                  type: 'warning'
+                }).then(res => {
+                  this.$post('lxyl/rkgl/rkthtz/confirm', {
+                    id: ctx.singleItem.id
+                  }).then(res => {
+                    if (res.success) {
+                      this.$success('操作成功')
+                      ctx.refresh()
+                    }
+                  })
+                })
+              } else {
+                this.$warning('请选中一条数据')
+              }
+            },
+            qxqr(ctx) {
+              if (ctx.singleItem && ctx.singleItem.id) {
+                this.$confirm('是否继续操作, 是否继续?', '提示', {
+                  confirmButtonText: '确定',
+                  cancelButtonText: '取消',
+                  type: 'warning'
+                }).then(res => {
+                  this.$post('lxyl/rkgl/rkthtz/unconfirm', {
+                    id: ctx.singleItem.id
+                  }).then(res => {
+                    if (res.success) {
+                      this.$success('操作成功')
+                      ctx.refresh()
+                    }
+                  })
+                })
+              } else {
+                this.$warning('请选中一条数据')
+              }
+            },
       cgthtb(ctx){
         ctx.DialogWidth='30vw'
         ctx.DialogTitle='同步采购退货单'