地址修改

src/components/process/Contract.vue

@@ -64,14 +64,14 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label=" " prop="buyProvinceId">
-                  <el-select v-model="formData.data.buyProvinceId" placeholder="省/洲" @change="(val) => getCityData(val, '30', true)">
+                  <el-select v-model="formData.data.buyProvinceId" filterable allow-create placeholder="省/洲" @change="(val) => getCityData(val, '30', true)">
                     <el-option v-for="item in provinceData" :label="item.name" :value="item.id"> </el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label=" " prop="buyCityId">
-                  <el-select v-model="formData.data.buyCityId" placeholder="城市">
+                  <el-select v-model="formData.data.buyCityId" filterable allow-create placeholder="城市">
                     <el-option v-for="item in cityData" :label="item.name" :value="item.id"> </el-option>
                   </el-select>
                 </el-form-item>
@@ -695,6 +695,7 @@ const changeTemplate = (val) => {
   }
 };
 const getCityData = (id, type, isChange) => {
+  console.log(id)
   proxy.post("/areaInfo/list", { parentId: id }).then((res) => {
     if (type === "20") {
       provinceData.value = res;
@@ -1008,7 +1009,18 @@ const clickSplit = (item) => {
 const clickDelete = (index) => {
   formData.data.contractShipmentList.splice(index, 1);
 };
+
 const handleSubmit = async () => {
+  //判断buyCityId是否为number类型
+  if(isNaN(parseFloat(formData.data.buyCityId)) && !isFinite(formData.data.buyCityId)){
+    formData.data.cityName = formData.data.buyCityId
+  }
+  //判断buyProvinceId是否为number类型
+  if(isNaN(parseFloat(formData.data.buyProvinceId)) && !isFinite(formData.data.buyProvinceId)){
+    formData.data.provinceName = formData.data.buyProvinceId
+  }
+  
+  console.log(formData.data)
   let status = await submit.value.handleSubmit(() => {});
   if (status) {
     if (!(formData.data.contractProductList && formData.data.contractProductList.length > 0)) {

src/components/process/PriceSheet.vue

@@ -64,14 +64,14 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label=" " prop="buyProvinceId">
-                  <el-select v-model="formData.data.buyProvinceId" placeholder="省/洲" @change="(val) => getCityData(val, '30', true)">
+                  <el-select v-model="formData.data.buyProvinceId" filterable allow-create placeholder="省/洲" @change="(val) => getCityData(val, '30', true)">
                     <el-option v-for="item in provinceData" :label="item.name" :value="item.id"> </el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label=" " prop="buyCityId">
-                  <el-select v-model="formData.data.buyCityId" placeholder="城市">
+                  <el-select v-model="formData.data.buyCityId" filterable allow-create placeholder="城市">
                     <el-option v-for="item in cityData" :label="item.name" :value="item.id"> </el-option>
                   </el-select>
                 </el-form-item>
@@ -718,6 +718,19 @@ const querySearch = (queryString, callback) => {
   });
 };
 const handleSubmit = async () => {
+  //判断是否为创建的省份和城市
+  formData.data.cityName = formData.data.buyCityId
+  formData.data.provinceName = formData.data.buyProvinceId
+  cityData.value.map(item=>{
+    if(item.id == formData.data.buyCityId){
+      formData.data.cityName = null
+    }
+  })
+  provinceData.value.map(item=>{
+    if(item.id == formData.data.buyProvinceId){
+      formData.data.provinceName = null
+    }
+  })
   let status = await submit.value.handleSubmit(() => {});
   if (status) {
     if (!(formData.data.quotationProductList && formData.data.quotationProductList.length > 0)) {