修改项目流转

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-05 15:04:22
+ * @LastEditTime: 2024-07-05 18:13:54
 -->
 <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,getDeptLeadersByDeptId } 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";
@@ -297,6 +297,7 @@ export default {
     },
     // 暂存
     async save() {
+      // 新增数据
       if (this.formTotal == 0) {
         this.$refs['projectAdd'].validate((vaild) => {
           if (vaild) {
@@ -308,7 +309,7 @@ export default {
             let addLog = addProject(this.addForm).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.getList();
-              this.$refs.arrange.save()
+              this.$refs.arrange.save();
             });
             if (addLog.code == 200) {
               this.$refs.arrange.save()
@@ -321,7 +322,6 @@ export default {
               })
             }
           } else {
-            // this.$refs.scrollToMe.scrollIntoView({ behavior: 'smooth' }); 
             let dom = document.getElementById('scrollToMe')
             dom.scrollIntoView({ behavior: 'smooth' });
           }
@@ -333,43 +333,24 @@ export default {
         if (updateLog.code == 200) {
           this.$refs.arrange.save()
         }
-        delProjectWork(this.taskForm.formId).then(res => {
+        await delProjectWork(this.taskForm.formId).then(res => {
           this.workList.forEach(work => {
             work.projectId = this.taskForm.formId;
             addProjectWork(work);
           })
-
         })
       }
-
     },
     async confirmAddForm() {
       let leaderData = await getDeptLeadersByDeptId({ deptId: 105 })
       let approvalId = [];
       if (leaderData.data) {
-        leaderData.data.forEach(item =>{
+        leaderData.data.forEach(item => {
           approvalId.push(item.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.save()
       this.$confirm('项目安排之后会自动发起预算编制、技术方案、技术交底、安全交底四个子流程，将无法进行撤回操作，是否继续提交？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -381,9 +362,12 @@ export default {
         } else {
           budgetInitiator = this.$refs.arrange.peopleForm.userId
         }
+        if(budgetInitiator == '' || budgetInitiator == null || budgetInitiator == undefined){
+          return this.$message.error('请选择项目负责人！')
+        }
+        console.log(budgetInitiator);
         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 => {

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

@@ -2,15 +2,15 @@
  * @Author: ysh
  * @Date: 2024-03-19 09:24:06
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-05 09:31:26
+ * @LastEditTime: 2024-07-05 18:04:35
 -->
 <template>
   <div class="app-container">
     <!-- <h2 style="text-align: center;">项目安排</h2> -->
-    <el-form :model="form" :rules="rules" label-width="120px" :disabled="disabled">
+    <el-form ref="arrangeForm" :model="form" :rules="rules" label-width="120px" :disabled="disabled">
       <el-row :gutter="20">
         <el-col :span="12" :xs="24">
-          <el-form-item label="承担部门：" prop="undertakingDept">
+          <el-form-item label="承担部门：" prop="deptId">
             <el-select v-model="form.deptId" multiple clearable style="width:100%" @change="getDeptLeader">
               <el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName" :value="item.deptId"
                 v-if="item.deptName != '四川中水成勘院测绘工程有限责任公司'">
@@ -118,7 +118,7 @@ export default {
       type: Object,
       required: true
     },
-    taskName:{
+    taskName: {
       type: String,
       required: true
     }
@@ -127,7 +127,11 @@ export default {
     return {
       baseUrl: process.env.VUE_APP_BASE_API,
       form: {},
-      rules: {},
+      rules: {
+        deptId: [
+          { required: true, message: "请选择承担部门", trigger: "change" }
+        ],
+      },
       deptList: [],
       deptLeaderList: [],
       file: {
@@ -228,9 +232,13 @@ export default {
       this.peopleVisible = false;
     },
     save() {
-      this.form.projectId = this.taskForm.formId;
-      this.form.undertakingDept = this.form.deptId.join(',');
-      updateProject(this.form)
+      this.$refs['arrangeForm'].validate((vaild) => {
+        if (vaild) {
+          this.form.projectId = this.taskForm.formId;
+          this.form.undertakingDept = this.form.deptId.join(',');
+          updateProject(this.form)
+        }
+      })
     },
     confirmPlanForm() {
       this.$confirm('项目安排之后会自动发起预算编制、技术方案、技术交底、安全交底四个子流程，将无法进行撤回操作，是否继续提交？', '提示', {
@@ -238,8 +246,6 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        // this.form.undertakingDept = this.form.deptId.join(',');
-        // updateProject(this.form)
         this.save();
         const params = { taskId: this.taskForm.taskId };
         // 获取下一个流程节点

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-07-05 14:33:37
+ * @LastEditTime: 2024-07-05 15:28:33
 -->
 <template>
   <div class="app-container">
@@ -98,10 +98,13 @@ export default {
       getProject(this.taskForm.formId).then(res => {
         let deptId = res.data.undertakingDept.split(',');
         this.$store.commit('SET_UNDERDEPTID', deptId);
+        this.managerList = []
         for (let d of deptId) {
           getUsersManageLeaderByDept({ deptId: Number(d) }).then(resopnse => {
             if (resopnse.data) {
-              this.managerList.push(resopnse.data.userId)
+              resopnse.data.forEach(element => {
+                this.managerList.push(element.userId)
+              });
             }
           })
         }

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" v-loading="loading">
     <el-empty description="未进行安全交底" v-if="isEmpty"></el-empty>
     <div v-if="!isEmpty">
       <h3 class="text-center"><b>{{ form.projectNumber + '-' + form.projectName + ' 安全交底' }}</b></h3>
@@ -88,7 +88,12 @@ export default {
     },
     projectName(newval) {
       this.$set(this.form, "projectName", newval);
+    },
+    'taskForm.formId'(){
+      this.loading = true;
+      this.initForm();
     }
+
   },
   data() {
     return {
@@ -96,6 +101,7 @@ export default {
       form: {},
       rules: {},
       userList: [],
+      loading:false
     }
   },
   mounted() {
@@ -117,6 +123,7 @@ export default {
               if (res.data) {
                 this.$set(this.form, "projectNumber", res.data.projectNumber);
                 this.$set(this.form, "projectName", res.data.projectName);
+                this.loading = false
               }
             })
           }

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" v-loading="loading">
     <el-empty description="未进行技术交底" v-if="isEmpty"></el-empty>
     <div v-if="!isEmpty">
       <h3 class="text-center"><b>{{ form.projectNumber + '-' + form.projectName + ' 技术交底' }}</b></h3>
@@ -85,6 +85,10 @@ export default {
     },
     projectName(newval) {
       this.$set(this.form, "projectName", newval);
+    },
+    'taskForm.formId'(){
+      this.loading = true;
+      this.initForm();
     }
   },
   data() {
@@ -93,6 +97,7 @@ export default {
       form: {},
       rules: {},
       userList: [],
+      loading:false,
     }
   },
   mounted() {
@@ -114,6 +119,7 @@ export default {
               if (res.data) {
                 this.$set(this.form, "projectNumber", res.data.projectNumber);
                 this.$set(this.form, "projectName", res.data.projectName);
+                this.loading = false;
               }
             })
           }

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

@@ -188,7 +188,7 @@
 
 <script>
 import { parseTime } from "@/utils/ruoyi";
-import { listTechnical, getTechnical, delTechnical, addTechnical, updateTechnical } from "@/api/oa/technical/technicalPlan";
+import { listTechnicalPlan, getTechnicalPlan, delTechnicalPlan, addTechnicalPlan, updateTechnicalPlan } from "@/api/oa/technical/technicalPlan";
 import { getProject } from "@/api/oa/project/project";
 import { listUser } from '@/api/system/user';
 import flow from '@/views/flowable/task/todo/detail/flow';
@@ -331,7 +331,7 @@ export default {
       }
     },
     initForm() {
-      getTechnical(this.taskForm.formId).then(res => {
+      getTechnicalPlan(this.taskForm.formId).then(res => {
         if (this.isEmptyObject(res.data)) {
           this.formTotal = 0;
           this.form.technicalPlanner = this.$store.getters.userId;
@@ -369,7 +369,7 @@ export default {
     /** 查询cmc技术方案列表 */
     getList() {
       this.loading = true;
-      listTechnical(this.queryParams).then(response => {
+      listTechnicalPlan(this.queryParams).then(response => {
         this.technicalList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -428,7 +428,7 @@ export default {
         if (valid) {
           if (this.formTotal != 0) {
             this.form.qualityInspector = this.form.qualityInspector.join(',');
-            updateTechnical(this.form).then(response => {
+            updateTechnicalPlan(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
@@ -463,7 +463,7 @@ export default {
             this.form.qualityInspector = this.form.qualityInspector.join(',');
             this.form.technicalPlanId = this.taskForm.formId;
             this.form.projectId = this.taskForm.formId;
-            addTechnical(this.form).then(response => {
+            addTechnicalPlan(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -471,6 +471,7 @@ export default {
             const params = { taskId: this.taskForm.taskId };
             getNextFlowNode(params).then(res => {
               this.$set(this.taskForm.variables, "formId", this.taskForm.formId);
+              this.$set(this.taskForm.variables, "techInitiator", this.form.technicalDirector);
               this.$set(this.taskForm.variables, "approval", this.form.technicalDesigner);
               complete(this.taskForm).then(response => {
                 this.$modal.msgSuccess(response.msg);