From ded9f2455ab4402d9d5902f25f2e447953b62725 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 03 一月 2024 10:29:23 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into dev

---
 src/views/service/serviceContract/AddServiceContractDialog.vue |   54 +++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/src/views/service/serviceContract/AddServiceContractDialog.vue b/src/views/service/serviceContract/AddServiceContractDialog.vue
index 6cd3dee..f387206 100644
--- a/src/views/service/serviceContract/AddServiceContractDialog.vue
+++ b/src/views/service/serviceContract/AddServiceContractDialog.vue
@@ -28,16 +28,14 @@
                   <el-input
                     v-if="
                       editConfig.title == '缂栬緫' ||
-                      (editConfig.title == '鏂板缓' &&
-                        codenumer &&
-                        (explain != '' || isIdDisabled))
+                      (editConfig.title == '鏂板缓' && codenumer && (explain != '' || isIdDisabled))
                     "
                     :disabled="editConfig.title == '缂栬緫'"
                     v-model="editConfig.infomation.number"
                     placeholder="璇疯緭鍏ョ紪鐮�"
                   >
                   </el-input>
-                  <span  v-else-if="editConfig.title == '鏂板缓'" style="color: #f56c6c"
+                  <span v-else-if="editConfig.title == '鏂板缓'" style="color: #f56c6c"
                     >璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span
                   >
                   <!-- <WordInput
@@ -504,10 +502,10 @@
       dialogWidth: "50%",
       editConfig: this.editCommonConfig,
       rules: {
-        number: [{ required: true, validator: this.validateCheckCode, trigger: "blur" }],
+        number: [{ required: true, validator: this.validateCheckCode, trigger: ["blur", "change"] }],
         client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鍚嶇О", trigger: "change" }],
         signTime: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
-        memberId: [{ required: true, message: "璇烽�夋嫨璐熻矗浜�", trigger: "change" }]
+        memberId: [{ required: true, validator: this.validateMemberId, trigger: "change" }]
       },
       memberOptions: [],
       contractTypeOptions: [], // 鍚堝悓绫诲瀷
@@ -566,9 +564,6 @@
       if (val) {
         this.formInfo()
       }
-    },
-    "editCommonConfig.infomation.codeStandID"() {
-      this.formInfo()
     }
   },
   methods: {
@@ -585,8 +580,27 @@
         .then((res) => {
           if (res.code === 200) {
             this.memberOptions = res.data.member
+            // this.$set(this.editConfig.infomation, "memberId", this.editConfig.infomation.memberId)
+            if (this.editConfig.title === "鏂板缓") {
+              let username = document.cookie.replace(/(?:(?:^|.*;\s*)username\s*=\s*([^;]*).*$)|^.*$/, "$1")
+              this.memberOptions.map((item) => {
+                if (item.username == username) {
+                  this.$set(this.editConfig.infomation, "memberId", item.id)
+                }
+              })
+            }
             this.contractTypeOptions = res.data.serviceContractType
+            this.$set(
+              this.editConfig.infomation,
+              "serviceContractTypeId",
+              this.editConfig.infomation.serviceContractTypeId
+            )
             this.contractStatusOptions = res.data.serviceContractStatus
+            this.$set(
+              this.editConfig.infomation,
+              "serviceContractStatusId",
+              this.editConfig.infomation.serviceContractStatusId
+            )
             // this.currencyOptions = res.data.currency
           }
         })
@@ -611,7 +625,6 @@
             this.$message.error("浜у搧鍚嶇О涓嶈兘涓虹┖")
           } else {
             const params = this.saveParams()
-            console.log(params)
             if (this.editConfig.title === "鏂板缓") {
               getAddServiceContract(params).then((res) => {
                 console.log(res)
@@ -660,8 +673,7 @@
         typeId: 0,
         serviceContractTypeId: data.serviceContractTypeId || 0,
         serviceContractStatusId: data.serviceContractStatusId || 0,
-        codeStandID: data.ID,
-        codeRule: this.codeRule
+        codeStandID: data.ID
       }
       return params
     },
@@ -776,7 +788,8 @@
             name: "",
             number: "",
             price: 0,
-            total: 0
+            total: 0,
+            unit: ""
           }
         ]
       } else {
@@ -792,6 +805,7 @@
           { label: "浜у搧鍚嶇О", prop: "name", productName: true, isRequird: true },
           { label: "浜у搧缂栧彿", prop: "number" },
           { label: "鏁伴噺", prop: "amount", inputNumber: true, isRequird: true },
+          { label: "鍗曚綅", prop: "unit" },
           { label: "閿�鍞崟浠�", prop: "price", inputFloat: true },
           { label: "浠风◣鍚堣", prop: "total", inputFloat: true }
         ]
@@ -817,7 +831,8 @@
         name: "",
         number: "",
         price: 0,
-        total: 0
+        total: 0,
+        unit: ""
       })
       this.showSummary.show = true
     },
@@ -833,7 +848,8 @@
           name: "",
           number: "",
           price: 0,
-          total: 0
+          total: 0,
+          unit: ""
         }
       ]
       this.productTableList.tableData = this.tableData
@@ -843,6 +859,14 @@
     clearupProduct(data) {
       this.tableData = data
       this.productTableList.tableData = this.tableData
+    },
+    // 璐熻矗浜鸿嚜瀹氫箟鏍￠獙瑙勫垯
+    validateMemberId(rule, value, callback) {
+      if (this.editConfig.infomation?.memberId > 0) {
+        callback()
+      } else {
+        callback(new Error("璇疯緭鍏ヨ礋璐ｄ汉"))
+      }
     }
   }
 }

--
Gitblit v1.8.0