Browse Source

所以合同页面 买方买方地址字段调整

lxf 1 year ago
parent
commit
ba8e4b48ee

+ 39 - 39
src/components/process/Contract.vue

@@ -10,18 +10,18 @@
           </el-form-item>
           <el-row style="margin-top: 20px; width: 100%">
             <el-col :span="8">
-              <el-form-item label="地址" prop="sellCountryId">
-                <el-input v-model="formData.data.sellCountryId" placeholder="请输入国家" />
+              <el-form-item label="地址" prop="sellCountryName">
+                <el-input v-model="formData.data.sellCountryName" placeholder="请输入国家" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label=" " prop="sellProvinceId">
-                <el-input v-model="formData.data.sellProvinceId" placeholder="请输入省/州" />
+              <el-form-item label=" " prop="sellProvinceName">
+                <el-input v-model="formData.data.sellProvinceName" placeholder="请输入省/州" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label=" " prop="sellCityId">
-                <el-input v-model="formData.data.sellCityId" placeholder="请输入城市" />
+              <el-form-item label=" " prop="sellCityName">
+                <el-input v-model="formData.data.sellCityName" placeholder="请输入城市" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -56,8 +56,8 @@
             </el-form-item>
             <el-row style="margin-top: 20px; width: 100%">
               <el-col :span="6">
-                <el-form-item label="地址" prop="buyCountryId">
-                  <el-select v-model="formData.data.buyCountryId" placeholder="国家" filterable allow-create @change="(val) => getCityData(val, '20', true)">
+                <el-form-item label="地址" prop="countryId">
+                  <el-select v-model="formData.data.countryId" 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="buyProvinceId"
+                    addressId="provinceId"
                     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="buyCityId" addressName="cityName" v-model="formData.data" :data="cityData"> </selectCity>
+                  <selectCity placeholder="城市" addressId="cityId" 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" }],
-  buyCountryId: [{ required: true, message: "请选择国家", trigger: "change" }],
+  countryId: [{ required: true, message: "请选择国家", trigger: "change" }],
   buyContactName: [{ required: true, message: "请输入联系人", trigger: ["change", "blur"] }],
   buyContactNumber: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
   productName: [{ required: true, message: "请输入商品名称", trigger: "blur" }],
@@ -640,34 +640,34 @@ const changeTemplate = (val) => {
         proxy.post("/customizeArea/list", { parentId: "0" }).then((resCountry) => {
           let sellCountryData = resCountry.filter((item) => item.id === res.countryId);
           if (sellCountryData && sellCountryData.length > 0) {
-            formData.data.sellCountryId = sellCountryData[0].chineseName;
+            formData.data.sellCountryName = sellCountryData[0].chineseName;
           } else {
-            formData.data.sellCountryId = "";
+            formData.data.sellCountryName = "";
           }
         });
         if (res.countryId) {
           proxy.post("/customizeArea/list", { parentId: res.countryId }).then((resProvince) => {
             let sellProvinceData = resProvince.filter((item) => item.id === res.provinceId);
             if (sellProvinceData && sellProvinceData.length > 0) {
-              formData.data.sellProvinceId = sellProvinceData[0].name;
+              formData.data.sellProvinceName = sellProvinceData[0].name;
             } else {
-              formData.data.sellProvinceId = "";
+              formData.data.sellProvinceName = "";
             }
           });
         } else {
-          formData.data.sellProvinceId = "";
+          formData.data.sellProvinceName = "";
         }
         if (res.provinceId) {
           proxy.post("/customizeArea/list", { parentId: res.provinceId }).then((resCity) => {
             let sellCityData = resCity.filter((item) => item.id === res.cityId);
             if (sellCityData && sellCityData.length > 0) {
-              formData.data.sellCityId = sellCityData[0].name;
+              formData.data.sellCityName = sellCityData[0].name;
             } else {
-              formData.data.sellCityId = "";
+              formData.data.sellCityName = "";
             }
           });
         } else {
-          formData.data.sellCityId = "";
+          formData.data.sellCityName = "";
         }
         formData.data.sellCorporationId = res.corporationId;
         formData.data.sellContactName = res.contactName;
@@ -679,9 +679,9 @@ const changeTemplate = (val) => {
         formData.data.sellCorporationId = "";
         formData.data.sellContactName = "";
         formData.data.sellContactNumber = "";
-        formData.data.sellCountryId = "";
-        formData.data.sellProvinceId = "";
-        formData.data.sellCityId = "";
+        formData.data.sellCountryName = "";
+        formData.data.sellProvinceName = "";
+        formData.data.sellCityName = "";
         formData.data.sellAddress = "";
       }
     );
@@ -689,9 +689,9 @@ const changeTemplate = (val) => {
     formData.data.sellCorporationId = "";
     formData.data.sellContactName = "";
     formData.data.sellContactNumber = "";
-    formData.data.sellCountryId = "";
-    formData.data.sellProvinceId = "";
-    formData.data.sellCityId = "";
+    formData.data.sellCountryName = "";
+    formData.data.sellProvinceName = "";
+    formData.data.sellCityName = "";
     formData.data.sellAddress = "";
   }
 };
@@ -700,15 +700,15 @@ const getCityData = (id, type, isChange) => {
     if (type === "20") {
       provinceData.value = res;
       if (isChange) {
-        formData.data.buyProvinceId = "";
+        formData.data.provinceId = "";
         formData.data.provinceName = "";
-        formData.data.buyCityId = "";
+        formData.data.cityId = "";
         formData.data.cityName = "";
       }
     } else if (type === "30") {
       cityData.value = res;
       if (isChange) {
-        formData.data.buyCityId = "";
+        formData.data.cityId = "";
         formData.data.cityName = "";
       }
     } else {
@@ -738,27 +738,27 @@ const changeCustomer = (val) => {
             };
           });
         }
-        formData.data.buyCountryId = res.countryId;
-        formData.data.buyProvinceId = res.provinceId;
-        formData.data.buyCityId = res.cityId;
+        formData.data.countryId = res.countryId;
+        formData.data.provinceId = res.provinceId;
+        formData.data.cityId = res.cityId;
         formData.data.buyPostalCode = res.zipCode;
         formData.data.buyAddress = res.address;
-        getCityData(formData.data.buyCountryId, "20");
-        getCityData(formData.data.buyProvinceId, "30");
+        getCityData(formData.data.countryId, "20");
+        getCityData(formData.data.provinceId, "30");
       },
       (err) => {
         console.log(err);
-        formData.data.buyCountryId = "";
-        formData.data.buyProvinceId = "";
-        formData.data.buyCityId = "";
+        formData.data.countryId = "";
+        formData.data.provinceId = "";
+        formData.data.cityId = "";
         formData.data.buyPostalCode = "";
         formData.data.buyAddress = "";
       }
     );
   } else {
-    formData.data.buyCountryId = "";
-    formData.data.buyProvinceId = "";
-    formData.data.buyCityId = "";
+    formData.data.countryId = "";
+    formData.data.provinceId = "";
+    formData.data.cityId = "";
     formData.data.buyPostalCode = "";
     formData.data.buyAddress = "";
   }

+ 39 - 39
src/components/process/EHSD/Contract.vue

@@ -10,18 +10,18 @@
           </el-form-item>
           <el-row style="margin-top: 20px; width: 100%">
             <el-col :span="8">
-              <el-form-item label="地址" prop="sellCountryId">
-                <el-input v-model="formData.data.sellCountryId" placeholder="请输入国家" />
+              <el-form-item label="地址" prop="sellCountryName">
+                <el-input v-model="formData.data.sellCountryName" placeholder="请输入国家" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label=" " prop="sellProvinceId">
-                <el-input v-model="formData.data.sellProvinceId" placeholder="请输入省/州" />
+              <el-form-item label=" " prop="sellProvinceName">
+                <el-input v-model="formData.data.sellProvinceName" placeholder="请输入省/州" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label=" " prop="sellCityId">
-                <el-input v-model="formData.data.sellCityId" placeholder="请输入城市" />
+              <el-form-item label=" " prop="sellCityName">
+                <el-input v-model="formData.data.sellCityName" placeholder="请输入城市" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -56,8 +56,8 @@
             </el-form-item>
             <el-row style="margin-top: 20px; width: 100%">
               <el-col :span="6">
-                <el-form-item label="地址" prop="buyCountryId">
-                  <el-select v-model="formData.data.buyCountryId" placeholder="国家" filterable allow-create @change="(val) => getCityData(val, '20', true)">
+                <el-form-item label="地址" prop="countryId">
+                  <el-select v-model="formData.data.countryId" 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="buyProvinceId"
+                    addressId="provinceId"
                     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="buyCityId" addressName="cityName" v-model="formData.data" :data="cityData"> </selectCity>
+                  <selectCity placeholder="城市" addressId="cityId" 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" }],
-  buyCountryId: [{ required: true, message: "请选择国家", trigger: "change" }],
+  countryId: [{ required: true, message: "请选择国家", trigger: "change" }],
   buyContactName: [{ required: true, message: "请输入联系人", trigger: ["change", "blur"] }],
   buyContactNumber: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
   productName: [{ required: true, message: "请输入商品名称", trigger: "blur" }],
@@ -688,34 +688,34 @@ const changeTemplate = (val) => {
         proxy.post("/customizeArea/list", { parentId: "0" }).then((resCountry) => {
           let sellCountryData = resCountry.filter((item) => item.id === res.countryId);
           if (sellCountryData && sellCountryData.length > 0) {
-            formData.data.sellCountryId = sellCountryData[0].chineseName;
+            formData.data.sellCountryName = sellCountryData[0].chineseName;
           } else {
-            formData.data.sellCountryId = "";
+            formData.data.sellCountryName = "";
           }
         });
         if (res.countryId) {
           proxy.post("/customizeArea/list", { parentId: res.countryId }).then((resProvince) => {
             let sellProvinceData = resProvince.filter((item) => item.id === res.provinceId);
             if (sellProvinceData && sellProvinceData.length > 0) {
-              formData.data.sellProvinceId = sellProvinceData[0].name;
+              formData.data.sellProvinceName = sellProvinceData[0].name;
             } else {
-              formData.data.sellProvinceId = "";
+              formData.data.sellProvinceName = "";
             }
           });
         } else {
-          formData.data.sellProvinceId = "";
+          formData.data.sellProvinceName = "";
         }
         if (res.provinceId) {
           proxy.post("/customizeArea/list", { parentId: res.provinceId }).then((resCity) => {
             let sellCityData = resCity.filter((item) => item.id === res.cityId);
             if (sellCityData && sellCityData.length > 0) {
-              formData.data.sellCityId = sellCityData[0].name;
+              formData.data.sellCityName = sellCityData[0].name;
             } else {
-              formData.data.sellCityId = "";
+              formData.data.sellCityName = "";
             }
           });
         } else {
-          formData.data.sellCityId = "";
+          formData.data.sellCityName = "";
         }
         formData.data.sellCorporationId = res.corporationId;
         formData.data.sellContactName = res.contactName;
@@ -727,9 +727,9 @@ const changeTemplate = (val) => {
         formData.data.sellCorporationId = "";
         formData.data.sellContactName = "";
         formData.data.sellContactNumber = "";
-        formData.data.sellCountryId = "";
-        formData.data.sellProvinceId = "";
-        formData.data.sellCityId = "";
+        formData.data.sellCountryName = "";
+        formData.data.sellProvinceName = "";
+        formData.data.sellCityName = "";
         formData.data.sellAddress = "";
       }
     );
