技术交底、合同经营审核

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcSafeMapper.xml

@@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="disclosureTime != null "> and s.disclosure_time = #{disclosureTime}</if>
             <if test="acceptTime != null "> and s.accept_time = #{acceptTime}</if>
         </where>
-        order by s.discloure_time desc
+        order by s.disclosure_time desc
     </select>
     
     <select id="selectCmcSafeBySafeId" parameterType="String" resultMap="CmcSafeResult">

oa-ui/src/api/system/post.js

@@ -75,6 +75,15 @@ export function getUsersDeptLeader(query) {
   })
 }
 
+// 查询经营部门的部门负责人
+export function getDeptLeaders(query) {
+  return request({
+    url: '/system/post/deptLeaders',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询当前部门的部门负责人
 export function getUsersDeptLeaderByDept(query) {
   return request({

oa-ui/src/views/flowable/form/business/contractForm.vue

@@ -1,40 +1,39 @@
 <!--
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-05 10:31:53
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-07-05 17:33:58
 -->
 <template>
   <div class="app-container">
     <el-row :gutter="20">
-      <el-col :span="flowDisabled ? 18:24" :xs="24">
+      <el-col :span="flowDisabled ? 18 : 24" :xs="24">
         <h2 class="text-center"><b>承接合同评审表</b></h2>
         <el-divider></el-divider>
         <el-form ref="form" :model="form" :rules="rules" label-width="130px" :disabled="formDisabled">
           <el-row :gutter="20">
             <el-col :span="12" :xs="24">
               <el-form-item label="投标项目名称：" prop="tenderId">
-                <el-button type="primary" size="mini" @click="tbOpen = true"
-                  v-if="taskName == '合同拟稿'">选择投标项目</el-button>
+                <el-button type="primary" size="mini" @click="tbOpen = true" v-if="taskName == '合同拟稿'">选择投标项目</el-button>
                 <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="3" direction="vertical">
                   <el-descriptions-item label="投标项目名称" label-class-name="my-label" :span="3">{{ chooseTender.projectName
-                    }}</el-descriptions-item>
+                  }}</el-descriptions-item>
                   <el-descriptions-item label="项目来源" label-class-name="my-label">{{ getProjectSource(chooseTender)
-                    }}</el-descriptions-item>
+                  }}</el-descriptions-item>
                   <el-descriptions-item label="联系人" label-class-name="my-label">{{ chooseTender.aPerson
-                    }}</el-descriptions-item>
+                  }}</el-descriptions-item>
                   <el-descriptions-item label="联系电话" label-class-name="my-label">{{ chooseTender.aPhone
-                    }}</el-descriptions-item>
+                  }}</el-descriptions-item>
                 </el-descriptions>
               </el-form-item>
               <el-form-item label="合同名称" prop="contractName">
-                <el-input type="textarea" :rows="3" style="width: 100%;" v-model="form.contractName"
-                  placeholder="请输入合同名称" :disabled="taskName != '合同拟稿'"></el-input>
+                <el-input type="textarea" :rows="3" style="width: 100%;" v-model="form.contractName" placeholder="请输入合同名称"
+                  :disabled="taskName != '合同拟稿'"></el-input>
               </el-form-item>
               <el-form-item label="甲方单位" prop="partyAId">
                 <el-select v-model="form.partyAId" filterable placeholder="请选择" disabled style="width: 100%;">
-                  <el-option v-for="item in partyAList" :key="item.value" :label="item.partyAName"
-                    :value="item.partyAId" :disabled="taskName != '合同拟稿'">
+                  <el-option v-for="item in partyAList" :key="item.value" :label="item.partyAName" :value="item.partyAId"
+                    :disabled="taskName != '合同拟稿'">
                   </el-option>
                 </el-select>
                 <el-button type="primary" @click="partyAOpen = true" size="mini"
