修改项目流转

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java

@@ -81,6 +81,16 @@ public class SysPostController extends BaseController
         return success(deptLeader);
     }
 
+    /**
+     * 通过deptId获取部门主任
+     */
+    @GetMapping("/deptLeaders")
+    public AjaxResult getDeptLeaders(String userId)
+    {
+        List<SysUser> deptLeaderList =  postService.selectDeptLeadersByDeptId(userId);
+        return success(deptLeaderList);
+    }
+
     /**
      * 获取部门副主任
      */
@@ -109,6 +119,16 @@ public class SysPostController extends BaseController
         return success(deptLeader);
     }
 
+    /**
+     * 通过deptId获取部门主任
+     */
+    @GetMapping("/deptLeadersByDept")
+    public AjaxResult getDeptLeadersByDeptId(String deptId)
+    {
+        List<SysUser> deptLeaderList =  postService.selectDeptLeadersByDeptId(deptId);
+        return success(deptLeaderList);
+    }
+
     /**
      * 通过deptId获取是否部门负责人
      */

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java

@@ -92,6 +92,14 @@ public interface SysUserPostMapper
      */
     public SysUser selectDeptLeaderByUserId(String userId);
 
+    /**
+     * 查询部门主任
+     *
+     * @param
+     * @return 查询部门主任
+     */
+    public List<SysUser> selectDeptLeadersByUserId(String userId);
+
     /**
      * 查询部门副主任
      *
@@ -132,6 +140,14 @@ public interface SysUserPostMapper
      */
     public SysUser selectDeptLeaderByDeptId(String deptId);
 
+    /**
+     * 查询部门主任
+     *
+     * @param
+     * @return 查询部门主任
+     */
+    public List<SysUser> selectDeptLeadersByDeptId(String deptId);
+
     /**
      * 查询部门副主任
      *

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java

@@ -148,6 +148,14 @@ public interface ISysPostService
      */
     public SysUser selectDeptLeaderByUserId(String userId);
 
+    /**
+     * 查询部门主任
+     *
+     * @param
+     * @return 查询部门主任
+     */
+    public List<SysUser> selectDeptLeadersByUserId(String userId);
+
     /**
      * 查询部门副主任
      *
@@ -188,6 +196,14 @@ public interface ISysPostService
      */
     public SysUser selectDeptLeaderByDeptId(String deptId);
 
