41aeabdf by lihua

修复重新提交的问题

1 parent 27771cee
......@@ -1989,12 +1989,18 @@ onBeforeMount(async () => {
})
if (guid) {
fullscreenLoading.value = true;
Promise.all([ps1, ps2]).then(() => {
getRegiaterDetail({ guid: guid }).then((res: any) => {
let ps3 = getRegisterCatalogListData();
Promise.all([ps1, ps2, ps3]).then(() => {
getRegiaterDetail({ guid: guid }).then(async (res: any) => {
fullscreenLoading.value = false;
if (res?.code == proxy.$passCode) {
detailInfo.value = res.data || {};
getRegisterCatalogListData();
// detailInfo.value.productName = detailInfo.value.damGuid ? detailInfo.value.damGuid : detailInfo.value.productName;
if (detailInfo.value.damGuid) {
const opt = registerCatalogList.value.find(item => item.guid == detailInfo.value.damGuid);
productBaseInfoItems.value[0].default = opt ? opt.guid : detailInfo.value.productName;
detailInfo.value.productName = productBaseInfoItems.value[0].default;
}
detailInfo.value.dataSources = (detailInfo.value.dataSources || '') + '';
detailInfo.value.productKeywords = detailInfo.value.productKeywords || [];
let dataCoverage = detailInfo.value.dataCoverage;
......@@ -2009,7 +2015,6 @@ onBeforeMount(async () => {
if (approveVO && (approveVO.approveState == 'C' || approveVO.approveState == 'R') && approveVO.staffGuid == userData.staffGuid && detailInfo.value.bizApproveState != 'D') {
restart.value = true;
}
detailInfo.value.productName = detailInfo.value.damGuid ? detailInfo.value.damGuid : detailInfo.value.productName;
setProductBaseFormItems(detailInfo.value);
let dataCoverageTimeRange: string[] = [];
let dataCoverageStartTime = detailInfo.value.registerRSVO.dataCoverageStartTime;
......@@ -2089,14 +2094,16 @@ onBeforeMount(async () => {
})
const getRegisterCatalogListData = () => {
getRegisterCatalogList().then((res: any) => {
return getRegisterCatalogList().then((res: any) => {
if (res.code == proxy.$passCode) {
const data = res.data || [];
productBaseInfoItems.value[0].options = registerCatalogList.value = data;
if (guid) {
const opt = detailInfo.value.damGuid && data.find(item => item.guid == detailInfo.value.damGuid);
productBaseInfoItems.value[0].default = opt ? opt.guid : detailInfo.value.productName;
}
// if (detailInfo.value.damGuid) {
// const opt = data.find(item => item.guid == detailInfo.value.damGuid);
// productBaseInfoItems.value[0].default = opt ? opt.guid : detailInfo.value.productName;
// detailInfo.value.productName = productBaseInfoItems.value[0].default;
// }
return;
// let dataScaleItem = baseFormItems.value.find(item => item.field == 'dataScale');
// if (draftDetailInfo.value.damGuid) {
// let da = registerCatalogList.value.find(r => r.guid == draftDetailInfo.value.damGuid);
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!