@@ -737,9 +737,9 @@ const changeTemplate = (val) => {
     formData.data.sellCorporationId = "";
     formData.data.sellContactName = "";
     formData.data.sellContactNumber = "";
-    formData.data.sellCountryId = "";
-    formData.data.sellProvinceId = "";
-    formData.data.sellCityId = "";
+    formData.data.sellCountryName = "";
+    formData.data.sellProvinceName = "";
+    formData.data.sellCityName = "";
     formData.data.sellAddress = "";
   }
 };
@@ -748,15 +748,15 @@ const getCityData = (id, type, isChange) => {
     if (type === "20") {
       provinceData.value = res;
       if (isChange) {
-        formData.data.buyProvinceId = "";
+        formData.data.provinceId = "";
         formData.data.provinceName = "";
-        formData.data.buyCityId = "";
+        formData.data.cityId = "";
         formData.data.cityName = "";
       }
     } else if (type === "30") {
       cityData.value = res;
       if (isChange) {
-        formData.data.buyCityId = "";
+        formData.data.cityId = "";
         formData.data.cityName = "";
       }
     } else {
@@ -787,27 +787,27 @@ const changeCustomer = (val) => {
             };
           });
         }
-        formData.data.buyCountryId = res.countryId;
-        formData.data.buyProvinceId = res.provinceId;
-        formData.data.buyCityId = res.cityId;
+        formData.data.countryId = res.countryId;
+        formData.data.provinceId = res.provinceId;
+        formData.data.cityId = res.cityId;
         formData.data.buyPostalCode = res.zipCode;
         formData.data.buyAddress = res.address;
-        getCityData(formData.data.buyCountryId, "20");
-        getCityData(formData.data.buyProvinceId, "30");
+        getCityData(formData.data.countryId, "20");
+        getCityData(formData.data.provinceId, "30");
       },
       (err) => {
         console.log(err);
-        formData.data.buyCountryId = "";
-        formData.data.buyProvinceId = "";
-        formData.data.buyCityId = "";
+        formData.data.countryId = "";
+        formData.data.provinceId = "";
+        formData.data.cityId = "";
         formData.data.buyPostalCode = "";
         formData.data.buyAddress = "";
       }
     );
   } else {
-    formData.data.buyCountryId = "";
-    formData.data.buyProvinceId = "";
-    formData.data.buyCityId = "";
+    formData.data.countryId = "";
+    formData.data.provinceId = "";
+    formData.data.cityId = "";
     formData.data.buyPostalCode = "";
     formData.data.buyAddress = "";
   }

+ 41 - 41
src/components/process/EHSD/PriceSheet.vue

@@ -10,18 +10,18 @@
           </el-form-item>
           <el-row style="margin-top: 20px; width: 100%">
             <el-col :span="8">
-              <el-form-item label="地址" prop="sellCountryId">
-                <el-input v-model="formData.data.sellCountryId" placeholder="请输入国家" />
+              <el-form-item label="地址" prop="sellCountryName">
+                <el-input v-model="formData.data.sellCountryName" placeholder="请输入国家" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label=" " prop="sellProvinceId">
-                <el-input v-model="formData.data.sellProvinceId" placeholder="请输入省/州" />
+              <el-form-item label=" " prop="sellProvinceName">
+                <el-input v-model="formData.data.sellProvinceName" placeholder="请输入省/州" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label=" " prop="sellCityId">
-                <el-input v-model="formData.data.sellCityId" placeholder="请输入城市" />
+              <el-form-item label=" " prop="sellCityName">
+                <el-input v-model="formData.data.sellCityName" placeholder="请输入城市" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -56,8 +56,8 @@
             </el-form-item>
             <el-row style="margin-top: 20px; width: 100%">
               <el-col :span="6">
-                <el-form-item label="地址" prop="buyCountryId">
-                  <el-select v-model="formData.data.buyCountryId" placeholder="国家" filterable allow-create @change="(val) => getCityData(val, '20', true)">
+                <el-form-item label="地址" prop="countryId">
+                  <el-select v-model="formData.data.countryId" 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="buyProvinceId"
+                    addressId="provinceId"
                     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="buyCityId" addressName="cityName" v-model="formData.data" :data="cityData"> </selectCity>
+                  <selectCity placeholder="城市" addressId="cityId" 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" }],
-  buyCountryId: [{ required: true, message: "请选择国家", trigger: "change" }],
+  countryId: [{ required: true, message: "请选择国家", trigger: "change" }],
   buyContactName: [{ required: true, message: "请输入联系人", trigger: ["change", "blur"] }],
   buyContactNumber: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
   productName: [{ required: true, message: "请输入商品名称", trigger: "blur" }],
@@ -538,34 +538,34 @@ const changeTemplate = (val) => {
         proxy.post("/customizeArea/list", { parentId: "0" }).then((resCountry) => {
           let sellCountryData = resCountry.filter((item) => item.id === res.countryId);
           if (sellCountryData && sellCountryData.length > 0) {
-            formData.data.sellCountryId = sellCountryData[0].chineseName;
+            formData.data.sellCountryName = sellCountryData[0].chineseName;
           } else {
-            formData.data.sellCountryId = "";
+            formData.data.sellCountryName = "";
           }
         });
         if (res.countryId) {
           proxy.post("/customizeArea/list", { parentId: res.countryId }).then((resProvince) => {
             let sellProvinceData = resProvince.filter((item) => item.id === res.provinceId);
             if (sellProvinceData && sellProvinceData.length > 0) {
-              formData.data.sellProvinceId = sellProvinceData[0].name;
+              formData.data.sellProvinceName = sellProvinceData[0].name;
             } else {
-              formData.data.sellProvinceId = "";
+              formData.data.sellProvinceName = "";
             }
           });
         } else {
-          formData.data.sellProvinceId = "";
+          formData.data.sellProvinceName = "";
         }
         if (res.provinceId) {
           proxy.post("/customizeArea/list", { parentId: res.provinceId }).then((resCity) => {
             let sellCityData = resCity.filter((item) => item.id === res.cityId);
             if (sellCityData && sellCityData.length > 0) {
-              formData.data.sellCityId = sellCityData[0].name;
+              formData.data.sellCityName = sellCityData[0].name;
             } else {
-              formData.data.sellCityId = "";
+              formData.data.sellCityName = "";
             }
           });
         } else {
-          formData.data.sellCityId = "";
+          formData.data.sellCityName = "";
         }
         formData.data.sellCorporationId = res.corporationId;
         formData.data.sellContactName = res.contactName;
@@ -577,9 +577,9 @@ const changeTemplate = (val) => {
         formData.data.sellCorporationId = "";
         formData.data.sellContactName = "";
         formData.data.sellContactNumber = "";
-        formData.data.sellCountryId = "";
-        formData.data.sellProvinceId = "";
-        formData.data.sellCityId = "";
+        formData.data.sellCountryName = "";
+        formData.data.sellProvinceName = "";
+        formData.data.sellCityName = "";
         formData.data.sellAddress = "";
       }
     );
@@ -587,9 +587,9 @@ const changeTemplate = (val) => {
     formData.data.sellCorporationId = "";
     formData.data.sellContactName = "";
     formData.data.sellContactNumber = "";
-    formData.data.sellCountryId = "";
-    formData.data.sellProvinceId = "";
-    formData.data.sellCityId = "";
+    formData.data.sellCountryName = "";
+    formData.data.sellProvinceName = "";
+    formData.data.sellCityName = "";
     formData.data.sellAddress = "";
   }
 };
@@ -598,15 +598,15 @@ const getCityData = (id, type, isChange) => {
     if (type === "20") {
       provinceData.value = res;
       if (isChange) {
-        formData.data.buyProvinceId = "";
+        formData.data.provinceId = "";
         formData.data.provinceName = "";
-        formData.data.buyCityId = "";
+        formData.data.cityId = "";
         formData.data.cityName = "";
       }
     } else if (type === "30") {
       cityData.value = res;
       if (isChange) {
-        formData.data.buyCityId = "";
+        formData.data.cityId = "";
         formData.data.cityName = "";
       }
     } else {
@@ -637,27 +637,27 @@ const changeCustomer = (val) => {
             };
           });
         }
-        formData.data.buyCountryId = res.countryId;
-        formData.data.buyProvinceId = res.provinceId;
-        formData.data.buyCityId = res.cityId;
+        formData.data.countryId = res.countryId;
+        formData.data.provinceId = res.provinceId;
+        formData.data.cityId = res.cityId;
         formData.data.buyPostalCode = res.zipCode;
         formData.data.buyAddress = res.address;
-        getCityData(formData.data.buyCountryId, "20");
-        getCityData(formData.data.buyProvinceId, "30");
+        getCityData(formData.data.countryId, "20");
+        getCityData(formData.data.provinceId, "30");
       },
       (err) => {
         console.log(err);
-        formData.data.buyCountryId = "";
-        formData.data.buyProvinceId = "";
-        formData.data.buyCityId = "";
+        formData.data.countryId = "";
+        formData.data.provinceId = "";
+        formData.data.cityId = "";
         formData.data.buyPostalCode = "";
         formData.data.buyAddress = "";
       }
     );
   } else {
-    formData.data.buyCountryId = "";
-    formData.data.buyProvinceId = "";
-    formData.data.buyCityId = "";
+    formData.data.countryId = "";
+    formData.data.provinceId = "";
+    formData.data.cityId = "";
     formData.data.buyPostalCode = "";
     formData.data.buyAddress = "";
   }
