修改合同、分包合同添加数据先后顺序乱序的问题；

新增项目流转添加等待执行后再新增功能

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-09-04 17:19:17
+ * @LastEditTime: 2024-09-29 11:01:48
 -->
 <template>
   <div class="app-container">
@@ -87,7 +87,8 @@
             </el-form-item>
           </el-row>
           <el-form-item label="关联分包合同">
-            <el-button type="primary" size="mini" @click="subOpen = true" icon="el-icon-plus" v-if="taskName == '合同拟稿'">新增分包合同</el-button>
+            <el-button type="primary" size="mini" @click="subOpen = true" icon="el-icon-plus"
+              v-if="taskName == '合同拟稿'">新增分包合同</el-button>
             <el-table v-loading="subloading" border :data="connectSubContractList">
               <el-table-column type="index" label="序号" width="55" align="center" />
               <el-table-column label="合同名称" align="center" prop="subContractName" />
@@ -96,7 +97,7 @@
               <el-table-column label="操作" align="center">
                 <template slot-scope="scope">
                   <el-button type="text" icon="el-icon-view" @click="clickSubFn(scope.row)">查看</el-button>
-                  <el-button type="text" style="color:#F56C6C;" icon="el-icon-delete"  v-if="taskName == '合同拟稿'"
+                  <el-button type="text" style="color:#F56C6C;" icon="el-icon-delete" v-if="taskName == '合同拟稿'"
                     @click="handleDeleteSub(scope.$index, scope.row)">删除</el-button>
                 </template>
               </el-table-column>
