From a63d71177a2899b01da37e5bfc2d498bec5f80be Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 17 十月 2023 15:10:13 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into zhengwenfeng/modify-style

---
 src/views/sales/contractManage/AddContractManageDialog.vue |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/views/sales/contractManage/AddContractManageDialog.vue b/src/views/sales/contractManage/AddContractManageDialog.vue
index b3114e0..7585886 100644
--- a/src/views/sales/contractManage/AddContractManageDialog.vue
+++ b/src/views/sales/contractManage/AddContractManageDialog.vue
@@ -269,7 +269,8 @@
       rules: {
         number: [{ required: true, validator: this.checkCode, trigger: "blur" }],
         client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鍚嶇О", trigger: "change" }],
-        member_id: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }]
+        member_id: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+        contractName: [{ required: true, message: "璇疯緭鍏ュ悎鍚屽悕绉�", trigger: "blur" }]
       },
       memberOptions: [],
       statusOptions: [], // 鍚堝悓鐘舵��
@@ -295,6 +296,9 @@
   created() {
     this.$store.dispatch("geClient")
     // this.$store.dispatch("geQuotation")
+    if (this.editConfig.title !== "鏂板缓") {
+      this.isAddQuatation = false
+    }
     this.getCommonData()
     this.formInfo()
   },
@@ -330,6 +334,7 @@
     // 淇濆瓨
     saveClick(formName) {
       this.$refs[formName].validate((valid) => {
+        this.validateFormNumber()
         if (valid) {
           console.log(this.editConfig.infomation)
           const params = this.saveParams()
@@ -433,6 +438,7 @@
       } else if (value === "quotation") {
         this.editSelCommonConfig.title = "鎶ヤ环鍗�"
         this.editSelCommonConfig.editVisible = true
+        this.editSelCommonConfig.clientId = this.clientId
         this.editSelCommonConfig.tableInfomation = [...this.quotationList]
       }
     },

--
Gitblit v1.8.0