@@ -866,8 +866,8 @@ onMounted(() => {
       }
       delete formData.data.id;
       delete formData.data.code;
-      getCityData(formData.data.buyCountryId, "20");
-      getCityData(formData.data.buyProvinceId, "30");
+      getCityData(formData.data.countryId, "20");
+      getCityData(formData.data.provinceId, "30");
       if (formData.data.quotationProductList && formData.data.quotationProductList.length > 0) {
         formData.data.quotationProductList = formData.data.quotationProductList.map((item) => {
           delete item.id;

+ 932 - 0
src/components/process/EHSD/Purchase.vue

@@ -0,0 +1,932 @@
+<template>
+  <div style="width: 100%; padding: 0px 15px">
+    <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="submit">
+      <template #seller>
+        <div style="width: 100%">
+          <el-form-item prop="sellCorporationId">
+            <el-select v-model="formData.data.sellCorporationId" style="width: 100%" @change="changeSellCorporation">
+              <el-option v-for="item in corporationList" :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+          <el-row style="margin-top: 20px; width: 100%">
+            <el-col :span="8">
+              <el-form-item label="地址" prop="sellCountryName">
+                <el-input v-model="formData.data.sellCountryName" placeholder="请输入国家" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label=" " prop="sellProvinceName">
+                <el-input v-model="formData.data.sellProvinceName" placeholder="请输入省/州" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label=" " prop="sellCityName">
+                <el-input v-model="formData.data.sellCityName" placeholder="请输入城市" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row style="margin-top: 20px; width: 100%">
+            <el-col :span="24">
+              <el-form-item prop="sellAddress">
+                <el-input v-model="formData.data.sellAddress" type="textarea"> </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row style="margin-top: 20px; width: 100%">
+            <el-col :span="8">
+              <el-form-item label="联系人" prop="sellContactName">
+                <el-input v-model="formData.data.sellContactName" placeholder="请输入联系人" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <el-form-item label=" " prop="sellContactNumber">
+                <el-input v-model="formData.data.sellContactNumber" placeholder="请输入联系人电话" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </template>
+      <template #buyer>
+        <div style="width: 100%">
+          <div style="width: 100%">
+            <el-form-item prop="buyCorporationId">
+              <el-select v-model="formData.data.buyCorporationId" style="width: 100%" @change="changeSupplier">
+                <el-option v-for="item in customerList" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
+            </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-option v-for="item in countryData" :label="item.chineseName" :value="item.id"> </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label=" " prop="provinceName">
+                  <selectCity
+                    placeholder="省/洲"
+                    @change="(val) => getCityData(val, '30', true)"
+                    addressId="provinceId"
+                    addressName="provinceName"
+                    v-model="formData.data"
+                    :data="provinceData">
+                  </selectCity>
+                </el-form-item>
+              </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>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label=" " prop="buyPostalCode">
+                  <el-input v-model="formData.data.buyPostalCode" placeholder="请输入邮编" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row style="margin-top: 20px; width: 100%">
+              <el-col :span="24">
+                <el-form-item prop="buyAddress">
+                  <el-input v-model="formData.data.buyAddress" type="textarea"> </el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row style="margin-top: 20px; width: 100%">
+              <el-col :span="8">
+                <el-form-item label="联系人" prop="buyContactName">
+                  <el-autocomplete
+                    v-model="formData.data.buyContactName"
+                    :fetch-suggestions="querySearchPerson"
+                    clearable
+                    class="inline-input w-50"
+                    placeholder="请输入联系人"
+                    @select="handlePerson">
+                  </el-autocomplete>
+                </el-form-item>
+              </el-col>
+              <el-col :span="16">
+                <el-form-item label=" " prop="buyContactNumber">
+                  <el-input v-model="formData.data.buyContactNumber" placeholder="请输入联系人电话" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+        </div>
+      </template>
+      <template #payment>
+        <div style="width: 100%">
+          <el-row style="margin-top: 20px; width: 100%">
+            <el-col :span="6">
+              <el-form-item label="付款方式" prop="paymentMethod">
+                <el-select v-model="formData.data.paymentMethod" placeholder="请选择付款方式" style="width: 100%">
+                  <el-option v-for="item in fundsPaymentMethod" :key="item.value" :label="item.label" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="发票类型" prop="invoiceType">
+                <el-select v-model="formData.data.invoiceType" placeholder="请选择发票类型" style="width: 100%">
+                  <el-option v-for="item in invoiceType" :key="item.value" :label="item.label" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </template>
+      <template #delivery>
+        <div style="width: 100%">
+          <el-row style="margin-top: 20px; width: 100%">
+            <el-col :span="6">
+              <el-form-item label="交付日期" prop="deliveryTime">
+                <el-date-picker v-model="formData.data.deliveryTime" type="date" placeholder="请选择交付日期" value-format="YYYY-MM-DD" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="质保期 (天)" prop="effective">
+                <el-input-number v-model="formData.data.effective" placeholder="请输入质保期" style="width: 100%" :precision="0" :controls="false" :min="0" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </template>
+      <template #commodity>
+        <div style="width: 100%">
+          <el-table :data="formData.data.contractProductList" style="width: 100%; margin-top: 16px">
+            <el-table-column label="商品图片" width="80">
+              <template #default="{ row }">
+                <div v-if="row.productId">
+                  <img :src="row.fileUrl" class="pic" @click="onPicture(row.fileUrl)" />
+                </div>
+                <div v-else></div>
+              </template>
+            </el-table-column>
+            <el-table-column label="商品名称" min-width="180">
+              <template #default="{ row, $index }">
+                <div style="width: 100%">
+                  <el-form-item
+                    :prop="'contractProductList.' + $index + '.productName'"
+                    :rules="rules.productName"
+                    :inline-message="true"
+                    class="shrinkPadding">
+                    <el-input v-model="row.productName" placeholder="请输入商品名称" />
+                  </el-form-item>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column label="尺寸 cm*cm*cm" width="140">
+              <template #default="{ row, $index }">
+                <div style="width: 100%">
+                  <el-form-item
+                    :prop="'contractProductList.' + $index + '.productModel'"
+                    :rules="rules.productModel"
+                    :inline-message="true"
+                    class="shrinkPadding">
+                    <el-input v-model="row.productModel" placeholder="请输入" />
+                  </el-form-item>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column label="数量" width="130">
+              <template #default="{ row, $index }">
+                <div style="width: 100%">
+                  <el-form-item :prop="'contractProductList.' + $index + '.quantity'" :rules="rules.quantity" :inline-message="true" class="shrinkPadding">
+                    <el-input-number
+                      v-model="row.quantity"
+                      placeholder="请输入"
+                      style="width: 100%"
+                      :precision="0"
+                      :controls="false"
+                      :min="0"
+                      @change="calculationAmount()" />
+                  </el-form-item>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column label="单价" width="140">
+              <template #default="{ row, $index }">
+                <div style="width: 100%">
+                  <el-form-item :prop="'contractProductList.' + $index + '.price'" :rules="rules.price" :inline-message="true" class="shrinkPadding">
+                    <el-input-number
+                      v-model="row.price"
+                      placeholder="请输入"
+                      style="width: 100%"
+                      :precision="2"
+                      :controls="false"
+                      :min="0"
+                      @change="calculationAmount()" />
+                  </el-form-item>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column label="贸易方式" width="140">
+              <template #default="{ row, $index }">
+                <div style="width: 100%">
+                  <el-form-item
+                    :prop="'contractProductList.' + $index + '.tradeMethods'"
+                    :rules="rules.tradeMethods"
+                    :inline-message="true"
+                    class="shrinkPadding">
+                    <el-select v-model="row.tradeMethods" placeholder="请选择" style="width: 100%">
+                      <el-option v-for="item in tradeMethods" :key="item.value" :label="item.label" :value="item.value" />
+                    </el-select>
+                  </el-form-item>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column label="包装方式" width="180">
+              <template #default="{ row, $index }">
+                <div style="width: 100%">
+                  <el-form-item :prop="'contractProductList.' + $index + '.packMethod'" :rules="rules.packMethod" :inline-message="true" class="shrinkPadding">
+                    <el-input v-model="row.packMethod" placeholder="请输入" />
+                  </el-form-item>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="amount" :label="'金额 ( ' + formData.data.currency + ' )'" width="130" />
+            <el-table-column label="操作" width="60" align="center" fixed="right">
+              <template #default="{ row, $index }">
+                <el-button type="primary" link @click="handleRemove($index, row)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+      </template>
+      <template #otherCharge>
+        <div style="width: 100%">
+          <el-button type="primary" @click="clickAdd()">添加行</el-button>
+          <el-table :data="formData.data.contractProjectList" style="width: 100%; margin-top: 16px">
+            <el-table-column label="收费项目" width="220">
+              <template #default="{ row, $index }">
+                <div style="width: 100%">
+                  <el-form-item :prop="'contractProjectList.' + $index + '.payName'" :rules="rules.payName" :inline-message="true">
+                    <el-autocomplete v-model="row.payName" :fetch-suggestions="querySearch" clearable class="inline-input w-50" placeholder="请输入收费项目" />
+                  </el-form-item>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column label="备注">
+              <template #default="{ row, $index }">
+                <div style="width: 100%">
+                  <el-form-item :prop="'contractProjectList.' + $index + '.remark'">
+                    <el-input v-model="row.remark" placeholder="请输入备注" />
+                  </el-form-item>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column :label="'金额 ( ' + formData.data.currency + ' )'" width="130">
+              <template #default="{ row, $index }">
+                <div style="width: 100%">
+                  <el-form-item :prop="'contractProjectList.' + $index + '.amount'" :rules="rules.amount" :inline-message="true" class="shrinkPadding">
+                    <el-input-number
+                      v-model="row.amount"
+                      placeholder="请输入金额"
+                      style="width: 100%"
+                      :precision="2"
+                      :controls="false"
+                      :min="0"
+                      @change="totalAmount()" />
+                  </el-form-item>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" width="60" align="center" fixed="right">
+              <template #default="{ $index }">
+                <el-button type="primary" link @click="handleDelete($index)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+      </template>
+      <template #offerMoney>
+        <div style="width: 100%; display: flex">
+          <div style="width: calc(100% - 190px)"></div>
+          <div style="width: 130px; padding: 0 12px">
+            <el-form-item label="合同总金额" prop="amount" class="shrinkPadding">
+              <el-input v-model="formData.data.amount" placeholder="合同总金额" disabled />
+            </el-form-item>
+          </div>
+        </div>
+      </template>
+      <template #shipment>
+        <div style="width: 100%">
+          <el-table :data="formData.data.contractShipmentList" style="width: 100%; margin-top: 16px">
+            <el-table-column prop="code" label="商品编码" width="120" />
+            <el-table-column prop="productName" label="商品名称" />
+            <el-table-column label="出货日期" width="220">
+              <template #default="{ row, $index }">
+                <div style="width: 100%">
+                  <el-form-item :prop="'contractShipmentList.' + $index + '.shipmentTime'" :rules="rules.shipmentTime" :inline-message="true">
+                    <el-date-picker v-model="row.shipmentTime" type="date" placeholder="请选择出货日期" value-format="YYYY-MM-DD" />
+                  </el-form-item>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column label="数量" width="160">
+              <template #default="{ row, $index }">
+                <div style="width: 100%">
+                  <el-form-item :prop="'contractShipmentList.' + $index + '.quantity'" :inline-message="true">
+                    <el-input-number
+                      v-model="row.quantity"
+                      placeholder="请输入数量"
+                      style="width: 100%"
+                      :precision="0"
+                      :controls="false"
+                      :min="0"
+                      @change="calculationAmount()" />
+                  </el-form-item>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="操作" width="120" fixed="right">
+              <template #default="{ row, $index }">
+                <el-button type="primary" link @click="clickSplit(row)">拆分</el-button>
+                <el-button type="primary" link @click="clickDelete($index)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+      </template>
+    </byForm>
+
+    <el-dialog v-if="openProductCompany" v-model="openProductCompany" title="公司产品库" width="90%" append-to-body>
+      <CompanyProduct :selectStatus="true" @selectProduct="selectProduct"></CompanyProduct>
+    </el-dialog>
+
+    <el-dialog v-if="openProductCustomer" v-model="openProductCustomer" title="客户产品库" width="90%" append-to-body>
+      <CustomerProduct :selectStatus="true" :buyCorporationId="formData.data.buyCorporationId" @selectProduct="selectProduct"></CustomerProduct>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import byForm from "@/components/byForm/index";
+import CompanyProduct from "@/views/EHSD/productLibrary/companyProduct/index";
+import CustomerProduct from "@/views/EHSD/productLibrary/customerProduct/index";
+import { ElMessage } from "element-plus";
+import selectCity from "@/components/selectCity/index.vue";
+
+const { proxy } = getCurrentInstance();
+const invoiceType = ref([]);
+const accountCurrency = ref([]);
+const fundsPaymentMethod = ref([]);
+const tradeMethods = ref([]);
+const shippingMethod = ref([]);
+const templateList = ref([]);
+const corporationList = ref([]);
+const customerList = ref([]);
+const accountList = ref([]);
+const supplierList = ref([]);
+const countryData = ref([]);
+const provinceData = ref([]);
+const cityData = ref([]);
+const customerUserList = ref([]);
+const openProductCompany = ref(false);
+const openProductCustomer = ref(false);
+const activeName = ref("");
+const formData = reactive({
+  data: {
+    currency: "¥",
+    amount: undefined,
+    contractProductList: [],
+    contractProjectList: [],
+    contractShipmentList: [],
+  },
+});
+const submit = ref(null);
+const formOption = reactive({
+  inline: true,
+  labelWidth: 100,
+  itemWidth: 100,
+  rules: [],
+});
+const uploadData = ref({});
+const indicationUploadData = ref({});
+const formConfig = computed(() => {
+  return [
+    {
+      type: "slot",
+      slotName: "seller",
+      label: "卖方信息",
+      itemWidth: 50,
+    },
+    {
+      type: "slot",
+      slotName: "buyer",
+      label: "买方信息",
+      itemWidth: 50,
+    },
+    {
+      type: "slot",
+      slotName: "payment",
+      label: "付款信息",
+    },
+    {
+      type: "slot",
+      slotName: "delivery",
+      label: "交付信息",
+    },
+    {
+      type: "slot",
+      slotName: "commodity",
+      label: "商品信息",
+    },
+    {
+      type: "slot",
+      slotName: "otherCharge",
+      label: "其他收费项目",
+    },
+    {
+      type: "slot",
+      slotName: "offerMoney",
+    },
+    {
+      type: "slot",
+      slotName: "shipment",
+      label: "出货计划",
+    },
+  ];
+});
+const rules = ref({
+  contractTemplateId: [{ required: true, message: "请选择合同模板", trigger: "change" }],
+  buyCorporationId: [{ required: true, message: "请选择公司", trigger: "change" }],
+  countryId: [{ required: true, message: "请选择国家", trigger: "change" }],
+  buyContactName: [{ required: true, message: "请输入联系人", trigger: ["change", "blur"] }],
+  buyContactNumber: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
+  productName: [{ required: true, message: "请输入商品名称", trigger: "blur" }],
+  productModel: [{ required: true, message: "请输入尺寸 cm*cm*cm", trigger: "blur" }],
+  quantity: [{ required: true, message: "请输入数量", trigger: "blur" }],
+  price: [{ required: true, message: "请输入单价", trigger: "blur" }],
+  packMethod: [{ required: true, message: "请输入包装方式", trigger: "blur" }],
+  amount: [{ required: true, message: "请输入金额", trigger: "blur" }],
+  payName: [{ required: true, message: "请输入收费项目", trigger: ["change", "blur"] }],
+  currency: [{ required: true, message: "请选择币种", trigger: "change" }],
+  effective: [{ required: true, message: "请输入质保期", trigger: "blur" }],
+  deliveryTime: [{ required: true, message: "请选择交付日期", trigger: "change" }],
+  paymentMethod: [{ required: true, message: "请选择付款方式", trigger: "change" }],
+  invoiceType: [{ required: true, message: "请选择付款方式", trigger: "change" }],
+  advanceRatio: [{ required: true, message: "请输入预付比例", trigger: "blur" }],
+  shroffAccountId: [{ required: true, message: "请选择收款账号", trigger: "change" }],
+  tradeMethods: [{ required: true, message: "请选择贸易方式", trigger: "change" }],
+  transportMethod: [{ required: true, message: "请选择运输方式", trigger: "change" }],
+  transportRemark: [{ required: true, message: "请输入运输说明", trigger: "blur" }],
+  remark: [{ required: true, message: "请输入付款条件", trigger: "blur" }],
+});
+const getDict = () => {
+  proxy.getDictOne(["invoice_type", "account_currency", "funds_payment_method", "trade_methods", "shipping_method"]).then((res) => {
+    invoiceType.value = res["invoice_type"].map((x) => ({
+      label: x.dictValue,
+      value: x.dictKey,
+    }));
+    accountCurrency.value = res["account_currency"].map((x) => ({
+      label: x.dictValue,
+      value: x.dictKey,
+    }));
+    fundsPaymentMethod.value = res["funds_payment_method"].map((x) => ({
+      label: x.dictValue,
+      value: x.dictKey,
+    }));
+    tradeMethods.value = res["trade_methods"].map((x) => ({
+      label: x.dictValue,
+      value: x.dictKey,
+    }));
+    shippingMethod.value = res["shipping_method"].map((x) => ({
+      label: x.dictValue,
+      value: x.dictKey,
+    }));
+  });
+  proxy.post("/contractTemplate/page", { pageNum: 1, pageSize: 999 }).then((res) => {
+    templateList.value = res.rows.map((item) => {
+      return {
+        ...item,
+        label: item.templateName,
+        value: item.id,
+      };
+    });
+  });
+  proxy.post("/corporation/page", { pageNum: 1, pageSize: 999 }).then((res) => {
+    corporationList.value = res.rows.map((item) => {
+      return {
+        ...item,
+        label: item.name,
+        value: item.id,
+      };
+    });
+  });
+  proxy.post("/customer/page", { pageNum: 1, pageSize: 999 }).then((res) => {
+    customerList.value = res.rows.map((item) => {
+      return {
+        ...item,
+        label: item.name,
+        value: item.id,
+      };
+    });
+  });
+  proxy.post("/accountManagement/page", { pageNum: 1, pageSize: 999 }).then((res) => {
+    accountList.value = res.rows.map((item) => {
+      return {
+        ...item,
+        label: item.alias,
+        value: item.id,
+      };
+    });
+  });
+  proxy.post("/supplierInfo/page", { pageNum: 1, pageSize: 999 }).then((res) => {
+    supplierList.value = res.rows.map((item) => {
+      return {
+        ...item,
+        label: item.name,
+        value: item.id,
+      };
+    });
+  });
+};
+getDict();
+const changeSellCorporation = (val) => {
+  if (val) {
+    proxy.post("/corporation/detail", { id: val }).then(
+      (res) => {
+        proxy.post("/customizeArea/list", { parentId: "0" }).then((resCountry) => {
+          let sellCountryData = resCountry.filter((item) => item.id === res.countryId);
+          if (sellCountryData && sellCountryData.length > 0) {
+            formData.data.sellCountryName = sellCountryData[0].chineseName;
+          } else {
+            formData.data.sellCountryName = "";
+          }
+        });
+        if (res.countryId) {
+          proxy.post("/customizeArea/list", { parentId: res.countryId }).then((resProvince) => {
+            let sellProvinceData = resProvince.filter((item) => item.id === res.provinceId);
+            if (sellProvinceData && sellProvinceData.length > 0) {
+              formData.data.sellProvinceName = sellProvinceData[0].name;
+            } else {
+              formData.data.sellProvinceName = "";
+            }
+          });
+        } else {
+          formData.data.sellProvinceName = "";
+        }
+        if (res.provinceId) {
+          proxy.post("/customizeArea/list", { parentId: res.provinceId }).then((resCity) => {
+            let sellCityData = resCity.filter((item) => item.id === res.cityId);
+            if (sellCityData && sellCityData.length > 0) {
+              formData.data.sellCityName = sellCityData[0].name;
+            } else {
+              formData.data.sellCityName = "";
+            }
+          });
+        } else {
+          formData.data.sellCityName = "";
+        }
+        formData.data.sellAddress = res.address;
+      },
+      (err) => {
+        console.log(err);
+        formData.data.sellCountryName = "";
+        formData.data.sellProvinceName = "";
+        formData.data.sellCityName = "";
+        formData.data.sellAddress = "";
+      }
+    );
+  } else {
+    formData.data.sellCountryName = "";
+    formData.data.sellProvinceName = "";
+    formData.data.sellCityName = "";
+    formData.data.sellAddress = "";
+  }
+};
+const getCityData = (id, type, isChange) => {
+  proxy.post("/customizeArea/list", { parentId: id }).then((res) => {
+    if (type === "20") {
+      provinceData.value = res;
+      if (isChange) {
+        formData.data.provinceId = "";
+        formData.data.provinceName = "";
+        formData.data.cityId = "";
+        formData.data.cityName = "";
+      }
+    } else if (type === "30") {
+      cityData.value = res;
+      if (isChange) {
+        formData.data.cityId = "";
+        formData.data.cityName = "";
+      }
+    } else {
+      countryData.value = res;
+    }
+  });
+};
+getCityData("0");
+const changeSupplier = (val) => {
+  formData.data.contractProductList = [];
+  formData.data.customerName = "";
+  formData.data.customerTel = "";
+  if (val) {
+    proxy.post("/customer/detail", { id: val }).then(
+      (res) => {
+        if (res.customerUserList && res.customerUserList.length > 0) {
+          formData.data.buyContactName = res.customerUserList[0].name;
+          if (res.customerUserList[0].contactJson) {
+            let contactJson = JSON.parse(res.customerUserList[0].contactJson);
+            if (contactJson && contactJson.length > 0) {
+              formData.data.buyContactNumber = contactJson[0].contactNo;
+            }
+          }
+          customerUserList.value = res.customerUserList.map((item) => {
+            return {
+              ...item,
+              value: item.name,
+            };
+          });
+        }
+        formData.data.countryId = res.countryId;
+        formData.data.provinceId = res.provinceId;
+        formData.data.cityId = res.cityId;
+        formData.data.buyPostalCode = res.zipCode;
+        formData.data.buyAddress = res.address;
+        getCityData(formData.data.countryId, "20");
+        getCityData(formData.data.provinceId, "30");
+      },
+      (err) => {
+        console.log(err);
+        formData.data.countryId = "";
+        formData.data.provinceId = "";
+        formData.data.cityId = "";
+        formData.data.buyPostalCode = "";
+        formData.data.buyAddress = "";
+      }
+    );
+  } else {
+    formData.data.countryId = "";
+    formData.data.provinceId = "";
+    formData.data.cityId = "";
+    formData.data.buyPostalCode = "";
+    formData.data.buyAddress = "";
+  }
+};
+const createFilter = (queryString) => {
+  return (restaurant) => {
+    return restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0;
+  };
+};
+const querySearchPerson = (queryString, callback) => {
+  const results = queryString ? customerUserList.value.filter(createFilter(queryString)) : customerUserList.value;
+  callback(results);
+};
+const handlePerson = (item) => {
+  formData.data.customerTel = item.phone;
+};
+const selectProduct = (goods) => {
+  if (goods && goods.id) {
+    let data = formData.data.contractProductList.filter((item) => item.productId === goods.id);
+    if (data && data.length > 0) {
+      return ElMessage("该产品已添加");
+    }
+    let fileUrl = "";
+    if (goods.fileList && goods.fileList.length > 0) {
+      fileUrl = goods.fileList[0].fileUrl;
+    }
+    if (formData.data.contractProductList && formData.data.contractProductList.length > 0) {
+      formData.data.contractProductList.push({
+        fileUrl: fileUrl,
+        productId: goods.id,
+        productName: goods.name,
+        productModel: goods.productLong + "*" + goods.productWide + "*" + goods.productHigh,
+        quantity: undefined,
+        price: undefined,
+        amount: "",
+        tradeMethods: "",
+      });
+    } else {
+      formData.data.contractProductList = [
+        {
+          fileUrl: fileUrl,
+          productId: goods.id,
+          productName: goods.name,
+          productModel: goods.productLong + "*" + goods.productWide + "*" + goods.productHigh,
+          quantity: undefined,
+          price: undefined,
+          amount: "",
+          tradeMethods: "",
+        },
+      ];
+    }
+    formData.data.contractShipmentList.push({
+      code: goods.code,
+      productId: goods.id,
+      productName: goods.name,
+      shipmentTime: "",
+      quantity: undefined,
+    });
+    ElMessage({
+      message: "添加成功!",
+      type: "success",
+    });
+  } else {
+    return ElMessage("选择错误");
+  }
+};
+const onPicture = (path) => {
+  window.open(path, "_blank");
+};
+const handleRemove = async (index, row) => {
+  formData.data.contractShipmentList = formData.data.contractShipmentList.filter((item) => item.productId !== row.productId);
+  await formData.data.contractProductList.splice(index, 1);
+  totalAmount();
+};
+const calculationAmount = () => {
+  nextTick(() => {
+    if (formData.data.contractProductList && formData.data.contractProductList.length > 0) {
+      for (let i = 0; i < formData.data.contractProductList.length; i++) {
+        let money = 0;
+        if (formData.data.contractProductList[i].quantity && formData.data.contractProductList[i].price) {
+          money = parseFloat(Number(formData.data.contractProductList[i].quantity) * Number(formData.data.contractProductList[i].price)).toFixed(2);
+        }
+        formData.data.contractProductList[i].amount = money;
+      }
+    }
+    nextTick(() => {
+      totalAmount();
+    });
+  });
+};
+const totalAmount = () => {
+  let money = 0;
+  if (formData.data.contractProductList && formData.data.contractProductList.length > 0) {
+    for (let i = 0; i < formData.data.contractProductList.length; i++) {
+      if (formData.data.contractProductList[i].amount) {
+        money = parseFloat(Number(money) + Number(formData.data.contractProductList[i].amount)).toFixed(2);
+      }
+    }
+  }
+  if (formData.data.contractProjectList && formData.data.contractProjectList.length > 0) {
+    for (let i = 0; i < formData.data.contractProjectList.length; i++) {
+      if (formData.data.contractProjectList[i].amount) {
+        money = parseFloat(Number(money) + Number(formData.data.contractProjectList[i].amount)).toFixed(2);
+      }
+    }
+  }
+  formData.data.amount = money;
+};
+const clickAdd = () => {
+  if (formData.data.contractProjectList && formData.data.contractProjectList.length > 0) {
+    formData.data.contractProjectList.push({
+      payName: "",
+      amount: undefined,
+      remark: "",
+    });
+  } else {
+    formData.data.contractProjectList = [{ payName: "", amount: undefined, remark: "" }];
+  }
+};
+const handleDelete = async (index) => {
+  await formData.data.contractProjectList.splice(index, 1);
+  totalAmount();
+};
+const querySearch = (queryString, callback) => {
+  proxy.post("/quotationPay/page", { payName: queryString }).then((res) => {
+    if (res.rows && res.rows.length > 0) {
+      res.rows = res.rows.map((item) => {
+        return {
+          ...item,
+          value: item.payName,
+        };
+      });
+      callback(res.rows);
+    } else {
+      callback([]);
+    }
+  });
+};
+const handleSubmit = async () => {
+  let status = await submit.value.handleSubmit(() => {});
+  if (status) {
+    if (!(formData.data.contractProductList && formData.data.contractProductList.length > 0)) {
+      ElMessage("请添加至少一件商品");
+      return false;
+    }
+    if (formData.data.contractShipmentList && formData.data.contractShipmentList.length > 0) {
+      for (let i = 0; i < formData.data.contractProductList.length; i++) {
+        let data = formData.data.contractShipmentList.filter((item) => item.productId === formData.data.contractProductList[i].productId);
+        if (data && data.length > 0) {
+          let quantity = 0;
+          for (let j = 0; j < data.length; j++) {
+            quantity = parseFloat(Number(quantity) + Number(data[j].quantity));
+          }
+          if (quantity > formData.data.contractProductList[i].quantity) {
+            ElMessage("出货数量不能大于商品数量");
+            return false;
+          }
+        }
+      }
+    }
+    return true;
+  } else {
+    setTimeout(() => {
+      const errorDiv = document.getElementsByClassName("is-error");
+      errorDiv[0].scrollIntoView();
+    }, 0);
+  }
+  return status;
+};
+// 接收父组件的传值
+const props = defineProps({
+  queryData: Object,
+});
+const clickCustomerProduct = () => {
+  if (!formData.data.buyCorporationId) {
+    return ElMessage("请先选择客户");
+  }
+  openProductCustomer.value = true;
+};
+// 向父组件暴露
+defineExpose({
+  submitData: formData.data,
+  handleSubmit,
+});
+const changeShroffAccount = (val) => {
+  if (val) {
+    let data = accountList.value.filter((item) => item.value === val);
+    if (data && data.length > 0) {
+      formData.data.beneficiaryName = data[0].beneficiaryName;
+      formData.data.beneficiaryBank = data[0].beneficiaryBank;
+      formData.data.beneficiaryBankAddress = data[0].beneficiaryBankAddress;
+      formData.data.beneficiaryAccountNumber = data[0].beneficiaryAccountNumber;
+      formData.data.swiftCode = data[0].swiftCode;
+      formData.data.beneficiaryAddress = data[0].beneficiaryAddress;
+    }
+  }
+};
+const changeActiveName = () => {
+  if (activeName.value) {
+    activeName.value = "";
+  } else {
+    activeName.value = "1";
+  }
+};
+const uploadFile = async (file) => {
+  const res = await proxy.post("/fileInfo/getSing", { fileName: file.name });
+  uploadData.value = res.uploadBody;
+  file.id = res.id;
+  file.fileName = res.fileName;
+  file.fileUrl = res.fileUrl;
+  file.uploadState = true;
+  return true;
+};
+const indicationUploadFile = async (file) => {
+  const res = await proxy.post("/fileInfo/getSing", { fileName: file.name });
+  indicationUploadData.value = res.uploadBody;
+  file.id = res.id;
+  file.fileName = res.fileName;
+  file.fileUrl = res.fileUrl;
+  file.uploadState = true;
+  return true;
+};
+const handleSuccess = (any, UploadFile) => {
+  UploadFile.raw.uploadState = false;
+};
+const onPreviewFile = (file) => {
+  window.open(file.raw.fileUrl, "_blank");
+};
+const clickSplit = (item) => {
+  formData.data.contractShipmentList.push({
+    code: item.code,
+    productId: item.productId,
+    productName: item.productName,
+    shipmentTime: "",
+    quantity: undefined,
+  });
+};
+const clickDelete = (index) => {
+  formData.data.contractShipmentList.splice(index, 1);
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep(.el-input-number .el-input__inner) {
+  text-align: left;
+}
+.pic {
+  object-fit: contain;
+  width: 50px;
+  height: 50px;
+  cursor: pointer;
+  vertical-align: middle;
+}
+.shrinkPadding {
+  padding-right: 0 !important;
+}
+.hideCollapse {
+  margin-top: -62px;
+  border: 0 !important;
+}
+::v-deep(.el-collapse-item__arrow) {
+  display: none !important;
+}
+::v-deep(.el-collapse-item__wrap) {
+  border: 0 !important;
+}
+::v-deep(.el-collapse-item__header) {
+  border: 0 !important;
+}
+</style>

+ 39 - 39
src/components/process/EHSD/Sample.vue

@@ -10,18 +10,18 @@
           </el-form-item>
           <el-row style="margin-top: 20px; width: 100%">
             <el-col :span="8">
-              <el-form-item label="地址" prop="sellCountryId">
-                <el-input v-model="formData.data.sellCountryId" placeholder="请输入国家" />
+              <el-form-item label="地址" prop="sellCountryName">
+                <el-input v-model="formData.data.sellCountryName" placeholder="请输入国家" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label=" " prop="sellProvinceId">
-                <el-input v-model="formData.data.sellProvinceId" placeholder="请输入省/州" />
+              <el-form-item label=" " prop="sellProvinceName">
+                <el-input v-model="formData.data.sellProvinceName" placeholder="请输入省/州" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label=" " prop="sellCityId">
-                <el-input v-model="formData.data.sellCityId" placeholder="请输入城市" />
+              <el-form-item label=" " prop="sellCityName">
+                <el-input v-model="formData.data.sellCityName" placeholder="请输入城市" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -56,8 +56,8 @@
             </el-form-item>
             <el-row style="margin-top: 20px; width: 100%">
               <el-col :span="6">
-                <el-form-item label="地址" prop="buyCountryId">
-                  <el-select v-model="formData.data.buyCountryId" placeholder="国家" filterable allow-create @change="(val) => getCityData(val, '20', true)">
+                <el-form-item label="地址" prop="countryId">
+                  <el-select v-model="formData.data.countryId" 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="buyProvinceId"
+                    addressId="provinceId"
                     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="buyCityId" addressName="cityName" v-model="formData.data" :data="cityData"> </selectCity>
+                  <selectCity placeholder="城市" addressId="cityId" 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" }],
-  buyCountryId: [{ required: true, message: "请选择国家", trigger: "change" }],
+  countryId: [{ required: true, message: "请选择国家", trigger: "change" }],
   buyContactName: [{ required: true, message: "请输入联系人", trigger: ["change", "blur"] }],
   buyContactNumber: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
   productName: [{ required: true, message: "请输入商品名称", trigger: "blur" }],
@@ -698,34 +698,34 @@ const changeTemplate = (val) => {
         proxy.post("/customizeArea/list", { parentId: "0" }).then((resCountry) => {
           let sellCountryData = resCountry.filter((item) => item.id === res.countryId);
           if (sellCountryData && sellCountryData.length > 0) {
-            formData.data.sellCountryId = sellCountryData[0].chineseName;
+            formData.data.sellCountryName = sellCountryData[0].chineseName;
           } else {
-            formData.data.sellCountryId = "";
+            formData.data.sellCountryName = "";
           }
         });
         if (res.countryId) {
           proxy.post("/customizeArea/list", { parentId: res.countryId }).then((resProvince) => {
             let sellProvinceData = resProvince.filter((item) => item.id === res.provinceId);
             if (sellProvinceData && sellProvinceData.length > 0) {
-              formData.data.sellProvinceId = sellProvinceData[0].name;
+              formData.data.sellProvinceName = sellProvinceData[0].name;
             } else {
-              formData.data.sellProvinceId = "";
+              formData.data.sellProvinceName = "";
             }
           });
         } else {
-          formData.data.sellProvinceId = "";
+          formData.data.sellProvinceName = "";
         }
         if (res.provinceId) {
           proxy.post("/customizeArea/list", { parentId: res.provinceId }).then((resCity) => {
             let sellCityData = resCity.filter((item) => item.id === res.cityId);
             if (sellCityData && sellCityData.length > 0) {
-              formData.data.sellCityId = sellCityData[0].name;
+              formData.data.sellCityName = sellCityData[0].name;
             } else {
-              formData.data.sellCityId = "";
+              formData.data.sellCityName = "";
             }
           });
         } else {
-          formData.data.sellCityId = "";
+          formData.data.sellCityName = "";
         }
         formData.data.sellCorporationId = res.corporationId;
         formData.data.sellContactName = res.contactName;
@@ -737,9 +737,9 @@ const changeTemplate = (val) => {
         formData.data.sellCorporationId = "";
         formData.data.sellContactName = "";
         formData.data.sellContactNumber = "";
-        formData.data.sellCountryId = "";
-        formData.data.sellProvinceId = "";
-        formData.data.sellCityId = "";
+        formData.data.sellCountryName = "";
+        formData.data.sellProvinceName = "";
+        formData.data.sellCityName = "";
         formData.data.sellAddress = "";
       }
     );
@@ -747,9 +747,9 @@ const changeTemplate = (val) => {
     formData.data.sellCorporationId = "";
     formData.data.sellContactName = "";
     formData.data.sellContactNumber = "";
-    formData.data.sellCountryId = "";
-    formData.data.sellProvinceId = "";
-    formData.data.sellCityId = "";
+    formData.data.sellCountryName = "";
+    formData.data.sellProvinceName = "";
+    formData.data.sellCityName = "";
     formData.data.sellAddress = "";
   }
 };
@@ -758,15 +758,15 @@ const getCityData = (id, type, isChange) => {
     if (type === "20") {
       provinceData.value = res;
       if (isChange) {
-        formData.data.buyProvinceId = "";
+        formData.data.provinceId = "";
         formData.data.provinceName = "";
-        formData.data.buyCityId = "";
+        formData.data.cityId = "";
         formData.data.cityName = "";
       }
     } else if (type === "30") {
       cityData.value = res;
       if (isChange) {
-        formData.data.buyCityId = "";
+        formData.data.cityId = "";
         formData.data.cityName = "";
       }
     } else {
@@ -797,27 +797,27 @@ const changeCustomer = (val) => {
             };
           });
         }
-        formData.data.buyCountryId = res.countryId;
-        formData.data.buyProvinceId = res.provinceId;
-        formData.data.buyCityId = res.cityId;
+        formData.data.countryId = res.countryId;
+        formData.data.provinceId = res.provinceId;
+        formData.data.cityId = res.cityId;
         formData.data.buyPostalCode = res.zipCode;
         formData.data.buyAddress = res.address;
-        getCityData(formData.data.buyCountryId, "20");
-        getCityData(formData.data.buyProvinceId, "30");
+        getCityData(formData.data.countryId, "20");
+        getCityData(formData.data.provinceId, "30");
       },
       (err) => {
         console.log(err);
-        formData.data.buyCountryId = "";
-        formData.data.buyProvinceId = "";
-        formData.data.buyCityId = "";
+        formData.data.countryId = "";
+        formData.data.provinceId = "";
+        formData.data.cityId = "";
         formData.data.buyPostalCode = "";
         formData.data.buyAddress = "";
       }
     );
   } else {
-    formData.data.buyCountryId = "";
-    formData.data.buyProvinceId = "";
-    formData.data.buyCityId = "";
+    formData.data.countryId = "";
+    formData.data.provinceId = "";
+    formData.data.cityId = "";
     formData.data.buyPostalCode = "";
     formData.data.buyAddress = "";
   }

