adjust sjrw

src/views/ccgl/rkgl/rkd/top/index.vue

@@ -13,7 +13,7 @@
      <el-button @click="qxqr(ctx.basePage)" size='mini'  type="primary">取消确认</el-button>
        <el-button @click="sapgz(ctx.basePage)" size='mini'  type="primary">SAP过账</el-button>
        <el-button @click="tbshd(ctx.basePage)" size='mini'  type="primary">同步送货单</el-button>
-        <el-button @click="qktjkw(ctx.basePage)" size='mini'  type="primary">清空推荐库位</el-button>
+       <!-- <el-button @click="qktjkw(ctx.basePage)" size='mini'  type="primary">清空推荐库位</el-button> -->
 		</template>
 
 	</BasePage>
@@ -228,7 +228,7 @@
           					cancelButtonText: '取消',
           					type: 'warning'
           				}).then(res=>{
-          					this.$post('lxyl/rkgl/rktz/empty',{
+          					this.$post('lxyl/rkgl/sjtz/cleanKw ',{
           					  id:ctx.singleItem.id
           					}).then(res=>{
           					  if(res.success){

src/views/ccgl/rkgl/sjrw/top/edit.vue

@@ -66,6 +66,9 @@
             },
       xzrkqdSave(obj){
         let {list,row}=obj
+        if(list&&list[0]&&list[0].kqid){
+          this.form.kqid=list[0].kqid
+        }
         this.form.swlxid=row.swlxid
         this.form.lydjid=row.id
         this.form.ckid=row.ckid
@@ -167,6 +170,23 @@
               }
             }
           },
+          {
+                      "label": "库区",
+                      "prop": "kqid",
+                      "span": 8,
+                      "type": "RelSelect",
+                      "value": "",
+                      // "required": true,
+                      "typeConfig": {
+                        "src": "wms/jcsj/kq/query",
+                        "match": {
+                          "value": "id",
+                          "label": "name"
+                        },
+                        linkage: true,
+                        linkParams: ['ckid']
+                      }
+                    },
           {
             "label": "事务类型",
             "prop": "swlxid",

src/views/ccgl/rkgl/sjrw/top/index.vue

@@ -6,6 +6,7 @@
 		</template>
 		<template #toolbar="ctx">
 		 <el-button @click="tjkw(ctx.basePage)" size='mini'  type="primary">推荐库位</el-button>
+      <el-button @click="qktjkw(ctx.basePage)" size='mini'  type="primary">清空推荐库位</el-button>
 <!-- 		 <ImportButton @success="()=>{
 		  			        ctx.basePage.refresh()
 		  			        }" :url="'/wms/rkgl/rktz/import'" /> -->
@@ -180,6 +181,26 @@
 
 		},
 		methods: {
+      qktjkw(ctx){
+        if(ctx.singleItem&&ctx.singleItem.id){
+          this.$confirm('是否继续该操作?', '提示', {
+          					confirmButtonText: '确定',
+          					cancelButtonText: '取消',
+          					type: 'warning'
+          				}).then(res=>{
+          					this.$post('lxyl/rkgl/sjtz/cleanKw ',{
+          					  id:ctx.singleItem.id
+          					}).then(res=>{
+          					  if(res.success){
+          					    this.$success('操作成功')
+          					    ctx.refresh()
+          					  }
+          					})
+          				})
+        }else{
+          this.$warning('请选中一条数据')
+        }
+      },
       tjkw(ctx){
         if(ctx.singleItem&&ctx.singleItem.id){
             this.$confirm('是否继续?', '提示', {

src/views/ccgl/rkgl/sjrw/top/rkqd.vue

@@ -40,7 +40,13 @@
           /* 基本配置*/
           url: 'wms/rkgl/rktz',
           queryUrl: 'lxyl/rkgl/sjtz/query/rktzqd',
-          tableTitle: [{
+          tableTitle: [
+            {
+              title: "库区",
+              field: "kqName",
+              width: 180
+            },
+            {
               title: "物料编码",
               field: "wlxxCode",
               fieldType: "upper",
@@ -82,6 +88,11 @@
               	field: "packCode",
               	width: 240,
               },
+              {
+                title: "负责人",
+                field: "fzrName",
+                width: 200,
+              },
              {
              	title: "容器",
              	field: "rqCode",

src/views/ccgl/rkgl/sjrw/top/xzrkqd.vue

@@ -59,6 +59,13 @@
            list:list,
            row:this.row
          }
+         /* 判断库区是否一致*/
+         let kqList=list.map(item=>item.kqid||'null')
+         kqList=[...new Set(kqList)]
+         if(kqList.length>1){
+           this.$warning('所选库区存在不一致,请重新选择')
+           return
+         }
         /* 判定list wlid是否重复*/
         let wlzList=list.map(item=>item.wlxxWlzid)
         wlzList=[...new Set(wlzList)]