1

src/components/process/EHSD/Contract.vue

@@ -1730,6 +1730,9 @@ onMounted(() => {
         res.countryId = res.buyCountryId;
         res.provinceId = res.buyProvinceId;
         res.cityId = res.buyCityId;
+        res.countryName = "";
+        res.provinceName = "";
+        res.cityName = "";
         formData.data = res;
         proxy
           .post("/fileInfo/getList", {

src/components/process/EHSD/Sample.vue

@@ -1638,6 +1638,9 @@ onMounted(() => {
   if (route.query && route.query.processType) {
     proxy.post("/sample/detail", { id: route.query.businessId }).then((res) => {
       res.sampleShipmentList = res.sampleShipmentLists;
+      res.countryId = res.buyCountryId;
+      res.provinceId = res.buyProvinceId;
+      res.cityId = res.buyCityId;
       if (!res.fileList) {
         res.fileList = [];
       }
@@ -1689,6 +1692,7 @@ onMounted(() => {
             }
           });
       }
+      console.log(formData.data, "wqqeq");
       if (formData.data.countryId) {
         getCityData(formData.data.countryId, "20");
       }

src/components/selectCity/index.vue

@@ -1,7 +1,17 @@
 <template>
   <div class="select-city">
-    <el-select clearable filterable allow-create :placeholder="placeholder" @change="getCityData" @clear="getCityData" v-model="showModel" style="width: 100%">
-      <el-option v-for="item in data" :label="item.name" :value="item.id"> </el-option>
+    <el-select
+      clearable
+      filterable
+      allow-create
+      :placeholder="placeholder"
+      @change="getCityData"
+      @clear="getCityData"
+      v-model="showModel"
+      style="width: 100%"
+    >
+      <el-option v-for="item in data" :label="item.name" :value="item.id">
+      </el-option>
     </el-select>
   </div>
 </template>
@@ -39,7 +49,11 @@ defineProps({
 watch(
   formData.value,
   () => {
-    if (!formData.value[proxy.addressId || "provinceId"] && !formData.value[proxy.addressName || "provinceName"]) {
+    console.log(JSON.parse(JSON.stringify(formData.value)), "22");
+    if (
+      !formData.value[proxy.addressId || "provinceId"] &&
+      !formData.value[proxy.addressName || "provinceName"]
+    ) {
       if (formData.value[proxy.addressId || "provinceId"] === "-1") {
         showModel.value = "";
         formData.value[proxy.addressId || "provinceId"] = "";
@@ -47,14 +61,20 @@ watch(
       } else {
         showModel.value = "";
       }
+      console.log(showModel.value, "www");
     } else {
       if (formData.value[proxy.addressId || "provinceId"] === "-1") {
-        showModel.value = formData.value[proxy.addressId || "provinceId"] || formData.value[proxy.addressName || "provinceName"];
+        showModel.value =
+          formData.value[proxy.addressId || "provinceId"] ||
+          formData.value[proxy.addressName || "provinceName"];
         formData.value[proxy.addressId || "provinceId"] = "";
         formData.value[proxy.addressName || "provinceName"] = "";
       } else {
-        showModel.value = formData.value[proxy.addressId || "provinceId"] || formData.value[proxy.addressName || "provinceName"];
+        showModel.value =
+          formData.value[proxy.addressId || "provinceId"] ||
+          formData.value[proxy.addressName || "provinceName"];
       }
+      console.log(showModel.value, "www");
     }
   },
   {