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 {
updateCertificate,
dataSourcesList
} from "@/api/modules/dataAsset";
import {
getTenantDetailInfo,
getTenantInfo
} from "@/api/modules/queryService";
import { passFlowData, rejectFlowData, revokeFlowData, isMyFirstNode } from "@/api/modules/workFlowService";
import useDataAssetStore from "@/store/modules/dataAsset";
import { changeNum, getDownloadUrl, download } from '@/utils/common';
......@@ -269,22 +265,6 @@ const getDetailInfo = () => {
}).catch(() => {
fullscreenLoading.value = false;
}));
// ps.push(getTenantDetailInfo(userData.tenantGuid).then((res: any) => {
// if (res.code == proxy.$passCode) {
// const data = res.data ?? {};
// tentData = { ...tentData, ...data };
// } else {
// ElMessage.error(res.msg);
// }
// }));
// ps.push(getTenantInfo({ tenantName: userData.tenantName }).then((res: any) => {
// if (res.code == proxy.$passCode) {
// const data = res.data ?? {};
// tentData = { ...tentData, ...data };
// } else {
// ElMessage.error(res.msg);
// }
// }))
Promise.all(ps).then(() => {
fullscreenLoading.value = false;
// tenantDetail.value = tentData;
......@@ -312,22 +292,6 @@ const getDetailInfo = () => {
ElMessage.error(res.msg);
}
}));
// ps.push(getTenantDetailInfo(userData.tenantGuid).then((res: any) => {
// if (res.code == proxy.$passCode) {
// const data = res.data ?? {};
// tentData = { ...tentData, ...data };
// } else {
// ElMessage.error(res.msg);
// }
// }));
// ps.push(getTenantInfo({ tenantName: userData.tenantName }).then((res: any) => {
// if (res.code == proxy.$passCode) {
// const data = res.data ?? {};
// tentData = { ...tentData, ...data };
// } else {
// ElMessage.error(res.msg);
// }
// }))
Promise.all(ps).then(() => {
fullscreenLoading.value = false;
......@@ -353,37 +317,8 @@ const handleExpand = () => {
// 提取到 onBeforeMount 中的请求
const tentData = ref<any>({});
const getTenantInformation = () => {
const ps: any = [];
ps.push(getTenantDetailInfo(tenantGuid || userData.tenantGuid).then((res: any) => {
if (res.code === proxy.$passCode) {
const data = res.data ?? {};
tentData.value = { ...tentData.value, ...data };
} else {
ElMessage.error(res.msg);
}
}));
ps.push(getTenantInfo({ tenantName: route.query.tenantName || userData.tenantName }).then((res: any) => {
if (res.code === proxy.$passCode) {
const data = res.data ?? {};
tentData.value = { ...tentData.value, ...data };
} else {
ElMessage.error(res.msg);
}
}));
// 这里返回 Promise.all 来等待所有请求完成
return Promise.all(ps);
};
onBeforeMount(() => {
getDetailInfo();
getTenantInformation().then(() => {
tenantDetail.value = { ...tentData.value }; // 将最终的数据赋值给 tenantDetail
}).catch(() => {
console.log('请求失败');
});
});
onActivated(() => {
......@@ -499,65 +434,6 @@ const approveTableInfo: any = ref({
const approvalProcessRef = ref();
const deploymentId = ref('');
const processInstanceId = ref('');
const tenantDetail: any = ref({});
/** 获取当前登录会员，服务商，企业等详情。 */
const getTenantDetail = () => {
// getTenantDetailInfo(userData.tenantGuid).then((res: any) => {
// if (res.code == proxy.$passCode) {
// const data = res.data ?? {};
// userData.value = data;
// } else {
// ElMessage.error(res.msg);
// }
// })
// getTenantInfo({tenantName: userData.tenantName}).then((res: any) => {
// if (res.code == proxy.$passCode) {
// const data = res.data ?? {};
// tenantDetail.value = data;
// } else {
// ElMessage.error(res.msg);
// }
// });
}
// const onUploadFilePreview = (file) => {
// let url = file.url;
// getImageContent(url).then((res: any) => {
// if (res && !res.msg) {
// let name = file.name;
// var fileSuffix = name ? name.substring(name.lastIndexOf('.') + 1).toLowerCase() : '';
// if (fileSuffix === 'png' || fileSuffix === 'jpeg' || fileSuffix === 'jpg' || fileSuffix === 'pdf') { //浏览器可以支持图片和pdf预览
// let fileUrl = <string>getDownloadUrl(res, name, fileSuffix);
// let win = window.open(fileUrl, name);
// win && (win.document.title = name);
// } else {
// download(res, name, fileSuffix);
// }
// // if (fileSuffix === 'png' || fileSuffix === 'jpeg' || fileSuffix === 'jpg' || fileSuffix === 'pdf' || fileSuffix === 'zip' || fileSuffix === 'rar') {
// // let win = window.open(fileUrl, name);
// // win && (win.document.title = name);
// // return win;
// // }
// // window.open('https://view.officeapps.live.com/op/view.aspx?src=' + encodeURIComponent(fileUrl));
// } else {
// res?.msg && ElMessage.error(res?.msg);
// }
// })
// }
// const onUploadFileDownload = (file) => {
// let url = file.url;
// getImageContent(url).then((res: any) => {
// if (res && !res.msg) {
// let name = file.name;
// var fileSuffix = name ? name.substring(name.lastIndexOf('.') + 1) : '';
// download(res, name, fileSuffix);
// } else {
// res?.msg && ElMessage.error(res?.msg);
// }
// })
// }
const toolBtns: any = computed(() => {
let btnsArr: any = [{
......@@ -1315,14 +1191,6 @@ const passCommonDialogBtnClick = (btn, info) => {
<span class="item_value">{{ (assetDetailInfo.dataProtection == 6 ? assetDetailInfo.dataProtectionOther :
assetDetailInfo.dataProtectionName) ?? '--' }}</span>
</div>
<div class="list_item" v-if="detailType != 'asset'">
<span class="item_label">所属行业:</span>
<span class="item_value"><ellipsis-tooltip
:content="(assetDetailInfo.ownIndustryName?.filter(u => u != '其他')?.join(',') +
(assetDetailInfo.ownIndustry?.includes(4)
? ((assetDetailInfo.ownIndustryName?.length > 1 ? ',' : '') + assetDetailInfo.ownIndustryOther) : '')) ?? '--'" class-name="w100f"
:refName="'tooltipOver' + 'ownIndustryName'"></ellipsis-tooltip></span>
</div>
<div class="list_item">
<span class="item_label">本次登记:</span>
<span class="item_value"><ellipsis-tooltip :content="assetDetailInfo.exchangeName ?? '--'"
......@@ -1707,11 +1575,11 @@ const passCommonDialogBtnClick = (btn, info) => {
</span>
</div>
<!-- <span
v-if="tenantDetail.businessLicense?.length || assetDetailInfo.registerAttachment?.commitmentLetter?.length"
class="small-title" :style="{ marginTop: '10px' }">公司信息</span> -->
<div class="list_item isFile" v-if="tenantDetail.businessLicense?.length">
v-if="tenantDetail.businessLicense?.length || assetDetailInfo.registerAttachment?.commitmentLetter?.length"
class="small-title" :style="{ marginTop: '10px' }">公司信息</span> -->
<div class="list_item isFile" v-if="assetDetailInfo.registerAttachment?.businessLicense?.length">
<span class="item_label" :style="{ width: 'auto', 'text-align': 'left' }">营业执照</span>
<span v-for="(item) in (tenantDetail?.businessLicense || [])" class="item_value"
<span v-for="(item) in (assetDetailInfo?.businessLicense || [])" class="item_value"
:style="{ 'padding-left': '0px' }">
<div class="file-operate">
<template
......@@ -1821,7 +1689,7 @@ const passCommonDialogBtnClick = (btn, info) => {
</div>
<div class="list_item">
<span class="item_label">公司名称:</span>
<span class="item_value"><ellipsis-tooltip :content="tenantDetail?.tenantName ?? '--'"
<span class="item_value"><ellipsis-tooltip :content="assetDetailInfo?.companyName ?? '--'"
class-name="w100f mr8-i" :refName="'tooltipOver' + 'tenantName'"></ellipsis-tooltip>
</span>
</div>
......@@ -1833,7 +1701,7 @@ const passCommonDialogBtnClick = (btn, info) => {
</div>
<div class="list_item">
<span class="item_label">统一社会信用代码:</span>
<span class="item_value">{{ tenantDetail.socialCreditCode ?? "--" }}</span>
<span class="item_value">{{ assetDetailInfo.socialCreditCode ?? "--" }}</span>
</div>
<div class="list_item">
<span class="item_label">是否列入失信:</span>
......@@ -1845,21 +1713,21 @@ const passCommonDialogBtnClick = (btn, info) => {
</div>
<div class="list_item">
<span class="item_label">注册日期:</span>
<span class="item_value">{{ tenantDetail.registrationDate ? formattedDate(tenantDetail.registrationDate) :
<span class="item_value">{{ assetDetailInfo.registrationDate ? formattedDate(assetDetailInfo.registrationDate) :
"--"
}}</span>
</div>
<div class="list_item">
<span class="item_label">营业开始日期:</span>
<span class="item_value">{{ tenantDetail.businessLicenseStartDate ?? "--" }}</span>
<span class="item_value">{{ assetDetailInfo.businessLicenseStartDate ?? "--" }}</span>
</div>
<div class="list_item">
<span class="item_label">营业结束日期:</span>
<span class="item_value">{{ tenantDetail.businessLicenseEndDate ?? "--" }}</span>
<span class="item_value">{{ assetDetailInfo.businessLicenseEndDate ?? "--" }}</span>
</div>
<div class="list_item is_block">
<span class="item_label">单位注册地址:</span>
<span class="item_value"> <ellipsis-tooltip :content="tenantDetail?.address ?? '--'"
<span class="item_value"> <ellipsis-tooltip :content="assetDetailInfo?.address ?? '--'"
class-name="w100f pr8" :refName="'tooltipOver' + 'address'"></ellipsis-tooltip></span>
</div>
</div>
......
src/views/data_asset/registerStart.vue
......@@ -173,23 +173,23 @@ const getTenantDetail = () => {
if (res.code == proxy.$passCode) {
const data = res.data ?? {};
tentData = { ...tentData, ...data };
return getTenantInfo({ tenantName: userData.tenantName }).then((res: any) => {
if (res.code == proxy.$passCode) {
const data = res.data || {};
tentData = { ...tentData, ...data };
} else {
ElMessage.error(res.msg);
}
})
} else {
ElMessage.error(res.msg);
}
}));
ps.push(getTenantInfo({ tenantName: userData.tenantName }).then((res: any) => {
if (res.code == proxy.$passCode) {
const data = res.data ?? {};
tentData = { ...tentData, ...data };
} else {
ElMessage.error(res.msg);
}
}))
Promise.all(ps).then(() => {
tenantDetail.value = tentData;
propertyFormItems.value.forEach((item, index) => {
if (item.field == 'address' || item.field == 'socialCreditCode' || item.field == 'registrationDate' || item.field == 'businessLicenseStartDate' || item.field == 'businessLicenseEndDate') {//在会员详情处获取。
if (item.field == 'tenantName' || item.field == 'address' || item.field == 'socialCreditCode' || item.field == 'registrationDate' || item.field == 'businessLicenseStartDate' || item.field == 'businessLicenseEndDate') {//在会员详情处获取。
item.default = tenantDetail.value[item.field];
} else if (item.field == 'businessLicenseJson') {
item.default = tenantDetail.value[item.field] ? JSON.parse(tenantDetail.value[item.field]) : [];
......@@ -1405,7 +1405,7 @@ const propertyFormItems: any = ref([
placeholder: '请输入',
field: 'tenantName',
maxlength: 50,
default: userData.tenantName ?? "",
default: tenantDetail.value.tenantName ?? "",
disabled: true,
required: false
},
......@@ -1702,6 +1702,8 @@ const saveDraft = () => {
let propertyFormLine = porpertyInfoFormRef.value.formInline;
Object.assign(params, propertyFormLine);
propertyFormLine.propertyTerm == 'Y' && (params.propertyTermSdate = propertyFormLine.propertyTermDate[0], params.propertyTermEdate = propertyFormLine.propertyTermDate[1]);
params.companyGuid = tenantDetail.value?.tenantGuid || userData.tenantGuid;
params.companyName = tenantDetail.value?.tenantName;
delete params.qualityEvaluationInstitutionGuid;
delete params.costAssessmentInstitutionGuid;
delete params.rules;
......@@ -1735,6 +1737,12 @@ const saveDraft = () => {
name: u.name
}
}) || [],
businessLicense: propertyFormLine?.businessLicenseJson?.map(u => {
return {
url: u.url,
name: u.name
}
}) || []
}
if (qualityEvaluationInstitution.value) {
registerAttachment.qualityEvaluationInstitution = qualityEvaluationInstitution.value
......@@ -1824,6 +1832,8 @@ const save = () => {
delete params.rules;
delete params.cost;
delete params.trem;
params.companyGuid = tenantDetail.value?.tenantGuid || userData.tenantGuid;
params.companyName = tenantDetail.value?.tenantName;
let uploadFormInline = uploadFormRef.value.formInline;
let registerAttachment: any = {
......@@ -1852,6 +1862,12 @@ const save = () => {
name: u.name
}
}) || [],
businessLicense: propertyFormLine?.businessLicenseJson?.map(u => {
return {
url: u.url,
name: u.name
}
}) || []
}
if (qualityEvaluationInstitution.value) {
registerAttachment.qualityEvaluationInstitution = qualityEvaluationInstitution.value
......
src/views/data_asset/tableRuleForm.vue
......@@ -1355,7 +1355,8 @@ defineExpose({
<el-input v-model="sqlTableFilters[dialogSelectSubjectTable.tableName]" ref="sqlInputRef" type="textarea"
:disabled="props.readonly" :autosize="true" resize="none" @change="handleSqlChange"></el-input>
<div class="left-title">质检字段<label style="color: red;">*</label></div>
<el-select v-model="sqlSelectField[dialogSelectSubjectTable.tableName]" placeholder="请选择" multiple filterable
<el-select v-model="sqlSelectField[dialogSelectSubjectTable.tableName]" placeholder="请选择" multiple filterable :collapse-tags="true" :collapse-tags-tooltip="true"
:max-collapse-tags="1"
clearable :disabled="props.readonly">
<el-option v-for="opt in sqlFieldsList[dialogSelectSubjectTable.tableName]" :key="opt['value']"
:label="opt['value']" :value="opt['value']" />
......@@ -1609,6 +1610,14 @@ defineExpose({
}
}
.table-field {
width: 360px;
.left-title {
border-right: 1px solid #d9d9d9;
}
}
.sql-edit {
width: calc(100% - 360px);
......
src/views/data_product/productListing.vue
......@@ -166,11 +166,10 @@ const tableInfo = ref({
if (approveVO && approveVO.approveState == 'A' && staffGuid == currentStaffGuid) {
isShowCancel = true;
}
if (bizApproveState === 'Y' && staffGuid == currentStaffGuid) {
if (bizApproveState === 'Y' && staffGuid == currentStaffGuid && !row.zqName) {
if (row.listingStatus === 'Y') {
list.push({ label: "下架", value: "down" });
}
if (row.listingStatus === 'N') {
} else {
list.push({ label: "上架", value: "up" });
}
}
......
src/views/data_quality/ruleForm.vue
......@@ -2184,7 +2184,8 @@ defineExpose({
<el-input v-model="sqlTableFilters[dialogSelectSubjectTable.enName]" ref="sqlInputRef" type="textarea"
:disabled="props.readonly" :autosize="true" resize="none" @change="handleSqlChange"></el-input>
<div class="left-title">质检字段<label style="color: red;">*</label></div>
<el-select v-model="sqlSelectField[dialogSelectSubjectTable.enName]" placeholder="请选择" multiple filterable
<el-select v-model="sqlSelectField[dialogSelectSubjectTable.enName]" placeholder="请选择" multiple filterable :collapse-tags="true" :collapse-tags-tooltip="true"
:max-collapse-tags="1"
clearable :disabled="props.readonly">
<el-option v-for="opt in sqlFieldsList[dialogSelectSubjectTable.enName]" :key="opt['value']"
:label="opt['value']" :value="opt['value']" />
......
src/views/data_quality/ruleModel.vue
......@@ -193,7 +193,7 @@ const changeStep = (val, skip = false) => {
child.guid = child.tableGuid || child.guid;
child.enName = child.tableName;
child.chName = child.tableChName || child.name;
child.dataSourceGuid = child.parentGuid;
child.dataSourceGuid = route.query.dataSource == '4' ? child.parentGuid : child.dataSourceGuid;
child.databaseName = child.databaseName,
toSubjectTables.value.push(child);
})
......
src/views/importFile.vue
......@@ -451,7 +451,7 @@ const dialogBtnClick = (btn, info) => {
// dialogInfo.value.footer.btns.map((item: any) => item.disabled = true)
if (dialogInfo.value.type == 'upload') {
if (tabsActiveName.value == 'dictionary') {
importData({ dictionaryGuid: dictionaryGuid.value })
importData({ bizGuid: dictionaryGuid.value })
} else {
importData(info)
}
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!