Merge branch 'develop' into release-test

@@ -39,7 +39,7 @@ watch([
 ], () => {
   if (settingsStore.settings.app.enableDynamicTitle && settingsStore.title) {
     const title = typeof settingsStore.title === 'function' ? settingsStore.title() : settingsStore.title
-    document.title = `${title}`
+    document.title = `${title} - ${import.meta.env.VITE_APP_TITLE}`
   }
   else {
     document.title = import.meta.env.VITE_APP_TITLE

@@ -96,6 +96,13 @@ export const getTenantDetailInfo = (params) => request({
   method: 'get'
 })
 
+// 查看人员详情
+export const getStaffDetailInfo = (params) => request({
+  url: `${import.meta.env.VITE_APP_PERSONAL_URL}/staff/getByGuid/${params}`,
+  method: 'get'
+})
+
+
 
 /**
  * 日志管理

@@ -13,10 +13,13 @@ import {
   saveQuality,
   qualityAllow,
   deleteQuality,
-  updatQuality
+  updatQuality,
 } from "@/api/modules/dataAsset";
 import useUserStore from "@/store/modules/user";
 import useDataAssetStore from "@/store/modules/dataAsset";
+import {
+  getStaffDetailInfo
+} from "@/api/modules/queryService";
 import { rejectFlowData, revokeFlowData, getCamundaDeploymentId, getProcessNodesPromise } from "@/api/modules/workFlowService";
 
 const assetStore = useDataAssetStore();
@@ -41,7 +44,7 @@ const tableFields = ref([
 
 const deploymentId = ref('');
 
-onBeforeMount(() => {
+onMounted(() => {
   getCamundaDeploymentId('10018', userData.tenantGuid, userData.staffGuid).then((res: any) => {
     if (res.code == proxy.$passCode) {
       deploymentId.value = res.data;
@@ -413,6 +416,8 @@ const dialogBtnClick = (btn, info) => {
       processInstanceId: null,
     }).then((res: any) => {
       if (res?.code == proxy.$passCode) {
+        getStaffDetailInfo(res.data?.[1]?.candidateUsers?.[0]?.staffGuid).then((resUser: any) => {
+          if (resUser?.code == proxy.$passCode) {
             if (dialogInfo.value.type == 'reSubmit') {
               updatQuality({
                 guid: currTableData.value.guid,
@@ -420,7 +425,7 @@ const dialogBtnClick = (btn, info) => {
                 damGuid: currTableData.value.damGuid,
                 daName: currTableData.value.daName,
                 immediateApprove: true,
-            evaluationAgencyGuid: res.data?.[1]?.candidateUsers?.[0]?.staffGuid,
+                evaluationAgencyGuid: resUser.data?.tenantGuid,
                 qualityEvaluationFile: info.qualityEvaluationFile?.map(file => {
                   return {
                     name: file.name,
@@ -445,7 +450,7 @@ const dialogBtnClick = (btn, info) => {
                 damGuid: info.damGuid,
                 daName: daInfo.damName,
                 immediateApprove: true,
-            evaluationAgencyGuid: res.data?.[1]?.candidateUsers?.[0]?.staffGuid,
+                evaluationAgencyGuid: resUser.data?.tenantGuid,
                 qualityEvaluationFile: info.qualityEvaluationFile?.map(file => {
                   return {
                     name: file.name,
@@ -469,6 +474,11 @@ const dialogBtnClick = (btn, info) => {
             ElMessage.error(res.msg);
           }
         })
+      } else {
+        dialogInfo.value.footer.btns[1].loading = false;
+        ElMessage.error(res.msg);
+      }
+    })
   } else if (btn.value == 'cancel') {
     dialogInfo.value.visible = false;
   }

@@ -17,7 +17,7 @@ import {
   costAssessAllow
 } from "@/api/modules/dataAsset";
 import {
-  getTenantAttach
+  getStaffDetailInfo
 } from "@/api/modules/queryService";
 import useUserStore from "@/store/modules/user";
 import useDataAssetStore from "@/store/modules/dataAsset";
@@ -741,7 +741,8 @@ const dialogBtnClick = (btn, info) => {
       deploymentId: deploymentId.value,
       processInstanceId: null,
     }).then((res: any) => {
-      console.log('res', res);
+      getStaffDetailInfo(res.data?.[1]?.candidateUsers?.[0]?.staffGuid).then((resUser: any) => {
+        if (resUser?.code == proxy.$passCode) {
           if (dialogInfo.value.type == 'reSubmit') {
             if (reSubmitPromise.value) {
               return;
@@ -768,7 +769,7 @@ const dialogBtnClick = (btn, info) => {
               evaluationRangeStart: info.evaluationRange ? info.evaluationRange[0] : null,
               evaluationRangeEnd: info.evaluationRange ? info.evaluationRange[1] : null,
               evaluationNote: info.evaluationNote || null,
-          evaluationAgencyGuid: res.data?.[1]?.candidateUsers?.[0]?.staffGuid,
+              evaluationAgencyGuid: resUser.data?.tenantGuid,
             }).then((res: any) => {
               reSubmitPromise.value = null;
               if (res?.code == proxy.$passCode) {
@@ -800,7 +801,7 @@ const dialogBtnClick = (btn, info) => {
                     url: file.url
                   }
                 }) || [],
-            evaluationAgencyGuid: res.data?.[1]?.candidateUsers?.[0]?.staffGuid,
+                evaluationAgencyGuid: resUser.data?.tenantGuid,
               }
             } else {
               //未通过质量评估发起资产申请
@@ -841,6 +842,10 @@ const dialogBtnClick = (btn, info) => {
               }
             })
           }
+        } else {
+          ElMessage.error(res.msg);
+        }
+      });
     })
   } else if (btn.value == 'cancel') {
     dialogInfo.value.visible = false;