1

src/views/ccgl/kngl/zlhbg/mx.vue

@@ -12,10 +12,7 @@
 </template>
 
 <script>
-  import wlsx from 'common/src/mixin/wlsx.js'
-  import wlphsx from 'common/src/mixin/wlphsx.js'
   export default {
-    mixins:[wlphsx,wlsx],
     data() {
       return {
         power: {
@@ -35,22 +32,22 @@
         },
         config: {
           /* 基本配置*/
-          url: 'wms/rkgl/rktz',
-          queryUrl: 'wms/rkgl/rktz/query/detail',
+          url: 'lxyl/kcgl/zlhbg/query/detail',
+          queryUrl: 'lxyl/kcgl/zlhbg/query/detail',
           tableTitle: [{
               title: "物料编码",
-              field: "wlcode",
+              field: "wlxxCode",
               fieldType: "upper",
               width: 140
             },
             {
                 title: "物料名称",
-                field: "wlmc",
+                field: "wlxxName",
                 width: 140
               },
             {
                 title: "物料规格",
-                field: "gg",
+                field: "wlxxGg",
                 width: 140
               },
               {
@@ -58,16 +55,7 @@
                   field: "wlph",
                   width: 140
                 },
-              {
-              	title: "计量单位",
-              	field: "jldwname",
-              	width: 100,
-              },
-              {
-              	title: "应收数量",
-              	field: "yssl",
-                width: 100,
-              },
+
               {
               	title: "入库数量",
               	field: "rksl",
@@ -79,50 +67,36 @@
               	width: 120,
               },
               {
-                title: "码盘数量",
-                field: "ztsl",
-                width: 120,
+              	title: "变更后制令号",
+              	field: "bghzlh",
+              	width: 120,
               },
               {
-                title: "过账数量",
-                field: "gzsl",
+                title: "唯一码",
+                field: "packCode",
                 width: 120,
               },
               {
-                title: "状态",
-                field: "zt",
+                title: "容器",
+                field: "rqCode",
                 width: 120,
-                "transform": {
-                	"url": "wms/rkgl/rktz/init/zt",
-                	"label": "name",
-                	"value": "id"
-                }
               },
               {
-                title: "来源单号",
-                field: "lydjid",
+                title: "货主",
+                field: "hzName",
                 width: 120,
               },
               {
-                title: "关闭人",
-                field: "gbr",
+                title: "包装数量",
+                field: "packmxSl",
                 width: 120,
               },
               {
-              	title: "关闭原因",
-              	field: "gbyy",
-              	width: 200,
-              },
-              {
-              	title: "关闭时间",
-              	field: "gbsj",
-              	fieldType: 'ftDateTime'
+                title: "装托数量",
+                field: "ztsl",
+                width: 120,
               },
-              {
-                title: "备注",
-                field: "bz",
-                width: 200
-              }
+
           ],
           queryParams: [],
 

src/views/ccgl/kngl/zlhbg/top/cx.vue

@@ -3,7 +3,7 @@
     <div slot="form" style="display: flex;height: 70vh;">
       <!-- basePage-->
       <BasePage ref="basePage" :power='power' :toolButton='false' class="min_full" style="height: 100%;"
-        :autoQuery='false' :config="config">
+       :config="config">
         <template #dialog="ctx">
           <!-- 嵌入默认页面额外弹框的插槽 ctx.pagePage来操作默认页面 -->
         </template>
@@ -93,6 +93,16 @@
               field: "wlph",
               width: 140
             },
+            {
+              title: "包装数量",
+              field: "packmxSl",
+              width: 140
+            },
+            {
+              title: "装托数量",
+              field: "ztsl",
+              width: 140
+            },
             {
               title: "制令号",
               field: "zlh",

src/views/ccgl/kngl/zlhbg/top/edit.vue

 <template>
-	<RelDialog bigTitle detailTable='RKTZMX' @getFormDetail='getFormDetail' width="70%" :type='type' :editApp='editApp'
+	<RelDialog bigTitle detailTable='ZLHBGMX' @getFormDetail='getFormDetail' width="70%" :type='type' :editApp='editApp'
 		:app='app' :buttonApp='buttonApp'>
 		<el-form slot="form" ref="form" :model="form" label-width="100px" :rules="rules">
       <!-- 查询弹框-->
@@ -51,7 +51,13 @@ import Cx from './cx.vue'
 			/* 选择list时的回调 */
       save(list){
         this.showDialog=false
-        
+        /* 添加熬子表*/
+        list.forEach(item=>{
+          item.lydjid=item.id
+          delete item.id
+          this.formDetail.push(_.cloneDeep(item))
+        })
+
 
       }
 		},
@@ -161,8 +167,13 @@ import Cx from './cx.vue'
           	width: 200,
           },
           {
-          	title: "数量",
-          	field: "sl",
+          	title: "包装数量",
+          	field: "packmxSl",
+          	width: 200,
+          },
+          {
+          	title: "装托数量",
+          	field: "ztsl",
           	width: 200,
           }
 

src/views/ccgl/kngl/zlhbg/top/index.vue

@@ -4,7 +4,7 @@
       <!-- 嵌入默认页面额外弹框的插槽 ctx.pagePage来操作默认页面 -->
     </template>
     <template #toolbar="ctx">
-      <!-- <el-button @click="demo(ctx.basePage)" size='mini'  type="primary">直接入库</el-button> -->
+      <el-button @click="doConfirm(ctx.basePage)" size='mini'  type="primary">确认</el-button>
     </template>
 
   </BasePage>
@@ -98,15 +98,31 @@
                 value: ''
               }
             ]
-
           ],
           /* 默认启停用  */
-
         }
       }
-
     },
     methods: {
+      doConfirm(ctx){
+        if(ctx.singleItem&&ctx.singleItem.id){
+          this.$confirm('是否确认?', '提示', {
+          					confirmButtonText: '确定',
+          					cancelButtonText: '取消',
+          					type: 'warning'
+          				}).then(res=>{
+                      this.$post('lxyl/kcgl/zlhbg/doConfirm',{
+                        id:ctx.singleItem.id
+                      }).then(res=>{
+                        if(res.success){
+                          ctx.refresh()
+                        }
+                      })
+          				})
+        }else{
+          this.$warning('请选中一条数据')
+        }
+      },
       getRow(val) {
         this.$emit('getRow', val)
       }

src/views/ccgl/rkgl/sjrw/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">
- 
+
     <template  slot="tabCustom2">
 
     </template>
@@ -67,6 +67,11 @@
               field: "kwName",
               width: 140
             },
+            {
+              title: "实际库位",
+              field: "sjkwCode",
+              width: 140
+            },
             // {
             //   title: "应收数量",
             //   field: "yssl",