+ 41 - 41
src/components/process/PriceSheet.vue

@@ -10,18 +10,18 @@
           </el-form-item>
           <el-row style="margin-top: 20px; width: 100%">
             <el-col :span="8">
-              <el-form-item label="地址" prop="sellCountryId">
-                <el-input v-model="formData.data.sellCountryId" placeholder="请输入国家" />
+              <el-form-item label="地址" prop="sellCountryName">
+                <el-input v-model="formData.data.sellCountryName" placeholder="请输入国家" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label=" " prop="sellProvinceId">
-                <el-input v-model="formData.data.sellProvinceId" placeholder="请输入省/州" />
+              <el-form-item label=" " prop="sellProvinceName">
+                <el-input v-model="formData.data.sellProvinceName" placeholder="请输入省/州" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label=" " prop="sellCityId">
-                <el-input v-model="formData.data.sellCityId" placeholder="请输入城市" />
+              <el-form-item label=" " prop="sellCityName">
+                <el-input v-model="formData.data.sellCityName" placeholder="请输入城市" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -56,8 +56,8 @@
             </el-form-item>
             <el-row style="margin-top: 20px; width: 100%">
               <el-col :span="6">
-                <el-form-item label="地址" prop="buyCountryId">
-                  <el-select v-model="formData.data.buyCountryId" placeholder="国家" filterable allow-create @change="(val) => getCityData(val, '20', true)">
+                <el-form-item label="地址" prop="countryId">
+                  <el-select v-model="formData.data.countryId" 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="buyProvinceId"
+                    addressId="provinceId"
                     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="buyCityId" addressName="cityName" v-model="formData.data" :data="cityData"> </selectCity>
