From 75e27a973b76fa78ff12b96b503487c3d7e33688 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 27 十二月 2023 16:06:13 +0800
Subject: [PATCH] Merge branch 'wn' of http://192.168.5.5:10010/r/web/crm-web into dev

---
 src/views/service/serviceFollowup/AddServiceFollowupDialog.vue |   44 +++++++++++++++++++++++++++++---------------
 1 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/views/service/serviceFollowup/AddServiceFollowupDialog.vue b/src/views/service/serviceFollowup/AddServiceFollowupDialog.vue
index 1015ebd..4b37119 100644
--- a/src/views/service/serviceFollowup/AddServiceFollowupDialog.vue
+++ b/src/views/service/serviceFollowup/AddServiceFollowupDialog.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
@@ -340,10 +338,10 @@
       dialogWidth: "50%",
       editConfig: this.editCommonConfig,
       rules: {
-        number: [{ required: true,  validator: this.validateCheckCode, trigger: ["blur",'change'] }],
+        number: [{ required: true, validator: this.validateCheckCode, trigger: ["blur", "change"] }],
         client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鍚嶇О", trigger: "change" }],
         service_number: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鏈嶅姟鍗�", trigger: "change" }],
-        memberId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }]
+        memberId: [{ required: true, validator: this.validateMemberId, trigger: "change" }]
       },
       satisfactionOptions: [], // 婊℃剰搴�
       timelyRateOptions: [], // 鍙婃椂鐜�
@@ -383,7 +381,7 @@
       if (val) {
         this.formInfo()
       }
-    },
+    }
   },
   methods: {
     formInfo() {
@@ -398,17 +396,25 @@
       getAllData()
         .then((res) => {
           this.memberOptions = res.data.member
-          this.$set(this.editConfig.infomation,'memberId',this.editConfig.infomation.memberId)
+          // 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.satisfactionOptions = res.data.satisfaction // 婊℃剰搴�
-          this.$set(this.editConfig.infomation,'satisfactionId',this.editConfig.infomation.satisfactionId)
+          this.$set(this.editConfig.infomation, "satisfactionId", this.editConfig.infomation.satisfactionId)
           this.timelyRateOptions = res.data.timely_rate // 鍙婃椂鐜�
-          this.$set(this.editConfig.infomation,'timelyRateId',this.editConfig.infomation.timelyRateId)
+          this.$set(this.editConfig.infomation, "timelyRateId", this.editConfig.infomation.timelyRateId)
           this.solveRateOptions = res.data.solve_rate // 瑙ｅ喅鐜�
-          this.$set(this.editConfig.infomation,'solveRateId',this.editConfig.infomation.solveRateId)
+          this.$set(this.editConfig.infomation, "solveRateId", this.editConfig.infomation.solveRateId)
           this.oldMemberOptions = res.data.member // 鍘熸湇鍔′汉鍛�
-          this.$set(this.editConfig.infomation,'oldMemberId',this.editConfig.infomation.oldMemberId)
+          this.$set(this.editConfig.infomation, "oldMemberId", this.editConfig.infomation.oldMemberId)
           this.isVisitOptions = res.data.isVisit // 鏈嶅姟浜哄憳鏄惁鏉ヨ繃
-          this.$set(this.editConfig.infomation,'isVisitId',this.editConfig.infomation.isVisitId)
+          this.$set(this.editConfig.infomation, "isVisitId", this.editConfig.infomation.isVisitId)
         })
         .catch((err) => {
           console.log(err)
@@ -462,7 +468,7 @@
         serviceOrderId: this.serviceOrderId || 0,
         solveRate: data.solveRateId || 0,
         timelyRate: data.timelyRateId || 0,
-        codeStandID: data.ID,
+        codeStandID: data.ID
       }
       return params
     },
@@ -542,7 +548,15 @@
     // 娣诲姞闄勪欢
     addAnnexClick() {},
     // 璁剧疆鍏佽涓婁紶鏂囦欢鏍煎紡
-    setFormatClick() {}
+    setFormatClick() {},
+    // 鍥炶浜鸿嚜瀹氫箟鏍￠獙瑙勫垯
+    validateMemberId(rule, value, callback) {
+      if (this.editConfig.infomation?.memberId > 0) {
+        callback()
+      } else {
+        callback(new Error("璇烽�夋嫨鍥炶浜�"))
+      }
+    }
   }
 }
 </script>

--
Gitblit v1.8.0