Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
752e1625 by lihua
Options

流程传参修改

1 parent 5caf6b58
Inline Side-by-side
Showing 14 changed files with 64 additions and 98 deletions
src/api/modules/dataAsset.ts
...@@ -324,9 +324,10 @@ export const existDamName = (params) => request({ ...@@ -324,9 +324,10 @@ export const existDamName = (params) => request({
324 }); 324 });
325 325
326 /** 获取资产目录基本信息的详情 */ 326 /** 获取资产目录基本信息的详情 */
327 export const getRegisterCatalogDetail = (guid) => request({ 327 export const getRegisterCatalogDetail = (params) => request({
328 url: `${import.meta.env.VITE_API_NEW_PORTAL}/dam-catalog-table/detail?guid=${guid}`, 328 url: `${import.meta.env.VITE_API_NEW_PORTAL}/dam-catalog-table/detail`,
329 method: 'get' 329 method: 'get',
330 params
330 }); 331 });
331 332
332 /** 获取资产目录表的详情 */ 333 /** 获取资产目录表的详情 */
......
src/api/modules/dataProduct.ts
...@@ -40,8 +40,8 @@ export const getListingCount = () => request({ ...@@ -40,8 +40,8 @@ export const getListingCount = () => request({
40 }) 40 })
41 41
42 // 驳回流程数据 42 // 驳回流程数据
43 export const productRejectFlowData = (data) => request({ 43 export const productRejectFlowData = (data, serviceTenantGuid: any = null ) => request({
44 url: `${import.meta.env.VITE_API_NEW_PORTAL}/product-grounding/submit-flow`, 44 url: `${import.meta.env.VITE_API_NEW_PORTAL}/product-grounding/submit-flow${ serviceTenantGuid ? `?serviceTenantGuid=${serviceTenantGuid}` : '' }`,
45 method: 'post', 45 method: 'post',
46 data 46 data
47 }) 47 })
......
src/api/modules/workFlowService.ts
...@@ -9,20 +9,20 @@ export const getProcessFlowDetail = (params) => request({ ...@@ -9,20 +9,20 @@ export const getProcessFlowDetail = (params) => request({
9 method: 'post', 9 method: 'post',
10 }) 10 })
11 // 审批通过 11 // 审批通过
12 export const passFlowData = (params) => request({ 12 export const passFlowData = (params, serviceTenantGuid:any=null) => request({
13 url: `${import.meta.env.VITE_APP_WORK_FLOW_URL}/work-flow/data/allow-flow`, 13 url: `${import.meta.env.VITE_APP_WORK_FLOW_URL}/work-flow/data/allow-flow${ serviceTenantGuid ? `?serviceTenantGuid=${serviceTenantGuid}` : '' }`,
14 method: 'post', 14 method: 'post',
15 data: params 15 data: params
16 }) 16 })
17 // 审批驳回 17 // 审批驳回
18 export const rejectFlowData = (params) => request({ 18 export const rejectFlowData = (params, serviceTenantGuid:any=null) => request({
19 url: `${import.meta.env.VITE_APP_WORK_FLOW_URL}/work-flow/data/backup-flow`, 19 url: `${import.meta.env.VITE_APP_WORK_FLOW_URL}/work-flow/data/backup-flow${ serviceTenantGuid ? `?serviceTenantGuid=${serviceTenantGuid}` : '' }`,
20 method: 'post', 20 method: 'post',
21 data: params 21 data: params
22 }) 22 })
23 // 审批撤销 23 // 审批撤销
24 export const revokeFlowData = (params) => request({ 24 export const revokeFlowData = (params, serviceTenantGuid:any=null) => request({
25 url: `${import.meta.env.VITE_APP_WORK_FLOW_URL}/work-flow/data/canal-flow`, 25 url: `${import.meta.env.VITE_APP_WORK_FLOW_URL}/work-flow/data/canal-flow${ serviceTenantGuid ? `?serviceTenantGuid=${serviceTenantGuid}` : '' }`,
26 method: 'post', 26 method: 'post',
27 data: params 27 data: params
28 }) 28 })
......
src/store/modules/user.ts
...@@ -61,7 +61,7 @@ const useUserStore = defineStore( ...@@ -61,7 +61,7 @@ const useUserStore = defineStore(
61 userName.value = res.data.staffName; 61 userName.value = res.data.staffName;
62 localStorage.setItem('userName', res.data?.staffName); 62 localStorage.setItem('userName', res.data?.staffName);
63 localStorage.setItem('userData', JSON.stringify(res.data)); 63 localStorage.setItem('userData', JSON.stringify(res.data));
64 return getSystemMenu({ tenantGuid: currentTenantGuid.value }, res.data?.isAdmin == 'Y' && res.data?.superTubeFlag == 'Y').then((info: any) => { //解决页面调用流程接口传递staffGuid，为空的问题 64 return getSystemMenu({ tenantGuid: currentTenantGuid.value }, res.data?.isAdmin == 'Y' && (!res.data?.superTubeFlag || res.data?.superTubeFlag == 'Y')).then((info: any) => { //解决页面调用流程接口传递staffGuid，为空的问题
65 if (info.code == '00000') { 65 if (info.code == '00000') {
66 localStorage.setItem('userInfoData', JSON.stringify(info.data)); 66 localStorage.setItem('userInfoData', JSON.stringify(info.data));
67 userInfoData.value = info.data; 67 userInfoData.value = info.data;
......
src/views/data_asset/certificateManagement.vue
...@@ -192,7 +192,7 @@ const tableBtnClick = (scope, btn) => { ...@@ -192,7 +192,7 @@ const tableBtnClick = (scope, btn) => {
192 } if (type === 'path_detail') { // 详情 192 } if (type === 'path_detail') { // 详情
193 router.push({ 193 router.push({
194 name: 'certificateDetail', 194 name: 'certificateDetail',
195 query: { guid: row.registerGuid, certificateGuid: row.guid, type: 'certificate', daTenantGuid: row.tenantGuid } 195 query: { guid: row.registerGuid, certificateGuid: row.guid, type: 'certificate', serviceTenantGuid: row.tenantGuid }
196 }); 196 });
197 } 197 }
198 }; 198 };
......
src/views/data_asset/qualityEvaluate.vue
...@@ -107,7 +107,8 @@ const getTableData = () => { ...@@ -107,7 +107,8 @@ const getTableData = () => {
107 pageSize: page.value.limit, 107 pageSize: page.value.limit,
108 pageIndex: page.value.curr, 108 pageIndex: page.value.curr,
109 daName: page.value.daName, 109 daName: page.value.daName,
110 approveState: page.value.approveState 110 approveState: page.value.approveState,
111 currentStaffGuid: userData.staffGuid
111 }).then((res: any) => { 112 }).then((res: any) => {
112 tableInfo.value.loading = false 113 tableInfo.value.loading = false
113 if (res.code == proxy.$passCode) { 114 if (res.code == proxy.$passCode) {
...@@ -258,6 +259,7 @@ const tableBtnClick = (scope, btn) => { ...@@ -258,6 +259,7 @@ const tableBtnClick = (scope, btn) => {
258 guid: row.approveVO.approveGuid, 259 guid: row.approveVO.approveGuid,
259 flowType: row.approveVO.flowType, 260 flowType: row.approveVO.flowType,
260 approveStaffGuid: userData.staffGuid, 261 approveStaffGuid: userData.staffGuid,
262 serviceTenantGuid: row.tenantGuid
261 }).then((res: any) => { 263 }).then((res: any) => {
262 if (res.code == '00000') { 264 if (res.code == '00000') {
263 ElMessage.success('撤销成功！') 265 ElMessage.success('撤销成功！')
...@@ -276,18 +278,18 @@ const tableBtnClick = (scope, btn) => { ...@@ -276,18 +278,18 @@ const tableBtnClick = (scope, btn) => {
276 if (row.registerApproveState == 'Y') { 278 if (row.registerApproveState == 'Y') {
277 router.push({ 279 router.push({
278 name: 'registerDetail', 280 name: 'registerDetail',
279 query: { guid: row.registerGuid, evaGuid: row.guid, type: 'qualityEvaluate', daTenantGuid: row.tenantGuid } 281 query: { guid: row.registerGuid, evaGuid: row.guid, type: 'qualityEvaluate', serviceTenantGuid: row.tenantGuid }
280 }); 282 });
281 } else { 283 } else {
282 router.push({ 284 router.push({
283 name: 'evaCatalogDetail', 285 name: 'evaCatalogDetail',
284 query: { guid: row.damGuid, evaGuid: row.guid, type: 'qualityEvaluate' } 286 query: { guid: row.damGuid, evaGuid: row.guid, type: 'qualityEvaluate', serviceTenantGuid: row.tenantGuid }
285 }); 287 });
286 } 288 }
287 } else if (type == 'productDetail') { 289 } else if (type == 'productDetail') {
288 router.push({ 290 router.push({
289 name: 'registerCatalogDetail', 291 name: 'registerCatalogDetail',
290 query: { guid: row.damGuid } 292 query: { guid: row.damGuid, serviceTenantGuid: row.tenantGuid }
291 }); 293 });
292 } 294 }
293 }; 295 };
...@@ -653,6 +655,7 @@ const passDialogBtnClick = (btn, info) => { ...@@ -653,6 +655,7 @@ const passDialogBtnClick = (btn, info) => {
653 url: file.url 655 url: file.url
654 } 656 }
655 }) || [], 657 }) || [],
658 serviceTenantGuid: currTableData.value.tenantGuid
656 }).then((res: any) => { 659 }).then((res: any) => {
657 passDialogInfo.value.footer.btns[1].loading = false; 660 passDialogInfo.value.footer.btns[1].loading = false;
658 if (res?.code == proxy.$passCode) { 661 if (res?.code == proxy.$passCode) {
...@@ -720,7 +723,8 @@ const rejectDialogBtnClick = (btn, info) => { ...@@ -720,7 +723,8 @@ const rejectDialogBtnClick = (btn, info) => {
720 guid: row.approveVO.approveGuid, 723 guid: row.approveVO.approveGuid,
721 flowType: row.approveVO.flowType, 724 flowType: row.approveVO.flowType,
722 approveStaffGuid: userData.staffGuid, 725 approveStaffGuid: userData.staffGuid,
723 approveSuggest: info.approveSuggest 726 approveSuggest: info.approveSuggest,
727 serviceTenantGuid: currTableData.value.tenantGuid
724 } 728 }
725 rejectFlowData(params).then((res: any) => { 729 rejectFlowData(params).then((res: any) => {
726 rejectDialogInfo.value.footer.btns[1].loading = false; 730 rejectDialogInfo.value.footer.btns[1].loading = false;
......
src/views/data_asset/registerCatalogCreate.vue
...@@ -523,7 +523,7 @@ onBeforeMount(() => { ...@@ -523,7 +523,7 @@ onBeforeMount(() => {
523 if (damGuid.value) { 523 if (damGuid.value) {
524 fullscreenLoading.value = true; 524 fullscreenLoading.value = true;
525 525
526 getRegisterCatalogDetail(damGuid.value).then((res: any) => { 526 getRegisterCatalogDetail({ guid: damGuid.value }).then((res: any) => {
527 fullscreenLoading.value = false; 527 fullscreenLoading.value = false;
528 if (res.code == proxy.$passCode) { 528 if (res.code == proxy.$passCode) {
529 detailInfo.value = res.data || {}; 529 detailInfo.value = res.data || {};
......
src/views/data_asset/registerCatalogDetail.vue
...@@ -86,7 +86,7 @@ const processInstanceId = ref(''); ...@@ -86,7 +86,7 @@ const processInstanceId = ref('');
86 86
87 const getDetailInfo = () => { 87 const getDetailInfo = () => {
88 fullscreenLoading.value = true; 88 fullscreenLoading.value = true;
89 getRegisterCatalogDetail(catalogGuid).then((res: any) => { 89 getRegisterCatalogDetail({ guid: catalogGuid, serviceTenantGuid: route.query.serviceTenantGuid }).then((res: any) => {
90 if (res.code == proxy.$passCode) { 90 if (res.code == proxy.$passCode) {
91 const data = res.data || {}; 91 const data = res.data || {};
92 detailInfo.value = data; 92 detailInfo.value = data;
...@@ -110,7 +110,7 @@ const getDetailInfo = () => { ...@@ -110,7 +110,7 @@ const getDetailInfo = () => {
110 } 110 }
111 }); 111 });
112 if (evaGuid) { 112 if (evaGuid) {
113 getEvaDetail({ guid: evaGuid }).then((res: any) => { 113 getEvaDetail({ guid: evaGuid, serviceTenantGuid: route.query.serviceTenantGuid }).then((res: any) => {
114 if (res.code == proxy.$passCode) { 114 if (res.code == proxy.$passCode) {
115 const data = res.data || {}; 115 const data = res.data || {};
116 evaDetailInfo.value = data; 116 evaDetailInfo.value = data;
...@@ -122,7 +122,7 @@ const getDetailInfo = () => { ...@@ -122,7 +122,7 @@ const getDetailInfo = () => {
122 }); 122 });
123 } 123 }
124 if (costAssessGuid) { 124 if (costAssessGuid) {
125 getCostDetail({ guid: costAssessGuid }).then((res: any) => { 125 getCostDetail({ guid: costAssessGuid, serviceTenantGuid: route.query.serviceTenantGuid }).then((res: any) => {
126 if (res.code == proxy.$passCode) { 126 if (res.code == proxy.$passCode) {
127 const data = res.data || {}; 127 const data = res.data || {};
128 costAssessDetail.value = data; 128 costAssessDetail.value = data;
......
src/views/data_asset/registerDetail.vue
...@@ -50,7 +50,7 @@ const detailType: any = ref(route.query.type); ...@@ -50,7 +50,7 @@ const detailType: any = ref(route.query.type);
50 const evaGuid: any = ref(route.query.evaGuid); 50 const evaGuid: any = ref(route.query.evaGuid);
51 const costAssessGuid: any = ref(route.query.costAssessGuid); 51 const costAssessGuid: any = ref(route.query.costAssessGuid);
52 const certificateGuid: any = ref(route.query.certificateGuid); 52 const certificateGuid: any = ref(route.query.certificateGuid);
53 const daTenantGuid: any = ref(route.query.daTenantGuid); 53 const serviceTenantGuid: any = ref(route.query.serviceTenantGuid);
54 54
55 const contentRef = ref(); 55 const contentRef = ref();
56 const tabsInfo = ref({ 56 const tabsInfo = ref({
...@@ -77,7 +77,7 @@ const getDetailInfo = () => { ...@@ -77,7 +77,7 @@ const getDetailInfo = () => {
77 fullscreenLoading.value = true; 77 fullscreenLoading.value = true;
78 if (detailType.value == 'qualityEvaluate') { 78 if (detailType.value == 'qualityEvaluate') {
79 let ps: any = []; 79 let ps: any = [];
80 ps.push(getEvaDetail({ guid: evaGuid.value }).then((res: any) => { 80 ps.push(getEvaDetail({ guid: evaGuid.value, serviceTenantGuid: serviceTenantGuid.value }).then((res: any) => {
81 if (res.code == proxy.$passCode) { 81 if (res.code == proxy.$passCode) {
82 const data = res.data || {}; 82 const data = res.data || {};
83 evaDetailInfo.value = data; 83 evaDetailInfo.value = data;
...@@ -107,7 +107,7 @@ const getDetailInfo = () => { ...@@ -107,7 +107,7 @@ const getDetailInfo = () => {
107 }).catch(() => { 107 }).catch(() => {
108 fullscreenLoading.value = false; 108 fullscreenLoading.value = false;
109 })); 109 }));
110 ps.push(getRegiaterDetail({ guid: assetGuid }).then((res: any) => { 110 ps.push(getRegiaterDetail({ guid: assetGuid, serviceTenantGuid: serviceTenantGuid.value }).then((res: any) => {
111 if (res.code == proxy.$passCode) { 111 if (res.code == proxy.$passCode) {
112 const data = res.data || {}; 112 const data = res.data || {};
113 assetDetailInfo.value = data; 113 assetDetailInfo.value = data;
...@@ -123,7 +123,7 @@ const getDetailInfo = () => { ...@@ -123,7 +123,7 @@ const getDetailInfo = () => {
123 }) 123 })
124 } else if (detailType.value == 'costAssess') { 124 } else if (detailType.value == 'costAssess') {
125 let ps: any = []; 125 let ps: any = [];
126 ps.push(getCostAssessDetail({ guid: costAssessGuid.value }).then((res: any) => { 126 ps.push(getCostAssessDetail({ guid: costAssessGuid.value, serviceTenantGuid: serviceTenantGuid.value }).then((res: any) => {
127 if (res.code == proxy.$passCode) { 127 if (res.code == proxy.$passCode) {
128 const data = res.data || {}; 128 const data = res.data || {};
129 costAssessDetailInfo.value = data; 129 costAssessDetailInfo.value = data;
...@@ -174,7 +174,7 @@ const getDetailInfo = () => { ...@@ -174,7 +174,7 @@ const getDetailInfo = () => {
174 }).catch(() => { 174 }).catch(() => {
175 fullscreenLoading.value = false; 175 fullscreenLoading.value = false;
176 })); 176 }));
177 ps.push(getRegiaterDetail({ guid: assetGuid }).then((res: any) => { 177 ps.push(getRegiaterDetail({ guid: assetGuid, serviceTenantGuid: serviceTenantGuid.value }).then((res: any) => {
178 if (res.code == proxy.$passCode) { 178 if (res.code == proxy.$passCode) {
179 const data = res.data || {}; 179 const data = res.data || {};
180 assetDetailInfo.value = data; 180 assetDetailInfo.value = data;
...@@ -190,7 +190,7 @@ const getDetailInfo = () => { ...@@ -190,7 +190,7 @@ const getDetailInfo = () => {
190 }) 190 })
191 } else if (detailType.value == 'certificate') { 191 } else if (detailType.value == 'certificate') {
192 let ps: any = [], tentData = {}; 192 let ps: any = [], tentData = {};
193 ps.push(getCertificateDetail({ guid: certificateGuid.value }).then((res: any) => { 193 ps.push(getCertificateDetail({ guid: certificateGuid.value, serviceTenantGuid: serviceTenantGuid.value }).then((res: any) => {
194 if (res.code == proxy.$passCode) { 194 if (res.code == proxy.$passCode) {
195 const data = res.data || {}; 195 const data = res.data || {};
196 detailInfo.value = data; 196 detailInfo.value = data;
...@@ -207,7 +207,7 @@ const getDetailInfo = () => { ...@@ -207,7 +207,7 @@ const getDetailInfo = () => {
207 } 207 }
208 let qualityPs: any = []; 208 let qualityPs: any = [];
209 if (detailInfo.value.qualityEvaluationGuid) { 209 if (detailInfo.value.qualityEvaluationGuid) {
210 qualityPs.push(getEvaDetail({ guid: detailInfo.value.qualityEvaluationGuid }).then((res: any) => { 210 qualityPs.push(getEvaDetail({ guid: detailInfo.value.qualityEvaluationGuid, serviceTenantGuid: serviceTenantGuid.value }).then((res: any) => {
211 if (res.code == proxy.$passCode) { 211 if (res.code == proxy.$passCode) {
212 const data = res.data || {}; 212 const data = res.data || {};
213 evaDetailInfo.value = data; 213 evaDetailInfo.value = data;
...@@ -231,7 +231,7 @@ const getDetailInfo = () => { ...@@ -231,7 +231,7 @@ const getDetailInfo = () => {
231 })); 231 }));
232 } 232 }
233 if (detailInfo.value.costAccessmentGuid) { 233 if (detailInfo.value.costAccessmentGuid) {
234 qualityPs.push(getCostAssessDetail({ guid: detailInfo.value.costAccessmentGuid }).then((res: any) => { 234 qualityPs.push(getCostAssessDetail({ guid: detailInfo.value.costAccessmentGuid, serviceTenantGuid: serviceTenantGuid.value }).then((res: any) => {
235 if (res.code == proxy.$passCode) { 235 if (res.code == proxy.$passCode) {
236 const data = res.data || {}; 236 const data = res.data || {};
237 costAssessDetailInfo.value = data; 237 costAssessDetailInfo.value = data;
...@@ -259,7 +259,7 @@ const getDetailInfo = () => { ...@@ -259,7 +259,7 @@ const getDetailInfo = () => {
259 ElMessage.error(res.msg); 259 ElMessage.error(res.msg);
260 } 260 }
261 })); 261 }));
262 ps.push(getRegiaterDetail({ guid: assetGuid }).then((res: any) => { 262 ps.push(getRegiaterDetail({ guid: assetGuid, serviceTenantGuid: serviceTenantGuid.value }).then((res: any) => {
263 if (res.code == proxy.$passCode) { 263 if (res.code == proxy.$passCode) {
264 const data = res.data || {}; 264 const data = res.data || {};
265 assetDetailInfo.value = data; 265 assetDetailInfo.value = data;
...@@ -292,7 +292,7 @@ const getDetailInfo = () => { ...@@ -292,7 +292,7 @@ const getDetailInfo = () => {
292 }) 292 })
293 } else { 293 } else {
294 let ps: any = [] 294 let ps: any = []
295 ps.push(getRegiaterDetail({ guid: assetGuid }).then((res: any) => { 295 ps.push(getRegiaterDetail({ guid: assetGuid, serviceTenantGuid: serviceTenantGuid.value }).then((res: any) => {
296 if (res.code == proxy.$passCode) { 296 if (res.code == proxy.$passCode) {
297 const data = res.data || {}; 297 const data = res.data || {};
298 if (fullPath === route.fullPath) { 298 if (fullPath === route.fullPath) {
...@@ -959,6 +959,7 @@ const passDialogBtnClick = (btn, info) => { ...@@ -959,6 +959,7 @@ const passDialogBtnClick = (btn, info) => {
959 flowType: detailInfo.value.approveVO.flowType, 959 flowType: detailInfo.value.approveVO.flowType,
960 approveSuggest: info.approveSuggest, 960 approveSuggest: info.approveSuggest,
961 approveStaffGuid: userData.staffGuid, 961 approveStaffGuid: userData.staffGuid,
962 serviceTenantGuid: serviceTenantGuid.value
962 } 963 }
963 submitPromise.value = passFlowData(params).then((res: any) => { 964 submitPromise.value = passFlowData(params).then((res: any) => {
964 submitPromise.value = null; 965 submitPromise.value = null;
...@@ -993,6 +994,7 @@ const passDialogBtnClick = (btn, info) => { ...@@ -993,6 +994,7 @@ const passDialogBtnClick = (btn, info) => {
993 url: file.url 994 url: file.url
994 } 995 }
995 }) || [], 996 }) || [],
997 serviceTenantGuid: serviceTenantGuid.value
996 }).then((res: any) => { 998 }).then((res: any) => {
997 submitPromise.value = null; 999 submitPromise.value = null;
998 if (res?.code == proxy.$passCode) { 1000 if (res?.code == proxy.$passCode) {
...@@ -1025,6 +1027,7 @@ const passDialogBtnClick = (btn, info) => { ...@@ -1025,6 +1027,7 @@ const passDialogBtnClick = (btn, info) => {
1025 url: file.url 1027 url: file.url
1026 } 1028 }
1027 }) || [], 1029 }) || [],
1030 serviceTenantGuid: serviceTenantGuid.value
1028 }).then((res: any) => { 1031 }).then((res: any) => {
1029 submitPromise.value = null; 1032 submitPromise.value = null;
1030 if (res?.code == proxy.$passCode) { 1033 if (res?.code == proxy.$passCode) {
...@@ -1113,6 +1116,7 @@ const rejectDialogBtnClick = (btn, info) => { ...@@ -1113,6 +1116,7 @@ const rejectDialogBtnClick = (btn, info) => {
1113 flowType: detailInfo.value.approveVO.flowType, 1116 flowType: detailInfo.value.approveVO.flowType,
1114 approveSuggest: info.approveSuggest, 1117 approveSuggest: info.approveSuggest,
1115 approveStaffGuid: userData.staffGuid, 1118 approveStaffGuid: userData.staffGuid,
1119 serviceTenantGuid: serviceTenantGuid.value
1116 } 1120 }
1117 rejectFlowData(params).then((res: any) => { 1121 rejectFlowData(params).then((res: any) => {
1118 if (res?.code == proxy.$passCode) { 1122 if (res?.code == proxy.$passCode) {
......
src/views/data_asset/registerManagemant.vue
...@@ -269,7 +269,7 @@ const tableBtnClick = (scope, btn) => { ...@@ -269,7 +269,7 @@ const tableBtnClick = (scope, btn) => {
269 } else if (type === 'detail') { // 详情, 若是草稿中，详情就是编辑， 269 } else if (type === 'detail') { // 详情, 若是草稿中，详情就是编辑，
270 router.push({ 270 router.push({
271 name: 'registerInfoDetail', 271 name: 'registerInfoDetail',
272 query: { guid: row.guid, name: row.daName, type: 'asset' } 272 query: { guid: row.guid, name: row.daName, type: 'asset', serviceTenantGuid: row.tenantGuid }
273 }); 273 });
274 } else if (type === 'pass') { 274 } else if (type === 'pass') {
275 passDialogInfo.value.visible = true; 275 passDialogInfo.value.visible = true;
...@@ -433,6 +433,7 @@ const passDialogBtnClick = (btn, info) => { ...@@ -433,6 +433,7 @@ const passDialogBtnClick = (btn, info) => {
433 flowType: currTableData.value.approveVO.flowType, 433 flowType: currTableData.value.approveVO.flowType,
434 approveSuggest: info.approveSuggest, 434 approveSuggest: info.approveSuggest,
435 approveStaffGuid: userData.staffGuid, 435 approveStaffGuid: userData.staffGuid,
436 serviceTenantGuid: currTableData.value.tenantGuid
436 } 437 }
437 passFlowData(params).then((res: any) => { 438 passFlowData(params).then((res: any) => {
438 loading.value = false; 439 loading.value = false;
...@@ -503,6 +504,7 @@ const rejectDialogBtnClick = (btn, info) => { ...@@ -503,6 +504,7 @@ const rejectDialogBtnClick = (btn, info) => {
503 flowType: currTableData.value.approveVO.flowType, 504 flowType: currTableData.value.approveVO.flowType,
504 approveSuggest: info.approveSuggest, 505 approveSuggest: info.approveSuggest,
505 approveStaffGuid: userData.staffGuid, 506 approveStaffGuid: userData.staffGuid,
507 serviceTenantGuid: currTableData.value.tenantGuid
506 } 508 }
507 rejectFlowData(params).then((res: any) => { 509 rejectFlowData(params).then((res: any) => {
508 loading.value = false; 510 loading.value = false;
......
src/views/data_asset/valueEvaluate.vue
...@@ -158,7 +158,8 @@ const getTableData = () => { ...@@ -158,7 +158,8 @@ const getTableData = () => {
158 pageSize: page.value.limit, 158 pageSize: page.value.limit,
159 pageIndex: page.value.curr, 159 pageIndex: page.value.curr,
160 daName: page.value.daName, 160 daName: page.value.daName,
161 approveState: page.value.approveState 161 approveState: page.value.approveState,
162 currentStaffGuid: userData.staffGuid
162 }).then((res: any) => { 163 }).then((res: any) => {
163 tableInfo.value.loading = false; 164 tableInfo.value.loading = false;
164 if (res.code == proxy.$passCode) { 165 if (res.code == proxy.$passCode) {
...@@ -240,30 +241,6 @@ const tableInfo = ref({ ...@@ -240,30 +241,6 @@ const tableInfo = ref({
240 } 241 }
241 }); 242 });
242 243
243 // const getTableBtns = (row) => {
244 // let btnsArr: any[] = [];
245 // if (row.approveState == 'A') {//审批中
246 // btnsArr.push({ label: "详情", value: "path_detail" })
247 // if (row.tenantGuid == userData.tenantGuid) {
248 // btnsArr.push({ label: "撤销", value: "revoke" });
249 // }
250 // if (row.approveTenantGuids?.includes(userData.tenantGuid)) {
251 // btnsArr.push({ label: "通过", value: "pass" });
252 // btnsArr.push({ label: "驳回", value: "backup" });
253 // }
254 // } else if (row.approveState == 'Y') {//已通过的不能删除。
255 // btnsArr.push({ label: "详情", value: "path_detail" })
256 // } else if (row.approveState == 'R' || row.approveState == 'C') {//已驳回或已撤销
257 // btnsArr.push({ label: "详情", value: "path_detail" });
258 // if (row.tenantGuid == userData.tenantGuid) {
259 // btnsArr.push({ label: "重新提交", value: "edit", disabled: false })
260 // }
261 // if (row.tenantGuid == userData.tenantGuid) {
262 // btnsArr.push({ label: "删除", value: "delete" });
263 // }
264 // }
265 // return btnsArr;
266 // }
267 const getTableBtns = (row) => { 244 const getTableBtns = (row) => {
268 let btnsArr: any[] = []; 245 let btnsArr: any[] = [];
269 const approveVO = row.approveVO || {}; 246 const approveVO = row.approveVO || {};
...@@ -403,18 +380,18 @@ const tableBtnClick = (scope, btn) => { ...@@ -403,18 +380,18 @@ const tableBtnClick = (scope, btn) => {
403 if (row.registerApproveState == 'Y') { 380 if (row.registerApproveState == 'Y') {
404 router.push({ 381 router.push({
405 name: 'registerValueDetail', 382 name: 'registerValueDetail',
406 query: { guid: row.registerGuid, costAssessGuid: row.guid, type: 'costAssess', daTenantGuid: row.tenantGuid } 383 query: { guid: row.registerGuid, costAssessGuid: row.guid, type: 'costAssess', serviceTenantGuid: row.tenantGuid }
407 }); 384 });
408 } else { 385 } else {
409 router.push({ 386 router.push({
410 name: 'costAssessDetail', 387 name: 'costAssessDetail',
411 query: { guid: row.damGuid, costAssessGuid: row.guid, type: 'costAssess' } 388 query: { guid: row.damGuid, costAssessGuid: row.guid, type: 'costAssess', serviceTenantGuid: row.tenantGuid }
412 }); 389 });
413 } 390 }
414 } else if (type == 'productDetail') { 391 } else if (type == 'productDetail') {
415 router.push({ 392 router.push({
416 name: 'registerCatalogDetail', 393 name: 'registerCatalogDetail',
417 query: { guid: row.damGuid } 394 query: { guid: row.damGuid, serviceTenantGuid: row.tenantGuid }
418 }); 395 });
419 } 396 }
420 else if (type === 'pass') { 397 else if (type === 'pass') {
...@@ -1013,6 +990,7 @@ const passDialogBtnClick = (btn, info) => { ...@@ -1013,6 +990,7 @@ const passDialogBtnClick = (btn, info) => {
1013 url: file.url 990 url: file.url
1014 } 991 }
1015 }) || [], 992 }) || [],
993 serviceTenantGuid: currTableData.value.tenantGuid
1016 }).then((res: any) => { 994 }).then((res: any) => {
1017 if (res?.code == proxy.$passCode) { 995 if (res?.code == proxy.$passCode) {
1018 if (res.data) { 996 if (res.data) {
...@@ -1070,37 +1048,6 @@ const rejectDialogInfo = ref({ ...@@ -1070,37 +1048,6 @@ const rejectDialogInfo = ref({
1070 }, 1048 },
1071 }); 1049 });
1072 1050
1073 // const rejectDialogBtnClick = (btn, info) => {
1074 // if (btn.value == 'submit') {
1075 // if (info.approveSuggest == '') {
1076 // ElMessage.error('请填写驳回理由');
1077 // return
1078 // }
1079 // tableInfo.value.loading = true;
1080 // let params = {
1081 // bizGuid: currTableData.value.guid,
1082 // funcCode: currTableData.value.funcCode,
1083 // approveSuggest: info.approveSuggest
1084 // }
1085 // registerApproveBackup(params).then((res: any) => {
1086 // tableInfo.value.loading = false;
1087 // if (res?.code == proxy.$passCode) {
1088 // if (res.data) {
1089 // ElMessage.success('驳回成功');
1090 // getTableData();
1091 // rejectDialogInfo.value.visible = false;
1092 // } else {
1093 // ElMessage.error('驳回失败');
1094 // }
1095 // } else {
1096 // ElMessage.error(res.msg);
1097 // }
1098 // });
1099 // } else if (btn.value == 'cancel') {
1100 // rejectDialogInfo.value.visible = false;
1101 // }
1102 // };
1103
1104 const rejectDialogBtnClick = (btn, info) => { 1051 const rejectDialogBtnClick = (btn, info) => {
1105 if (btn.value == 'submit') { 1052 if (btn.value == 'submit') {
1106 if (info.approveSuggest == '') { 1053 if (info.approveSuggest == '') {
...@@ -1114,6 +1061,7 @@ const rejectDialogBtnClick = (btn, info) => { ...@@ -1114,6 +1061,7 @@ const rejectDialogBtnClick = (btn, info) => {
1114 flowType: currTableData.value.approveVO.flowType, 1061 flowType: currTableData.value.approveVO.flowType,
1115 approveSuggest: info.approveSuggest, 1062 approveSuggest: info.approveSuggest,
1116 approveStaffGuid: userData.staffGuid, 1063 approveStaffGuid: userData.staffGuid,
1064 serviceTenantGuid: currTableData.value.tenantGuid
1117 } 1065 }
1118 rejectFlowData(params).then((res: any) => { 1066 rejectFlowData(params).then((res: any) => {
1119 tableInfo.value.loading = false; 1067 tableInfo.value.loading = false;
...@@ -1164,4 +1112,5 @@ const rejectDialogBtnClick = (btn, info) => { ...@@ -1164,4 +1112,5 @@ const rejectDialogBtnClick = (btn, info) => {
1164 // .el-upload__tip { 1112 // .el-upload__tip {
1165 // margin-left: 0px; 1113 // margin-left: 0px;
1166 // } 1114 // }
1167 // }</style> 1115 // }
1116 </style>
......
src/views/data_product/productListing.vue
...@@ -206,7 +206,8 @@ const getTableData = (exchangeGuid = '') => { ...@@ -206,7 +206,8 @@ const getTableData = (exchangeGuid = '') => {
206 Object.assign({}, searchItemValue.value, { 206 Object.assign({}, searchItemValue.value, {
207 pageIndex: page.value.curr, 207 pageIndex: page.value.curr,
208 pageSize: page.value.limit, 208 pageSize: page.value.limit,
209 exchangeGuid: exchangeGuid 209 exchangeGuid: exchangeGuid,
210 currentStaffGuid: userData.staffGuid
210 }) 211 })
211 ) 212 )
212 .then((res: any) => { 213 .then((res: any) => {
...@@ -318,7 +319,8 @@ const tableBtnClick = (scope, btn) => { ...@@ -318,7 +319,8 @@ const tableBtnClick = (scope, btn) => {
318 guid: row.guid, 319 guid: row.guid,
319 type: 'detail', 320 type: 'detail',
320 name: row.damName, 321 name: row.damName,
321 exchangeGuid: row.exchangeGuid ? row.exchangeGuid : '' 322 exchangeGuid: row.exchangeGuid ? row.exchangeGuid : '',
323 serviceTenantGuid: row.tenantGuid
322 } 324 }
323 }); 325 });
324 } 326 }
...@@ -375,7 +377,7 @@ const tableBtnClick = (scope, btn) => { ...@@ -375,7 +377,7 @@ const tableBtnClick = (scope, btn) => {
375 guid: row.approveVO.approveGuid, 377 guid: row.approveVO.approveGuid,
376 flowType: row.approveVO.flowType, 378 flowType: row.approveVO.flowType,
377 approveStaffGuid: userData.staffGuid, 379 approveStaffGuid: userData.staffGuid,
378 380 serviceTenantGuid: row.tenantGuid
379 }).then((res: any) => { 381 }).then((res: any) => {
380 if (res.code == '00000') { 382 if (res.code == '00000') {
381 ElMessage.success('撤销成功！') 383 ElMessage.success('撤销成功！')
...@@ -573,6 +575,7 @@ const passSubmit = () => { ...@@ -573,6 +575,7 @@ const passSubmit = () => {
573 complianceInfoMap: complianceInfoMap, 575 complianceInfoMap: complianceInfoMap,
574 approveState: 'Y', 576 approveState: 'Y',
575 bizGuid: row.approveVO.bizGuid, 577 bizGuid: row.approveVO.bizGuid,
578 serviceTenantGuid: row.tenantGuid
576 }).then((res: any) => { 579 }).then((res: any) => {
577 if (res.code == '00000') { 580 if (res.code == '00000') {
578 fullscreenLoading.value = false; 581 fullscreenLoading.value = false;
...@@ -624,7 +627,8 @@ const rejectSubmit = async () => { ...@@ -624,7 +627,8 @@ const rejectSubmit = async () => {
624 approveStaffGuid: userData.staffGuid, 627 approveStaffGuid: userData.staffGuid,
625 complianceInfoMap: complianceInfoMap, 628 complianceInfoMap: complianceInfoMap,
626 bizGuid: row.approveVO.bizGuid, 629 bizGuid: row.approveVO.bizGuid,
627 approveState: 'R' 630 approveState: 'R',
631 serviceTenantGuid: row.tenantGuid
628 }).then((res: any) => { 632 }).then((res: any) => {
629 if (res.code == '00000') { 633 if (res.code == '00000') {
630 fullscreenLoading.value = false; 634 fullscreenLoading.value = false;
......
src/views/data_product/productListingCheck.vue
...@@ -182,6 +182,7 @@ const getTableData = () => { ...@@ -182,6 +182,7 @@ const getTableData = () => {
182 isGrounding: 1, 182 isGrounding: 1,
183 pageIndex: page.value.curr, 183 pageIndex: page.value.curr,
184 pageSize: page.value.limit, 184 pageSize: page.value.limit,
185 currentStaffGuid: userData.staffGuid
185 }) 186 })
186 ) 187 )
187 .then((res: any) => { 188 .then((res: any) => {
......
src/views/data_product/productListingDetail.vue
...@@ -729,7 +729,7 @@ const getTableInfo = () => { ...@@ -729,7 +729,7 @@ const getTableInfo = () => {
729 729
730 const getProductDetail = async () => { 730 const getProductDetail = async () => {
731 flowDetailLoading.value = true; 731 flowDetailLoading.value = true;
732 getListingDetail({ guid }).then((res: any) => { 732 getListingDetail({ guid: guid, serviceTenantGuid: route.query.serviceTenantGuid }).then((res: any) => {
733 flowDetailLoading.value = false; 733 flowDetailLoading.value = false;
734 if (res.code == proxy.$passCode) { 734 if (res.code == proxy.$passCode) {
735 const data = res.data || {} 735 const data = res.data || {}
...@@ -1513,6 +1513,7 @@ const getTableData = async () => { ...@@ -1513,6 +1513,7 @@ const getTableData = async () => {
1513 const res: any = await getListingList({ 1513 const res: any = await getListingList({
1514 pageIndex: 1, 1514 pageIndex: 1,
1515 pageSize: -1, 1515 pageSize: -1,
1516 currentStaffGuid: userData.staffGuid
1516 }); 1517 });
1517 if (res.code == proxy.$passCode) { 1518 if (res.code == proxy.$passCode) {
1518 pageLIstInfo.value = res.data.records || []; 1519 pageLIstInfo.value = res.data.records || [];
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!