@@ -49,8 +48,7 @@
                   :disabled="taskName != '合同拟稿'"></el-input>
               </el-form-item>
               <el-form-item label="合同金额" prop="amount">
-                <el-input style="width:100%;" v-model="form.amount" placeholder="请输入合同金额"
-                  :disabled="taskName != '合同拟稿'">
+                <el-input style="width:100%;" v-model="form.amount" placeholder="请输入合同金额" :disabled="taskName != '合同拟稿'">
                   <template slot="append">元</template>
                 </el-input>
               </el-form-item>
@@ -171,8 +169,8 @@
                     clearable :disabled="taskName != '合同拟稿'"></el-input-number>
                 </td>
                 <td>
-                  <el-date-picker style="width: 140px" v-model="payment.paymentTime" value-format="yyyy-MM-dd"
-                    type="date" placeholder="选择日期" :disabled="taskName != '合同拟稿'">
+                  <el-date-picker style="width: 140px" v-model="payment.paymentTime" value-format="yyyy-MM-dd" type="date"
+                    placeholder="选择日期" :disabled="taskName != '合同拟稿'">
                   </el-date-picker>
                 </td>
                 <td>
@@ -362,20 +360,22 @@
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
-              <el-form-item label="签名：" label-width="120px" v-if="taskName != '合同拟稿' && taskName != '线上会审' && taskName != '会议评审'">
+              <el-form-item label="签名：" label-width="120px"
+                v-if="taskName != '合同拟稿' && taskName != '线上会审' && taskName != '会议评审'">
                 <span class="auditor"> {{ form.managerUser ? form.managerUser.nickName : managerUser }} </span>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="日期：" label-width="120px" v-if="taskName != '合同拟稿' && taskName != '线上会审' && taskName != '会议评审'">
+              <el-form-item label="日期：" label-width="120px"
+                v-if="taskName != '合同拟稿' && taskName != '线上会审' && taskName != '会议评审'">
                 <span> {{ form.managerTime ? form.managerTime : managerTime }} </span>
               </el-form-item>
             </el-col>
           </el-row>
           <el-divider></el-divider>
           <el-form-item label="签订日期" prop="signDate">
-            <el-date-picker clearable v-model="form.signDate" type="date" value-format="yyyy-MM-dd"
-              placeholder="请选择签订日期" :disabled="taskName != '合同签订'">
+            <el-date-picker clearable v-model="form.signDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择签订日期"
+              :disabled="taskName != '合同签订'">
             </el-date-picker>
           </el-form-item>
           <el-form-item label="签订备注" prop="signRemark">
@@ -453,7 +453,7 @@ import { getContractMeeting, addContractMeeting, updateContractMeeting } from "@
 import { listProjectContract, addProjectContract, delProjectContract } from "@/api/oa/contract/projectContract";
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm, } from "@/api/flowable/todo";
 import { listTender, getTender } from "@/api/oa/tender/tender";
-import { getUsersDeptLeader, getUsersManageLeader, getUsersDeptLeaderByDept } from '@/api/system/post.js'
+import { getUsersDeptLeader, getUsersManageLeader, getUsersDeptLeaderByDept, getDeptLeadersByDeptId, getUsersManageLeaderByDept } from '@/api/system/post.js'
 import flow from '@/views/flowable/task/todo/detail/flow'
 import { flowXmlAndNode } from "@/api/flowable/definition";
 import ChooseProject from '../components/chooseProject.vue';
