6ac3b327 by lxs

数据产品上架更新

1 parent ce05ad8f
......@@ -27,7 +27,7 @@ import { getCamundaDeploymentId, rejectFlowData, passFlowData, isMyFirstNode, re
const { required } = useValidator();
const route = useRoute();
const userStore = useUserStore();
const userData = JSON.parse(userStore.userData);
const userData = JSON.parse(localStorage.userData);
const fullPath = route.fullPath;
const assetStore = useDataAssetStore();
const guid = route.query.guid as string;
......@@ -75,7 +75,7 @@ const getArea = (node, resolve) => {
return;
}
if (!getAreaDataPromise.value[node.value]) {
console.log('getAreaDataPromise', getAreaDataPromise.value);
// console.log('getAreaDataPromise', getAreaDataPromise.value);
getAreaDataPromise.value[node.value] = getAreaData(params).then((res: any) => {
getAreaDataPromise.value[node.value] = null;
node.loaded = true;
......@@ -310,7 +310,8 @@ const formInfo = ref<any>({
default: '',
disabled: false,
inputType: 'moneyNumber',
required: true
required: true,
visible: true,
},
{
label: "价格单位",
......@@ -327,6 +328,7 @@ const formInfo = ref<any>({
clearable: true,
disabled: false,
required: true,
visible: true,
},
{
label: "登记数交所",
......@@ -664,7 +666,7 @@ const getTableInfo = () => {
const getProductDetail = async () => {
flowDetailLoading.value = true;
getListingDetail({ guid: guid, serviceTenantGuid: route.query.tenantGuid }).then((res: any) => {
getListingDetail({ guid: guid, serviceTenantGuid: route.query.serviceTenantGuid }).then((res: any) => {
flowDetailLoading.value = false;
if (res.code == proxy.$passCode) {
const data = res.data || {}
......@@ -689,7 +691,7 @@ const getProductDetail = async () => {
let coverageArea = data.coverageArea || [];
if (data.coverageArea?.[0]?.[0] == 'all') {
setFormItems({ ...flowDetail.value, coverageArea: coverageArea }, true);
console.log(formInfo.value.items);
// console.log(formInfo.value.items);
} else {
let p: any = [];
data.coverageArea.forEach(area => {
......@@ -746,7 +748,7 @@ const getApproveData = () => {
getApproveList(guid).then((res: any) => {
approveTableInfo.value.loading = false;
if (res.code == proxy.$passCode) {
console.log(res.data);
// console.log(res.data);
approveTableInfo.value.data = res.data || [];
} else {
ElMessage.error(res.msg);
......@@ -786,7 +788,7 @@ const submitForm = (btn, formEl, tosub = false) => {
delete params.productImgList;
params.coverageArea = subForm.value.coverageAreas == 'Y' ? [['all']] : subForm.value.coverageArea;
params.productPic = subForm.value.productImg.length ? { name: subForm.value.productImg[0].name, url: subForm.value.productImg[0].url } : {};
console.log(params, formInfo.value.items.at(3).defaultValue, formInfo.value, '-----------------');
// console.log(params, formInfo.value.items.at(3).defaultValue, formInfo.value, '-----------------');
params.caseNumber = parseInt(params.caseNumber.replace(/,/g, ''), 10),
params.dataScale = parseInt(params.dataScale.replace(/,/g, ''), 10),
params.timeAreaStart = params.dateRange ? params.dateRange[0] : '';
......@@ -858,7 +860,7 @@ const submitForm = (btn, formEl, tosub = false) => {
} else {
if (detailType == 'add') {
// 上架交易所
console.log(params, '--------上架交易所 ---------');
// console.log(params, '--------上架交易所 ---------');
params.immediateApprove = btn.value == 'submit' ? true : false;
params.registrationCertificate = params.registrationCertificateInfo.length ? { name: params.registrationCertificateInfo[0].name, url: params.registrationCertificateInfo[0].url } : {};
params.accreditFile = params.accreditFileInfo.length ? [{
......@@ -891,7 +893,7 @@ const submitForm = (btn, formEl, tosub = false) => {
delete params.costAssessmentFileInfo;
delete params.productDetailInfo;
delete params.qualityEvaluationFileInfo;
console.log(params, '-------rwrwerwer----------');
// console.log(params, '-------rwrwerwer----------');
listingSave(params).then((res: any) => {
if (res.code == proxy.$passCode) {
ElMessage({
......@@ -955,7 +957,7 @@ const submitForm = (btn, formEl, tosub = false) => {
delete params.costAssessmentFileInfo;
delete params.productDetailInfo;
delete params.qualityEvaluationFileInfo;
console.log(params, '-------rwrwerwer----------');
// console.log(params, '-------rwrwerwer----------');
listingUpdate(params).then((res: any) => {
if (res.code == proxy.$passCode) {
ElMessage({
......@@ -1122,7 +1124,7 @@ const btnClick = (btn) => {
}
const setFormItems = (row: any = null, isDetail = false) => {
console.log(row, '--------1---------');
// console.log(row, '--------1---------');
formInfo.value.items.forEach((item: any) => {
if (item.field == 'productImg') {
// item.default = row ? (row.productPic ? [row.productPic] : row[item.field] || []) : []
......@@ -1168,7 +1170,7 @@ const setFormItems = (row: any = null, isDetail = false) => {
item.default = row ? row[item.field] : (item.default || '')
}
} else if (item.field == 'dateRange') {
console.log(row, '--------2-22--------');
// console.log(row, '--------2-22--------');
if (row.dateRange) {
item.default = row.dateRange;
}
......@@ -1196,6 +1198,14 @@ const setFormItems = (row: any = null, isDetail = false) => {
else if (item.field == 'qualityEvaluationFileInfo') {
item.default = row ? (row.evaluationFile ? row.evaluationFile : row[item.field] || []) : []
}
else if (item.field == 'productPrice') {
item.default = row[item.field] || '';
item.visible = row?.pricingWay != '4';
}
else if (item.field == 'priceUnit') {
item.default = row[item.field] || '';
item.visible = row?.pricingWay != '4';
}
else {
item.default = row[item.field] !== undefined ? row[item.field] : (item.default || '');
// if (item && item.hasOwnProperty('default')) {
......@@ -1209,37 +1219,32 @@ const setFormItems = (row: any = null, isDetail = false) => {
const selectChange = async (val, row, info) => {
if (row.field == 'damName') {
console.log(val, row, info, '--------1123123---------');
// console.log(val, row, info, '--------1123123---------');
if (!val) {
return;
}
const data = row.options.filter(o => o.damName == val);
let coverageArea = (data.length && data[0].coverageArea) ? data[0].coverageArea : [];
await setFormItems({ ...info, coverageArea: coverageArea });
formInfo.value.items.forEach((item: any) => {
if (item.field == 'costAssessmentFileInfo') {
item.default = data?.[0]?.assessmentFile || [];
} else if (item.field == 'qualityEvaluationFileInfo') {
item.default = data?.[0]?.evaluationFile || [];
} else if (item.field == 'qualityEvaluationFileInfo') {
item.default = data?.[0]?.evaluationFile || [];
} else if (item.field == 'commitmentLetterInfo') {
item.default = data?.[0]?.commitmentLetter || [];
} else if (item.field == 'qualityEvaluationInstitution') {
item.default = data?.[0]?.qualityEvaluationInstitution || '';
} else if (item.field == 'costAssessmentInstitution') {
item.default = data?.[0]?.costAssessmentInstitution || '';
}
// else if (item.field == 'pricingWay') {
// item.default = data?.[0]?.fixPriceWay || '';
// } else if (item.field == 'productPrice') {
// item.default = data?.[0]?.pricingAmount || '';
// } else if (item.field == 'priceUnit') {
// item.default = data?.[0]?.priceUnit || '';
// }
});
formInfo.value.items.at(0).default = val;
// formInfo.value.items.forEach((item: any) => {
// if (item.field == 'costAssessmentFileInfo') {
// item.default = data?.[0]?.assessmentFile || [];
// } else if (item.field == 'qualityEvaluationFileInfo') {
// item.default = data?.[0]?.evaluationFile || [];
// } else if (item.field == 'qualityEvaluationFileInfo') {
// item.default = data?.[0]?.evaluationFile || [];
// } else if (item.field == 'commitmentLetterInfo') {
// item.default = data?.[0]?.commitmentLetter || [];
// } else if (item.field == 'qualityEvaluationInstitution') {
// item.default = data?.[0]?.qualityEvaluationInstitution || '';
// } else if (item.field == 'costAssessmentInstitution') {
// item.default = data?.[0]?.costAssessmentInstitution || '';
// } else if (item.field == 'pricingWay') {
// item.default = data?.[0]?.pricingWay || '';
// }
// });
// formInfo.value.items.at(0).default = val;
formInfo.value.items.at(1).default = data.length ? data[0].damType : '';
// formInfo.value.items.at(2).default = data.length ? data[0].subjectDomain : '';
formInfo.value.items.at(2).default = data.length ? data[0].damCode : '';
......@@ -1254,24 +1259,28 @@ const selectChange = async (val, row, info) => {
formInfo.value.items.at(-1).default = data.length ? data[0].subjectDomain : '';
// formInfo.value.items.at(-3).required = data[0].damType != '1' && data[0].damType != '2';
// formInfo.value.items.at(-4).required = data[0].damType != '1' && data[0].damType != '2';
if (data.length && data[0].coverageArea?.[0]?.[0] != 'all' && data[0].coverageArea) {
let p: any = [];
data[0].coverageArea.forEach(area => {
if (p.includes(area[0])) {
return;
}
p.push(area[0]);
getArea({ value: area[0], level: 1 }, () => { })
});
let ps: any = []
for (const key in getAreaDataPromise.value) {
ps.push(getAreaDataPromise.value[key])
}
Promise.all(ps).then(() => {
const fInfo = listingFormRef.value.formInline;
setFormItems({ ...fInfo, coverageArea: coverageArea });
});
}
// if (data.length && data[0].coverageArea?.[0]?.[0] != 'all' && data[0].coverageArea) {
// let p: any = [];
// data[0].coverageArea.forEach(area => {
// if (p.includes(area[0])) {
// return;
// }
// p.push(area[0]);
// getArea({ value: area[0], level: 1 }, () => { })
// });
// let ps: any = []
// for (const key in getAreaDataPromise.value) {
// ps.push(getAreaDataPromise.value[key])
// }
// Promise.all(ps).then(() => {
// const fInfo = listingFormRef.value.formInline;
// setFormItems({ ...fInfo, coverageArea: coverageArea });
// });
// }
} else if (row.field == 'pricingWay') {
await setFormItems({ ...info });
formInfo.value.items.at(9).visible = val != '4';
formInfo.value.items.at(10).visible = val != '4';
}
}
......@@ -1752,7 +1761,7 @@ const passCommonDialogInfo = ref({
{
label: '',
type: "textarea",
placeholder: "请填写通过理由(填)",
placeholder: "请填写通过理由(非必填)",
field: "approveSuggest",
clearable: true,
maxlength: 400,
......@@ -2318,7 +2327,8 @@ const rejectDialogBtnClick = (btn, info) => {
</div>
</div>
</div>
<div class="panel_wrap" v-if="(detailType == 'detail') && flowDetail.complianceInfo && Object.keys(flowDetail.complianceInfo).length > 0">
<div class="panel_wrap"
v-if="(detailType == 'detail') && flowDetail.complianceInfo && Object.keys(flowDetail.complianceInfo).length > 0">
<div class="panel_header">
<div class="header_title">
<span class="title_text">
......@@ -2330,35 +2340,51 @@ const rejectDialogBtnClick = (btn, info) => {
<div class="list_panel">
<div class="list_item">
<span class="item_label t_left">是否遵守隐私法律和数据保护法规:</span>
<span class="item_value">{{ flowDetail.complianceInfo?.[1] ? (flowDetail.complianceInfo?.[1] == 'Y' ? '是' : '否') : '--' }}</span>
<span class="item_value">{{ flowDetail.complianceInfo?.[1] ? (flowDetail.complianceInfo?.[1] == 'Y' ? '是'
: '否')
: '--' }}</span>
</div>
<div class="list_item">
<span class="item_label t_left">不存在侵犯他人版权的信息:</span>
<span class="item_value">{{ flowDetail.complianceInfo?.[2] ? (flowDetail.complianceInfo?.[2] == 'Y' ? '是' : '否') : '--' }}</span>
<span class="item_value">{{ flowDetail.complianceInfo?.[2] ? (flowDetail.complianceInfo?.[2] == 'Y' ? '是'
: '否')
: '--' }}</span>
</div>
<div class="list_item">
<span class="item_label t_left">是否符合研究伦理:</span>
<span class="item_value">{{ flowDetail.complianceInfo?.[3] ? (flowDetail.complianceInfo?.[3] == 'Y' ? '是' : '否') : '--' }}</span>
<span class="item_value">{{ flowDetail.complianceInfo?.[3] ? (flowDetail.complianceInfo?.[3] == 'Y' ? '是'
: '否')
: '--' }}</span>
</div>
<div class="list_item">
<span class="item_label t_left">是否遵守道德标准:</span>
<span class="item_value">{{ flowDetail.complianceInfo?.[4] ? (flowDetail.complianceInfo?.[4] == 'Y' ? '是' : '否') : '--' }}</span>
<span class="item_value">{{ flowDetail.complianceInfo?.[4] ? (flowDetail.complianceInfo?.[4] == 'Y' ? '是'
: '否')
: '--' }}</span>
</div>
<div class="list_item">
<span class="item_label t_left">数据来源是否合规:</span>
<span class="item_value">{{ flowDetail.complianceInfo?.[6] ? (flowDetail.complianceInfo?.[6] == 'Y' ? '是' : '否') : '--' }}</span>
<span class="item_value">{{ flowDetail.complianceInfo?.[6] ? (flowDetail.complianceInfo?.[6] == 'Y' ? '是'
: '否')
: '--' }}</span>
</div>
<div class="list_item">
<span class="item_label t_left">相关文档审查是否合规:</span>
<span class="item_value">{{ flowDetail.complianceInfo?.[7] ? (flowDetail.complianceInfo?.[7] == 'Y' ? '是' : '否') : '--' }}</span>
<span class="item_value">{{ flowDetail.complianceInfo?.[7] ? (flowDetail.complianceInfo?.[7] == 'Y' ? '是'
: '否')
: '--' }}</span>
</div>
<div class="list_item">
<span class="item_label t_left">是否符合国家标准及要求:</span>
<span class="item_value">{{ flowDetail.complianceInfo?.[8] ? (flowDetail.complianceInfo?.[8] == 'Y' ? '是' : '否') : '--' }}</span>
<span class="item_value">{{ flowDetail.complianceInfo?.[8] ? (flowDetail.complianceInfo?.[8] == 'Y' ? '是'
: '否')
: '--' }}</span>
</div>
<div class="list_item">
<span class="item_label t_left">数据内容是否合规:</span>
<span class="item_value">{{ flowDetail.complianceInfo?.[5] ? (flowDetail.complianceInfo?.[5] == 'Y' ? '是' : '否') : '--' }}</span>
<span class="item_value">{{ flowDetail.complianceInfo?.[5] ? (flowDetail.complianceInfo?.[5] == 'Y' ? '是'
: '否')
: '--' }}</span>
</div>
</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!