22056987 by lxs

Merge branch 'develop' into release-test

2 parents b0e4dec8 f5d41ca9
...@@ -241,7 +241,7 @@ const setBaseFormItemsValue = (info) => { ...@@ -241,7 +241,7 @@ const setBaseFormItemsValue = (info) => {
241 item.inputOptions.visible = false; 241 item.inputOptions.visible = false;
242 } 242 }
243 } else if (item.field == 'updateFrequency') { 243 } else if (item.field == 'updateFrequency') {
244 item.default = info[item.field] || ''; 244 item.default = Array.isArray(info[item.field]) ? info[item.field][0] : (info[item.field] || []);
245 } else if (item.field == 'ownIndustry') { 245 } else if (item.field == 'ownIndustry') {
246 item.default = Array.isArray(info[item.field]) ? info[item.field][0] : (info[item.field] || []); 246 item.default = Array.isArray(info[item.field]) ? info[item.field][0] : (info[item.field] || []);
247 item.inputOptions.default = info['ownIndustryOther']; 247 item.inputOptions.default = info['ownIndustryOther'];
...@@ -1721,6 +1721,7 @@ const saveDraft = () => { ...@@ -1721,6 +1721,7 @@ const saveDraft = () => {
1721 } else if (!params.coverageArea) { 1721 } else if (!params.coverageArea) {
1722 params.coverageArea = params.coverageAreas; 1722 params.coverageArea = params.coverageAreas;
1723 } 1723 }
1724 params.updateFrequency = [baseFormInline.updateFrequency];
1724 let propertyFormLine = porpertyInfoFormRef.value.formInline; 1725 let propertyFormLine = porpertyInfoFormRef.value.formInline;
1725 Object.assign(params, propertyFormLine); 1726 Object.assign(params, propertyFormLine);
1726 delete params.qualityEvaluationInstitutionGuid; 1727 delete params.qualityEvaluationInstitutionGuid;
...@@ -1833,6 +1834,7 @@ const save = () => { ...@@ -1833,6 +1834,7 @@ const save = () => {
1833 } else if (!params.coverageArea) { 1834 } else if (!params.coverageArea) {
1834 params.coverageArea = params.coverageAreas; 1835 params.coverageArea = params.coverageAreas;
1835 } 1836 }
1837 params.updateFrequency = [baseFormInline.updateFrequency];
1836 let propertyFormLine = porpertyInfoFormRef.value.formInline; 1838 let propertyFormLine = porpertyInfoFormRef.value.formInline;
1837 Object.assign(params, propertyFormLine); 1839 Object.assign(params, propertyFormLine);
1838 delete params.qualityEvaluationInstitutionGuid; 1840 delete params.qualityEvaluationInstitutionGuid;
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!