Merge branch 'master' of http://192.168.1.41:3000/SmartCost/SCCommon

types/src/interface/process.ts

@@ -53,7 +53,7 @@ export interface IProcessAccount {
   configure: AccountConfigure[];
   remark: string; // 审批意见(肯定有，会有默认值)
   coreViews: ICoreView[]; // 协审人信息
-  projectIDs: string[]; // 充许审批的单位工程ID，为空数组时表示可以审批当前环节的所有项目
+  projectIDs: string[]; // 允许审批的单位工程ID，为空数组时表示可以审批当前环节的所有项目
 }
 
 // 参与者信息

wise-cost-util/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sc/wise-cost-util",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "wise-cost项目前后端业务通用工具包",
   "main": "./dist/index.cjs.js",
   "module": "./dist/index.esm.js",

wise-cost-util/src/process.ts

@@ -6,10 +6,9 @@ export const getProcessStatus = (approvalWay: ApprovalWay, accounts: IProcessAcc
   if (!isArray(accounts)) {
     return accounts.status;
   }
-  // 若为上报审批，则流程状态直接为 success
-  if (approvalWay === ApprovalWay.REPORT) return ProcessStatus.APPROVED;
-  // 指定用户
-  if (approvalWay === ApprovalWay.ACCOUNT) {
+
+  // 指定用户 退回上一环节为上报审批时，判断流程状态和指定用户一样
+  if (approvalWay === ApprovalWay.ACCOUNT || approvalWay === ApprovalWay.REPORT) {
     const { status } = accounts[0];
     if (status === ProcessStatus.ACTIVATING) return ProcessStatus.ACTIVATING;
     if (status === ProcessStatus.APPROVED) return ProcessStatus.APPROVED;