From 6857572e3d303daaf3c28e639aad91c0bdf2fc42 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 15 八月 2023 14:30:10 +0800
Subject: [PATCH] bug修复及对应参数联调

---
 src/views/client/contacts/AddContactsDialog.vue |   52 +++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/src/views/client/contacts/AddContactsDialog.vue b/src/views/client/contacts/AddContactsDialog.vue
index f0f79e6..134b98d 100644
--- a/src/views/client/contacts/AddContactsDialog.vue
+++ b/src/views/client/contacts/AddContactsDialog.vue
@@ -114,7 +114,7 @@
                       <el-option v-for="item in countryOptions" :key="item.id" :label="item.name" :value="item.id">
                       </el-option>
                     </el-select>
-                    <div class="common-select-btn"><i class="el-icon-setting"></i></div>
+                    <!-- <div class="common-select-btn"><i class="el-icon-setting"></i></div> -->
                   </div>
                 </el-form-item>
               </el-col>
@@ -126,11 +126,12 @@
                       placeholder="璇烽�夋嫨"
                       class="common-select-sel"
                       size="mini"
+                      @change="selProvinceChange"
                     >
                       <el-option v-for="item in provinceOptions" :key="item.id" :label="item.name" :value="item.id">
                       </el-option>
                     </el-select>
-                    <div class="common-select-btn"><i class="el-icon-setting"></i></div>
+                    <!-- <div class="common-select-btn"><i class="el-icon-setting"></i></div> -->
                   </div>
                 </el-form-item>
               </el-col>
@@ -142,15 +143,16 @@
                       placeholder="璇烽�夋嫨"
                       class="common-select-sel"
                       size="mini"
+                      :disabled="cityOptions.length <= 0 ? true : false"
                     >
                       <el-option v-for="item in cityOptions" :key="item.id" :label="item.name" :value="item.id">
                       </el-option>
                     </el-select>
-                    <div class="common-select-btn"><i class="el-icon-setting"></i></div>
+                    <!-- <div class="common-select-btn"><i class="el-icon-setting"></i></div> -->
                   </div>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <!-- <el-col :span="12">
                 <el-form-item label="鍖哄煙" prop="region_id">
                   <div class="common-select">
                     <el-select
@@ -165,7 +167,7 @@
                     <div class="common-select-btn"><i class="el-icon-setting"></i></div>
                   </div>
                 </el-form-item>
-              </el-col>
+              </el-col> -->
               <!-- <el-col :span="12">
                 <el-form-item label="閭紪" prop="postalCode">
                   <el-input v-model="editConfig.infomation.postalCode"></el-input>
@@ -242,6 +244,7 @@
 import { getAddContact, getUpdateContact } from "@/api/client/contacts"
 import { getAllData } from "@/api/client/client"
 import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
+import { getCityList } from "@/api/common/address"
 export default {
   name: "AddContactsDialog",
   props: {
@@ -278,6 +281,14 @@
             message: "璇疯緭鍏ユ纭殑鎵嬫満鍙�",
             trigger: "blur"
           }
+        ],
+        email: [
+          { required: false, message: "", trigger: "blur" },
+          {
+            pattern: /^[a-zA-Z0-9_\\.]+@[a-zA-Z0-9-]+[\\.a-zA-Z]+$/,
+            message: "璇疯緭鍏ユ纭殑閭鏍煎紡",
+            trigger: "blur"
+          }
         ]
       },
       businessSourceOptions: [
@@ -291,7 +302,7 @@
         { value: "8", label: "鍏徃鐢佃瘽" }
       ],
       memberOptions: [],
-      countryOptions: [], // 鍥藉
+      countryOptions: [{ id: 1, name: "涓浗" }], // 鍥藉
       provinceOptions: [], // 鐪佷唤
       cityOptions: [], // 鍩庡競
       regionOptions: [], // 鍖哄煙
@@ -306,18 +317,26 @@
   },
   created() {
     this.$store.dispatch("geClient")
+    if (this.editConfig.title !== "鏂板缓" && this.editConfig.infomation.province_id !== 0) {
+      this.getCityList(this.editConfig.infomation.province_id, "edit")
+    }
     this.getCommonData()
   },
   methods: {
     getCommonData() {
+      this.editConfig.infomation.country_id = 1
+      this.editConfig.infomation.province_id =
+        this.editConfig.infomation.province_id === 0 ? "" : this.editConfig.infomation.province_id
+      this.editConfig.infomation.city_id =
+        this.editConfig.infomation.city_id === 0 ? "" : this.editConfig.infomation.city_id
       getAllData()
         .then((res) => {
           console.log(res)
           this.memberOptions = res.data.member
-          this.countryOptions = res.data.country
+          // this.countryOptions = res.data.country
           this.provinceOptions = res.data.province
-          this.cityOptions = res.data.city
-          this.regionOptions = res.data.region
+          // this.cityOptions = res.data.city
+          // this.regionOptions = res.data.region
         })
         .catch((err) => {
           console.log(err)
@@ -434,6 +453,21 @@
         this.unflodCollapseStr = "鏀惰捣"
         this.isUnflod = true
       }
+    },
+    // 閫夋嫨鐪佷唤
+    selProvinceChange(val) {
+      this.getCityList(val, "sel")
+    },
+    async getCityList(val, value) {
+      await getCityList({ province_id: val }).then((res) => {
+        console.log(res)
+        if (res.data.code === 200) {
+          this.cityOptions = res.data.data.list
+          if (value === "sel") {
+            this.editConfig.infomation.city_id = ""
+          }
+        }
+      })
     }
   }
 }

--
Gitblit v1.8.0