Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
ebea27b4 by lxs
Options

数据资产登记bug修改

1 parent 0b658a12
Inline Side-by-side
Showing 3 changed files with 31 additions and 42 deletions
src/views/data_asset/registerDetail.vue
......@@ -286,7 +286,7 @@ const handleExpand = () => {
onBeforeMount(() => {
getDetailInfo();
daTenantGuid.value && getTenantDetail();
getTenantDetail();
});
onActivated(() => {
......@@ -402,7 +402,7 @@ const tenantDetail: any = ref({});
/** 获取当前登录会员，服务商，企业等详情。 */
const getTenantDetail = () => {
getTenantDetailInfo(daTenantGuid.value).then((res: any) => {
getTenantDetailInfo(userData.tenantGuid).then((res: any) => {
if (res.code == proxy.$passCode) {
const data = res.data ?? {};
tenantDetail.value = data;
......@@ -1400,9 +1400,9 @@ const handleClickDamCatalogDetail = () => {
</span>
</div>
<div class="list_item is_block isFile" :style="{ width: '40%' }"
v-if="(detailType == 'asset' && assetDetailInfo.isQualityAssessment == 'Y') && assetDetailInfo.registerAttachment?.qualityEvaluationFile?.length">
v-if="(detailType == 'asset' && assetDetailInfo.isQualityAssessment == 'Y') && assetDetailInfo.registerAttachment?.evaluationFile?.length">
<span class="item_label" :style="{ width: 'auto', 'text-align': 'left' }">质量评估报告</span>
<span v-for="(item) in (assetDetailInfo.registerAttachment?.qualityEvaluationFile || [])"
<span v-for="(item) in (assetDetailInfo.registerAttachment?.evaluationFile || [])"
class="item_value" :style="{ 'padding-left': '0px' }">
<div class="file-operate">
<template
......@@ -1438,9 +1438,9 @@ const handleClickDamCatalogDetail = () => {
</span>
</div>
<div class="list_item is_block isFile" :style="{ width: '40%', 'margin-right': '28px' }"
v-if="(detailType == 'asset' && assetDetailInfo.isCostAssessment == 'Y') && assetDetailInfo.registerAttachment?.costAssessmentFile?.length">
v-if="(detailType == 'asset' && assetDetailInfo.isCostAssessment == 'Y') && assetDetailInfo.registerAttachment?.assessmentFile?.length">
<span class="item_label" :style="{ width: 'auto', 'text-align': 'left' }">价值评估报告</span>
<span v-for="(item) in (assetDetailInfo.registerAttachment?.costAssessmentFile || [])" class="item_value"
<span v-for="(item) in (assetDetailInfo.registerAttachment?.assessmentFile || [])" class="item_value"
:style="{ 'padding-left': '0px' }">
<div class="file-operate">
<template
......
src/views/data_asset/registerManagemant.vue
......@@ -376,6 +376,7 @@ const toSearch = (val: any, clear: boolean = false) => {
pageInfo.value.tenantGuid = val.tenantGuid;
}
getTableData();
getExchangeData();
};
const pageChange = (info) => {
......@@ -394,21 +395,6 @@ onActivated(() => {
})
onBeforeMount(() => {
// if (isCompanyPlatform.value) {
// tableInfo.value.fields = tableFields.value;
// searchItemList.value[1].visible = false;
// } else {
// tableFields.value.splice(2, 0, { label: "企业名称", field: "tenantName", width: 240, align: "left" });
// tableInfo.value.fields = tableFields.value;
// searchItemList.value[1].visible = true;
// getRegisterTenant().then((res: any) => {
// if (res.code == proxy.$passCode) {
// searchItemList.value[1].options = res.data || [];
// } else {
// ElMessage.error(res.msg);
// }
// });
// }
getExchangeData();
})
......@@ -571,7 +557,7 @@ const createBtnVisible = computed(() => {
@click="btnClick({ value: 'search', ...item })" v-preReClick>{{ item.exchangeName ?? '--' }}</div>
<div class="count-group">
<div class="count-item">
<div class="item-label">已上架产品数</div>
<div class="item-label">已登记产品数</div>
<div class="item-num">{{ changeNum(item.listingNum || 0) }}</div>
</div>
<div class="count-item">
......
src/views/data_asset/registerStart.vue
......@@ -47,6 +47,7 @@ const guid = route.query.guid;
const fullPath = route.fullPath;
const editType = route.query.type;
const exGuid = route.query.exchangeGuid;
const restart = localStorage.getItem('isRestart');
/** 资产目录列表 */
const registerCatalogList: any = ref([]);
......@@ -294,19 +295,19 @@ const setUploadFormItemsValue = (info) => {
if (item.field == 'registerLetter') {
item.default = attach.registerLetter || [];
item.templateUrl = attachDataInfo.value.register_letter;
} else if (item.field == 'qualityEvaluationFile') {
item.default = attach.qualityEvaluationFile || [];
} else if (item.field == 'evaluationFile') {
item.default = attach.evaluationFile || [];
item.templateUrl = attachDataInfo.value.quality_evaluation_file;
} else if (item.field == 'costAssessmentFile') {
item.default = attach.costAssessmentFile || [];
} else if (item.field == 'assessmentFile') {
item.default = attach.assessmentFile || [];
item.templateUrl = attachDataInfo.value.cost_assessment_file;
} else if (item.field === 'commitmentLetter') {
item.default = attach.commitmentLetter || [];
item.templateUrl = attachDataInfo.value['commitment-letter'];
} else if (item.field === 'costAssessmentInstitutionGuid') {
item.default = attach.costAssessmentInstitutionGuid || '';
item.default = attach.costAssessmentInstitutionGuid ? attach.costAssessmentInstitutionGuid : attach.costAssessmentInstitution;
} else if (item.field === 'qualityEvaluationInstitutionGuid') {
item.default = attach.qualityEvaluationInstitutionGuid || '';
item.default = attach.qualityEvaluationInstitutionGuid ? attach.qualityEvaluationInstitutionGuid : attach.qualityEvaluationInstitution;
}
});
}
......@@ -345,14 +346,14 @@ const draftDetailInfo: any = ref({});
/** 会员附件模板 */
const attachDataInfo: any = ref({});
const getRegisterCatalogListData = (dam: any={}) => {
const getRegisterCatalogListData = (dam: any = {}) => {
getRegisterCatalogList().then((res: any) => {
if (res.code == proxy.$passCode) {
const data = res.data || [];
baseFormItems.value[0].options = registerCatalogList.value = data;
if(guid){
if (guid) {
const opt = data.find(item => item.guid == dam.damGuid)
baseFormItems.value[0].default = opt? opt.guid: dam.damName
baseFormItems.value[0].default = opt ? opt.guid : dam.damName
}
let dataScaleItem = baseFormItems.value.find(item => item.field == 'dataScale');
if (draftDetailInfo.value.damGuid) {
......@@ -482,7 +483,7 @@ onBeforeMount(() => {
} else {
setPropertyFormItemsValue(draftDetailInfo.value);
}
getRegisterCatalogListData({damName: data.daName, damGuid: data.damGuid});
getRegisterCatalogListData({ damName: data.daName, damGuid: data.damGuid });
} else {
ElMessage.error(res.msg);
}
......@@ -536,6 +537,8 @@ onBeforeMount(() => {
// 获取数据资产目录主题
getParamsList({ dictType: '数据资产目录主题名称' }).then((res: any) => {
if (res.code == proxy.$passCode) {
const data = res.data || [];
subjectDomainListData.value = data;
let item = baseFormItems.value.find(item => item.field == 'subjectDomain');
item && (item.options = subjectDomainListData.value);
} else {
......@@ -1749,7 +1752,7 @@ const uploadFormItems: any = ref([
required: true,
default: [],
col: 'mr8',
field: 'qualityEvaluationFile',
field: 'evaluationFile',
visible: false,
},
{
......@@ -1780,7 +1783,7 @@ const uploadFormItems: any = ref([
required: true,
default: [],
col: 'mr8',
field: 'costAssessmentFile',
field: 'assessmentFile',
visible: false,
},
{
......@@ -1821,7 +1824,7 @@ const uploadFormRules = ref({
costAssessmentInstitutionGuid: [
{ required: true, trigger: 'change', message: "请选择价值评估机构" }
],
qualityEvaluationFile: [{
evaluationFile: [{
validator: (rule: any, value: any, callback: any) => {
if (!value?.length) {
callback(new Error('请上传质量评估报告'))
......@@ -1830,7 +1833,7 @@ const uploadFormRules = ref({
}
}, trigger: 'change'
}],
costAssessmentFile: [{
assessmentFile: [{
validator: (rule: any, value: any, callback: any) => {
if (!value?.length) {
callback(new Error('请上传价值评估报告'))
......@@ -1898,8 +1901,8 @@ const saveDraft = () => {
let registerAttachment: any = {
// fileHash: uploadFormInline.fileHash,
registerLetter: uploadFormInline['registerLetter']?.map(u => u.url) || [],
qualityEvaluationFile: uploadFormInline['qualityEvaluationFile']?.map(u => u.url) || [],
costAssessmentFile: uploadFormInline['costAssessmentFile']?.map(u => u.url) || [],
evaluationFile: uploadFormInline['evaluationFile']?.map(u => u.url) || [],
assessmentFile: uploadFormInline['assessmentFile']?.map(u => u.url) || [],
commitmentLetter: uploadFormInline['commitmentLetter']?.map(u => u.url) || [],
}
if (qualityEvaluationInstitution.value) {
......@@ -1986,8 +1989,8 @@ const save = () => {
let registerAttachment: any = {
// fileHash: uploadFormInline.fileHash,
registerLetter: uploadFormInline['registerLetter']?.map(u => u.url) || [],
qualityEvaluationFile: uploadFormInline['qualityEvaluationFile']?.map(u => u.url) || [],
costAssessmentFile: uploadFormInline['costAssessmentFile']?.map(u => u.url) || [],
evaluationFile: uploadFormInline['evaluationFile']?.map(u => u.url) || [],
assessmentFile: uploadFormInline['assessmentFile']?.map(u => u.url) || [],
commitmentLetter: uploadFormInline['commitmentLetter']?.map(u => u.url) || [],
}
if (qualityEvaluationInstitution.value) {
......@@ -2012,7 +2015,7 @@ const save = () => {
fullscreenLoading.value = true;
if (draftDetailInfo.value.guid) {
params.guid = draftDetailInfo.value.guid;
params.isRestart = localStorage.getItem('isRestart') ? true : false;
params.isRestart = restart ? true : false;
registerUpdate(params).then((res: any) => {
fullscreenLoading.value = false;
if (res.code == proxy.$passCode) {
......@@ -2145,7 +2148,7 @@ const approveTableInfo: any = ref({
<div class="tool_btns">
<div class="btns">
<el-button plain @click="cancel">取消</el-button>
<el-button type="primary" @click="saveDraft">保存</el-button>
<el-button type="primary" @click="saveDraft" v-if="!restart">保存</el-button>
<el-button type="primary" @click="save">提交申请</el-button>
</div>
</div>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!