+                  <selectCity placeholder="城市" addressId="cityId" 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" }],
-  buyCountryId: [{ required: true, message: "请选择国家", trigger: "change" }],
+  countryId: [{ required: true, message: "请选择国家", trigger: "change" }],
   buyContactName: [{ required: true, message: "请输入联系人", trigger: ["change", "blur"] }],
   buyContactNumber: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
   productName: [{ required: true, message: "请输入商品名称", trigger: "blur" }],
@@ -484,34 +484,34 @@ const changeTemplate = (val) => {
         proxy.post("/customizeArea/list", { parentId: "0" }).then((resCountry) => {
           let sellCountryData = resCountry.filter((item) => item.id === res.countryId);
           if (sellCountryData && sellCountryData.length > 0) {
-            formData.data.sellCountryId = sellCountryData[0].chineseName;
+            formData.data.sellCountryName = sellCountryData[0].chineseName;
           } else {
-            formData.data.sellCountryId = "";
+            formData.data.sellCountryName = "";
           }
         });
         if (res.countryId) {
           proxy.post("/customizeArea/list", { parentId: res.countryId }).then((resProvince) => {
             let sellProvinceData = resProvince.filter((item) => item.id === res.provinceId);
             if (sellProvinceData && sellProvinceData.length > 0) {
-              formData.data.sellProvinceId = sellProvinceData[0].name;
+              formData.data.sellProvinceName = sellProvinceData[0].name;
             } else {
-              formData.data.sellProvinceId = "";
+              formData.data.sellProvinceName = "";
             }
           });
         } else {
-          formData.data.sellProvinceId = "";
+          formData.data.sellProvinceName = "";
         }
         if (res.provinceId) {
           proxy.post("/customizeArea/list", { parentId: res.provinceId }).then((resCity) => {
             let sellCityData = resCity.filter((item) => item.id === res.cityId);
             if (sellCityData && sellCityData.length > 0) {
-              formData.data.sellCityId = sellCityData[0].name;
+              formData.data.sellCityName = sellCityData[0].name;
             } else {
-              formData.data.sellCityId = "";
+              formData.data.sellCityName = "";
             }
           });
         } else {
-          formData.data.sellCityId = "";
+          formData.data.sellCityName = "";
         }
         formData.data.sellCorporationId = res.corporationId;
         formData.data.sellContactName = res.contactName;
@@ -523,9 +523,9 @@ const changeTemplate = (val) => {
         formData.data.sellCorporationId = "";
         formData.data.sellContactName = "";
         formData.data.sellContactNumber = "";
-        formData.data.sellCountryId = "";
-        formData.data.sellProvinceId = "";
-        formData.data.sellCityId = "";
+        formData.data.sellCountryName = "";
+        formData.data.sellProvinceName = "";
+        formData.data.sellCityName = "";
         formData.data.sellAddress = "";
       }
     );
