From 33836e44d74759010d8e79f3cc702186c4bdf4ea Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 17 十月 2023 11:22:56 +0800
Subject: [PATCH] bug修复(5235 5236)

---
 src/views/sales/quotation/AddQuotationDialog.vue |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/views/sales/quotation/AddQuotationDialog.vue b/src/views/sales/quotation/AddQuotationDialog.vue
index 428fa9b..871458c 100644
--- a/src/views/sales/quotation/AddQuotationDialog.vue
+++ b/src/views/sales/quotation/AddQuotationDialog.vue
@@ -356,8 +356,9 @@
       editConfig: this.editCommonConfig,
       rules: {
         number: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+        quotationName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
         quotation_status_id: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
-        sale_chance_name: [{ required: true, message: "璇烽�夋嫨閿�鍞満浼�", trigger: "blur" }],
+        sale_chance_name: [{ required: true, validator: this.checkChance, trigger: "change" }],
         member_id: [{ required: true, message: "璇烽�夋嫨璐熻矗浜�", trigger: "change" }]
       },
       memberOptions: [],
@@ -495,7 +496,7 @@
       let data = this.editConfig.infomation
       let params = {
         id: this.editConfig.title === "鏂板缓" ? 0 : data.id,
-        quotationName: this.quotationName || "",
+        quotationName: data.quotationName || "",
         conditions: data.conditions || "",
         file: data.file || "",
         member_id: data.member_id || 0,
@@ -505,7 +506,8 @@
         validity_date: data.validity_date || "",
         products: this.tableData,
         codeStandID: data.ID,
-        codeRule: this.codeRule
+        codeRule: this.codeRule,
+        client_id: this.clientId || 0,
       }
       return params
     },
@@ -659,6 +661,14 @@
     clearupProduct(data) {
       this.tableData = data
       this.productTableList.tableData = this.tableData
+    },
+    // 璁㈠崟缂栫爜鍗曠嫭鏍¢獙
+    checkChance(rule, value, callback) {
+      if (this.editConfig.infomation.sale_chance_name && this.editConfig.infomation.sale_chance_name.length > 0) {
+        callback()
+      } else {
+        callback(new Error("璇烽�夋嫨閿�鍞満浼�"))
+      }
     }
   }
 }

--
Gitblit v1.8.0