Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
5326d71a by lxs
Options

Merge branch 'release-test' of http://117.78.60.236:8000/csbr-daop/fe-data-asset… 

…-management into release-test
2 parents 3055b892 9035155b
Inline Side-by-side
Showing 7 changed files with 52 additions and 159 deletions
src/views/data_asset/registerDetail.vue
...@@ -19,10 +19,6 @@ import { ...@@ -19,10 +19,6 @@ import {
19 updateCertificate, 19 updateCertificate,
20 dataSourcesList 20 dataSourcesList
21 } from "@/api/modules/dataAsset"; 21 } from "@/api/modules/dataAsset";
22 import {
23 getTenantDetailInfo,
24 getTenantInfo
25 } from "@/api/modules/queryService";
26 import { passFlowData, rejectFlowData, revokeFlowData, isMyFirstNode } from "@/api/modules/workFlowService"; 22 import { passFlowData, rejectFlowData, revokeFlowData, isMyFirstNode } from "@/api/modules/workFlowService";
27 import useDataAssetStore from "@/store/modules/dataAsset"; 23 import useDataAssetStore from "@/store/modules/dataAsset";
28 import { changeNum, getDownloadUrl, download } from '@/utils/common'; 24 import { changeNum, getDownloadUrl, download } from '@/utils/common';
...@@ -269,22 +265,6 @@ const getDetailInfo = () => { ...@@ -269,22 +265,6 @@ const getDetailInfo = () => {
269 }).catch(() => { 265 }).catch(() => {
270 fullscreenLoading.value = false; 266 fullscreenLoading.value = false;
271 })); 267 }));
272 // ps.push(getTenantDetailInfo(userData.tenantGuid).then((res: any) => {
273 // if (res.code == proxy.$passCode) {
274 // const data = res.data ?? {};
275 // tentData = { ...tentData, ...data };
276 // } else {
277 // ElMessage.error(res.msg);
278 // }
279 // }));
280 // ps.push(getTenantInfo({ tenantName: userData.tenantName }).then((res: any) => {
281 // if (res.code == proxy.$passCode) {
282 // const data = res.data ?? {};
283 // tentData = { ...tentData, ...data };
284 // } else {
285 // ElMessage.error(res.msg);
286 // }
287 // }))
288 Promise.all(ps).then(() => { 268 Promise.all(ps).then(() => {
289 fullscreenLoading.value = false; 269 fullscreenLoading.value = false;
290 // tenantDetail.value = tentData; 270 // tenantDetail.value = tentData;
...@@ -312,22 +292,6 @@ const getDetailInfo = () => { ...@@ -312,22 +292,6 @@ const getDetailInfo = () => {
312 ElMessage.error(res.msg); 292 ElMessage.error(res.msg);
313 } 293 }
314 })); 294 }));
315 // ps.push(getTenantDetailInfo(userData.tenantGuid).then((res: any) => {
316 // if (res.code == proxy.$passCode) {
317 // const data = res.data ?? {};
318 // tentData = { ...tentData, ...data };
319 // } else {
320 // ElMessage.error(res.msg);
321 // }
322 // }));
323 // ps.push(getTenantInfo({ tenantName: userData.tenantName }).then((res: any) => {
324 // if (res.code == proxy.$passCode) {
325 // const data = res.data ?? {};
326 // tentData = { ...tentData, ...data };
327 // } else {
328 // ElMessage.error(res.msg);
329 // }
330 // }))
331 295
332 Promise.all(ps).then(() => { 296 Promise.all(ps).then(() => {
333 fullscreenLoading.value = false; 297 fullscreenLoading.value = false;
...@@ -353,37 +317,8 @@ const handleExpand = () => { ...@@ -353,37 +317,8 @@ const handleExpand = () => {
353 317
354 // 提取到 onBeforeMount 中的请求 318 // 提取到 onBeforeMount 中的请求
355 const tentData = ref<any>({}); 319 const tentData = ref<any>({});
356 const getTenantInformation = () => {
357 const ps: any = [];
358
359 ps.push(getTenantDetailInfo(tenantGuid || userData.tenantGuid).then((res: any) => {
360 if (res.code === proxy.$passCode) {
361 const data = res.data ?? {};
362 tentData.value = { ...tentData.value, ...data };
363 } else {
364 ElMessage.error(res.msg);
365 }
366 }));
367
368 ps.push(getTenantInfo({ tenantName: route.query.tenantName || userData.tenantName }).then((res: any) => {
369 if (res.code === proxy.$passCode) {
370 const data = res.data ?? {};
371 tentData.value = { ...tentData.value, ...data };
372 } else {
373 ElMessage.error(res.msg);
374 }
375 }));
376
377 // 这里返回 Promise.all 来等待所有请求完成
378 return Promise.all(ps);
379 };
380 onBeforeMount(() => { 320 onBeforeMount(() => {
381 getDetailInfo(); 321 getDetailInfo();
382 getTenantInformation().then(() => {
383 tenantDetail.value = { ...tentData.value }; // 将最终的数据赋值给 tenantDetail
384 }).catch(() => {
385 console.log('请求失败');
386 });
387 }); 322 });
388 323
389 onActivated(() => { 324 onActivated(() => {
...@@ -499,65 +434,6 @@ const approveTableInfo: any = ref({ ...@@ -499,65 +434,6 @@ const approveTableInfo: any = ref({
499 const approvalProcessRef = ref(); 434 const approvalProcessRef = ref();
500 const deploymentId = ref(''); 435 const deploymentId = ref('');
501 const processInstanceId = ref(''); 436 const processInstanceId = ref('');
502 const tenantDetail: any = ref({});
503
504 /** 获取当前登录会员，服务商，企业等详情。 */
505 const getTenantDetail = () => {
506 // getTenantDetailInfo(userData.tenantGuid).then((res: any) => {
507 // if (res.code == proxy.$passCode) {
508 // const data = res.data ?? {};
509 // userData.value = data;
510 // } else {
511 // ElMessage.error(res.msg);
512 // }
513 // })
514 // getTenantInfo({tenantName: userData.tenantName}).then((res: any) => {
515 // if (res.code == proxy.$passCode) {
516 // const data = res.data ?? {};
517 // tenantDetail.value = data;
518 // } else {
519 // ElMessage.error(res.msg);
520 // }
521 // });
522 }
523
524 // const onUploadFilePreview = (file) => {
525 // let url = file.url;
526 // getImageContent(url).then((res: any) => {
527 // if (res && !res.msg) {
528 // let name = file.name;
529 // var fileSuffix = name ? name.substring(name.lastIndexOf('.') + 1).toLowerCase() : '';
530 // if (fileSuffix === 'png' || fileSuffix === 'jpeg' || fileSuffix === 'jpg' || fileSuffix === 'pdf') { //浏览器可以支持图片和pdf预览
531 // let fileUrl = <string>getDownloadUrl(res, name, fileSuffix);
532 // let win = window.open(fileUrl, name);
533 // win && (win.document.title = name);
534 // } else {
535 // download(res, name, fileSuffix);
536 // }
537 // // if (fileSuffix === 'png' || fileSuffix === 'jpeg' || fileSuffix === 'jpg' || fileSuffix === 'pdf' || fileSuffix === 'zip' || fileSuffix === 'rar') {
538 // // let win = window.open(fileUrl, name);
539 // // win && (win.document.title = name);
540 // // return win;
541 // // }
542 // // window.open('https://view.officeapps.live.com/op/view.aspx?src=' + encodeURIComponent(fileUrl));
543 // } else {
544 // res?.msg && ElMessage.error(res?.msg);
545 // }
546 // })
547 // }
548
549 // const onUploadFileDownload = (file) => {
550 // let url = file.url;
551 // getImageContent(url).then((res: any) => {
552 // if (res && !res.msg) {
553 // let name = file.name;
554 // var fileSuffix = name ? name.substring(name.lastIndexOf('.') + 1) : '';
555 // download(res, name, fileSuffix);
556 // } else {
557 // res?.msg && ElMessage.error(res?.msg);
558 // }
559 // })
560 // }
561 437
562 const toolBtns: any = computed(() => { 438 const toolBtns: any = computed(() => {
563 let btnsArr: any = [{ 439 let btnsArr: any = [{
...@@ -1315,14 +1191,6 @@ const passCommonDialogBtnClick = (btn, info) => { ...@@ -1315,14 +1191,6 @@ const passCommonDialogBtnClick = (btn, info) => {
1315 <span class="item_value">{{ (assetDetailInfo.dataProtection == 6 ? assetDetailInfo.dataProtectionOther : 1191 <span class="item_value">{{ (assetDetailInfo.dataProtection == 6 ? assetDetailInfo.dataProtectionOther :
1316 assetDetailInfo.dataProtectionName) ?? '--' }}</span> 1192 assetDetailInfo.dataProtectionName) ?? '--' }}</span>
1317 </div> 1193 </div>
1318 <div class="list_item" v-if="detailType != 'asset'">
1319 <span class="item_label">所属行业:</span>
1320 <span class="item_value"><ellipsis-tooltip
1321 :content="(assetDetailInfo.ownIndustryName?.filter(u => u != '其他')?.join(',') +
1322 (assetDetailInfo.ownIndustry?.includes(4)
1323 ? ((assetDetailInfo.ownIndustryName?.length > 1 ? ',' : '') + assetDetailInfo.ownIndustryOther) : '')) ?? '--'" class-name="w100f"
1324 :refName="'tooltipOver' + 'ownIndustryName'"></ellipsis-tooltip></span>
1325 </div>
1326 <div class="list_item"> 1194 <div class="list_item">
1327 <span class="item_label">本次登记:</span> 1195 <span class="item_label">本次登记:</span>
1328 <span class="item_value"><ellipsis-tooltip :content="assetDetailInfo.exchangeName ?? '--'" 1196 <span class="item_value"><ellipsis-tooltip :content="assetDetailInfo.exchangeName ?? '--'"
...@@ -1707,11 +1575,11 @@ const passCommonDialogBtnClick = (btn, info) => { ...@@ -1707,11 +1575,11 @@ const passCommonDialogBtnClick = (btn, info) => {
1707 </span> 1575 </span>
1708 </div> 1576 </div>
1709 <!-- <span 1577 <!-- <span
1710 v-if="tenantDetail.businessLicense?.length || assetDetailInfo.registerAttachment?.commitmentLetter?.length" 1578 v-if="tenantDetail.businessLicense?.length || assetDetailInfo.registerAttachment?.commitmentLetter?.length"
1711 class="small-title" :style="{ marginTop: '10px' }">公司信息</span> --> 1579 class="small-title" :style="{ marginTop: '10px' }">公司信息</span> -->
1712 <div class="list_item isFile" v-if="tenantDetail.businessLicense?.length"> 1580 <div class="list_item isFile" v-if="assetDetailInfo.registerAttachment?.businessLicense?.length">
1713 <span class="item_label" :style="{ width: 'auto', 'text-align': 'left' }">营业执照</span> 1581 <span class="item_label" :style="{ width: 'auto', 'text-align': 'left' }">营业执照</span>
1714 <span v-for="(item) in (tenantDetail?.businessLicense || [])" class="item_value" 1582 <span v-for="(item) in (assetDetailInfo?.businessLicense || [])" class="item_value"
1715 :style="{ 'padding-left': '0px' }"> 1583 :style="{ 'padding-left': '0px' }">
1716 <div class="file-operate"> 1584 <div class="file-operate">
1717 <template 1585 <template
...@@ -1821,7 +1689,7 @@ const passCommonDialogBtnClick = (btn, info) => { ...@@ -1821,7 +1689,7 @@ const passCommonDialogBtnClick = (btn, info) => {
1821 </div> 1689 </div>
1822 <div class="list_item"> 1690 <div class="list_item">
1823 <span class="item_label">公司名称:</span> 1691 <span class="item_label">公司名称:</span>
1824 <span class="item_value"><ellipsis-tooltip :content="tenantDetail?.tenantName ?? '--'" 1692 <span class="item_value"><ellipsis-tooltip :content="assetDetailInfo?.companyName ?? '--'"
1825 class-name="w100f mr8-i" :refName="'tooltipOver' + 'tenantName'"></ellipsis-tooltip> 1693 class-name="w100f mr8-i" :refName="'tooltipOver' + 'tenantName'"></ellipsis-tooltip>
1826 </span> 1694 </span>
1827 </div> 1695 </div>
...@@ -1833,7 +1701,7 @@ const passCommonDialogBtnClick = (btn, info) => { ...@@ -1833,7 +1701,7 @@ const passCommonDialogBtnClick = (btn, info) => {
1833 </div> 1701 </div>
1834 <div class="list_item"> 1702 <div class="list_item">
1835 <span class="item_label">统一社会信用代码:</span> 1703 <span class="item_label">统一社会信用代码:</span>
1836 <span class="item_value">{{ tenantDetail.socialCreditCode ?? "--" }}</span> 1704 <span class="item_value">{{ assetDetailInfo.socialCreditCode ?? "--" }}</span>
1837 </div> 1705 </div>
1838 <div class="list_item"> 1706 <div class="list_item">
1839 <span class="item_label">是否列入失信:</span> 1707 <span class="item_label">是否列入失信:</span>
...@@ -1845,21 +1713,21 @@ const passCommonDialogBtnClick = (btn, info) => { ...@@ -1845,21 +1713,21 @@ const passCommonDialogBtnClick = (btn, info) => {
1845 </div> 1713 </div>
1846 <div class="list_item"> 1714 <div class="list_item">
1847 <span class="item_label">注册日期:</span> 1715 <span class="item_label">注册日期:</span>
1848 <span class="item_value">{{ tenantDetail.registrationDate ? formattedDate(tenantDetail.registrationDate) : 1716 <span class="item_value">{{ assetDetailInfo.registrationDate ? formattedDate(assetDetailInfo.registrationDate) :
1849 "--" 1717 "--"
1850 }}</span> 1718 }}</span>
1851 </div> 1719 </div>
1852 <div class="list_item"> 1720 <div class="list_item">
1853 <span class="item_label">营业开始日期:</span> 1721 <span class="item_label">营业开始日期:</span>
1854 <span class="item_value">{{ tenantDetail.businessLicenseStartDate ?? "--" }}</span> 1722 <span class="item_value">{{ assetDetailInfo.businessLicenseStartDate ?? "--" }}</span>
1855 </div> 1723 </div>
1856 <div class="list_item"> 1724 <div class="list_item">
1857 <span class="item_label">营业结束日期:</span> 1725 <span class="item_label">营业结束日期:</span>
1858 <span class="item_value">{{ tenantDetail.businessLicenseEndDate ?? "--" }}</span> 1726 <span class="item_value">{{ assetDetailInfo.businessLicenseEndDate ?? "--" }}</span>
1859 </div> 1727 </div>
1860 <div class="list_item is_block"> 1728 <div class="list_item is_block">
1861 <span class="item_label">单位注册地址:</span> 1729 <span class="item_label">单位注册地址:</span>
1862 <span class="item_value"> <ellipsis-tooltip :content="tenantDetail?.address ?? '--'" 1730 <span class="item_value"> <ellipsis-tooltip :content="assetDetailInfo?.address ?? '--'"
1863 class-name="w100f pr8" :refName="'tooltipOver' + 'address'"></ellipsis-tooltip></span> 1731 class-name="w100f pr8" :refName="'tooltipOver' + 'address'"></ellipsis-tooltip></span>
1864 </div> 1732 </div>
1865 </div> 1733 </div>
......
src/views/data_asset/registerStart.vue
...@@ -173,23 +173,23 @@ const getTenantDetail = () => { ...@@ -173,23 +173,23 @@ const getTenantDetail = () => {
173 if (res.code == proxy.$passCode) { 173 if (res.code == proxy.$passCode) {
174 const data = res.data ?? {}; 174 const data = res.data ?? {};
175 tentData = { ...tentData, ...data }; 175 tentData = { ...tentData, ...data };
176 return getTenantInfo({ tenantName: userData.tenantName }).then((res: any) => {
177 if (res.code == proxy.$passCode) {
178 const data = res.data || {};
179 tentData = { ...tentData, ...data };
180 } else {
181 ElMessage.error(res.msg);
182 }
183 })
176 } else { 184 } else {
177 ElMessage.error(res.msg); 185 ElMessage.error(res.msg);
178 } 186 }
179 })); 187 }));
180 ps.push(getTenantInfo({ tenantName: userData.tenantName }).then((res: any) => {
181 if (res.code == proxy.$passCode) {
182 const data = res.data ?? {};
183 tentData = { ...tentData, ...data };
184 } else {
185 ElMessage.error(res.msg);
186 }
187 }))
188 188
189 Promise.all(ps).then(() => { 189 Promise.all(ps).then(() => {
190 tenantDetail.value = tentData; 190 tenantDetail.value = tentData;
191 propertyFormItems.value.forEach((item, index) => { 191 propertyFormItems.value.forEach((item, index) => {
192 if (item.field == 'address' || item.field == 'socialCreditCode' || item.field == 'registrationDate' || item.field == 'businessLicenseStartDate' || item.field == 'businessLicenseEndDate') {//在会员详情处获取。 192 if (item.field == 'tenantName' || item.field == 'address' || item.field == 'socialCreditCode' || item.field == 'registrationDate' || item.field == 'businessLicenseStartDate' || item.field == 'businessLicenseEndDate') {//在会员详情处获取。
193 item.default = tenantDetail.value[item.field]; 193 item.default = tenantDetail.value[item.field];
194 } else if (item.field == 'businessLicenseJson') { 194 } else if (item.field == 'businessLicenseJson') {
195 item.default = tenantDetail.value[item.field] ? JSON.parse(tenantDetail.value[item.field]) : []; 195 item.default = tenantDetail.value[item.field] ? JSON.parse(tenantDetail.value[item.field]) : [];
...@@ -1405,7 +1405,7 @@ const propertyFormItems: any = ref([ ...@@ -1405,7 +1405,7 @@ const propertyFormItems: any = ref([
1405 placeholder: '请输入', 1405 placeholder: '请输入',
1406 field: 'tenantName', 1406 field: 'tenantName',
1407 maxlength: 50, 1407 maxlength: 50,
1408 default: userData.tenantName ?? "", 1408 default: tenantDetail.value.tenantName ?? "",
1409 disabled: true, 1409 disabled: true,
1410 required: false 1410 required: false
1411 }, 1411 },
...@@ -1702,6 +1702,8 @@ const saveDraft = () => { ...@@ -1702,6 +1702,8 @@ const saveDraft = () => {
1702 let propertyFormLine = porpertyInfoFormRef.value.formInline; 1702 let propertyFormLine = porpertyInfoFormRef.value.formInline;
1703 Object.assign(params, propertyFormLine); 1703 Object.assign(params, propertyFormLine);
1704 propertyFormLine.propertyTerm == 'Y' && (params.propertyTermSdate = propertyFormLine.propertyTermDate[0], params.propertyTermEdate = propertyFormLine.propertyTermDate[1]); 1704 propertyFormLine.propertyTerm == 'Y' && (params.propertyTermSdate = propertyFormLine.propertyTermDate[0], params.propertyTermEdate = propertyFormLine.propertyTermDate[1]);
1705 params.companyGuid = tenantDetail.value?.tenantGuid || userData.tenantGuid;
1706 params.companyName = tenantDetail.value?.tenantName;
1705 delete params.qualityEvaluationInstitutionGuid; 1707 delete params.qualityEvaluationInstitutionGuid;
1706 delete params.costAssessmentInstitutionGuid; 1708 delete params.costAssessmentInstitutionGuid;
1707 delete params.rules; 1709 delete params.rules;
...@@ -1735,6 +1737,12 @@ const saveDraft = () => { ...@@ -1735,6 +1737,12 @@ const saveDraft = () => {
1735 name: u.name 1737 name: u.name
1736 } 1738 }
1737 }) || [], 1739 }) || [],
1740 businessLicense: propertyFormLine?.businessLicenseJson?.map(u => {
1741 return {
1742 url: u.url,
1743 name: u.name
1744 }
1745 }) || []
1738 } 1746 }
1739 if (qualityEvaluationInstitution.value) { 1747 if (qualityEvaluationInstitution.value) {
1740 registerAttachment.qualityEvaluationInstitution = qualityEvaluationInstitution.value 1748 registerAttachment.qualityEvaluationInstitution = qualityEvaluationInstitution.value
...@@ -1824,6 +1832,8 @@ const save = () => { ...@@ -1824,6 +1832,8 @@ const save = () => {
1824 delete params.rules; 1832 delete params.rules;
1825 delete params.cost; 1833 delete params.cost;
1826 delete params.trem; 1834 delete params.trem;
1835 params.companyGuid = tenantDetail.value?.tenantGuid || userData.tenantGuid;
1836 params.companyName = tenantDetail.value?.tenantName;
1827 1837
1828 let uploadFormInline = uploadFormRef.value.formInline; 1838 let uploadFormInline = uploadFormRef.value.formInline;
1829 let registerAttachment: any = { 1839 let registerAttachment: any = {
...@@ -1852,6 +1862,12 @@ const save = () => { ...@@ -1852,6 +1862,12 @@ const save = () => {
1852 name: u.name 1862 name: u.name
1853 } 1863 }
1854 }) || [], 1864 }) || [],
1865 businessLicense: propertyFormLine?.businessLicenseJson?.map(u => {
1866 return {
1867 url: u.url,
1868 name: u.name
1869 }
1870 }) || []
1855 } 1871 }
1856 if (qualityEvaluationInstitution.value) { 1872 if (qualityEvaluationInstitution.value) {
1857 registerAttachment.qualityEvaluationInstitution = qualityEvaluationInstitution.value 1873 registerAttachment.qualityEvaluationInstitution = qualityEvaluationInstitution.value
......
src/views/data_asset/tableRuleForm.vue
...@@ -1355,7 +1355,8 @@ defineExpose({ ...@@ -1355,7 +1355,8 @@ defineExpose({
1355 <el-input v-model="sqlTableFilters[dialogSelectSubjectTable.tableName]" ref="sqlInputRef" type="textarea" 1355 <el-input v-model="sqlTableFilters[dialogSelectSubjectTable.tableName]" ref="sqlInputRef" type="textarea"
1356 :disabled="props.readonly" :autosize="true" resize="none" @change="handleSqlChange"></el-input> 1356 :disabled="props.readonly" :autosize="true" resize="none" @change="handleSqlChange"></el-input>
1357 <div class="left-title">质检字段<label style="color: red;">*</label></div> 1357 <div class="left-title">质检字段<label style="color: red;">*</label></div>
1358 <el-select v-model="sqlSelectField[dialogSelectSubjectTable.tableName]" placeholder="请选择" multiple filterable 1358 <el-select v-model="sqlSelectField[dialogSelectSubjectTable.tableName]" placeholder="请选择" multiple filterable :collapse-tags="true" :collapse-tags-tooltip="true"
1359 :max-collapse-tags="1"
1359 clearable :disabled="props.readonly"> 1360 clearable :disabled="props.readonly">
1360 <el-option v-for="opt in sqlFieldsList[dialogSelectSubjectTable.tableName]" :key="opt['value']" 1361 <el-option v-for="opt in sqlFieldsList[dialogSelectSubjectTable.tableName]" :key="opt['value']"
1361 :label="opt['value']" :value="opt['value']" /> 1362 :label="opt['value']" :value="opt['value']" />
...@@ -1609,6 +1610,14 @@ defineExpose({ ...@@ -1609,6 +1610,14 @@ defineExpose({
1609 } 1610 }
1610 } 1611 }
1611 1612
1613 .table-field {
1614 width: 360px;
1615
1616 .left-title {
1617 border-right: 1px solid #d9d9d9;
1618 }
1619 }
1620
1612 .sql-edit { 1621 .sql-edit {
1613 width: calc(100% - 360px); 1622 width: calc(100% - 360px);
1614 1623
......
src/views/data_product/productListing.vue
...@@ -166,11 +166,10 @@ const tableInfo = ref({ ...@@ -166,11 +166,10 @@ const tableInfo = ref({
166 if (approveVO && approveVO.approveState == 'A' && staffGuid == currentStaffGuid) { 166 if (approveVO && approveVO.approveState == 'A' && staffGuid == currentStaffGuid) {
167 isShowCancel = true; 167 isShowCancel = true;
168 } 168 }
169 if (bizApproveState === 'Y' && staffGuid == currentStaffGuid) { 169 if (bizApproveState === 'Y' && staffGuid == currentStaffGuid && !row.zqName) {
170 if (row.listingStatus === 'Y') { 170 if (row.listingStatus === 'Y') {
171 list.push({ label: "下架", value: "down" }); 171 list.push({ label: "下架", value: "down" });
172 } 172 } else {
173 if (row.listingStatus === 'N') {
174 list.push({ label: "上架", value: "up" }); 173 list.push({ label: "上架", value: "up" });
175 } 174 }
176 } 175 }
......
src/views/data_quality/ruleForm.vue
...@@ -2184,7 +2184,8 @@ defineExpose({ ...@@ -2184,7 +2184,8 @@ defineExpose({
2184 <el-input v-model="sqlTableFilters[dialogSelectSubjectTable.enName]" ref="sqlInputRef" type="textarea" 2184 <el-input v-model="sqlTableFilters[dialogSelectSubjectTable.enName]" ref="sqlInputRef" type="textarea"
2185 :disabled="props.readonly" :autosize="true" resize="none" @change="handleSqlChange"></el-input> 2185 :disabled="props.readonly" :autosize="true" resize="none" @change="handleSqlChange"></el-input>
2186 <div class="left-title">质检字段<label style="color: red;">*</label></div> 2186 <div class="left-title">质检字段<label style="color: red;">*</label></div>
2187 <el-select v-model="sqlSelectField[dialogSelectSubjectTable.enName]" placeholder="请选择" multiple filterable 2187 <el-select v-model="sqlSelectField[dialogSelectSubjectTable.enName]" placeholder="请选择" multiple filterable :collapse-tags="true" :collapse-tags-tooltip="true"
2188 :max-collapse-tags="1"
2188 clearable :disabled="props.readonly"> 2189 clearable :disabled="props.readonly">
2189 <el-option v-for="opt in sqlFieldsList[dialogSelectSubjectTable.enName]" :key="opt['value']" 2190 <el-option v-for="opt in sqlFieldsList[dialogSelectSubjectTable.enName]" :key="opt['value']"
2190 :label="opt['value']" :value="opt['value']" /> 2191 :label="opt['value']" :value="opt['value']" />
......
src/views/data_quality/ruleModel.vue
...@@ -193,7 +193,7 @@ const changeStep = (val, skip = false) => { ...@@ -193,7 +193,7 @@ const changeStep = (val, skip = false) => {
193 child.guid = child.tableGuid || child.guid; 193 child.guid = child.tableGuid || child.guid;
194 child.enName = child.tableName; 194 child.enName = child.tableName;
195 child.chName = child.tableChName || child.name; 195 child.chName = child.tableChName || child.name;
196 child.dataSourceGuid = child.parentGuid; 196 child.dataSourceGuid = route.query.dataSource == '4' ? child.parentGuid : child.dataSourceGuid;
197 child.databaseName = child.databaseName, 197 child.databaseName = child.databaseName,
198 toSubjectTables.value.push(child); 198 toSubjectTables.value.push(child);
199 }) 199 })
......
src/views/importFile.vue
...@@ -451,7 +451,7 @@ const dialogBtnClick = (btn, info) => { ...@@ -451,7 +451,7 @@ const dialogBtnClick = (btn, info) => {
451 // dialogInfo.value.footer.btns.map((item: any) => item.disabled = true) 451 // dialogInfo.value.footer.btns.map((item: any) => item.disabled = true)
452 if (dialogInfo.value.type == 'upload') { 452 if (dialogInfo.value.type == 'upload') {
453 if (tabsActiveName.value == 'dictionary') { 453 if (tabsActiveName.value == 'dictionary') {
454 importData({ dictionaryGuid: dictionaryGuid.value }) 454 importData({ bizGuid: dictionaryGuid.value })
455 } else { 455 } else {
456 importData(info) 456 importData(info)
457 } 457 }
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!