@@ -533,9 +533,9 @@ const changeTemplate = (val) => {
     formData.data.sellCorporationId = "";
     formData.data.sellContactName = "";
     formData.data.sellContactNumber = "";
-    formData.data.sellCountryId = "";
-    formData.data.sellProvinceId = "";
-    formData.data.sellCityId = "";
+    formData.data.sellCountryName = "";
+    formData.data.sellProvinceName = "";
+    formData.data.sellCityName = "";
     formData.data.sellAddress = "";
   }
 };
@@ -544,15 +544,15 @@ const getCityData = (id, type, isChange) => {
     if (type === "20") {
       provinceData.value = res;
       if (isChange) {
-        formData.data.buyProvinceId = "";
+        formData.data.provinceId = "";
         formData.data.provinceName = "";
-        formData.data.buyCityId = "";
+        formData.data.cityId = "";
         formData.data.cityName = "";
       }
     } else if (type === "30") {
       cityData.value = res;
       if (isChange) {
-        formData.data.buyCityId = "";
+        formData.data.cityId = "";
         formData.data.cityName = "";
       }
     } else {
@@ -582,27 +582,27 @@ const changeCustomer = (val) => {
             };
           });
         }
-        formData.data.buyCountryId = res.countryId;
-        formData.data.buyProvinceId = res.provinceId;
-        formData.data.buyCityId = res.cityId;
+        formData.data.countryId = res.countryId;
+        formData.data.provinceId = res.provinceId;
+        formData.data.cityId = res.cityId;
         formData.data.buyPostalCode = res.zipCode;
         formData.data.buyAddress = res.address;
