部分需求更改

src/components/selectCity/index.vue

@@ -1,7 +1,17 @@
 <template>
   <div class="select-city">
-    <el-select clearable filterable allow-create :placeholder="placeholder" @change="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"
+      v-model="showModel"
+      :disabled="disabled"
+      style="width: 100%"
+    >
+      <el-option v-for="item in data" :label="item.name" :value="item.id">
+      </el-option>
     </el-select>
   </div>
 </template>
@@ -34,16 +44,25 @@ defineProps({
     type: Array,
     default: false,
   },
+  disabled: {
+    type: Boolean,
+    default: false,
+  },
 });
 //监听modelValue的变化
 watch(
   formData.value,
   (val) => {
     // console.log(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"] &&
+      !formData.value[proxy.addressName || "provinceName"]
+    ) {
       showModel.value = "";
     } 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"];
     }
   },
   {

src/views/WDLY/outInBound/waitOutBound/index.vue

@@ -41,6 +41,7 @@
               v-model="formData.data.countryId"
               placeholder="国家"
               @change="(val) => getCityData(val, '20', true)"
+              :disabled="submitType == 4"
             >
               <el-option
                 v-for="item in countryData"
@@ -61,6 +62,7 @@
               addressName="provinceName"
               v-model="formData.data"
               :data="provinceData"
+              :disabled="submitType == 4"
             >
             </selectCity>
           </div>
@@ -74,6 +76,7 @@
               addressName="cityName"
               v-model="formData.data"
               :data="cityData"
+              :disabled="submitType == 4"
             >
             </selectCity>
           </div>
@@ -435,12 +438,14 @@ const configData = computed(() => [
       prop: "countryId",
       label: "收货信息",
       itemWidth: 33.33,
+      disabled: true,
     },
     {
       type: "slot",
       slotName: "provinceId",
       label: " ",
       itemWidth: 33.33,
+      disabled: true,
     },
     {
       type: "slot",
@@ -448,11 +453,13 @@ const configData = computed(() => [
       prop: "cityId",
       label: " ",
       itemWidth: 33.33,
+      disabled: true,
     },
     {
       type: "input",
       itemType: "textarea",
       prop: "areaDetail",
+      disabled: true,
     },
     {
       type: "title",
@@ -789,6 +796,9 @@ const outBound = (row) => {
         res.cityId = res.purchaseBackInfo.cityId
           ? res.purchaseBackInfo.cityId
           : "";
+        res.areaDetail = res.purchaseBackInfo.detailedAddress
+          ? res.purchaseBackInfo.detailedAddress
+          : "";
       }
       formData.data = res;
       getCityData(formData.data.countryId, "20");

src/views/WDLY/purchaseManage/alreadyPurchase/index.vue

@@ -769,6 +769,9 @@ let rulesTwo = ref({
   phone: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
   countryId: [{ required: true, message: "请选择国家", trigger: "change" }],
   quantity: [{ required: true, message: "请输入退货数量", trigger: "blur" }],
+  detailedAddress: [
+    { required: true, message: "请输入详细地址", trigger: "blur" },
+  ],
 });
 
 const { proxy } = getCurrentInstance();