From af714e956bd9f105d35d7a953c030bb8fe9b523c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Mon, 5 Jun 2023 17:33:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8D=AE=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/purchase/purApply/purOrderSelectProduct.vue | 9 +++------
 src/views/purchase/purOrder/purOrderEditDialog.vue    | 4 ++--
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/views/purchase/purApply/purOrderSelectProduct.vue b/src/views/purchase/purApply/purOrderSelectProduct.vue
index af7a7393..2402f96a 100644
--- a/src/views/purchase/purApply/purOrderSelectProduct.vue
+++ b/src/views/purchase/purApply/purOrderSelectProduct.vue
@@ -328,17 +328,14 @@ export default {
 
       if (this.ids.length > 0) {
         for (var i = 0; i < this.ids.length; i++) {
-          if (this.ids[i] == this.multipleSelection.rlId) {
+          if (this.ids[i] == this.multipleSelection.id) {
             this.$message.error("该产品已录入！");
             return
           }
         }
       }
 
-      if (!this.multipleSelection.companyName) {
-        this.$message.error("配送企业为空！请重新选择！");
-        return;
-      }
+
       let str = this.multipleSelection.zczbhhzbapzbh;
       if (str.search(",") != -1) {
         this.currentCert = null;
@@ -352,7 +349,7 @@ export default {
     combine() {
       this.loading = true;
       let tQuery = {
-        productId: this.multipleSelection.rlId,
+        productId: this.multipleSelection.id,
         productName: this.multipleSelection.cpmctymc,
         count: 1,
         orderIdFk: this.pId,
diff --git a/src/views/purchase/purOrder/purOrderEditDialog.vue b/src/views/purchase/purOrder/purOrderEditDialog.vue
index 44b430f5..9194a3ff 100644
--- a/src/views/purchase/purOrder/purOrderEditDialog.vue
+++ b/src/views/purchase/purOrder/purOrderEditDialog.vue
@@ -165,7 +165,7 @@
                 <el-option v-for="item in suppliers"
                            :key="item.erpId"
                            :label="item.name"
-                           :value="item.name">
+                           :value="item.erpId">
                 </el-option>
               </el-select>
             </template>
@@ -441,7 +441,7 @@ export default {
       this.selectedIndex = val.index;
       filterSupList({productId:val.productId}) //查找该单号下的所有条码
           .then((response) => {
-            this.suppliers = response.data.list || [];
+            this.suppliers = response.data || [];
           })
           .catch(() => {