-        getCityData(formData.data.buyCountryId, "20");
-        getCityData(formData.data.buyProvinceId, "30");
+        getCityData(formData.data.countryId, "20");
+        getCityData(formData.data.provinceId, "30");
       },
       (err) => {
         console.log(err);
-        formData.data.buyCountryId = "";
-        formData.data.buyProvinceId = "";
-        formData.data.buyCityId = "";
+        formData.data.countryId = "";
+        formData.data.provinceId = "";
+        formData.data.cityId = "";
         formData.data.buyPostalCode = "";
         formData.data.buyAddress = "";
       }
     );
   } else {
-    formData.data.buyCountryId = "";
-    formData.data.buyProvinceId = "";
-    formData.data.buyCityId = "";
+    formData.data.countryId = "";
+    formData.data.provinceId = "";
+    formData.data.cityId = "";
     formData.data.buyPostalCode = "";
     formData.data.buyAddress = "";
   }
@@ -764,8 +764,8 @@ onMounted(() => {
       }
       delete formData.data.id;
       delete formData.data.code;
-      getCityData(formData.data.buyCountryId, "20");
-      getCityData(formData.data.buyProvinceId, "30");
+      getCityData(formData.data.countryId, "20");
+      getCityData(formData.data.provinceId, "30");
       if (formData.data.quotationProductList && formData.data.quotationProductList.length > 0) {
         formData.data.quotationProductList = formData.data.quotationProductList.map((item) => {
           delete item.id;

+ 39 - 39
src/components/process/ServiceContract.vue

@@ -10,18 +10,18 @@
           </el-form-item>
           <el-row style="margin-top: 20px; width: 100%">
             <el-col :span="8">
-              <el-form-item label="地址" prop="sellCountryId">
-                <el-input v-model="formData.data.sellCountryId" placeholder="请输入国家" />
+              <el-form-item label="地址" prop="sellCountryName">
+                <el-input v-model="formData.data.sellCountryName" placeholder="请输入国家" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label=" " prop="sellProvinceId">
-                <el-input v-model="formData.data.sellProvinceId" placeholder="请输入省/州" />
+              <el-form-item label=" " prop="sellProvinceName">
+                <el-input v-model="formData.data.sellProvinceName" placeholder="请输入省/州" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label=" " prop="sellCityId">
-                <el-input v-model="formData.data.sellCityId" placeholder="请输入城市" />
+              <el-form-item label=" " prop="sellCityName">
+                <el-input v-model="formData.data.sellCityName" placeholder="请输入城市" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -56,8 +56,8 @@
             </el-form-item>
             <el-row style="margin-top: 20px; width: 100%">
               <el-col :span="6">
-                <el-form-item label="地址" prop="buyCountryId">
-                  <el-select v-model="formData.data.buyCountryId" placeholder="国家" filterable allow-create @change="(val) => getCityData(val, '20', true)">
+                <el-form-item label="地址" prop="countryId">
+                  <el-select v-model="formData.data.countryId" 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="buyProvinceId"
+                    addressId="provinceId"
                     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="buyCityId" addressName="cityName" v-model="formData.data" :data="cityData"> </selectCity>
+                  <selectCity placeholder="城市" addressId="cityId" 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" }],
-  buyCountryId: [{ required: true, message: "请选择国家", trigger: "change" }],
+  countryId: [{ required: true, message: "请选择国家", trigger: "change" }],
   buyContactName: [{ required: true, message: "请输入联系人", trigger: ["change", "blur"] }],
   buyContactNumber: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
   productName: [{ required: true, message: "请输入商品名称", trigger: "blur" }],
@@ -475,34 +475,34 @@ const changeTemplate = (val) => {
         proxy.post("/customizeArea/list", { parentId: "0" }).then((resCountry) => {
           let sellCountryData = resCountry.filter((item) => item.id === res.countryId);
           if (sellCountryData && sellCountryData.length > 0) {
-            formData.data.sellCountryId = sellCountryData[0].chineseName;
+            formData.data.sellCountryName = sellCountryData[0].chineseName;
           } else {
-            formData.data.sellCountryId = "";
+            formData.data.sellCountryName = "";
           }
         });
         if (res.countryId) {
           proxy.post("/customizeArea/list", { parentId: res.countryId }).then((resProvince) => {
             let sellProvinceData = resProvince.filter((item) => item.id === res.provinceId);
             if (sellProvinceData && sellProvinceData.length > 0) {
-              formData.data.sellProvinceId = sellProvinceData[0].name;
+              formData.data.sellProvinceName = sellProvinceData[0].name;
             } else {
-              formData.data.sellProvinceId = "";
+              formData.data.sellProvinceName = "";
             }
           });
         } else {
-          formData.data.sellProvinceId = "";
+          formData.data.sellProvinceName = "";
         }
         if (res.provinceId) {
           proxy.post("/customizeArea/list", { parentId: res.provinceId }).then((resCity) => {
             let sellCityData = resCity.filter((item) => item.id === res.cityId);
             if (sellCityData && sellCityData.length > 0) {
-              formData.data.sellCityId = sellCityData[0].name;
+              formData.data.sellCityName = sellCityData[0].name;
             } else {
-              formData.data.sellCityId = "";
+              formData.data.sellCityName = "";
             }
           });
         } else {
-          formData.data.sellCityId = "";
+          formData.data.sellCityName = "";
         }
         formData.data.sellCorporationId = res.corporationId;
         formData.data.sellContactName = res.contactName;
@@ -514,9 +514,9 @@ const changeTemplate = (val) => {
         formData.data.sellCorporationId = "";
         formData.data.sellContactName = "";
         formData.data.sellContactNumber = "";
-        formData.data.sellCountryId = "";
-        formData.data.sellProvinceId = "";
-        formData.data.sellCityId = "";
+        formData.data.sellCountryName = "";
+        formData.data.sellProvinceName = "";
+        formData.data.sellCityName = "";
         formData.data.sellAddress = "";
       }
     );
@@ -524,9 +524,9 @@ const changeTemplate = (val) => {
     formData.data.sellCorporationId = "";
     formData.data.sellContactName = "";
     formData.data.sellContactNumber = "";
-    formData.data.sellCountryId = "";
-    formData.data.sellProvinceId = "";
-    formData.data.sellCityId = "";
+    formData.data.sellCountryName = "";
+    formData.data.sellProvinceName = "";
+    formData.data.sellCityName = "";
     formData.data.sellAddress = "";
   }
 };
@@ -535,15 +535,15 @@ const getCityData = (id, type, isChange) => {
     if (type === "20") {
       provinceData.value = res;
       if (isChange) {
-        formData.data.buyProvinceId = "";
+        formData.data.provinceId = "";
         formData.data.provinceName = "";
-        formData.data.buyCityId = "";
+        formData.data.cityId = "";
         formData.data.cityName = "";
       }
     } else if (type === "30") {
       cityData.value = res;
       if (isChange) {
-        formData.data.buyCityId = "";
+        formData.data.cityId = "";
         formData.data.cityName = "";
       }
     } else {
@@ -573,27 +573,27 @@ const changeCustomer = (val) => {
             };
           });
         }
-        formData.data.buyCountryId = res.countryId;
-        formData.data.buyProvinceId = res.provinceId;
-        formData.data.buyCityId = res.cityId;
+        formData.data.countryId = res.countryId;
+        formData.data.provinceId = res.provinceId;
+        formData.data.cityId = res.cityId;
         formData.data.buyPostalCode = res.zipCode;
         formData.data.buyAddress = res.address;
-        getCityData(formData.data.buyCountryId, "20");
-        getCityData(formData.data.buyProvinceId, "30");
+        getCityData(formData.data.countryId, "20");
+        getCityData(formData.data.provinceId, "30");
       },
       (err) => {
         console.log(err);
-        formData.data.buyCountryId = "";
-        formData.data.buyProvinceId = "";
-        formData.data.buyCityId = "";
+        formData.data.countryId = "";
+        formData.data.provinceId = "";
+        formData.data.cityId = "";
         formData.data.buyPostalCode = "";
         formData.data.buyAddress = "";
       }
     );
   } else {
-    formData.data.buyCountryId = "";
-    formData.data.buyProvinceId = "";
-    formData.data.buyCityId = "";
+    formData.data.countryId = "";
+    formData.data.provinceId = "";
+    formData.data.cityId = "";
     formData.data.buyPostalCode = "";
     formData.data.buyAddress = "";
   }

