1

src/components/process/Contract.vue

@@ -56,8 +56,8 @@
             </el-form-item>
             <el-row style="margin-top: 20px; width: 100%">
               <el-col :span="6">
-                <el-form-item label="地址" prop="countryId">
-                  <el-select v-model="formData.data.countryId" placeholder="国家" filterable allow-create @change="(val) => getCityData(val, '20', true)">
+                <el-form-item label="地址" prop="buyCountryId">
+                  <el-select v-model="formData.data.buyCountryId" placeholder="国家" filterable allow-create @change="(val) => getCityData(val, '20', true)">
                     <el-option v-for="item in countryData" :label="item.chineseName" :value="item.id"> </el-option>
                   </el-select>
                 </el-form-item>
@@ -67,7 +67,7 @@
                   <selectCity
                     placeholder="省/洲"
                     @change="(val) => getCityData(val, '30', true)"
-                    addressId="provinceId"
+                    addressId="buyProvinceId"
                     addressName="provinceName"
                     v-model="formData.data"
                     :data="provinceData">
@@ -76,7 +76,7 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label=" " prop="cityName">
-                  <selectCity placeholder="城市" addressId="cityId" addressName="cityName" v-model="formData.data" :data="cityData"> </selectCity>
+                  <selectCity placeholder="城市" addressId="buyCityId" addressName="cityName" v-model="formData.data" :data="cityData"> </selectCity>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -551,7 +551,7 @@ const rules = ref({
   contractType: [{ required: true, message: "请选择合同类型", trigger: "change" }],
   contractTemplateId: [{ required: true, message: "请选择合同模板", trigger: "change" }],
   buyCorporationId: [{ required: true, message: "请选择公司", trigger: "change" }],
-  countryId: [{ required: true, message: "请选择国家", trigger: "change" }],
+  buyCountryId: [{ required: true, message: "请选择国家", trigger: "change" }],
   buyContactName: [{ required: true, message: "请输入联系人", trigger: ["change", "blur"] }],
   buyContactNumber: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
   productName: [{ required: true, message: "请输入商品名称", trigger: "blur" }],
@@ -700,13 +700,16 @@ const getCityData = (id, type, isChange) => {
     if (type === "20") {
       provinceData.value = res;
       if (isChange) {
-        formData.data.provinceId = "";
-        formData.data.cityId = "";
+        formData.data.buyProvinceId = "";
+        formData.data.provinceName = "";
+        formData.data.buyCityId = "";
+        formData.data.cityName = "";
       }
     } else if (type === "30") {
       cityData.value = res;
       if (isChange) {
-        formData.data.cityId = "";
+        formData.data.buyCityId = "";
+        formData.data.cityName = "";
       }
     } else {
       countryData.value = res;
@@ -735,27 +738,27 @@ const changeCustomer = (val) => {
             };
           });
         }
-        formData.data.countryId = res.countryId;
-        formData.data.provinceId = res.provinceId;
-        formData.data.cityId = res.cityId;
+        formData.data.buyCountryId = res.countryId;
+        formData.data.buyProvinceId = res.provinceId;
+        formData.data.buyCityId = res.cityId;
         formData.data.buyPostalCode = res.zipCode;
         formData.data.buyAddress = res.address;
-        getCityData(formData.data.countryId, "20");
-        getCityData(formData.data.provinceId, "30");
+        getCityData(formData.data.buyCountryId, "20");
+        getCityData(formData.data.buyProvinceId, "30");
       },
       (err) => {
         console.log(err);
-        formData.data.countryId = "";
-        formData.data.provinceId = "";
-        formData.data.cityId = "";
+        formData.data.buyCountryId = "";
+        formData.data.buyProvinceId = "";
+        formData.data.buyCityId = "";
         formData.data.buyPostalCode = "";
         formData.data.buyAddress = "";
       }
     );
   } else {
-    formData.data.countryId = "";
-    formData.data.provinceId = "";
-    formData.data.cityId = "";
+    formData.data.buyCountryId = "";
+    formData.data.buyProvinceId = "";
+    formData.data.buyCityId = "";
     formData.data.buyPostalCode = "";
     formData.data.buyAddress = "";
   }

src/components/process/EHSD/Contract.vue

@@ -56,8 +56,8 @@
             </el-form-item>
             <el-row style="margin-top: 20px; width: 100%">
               <el-col :span="6">