@@ -417,7 +418,7 @@ export default {
     FileItem,
     ChoosePartyA,
     workTable,
-    paymentTable, projectInfo,ChooseSubcontract,subContract
+    paymentTable, projectInfo, ChooseSubcontract, subContract
   },
   props: {
     taskName: {
@@ -467,12 +468,12 @@ export default {
       // 遮罩层
       loading: true,
       projectloading: true,
-      subloading:true,
+      subloading: true,
       // 弹出层标题
       title: "",
       // 是否显示弹出层
       open: false,
-      subOpen:false,
+      subOpen: false,
       tbOpen: false,
       partyAOpen: false,
       // 表单参数
@@ -491,9 +492,9 @@ export default {
       meetingOpen: false,
       commentOpen: false,
       drawerOpen: false,
-      subInfoOpen:false,
+      subInfoOpen: false,
       chooseProjectList: [],
-      connectSubContractList:[],
+      connectSubContractList: [],
       partyAList: [],
       projectList: [],
       deptList: [],
@@ -538,8 +539,8 @@ export default {
       formTotal: 0,
       flowData: {},
       clickTd: {},
-      subContractId:{
-        formId:''
+      subContractId: {
+        formId: ''
       }
     };
   },
@@ -1009,24 +1010,56 @@ export default {
         }
       });
     },
+    // updateContractData() {
+    //   this.workList = this.$refs.workTableRef.workList;
+    //   this.paymentList = this.$refs.paymentRef.paymentList;
+    //   updateContract(this.form).then(response => {
+    //     this.$modal.msgSuccess("修改成功");
+    //     this.open = false;
+    //     delContractWork(this.form.contractId).then(res => {
+    //       for (let work of this.workList) {
+    //         work.contractId = this.form.contractId
+    //         addContractWork(work);
+    //       }
+    //     })
+    //     delContractPayment(this.form.contractId).then(res => {
+    //       for (let payment of this.paymentList) {
+    //         payment.contractId = this.form.contractId
+    //         addContractPayment(payment);
+    //       }
+    //     })
+    //   });
+    // },
     updateContractData() {
       this.workList = this.$refs.workTableRef.workList;
       this.paymentList = this.$refs.paymentRef.paymentList;
       updateContract(this.form).then(response => {
         this.$modal.msgSuccess("修改成功");
         this.open = false;
-        delContractWork(this.form.contractId).then(res => {
-          for (let work of this.workList) {
-            work.contractId = this.form.contractId
-            addContractWork(work);
-          }
-        })
-        delContractPayment(this.form.contractId).then(res => {
-          for (let payment of this.paymentList) {
-            payment.contractId = this.form.contractId
-            addContractPayment(payment);
-          }
-        })
+        // 删除合同的工作和支付信息，并等待两个操作完成
+        Promise.all([
+          delContractWork(this.form.contractId),
+          delContractPayment(this.form.contractId)
+        ]).then(([workRes, paymentRes]) => {
+          // 添加工作信息
+          const workPromises = this.workList.map(work => {
+            work.contractId = this.form.contractId;
+            return addContractWork(work);
+          });
+          // 添加支付信息
+          const paymentPromises = this.paymentList.map(payment => {
+            payment.contractId = this.form.contractId;
+            return addContractPayment(payment);
+          });
+          // 等待所有添加操作完成
+          return Promise.all([...workPromises, ...paymentPromises]);
+        }).then(() => {
+          this.$modal.msgSuccess("计划工作量和回款计划添加成功");
+        }).catch(error => {
+          this.$modal.msgError("操作失败: " + error.message);
+        });
+      }).catch(error => {
+        this.$modal.msgError("合同更新失败: " + error.message);
       });
     },
     updateRelatedProject() {
@@ -1130,7 +1163,7 @@ export default {
         this.$set(this.form, 'partyAId', val[0].partyAId)
       }
     },
-    async confirmSubContract(val){
+    async confirmSubContract(val) {
       let isSame = this.haveSameIds(val, this.connectSubContractList, 'subContractId');
       if (isSame) {
         this.$message.error('请勿重复添加已有的分包合同')

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-05 10:39:05
+ * @LastEditTime: 2024-09-29 11:15:09
 -->
 <template>
   <div class="app-container">
@@ -813,7 +813,7 @@ export default {
       return true;
     },
     // 保存信息
-    saves() {
+    async saves() {
       this.workList = this.$refs.workTableRef.workList;
       this.paymentList = this.$refs.paymentRef.paymentList;
       if (this.formTotal != 0) {
@@ -841,11 +841,11 @@ export default {
         })
         for (let work of this.workList) {
           work.contractId = subContractId;
-          addContractWork(work);
+          await addContractWork(work);
         }
         for (let payment of this.paymentList) {
           payment.contractId = subContractId;
-          addContractPayment(payment);
+          await addContractPayment(payment);
         }
         const params = { taskId: this.taskForm.taskId };
         getNextFlowNode(params).then(res => {
@@ -987,27 +987,58 @@ export default {
         handleComplete(this.taskForm);
       }
     },
-    updateChooseProjectList() {
+    // updateChooseProjectList() {
+    //   this.workList = this.$refs.workTableRef.workList;
+    //   this.paymentList = this.$refs.paymentRef.paymentList;
+    //   const subContractId = this.taskForm.formId
+    //   delProjectSubcontract(subContractId).then(() => {
+    //     this.chooseProjectList.forEach(item => {
+    //       addProjectSubcontract({ subContractId: subContractId, projectId: item.projectId })
+    //     })
+    //   })
+    //   delContractWork(subContractId).then(() => {
+    //     for (let work of this.workList) {
+    //       work.contractId = subContractId;
+    //       addContractWork(work);
+    //     }
+    //   })
+    //   delContractPayment(subContractId).then(() => {
+    //     for (let payment of this.paymentList) {
+    //       payment.contractId = subContractId;
+    //       addContractPayment(payment);
+    //     }
+    //   })
+    // },
+    async updateChooseProjectList() {
       this.workList = this.$refs.workTableRef.workList;
       this.paymentList = this.$refs.paymentRef.paymentList;
-      const subContractId = this.taskForm.formId
-      delProjectSubcontract(subContractId).then(() => {
-        this.chooseProjectList.forEach(item => {
-          addProjectSubcontract({ subContractId: subContractId, projectId: item.projectId })
-        })
-      })
-      delContractWork(subContractId).then(() => {
+      const subContractId = this.taskForm.formId;
+      try {
+        // 删除项目分包合同
+        await delProjectSubcontract(subContractId);
+        // 添加新的项目分包合同
+        for (let item of this.chooseProjectList) {
+          await addProjectSubcontract({ subContractId: subContractId, projectId: item.projectId });
+        }
+        // 删除合同工作
+        await delContractWork(subContractId);
+        // 添加新的合同工作
         for (let work of this.workList) {
           work.contractId = subContractId;
-          addContractWork(work);
+          await addContractWork(work);
         }
-      })
-      delContractPayment(subContractId).then(() => {
+        // 删除合同付款
+        await delContractPayment(subContractId);
+        // 添加新的合同付款
         for (let payment of this.paymentList) {
           payment.contractId = subContractId;
-          addContractPayment(payment);
+          await addContractPayment(payment);
         }
-      })
+        this.$modal.msgSuccess("更新成功");
+      } catch (error) {
+        console.error("更新选择项目列表时出错:", error);
+        this.$modal.msgError("更新失败");
+      }
     },
     // 确定合作单位
     confirmPartners(val) {

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-09-06 09:48:03
+ * @LastEditTime: 2024-09-29 11:47:57
 -->
 <template>
   <div class="project-wrapper">
@@ -120,7 +120,7 @@
 <script>
 import { parseTime } from "@/utils/ruoyi";
 import { mapGetters } from "vuex";
-import { listProject, getProject, addProject, updateProject, delProject, getProjectNmuber,sendMessage } from "@/api/oa/project/project";
+import { listProject, getProject, addProject, updateProject, delProject, getProjectNmuber, sendMessage } from "@/api/oa/project/project";
 import { listDept } from '@/api/system/dept'
 import { getUser } from "@/api/system/user";
 import { getUsersDeptLeaderByDept } from "@/api/system/post";
@@ -325,15 +325,14 @@ export default {
       }
       this.openContract = false;
     },
-    updatePlanWorkload() {
+    async updatePlanWorkload() {
       const workList = this.$refs.planworkRef.workList;
       const projectId = this.taskForm.formId
-      delProjectWork(projectId).then(() => {
-        workList.forEach(work => {
-          work.projectId = projectId;
-          addProjectWork(work);
-        })
-      })
+      await delProjectWork(projectId)
+      for (let work of workList) {
+        work.projectId = projectId;
+        await addProjectWork(work);
+      }
     },
     // 暂存
     async save() {

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-07-08 16:16:27
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-05 16:54:57
+ * @LastEditTime: 2024-09-29 10:40:31
 -->
 <template>
   <div class="app-container">
@@ -159,14 +159,13 @@ export default {
       }
     },
     // 更新工作量
-    updateWorkList() {
-      delProjectWork(this.taskForm.formId).then(res => {
-        this.workList.forEach(work => {
-          work.projectId = this.taskForm.formId;
-          addProjectWork(work);
-        })
-        this.$message.success('保存成功')
-      })
+    async updateWorkList() {
+      await delProjectWork(this.taskForm.formId)
+      for (let work of this.workList) {
+        work.projectId = this.taskForm.formId;
+        await addProjectWork(work);
+      }
+      this.$message.success('保存成功')
     },
     // 保存按钮
     save() {

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-07-04 17:37:29
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-27 16:49:03
+ * @LastEditTime: 2024-09-27 17:08:06
 -->
 <template>
   <div class="app-container">
@@ -108,7 +108,7 @@
           </el-row>
         </el-form>
         <div style="text-align: center;" v-if="taskName">
-          <el-button type="danger" @click="returnOpen = true">退 回</el-button>
+          <el-button type="danger" @click="returnOpen = true" v-show="taskName != '技术交底'">退 回</el-button>
           <el-button type="primary" @click="submitForm">提 交</el-button>
         </div>
       </el-col>

oa-ui/src/views/oa/contract/components/edit.vue

@@ -406,18 +406,30 @@ export default {
       updateContract(this.form).then(response => {
         this.$modal.msgSuccess("修改成功");
         this.open = false;
-        delContractWork(this.form.contractId).then(res => {
-          for (let work of this.workList) {
-            work.contractId = this.form.contractId
-            addContractWork(work);
-          }
-        })
-        delContractPayment(this.form.contractId).then(res => {
-          for (let payment of this.paymentList) {
-            payment.contractId = this.form.contractId
-            addContractPayment(payment);
-          }
-        })
+        // 删除合同的工作和支付信息，并等待两个操作完成
+        Promise.all([
+          delContractWork(this.form.contractId),
+          delContractPayment(this.form.contractId)
+        ]).then(([workRes, paymentRes]) => {
+          // 添加工作信息
+          const workPromises = this.workList.map(work => {
+            work.contractId = this.form.contractId;
+            return addContractWork(work);
+          });
+          // 添加支付信息
+          const paymentPromises = this.paymentList.map(payment => {
+            payment.contractId = this.form.contractId;
+            return addContractPayment(payment);
+          });
+          // 等待所有添加操作完成
+          return Promise.all([...workPromises, ...paymentPromises]);
+        }).then(() => {
+          this.$modal.msgSuccess("计划工作量和回款计划添加成功");
+        }).catch(error => {
+          this.$modal.msgError("操作失败: " + error.message);
+        });
+      }).catch(error => {
+        this.$modal.msgError("合同更新失败: " + error.message);
       });
     },
     async updateRelatedProject() {

oa-ui/src/views/oa/contract/components/subEdit.vue

@@ -242,6 +242,7 @@ export default {
       // this.init();
       this.getContractSubcontractList();
       this.getProjectSubcontractList();
+      this.form.partnerId = this.form.partnerId ? this.form.partnerId.split(',') : null;
     }
   },
   created() {
@@ -256,7 +257,7 @@ export default {
       this.getContractCommentList();
       this.getProjectSubcontractList();
     },
-    getContractCommentList(){
+    getContractCommentList() {
       const subContractId = this.form.subContractId;
       listContractComment({ pageNum: 1, pageSize: 100, contractId: subContractId }).then(res => {
         if (res.rows && res.rows.length != 0) {
@@ -282,14 +283,13 @@ export default {
     getContractSubcontractList() {
       this.contractloading = true;
       const subContractId = this.form.subContractId;
-      if(!subContractId) return
+      if (!subContractId) return
       listContractSubcontract({ subContractId: subContractId }).then(async res => {
         let list = []
         for (let r of res.rows) {
           let obj = await getContract(r.contractId)
           list.push(obj.data)
         }
-        console.log(res,subContractId);
         this.connectContractList = list
         this.contractloading = false;
       })
@@ -409,31 +409,64 @@ export default {
         this.form.contractDocument = ""
       }
     },
-    updateSubContractFn() {
-      const subContractId = this.form.subContractId
+    // updateSubContractFn() {
+    //   const subContractId = this.form.subContractId
+    //   this.workList = this.$refs.workTableRef.workList;
+    //   this.paymentList = this.$refs.paymentRef.paymentList;
+    //   updateSubContract(this.form).then(() => {
+    //     this.$modal.msgSuccess("修改成功");
+    //     delProjectSubcontract(subContractId).then(() => {
+    //       this.connectProjectList.forEach(item => {
+    //         addProjectSubcontract({ subContractId: subContractId, projectId: item.projectId })
+    //       })
+    //     })
+    //     delContractWork(subContractId).then(() => {
+    //       for (let work of this.workList) {
+    //         work.contractId = subContractId;
+    //         addContractWork(work);
+    //       }
+    //     })
+    //     delContractPayment(subContractId).then(() => {
+    //       for (let payment of this.paymentList) {
+    //         payment.contractId = subContractId;
+    //         addContractPayment(payment);
+    //       }
+    //     })
+    //   })
+
+    // },
+    async updateSubContractFn() {
+      const subContractId = this.form.subContractId;
       this.workList = this.$refs.workTableRef.workList;
       this.paymentList = this.$refs.paymentRef.paymentList;
-      updateSubContract(this.form).then(() => {
+      try {
+        // 更新子合同
+        await updateSubContract(this.form);
         this.$modal.msgSuccess("修改成功");
-        delProjectSubcontract(subContractId).then(() => {
-          this.connectProjectList.forEach(item => {
-            addProjectSubcontract({ subContractId: subContractId, projectId: item.projectId })
-          })
-        })
-        delContractWork(subContractId).then(() => {
-          for (let work of this.workList) {
-            work.contractId = subContractId;
-            addContractWork(work);
-          }
-        })
-        delContractPayment(subContractId).then(() => {
-          for (let payment of this.paymentList) {
-            payment.contractId = subContractId;
-            addContractPayment(payment);
-          }
-        })
-      })
-
+        // 删除项目分包合同
+        await delProjectSubcontract(subContractId);
+        // 添加新的项目分包合同
+        for (let item of this.connectProjectList) {
+          await addProjectSubcontract({ subContractId: subContractId, projectId: item.projectId });
+        }
+        // 删除合同工作
+        await delContractWork(subContractId);
+        // 添加新的合同工作
+        for (let work of this.workList) {
+          work.contractId = subContractId;
+          await addContractWork(work);
+        }
+        // 删除合同付款
+        await delContractPayment(subContractId);
+        // 添加新的合同付款
+        for (let payment of this.paymentList) {
+          payment.contractId = subContractId;
+          await addContractPayment(payment);
+        }
+      } catch (error) {
+        console.error("更新合同时出错:", error);
+        this.$modal.msgError("更新失败");
+      }
     },
     updateRelatedProject() {
       delProjectContract(this.form.contractId).then(() => {