修改综合事务部借款审批流程

oa-ui/src/views/flowable/form/finance/borrowForm.vue

@@ -82,8 +82,8 @@
               <td>
                 <el-select v-model="detail.borrowItem" placeholder="请选择开支项" clearable @change="handleExpenseChange"
                   style="width: 100%;" :disabled="taskName != '借款申请'" v-if="form.borrowUsage == 0">
-                  <el-option v-for="dict in dict.type.cmc_borrow_expense" clearable :key="dict.value"
-                    :label="dict.label" :value="dict.value" />
+                  <el-option v-for="dict in dict.type.cmc_borrow_expense" clearable :key="dict.value" :label="dict.label"
+                    :value="dict.value" />
                   <!-- <el-option label="+新增更多开支项..." value="new_expense" /> -->
                 </el-select>
                 <el-autocomplete v-model="detail.borrowItem" :fetch-suggestions="querySearchAsync" placeholder="请输入内容"
@@ -181,8 +181,8 @@
           <!-- 非党工团审核 -->
           <div v-if="form.borrowUsage == 0 || form.borrowUsage == 1">
             <el-form-item label="部门负责人意见" prop="deptComment" label-width="150px">
-              <el-input type="textarea" v-model="form.deptComment" placeholder="请输入部门负责人意见"
-                :disabled="taskName != '部门审核'" :autosize="{ minRows: 4 }" />
+              <el-input type="textarea" v-model="form.deptComment" placeholder="请输入部门负责人意见" :disabled="taskName != '部门审核'"
+                :autosize="{ minRows: 4 }" />
             </el-form-item>
             <el-row>
               <el-col :span="6" :xs="24" :offset="12">
@@ -213,8 +213,8 @@
               </el-col>
             </el-row>
             <el-form-item label="总经理审批意见" prop="zjlComment" label-width="150px">
-              <el-input type="textarea" v-model="form.zjlComment" placeholder="请输入总经理审批意见"
-                :disabled="taskName != '总经理审核'" :autosize="{ minRows: 4 }" />
+              <el-input type="textarea" v-model="form.zjlComment" placeholder="请输入总经理审批意见" :disabled="taskName != '总经理审核'"
+                :autosize="{ minRows: 4 }" />
             </el-form-item>
             <el-row>
               <el-col :span="6" :xs="24" :offset="12">
@@ -229,8 +229,8 @@
               </el-col>
             </el-row>
             <el-form-item label="董事长批准意见" prop="dszComment" label-width="150px" v-if="exceed && !form.cwUser">
-              <el-input type="textarea" v-model="form.dszComment" placeholder="请输入董事长批准意见"
-                :disabled="taskName != '董事长批准'" :autosize="{ minRows: 4 }" />
+              <el-input type="textarea" v-model="form.dszComment" placeholder="请输入董事长批准意见" :disabled="taskName != '董事长批准'"
+                :autosize="{ minRows: 4 }" />
             </el-form-item>
             <el-row v-if="exceed && !form.cwUser">
               <el-col :span="6" :xs="24" :offset="12">
@@ -455,6 +455,7 @@ export default {
       flowData: {},
       isProject: true,
       exceed: false, //是否超预算
+      need: true, //是否需要分管审批
       deptId: undefined,
       dgtLabel: '工会审核意见',
       siteExpenses: 0,
@@ -600,7 +601,8 @@ export default {
         else {
           this.formTotal = 1;
           this.form = res.data;
-
+          if (this.form.applyDept == 104) //董事长分管的综合事务部，跳过分管审批
+            this.need = false;
           this.hanldeChangeType();
           this.handleSelectProject(res.data.projectId)
           this.getBudgetSettle()
@@ -730,9 +732,9 @@ export default {
         await this.VerificationAmount();
       }
       let msg;
-      if(this.taskName == '财务处理'){
+      if (this.taskName == '财务处理') {
         msg = '最后一个节点，提交将结束流程，是否提交？'
-      }else{
+      } else {
         msg = '是否提交到下一个流程？'
       }
       this.$confirm(msg, '提示', {
@@ -784,16 +786,34 @@ export default {
                 if (this.taskName == '借款申请') {
                   this.borrowAprrovalFun();
                 } else if (this.taskName == '部门审核') {
-                  getUsersManageLeaderByDept({ deptId: this.form.applyDept }).then(res => {
-                    let userIds = [];
-                    if (res.data) {
-                      res.data.forEach(item => {
-                        userIds.push(item.userId)
+                  this.$set(this.taskForm.variables, "need", this.need);
+                  if (this.need) {
+                    getUsersManageLeaderByDept({ deptId: this.form.applyDept }).then(res => {
+                      let userIds = [];
+                      if (res.data) {
+                        res.data.forEach(item => {
+                          userIds.push(item.userId)
+                        })
+                      }
+                      this.$set(this.taskForm.variables, "approvalList", userIds);
+                      this.handleComplete(this.taskForm);
+                    })
+                  }
+                  else {
+                    getUsersManageLeaderByDept({ deptId: this.form.applyDept }).then(res => {
+                      let userIds = [];
+                      if (res.data) {
+                        res.data.forEach(item => {
+                          userIds.push(item.userId)
+                        })
+                      }
+                      this.$set(this.taskForm.variables, "approvalList", userIds);
+                      getUserByPost({ postName: '总经理' }).then(res => {
+                        this.$set(this.taskForm.variables, "approval", res.data[0].userId);
+                        this.handleComplete(this.taskForm);
                       })
-                    }
-                    this.$set(this.taskForm.variables, "approvalList", userIds);
-                    this.handleComplete(this.taskForm);
-                  })
+                    })
+                  }
                 }
                 else if (this.taskName == '分管审核') {
                   getUserByPost({ postName: '总经理' }).then(res => {

oa-ui/src/views/flowable/task/myProcess/progressTree.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-18 15:14:45
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-06-16 09:59:01
+ * @LastEditors: wrh
+ * @LastEditTime: 2025-11-12 10:24:23
 -->
 <template>
   <div>
@@ -132,7 +132,10 @@ export default {
             }
           }
         } else if (i.category == "finance") {
-          this.treeData[2].children.push(i);
+          if (i.name != "借款审批")
+            this.treeData[2].children.push(i);
+          if (i.name == "借款审批" && i.version == 2)
+            this.treeData[2].children.push(i);
         } else if (i.category == "oa") {
           this.treeData[3].children.push(i);
         } else if (i.category == "assess") {