@@ -569,7 +569,7 @@ export default {
           commentTime: undefined
         },
         {
-          deptId: 110,
+          deptId: 106,
           userId: '',
           comment: '',
           document: '',
@@ -583,7 +583,7 @@ export default {
         //   commentTime: undefined
         // },
         {
-          deptId: 107,
+          deptId: 109,
           userId: '',
           comment: '',
           document: '',
@@ -727,9 +727,14 @@ export default {
                 },
               ]
               for (let comment of this.commentList) {
-                getUsersDeptLeaderByDept({ deptId: comment.deptId }).then(res => {
-                  comment.userId = res.data.userId;
-                })
+                if (comment.deptId == 105)
+                  getDeptLeadersByDeptId({ deptId: comment.deptId }).then(res => {
+                    comment.userId = res.data[1].userId;
+                  })
+                else
+                  getUsersDeptLeaderByDept({ deptId: comment.deptId }).then(res => {
+                    comment.userId = res.data.userId;
+                  })
               }
             }
 
@@ -910,9 +915,14 @@ export default {
         this.commentOpen = true;
         this.meetingOpen = false;
         for (let comment of this.commentList) {
-          getUsersDeptLeaderByDept({ deptId: comment.deptId }).then(res => {
-            comment.userId = res.data.userId;
-          })
+          if (comment.deptId == 105)
+            getDeptLeadersByDeptId({ deptId: comment.deptId }).then(res => {
+              comment.userId = res.data[1].userId;
+            })
+          else
+            getUsersDeptLeaderByDept({ deptId: comment.deptId }).then(res => {
+              comment.userId = res.data.userId;
+            })
         }
       }
     },
