|
@@ -262,16 +262,19 @@ export default {
|
|
form.flow = this.flowList.find(
|
|
form.flow = this.flowList.find(
|
|
(item) => item.id == this.currentProject.flow_id
|
|
(item) => item.id == this.currentProject.flow_id
|
|
);
|
|
);
|
|
- if (current.type.id != 7) {
|
|
|
|
|
|
+ if (current.type_id != 7) {
|
|
form.industry = this.industryList.find(
|
|
form.industry = this.industryList.find(
|
|
(item) => item.id == this.currentProject.industry_id
|
|
(item) => item.id == this.currentProject.industry_id
|
|
);
|
|
);
|
|
- form.location = current.location;
|
|
|
|
|
|
+ form.location = {
|
|
|
|
+ name: current.location,
|
|
|
|
+ code: current.location_code,
|
|
|
|
+ };
|
|
form.name = current.name;
|
|
form.name = current.name;
|
|
form.version = current.version;
|
|
form.version = current.version;
|
|
code.type = form.type.code;
|
|
code.type = form.type.code;
|
|
code.industry = form.industry.code;
|
|
code.industry = form.industry.code;
|
|
- code.location = form.location;
|
|
|
|
|
|
+ code.location = form.location.code;
|
|
code.name = form.name;
|
|
code.name = form.name;
|
|
code.version = form.version;
|
|
code.version = form.version;
|
|
}
|
|
}
|
|
@@ -325,10 +328,10 @@ export default {
|
|
let location = provinces[multiIndex[0]].children
|
|
let location = provinces[multiIndex[0]].children
|
|
? provinces[multiIndex[0]].children[multiIndex[1]]
|
|
? provinces[multiIndex[0]].children[multiIndex[1]]
|
|
: provinces[multiIndex[0]];
|
|
: provinces[multiIndex[0]];
|
|
- let code =
|
|
|
|
|
|
+ location.code =
|
|
location.code.length == 4 ? location.code.substr(1) : location.code;
|
|
location.code.length == 4 ? location.code.substr(1) : location.code;
|
|
this.formData.location = location;
|
|
this.formData.location = location;
|
|
- this.formData.code.location = code;
|
|
|
|
|
|
+ this.formData.code.location = location.code;
|
|
},
|
|
},
|
|
},
|
|
},
|
|
};
|
|
};
|