完善项目结算流程

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

@@ -40,7 +40,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectCmcSettleList" parameterType="CmcSettle" resultMap="CmcSettleResult">
         <include refid="selectCmcSettleVo"/>
-        <where>  
+        <where>
+            <if test="settleId != null  and settleId != ''"> and settle_id = #{settleId}</if>
             <if test="projectId != null  and projectId != ''"> and project_id = #{projectId}</if>
             <if test="workloadReport != null  and workloadReport != ''"> and workload_report = #{workloadReport}</if>
             <if test="reporter != null "> and reporter = #{reporter}</if>

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

@@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="amountXm != null "> and amount_xm = #{amountXm}</if>
             <if test="amountManager != null "> and amount_manager = #{amountManager}</if>
         </where>
+        order by #{summaryId} asc
     </select>
     
     <select id="selectCmcSettleSummaryBySettleId" parameterType="String" resultMap="CmcSettleSummaryResult">

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

@@ -35,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="settleXm != null "> and settle_xm = #{settleXm}</if>
             <if test="settleManager != null "> and settle_manager = #{settleManager}</if>
         </where>
+        order by  #{workId} asc
     </select>
     
     <select id="selectCmcSettleWorkBySettleId" parameterType="String" resultMap="CmcSettleWorkResult">

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

@@ -1,3 +1,9 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-04-23 17:08:16
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-05-07 16:08:23
+-->
 <template>
   <div>
     <sc-table :taskForm="taskForm" :tableForm="tableForm" v-if="taskForm.procDefName == '生产部门考核'"></sc-table>
@@ -10,6 +16,7 @@
     <car-form :taskForm="taskForm" :taskName="''" v-else-if="taskForm.procDefName == '用车审批'"></car-form>
     <technical-form :taskForm="taskForm" v-else-if="taskForm.procDefName == '技术交底'"></technical-form>
     <safe-form :taskForm="taskForm" v-else-if="taskForm.procDefName == '安全交底'"></safe-form>
+    <settle-form :taskForm="taskForm" :taskName="''" :disabled="true" v-else-if="taskForm.procDefName == '项目结算'"></settle-form>
   </div>
 </template>
 
@@ -24,6 +31,7 @@ import CarForm from '@/views/flowable/form/carForm.vue';
 import projectProcess from '@/views/flowable/form/projectProcess/index'
 import TechnicalForm from '@/views/flowable/form/technicalForm.vue';
 import SafeForm from '@/views/flowable/form/safeForm.vue';