@@ -1003,8 +1013,9 @@ export default {
                   updateContractComment(comment);
                 }
                 getUsersManageLeader({ userId: this.form.drafter }).then(res => {
-                  let userId = res.data.userId;
-                  this.$set(this.taskForm.variables, "approval", userId);
+                  let userIdList = [];
+                  userIdList.push(res.data[0].userId)
+                  this.$set(this.taskForm.variables, "approvalList", userIdList);
                   complete(this.taskForm).then(response => {
                     this.$modal.msgSuccess(response.msg);
                     this.$emit('goBack')
@@ -1018,8 +1029,9 @@ export default {
                 formData.append("form", jsonForm);
                 updateContractMeeting(formData);
                 getUsersManageLeader({ userId: this.form.drafter }).then(res => {
-                  let userId = res.data.userId;
-                  this.$set(this.taskForm.variables, "approval", userId);
+            let userIdList = [];
+            userIdList.push(res.data[0].userId)
+            this.$set(this.taskForm.variables, "approvalList", userIdList);
                   complete(this.taskForm).then(response => {
                     this.$modal.msgSuccess(response.msg);
                     this.$emit('goBack')
@@ -1089,9 +1101,10 @@ export default {
       const params = { taskId: this.taskForm.taskId };
       getNextFlowNode(params).then(res => {
         if (this.commentOpen == false && this.meetingOpen == false) {
-          getUsersManageLeader({ userId: this.$store.getters.userId }).then(res => {
-            let userId = res.data.userId;
-            this.$set(this.taskForm.variables, "approval", userId);
+          getUsersManageLeaderByDept({ deptId: 105 }).then(res => {
+            let userIdList = [];
+            userIdList.push(res.data[0].userId)
+            this.$set(this.taskForm.variables, "approvalList", userIdList);
             this.$set(this.taskForm.variables, "commentType", '0');
             complete(this.taskForm).then(response => {
               this.$modal.msgSuccess(response.msg);

oa-ui/src/views/flowable/form/business/subContract.vue

@@ -2,12 +2,12 @@
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
  * @LastEditors: wrh
- * @LastEditTime: 2024-07-03 13:51:41
+ * @LastEditTime: 2024-07-05 17:29:38
 -->
 <template>
   <div class="app-container">
     <el-row :gutter="20">
-      <el-col :span="flowDisabled ? 18:24" :xs="24">
+      <el-col :span="flowDisabled ? 18 : 24" :xs="24">
         <h2 class="text-center">分包合同评审表</h2>
         <el-form ref="form" :model="form" :rules="rules" label-width="130px" :formDisabled="formDisabled">
           <el-divider></el-divider>
@@ -41,7 +41,8 @@
           <el-row :gutter="20">
             <el-col :span="16" :xs="24">
               <el-form-item label="分包合同名称" prop="subContractName">
-                <el-input type="textarea" :rows="3" v-model="form.subContractName" placeholder="请输入分包合同名称" :disabled="taskName != '合同拟稿'" />
+                <el-input type="textarea" :rows="3" v-model="form.subContractName" placeholder="请输入分包合同名称"
+                  :disabled="taskName != '合同拟稿'" />
               </el-form-item>
             </el-col>
             <el-col :span="8" :xs="24">
@@ -54,8 +55,8 @@
           <el-row :gutter="20">
             <el-col :span="16" :xs="24">
               <el-form-item label="承接单位" prop="partnerId">
-                <el-select allow-create v-model="form.partnerId" multiple filterable placeholder="请选择"
-                  style="width: 84%;" disabled clearable>
+                <el-select allow-create v-model="form.partnerId" multiple filterable placeholder="请选择" style="width: 84%;"
+                  disabled clearable>
                   <el-option v-for="item in partnerList" :key="item.value" :label="item.partnerName"
                     :value="item.partnerId">
                   </el-option>
@@ -75,8 +76,7 @@
             <el-col :span="16" :xs="24">
               <el-form-item label="合同文件" prop="contractDocument">
                 <FileUpload v-if="formTotal == 0" :disabled="taskName != '合同拟稿'" ref="contractFile" :limit="1"
-                  :filePathName="'分包合同/合同文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
-                  @input="getContractPath">
+                  :filePathName="'分包合同/合同文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getContractPath">
                 </FileUpload>
                 <div v-if="taskName != '合同拟稿' && form.contractDocument">
                   <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + form.contractDocument}`)">
@@ -174,8 +174,8 @@
                     :disabled="taskName != '合同拟稿'"></el-input-number>
                 </td>
                 <td>
-                  <el-date-picker style="width: 140px" v-model="payment.paymentTime" value-format="yyyy-MM-dd"
-                    type="date" placeholder="选择日期" :disabled="taskName != '合同拟稿'">
+                  <el-date-picker style="width: 140px" v-model="payment.paymentTime" value-format="yyyy-MM-dd" type="date"
+                    placeholder="选择日期" :disabled="taskName != '合同拟稿'">
                   </el-date-picker>
                 </td>
                 <td>
@@ -357,20 +357,22 @@
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
-              <el-form-item label="签名：" label-width="120px" v-if="taskName != '合同拟稿' && taskName != '线上会审' && taskName != '会议评审'">
+              <el-form-item label="签名：" label-width="120px"
+                v-if="taskName != '合同拟稿' && taskName != '线上会审' && taskName != '会议评审'">
                 <span class="auditor"> {{ form.managerUser ? form.managerUser.nickName : managerUser }} </span>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="日期：" label-width="120px" v-if="taskName != '合同拟稿' && taskName != '线上会审' && taskName != '会议评审'">
+              <el-form-item label="日期：" label-width="120px"
+                v-if="taskName != '合同拟稿' && taskName != '线上会审' && taskName != '会议评审'">
                 <span> {{ form.managerTime ? form.managerTime : managerTime }} </span>
               </el-form-item>
             </el-col>
           </el-row>
           <el-divider></el-divider>
           <el-form-item label="签订日期" prop="signDate">
-            <el-date-picker clearable v-model="form.signDate" type="date" value-format="yyyy-MM-dd"
-              placeholder="请选择签订日期" :disabled="taskName != '合同签订'">
+            <el-date-picker clearable v-model="form.signDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择签订日期"
+              :disabled="taskName != '合同签订'">
             </el-date-picker>
           </el-form-item>
           <el-form-item label="签订备注" prop="signRemark">
@@ -428,7 +430,7 @@ import { listProjectContract } from "@/api/oa/contract/projectContract";
 import { getContract } from "@/api/oa/contract/contract";
 import { listSubContract, getSubContract, delSubContract, addSubContract, updateSubContract } from "@/api/oa/contract/subContract";
 import { listProjectSubcontract, addProjectSubcontract, delProjectSubcontract } from '@/api/oa/contract/projectSubcontract'
-import { getUsersDeptLeader, getUsersManageLeader, getUsersDeptLeaderByDept } from '@/api/system/post.js'
+import { getUsersDeptLeader, getUsersManageLeader, getUsersDeptLeaderByDept, getDeptLeadersByDeptId, getUsersManageLeaderByDept } from '@/api/system/post.js'
 import flow from '@/views/flowable/task/todo/detail/flow'
 import { flowXmlAndNode } from "@/api/flowable/definition";
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm, } from "@/api/flowable/todo";
@@ -566,7 +568,7 @@ export default {
           commentTime: undefined
         },
         {
-          deptId: 110,
+          deptId: 106,
           userId: '',
           comment: '',
           document: '',
@@ -580,7 +582,7 @@ export default {
         //   commentTime: undefined
         // },
         {
-          deptId: 106,
+          deptId: 109,
           userId: '',
           comment: '',
           document: '',
@@ -712,21 +714,21 @@ export default {
                   commentTime: undefined
                 },
                 {
-                  deptId: 110,
-                  userId: '',
-                  comment: '',
-                  document: '',
-                  commentTime: undefined
-                },
-                {
-                  deptId: 107,
+                  deptId: 106,
                   userId: '',
                   comment: '',
                   document: '',
                   commentTime: undefined
                 },
+                // {
+                //   deptId: 107,
+                //   userId: '',
+                //   comment: '',
+                //   document: '',
+                //   commentTime: undefined
+                // },
                 {
-                  deptId: 106,
+                  deptId: 109,
                   userId: '',
                   comment: '',
                   document: '',
@@ -734,9 +736,15 @@ export default {
                 },
               ]
               for (let comment of this.commentList) {
-                getUsersDeptLeaderByDept({ deptId: comment.deptId }).then(res => {
-                  comment.userId = res.data.userId;
-                })
+                if (comment.deptId == 105)
+                  getDeptLeadersByDeptId({ deptId: comment.deptId }).then(res => {
+                    comment.userId = res.data[1].userId;
+                    console.log(comment.userId);
+                  })
+                else
+                  getUsersDeptLeaderByDept({ deptId: comment.deptId }).then(res => {
+                    comment.userId = res.data.userId;
+                  })
               }
             }
           });
@@ -874,9 +882,14 @@ export default {
         this.commentOpen = true;
         this.meetingOpen = false;
         for (let comment of this.commentList) {
-          getUsersDeptLeaderByDept({ deptId: comment.deptId }).then(res => {
-            comment.userId = res.data.userId;
-          })
+          if (comment.deptId == 105)
+            getDeptLeadersByDeptId({ deptId: comment.deptId }).then(res => {
+              comment.userId = res.data[1].userId;
+            })
+          else
+            getUsersDeptLeaderByDept({ deptId: comment.deptId }).then(res => {
+              comment.userId = res.data.userId;
+            })
         }
       }
     },
@@ -935,8 +948,9 @@ export default {
                   updateContractComment(comment);
                 }
                 getUsersManageLeader({ userId: this.form.drafter }).then(res => {
-                  let userId = res.data.userId;
-                  this.$set(this.taskForm.variables, "approval", userId);
+                  let userIdList = [];
+                  userIdList.push(res.data[0].userId)
+                  this.$set(this.taskForm.variables, "approvalList", userIdList);
                   handleComplete(this.taskForm);
                 })
               }
@@ -947,8 +961,9 @@ export default {
                 formData.append("form", jsonForm);
                 updateContractMeeting(formData);
                 getUsersManageLeader({ userId: this.form.drafter }).then(res => {
-                  let userId = res.data.userId;
-                  this.$set(this.taskForm.variables, "approval", userId);
+                  let userIdList = [];
+                  userIdList.push(res.data[0].userId)
+                  this.$set(this.taskForm.variables, "approvalList", userIdList);
                   handleComplete(this.taskForm);
                 })
               }
@@ -989,9 +1004,10 @@ export default {
     // 合同拟稿提交事件
     contractDraftSubmit(handleComplete) {
       if (this.commentOpen == false && this.meetingOpen == false) {
-        getUsersManageLeader({ userId: this.$store.getters.userId }).then(res => {
-          let userId = res.data.userId;
-          this.$set(this.taskForm.variables, "approval", userId);
+        getUsersManageLeaderByDept({ deptId: 105 }).then(res => {
+          let userIdList = [];
+          userIdList.push(res.data[0].userId)
+          this.$set(this.taskForm.variables, "approvalList", userIdList);
           this.$set(this.taskForm.variables, "commentType", '0');
           handleComplete(this.taskForm);
         })

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

@@ -46,17 +46,17 @@
             </el-select> -->
             <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="1">
               <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
-                }}</el-descriptions-item>
+              }}</el-descriptions-item>
               <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
-                }}</el-descriptions-item>
+              }}</el-descriptions-item>
               <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ?
-    chooseProject.projectLeaderUser.nickName : ''
-                }}</el-descriptions-item>
+                chooseProject.projectLeaderUser.nickName : ''
+              }}</el-descriptions-item>
               <el-descriptions-item label="承担部门" label-class-name="my-label">
                 <el-tag size="small">{{ chooseProject.undertakingDeptName }}</el-tag>
               </el-descriptions-item>
               <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
-                }}</el-descriptions-item>
+              }}</el-descriptions-item>
             </el-descriptions>
           </el-form-item>
           <el-form-item label="借款明细">
@@ -83,12 +83,12 @@
                   <el-input v-model="detail.unit" :disabled="taskName != '借款申请'"></el-input>
                 </td>
                 <td>
-                  <el-input-number :controls="false" style="width:100%" v-model="detail.price" @change="calculateAmount(detail)"
-                    :disabled="taskName != '借款申请'"></el-input-number>
+                  <el-input-number :controls="false" style="width:100%" v-model="detail.price"
+                    @change="calculateAmount(detail)" :disabled="taskName != '借款申请'"></el-input-number>
                 </td>
                 <td>
-                  <el-input-number :controls="false" style="width:100%" v-model="detail.quantity" @change="calculateAmount(detail)"
-                    :disabled="taskName != '借款申请'"></el-input-number>
+                  <el-input-number :controls="false" style="width:100%" v-model="detail.quantity"
+                    @change="calculateAmount(detail)" :disabled="taskName != '借款申请'"></el-input-number>
                 </td>
                 <td>
                   <el-input v-model="detail.applyAmount" :disabled="taskName != '借款申请'"></el-input>
@@ -154,8 +154,8 @@
           <!-- 非党工团审核 -->
           <div v-if="form.borrowUsage == 0 || form.borrowUsage == 1">
             <el-form-item label="部门负责人意见" prop="deptComment">
-              <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">
@@ -202,8 +202,8 @@
               </el-col>
             </el-row>
             <el-form-item label="总经理审批意见" prop="zjlComment">
-              <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">
@@ -692,15 +692,24 @@ export default {
                   this.$emit('goBack')
                 });
               } else {
-                getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
-                  let userId = res.data.userId;
-                  this.$set(this.taskForm.variables, "approval", userId);
-                  this.$set(this.taskForm.variables, "dept", this.deptId);
-                  complete(this.taskForm).then(response => {
-                    this.$modal.msgSuccess(response.msg);
-                    this.$emit('goBack')
-                  });
-                })
+                if (this.deptId == 105)
+                  getDeptLeaders({ userId: this.form.drafter }).then(res => {
+                    this.$set(this.taskForm.variables, "approval", res.data[1].userId);
+                    complete(this.taskForm).then(response => {
+                      this.$modal.msgSuccess(response.msg);
+                      this.$emit('goBack')
+                    });
+                  })
+                else
+                  getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
+                    let userId = res.data.userId;
+                    this.$set(this.taskForm.variables, "approval", userId);
+                    this.$set(this.taskForm.variables, "dept", this.deptId);
+                    complete(this.taskForm).then(response => {
+                      this.$modal.msgSuccess(response.msg);
+                      this.$emit('goBack')
+                    });
+                  })
               }
 
             })

oa-ui/src/views/flowable/form/oa/carForm.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-02-29 11:44:28
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-21 14:35:59
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-07-05 17:57:11
 -->
 
 <template>
@@ -56,17 +56,17 @@
                 </el-select> -->
                 <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="1">
                   <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
-                    }}</el-descriptions-item>
+                  }}</el-descriptions-item>
                   <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
-                    }}</el-descriptions-item>
+                  }}</el-descriptions-item>
                   <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ?
-    chooseProject.projectLeaderUser.nickName : ''
-                    }}</el-descriptions-item>
+                    chooseProject.projectLeaderUser.nickName : ''
+                  }}</el-descriptions-item>
                   <el-descriptions-item label="承担部门" label-class-name="my-label">
                     <el-tag size="small">{{ chooseProject.undertakingDeptName }}</el-tag>
                   </el-descriptions-item>
                   <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
-                    }}</el-descriptions-item>
+                  }}</el-descriptions-item>
                 </el-descriptions>
               </el-form-item>
               <el-form-item label="用车事由：" prop="applyReason">
@@ -215,7 +215,7 @@
             </el-row>
             <el-row style="text-align: center;" v-else>
               <el-button type="primary" :disabled="taskName == ''" @click="completeApply">{{ taskName == '申请确认' ? "确认" :
-    "完成审批" }}</el-button>
+                "完成审批" }}</el-button>
             </el-row>
           </div>
         </el-card>
@@ -246,7 +246,7 @@ import { listCar, getCar } from "@/api/oa/car/car";
 import { listCarApproval, getCarApproval, updateCarApproval, addCarApproval, modifyCarApproval } from '@/api/oa/car/carApproval'
 import { getUserByPost } from "@/api/system/post";
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm, } from "@/api/flowable/todo";
-import { getUsersDeptLeader, getUsersManageLeader } from '@/api/system/post.js'
+import { getUsersDeptLeader, getUsersManageLeader, getDeptLeaders } from '@/api/system/post.js'
 import flow from '@/views/flowable/task/todo/detail/flow'
 import { flowXmlAndNode } from "@/api/flowable/definition";
 import { listUser } from '@/api/system/user';
@@ -273,8 +273,8 @@ export default {
       default: true
     }
   },
-  watch:{
-    'taskForm.formId'(){
+  watch: {
+    'taskForm.formId'() {
       this.initForm();
     }
   },
@@ -533,15 +533,24 @@ export default {
           })
         }
         else {
-          getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
-            if (res.data) {
-              this.$set(this.taskForm.variables, "approval", res.data.userId);
+          if (this.deptId == 105)
+          getDeptLeaders({ userId: this.form.drafter }).then(res => {
+              this.$set(this.taskForm.variables, "approval", res.data[1].userId);
               complete(this.taskForm).then(response => {
                 this.$modal.msgSuccess(response.msg);
                 this.$emit('goBack')
-              })
-            }
-          })
+              });
+            })
+          else
+            getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
+              if (res.data) {
+                this.$set(this.taskForm.variables, "approval", res.data.userId);
+                complete(this.taskForm).then(response => {
+                  this.$modal.msgSuccess(response.msg);
+                  this.$emit('goBack')
+                })
+              }
+            })
         }
       } else if (this.taskName == '部门审核') {
         getUsersManageLeader({ userId: this.$store.getters.userId }).then(res => {