-                <el-form-item label="地址" prop="countryId">
-                  <el-select v-model="formData.data.countryId" placeholder="国家" filterable allow-create @change="(val) => getCityData(val, '20', true)">
+                <el-form-item label="地址" prop="buyCountryId">
+                  <el-select v-model="formData.data.buyCountryId" placeholder="国家" filterable allow-create @change="(val) => getCityData(val, '20', true)">
                     <el-option v-for="item in countryData" :label="item.chineseName" :value="item.id"> </el-option>
                   </el-select>
                 </el-form-item>
@@ -67,7 +67,7 @@
                   <selectCity
                     placeholder="省/洲"
                     @change="(val) => getCityData(val, '30', true)"
-                    addressId="provinceId"
+                    addressId="buyProvinceId"
                     addressName="provinceName"
                     v-model="formData.data"
                     :data="provinceData">
@@ -76,7 +76,7 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label=" " prop="cityName">
-                  <selectCity placeholder="城市" addressId="cityId" addressName="cityName" v-model="formData.data" :data="cityData"> </selectCity>
+                  <selectCity placeholder="城市" addressId="buyCityId" addressName="cityName" v-model="formData.data" :data="cityData"> </selectCity>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -586,7 +586,7 @@ const formConfig = computed(() => {
 const rules = ref({
   contractTemplateId: [{ required: true, message: "请选择合同模板", trigger: "change" }],
   buyCorporationId: [{ required: true, message: "请选择公司", trigger: "change" }],
-  countryId: [{ required: true, message: "请选择国家", trigger: "change" }],
+  buyCountryId: [{ required: true, message: "请选择国家", trigger: "change" }],
   buyContactName: [{ required: true, message: "请输入联系人", trigger: ["change", "blur"] }],
   buyContactNumber: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
   productName: [{ required: true, message: "请输入商品名称", trigger: "blur" }],
@@ -744,17 +744,20 @@ const changeTemplate = (val) => {
   }
 };
 const getCityData = (id, type, isChange) => {
-  proxy.post("/areaInfo/list", { parentId: id }).then((res) => {
+  proxy.post("/customizeArea/list", { parentId: id }).then((res) => {
     if (type === "20") {
       provinceData.value = res;
       if (isChange) {
-        formData.data.provinceId = "";
-        formData.data.cityId = "";
+        formData.data.buyProvinceId = "";
+        formData.data.provinceName = "";
+        formData.data.buyCityId = "";
+        formData.data.cityName = "";
       }
     } else if (type === "30") {
       cityData.value = res;
       if (isChange) {
-        formData.data.cityId = "";
+        formData.data.buyCityId = "";
+        formData.data.cityName = "";
       }
     } else {
       countryData.value = res;
@@ -784,27 +787,27 @@ const changeCustomer = (val) => {
             };
           });
         }
-        formData.data.countryId = res.countryId;
-        formData.data.provinceId = res.provinceId;
-        formData.data.cityId = res.cityId;
+        formData.data.buyCountryId = res.countryId;
+        formData.data.buyProvinceId = res.provinceId;
+        formData.data.buyCityId = res.cityId;
         formData.data.buyPostalCode = res.zipCode;
         formData.data.buyAddress = res.address;
-        getCityData(formData.data.countryId, "20");
-        getCityData(formData.data.provinceId, "30");
+        getCityData(formData.data.buyCountryId, "20");
+        getCityData(formData.data.buyProvinceId, "30");
       },
       (err) => {
         console.log(err);
-        formData.data.countryId = "";
-        formData.data.provinceId = "";
-        formData.data.cityId = "";
+        formData.data.buyCountryId = "";
+        formData.data.buyProvinceId = "";
+        formData.data.buyCityId = "";
         formData.data.buyPostalCode = "";
         formData.data.buyAddress = "";
       }
     );
   } else {
-    formData.data.countryId = "";
-    formData.data.provinceId = "";
-    formData.data.cityId = "";
+    formData.data.buyCountryId = "";
+    formData.data.buyProvinceId = "";
+    formData.data.buyCityId = "";
     formData.data.buyPostalCode = "";
     formData.data.buyAddress = "";
   }

src/components/process/EHSD/PriceSheet.vue

@@ -56,8 +56,8 @@
             </el-form-item>
             <el-row style="margin-top: 20px; width: 100%">
               <el-col :span="6">
-                <el-form-item label="地址" prop="countryId">
-                  <el-select v-model="formData.data.countryId" placeholder="国家" filterable allow-create @change="(val) => getCityData(val, '20', true)">
+                <el-form-item label="地址" prop="buyCountryId">
+                  <el-select v-model="formData.data.buyCountryId" placeholder="国家" filterable allow-create @change="(val) => getCityData(val, '20', true)">
                     <el-option v-for="item in countryData" :label="item.chineseName" :value="item.id"> </el-option>
                   </el-select>
                 </el-form-item>
@@ -67,7 +67,7 @@
                   <selectCity
                     placeholder="省/洲"
                     @change="(val) => getCityData(val, '30', true)"
-                    addressId="provinceId"
+                    addressId="buyProvinceId"
                     addressName="provinceName"
                     v-model="formData.data"
                     :data="provinceData">
@@ -76,7 +76,7 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label=" " prop="cityName">
-                  <selectCity placeholder="城市" addressId="cityId" addressName="cityName" v-model="formData.data" :data="cityData"> </selectCity>
+                  <selectCity placeholder="城市" addressId="buyCityId" addressName="cityName" v-model="formData.data" :data="cityData"> </selectCity>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -446,7 +446,7 @@ const formConfig = computed(() => {
 const rules = ref({
   contractTemplateId: [{ required: true, message: "请选择合同模板", trigger: "change" }],
   buyCorporationId: [{ required: true, message: "请选择公司", trigger: "change" }],
-  countryId: [{ required: true, message: "请选择国家", trigger: "change" }],
+  buyCountryId: [{ required: true, message: "请选择国家", trigger: "change" }],
   buyContactName: [{ required: true, message: "请输入联系人", trigger: ["change", "blur"] }],
   buyContactNumber: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
   productName: [{ required: true, message: "请输入商品名称", trigger: "blur" }],
@@ -594,17 +594,20 @@ const changeTemplate = (val) => {
   }
 };
 const getCityData = (id, type, isChange) => {
-  proxy.post("/areaInfo/list", { parentId: id }).then((res) => {
+  proxy.post("/customizeArea/list", { parentId: id }).then((res) => {
     if (type === "20") {
       provinceData.value = res;
       if (isChange) {
-        formData.data.provinceId = "";
-        formData.data.cityId = "";
+        formData.data.buyProvinceId = "";
+        formData.data.provinceName = "";
+        formData.data.buyCityId = "";
+        formData.data.cityName = "";
       }
     } else if (type === "30") {
       cityData.value = res;
       if (isChange) {
-        formData.data.cityId = "";
+        formData.data.buyCityId = "";
+        formData.data.cityName = "";
       }
     } else {
       countryData.value = res;
@@ -634,27 +637,27 @@ const changeCustomer = (val) => {
             };
           });
         }
-        formData.data.countryId = res.countryId;
-        formData.data.provinceId = res.provinceId;
-        formData.data.cityId = res.cityId;
+        formData.data.buyCountryId = res.countryId;
+        formData.data.buyProvinceId = res.provinceId;
+        formData.data.buyCityId = res.cityId;
         formData.data.buyPostalCode = res.zipCode;
         formData.data.buyAddress = res.address;
-        getCityData(formData.data.countryId, "20");
-        getCityData(formData.data.provinceId, "30");
+        getCityData(formData.data.buyCountryId, "20");
+        getCityData(formData.data.buyProvinceId, "30");
       },
       (err) => {
         console.log(err);
-        formData.data.countryId = "";
-        formData.data.provinceId = "";
-        formData.data.cityId = "";
+        formData.data.buyCountryId = "";
+        formData.data.buyProvinceId = "";
+        formData.data.buyCityId = "";
         formData.data.buyPostalCode = "";
         formData.data.buyAddress = "";
       }
     );
   } else {
-    formData.data.countryId = "";
-    formData.data.provinceId = "";
-    formData.data.cityId = "";
+    formData.data.buyCountryId = "";
+    formData.data.buyProvinceId = "";
+    formData.data.buyCityId = "";
     formData.data.buyPostalCode = "";
     formData.data.buyAddress = "";
   }
@@ -863,8 +866,8 @@ onMounted(() => {
       }
       delete formData.data.id;
       delete formData.data.code;
-      getCityData(formData.data.countryId, "20");
-      getCityData(formData.data.provinceId, "30");
+      getCityData(formData.data.buyCountryId, "20");
+      getCityData(formData.data.buyProvinceId, "30");
       if (formData.data.quotationProductList && formData.data.quotationProductList.length > 0) {
         formData.data.quotationProductList = formData.data.quotationProductList.map((item) => {
           delete item.id;

src/components/process/EHSD/Sample.vue

@@ -56,8 +56,8 @@
             </el-form-item>
             <el-row style="margin-top: 20px; width: 100%">
               <el-col :span="6">
-                <el-form-item label="地址" prop="countryId">
-                  <el-select v-model="formData.data.countryId" placeholder="国家" filterable allow-create @change="(val) => getCityData(val, '20', true)">
+                <el-form-item label="地址" prop="buyCountryId">
+                  <el-select v-model="formData.data.buyCountryId" placeholder="国家" filterable allow-create @change="(val) => getCityData(val, '20', true)">
                     <el-option v-for="item in countryData" :label="item.chineseName" :value="item.id"> </el-option>
                   </el-select>
                 </el-form-item>
@@ -67,7 +67,7 @@
                   <selectCity
                     placeholder="省/洲"
                     @change="(val) => getCityData(val, '30', true)"
-                    addressId="provinceId"
+                    addressId="buyProvinceId"
                     addressName="provinceName"
                     v-model="formData.data"
                     :data="provinceData">
@@ -76,7 +76,7 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label=" " prop="cityName">
-                  <selectCity placeholder="城市" addressId="cityId" addressName="cityName" v-model="formData.data" :data="cityData"> </selectCity>
+                  <selectCity placeholder="城市" addressId="buyCityId" addressName="cityName" v-model="formData.data" :data="cityData"> </selectCity>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -590,7 +590,7 @@ const formConfig = computed(() => {
 const rules = ref({
   contractTemplateId: [{ required: true, message: "请选择合同模板", trigger: "change" }],
   buyCorporationId: [{ required: true, message: "请选择公司", trigger: "change" }],
-  countryId: [{ required: true, message: "请选择国家", trigger: "change" }],
+  buyCountryId: [{ required: true, message: "请选择国家", trigger: "change" }],
   buyContactName: [{ required: true, message: "请输入联系人", trigger: ["change", "blur"] }],
   buyContactNumber: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
   productName: [{ required: true, message: "请输入商品名称", trigger: "blur" }],
@@ -754,17 +754,20 @@ const changeTemplate = (val) => {
   }
 };
 const getCityData = (id, type, isChange) => {
-  proxy.post("/areaInfo/list", { parentId: id }).then((res) => {
+  proxy.post("/customizeArea/list", { parentId: id }).then((res) => {
     if (type === "20") {
       provinceData.value = res;
       if (isChange) {
-        formData.data.provinceId = "";
-        formData.data.cityId = "";
+        formData.data.buyProvinceId = "";
+        formData.data.provinceName = "";
+        formData.data.buyCityId = "";
+        formData.data.cityName = "";
       }
     } else if (type === "30") {
       cityData.value = res;
       if (isChange) {
-        formData.data.cityId = "";
+        formData.data.buyCityId = "";
+        formData.data.cityName = "";
       }
     } else {
       countryData.value = res;
@@ -794,27 +797,27 @@ const changeCustomer = (val) => {
             };
           });
         }
-        formData.data.countryId = res.countryId;
-        formData.data.provinceId = res.provinceId;
-        formData.data.cityId = res.cityId;
+        formData.data.buyCountryId = res.countryId;
+        formData.data.buyProvinceId = res.provinceId;
+        formData.data.buyCityId = res.cityId;
         formData.data.buyPostalCode = res.zipCode;
         formData.data.buyAddress = res.address;
-        getCityData(formData.data.countryId, "20");
-        getCityData(formData.data.provinceId, "30");
+        getCityData(formData.data.buyCountryId, "20");
+        getCityData(formData.data.buyProvinceId, "30");
       },
       (err) => {
         console.log(err);
-        formData.data.countryId = "";
-        formData.data.provinceId = "";
-        formData.data.cityId = "";
+        formData.data.buyCountryId = "";
+        formData.data.buyProvinceId = "";
+        formData.data.buyCityId = "";
         formData.data.buyPostalCode = "";
         formData.data.buyAddress = "";
       }
     );
   } else {
-    formData.data.countryId = "";
-    formData.data.provinceId = "";
-    formData.data.cityId = "";
+    formData.data.buyCountryId = "";
+    formData.data.buyProvinceId = "";
+    formData.data.buyCityId = "";
     formData.data.buyPostalCode = "";
     formData.data.buyAddress = "";
   }

src/components/process/PriceSheet.vue

@@ -56,8 +56,8 @@
             </el-form-item>
             <el-row style="margin-top: 20px; width: 100%">
               <el-col :span="6">
-                <el-form-item label="地址" prop="countryId">
-                  <el-select v-model="formData.data.countryId" placeholder="国家" filterable allow-create @change="(val) => getCityData(val, '20', true)">
+                <el-form-item label="地址" prop="buyCountryId">
+                  <el-select v-model="formData.data.buyCountryId" placeholder="国家" filterable allow-create @change="(val) => getCityData(val, '20', true)">
                     <el-option v-for="item in countryData" :label="item.chineseName" :value="item.id"> </el-option>
                   </el-select>
                 </el-form-item>
@@ -67,7 +67,7 @@
                   <selectCity
                     placeholder="省/洲"
                     @change="(val) => getCityData(val, '30', true)"
-                    addressId="provinceId"
+                    addressId="buyProvinceId"
                     addressName="provinceName"
                     v-model="formData.data"
                     :data="provinceData">
@@ -76,7 +76,7 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label=" " prop="cityName">
-                  <selectCity placeholder="城市" addressId="cityId" addressName="cityName" v-model="formData.data" :data="cityData"> </selectCity>
+                  <selectCity placeholder="城市" addressId="buyCityId" addressName="cityName" v-model="formData.data" :data="cityData"> </selectCity>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -410,7 +410,7 @@ const formConfig = computed(() => {
 const rules = ref({
   contractTemplateId: [{ required: true, message: "请选择合同模板", trigger: "change" }],
   buyCorporationId: [{ required: true, message: "请选择公司", trigger: "change" }],
-  countryId: [{ required: true, message: "请选择国家", trigger: "change" }],
+  buyCountryId: [{ required: true, message: "请选择国家", trigger: "change" }],
   buyContactName: [{ required: true, message: "请输入联系人", trigger: ["change", "blur"] }],
   buyContactNumber: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
   productName: [{ required: true, message: "请输入商品名称", trigger: "blur" }],
@@ -544,13 +544,16 @@ const getCityData = (id, type, isChange) => {
     if (type === "20") {
       provinceData.value = res;
       if (isChange) {
-        formData.data.provinceId = "";
-        formData.data.cityId = "";
+        formData.data.buyProvinceId = "";
+        formData.data.provinceName = "";
+        formData.data.buyCityId = "";
+        formData.data.cityName = "";
       }
     } else if (type === "30") {
       cityData.value = res;
       if (isChange) {
-        formData.data.cityId = "";
+        formData.data.buyCityId = "";
+        formData.data.cityName = "";
       }
     } else {
       countryData.value = res;
@@ -579,27 +582,27 @@ const changeCustomer = (val) => {
             };
           });
         }
-        formData.data.countryId = res.countryId;
-        formData.data.provinceId = res.provinceId;
-        formData.data.cityId = res.cityId;
+        formData.data.buyCountryId = res.countryId;
+        formData.data.buyProvinceId = res.provinceId;
+        formData.data.buyCityId = res.cityId;
         formData.data.buyPostalCode = res.zipCode;
         formData.data.buyAddress = res.address;
-        getCityData(formData.data.countryId, "20");
-        getCityData(formData.data.provinceId, "30");
+        getCityData(formData.data.buyCountryId, "20");
+        getCityData(formData.data.buyProvinceId, "30");
       },
       (err) => {
         console.log(err);
-        formData.data.countryId = "";
-        formData.data.provinceId = "";
-        formData.data.cityId = "";
+        formData.data.buyCountryId = "";
+        formData.data.buyProvinceId = "";
+        formData.data.buyCityId = "";
         formData.data.buyPostalCode = "";
         formData.data.buyAddress = "";
       }
     );
   } else {
-    formData.data.countryId = "";
-    formData.data.provinceId = "";
-    formData.data.cityId = "";
+    formData.data.buyCountryId = "";
+    formData.data.buyProvinceId = "";
+    formData.data.buyCityId = "";
     formData.data.buyPostalCode = "";
     formData.data.buyAddress = "";
   }
@@ -761,8 +764,8 @@ onMounted(() => {
       }
       delete formData.data.id;
       delete formData.data.code;
-      getCityData(formData.data.countryId, "20");
-      getCityData(formData.data.provinceId, "30");
+      getCityData(formData.data.buyCountryId, "20");
+      getCityData(formData.data.buyProvinceId, "30");
       if (formData.data.quotationProductList && formData.data.quotationProductList.length > 0) {
         formData.data.quotationProductList = formData.data.quotationProductList.map((item) => {
           delete item.id;

src/components/process/ServiceContract.vue

@@ -56,8 +56,8 @@
             </el-form-item>
             <el-row style="margin-top: 20px; width: 100%">
               <el-col :span="6">
-                <el-form-item label="地址" prop="countryId">
-                  <el-select v-model="formData.data.countryId" placeholder="国家" filterable allow-create @change="(val) => getCityData(val, '20', true)">
+                <el-form-item label="地址" prop="buyCountryId">
+                  <el-select v-model="formData.data.buyCountryId" placeholder="国家" filterable allow-create @change="(val) => getCityData(val, '20', true)">
                     <el-option v-for="item in countryData" :label="item.chineseName" :value="item.id"> </el-option>
                   </el-select>
                 </el-form-item>
@@ -67,7 +67,7 @@
                   <selectCity
                     placeholder="省/洲"
                     @change="(val) => getCityData(val, '30', true)"
-                    addressId="provinceId"
+                    addressId="buyProvinceId"
                     addressName="provinceName"
                     v-model="formData.data"
                     :data="provinceData">
@@ -76,7 +76,7 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label=" " prop="cityName">
-                  <selectCity placeholder="城市" addressId="cityId" addressName="cityName" v-model="formData.data" :data="cityData"> </selectCity>
+                  <selectCity placeholder="城市" addressId="buyCityId" addressName="cityName" v-model="formData.data" :data="cityData"> </selectCity>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -406,7 +406,7 @@ const formConfig = computed(() => {
 const rules = ref({
   contractTemplateId: [{ required: true, message: "请选择合同模板", trigger: "change" }],
   buyCorporationId: [{ required: true, message: "请选择公司", trigger: "change" }],
-  countryId: [{ required: true, message: "请选择国家", trigger: "change" }],
+  buyCountryId: [{ required: true, message: "请选择国家", trigger: "change" }],
   buyContactName: [{ required: true, message: "请输入联系人", trigger: ["change", "blur"] }],
   buyContactNumber: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
   productName: [{ required: true, message: "请输入商品名称", trigger: "blur" }],
@@ -535,13 +535,16 @@ const getCityData = (id, type, isChange) => {
     if (type === "20") {
       provinceData.value = res;
       if (isChange) {
-        formData.data.provinceId = "";
-        formData.data.cityId = "";
+        formData.data.buyProvinceId = "";
+        formData.data.provinceName = "";
+        formData.data.buyCityId = "";
+        formData.data.cityName = "";
       }
     } else if (type === "30") {
       cityData.value = res;
       if (isChange) {
-        formData.data.cityId = "";
+        formData.data.buyCityId = "";
+        formData.data.cityName = "";
       }
     } else {
       countryData.value = res;
@@ -570,27 +573,27 @@ const changeCustomer = (val) => {
             };
           });
         }
-        formData.data.countryId = res.countryId;
-        formData.data.provinceId = res.provinceId;
-        formData.data.cityId = res.cityId;
+        formData.data.buyCountryId = res.countryId;
+        formData.data.buyProvinceId = res.provinceId;
+        formData.data.buyCityId = res.cityId;
         formData.data.buyPostalCode = res.zipCode;
         formData.data.buyAddress = res.address;
-        getCityData(formData.data.countryId, "20");
-        getCityData(formData.data.provinceId, "30");
+        getCityData(formData.data.buyCountryId, "20");
+        getCityData(formData.data.buyProvinceId, "30");
       },
       (err) => {
         console.log(err);
-        formData.data.countryId = "";
-        formData.data.provinceId = "";
-        formData.data.cityId = "";
+        formData.data.buyCountryId = "";
+        formData.data.buyProvinceId = "";
+        formData.data.buyCityId = "";
         formData.data.buyPostalCode = "";
         formData.data.buyAddress = "";
       }
     );
   } else {
-    formData.data.countryId = "";
-    formData.data.provinceId = "";
-    formData.data.cityId = "";
+    formData.data.buyCountryId = "";
+    formData.data.buyProvinceId = "";
+    formData.data.buyCityId = "";
     formData.data.buyPostalCode = "";
     formData.data.buyAddress = "";
   }