+import SettleForm from '@/views/flowable/form/settleForm.vue';
 export default {
   props: {
     passingParam: {
@@ -45,7 +53,8 @@ export default {
     CarForm,
     projectProcess,
     TechnicalForm,
-    SafeForm
+    SafeForm,
+    SettleForm
   },
   data() {
     return {

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

@@ -1,3 +1,9 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-04-15 09:35:41
+ * @LastEditors: 
+ * @LastEditTime: 2024-05-07 17:06:16
+-->
 <!--
  * @Author: ysh
  * @Date: 2024-04-08 13:56:14
@@ -97,6 +103,7 @@
       <div class="headers">
         产值结算（内部）
         <div class="line"></div>
+        <settle-data :taskForm="taskForm"></settle-data>
       </div>
       <div slot="footer" class="dialog-footer" style="text-align: center">
         <el-button @click="preserve()" :disabled="disabled" type="warning">保 存</el-button>
@@ -138,9 +145,11 @@ import { getProject, updateProject } from "@/api/oa/project/project";
 import { getCar } from "@/api/oa/car/car";
 import { listUser } from '@/api/system/user';
 import borrowData from '../borrow/borrowData.vue';
+import SettleData from '../settle/settleData.vue';
 export default {
   components: {
-    borrowData
+    borrowData,
+    SettleData
   },
   computed: {
     ...mapGetters(["name", "userId"]),

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-04-23 16:06:30
+ * @LastEditTime: 2024-05-07 17:44:13
 -->
 
 <template>
@@ -41,8 +41,6 @@
             <in-progress :taskForm="taskForm" :taskName="taskName" :disabled="taskName != '项目生产'"
               @goBack="goBack"></in-progress>
           </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">

oa-ui/src/views/flowable/form/settle/settleData.vue

@@ -0,0 +1,69 @@
+<template>
+  <div class="mt20">
+    <div class="nav-btn">
+      <div>
+        <el-button class="mb20" type="primary" plain size="mini" icon="el-icon-plus"
+          @click="addSettleFlow">结算申请</el-button>
+      </div>
+      <div>
+        <el-button icon="el-icon-refresh" circle size="mini" @click="getSettleData()"></el-button>
+      </div>
+    </div>
+
+    <el-table :data="dataList" style="width: 100%">
+      <el-table-column type="index" label="序号" width="50" />
+      <el-table-column label="上报人">
+        <template slot-scope="scope">
+          {{ getReporter(scope.row) }}
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import { listSettle, getSettle, delSettle, addSettle, updateSettle } from "@/api/oa/settle/settle";
+import { getUser } from "@/api/system/user";
+export default {
+  props: {
+    taskForm: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      dataList: []
+    }
+  },
+  mounted() {
+    this.getSettleData()
+  },
+  methods: {
+    getSettleData() {
+      listSettle({ projectId: this.taskForm.formId }).then(res => {
+        console.log(res);
+        if (res.code == 200) {
+          this.dataList = res.rows
+        }
+      })
+    },
+    addSettleFlow() {
+
+    },
+    getReporter(row){
+      getUser(row.reporter).then(res=>{
+        console.log(res);
+        return res.data.nickName
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.nav-btn {
+  display: flex;
+  justify-content: space-between;
+}
+</style>

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

@@ -2,10 +2,10 @@
  * @Author: ysh
  * @Date: 2024-04-30 09:03:14
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-06 17:48:28
+ * @LastEditTime: 2024-05-07 16:13:01
 -->
 <template>
-  <div class="app-container">
+  <div class="app-container" v-loading="loading">
     <el-row :gutter="20">
       <el-col :span="19" :xs="24">
         <h2 class="text-center">项目结算表</h2>
@@ -13,7 +13,7 @@
           项目信息
           <div class="line"></div>
         </div>
-        <el-form ref="form" :model="form" :rules="rules" label-width="160px">
+        <el-form ref="settleForm" :model="form" :rules="rules" label-width="160px" :disabled="disabled">
           <el-form-item label="项目编号" prop="projectId">
             <el-select v-model="form.projectId" filterable placeholder="请选择" @change="handleSelectProject"
               :disabled="taskName != '结算发起'" clearable style="width: 100%">
@@ -35,11 +35,7 @@
                 {{ chooseProject.contractNumber }}
               </el-descriptions-item>
               <el-descriptions-item label="项目负责人" label-class-name="my-label">
-                {{
-                  chooseProject.projectLeaderUser
-                  ? chooseProject.projectLeaderUser.nickName
-                  : ""
-                }}
+                {{ chooseProject.projectLeaderUser ? chooseProject.projectLeaderUser.nickName : "" }}
               </el-descriptions-item>
               <el-descriptions-item label="甲方单位" label-class-name="my-label">
                 {{ chooseProject.partyA }}
@@ -65,7 +61,8 @@
             </el-descriptions>
           </el-form-item>
           <el-form-item label="工作量上报说明" prop="workloadReport">
-            <el-input v-model="form.workloadReport" type="textarea" placeholder="请输入工作量上报说明" />
+            <el-input v-model="form.workloadReport" type="textarea" :disabled="taskName != '结算发起'"
+              placeholder="请输入工作量上报说明" />
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
@@ -152,8 +149,8 @@
                     :controls="false"></el-input-number>
                 </td>
                 <td>
-                  <el-input-number style="width: 100px" v-model="work.coefficient" clearable @blur="calculateSettle(work)"
-                    :controls="false"></el-input-number>
+                  <el-input-number style="width: 100px" v-model="work.coefficient" clearable
+                    @blur="calculateSettle(work)" :controls="false"></el-input-number>
                 </td>
                 <td>
                   <!-- <el-input-number style="width:100px" v-model="work.settle" clearable :controls="false"></el-input-number> -->
@@ -224,6 +221,14 @@
                     :controls="false"></el-input-number>
                 </td>
               </tr>
+              <tr>
+                <td :colspan="2">结算说明</td>
+                <td :colspan="3">
+                  <el-input v-model="form.settleComment" type="textarea" clearable
+                    :autosize="{ minRows: 2, maxRows: 10 }">
+                  </el-input>
+                </td>
+              </tr>
             </table>
             <el-button icon="el-icon-plus" type="primary" plain size="mini" @click="addSumWorkList"></el-button>
           </el-form-item>
@@ -235,122 +240,129 @@
               <div class="line"></div>
             </div>
             <el-form-item label="综合事务部(设备领用情况)">
-              <el-input v-model="form.zhComment" type="textarea" clearable :autosize="{ minRows: 4, maxRows: 10 }">
+              <el-input v-model="form.zhComment" type="textarea" :disabled="taskName != '综合事务部处理'" clearable
+                :autosize="{ minRows: 4, maxRows: 10 }">
               </el-input>
             </el-form-item>
             <el-row>
               <el-col :span="6" :xs="24" :offset="12">
                 <el-form-item label="签名：" label-width="120px">
-                  <span class="auditor"> {{}} </span>
+                  <span class="auditor"> {{ form.zhUserName }} </span>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="日期：" label-width="120px">
-                  <span> {{}} </span>
+                  <span> {{ form.zhTime }} </span>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-form-item label="技术质量部(质量及工作量)">
-              <el-input v-model="form.remark" type="textarea" clearable :autosize="{ minRows: 4, maxRows: 10 }">
+              <el-input v-model="form.jsComment" type="textarea" :disabled="taskName != '技术质量部审核'" clearable
+                :autosize="{ minRows: 4, maxRows: 10 }">
               </el-input>
             </el-form-item>
             <el-row>
               <el-col :span="6" :xs="24" :offset="12">
                 <el-form-item label="签名：" label-width="120px">
-                  <span class="auditor"> {{}} </span>
+                  <span class="auditor"> {{ form.jsUserName }} </span>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="日期：" label-width="120px">
-                  <span> {{}} </span>
+                  <span> {{ form.jsTime }} </span>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-form-item label="项目管理部(结算)">
-              <el-input v-model="form.remark" type="textarea" clearable :autosize="{ minRows: 4, maxRows: 10 }">
+              <el-input v-model="form.xmComment" type="textarea" :disabled="taskName != '项目管理部结算'" clearable
+                :autosize="{ minRows: 4, maxRows: 10 }">
               </el-input>
             </el-form-item>
             <el-row>
               <el-col :span="6" :xs="24" :offset="12">
                 <el-form-item label="签名：" label-width="120px">
-                  <span class="auditor"> {{}} </span>
+                  <span class="auditor"> {{ form.xmUserName }} </span>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="日期：" label-width="120px">
-                  <span> {{}} </span>
+                  <span> {{ form.xmTime }} </span>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-form-item label="项目承担部门(确认)">
-              <el-input v-model="form.remark" type="textarea" clearable :autosize="{ minRows: 4, maxRows: 10 }">
+              <el-input v-model="form.deptComment" type="textarea" :disabled="taskName != '结算发起人确认'" clearable
+                :autosize="{ minRows: 4, maxRows: 10 }">
               </el-input>
             </el-form-item>
             <el-row>
               <el-col :span="6" :xs="24" :offset="12">
                 <el-form-item label="签名：" label-width="120px">
-                  <span class="auditor"> {{}} </span>
+                  <span class="auditor"> {{ form.deptUserName }} </span>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="日期：" label-width="120px">
-                  <span> {{}} </span>
+                  <span> {{ form.deptTime }} </span>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-form-item label="经营发展部(校核)">
-              <el-input v-model="form.remark" type="textarea" clearable :autosize="{ minRows: 4, maxRows: 10 }">
+              <el-input v-model="form.jyComment" type="textarea" :disabled="taskName != '经营发展部校核'" clearable
+                :autosize="{ minRows: 4, maxRows: 10 }">
               </el-input>
             </el-form-item>
             <el-row>
               <el-col :span="6" :xs="24" :offset="12">
                 <el-form-item label="签名：" label-width="120px">
-                  <span class="auditor"> {{}} </span>
+                  <span class="auditor"> {{ form.jyUserName }} </span>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="日期：" label-width="120px">
-                  <span> {{}} </span>
+                  <span> {{ form.jyTime }} </span>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-form-item label="分管领导(审核)">
-              <el-input v-model="form.remark" type="textarea" clearable :autosize="{ minRows: 4, maxRows: 10 }">
+              <el-input v-model="form.managerComment" type="textarea" :disabled="taskName != '分管审核'" clearable
+                :autosize="{ minRows: 4, maxRows: 10 }">
               </el-input>
             </el-form-item>
             <el-row>
               <el-col :span="6" :xs="24" :offset="12">
                 <el-form-item label="签名：" label-width="120px">
-                  <span class="auditor"> {{}} </span>
+                  <span class="auditor"> {{ form.managerUserName }} </span>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="日期：" label-width="120px">
-                  <span> {{}} </span>
+                  <span> {{ form.managerTime }} </span>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-form-item label="总经理(审批)">
-              <el-input v-model="form.remark" type="textarea" clearable :autosize="{ minRows: 4, maxRows: 10 }">
+              <el-input v-model="form.gmComment" type="textarea" :disabled="taskName != '总经理审批'" clearable
+                :autosize="{ minRows: 4, maxRows: 10 }">
               </el-input>
             </el-form-item>
             <el-row>
               <el-col :span="6" :xs="24" :offset="12">
                 <el-form-item label="签名：" label-width="120px">
-                  <span class="auditor"> {{}} </span>
+                  <span class="auditor"> {{ form.gmUserName }} </span>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
                 <el-form-item label="日期：" label-width="120px">
-                  <span> {{}} </span>
+                  <span> {{ form.gmTime }} </span>
                 </el-form-item>
               </el-col>
             </el-row>
           </div>
         </el-form>
-        <div style="text-align: center">
+        <div style="text-align: center" v-if="!disabled">
           <el-button type="warning" @click="preserve">保存</el-button>
-          <el-button type="primary">提交下一个流程</el-button>
+          <el-button type="primary" @click="submitNextFlow">提交下一个流程</el-button>
         </div>
       </el-col>
       <el-col :span="5" :xs="24">
@@ -375,33 +387,15 @@ import { flowXmlAndNode } from "@/api/flowable/definition";
 import { parseTime } from "@/utils/ruoyi";
 import { listProject, getProject } from "@/api/oa/project/project";
 import { deepClone } from '@/utils'
-import {
-  listSettle,
-  getSettle,
-  delSettle,
-  addSettle,
-  updateSettle,
-} from "@/api/oa/settle/settle";
-import {
-  listSettleSummary,
-  getSettleSummary,
-  addSettleSummary,
-  delSettleSummary,
-  updateSettleSummary,
-} from "@/api/oa/settle/settleSummary";
-import {
-  listSettleWork,
-  getSettleWork,
-  addSettleWork,
-  updateSettleWork,
-  delSettleWork,
-} from "@/api/oa/settle/settleWork";
-import {
-  listProjectContract,
-  addProjectContract,
-} from "@/api/oa/contract/projectContract";
+import { listSettle, getSettle, delSettle, addSettle, updateSettle } from "@/api/oa/settle/settle";
+import { listSettleSummary, getSettleSummary, addSettleSummary, delSettleSummary, updateSettleSummary } from "@/api/oa/settle/settleSummary";
+import { listSettleWork, getSettleWork, addSettleWork, updateSettleWork, delSettleWork } from "@/api/oa/settle/settleWork";
+import { listProjectContract, addProjectContract, } from "@/api/oa/contract/projectContract";
 import { getPrice } from "@/api/oa/price/price";
 import ChoosePrice from "./components/choosePrice.vue";
+import { getUser } from "@/api/system/user";
+import { complete, getNextFlowNode } from "@/api/flowable/todo";
+import { getUsersDeptLeader, getUsersDeptLeaderByDept, getUsersManageLeaderByDept } from '@/api/system/post.js'
 export default {
   components: {
     flow,
@@ -416,14 +410,22 @@ export default {
       type: Object,
       required: true,
     },
+    disabled: {
+      type: Boolean,
+      default: false
+    }
   },
   data() {
     return {
+      loading: true,
       drawer: false,
       flag: false,
       flowData: {},
       form: {},
-      rules: {},
+      rules: {
+        projectId: [
+          { required: true, trigger: "change", message: "请选择项目编号" }]
+      },
       projectList: [],
       isSelect: false,
       chooseProject: {},
@@ -458,6 +460,7 @@ export default {
       oldSettleSumList: [],
       actualSumSettle: "",
       clickWork: {},
+      deptId: undefined
     };
   },
   created() {
@@ -477,13 +480,20 @@ export default {
   methods: {
     initForm() {
       listSettle({ settleId: this.taskForm.formId }).then(res => {
-        console.log(res);
         if (res.total == 1) {
           this.form = res.rows[0];
           this.flag = true;
           this.handleSelectProject(res.rows[0].projectId);
           this.listSettleWorkFn();
           this.listSettleSummaryFn();
+          getUser(this.form.reporter).then(res => {
+            if (res.data) {
+              console.log(res.data);
+              this.form.reporterName = res.data.nickName;
+              this.deptId = res.data.deptId
+            }
+          })
+          this.getCurrentUser();
         } else if (res.total == 0) {
           this.flag = false;
           if (this.taskName == "结算发起") {
@@ -492,8 +502,145 @@ export default {
             this.form.reportTime = parseTime(new Date(), "{y}-{m}-{d}");
           }
         }
+        setTimeout(() => {
+          this.loading = false
+        }, 500);
+
       });
     },
+    getCurrentUser() {
+      if (this.taskName == '综合事务部处理') {
+        this.form.zhUserName = this.$store.state.user.name;
+        this.form.zhUserId = this.$store.state.user.id;
+        this.form.zhTime = parseTime(new Date(), "{y}-{m}-{d}");
+      } else if (this.taskName == '技术质量部审核') {
+        this.form.jsUserName = this.$store.state.user.name;
+        this.form.jsUserId = this.$store.state.user.id;
+        this.form.jsTime = parseTime(new Date(), "{y}-{m}-{d}");
+      } else if (this.taskName == '项目管理部结算') {
+        this.form.xmUserName = this.$store.state.user.name;
+        this.form.xmUserId = this.$store.state.user.id;
+        this.form.xmTime = parseTime(new Date(), "{y}-{m}-{d}");
+      } else if (this.taskName == '结算发起人确认') {
+        this.form.deptUserName = this.$store.state.user.name;
+        this.form.deptUserId = this.$store.state.user.id;
+        this.form.deptTime = parseTime(new Date(), "{y}-{m}-{d}");
+      } else if (this.taskName == '经营发展部校核') {
+        this.form.jyUserName = this.$store.state.user.name;
+        this.form.jyUserId = this.$store.state.user.id;
+        this.form.jyTime = parseTime(new Date(), "{y}-{m}-{d}");
+      } else if (this.taskName == '分管审核') {
+        this.form.managerUserName = this.$store.state.user.name;
+        this.form.managerUserId = this.$store.state.user.id;
+        this.form.managerTime = parseTime(new Date(), "{y}-{m}-{d}");
+      } else if (this.taskName == '总经理审批') {
+        this.form.gmUserName = this.$store.state.user.name;
+        this.form.gmUserId = this.$store.state.user.id;
+        this.form.gmTime = parseTime(new Date(), "{y}-{m}-{d}");
+      }
+      this.getReviewerName();
+    },
+    getReviewerName() {
+      if (this.form.zhUserId) {
+        getUser(this.form.zhUserId).then(res => {
+          this.form.zhUserName = res.data.nickName;;
+        })
+      }
+      if (this.form.jsUserId) {
+        getUser(this.form.jsUserId).then(res => {
+          this.form.jsUserName = res.data.nickName;;
+        })
+      }
+      if (this.form.xmUserId) {
+        getUser(this.form.xmUserId).then(res => {
+          this.form.xmUserName = res.data.nickName;;
+        })
+      }
+      if (this.form.deptUserId) {
+        getUser(this.form.deptUserId).then(res => {
+          this.form.deptUserName = res.data.nickName;;
+        })
+      }
+      if (this.form.jyUserId) {
+        getUser(this.form.jyUserId).then(res => {
+          this.form.jyUserName = res.data.nickName;;
+        })
+      }
+      if (this.form.managerUserId) {
+        getUser(this.form.managerUserId).then(res => {
+          this.form.managerUserName = res.data.nickName;;
+        })
+      }
+      if (this.form.gmUserId) {
+        getUser(this.form.gmUserId).then(res => {
+          this.form.gmUserName = res.data.nickName;;
+        })
+      }
+    },
+    // 保存按钮
+    preserve() {
+      if (this.flag) {
+        this.updateSettleFn();
+        this.updateSettleSummaryFn();
+        this.updateSettleWorkFn();
+
+      } else {
+        this.addSettleFn();
+      }
+    },
+    submitNextFlow() {
+      this.$refs["settleForm"].validate(vaild => {
+        if (vaild) {
+          this.preserve();
+          debugger
+          if (this.taskName == '结算发起') {
+            this.getNextFlowNodeFn(17);
+          } else if (this.taskName == '综合事务部处理') {
+            this.getNextFlowNodeFn(52);
+          } else if (this.taskName == '技术质量部审核') {
+            this.getNextFlowNodeFn(32);
+          } else if (this.taskName == '项目管理部结算') {
+            this.getNextFlowNodeFn();
+          } else if (this.taskName == '结算发起人确认') {
+            this.getNextFlowNodeFn(13);
+          } else if (this.taskName == '经营发展部校核') {
+            this.getNextFlowNodeFn(null, this.deptId);
+          } else if (this.taskName == '分管审核') {
+            this.getNextFlowNodeFn();
+          } else if (this.taskName == '总经理审批') {
+            this.getNextFlowNodeFn();
+          }
+        }
+      })
+    },
+    getNextFlowNodeFn(userId, deptId) {
+      const params = { taskId: this.taskForm.taskId };
+      getNextFlowNode(params).then(res => {
+        if (userId) {
+          this.$set(this.taskForm.variables, "approval", userId);
+          complete(this.taskForm).then(response => {
+            this.$modal.msgSuccess(response.msg);
+            this.$emit('goBack');
+          });
+        } else {
+          if (deptId) {
+            getUsersManageLeaderByDept({ deptId }).then(res => {
+              let id = res.data.userId;
+              this.$set(this.taskForm.variables, "approval", id);
+              complete(this.taskForm).then(response => {
+                this.$modal.msgSuccess(response.msg);
+                this.$emit('goBack');
+              });
+            })
+          } else {
+            complete(this.taskForm).then(response => {
+              this.$modal.msgSuccess(response.msg);
+              this.$emit('goBack');
+            });
+          }
+        }
+      })
+    },
     // 查询项目列表
     getProjectList() {
       listProject({
@@ -582,7 +729,6 @@ export default {
       this.calculateSumSettle();
     },
     calculateSumSettle() {
-      debugger;
       let sum = 0;
       let arr = this.settleWorkList;
       for (let a of arr) {
@@ -616,17 +762,8 @@ export default {
     setValue(key, name, val) {
       this.$set(key, name, val);
     },
-    // 保存按钮
-    preserve() {
-      if (this.flag) {
-        this.updateSettleSummaryFn();
-      } else {
-        console.log(this.form);
-        console.log(this.settleWorkList);
-        console.log(this.settleSumList);
-        this.addSettleFn();
-      }
-    },
+
+    // 增加数据
     addSettleFn() {
       let settleId = this.taskForm.formId;
       this.form.settleId = settleId;
@@ -638,16 +775,22 @@ export default {
     addSettleWorkFn(settleId) {
       for (let work of this.settleWorkList) {
         work.settleId = settleId;
-        addSettleWork(work);
+        setTimeout(() => {
+          addSettleWork(work);
+        }, 500)
       }
     },
     addSettleSummaryFn(settleId) {
+      this.settleSumTr.settleId = settleId
       addSettleSummary(this.settleSumTr);
       for (let item of this.settleSumList) {
         item.settleId = settleId;
-        addSettleSummary(item);
+        setTimeout(() => {
+          addSettleSummary(item);
+        }, 500)
       }
     },
+    // 获取数据
     listSettleWorkFn() {
       listSettleWork({ settleId: this.taskForm.formId }).then(res => {
         this.settleWorkList = res.rows;
@@ -668,7 +811,6 @@ export default {
     },
     listSettleSummaryFn() {
       listSettleSummary({ settleId: this.taskForm.formId }).then(res => {
-        console.log(res);
         this.settleSumList = res.rows;
         this.oldSettleSumList = res.rows;
         for (let s of this.settleSumList) {
@@ -683,10 +825,17 @@ export default {
         this.calculateActualSumSettle();
       });
     },
+    // 更新数据
     updateSettleFn() {
+      updateSettle(this.form).then(res => {
+        if (res.code == 200)
+          this.$message.success('保存成功')
+      })
     },
     updateSettleWorkFn() {
-
+      delSettleWork([this.taskForm.formId]).then(res => {
+        this.addSettleWorkFn(this.taskForm.formId);
+      })
     },
     updateSettleSummaryFn() {
       delSettleSummary([this.taskForm.formId]).then(res => {