+ 22 - 11
src/views/EHSD/procurement/handoverSlipEHSD/index.vue

@@ -207,17 +207,28 @@ const getList = async (req) => {
   });
 };
 getList();
-const clickPurchase = (item) => {
-  console.log(item, selectData.value);
-  // proxy.$router.replace({
-  //   path: "/platform_manage/process/processApproval",
-  //   query: {
-  //     flowKey: "contract_flow",
-  //     flowName: "销售合同审批流程",
-  //     random: proxy.random(),
-  //     tenantType: "EHSD",
-  //   },
-  // });
+const clickPurchase = (row) => {
+  let ids = "";
+  if (row && row.id) {
+    ids = row.id;
+  } else {
+    ids = selectData.value
+      .map((item) => {
+        return item.id;
+      })
+      .join(",");
+  }
+  proxy.$router.replace({
+    path: "/platform_manage/process/processApproval",
+    query: {
+      flowKey: "ehsd_purchase_flow",
+      flowName: "销售合同采购审批",
+      random: proxy.random(),
+      tenantType: "EHSD",
+      ids: ids,
+      type: 0,
+    },
+  });
 };
 const selectData = ref([]);
 const selectRow = (data) => {

+ 22 - 11
src/views/EHSD/procurement/handoverSlipSampleEHSD/index.vue

@@ -207,17 +207,28 @@ const getList = async (req) => {
   });
 };
 getList();
-const clickPurchase = (item) => {
-  console.log(item, selectData.value);
-  // proxy.$router.replace({
-  //   path: "/platform_manage/process/processApproval",
-  //   query: {
-  //     flowKey: "contract_flow",
-  //     flowName: "销售合同审批流程",
-  //     random: proxy.random(),
-  //     tenantType: "EHSD",
-  //   },
-  // });
+const clickPurchase = (row) => {
+  let ids = "";
+  if (row && row.id) {
+    ids = row.id;
+  } else {
+    ids = selectData.value
+      .map((item) => {
+        return item.id;
+      })
+      .join(",");
+  }
+  proxy.$router.replace({
+    path: "/platform_manage/process/processApproval",
+    query: {
+      flowKey: "ehsd_purchase_flow",
+      flowName: "样品单采购申请",
+      random: proxy.random(),
+      tenantType: "EHSD",
+      ids: ids,
+      type: 1,
+    },
+  });
 };
 const selectData = ref([]);
 const selectRow = (data) => {

+ 3 - 3
src/views/EHSD/saleContract/priceSheetEHSD/index.vue

@@ -35,7 +35,7 @@
           {{ getLabel(printDetails.sellCorporationId, corporationList, "nameEn") }}
         </div>
         <div style="text-align: center">
-          {{ printDetails.sellCountryId }},{{ printDetails.sellProvinceId }},{{ printDetails.sellCityId }},{{ printDetails.sellAddress }}
+          {{ printDetails.sellCountryName }},{{ printDetails.sellProvinceName }},{{ printDetails.sellCityName }},{{ printDetails.sellAddress }}
         </div>
         <div style="font-size: 14px; color: #409eff; text-align: center; padding-top: 16px">QUOTATION</div>
         <div style="padding-top: 8px">
@@ -52,7 +52,7 @@
               {{ getLabel(printDetails.sellCorporationId, corporationList, "nameEn") }}
             </div>
             <div style="padding: 16px 0">
-              {{ printDetails.sellCountryId }},{{ printDetails.sellProvinceId }},{{ printDetails.sellCityId }},{{ printDetails.sellAddress }}
+              {{ printDetails.sellCountryName }},{{ printDetails.sellProvinceName }},{{ printDetails.sellCityName }},{{ printDetails.sellAddress }}
             </div>
             <div>{{ printDetails.sellContactName }},{{ printDetails.sellContactNumber }}</div>
           </div>
@@ -72,7 +72,7 @@
           <div style="display: flex; width: 100%">
             <div style="width: 33%; border-bottom: 1px solid black; border-right: 1px solid black">
               <div style="color: #409eff">COUNTRY OF ORIGIN:</div>
-              <div>{{ printDetails.sellCountryId }}</div>
+              <div>{{ printDetails.sellCountryName }}</div>
             </div>
             <div style="width: 34%; border-bottom: 1px solid black; border-right: 1px solid black">
               <div style="color: #409eff">COUNTRY OF DESTINATION:</div>

+ 3 - 3
src/views/salesMange/saleContract/priceSheet/index.vue

@@ -35,7 +35,7 @@
           {{ getLabel(printDetails.sellCorporationId, corporationList, "nameEn") }}
         </div>
         <div style="text-align: center">
-          {{ printDetails.sellCountryId }},{{ printDetails.sellProvinceId }},{{ printDetails.sellCityId }},{{ printDetails.sellAddress }}
+          {{ printDetails.sellCountryName }},{{ printDetails.sellProvinceName }},{{ printDetails.sellCityName }},{{ printDetails.sellAddress }}
         </div>
         <div style="font-size: 14px; color: #409eff; text-align: center; padding-top: 16px">QUOTATION</div>
         <div style="padding-top: 8px">
@@ -52,7 +52,7 @@
               {{ getLabel(printDetails.sellCorporationId, corporationList, "nameEn") }}
             </div>
             <div style="padding: 16px 0">
-              {{ printDetails.sellCountryId }},{{ printDetails.sellProvinceId }},{{ printDetails.sellCityId }},{{ printDetails.sellAddress }}
+              {{ printDetails.sellCountryName }},{{ printDetails.sellProvinceName }},{{ printDetails.sellCityName }},{{ printDetails.sellAddress }}
             </div>
             <div>{{ printDetails.sellContactName }},{{ printDetails.sellContactNumber }}</div>
           </div>
@@ -72,7 +72,7 @@
           <div style="display: flex; width: 100%">
             <div style="width: 33%; border-bottom: 1px solid black; border-right: 1px solid black">
               <div style="color: #409eff">COUNTRY OF ORIGIN:</div>
-              <div>{{ printDetails.sellCountryId }}</div>
+              <div>{{ printDetails.sellCountryName }}</div>
             </div>
             <div style="width: 34%; border-bottom: 1px solid black; border-right: 1px solid black">
               <div style="color: #409eff">COUNTRY OF DESTINATION:</div>

+ 4 - 4
src/views/salesMange/shipmentMange/document/index.vue

@@ -169,7 +169,7 @@
             <div>{{ printDetails.corporation.name }}</div>
             <div>{{ printDetails.corporation.nameEn }}</div>
             <div style="padding: 16px 0">
-              {{ printDetails.contract.sellCountryId }},{{ printDetails.contract.sellProvinceId }},{{ printDetails.contract.sellCityId }},{{
+              {{ printDetails.contract.sellCountryName }},{{ printDetails.contract.sellProvinceName }},{{ printDetails.contract.sellCityName }},{{
                 printDetails.contract.sellAddress
               }}
             </div>
@@ -183,7 +183,7 @@
             <div>{{ printDetails.corporation.name }}</div>
             <div>{{ printDetails.corporation.nameEn }}</div>
             <div style="padding: 16px 0">
-              {{ printDetails.contract.sellCountryId }},{{ printDetails.contract.sellProvinceId }},{{ printDetails.contract.sellCityId }},{{
+              {{ printDetails.contract.sellCountryName }},{{ printDetails.contract.sellProvinceName }},{{ printDetails.contract.sellCityName }},{{
                 printDetails.contract.sellAddress
               }}
             </div>
@@ -207,7 +207,7 @@
           <div style="display: flex; width: 100%">
             <div style="width: 33%; border-bottom: 1px solid black; border-right: 1px solid black; padding-left: 4px">
               <div style="font-weight: 700">原产国 COUNTRY OF ORIGIN:</div>
-              <div>{{ printDetails.contract.sellCountryId }}</div>
+              <div>{{ printDetails.contract.sellCountryName }}</div>
             </div>
             <div style="width: 34%; border-bottom: 1px solid black; border-right: 1px solid black; padding-left: 4px">
               <div style="font-weight: 700">目的国 COUNTRY OF DESTINATION:</div>
@@ -253,7 +253,7 @@
           <div style="display: flex; width: 100%">
             <div style="width: 33%; border-bottom: 1px solid black; border-right: 1px solid black; padding-left: 4px">
               <div style="font-weight: 700">COUNTRY OF ORIGIN:</div>
-              <div>{{ printDetails.contract.sellCountryId }}</div>
+              <div>{{ printDetails.contract.sellCountryName }}</div>
             </div>
             <div style="width: 34%; border-bottom: 1px solid black; border-right: 1px solid black; padding-left: 4px">
               <div style="font-weight: 700">COUNTRY OF DESTINATION:</div>