523be5d0 by lihua

修复重新提交的问题

1 parent fd62d0fd
...@@ -1989,12 +1989,18 @@ onBeforeMount(async () => { ...@@ -1989,12 +1989,18 @@ onBeforeMount(async () => {
1989 }) 1989 })
1990 if (guid) { 1990 if (guid) {
1991 fullscreenLoading.value = true; 1991 fullscreenLoading.value = true;
1992 Promise.all([ps1, ps2]).then(() => { 1992 let ps3 = getRegisterCatalogListData();
1993 getRegiaterDetail({ guid: guid }).then((res: any) => { 1993 Promise.all([ps1, ps2, ps3]).then(() => {
1994 getRegiaterDetail({ guid: guid }).then(async (res: any) => {
1994 fullscreenLoading.value = false; 1995 fullscreenLoading.value = false;
1995 if (res?.code == proxy.$passCode) { 1996 if (res?.code == proxy.$passCode) {
1996 detailInfo.value = res.data || {}; 1997 detailInfo.value = res.data || {};
1997 getRegisterCatalogListData(); 1998 // detailInfo.value.productName = detailInfo.value.damGuid ? detailInfo.value.damGuid : detailInfo.value.productName;
1999 if (detailInfo.value.damGuid) {
2000 const opt = registerCatalogList.value.find(item => item.guid == detailInfo.value.damGuid);
2001 productBaseInfoItems.value[0].default = opt ? opt.guid : detailInfo.value.productName;
2002 detailInfo.value.productName = productBaseInfoItems.value[0].default;
2003 }
1998 detailInfo.value.dataSources = (detailInfo.value.dataSources || '') + ''; 2004 detailInfo.value.dataSources = (detailInfo.value.dataSources || '') + '';
1999 detailInfo.value.productKeywords = detailInfo.value.productKeywords || []; 2005 detailInfo.value.productKeywords = detailInfo.value.productKeywords || [];
2000 let dataCoverage = detailInfo.value.dataCoverage; 2006 let dataCoverage = detailInfo.value.dataCoverage;
...@@ -2009,7 +2015,6 @@ onBeforeMount(async () => { ...@@ -2009,7 +2015,6 @@ onBeforeMount(async () => {
2009 if (approveVO && (approveVO.approveState == 'C' || approveVO.approveState == 'R') && approveVO.staffGuid == userData.staffGuid && detailInfo.value.bizApproveState != 'D') { 2015 if (approveVO && (approveVO.approveState == 'C' || approveVO.approveState == 'R') && approveVO.staffGuid == userData.staffGuid && detailInfo.value.bizApproveState != 'D') {
2010 restart.value = true; 2016 restart.value = true;
2011 } 2017 }
2012 detailInfo.value.productName = detailInfo.value.damGuid ? detailInfo.value.damGuid : detailInfo.value.productName;
2013 setProductBaseFormItems(detailInfo.value); 2018 setProductBaseFormItems(detailInfo.value);
2014 let dataCoverageTimeRange: string[] = []; 2019 let dataCoverageTimeRange: string[] = [];
2015 let dataCoverageStartTime = detailInfo.value.registerRSVO.dataCoverageStartTime; 2020 let dataCoverageStartTime = detailInfo.value.registerRSVO.dataCoverageStartTime;
...@@ -2089,14 +2094,16 @@ onBeforeMount(async () => { ...@@ -2089,14 +2094,16 @@ onBeforeMount(async () => {
2089 }) 2094 })
2090 2095
2091 const getRegisterCatalogListData = () => { 2096 const getRegisterCatalogListData = () => {
2092 getRegisterCatalogList().then((res: any) => { 2097 return getRegisterCatalogList().then((res: any) => {
2093 if (res.code == proxy.$passCode) { 2098 if (res.code == proxy.$passCode) {
2094 const data = res.data || []; 2099 const data = res.data || [];
2095 productBaseInfoItems.value[0].options = registerCatalogList.value = data; 2100 productBaseInfoItems.value[0].options = registerCatalogList.value = data;
2096 if (guid) { 2101 // if (detailInfo.value.damGuid) {
2097 const opt = detailInfo.value.damGuid && data.find(item => item.guid == detailInfo.value.damGuid); 2102 // const opt = data.find(item => item.guid == detailInfo.value.damGuid);
2098 productBaseInfoItems.value[0].default = opt ? opt.guid : detailInfo.value.productName; 2103 // productBaseInfoItems.value[0].default = opt ? opt.guid : detailInfo.value.productName;
2099 } 2104 // detailInfo.value.productName = productBaseInfoItems.value[0].default;
2105 // }
2106 return;
2100 // let dataScaleItem = baseFormItems.value.find(item => item.field == 'dataScale'); 2107 // let dataScaleItem = baseFormItems.value.find(item => item.field == 'dataScale');
2101 // if (draftDetailInfo.value.damGuid) { 2108 // if (draftDetailInfo.value.damGuid) {
2102 // let da = registerCatalogList.value.find(r => r.guid == draftDetailInfo.value.damGuid); 2109 // 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!