ab2f71b2 by xukangle

Merge branch 'develop' into release-test

2 parents 63a98ad6 4fb866e2
...@@ -272,3 +272,13 @@ export const filterVal = (val, type) => { ...@@ -272,3 +272,13 @@ export const filterVal = (val, type) => {
272 } 272 }
273 } 273 }
274 274
275 /***
276 * 根据guid查询评估文件
277 * @param {Object} params
278 * path: /product-grounding/get-file-by-dam-guid
279 * method get
280 */
281 export const getFileByDamGuid = (params) => request({
282 url: `${import.meta.env.VITE_API_NEW_PORTAL}/product-grounding/get-file-by-dam-guid?damGuid=${params.damGuid}`,
283 method: 'get',
284 })
......
...@@ -15,11 +15,11 @@ import { changeNum } from '@/utils/common'; ...@@ -15,11 +15,11 @@ import { changeNum } from '@/utils/common';
15 import { onUploadFilePreview, onUploadFileDownload } from '@/api/modules/common'; 15 import { onUploadFilePreview, onUploadFileDownload } from '@/api/modules/common';
16 import { getAreaData, getServiceTenants, getSingleList } from "@/api/modules/queryService"; 16 import { getAreaData, getServiceTenants, getSingleList } from "@/api/modules/queryService";
17 import { getApproveList, getTenantApprove, registerApproveAllow, registerApproveBackup, getParamsList, getServiceDetail } from "@/api/modules/dataAsset"; 17 import { getApproveList, getTenantApprove, registerApproveAllow, registerApproveBackup, getParamsList, getServiceDetail } from "@/api/modules/dataAsset";
18 import { getProductList, getAddedProductList, getListingDetail, listingSave, listingUpdate, listingSavePortal, getParamsDataList, listingUpdateGateway, getDataExchangeProductList, getTemplateFile, getListingList } from "@/api/modules/dataProduct"; 18 import { getProductList, getFileByDamGuid, getAddedProductList, getListingDetail, listingSave, listingUpdate, listingSavePortal, getParamsDataList, listingUpdateGateway, getDataExchangeProductList, getTemplateFile, getListingList } from "@/api/modules/dataProduct";
19 import { getMatchDetail } from "@/api/modules/dataFinance"; 19 import { getMatchDetail } from "@/api/modules/dataFinance";
20 import { useValidator } from '@/hooks/useValidator'; 20 import { useValidator } from '@/hooks/useValidator';
21 import { getCamundaDeploymentId } from "@/api/modules/workFlowService"; 21 import { getCamundaDeploymentId } from "@/api/modules/workFlowService";
22 import { da } from "element-plus/es/locale"; 22
23 23
24 const { required } = useValidator(); 24 const { required } = useValidator();
25 const route = useRoute(); 25 const route = useRoute();
...@@ -1192,9 +1192,27 @@ const setFormItems = (row: any = null, isDetail = false) => { ...@@ -1192,9 +1192,27 @@ const setFormItems = (row: any = null, isDetail = false) => {
1192 const selectChange = async (val, row, info) => { 1192 const selectChange = async (val, row, info) => {
1193 if (row.field == 'damName') { 1193 if (row.field == 'damName') {
1194 const data = row.options.filter(o => o.damName == val); 1194 const data = row.options.filter(o => o.damName == val);
1195 console.log(data, '-------123----------');
1196 let coverageArea = (data.length && data[0].coverageArea) ? data[0].coverageArea : []; 1195 let coverageArea = (data.length && data[0].coverageArea) ? data[0].coverageArea : [];
1197 await setFormItems({ ...info, coverageArea: coverageArea }); 1196 await setFormItems({ ...info, coverageArea: coverageArea });
1197 const res: any = await getFileByDamGuid({ damGuid: data[0].damGuid });
1198 if (res.code == proxy.$passCode) {
1199 formInfo.value.items.forEach((item: any) => {
1200 // if (item.field == 'qualityEvaluationInstitution') {
1201 // item.default = res.data.qualityEvaluationInstitution || [];
1202 // }
1203 // if (item.field == 'costAssessmentInstitution') {
1204 // item.default = res.data.costAssessmentInstitution || [];
1205 // }
1206 if (item.field == 'costAssessmentFileInfo') {
1207 item.default = res.data.assessmentFile || [];
1208 }
1209 if (item.field == 'qualityEvaluationFileInfo') {
1210 item.default = res.data.evaluationFile || [];
1211 }
1212
1213 });
1214 }
1215
1198 formInfo.value.items.at(0).default = val; 1216 formInfo.value.items.at(0).default = val;
1199 formInfo.value.items.at(1).default = data.length ? data[0].damType : ''; 1217 formInfo.value.items.at(1).default = data.length ? data[0].damType : '';
1200 // formInfo.value.items.at(2).default = data.length ? data[0].subjectDomain : ''; 1218 // formInfo.value.items.at(2).default = data.length ? data[0].subjectDomain : '';
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!