From 10cc5737bf2c24931e6ee166b58cff259154dca0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Thu, 17 Aug 2023 16:43:42 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/DialogCreateOrder.vue | 54 +++++++++++++++++++++------
 src/views/inout/DialogSelectRl.vue    |  9 +++++
 2 files changed, 51 insertions(+), 12 deletions(-)

diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index d0dd60c..e301a67 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -16,15 +16,15 @@
                      v-if="curAction.checkWebNew != 2  || viewType !=1"
           >立即提交
           </el-button>
-          <el-button size="mini" type="primary" @click.native="submit(1)"
-                     v-if="curAction.checkWebNew > 1  && viewType == 1"
-          >待配货提交
-          </el-button>
+<!--          <el-button size="mini" type="primary" @click.native="submit(1)"-->
+<!--                     v-if="curAction.checkWebNew > 1  && viewType == 1"-->
+<!--          >待配货提交-->
+<!--          </el-button>-->
 
-          <el-button size="mini" type="primary" @click.native="submit(1)"
-                     v-if="curAction.checkWebNew == 3"
-          >未配货提交
-          </el-button>
+<!--          <el-button size="mini" type="primary" @click.native="submit(1)"-->
+<!--                     v-if="curAction.checkWebNew == 3"-->
+<!--          >未配货提交-->
+<!--          </el-button>-->
 
         </el-button-group>
         <el-row>
@@ -235,7 +235,23 @@
         editType="1">
       </editCodeDialog>
     </el-dialog>
-
+    <!--    绑定产品-->
+    <el-dialog
+      :title="selectRlTitle"
+      :visible.sync="selectRlVisible"
+      width="80%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="selectRlVisible"
+      append-to-body
+    >
+      <selectRlDialog
+        :curRow="codeFormData"
+        :type="1"
+        :fromCorp="orderFormData.fromCorp"
+        v-on:selectBindRl="selectBindRl"
+      ></selectRlDialog>
+    </el-dialog>
   </div>
 </template>
 
@@ -249,7 +265,7 @@ import {parseTime} from "../../utils/coTools";
 import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain"
 import editCodeDialog from "./DialogEditCode";
 
-
+import selectRlDialog from "./DialogSelectRl";
 import codesPanel from "./PanelCreateOrderCodes"
 import codeDetailPanel from "./PanelCreateOrderCodeDetail"
 import bizDetailPanel from "./PanelCreateOrderBizDetail"
@@ -337,6 +353,7 @@ export default {
           {required: true, message: "请选择单据类型", trigger: "change"}
         ],
       },
+      selectRlVisible: false,
       isScan: true,
       scanText: "扫码录入：",
       corpOrderIdDisabled: false,
@@ -367,7 +384,7 @@ export default {
     };
   },
   components: {
-    codesPanel, codeDetailPanel, bizDetailPanel, editCodeDialog
+    codesPanel, codeDetailPanel, bizDetailPanel, editCodeDialog, selectRlDialog
   },
   methods: {
     //获取用户仓库列表
@@ -596,6 +613,15 @@ export default {
             this.refreshCodesPanel();
             this.$message.error(response.message);
             this.selectRlTitle = response.message;
+            //判断是出库需要选择供应商的时候把供应商值传过去
+            if (tQuery.selectSupId != null) {
+              this.codeFormData.selectSupId = tQuery.selectSupId
+            } else {
+              this.codeFormData.selectSupId = false
+            }
+            //DI绑定多个产品,请指定对应产品 时候传递关键字做过滤
+            this.codeFormData.key = "key";
+            this.selectRlVisible = true;
           } else if (response.code == 503) {
             this.curRow = response.data;
             this.orderFormData.billNo = this.curRow.orderId;
@@ -854,7 +880,11 @@ export default {
       });
     },
 
-
+    selectBindRl(row) {
+      this.selectRlVisible = false;
+      this.orderFormData.relId = row.id;
+      this.addCode();
+    },
     getInputFocus(event) {
       event.currentTarget.select();
     }
diff --git a/src/views/inout/DialogSelectRl.vue b/src/views/inout/DialogSelectRl.vue
index c9c7d5a..6a0898f 100644
--- a/src/views/inout/DialogSelectRl.vue
+++ b/src/views/inout/DialogSelectRl.vue
@@ -585,9 +585,11 @@ export default {
     },
     getList() {
       this.loading = true;
+      this.filterQuery.udiCode = this.curRow.code;
       this.filterQuery.nameCode = this.curRow.nameCode;
       this.filterQuery.bindRlIds = this.curRow.bindRlIds;
       this.filterQuery.unitFk = this.fromCorp;
+      this.filterQuery.key = this.curRow.key;
       getMutiUdiInfos(this.filterQuery)
         .then((response) => {
           this.loading = false;
@@ -863,6 +865,13 @@ export default {
   components: {}
   ,
   created() {
+    if(this.curRow.selectSupId!=null){
+      if(this.curRow.selectSupId!=false){
+        this.fromCorp=this.curRow.selectSupId
+      }else{
+        this.fromCorp=''
+      }
+    }
     this.getList();
   }
   ,