|
@@ -50,7 +50,7 @@
|
|
|
<div style="width: 100%">
|
|
|
<div style="width: 100%">
|
|
|
<el-form-item prop="buyCorporationId">
|
|
|
- <el-select v-model="formData.data.buyCorporationId" style="width: 100%" @change="changeCustomer">
|
|
|
+ <el-select v-model="formData.data.buyCorporationId" filterable style="width: 100%" @change="changeCustomer">
|
|
|
<el-option v-for="item in customerList" :key="item.value" :label="item.label" :value="item.value" />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
@@ -701,15 +701,30 @@ const changeTemplate = (val) => {
|
|
|
formData.data.sellCorporationId = res.corporationId;
|
|
|
if (res.corporationId) {
|
|
|
proxy.post("/corporation/detail", { id: res.corporationId }).then((detailCorporation) => {
|
|
|
- proxy.post("/customizeArea/list", { parentId: "0" }).then((resCountry) => {
|
|
|
- let sellCountryData = resCountry.filter((item) => item.id === detailCorporation.countryId);
|
|
|
- if (sellCountryData && sellCountryData.length > 0) {
|
|
|
- formData.data.sellCountryName = sellCountryData[0].chineseName;
|
|
|
- } else {
|
|
|
- formData.data.sellCountryName = "";
|
|
|
- }
|
|
|
- });
|
|
|
- if (detailCorporation.countryId) {
|
|
|
+ if (detailCorporation.countryEnStr) {
|
|
|
+ formData.data.sellCountryName = detailCorporation.countryEnStr;
|
|
|
+ }
|
|
|
+ if (res.provinceEnStr) {
|
|
|
+ formData.data.sellProvinceName = detailCorporation.provinceEnStr;
|
|
|
+ }
|
|
|
+ if (res.cityEnStr) {
|
|
|
+ formData.data.sellCityName = detailCorporation.cityEnStr;
|
|
|
+ }
|
|
|
+ if (detailCorporation.countryEnStr) {
|
|
|
+ formData.data.sellCountryName = detailCorporation.countryEnStr;
|
|
|
+ } else {
|
|
|
+ proxy.post("/customizeArea/list", { parentId: "0" }).then((resCountry) => {
|
|
|
+ let sellCountryData = resCountry.filter((item) => item.id === detailCorporation.countryId);
|
|
|
+ if (sellCountryData && sellCountryData.length > 0) {
|
|
|
+ formData.data.sellCountryName = sellCountryData[0].chineseName;
|
|
|
+ } else {
|
|
|
+ formData.data.sellCountryName = "";
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
+ if (detailCorporation.provinceEnStr) {
|
|
|
+ formData.data.sellProvinceName = detailCorporation.provinceEnStr;
|
|
|
+ } else if (detailCorporation.countryId) {
|
|
|
proxy
|
|
|
.post("/customizeArea/list", {
|
|
|
parentId: detailCorporation.countryId,
|
|
@@ -725,7 +740,10 @@ const changeTemplate = (val) => {
|
|
|
} else {
|
|
|
formData.data.sellProvinceName = "";
|
|
|
}
|
|
|
- if (detailCorporation.provinceId) {
|
|
|
+
|
|
|
+ if (detailCorporation.cityEnStr) {
|
|
|
+ formData.data.sellCityName = detailCorporation.cityEnStr;
|
|
|
+ } else if (detailCorporation.provinceId) {
|
|
|
proxy
|
|
|
.post("/customizeArea/list", {
|
|
|
parentId: detailCorporation.provinceId,
|
|
@@ -741,7 +759,11 @@ const changeTemplate = (val) => {
|
|
|
} else {
|
|
|
formData.data.sellCityName = "";
|
|
|
}
|
|
|
- formData.data.sellAddress = detailCorporation.address;
|
|
|
+ if (detailCorporation.addressEn) {
|
|
|
+ formData.data.sellAddress = detailCorporation.addressEn;
|
|
|
+ } else {
|
|
|
+ formData.data.sellAddress = detailCorporation.address;
|
|
|
+ }
|
|
|
});
|
|
|
}
|
|
|
formData.data.sellContactName = res.contactName;
|