修改项目安排的数据回传

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-07 16:53:39
+ * @LastEditTime: 2024-04-08 11:36:23
 -->
 
 <template>
@@ -204,7 +204,6 @@ export default {
     getProjectWorkList() {
       getProjectWork(this.$route.query.formId).then(res => {
         this.workList = res.data;
-        console.log(res);
       })
     },
     confirmAddForm() {

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-04-07 17:31:15
+ * @LastEditTime: 2024-04-08 11:36:16
 -->
 <template>
   <div class="app-container">
@@ -22,7 +22,8 @@
         </el-select>
       </el-form-item>
       <el-form-item label="项目负责人" prop="projectLeader">
-        <el-tag effect="plain" type="warning" style="margin-right: 10px;" v-if="form.projectLeader != ''">{{
+        <el-tag effect="plain" type="warning" style="margin-right: 10px;"
+          v-if="form.projectLeader != '' && form.projectLeader != undefined">{{
       form.projectLeaderName }}</el-tag>
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="choosePeople">选择</el-button>
       </el-form-item>
@@ -69,7 +70,7 @@ import { listDept } from '@/api/system/dept'
 import { listUser } from '@/api/system/user'
 import { getUsersDeptLeaderByDept } from '@/api/system/post'
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm, } from "@/api/flowable/todo";
-import { listProject, getProject, addProject, updateProject, delProject, submitProject,modifyProject } from "@/api/oa/project/project";
+import { listProject, getProject, addProject, updateProject, delProject, submitProject, modifyProject } from "@/api/oa/project/project";
 export default {
   props: {
     disabled: {
@@ -83,9 +84,7 @@ export default {
   },
   data() {
     return {
-      form: {
-        projectLeader: ''
-      },
+      form: {},
       rules: {},
       deptList: [],
       userList: [],
@@ -103,11 +102,30 @@ export default {
     }
   },
   created() {
-    this.form.projectId = this.taskForm.formId;
+    this.initForm();
+    // this.form.projectId = this.taskForm.formId;
     this.getDeptList();
     this.getUserList();
   },
   methods: {
+    initForm() {
+      getProject(this.$route.query.formId).then(res => {
+        this.form = res.data;
+        if (this.form.undertakingDept != null && this.form.undertakingDept != "" && this.form.undertakingDept != undefined) {
+          this.form.deptId = this.form.undertakingDeptName.split(',')
+        }
+        if (this.form.projectLeaderUser) {
+          this.form.projectLeaderName = this.form.projectLeaderUser.nickName
+        }
+        this.$set(this.form, 'deptLeader', [])
+        if (this.form.undertakingDept) {
+          let arr = this.form.undertakingDept.split(',')
+          this.getDeptLeader(arr);
+        } else {
+          this.$set(this.form, 'deptId', [])
+        }
+      })
+    },
     getUserList() {
       listUser({ pageSize: 9999, pageNum: 1 }).then(res => {
         this.userList = res.rows
@@ -125,7 +143,8 @@ export default {
     getDeptLeader(val) {
       this.deptLeaderList = [];
       for (let v of val) {
-        getUsersDeptLeaderByDept({ deptId: v }).then(res => {
+        getUsersDeptLeaderByDept({ deptId: Number(v) }).then(res => {
+          debugger
           this.deptLeaderList.push(res.data.userId);
           this.form.deptLeader = this.deptLeaderList;
         })
@@ -165,26 +184,24 @@ export default {
       this.peopleVisible = false;
     },
     confirmPlanForm() {
-      console.log(this.form);
+      this.form.undertakingDept = this.form.deptId.join(',')
       let formData = new FormData();
       formData.append("form", JSON.stringify(this.form));
-      modifyProject(formData).then(res=>{
-        console.log(res);
-      })
+      modifyProject(formData)
       const params = { taskId: this.taskForm.taskId };
       // 获取下一个流程节点
-      // getNextFlowNode(params).then(res => {
-      //   this.$set(this.taskForm.variables, "formId", this.taskForm.formId);
-      //   this.$set(this.taskForm.variables, "budgetInitiator", this.peopleForm.userId);
-      //   getUsersDeptLeaderByDept({ deptId: 105 }).then(res => {
-      //     let userId = res.data.userId;
-      //     this.$set(this.taskForm.variables, "approval", userId);
-      //     complete(this.taskForm).then(response => {
-      //       this.$modal.msgSuccess(response.msg);
-      //       this.$emit('goBack')
-      //     });
-      //   })
-      // })
+      getNextFlowNode(params).then(res => {
+        this.$set(this.taskForm.variables, "formId", this.taskForm.formId);
+        this.$set(this.taskForm.variables, "budgetInitiator", this.peopleForm.userId);
+        getUsersDeptLeaderByDept({ deptId: 105 }).then(res => {
+          let userId = res.data.userId;
+          this.$set(this.taskForm.variables, "approval", userId);
+          complete(this.taskForm).then(response => {
+            this.$modal.msgSuccess(response.msg);
+            this.$emit('goBack')
+          });
+        })
+      })
     },
     cancel() {
       this.form = {}

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

@@ -2,27 +2,37 @@
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-07 16:38:10
+ * @LastEditTime: 2024-04-08 11:45:07
 -->
 
 <template>
   <div class="project-wrapper">
-
-    <el-tabs tabPosition="left" type="card" class="tabs-border" v-model="activeName">
-      <el-tab-pane label="项目登记" name="项目登记">
-        <addproject :taskForm="taskForm" :disabled="taskName != '项目登记'" @goBack="goBack"></addproject>
-      </el-tab-pane>
-      <el-tab-pane label="项目安排" name="项目安排">
-        <arrangeProject :taskForm ="taskForm" :disabled="taskName != '项目安排'" @goBack="goBack"></arrangeProject>
-      </el-tab-pane>
-      <el-tab-pane label="经营审核" name="经营审核"></el-tab-pane>
-      <el-tab-pane label="分管审核" name="分管审核"></el-tab-pane>
-      <el-tab-pane label="生产确认" name="生产确认"></el-tab-pane>
-      <el-tab-pane label="项目生产" name="项目生产"></el-tab-pane>
-      <el-tab-pane label="质量检查" name="质量检查"></el-tab-pane>
-      <el-tab-pane label="成果归档" name="成果归档"></el-tab-pane>
-    </el-tabs>
-
+    <el-row :gutter="20">
+      <el-col :span="18" :xs="24">
+        <el-tabs tabPosition="left" type="card" class="tabs-border" v-model="activeName">
+          <el-tab-pane label="项目登记" name="项目登记">
+            <addproject :taskForm="taskForm" :disabled="taskName != '项目登记'" @goBack="goBack"></addproject>
+          </el-tab-pane>
+          <el-tab-pane label="项目安排" name="项目安排">
+            <arrangeProject :taskForm="taskForm" :disabled="taskName != '项目安排'" @goBack="goBack"></arrangeProject>
+          </el-tab-pane>
+          <el-tab-pane label="经营审核" name="经营审核"></el-tab-pane>
+          <el-tab-pane label="分管审核" name="分管审核"></el-tab-pane>
+          <el-tab-pane label="生产确认" name="生产确认"></el-tab-pane>
+          <el-tab-pane label="项目生产" name="项目生产"></el-tab-pane>
+          <el-tab-pane label="质量检查" name="质量检查"></el-tab-pane>
+          <el-tab-pane label="成果归档" name="成果归档"></el-tab-pane>
+        </el-tabs>
+      </el-col>
+      <el-col :span="6" :xs="24">
+        <el-card>
+          <h2 style="text-align: center;">流程进度</h2>
+          <div>
+            <flow :flowData="flowData" />
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
 
   </div>
 </template>
@@ -33,6 +43,8 @@ import { listDept } from '@/api/system/dept'
 import { listUser, getUser } from '@/api/system/user'
 import addproject from "./addproject.vue"
 import arrangeProject from "./arrangeProject.vue"
+import flow from '@/views/flowable/task/todo/detail/flow'
+import { flowXmlAndNode } from "@/api/flowable/definition";
 export default {
   props: {
     taskName: {
@@ -44,11 +56,12 @@ export default {
   },
   components: {
     addproject,
-    arrangeProject
+    arrangeProject,
+    flow
   },
   data() {
     return {
-      activeName:'项目登记',
+      activeName: '项目登记',
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -84,6 +97,7 @@ export default {
         deadline: '',
         remark: ''
       }],
+      flowData: {}
     }
   },
   created() {
@@ -91,7 +105,9 @@ export default {
     console.log(this.taskName);
     this.getList();
     this.getDeptList();
-    // console.log(this.activeName);
+    flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
+      this.flowData = res.data;
+    })
   },
   methods: {
     // 查询项目列表
@@ -202,7 +218,7 @@ export default {
       this.peopleForm.userId = '';
       this.peopleVisible = false;
     },
-    goBack(){
+    goBack() {
       this.$emit('goBack')
     }
   },

oa-ui/src/views/oa/budget/addBudget.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-25 15:05:59
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-07 16:09:20
+ * @LastEditTime: 2024-04-08 09:28:41
 -->
 <template>
   <div>
@@ -119,7 +119,7 @@
             <el-breadcrumb-item>选择项目</el-breadcrumb-item>
             <el-breadcrumb-item>{{ projectForm.projectNumber }}</el-breadcrumb-item>
             <el-breadcrumb-item>{{ projectForm.projectName }}</el-breadcrumb-item>
-            <el-breadcrumb-item>{{ projectForm.projectLeader }}</el-breadcrumb-item>
+            <el-breadcrumb-item>{{ projectForm.projectLeaderUser.nickName }}</el-breadcrumb-item>
           </el-breadcrumb>
           <el-form ref="form2" :model="peopleForm" style="padding: 20px 100px 0">
             <!-- 选择人员 -->
@@ -313,7 +313,7 @@
             <el-breadcrumb-item>选择项目</el-breadcrumb-item>
             <el-breadcrumb-item>{{ projectForm.projectNumber }}</el-breadcrumb-item>
             <el-breadcrumb-item>{{ projectForm.projectName }}</el-breadcrumb-item>
-            <el-breadcrumb-item>{{ projectForm.projectLeader }}</el-breadcrumb-item>
+            <el-breadcrumb-item>{{ projectForm.projectLeaderUser.nickName }}</el-breadcrumb-item>
           </el-breadcrumb>
           <el-breadcrumb separator-class="el-icon-arrow-right" style="margin: 15px 0">
             <el-breadcrumb-item>固定成本小计</el-breadcrumb-item>
@@ -363,7 +363,7 @@
             <el-breadcrumb-item>选择项目</el-breadcrumb-item>
             <el-breadcrumb-item>{{ projectForm.projectNumber }}</el-breadcrumb-item>
             <el-breadcrumb-item>{{ projectForm.projectName }}</el-breadcrumb-item>
-            <el-breadcrumb-item>{{ projectForm.projectLeader }}</el-breadcrumb-item>
+            <el-breadcrumb-item>{{ projectForm.projectLeaderUser.nickName }}</el-breadcrumb-item>
           </el-breadcrumb>
           <el-breadcrumb separator-class="el-icon-arrow-right" style="margin: 15px 0">
             <el-breadcrumb-item>固定成本小计</el-breadcrumb-item>

oa-ui/src/views/oa/budget/components/budgetForm.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-03 16:28:09
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-07 09:48:26
+ * @LastEditTime: 2024-04-08 09:54:02
 -->
 <template>
   <div>
@@ -81,10 +81,10 @@
       <tr v-for="(work, index) in workList" :key="'work' + index">
         <td>{{ work.content }}</td>
         <td>{{ work.scale }}</td>
-        <td>{{ work.workLoad }}</td>
+        <td>{{ work.workload }}</td>
         <td>{{ work.price }}</td>
         <td>{{ work.coefficient }}</td>
-        <td>{{ work.total }}</td>
+        <td>{{ work.settle }}</td>
       </tr>
       <tr>
         <td colspan="5" class="head">外协费用</td>

oa-ui/src/views/oa/budget/components/budgetTable.vue

@@ -75,10 +75,10 @@
       <tr v-for="(work, index) in budgetForm.workList" :key="'work' + index">
         <td>{{ work.content }}</td>
         <td>{{ work.scale }}</td>
-        <td>{{ work.workLoad }}</td>
+        <td>{{ work.workload }}</td>
         <td>{{ work.price }}</td>
         <td>{{ work.coefficient }}</td>
-        <td>{{ work.total }}</td>
+        <td>{{ work.settle }}</td>
       </tr>
       <tr>
         <td colspan="5" class="head">外协费用</td>

oa-ui/src/views/oa/budget/components/choosePeople.vue

@@ -73,7 +73,7 @@ export default {
     /** 查询用户列表 */
     getList() {
       listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-        this.userList = response.rows.slice(1);
+        this.userList = response.rows;
         this.total = response.total;
       }
       );

oa-ui/src/views/oa/staff/index.vue

@@ -236,7 +236,6 @@
                   :value="dict.value" />
               </el-select>
             </el-form-item>
-            </el-form-item>
           </el-col>
         </el-row>
         <el-row>
@@ -418,7 +417,7 @@ export default {
       this.loading = true;
       listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
         this.userList = response.rows;
-        this.userList = this.userList.slice(1)
+        // this.userList = this.userList.slice(1)
         this.total = response.total;
         this.loading = false;
       }