+    /**
+     * 查询部门主任
+     *
+     * @param
+     * @return 查询部门主任
+     */
+    public List<SysUser> selectDeptLeadersByDeptId(String deptId);
+
     /**
      * 查询部门副主任
      *

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java

@@ -244,6 +244,17 @@ public class SysPostServiceImpl implements ISysPostService
         return userPostMapper.selectDeptLeaderByUserId(userId);
     }
 
+    /**
+     * 查询部门主任
+     *
+     * @param
+     * @return 查询部门主任
+     */
+    @Override
+    public List<SysUser> selectDeptLeadersByUserId(String userId) {
+        return userPostMapper.selectDeptLeadersByUserId(userId);
+    }
+
     /**
      * 查询部门副主任
      *
@@ -299,6 +310,17 @@ public class SysPostServiceImpl implements ISysPostService
         return userPostMapper.selectDeptLeaderByDeptId(deptId);
     }
 
+    /**
+     * 查询部门主任
+     *
+     * @param
+     * @return 查询部门主任
+     */
+    @Override
+    public List<SysUser> selectDeptLeadersByDeptId(String userId) {
+        return userPostMapper.selectDeptLeadersByDeptId(userId);
+    }
+
     /**
      * 查询部门副主任
      *

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

@@ -130,6 +130,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where p.post_name = '主任'
 	</select>
 
+	<select id="selectDeptLeadersByUserId" parameterType="String" resultMap="SysUserResult">
+		select r.user_id, r.nick_name from
+		(select u1.user_id, u1.nick_name, u.dept_id from
+		sys_user as u, sys_user as u1 where u.user_id = #{param} and u1.dept_id = u.dept_id) as r
+		left join sys_user_post as up on r.user_id = up.user_id
+		left join sys_post as p on p.post_id = up.post_id
+		where p.post_name = '主任'
+	</select>
+
 	<select id="selectViceDeptLeaderByUserId" parameterType="String" resultMap="SysUserResult">
 		select r.user_id, r.nick_name from
 		(select u1.user_id, u1.nick_name, u.dept_id from
@@ -175,6 +184,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where p.post_name = '主任'
 	</select>
 
+	<select id="selectDeptLeadersByDeptId" parameterType="String" resultMap="SysUserResult">
+		select r.user_id, r.nick_name from
+		(select user_id, nick_name, dept_id from
+		sys_user where dept_id = #{param}) as r
+		left join sys_user_post as up on r.user_id = up.user_id
+		left join sys_post as p on p.post_id = up.post_id
+		where p.post_name = '主任'
+	</select>
+
 	<select id="selectViceDeptLeaderByDeptId" parameterType="String" resultMap="SysUserResult">
 		select r.user_id, r.nick_name from
 		(select user_id, nick_name, dept_id from

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

@@ -84,6 +84,15 @@ export function getUsersDeptLeaderByDept(query) {
   })
 }
 
+// 查询经营部门的部门负责人
+export function getDeptLeadersByDeptId(query) {
+  return request({
+    url: '/system/post/deptLeadersByDept',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询当前用户的部门负责人
 export function getUsersViceDeptLeader(query) {
   return request({

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-02 09:46:00
+ * @LastEditTime: 2024-07-05 10:31:53
 -->
 <template>
   <div class="app-container">
@@ -228,14 +228,14 @@
                 </td>
                 <td>
                   <el-select v-model="comment.deptId" clearable style="width:120px"
-                    :disabled="(index < 4 && taskName == '合同拟稿') || taskName != '合同拟稿'" @change="getDeptLeader">
+                    :disabled="(index < 3 && taskName == '合同拟稿') || taskName != '合同拟稿'" @change="getDeptLeader">
                     <el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName" :value="item.deptId">
                     </el-option>
                   </el-select>
                 </td>
                 <td>
                   <el-select v-model="comment.userId" clearable style="width:120px"
-                    :disabled="(index < 4 && taskName == '合同拟稿') || taskName != '合同拟稿'">
+                    :disabled="(index < 3 && taskName == '合同拟稿') || taskName != '合同拟稿'">
                     <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId">
                     </el-option>
                   </el-select>
@@ -583,7 +583,7 @@ export default {
         //   commentTime: undefined
         // },
         {
-          deptId: 106,
+          deptId: 107,
           userId: '',
           comment: '',
           document: '',
@@ -705,7 +705,7 @@ export default {
                   commentTime: undefined
                 },
                 {
-                  deptId: 110,
+                  deptId: 106,
                   userId: '',
                   comment: '',
                   document: '',
@@ -719,7 +719,7 @@ export default {
                 //   commentTime: undefined
                 // },
                 {
-                  deptId: 106,
+                  deptId: 109,
                   userId: '',
                   comment: '',
                   document: '',

oa-ui/src/views/flowable/form/components/chooseContract.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-05-22 11:12:57
- * @LastEditors: 
- * @LastEditTime: 2024-06-14 18:26:54
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-07-05 09:09:03
 -->
 <template>
   <div>
@@ -29,7 +29,7 @@
       <el-table-column label="合同编号" align="center" prop="contractNumber" min-width="100px" />
       <el-table-column label="合同金额" align="center" prop="amount" min-width="100px" />
       <el-table-column label="拟稿人" align="center" prop="draftUser.nickName" min-width="100px" />
-      <el-table-column label="合同备注" align="center" prop="remark" min-width="100px" />
+      <el-table-column label="合同备注" align="center" prop="remark" min-width="250px" />
     </el-table>
     <div style="text-align: right;" class="mt20 mr20">
       <el-pagination @current-change="getList" :current-page.sync="queryParams.pageNum"

oa-ui/src/views/flowable/form/projectProcess/addproject.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-18 11:00:04
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-02 18:17:03
+ * @LastEditTime: 2024-07-05 15:04:22
 -->
 <template>
   <div class="project-wrapper">
@@ -148,7 +148,7 @@ import { parseTime } from "@/utils/ruoyi";
 import { mapGetters } from "vuex";
 import { listProject, getProject, addProject, updateProject, delProject } from "@/api/oa/project/project";
 import { getUser } from "@/api/system/user";
-import { getUsersDeptLeaderByDept } from "@/api/system/post";
+import { getUsersDeptLeaderByDept,getDeptLeadersByDeptId } from "@/api/system/post";
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm } from "@/api/flowable/todo";
 import { listProjectWork, addProjectWork, delProjectWork } from "@/api/oa/project/projectWork";
 import { listProjectContract, addProjectContract } from "@/api/oa/contract/projectContract";
@@ -328,9 +328,8 @@ export default {
         })
       } else {
         let updateLog = await updateProject(this.addForm).then(
-          this.$modal.msgSuccess("修改成功")
+          this.$modal.msgSuccess("保存成功")
         );
-        console.log(updateLog);
         if (updateLog.code == 200) {
           this.$refs.arrange.save()
         }
@@ -344,35 +343,57 @@ export default {
       }
 
     },
-    confirmAddForm() {
-      this.addForm.projectId = this.taskForm.formId;
-      for (let work of this.workList) {
-        work.projectId = this.taskForm.formId;
-        addProjectWork(work);
-      }
-      addProject(this.addForm).then(response => {
-        this.$modal.msgSuccess("新增成功");
-        this.getList();
-      });
-      let contractId = this.chooseContractInfo.contractId ? this.chooseContractInfo.contractId : ''
-      let pcobj = { projectId: this.taskForm.formId, contractId }
-      if (contractId != '') {
-        addProjectContract(pcobj).then(response => {
-          this.$modal.msgSuccess("合同关联成功");
+    async confirmAddForm() {
+      let leaderData = await getDeptLeadersByDeptId({ deptId: 105 })
+      let approvalId = [];
+      if (leaderData.data) {
+        leaderData.data.forEach(item =>{
+          approvalId.push(item.userId)
         })
       }
-      const params = { taskId: this.taskForm.taskId };
-      // 获取下一个流程节点
-      getNextFlowNode(params).then(res => {
-        getUsersDeptLeaderByDept({ deptId: 107 }).then(res => {
-          let userId = res.data.userId;
-          this.$set(this.taskForm.variables, "approval", userId);
+      console.log(approvalId);
+      this.$set(this.taskForm.variables, "approvalList", approvalId);
+      // this.addForm.projectId = this.taskForm.formId;
+      // for (let work of this.workList) {
+      //   work.projectId = this.taskForm.formId;
+      //   addProjectWork(work);
+      // }
+      // addProject(this.addForm).then(response => {
+      //   this.$modal.msgSuccess("新增成功");
+      //   this.getList();
+      // });
+      // let contractId = this.chooseContractInfo.contractId ? this.chooseContractInfo.contractId : ''
+      // let pcobj = { projectId: this.taskForm.formId, contractId }
+      // if (contractId != '') {
+      //   addProjectContract(pcobj).then(response => {
+      //     this.$modal.msgSuccess("合同关联成功");
+      //   })
+      // }
+      this.save();
+      this.$confirm('项目安排之后会自动发起预算编制、技术方案、技术交底、安全交底四个子流程，将无法进行撤回操作，是否继续提交？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        let budgetInitiator = this.$refs.arrange.peopleForm
+        if (this.addForm.projectLeader) {
+          budgetInitiator = this.addForm.projectLeader
+        } else {
+          budgetInitiator = this.$refs.arrange.peopleForm.userId
+        }
+        this.$set(this.taskForm.variables, "formId", this.taskForm.formId);
+        this.$set(this.taskForm.variables, "budgetInitiator", budgetInitiator);
+        // return
+        const params = { taskId: this.taskForm.taskId };
+        // 获取下一个流程节点
+        getNextFlowNode(params).then(res => {
+          console.log(this.taskForm);
           complete(this.taskForm).then(response => {
             this.$modal.msgSuccess(response.msg);
-            this.$emit("goBack");
+            this.$emit('goBack');
           });
-        });
-      });
+        })
+      })
     },
     // 查询业主单位列表
     getPartyAList() {

oa-ui/src/views/flowable/form/projectProcess/arrangeProject.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-19 09:24:06
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-04 17:41:05
+ * @LastEditTime: 2024-07-05 09:31:26
 -->
 <template>
   <div class="app-container">
@@ -96,10 +96,10 @@
         </el-form-item>
       </el-form>
     </el-dialog>
-    <div slot="footer" class="dialog-footer" style="text-align: center;">
+    <!-- <div slot="footer" class="dialog-footer" style="text-align: center;">
       <el-button type="primary" @click="confirmPlanForm" :disabled="disabled">提 交</el-button>
-      <!-- <el-button @click="cancel" :disabled="disabled">取 消</el-button> -->
-    </div>
+      <el-button @click="cancel" :disabled="disabled">取 消</el-button>
+    </div> -->
   </div>
 </template>
 
@@ -230,7 +230,6 @@ export default {
     save() {
       this.form.projectId = this.taskForm.formId;
       this.form.undertakingDept = this.form.deptId.join(',');
-      console.log(this.form);
       updateProject(this.form)
     },
     confirmPlanForm() {
@@ -239,8 +238,9 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        this.form.undertakingDept = this.form.deptId.join(',');
-        updateProject(this.form)
+        // this.form.undertakingDept = this.form.deptId.join(',');
+        // updateProject(this.form)
+        this.save();
         const params = { taskId: this.taskForm.taskId };
         // 获取下一个流程节点
         getNextFlowNode(params).then(res => {

oa-ui/src/views/flowable/form/projectProcess/businessReview.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-08 13:56:14
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-30 11:27:44
+ * @LastEditTime: 2024-07-05 14:33:37
 -->
 <template>
   <div class="app-container">
@@ -113,9 +113,9 @@ export default {
       const params = { taskId: this.taskForm.taskId };
       // 获取下一个流程节点
       getNextFlowNode(params).then(res => {
-        this.managerList.push(10)
-        this.managerList.push(7)
-        this.managerList = Array.from(new Set(this.managerList));
+        // this.managerList.push(10)
+        // this.managerList.push(7)
+        // this.managerList = Array.from(new Set(this.managerList));
         this.$set(this.taskForm.variables, "approvalList", this.managerList);
         complete(this.taskForm).then(response => {
           this.$modal.msgSuccess(response.msg);

oa-ui/src/views/flowable/form/projectProcess/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-03 09:08:28
+ * @LastEditTime: 2024-07-05 09:31:03
 -->
 
 <template>
@@ -14,10 +14,10 @@
             <addproject :taskForm="taskForm" :taskName="taskName" :disabled="taskName != '项目登记'" @goBack="goBack">
             </addproject>
           </el-tab-pane>
-          <el-tab-pane label="项目安排" name="项目安排">
+          <!-- <el-tab-pane label="项目安排" name="项目安排">
             <arrangeProject :taskForm="taskForm" :taskName="'项目安排'" :disabled="taskName != '项目安排'" @goBack="goBack">
             </arrangeProject>
-          </el-tab-pane>
+          </el-tab-pane> -->
           <el-tab-pane label="项目预算" name="项目预算">
             <budget-tab :taskForm="taskForm" @goBack="goBack"></budget-tab>
           </el-tab-pane>