流程传参修改

@@ -324,9 +324,10 @@ export const existDamName = (params) => request({
 });
 
 /** 获取资产目录基本信息的详情 */
-export const getRegisterCatalogDetail = (guid) => request({
-  url: `${import.meta.env.VITE_API_NEW_PORTAL}/dam-catalog-table/detail?guid=${guid}`,
-  method: 'get'
+export const getRegisterCatalogDetail = (params) => request({
+  url: `${import.meta.env.VITE_API_NEW_PORTAL}/dam-catalog-table/detail`,
+  method: 'get',
+  params
 });
 
 /** 获取资产目录表的详情 */

@@ -40,8 +40,8 @@ export const getListingCount = () => request({
 })
 
 // 驳回流程数据
-export const productRejectFlowData = (data) => request({
-  url: `${import.meta.env.VITE_API_NEW_PORTAL}/product-grounding/submit-flow`,
+export const productRejectFlowData = (data, serviceTenantGuid: any = null ) => request({
+  url: `${import.meta.env.VITE_API_NEW_PORTAL}/product-grounding/submit-flow${ serviceTenantGuid ? `?serviceTenantGuid=${serviceTenantGuid}` : '' }`,
   method: 'post',
   data
 })

@@ -9,20 +9,20 @@ export const getProcessFlowDetail = (params) => request({
     method: 'post',
   })
 // 审批通过
-export const passFlowData = (params) => request({
-  url: `${import.meta.env.VITE_APP_WORK_FLOW_URL}/work-flow/data/allow-flow`,
+export const passFlowData = (params, serviceTenantGuid:any=null) => request({
+  url: `${import.meta.env.VITE_APP_WORK_FLOW_URL}/work-flow/data/allow-flow${ serviceTenantGuid ? `?serviceTenantGuid=${serviceTenantGuid}` : '' }`,
   method: 'post',
   data: params
 })
 // 审批驳回
-export const rejectFlowData = (params) => request({
-  url: `${import.meta.env.VITE_APP_WORK_FLOW_URL}/work-flow/data/backup-flow`,
+export const rejectFlowData = (params, serviceTenantGuid:any=null) => request({
+  url: `${import.meta.env.VITE_APP_WORK_FLOW_URL}/work-flow/data/backup-flow${ serviceTenantGuid ? `?serviceTenantGuid=${serviceTenantGuid}` : '' }`,
   method: 'post',
   data: params
 })
 // 审批撤销
-export const revokeFlowData = (params) => request({
-  url: `${import.meta.env.VITE_APP_WORK_FLOW_URL}/work-flow/data/canal-flow`,
+export const revokeFlowData = (params, serviceTenantGuid:any=null) => request({
+  url: `${import.meta.env.VITE_APP_WORK_FLOW_URL}/work-flow/data/canal-flow${ serviceTenantGuid ? `?serviceTenantGuid=${serviceTenantGuid}` : '' }`,
   method: 'post',
   data: params
 })

@@ -60,7 +60,7 @@ const useUserStore = defineStore(
                   userName.value = res.data.staffName;
                   localStorage.setItem('userName', res.data?.staffName);
                   localStorage.setItem('userData', JSON.stringify(res.data));
-                  return getSystemMenu({ tenantGuid: currentTenantGuid.value }, res.data?.isAdmin == 'Y' && res.data?.superTubeFlag == 'Y').then((info: any) => { //解决页面调用流程接口传递staffGuid，为空的问题
+                  return getSystemMenu({ tenantGuid: currentTenantGuid.value }, res.data?.isAdmin == 'Y' && (!res.data?.superTubeFlag || res.data?.superTubeFlag == 'Y')).then((info: any) => { //解决页面调用流程接口传递staffGuid，为空的问题
                     if (info.code == '00000') {
                       localStorage.setItem('userInfoData', JSON.stringify(info.data));
                       userInfoData.value = info.data;

@@ -192,7 +192,7 @@ const tableBtnClick = (scope, btn) => {
   } if (type === 'path_detail') { // 详情
     router.push({
       name: 'certificateDetail',
-      query: { guid: row.registerGuid, certificateGuid: row.guid, type: 'certificate', daTenantGuid: row.tenantGuid }
+      query: { guid: row.registerGuid, certificateGuid: row.guid, type: 'certificate', serviceTenantGuid: row.tenantGuid }
     });
   }
 };

@@ -107,7 +107,8 @@ const getTableData = () => {
     pageSize: page.value.limit,
     pageIndex: page.value.curr,
     daName: page.value.daName,
-    approveState: page.value.approveState
+    approveState: page.value.approveState,
+    currentStaffGuid: userData.staffGuid
   }).then((res: any) => {
     tableInfo.value.loading = false
     if (res.code == proxy.$passCode) {
@@ -258,6 +259,7 @@ const tableBtnClick = (scope, btn) => {
         guid: row.approveVO.approveGuid,
         flowType: row.approveVO.flowType,
         approveStaffGuid: userData.staffGuid,
+        serviceTenantGuid: row.tenantGuid
       }).then((res: any) => {
         if (res.code == '00000') {
           ElMessage.success('撤销成功！')
@@ -276,18 +278,18 @@ const tableBtnClick = (scope, btn) => {
     if (row.registerApproveState == 'Y') {
       router.push({
         name: 'registerDetail',
-        query: { guid: row.registerGuid, evaGuid: row.guid, type: 'qualityEvaluate', daTenantGuid: row.tenantGuid }
+        query: { guid: row.registerGuid, evaGuid: row.guid, type: 'qualityEvaluate', serviceTenantGuid: row.tenantGuid }
       });
     } else {
       router.push({
         name: 'evaCatalogDetail',
-        query: { guid: row.damGuid, evaGuid: row.guid, type: 'qualityEvaluate' }
+        query: { guid: row.damGuid, evaGuid: row.guid, type: 'qualityEvaluate', serviceTenantGuid: row.tenantGuid }
       });
     }
   } else if (type == 'productDetail') {
     router.push({
       name: 'registerCatalogDetail',
-      query: { guid: row.damGuid }
+      query: { guid: row.damGuid, serviceTenantGuid: row.tenantGuid }
     });
   }
 };
@@ -653,6 +655,7 @@ const passDialogBtnClick = (btn, info) => {
           url: file.url
         }
       }) || [],
+      serviceTenantGuid: currTableData.value.tenantGuid
     }).then((res: any) => {
       passDialogInfo.value.footer.btns[1].loading = false;
       if (res?.code == proxy.$passCode) {
@@ -720,7 +723,8 @@ const rejectDialogBtnClick = (btn, info) => {
       guid: row.approveVO.approveGuid,
       flowType: row.approveVO.flowType,
       approveStaffGuid: userData.staffGuid,
-      approveSuggest: info.approveSuggest
+      approveSuggest: info.approveSuggest,
+      serviceTenantGuid: currTableData.value.tenantGuid
     }
     rejectFlowData(params).then((res: any) => {
       rejectDialogInfo.value.footer.btns[1].loading = false;

@@ -523,7 +523,7 @@ onBeforeMount(() => {
   if (damGuid.value) {
     fullscreenLoading.value = true;
 
-    getRegisterCatalogDetail(damGuid.value).then((res: any) => {
+    getRegisterCatalogDetail({ guid: damGuid.value }).then((res: any) => {
       fullscreenLoading.value = false;
       if (res.code == proxy.$passCode) {
         detailInfo.value = res.data || {};

@@ -86,7 +86,7 @@ const processInstanceId = ref('');
 
 const getDetailInfo = () => {
   fullscreenLoading.value = true;
-  getRegisterCatalogDetail(catalogGuid).then((res: any) => {
+  getRegisterCatalogDetail({ guid: catalogGuid, serviceTenantGuid: route.query.serviceTenantGuid }).then((res: any) => {
     if (res.code == proxy.$passCode) {
       const data = res.data || {};
       detailInfo.value = data;
@@ -110,7 +110,7 @@ const getDetailInfo = () => {
     }
   });
   if (evaGuid) {
-    getEvaDetail({ guid: evaGuid }).then((res: any) => {
+    getEvaDetail({ guid: evaGuid, serviceTenantGuid: route.query.serviceTenantGuid }).then((res: any) => {
       if (res.code == proxy.$passCode) {
         const data = res.data || {};
         evaDetailInfo.value = data;
@@ -122,7 +122,7 @@ const getDetailInfo = () => {
     });
   }
   if (costAssessGuid) {
-    getCostDetail({ guid: costAssessGuid }).then((res: any) => {
+    getCostDetail({ guid: costAssessGuid, serviceTenantGuid: route.query.serviceTenantGuid }).then((res: any) => {
       if (res.code == proxy.$passCode) {
         const data = res.data || {};
         costAssessDetail.value = data;

@@ -50,7 +50,7 @@ const detailType: any = ref(route.query.type);
 const evaGuid: any = ref(route.query.evaGuid);
 const costAssessGuid: any = ref(route.query.costAssessGuid);
 const certificateGuid: any = ref(route.query.certificateGuid);
-const daTenantGuid: any = ref(route.query.daTenantGuid);
+const serviceTenantGuid: any = ref(route.query.serviceTenantGuid);
 
 const contentRef = ref();
 const tabsInfo = ref({
@@ -77,7 +77,7 @@ const getDetailInfo = () => {
   fullscreenLoading.value = true;
   if (detailType.value == 'qualityEvaluate') {
     let ps: any = [];
-    ps.push(getEvaDetail({ guid: evaGuid.value }).then((res: any) => {
+    ps.push(getEvaDetail({ guid: evaGuid.value, serviceTenantGuid: serviceTenantGuid.value }).then((res: any) => {
       if (res.code == proxy.$passCode) {
         const data = res.data || {};
         evaDetailInfo.value = data;
@@ -107,7 +107,7 @@ const getDetailInfo = () => {
     }).catch(() => {
       fullscreenLoading.value = false;
     }));
-    ps.push(getRegiaterDetail({ guid: assetGuid }).then((res: any) => {
+    ps.push(getRegiaterDetail({ guid: assetGuid, serviceTenantGuid: serviceTenantGuid.value }).then((res: any) => {
       if (res.code == proxy.$passCode) {
         const data = res.data || {};
         assetDetailInfo.value = data;
@@ -123,7 +123,7 @@ const getDetailInfo = () => {
     })
   } else if (detailType.value == 'costAssess') {
     let ps: any = [];
-    ps.push(getCostAssessDetail({ guid: costAssessGuid.value }).then((res: any) => {
+    ps.push(getCostAssessDetail({ guid: costAssessGuid.value, serviceTenantGuid: serviceTenantGuid.value }).then((res: any) => {
       if (res.code == proxy.$passCode) {
         const data = res.data || {};
         costAssessDetailInfo.value = data;
@@ -174,7 +174,7 @@ const getDetailInfo = () => {
     }).catch(() => {
       fullscreenLoading.value = false;
     }));
-    ps.push(getRegiaterDetail({ guid: assetGuid }).then((res: any) => {
+    ps.push(getRegiaterDetail({ guid: assetGuid, serviceTenantGuid: serviceTenantGuid.value }).then((res: any) => {
       if (res.code == proxy.$passCode) {
         const data = res.data || {};
         assetDetailInfo.value = data;
@@ -190,7 +190,7 @@ const getDetailInfo = () => {
     })
   } else if (detailType.value == 'certificate') {
     let ps: any = [], tentData = {};
-    ps.push(getCertificateDetail({ guid: certificateGuid.value }).then((res: any) => {
+    ps.push(getCertificateDetail({ guid: certificateGuid.value, serviceTenantGuid: serviceTenantGuid.value }).then((res: any) => {
       if (res.code == proxy.$passCode) {
         const data = res.data || {};
         detailInfo.value = data;
@@ -207,7 +207,7 @@ const getDetailInfo = () => {
         }
         let qualityPs: any = [];
         if (detailInfo.value.qualityEvaluationGuid) {
-          qualityPs.push(getEvaDetail({ guid: detailInfo.value.qualityEvaluationGuid }).then((res: any) => {
+          qualityPs.push(getEvaDetail({ guid: detailInfo.value.qualityEvaluationGuid, serviceTenantGuid: serviceTenantGuid.value }).then((res: any) => {
             if (res.code == proxy.$passCode) {
               const data = res.data || {};
               evaDetailInfo.value = data;
@@ -231,7 +231,7 @@ const getDetailInfo = () => {
           }));
         }
         if (detailInfo.value.costAccessmentGuid) {
-          qualityPs.push(getCostAssessDetail({ guid: detailInfo.value.costAccessmentGuid }).then((res: any) => {
+          qualityPs.push(getCostAssessDetail({ guid: detailInfo.value.costAccessmentGuid, serviceTenantGuid: serviceTenantGuid.value }).then((res: any) => {
             if (res.code == proxy.$passCode) {
               const data = res.data || {};
               costAssessDetailInfo.value = data;
@@ -259,7 +259,7 @@ const getDetailInfo = () => {
         ElMessage.error(res.msg);
       }
     }));
-    ps.push(getRegiaterDetail({ guid: assetGuid }).then((res: any) => {
+    ps.push(getRegiaterDetail({ guid: assetGuid, serviceTenantGuid: serviceTenantGuid.value }).then((res: any) => {
       if (res.code == proxy.$passCode) {
         const data = res.data || {};
         assetDetailInfo.value = data;
@@ -292,7 +292,7 @@ const getDetailInfo = () => {
     })
   } else {
     let ps: any = []
-    ps.push(getRegiaterDetail({ guid: assetGuid }).then((res: any) => {
+    ps.push(getRegiaterDetail({ guid: assetGuid, serviceTenantGuid: serviceTenantGuid.value }).then((res: any) => {
       if (res.code == proxy.$passCode) {
         const data = res.data || {};
         if (fullPath === route.fullPath) {
@@ -959,6 +959,7 @@ const passDialogBtnClick = (btn, info) => {
         flowType: detailInfo.value.approveVO.flowType,
         approveSuggest: info.approveSuggest,
         approveStaffGuid: userData.staffGuid,
+        serviceTenantGuid: serviceTenantGuid.value
       }
       submitPromise.value = passFlowData(params).then((res: any) => {
         submitPromise.value = null;
@@ -993,6 +994,7 @@ const passDialogBtnClick = (btn, info) => {
             url: file.url
           }
         }) || [],
+        serviceTenantGuid: serviceTenantGuid.value
       }).then((res: any) => {
         submitPromise.value = null;
         if (res?.code == proxy.$passCode) {
@@ -1025,6 +1027,7 @@ const passDialogBtnClick = (btn, info) => {
             url: file.url
           }
         }) || [],
+        serviceTenantGuid: serviceTenantGuid.value
       }).then((res: any) => {
         submitPromise.value = null;
         if (res?.code == proxy.$passCode) {
@@ -1113,6 +1116,7 @@ const rejectDialogBtnClick = (btn, info) => {
       flowType: detailInfo.value.approveVO.flowType,
       approveSuggest: info.approveSuggest,
       approveStaffGuid: userData.staffGuid,
+      serviceTenantGuid: serviceTenantGuid.value
     }
     rejectFlowData(params).then((res: any) => {
       if (res?.code == proxy.$passCode) {

@@ -269,7 +269,7 @@ const tableBtnClick = (scope, btn) => {
   } else if (type === 'detail') { // 详情, 若是草稿中，详情就是编辑，
     router.push({
       name: 'registerInfoDetail',
-      query: { guid: row.guid, name: row.daName, type: 'asset' }
+      query: { guid: row.guid, name: row.daName, type: 'asset',  serviceTenantGuid: row.tenantGuid }
     });
   } else if (type === 'pass') {
     passDialogInfo.value.visible = true;
@@ -433,6 +433,7 @@ const passDialogBtnClick = (btn, info) => {
       flowType: currTableData.value.approveVO.flowType,
       approveSuggest: info.approveSuggest,
       approveStaffGuid: userData.staffGuid,
+      serviceTenantGuid: currTableData.value.tenantGuid
     }
     passFlowData(params).then((res: any) => {
       loading.value = false;
@@ -503,6 +504,7 @@ const rejectDialogBtnClick = (btn, info) => {
       flowType: currTableData.value.approveVO.flowType,
       approveSuggest: info.approveSuggest,
       approveStaffGuid: userData.staffGuid,
+      serviceTenantGuid: currTableData.value.tenantGuid
     }
     rejectFlowData(params).then((res: any) => {
       loading.value = false;

@@ -158,7 +158,8 @@ const getTableData = () => {
     pageSize: page.value.limit,
     pageIndex: page.value.curr,
     daName: page.value.daName,
-    approveState: page.value.approveState
+    approveState: page.value.approveState,
+    currentStaffGuid: userData.staffGuid
   }).then((res: any) => {
     tableInfo.value.loading = false;
     if (res.code == proxy.$passCode) {
@@ -240,30 +241,6 @@ const tableInfo = ref({
   }
 });
 
-// const getTableBtns = (row) => {
-//   let btnsArr: any[] = [];
-//   if (row.approveState == 'A') {//审批中
-//     btnsArr.push({ label: "详情", value: "path_detail" })
-//     if (row.tenantGuid == userData.tenantGuid) {
-//       btnsArr.push({ label: "撤销", value: "revoke" });
-//     }
-//     if (row.approveTenantGuids?.includes(userData.tenantGuid)) {
-//       btnsArr.push({ label: "通过", value: "pass" });
-//       btnsArr.push({ label: "驳回", value: "backup" });
-//     }
-//   } else if (row.approveState == 'Y') {//已通过的不能删除。
-//     btnsArr.push({ label: "详情", value: "path_detail" })
-//   } else if (row.approveState == 'R' || row.approveState == 'C') {//已驳回或已撤销
-//     btnsArr.push({ label: "详情", value: "path_detail" });
-//     if (row.tenantGuid == userData.tenantGuid) {
-//       btnsArr.push({ label: "重新提交", value: "edit", disabled: false })
-//     }
-//     if (row.tenantGuid == userData.tenantGuid) {
-//       btnsArr.push({ label: "删除", value: "delete" });
-//     }
-//   }
-//   return btnsArr;
-// }
 const getTableBtns = (row) => {
   let btnsArr: any[] = [];
   const approveVO = row.approveVO || {};
@@ -403,18 +380,18 @@ const tableBtnClick = (scope, btn) => {
     if (row.registerApproveState == 'Y') {
       router.push({
         name: 'registerValueDetail',
-        query: { guid: row.registerGuid, costAssessGuid: row.guid, type: 'costAssess', daTenantGuid: row.tenantGuid }
+        query: { guid: row.registerGuid, costAssessGuid: row.guid, type: 'costAssess', serviceTenantGuid: row.tenantGuid }
       });
     } else {
       router.push({
         name: 'costAssessDetail',
-        query: { guid: row.damGuid, costAssessGuid: row.guid, type: 'costAssess' }
+        query: { guid: row.damGuid, costAssessGuid: row.guid, type: 'costAssess', serviceTenantGuid: row.tenantGuid }
       });
     }
   } else if (type == 'productDetail') {
     router.push({
       name: 'registerCatalogDetail',
-      query: { guid: row.damGuid }
+      query: { guid: row.damGuid, serviceTenantGuid: row.tenantGuid }
     });
   }
   else if (type === 'pass') {
@@ -1013,6 +990,7 @@ const passDialogBtnClick = (btn, info) => {
           url: file.url
         }
       }) || [],
+      serviceTenantGuid: currTableData.value.tenantGuid
     }).then((res: any) => {
       if (res?.code == proxy.$passCode) {
         if (res.data) {
@@ -1070,37 +1048,6 @@ const rejectDialogInfo = ref({
   },
 });
 
-// const rejectDialogBtnClick = (btn, info) => {
-//   if (btn.value == 'submit') {
-//     if (info.approveSuggest == '') {
-//       ElMessage.error('请填写驳回理由');
-//       return
-//     }
-//     tableInfo.value.loading = true;
-//     let params = {
-//       bizGuid: currTableData.value.guid,
-//       funcCode: currTableData.value.funcCode,
-//       approveSuggest: info.approveSuggest
-//     }
-//     registerApproveBackup(params).then((res: any) => {
-//       tableInfo.value.loading = false;
-//       if (res?.code == proxy.$passCode) {
-//         if (res.data) {
-//           ElMessage.success('驳回成功');
-//           getTableData();
-//           rejectDialogInfo.value.visible = false;
-//         } else {
-//           ElMessage.error('驳回失败');
-//         }
-//       } else {
-//         ElMessage.error(res.msg);
-//       }
-//     });
-//   } else if (btn.value == 'cancel') {
-//     rejectDialogInfo.value.visible = false;
-//   }
-// };
-
 const rejectDialogBtnClick = (btn, info) => {
   if (btn.value == 'submit') {
     if (info.approveSuggest == '') {
@@ -1114,6 +1061,7 @@ const rejectDialogBtnClick = (btn, info) => {
       flowType: currTableData.value.approveVO.flowType,
       approveSuggest: info.approveSuggest,
       approveStaffGuid: userData.staffGuid,
+      serviceTenantGuid: currTableData.value.tenantGuid
     }
     rejectFlowData(params).then((res: any) => {
       tableInfo.value.loading = false;
@@ -1164,4 +1112,5 @@ const rejectDialogBtnClick = (btn, info) => {
 //   .el-upload__tip {
 //     margin-left: 0px;
 //   }
-// }</style>
+// }
+</style>

@@ -206,7 +206,8 @@ const getTableData = (exchangeGuid = '') => {
     Object.assign({}, searchItemValue.value, {
       pageIndex: page.value.curr,
       pageSize: page.value.limit,
-      exchangeGuid: exchangeGuid
+      exchangeGuid: exchangeGuid,
+      currentStaffGuid: userData.staffGuid
     })
   )
     .then((res: any) => {
@@ -318,7 +319,8 @@ const tableBtnClick = (scope, btn) => {
         guid: row.guid,
         type: 'detail',
         name: row.damName,
-        exchangeGuid: row.exchangeGuid ? row.exchangeGuid : ''
+        exchangeGuid: row.exchangeGuid ? row.exchangeGuid : '',
+        serviceTenantGuid: row.tenantGuid
       }
     });
   }
@@ -375,7 +377,7 @@ const tableBtnClick = (scope, btn) => {
         guid: row.approveVO.approveGuid,
         flowType: row.approveVO.flowType,
         approveStaffGuid: userData.staffGuid,
-
+        serviceTenantGuid: row.tenantGuid
       }).then((res: any) => {
         if (res.code == '00000') {
           ElMessage.success('撤销成功！')
@@ -573,6 +575,7 @@ const passSubmit = () => {
         complianceInfoMap: complianceInfoMap,
         approveState: 'Y',
         bizGuid: row.approveVO.bizGuid,
+        serviceTenantGuid: row.tenantGuid
       }).then((res: any) => {
         if (res.code == '00000') {
           fullscreenLoading.value = false;
@@ -624,7 +627,8 @@ const rejectSubmit = async () => {
         approveStaffGuid: userData.staffGuid,
         complianceInfoMap: complianceInfoMap,
         bizGuid: row.approveVO.bizGuid,
-        approveState: 'R'
+        approveState: 'R',
+        serviceTenantGuid: row.tenantGuid
       }).then((res: any) => {
         if (res.code == '00000') {
           fullscreenLoading.value = false;

@@ -182,6 +182,7 @@ const getTableData = () => {
       isGrounding: 1,
       pageIndex: page.value.curr,
       pageSize: page.value.limit,
+      currentStaffGuid: userData.staffGuid
     })
   )
     .then((res: any) => {

@@ -729,7 +729,7 @@ const getTableInfo = () => {
 
 const getProductDetail = async () => {
   flowDetailLoading.value = true;
-  getListingDetail({ guid }).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 || {}
@@ -1513,6 +1513,7 @@ const getTableData = async () => {
   const res: any = await getListingList({
     pageIndex: 1,
     pageSize: -1,
+    currentStaffGuid: userData.staffGuid
   });
   if (res.code == proxy.$passCode) {
     pageLIstInfo.value = res.data.records || [];