1

src/components/process/EHSD/Contract.vue

@@ -1730,10 +1730,9 @@ onMounted(() => {
         res.countryId = res.buyCountryId;
         res.provinceId = res.buyProvinceId;
         res.cityId = res.buyCityId;
-        res.countryName = "";
-        res.provinceName = "";
-        res.cityName = "";
-        formData.data = res;
+        for (const key in res) {
+          formData.data[key] = res[key];
+        }
         proxy
           .post("/fileInfo/getList", {
             businessIdList: [route.query.businessId],

src/components/process/EHSD/Purchase.vue

@@ -1492,7 +1492,6 @@ onMounted(() => {
       }
     });
   }
-  console.log(route, "wada");
   formOption.disabled = judgeStatus();
   if (route.query && route.query.processType) {
     proxy
@@ -1505,7 +1504,9 @@ onMounted(() => {
         res.countryId = res.sellCountryId;
         res.provinceId = res.sellProvinceId;
         res.cityId = res.sellCityId;
-        formData.data = res;
+        for (const key in res) {
+          formData.data[key] = res[key];
+        }
         proxy
           .post("/fileInfo/getList", {
             businessIdList: [route.query.businessId],

src/components/process/EHSD/Sample.vue

@@ -1647,7 +1647,9 @@ onMounted(() => {
       if (!res.packageFileList) {
         res.packageFileList = [];
       }
-      formData.data = res;
+      for (const key in res) {
+        formData.data[key] = res[key];
+      }
       proxy
         .post("/fileInfo/getList", {
           businessIdList: [route.query.businessId],
@@ -1692,7 +1694,6 @@ onMounted(() => {
             }
           });
       }
-      console.log(formData.data, "wqqeq");
       if (formData.data.countryId) {
         getCityData(formData.data.countryId, "20");
       }

src/components/selectCity/index.vue

@@ -1,17 +1,7 @@
 <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>
@@ -49,11 +39,7 @@ defineProps({
 watch(
   formData.value,
   () => {
-    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"] && !formData.value[proxy.addressName || "provinceName"]) {
       if (formData.value[proxy.addressId || "provinceId"] === "-1") {
         showModel.value = "";
         formData.value[proxy.addressId || "provinceId"] = "";
@@ -61,20 +47,14 @@ 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");
     }
   },
   {