f5d41ca9 by lxs

数据资产登记更新

1 parent e0eee7fe
...@@ -1328,7 +1328,7 @@ const passCommonDialogBtnClick = (btn, info) => { ...@@ -1328,7 +1328,7 @@ const passCommonDialogBtnClick = (btn, info) => {
1328 '--' }}</span> 1328 '--' }}</span>
1329 </div> 1329 </div>
1330 </div> 1330 </div>
1331 <div class="first-col" style="width: 250px;"> 1331 <div class="first-col">
1332 <div class="list_item"> 1332 <div class="list_item">
1333 <span class="item_label">结构化数据:</span> 1333 <span class="item_label">结构化数据:</span>
1334 <span class="item_value">{{ assetDetailInfo.isStructured == 'Y' ? '是' : '否' }}</span> 1334 <span class="item_value">{{ assetDetailInfo.isStructured == 'Y' ? '是' : '否' }}</span>
...@@ -2344,14 +2344,17 @@ const passCommonDialogBtnClick = (btn, info) => { ...@@ -2344,14 +2344,17 @@ const passCommonDialogBtnClick = (btn, info) => {
2344 .info-content { 2344 .info-content {
2345 display: flex; 2345 display: flex;
2346 2346
2347 .first-col { 2347 >div {
2348 width: 310px; 2348 width: 33.33%;
2349 } 2349 }
2350 // .first-col {
2351 // width: 310px;
2352 // }
2350 2353
2351 .last-col { 2354 // .last-col {
2352 flex: 1; 2355 // flex: 1;
2353 min-width: 120px; 2356 // min-width: 120px;
2354 } 2357 // }
2355 } 2358 }
2356 } 2359 }
2357 2360
......
...@@ -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 = info[item.field] || []; 246 item.default = info[item.field] || [];
247 item.inputOptions.default = info['ownIndustryOther']; 247 item.inputOptions.default = info['ownIndustryOther'];
...@@ -972,8 +972,8 @@ const baseFormItems: any = ref([ ...@@ -972,8 +972,8 @@ const baseFormItems: any = ref([
972 type: "checkbox-group-row", 972 type: "checkbox-group-row",
973 placeholder: "", 973 placeholder: "",
974 field: "updateFrequency", 974 field: "updateFrequency",
975 default: [], 975 default: '',
976 children: updateFrequencyListData.value, 976 options: updateFrequencyListData.value,
977 required: true, 977 required: true,
978 block: true, 978 block: true,
979 }, 979 },
...@@ -1082,7 +1082,7 @@ const baseFormRules = ref({ ...@@ -1082,7 +1082,7 @@ const baseFormRules = ref({
1082 { required: true, trigger: 'blur', message: "请填写数据取得方式其他内容" } 1082 { required: true, trigger: 'blur', message: "请填写数据取得方式其他内容" }
1083 ], 1083 ],
1084 updateFrequency: [ 1084 updateFrequency: [
1085 { type: 'array', required: true, trigger: 'change', message: "请选择数据更新频率" } 1085 { required: true, trigger: 'change', message: "请选择数据更新频率" }
1086 ], 1086 ],
1087 updateFrequencyOther: [ 1087 updateFrequencyOther: [
1088 { required: true, trigger: 'blur', message: "请填写数据更新频率其他内容" } 1088 { required: true, trigger: 'blur', message: "请填写数据更新频率其他内容" }
...@@ -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;
...@@ -2150,7 +2152,7 @@ onBeforeMount(() => { ...@@ -2150,7 +2152,7 @@ onBeforeMount(() => {
2150 const data = res.data || []; 2152 const data = res.data || [];
2151 updateFrequencyListData.value = data; 2153 updateFrequencyListData.value = data;
2152 let item = baseFormItems.value.find(item => item.field == 'updateFrequency'); 2154 let item = baseFormItems.value.find(item => item.field == 'updateFrequency');
2153 item && (item.children = updateFrequencyListData.value); 2155 item && (item.options = updateFrequencyListData.value);
2154 } else { 2156 } else {
2155 proxy.$ElMessage.error(res.msg); 2157 proxy.$ElMessage.error(res.msg);
2156 } 2158 }
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!