修改合同撤回之后无法提交的bug，新增删除流程同时删除数据的功能

oa-ui/src/api/oa/contract/contractComment.js

@@ -1,3 +1,9 @@
+/*
+ * @Author: ysh
+ * @Date: 2024-03-18 09:05:41
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-06-13 17:03:49
+ */
 import request from '@/utils/request'
 
 // 查询cmc合同意见列表

oa-ui/src/components/FileUpload/index.vue

@@ -50,7 +50,7 @@ export default {
     // 大小限制(MB)
     fileSize: {
       type: Number,
-      default: 5,
+      default: 50,
     },
     // 文件类型, 例如['png', 'jpg', 'jpeg']
     fileType: {

oa-ui/src/utils/deleteResource.js

@@ -0,0 +1,38 @@
+import request from '@/utils/request'
+
+const apiEndpoints = [
+  {
+    procDefName: '承接合同评审',
+    apiUrl: [
+      '/oa/contract/:id',
+      '/oa/contractComment/:id',
+      '/oa/contractMeeting/:id',
+      '/oa/contractPayment/:id',
+    ]
+  }
+]
+
+// 编写一个方法来处理删除请求，并同时发送所有API请求  
+export async function deleteResources(procDefName, id) {  
+  // 查找对应的API端点  
+  const endpoint = apiEndpoints.find(endpoint => endpoint.procDefName === procDefName);  
+  if (!endpoint) {  
+    throw new Error(`No API endpoints found for process definition: ${procDefName}`);  
+  }  
+    
+  // 构建所有请求的Promise数组  
+  const deletePromises = endpoint.apiUrl.map(apiUrl => {  
+    // 替换URL中的:id占位符  
+    const url = apiUrl.replace(':id', id);  
+    // 发送DELETE请求并返回Promise  
+    return request.delete(url)  
+  });  
+    
+  // 等待所有请求完成  
+  try {  
+    return await Promise.all(deletePromises);  
+    console.log('删除完成！');  
+  } catch (error) {  
+    console.error('One or more deletion requests failed:', error);  
+  }  
+} 

oa-ui/src/views/file/filesProject/achievement.vue

@@ -559,7 +559,6 @@ export default {
         return delAchievement(this.ids);
       }).then(() => {
         this.getAchiList();
-        debugger
         this.ids = [];
         this.$modal.msgSuccess("删除成功");
       }).catch(() => { });

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

@@ -2,14 +2,13 @@
  * @Author: ysh
  * @Date: 2024-03-25 15:05:59
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-12 16:03:19
+ * @LastEditTime: 2024-06-13 15:53:25
 -->
 <template>
   <div>
     <div>
-        <el-alert v-if="reBackDescription != ''" title="预算被退回" type="warning" show-icon
-          :description="reBackDescription">
-        </el-alert>
+      <el-alert v-if="reBackDescription != ''" title="预算被退回" type="warning" show-icon :description="reBackDescription">
+      </el-alert>
       <div class="header">
         <div class="title">
           <div class="title-text">新增预算</div>
@@ -39,10 +38,10 @@
             </el-form-item>
             <el-form-item label="项目负责人：" prop="projectLeader">
               {{
-          projectForm.projectLeaderUser
-            ? projectForm.projectLeaderUser.nickName
-            : ""
-        }}
+        projectForm.projectLeaderUser
+          ? projectForm.projectLeaderUser.nickName
+          : ""
+      }}
             </el-form-item>
             <el-form-item label="项目类型：" prop="projectType">
               {{ projectForm.projectType }}
@@ -80,7 +79,7 @@
               </table>
             </el-form-item>
             <el-form-item label="甲方单位：">
-              {{ projectForm.partyA }}
+              {{ projectForm.partyA ? projectForm.partyA.partyAName : '' }}
             </el-form-item>
             <el-form-item label="联系人：">
               {{ projectForm.contactPerson }}
@@ -107,8 +106,8 @@
             <el-breadcrumb-item>{{ projectForm.projectNumber }}</el-breadcrumb-item>
             <el-breadcrumb-item>{{ projectForm.projectName }}</el-breadcrumb-item>
             <el-breadcrumb-item>{{ projectForm.projectLeaderUser
-          ? projectForm.projectLeaderUser.nickName
-          : "" }}</el-breadcrumb-item>
+        ? projectForm.projectLeaderUser.nickName
+        : "" }}</el-breadcrumb-item>
           </el-breadcrumb>
           <el-form ref="form2" :model="peopleForm" style="padding: 20px 100px 0">
             <!-- 选择人员 -->
@@ -252,8 +251,8 @@
             <el-breadcrumb-item>{{ projectForm.projectNumber }}</el-breadcrumb-item>
             <el-breadcrumb-item>{{ projectForm.projectName }}</el-breadcrumb-item>
             <el-breadcrumb-item>{{ projectForm.projectLeaderUser
-          ? projectForm.projectLeaderUser.nickName
-          : "" }}</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>
@@ -352,8 +351,8 @@
             <el-breadcrumb-item>{{ projectForm.projectNumber }}</el-breadcrumb-item>
             <el-breadcrumb-item>{{ projectForm.projectName }}</el-breadcrumb-item>
             <el-breadcrumb-item>{{ projectForm.projectLeaderUser
-          ? projectForm.projectLeaderUser.nickName
-          : "" }}</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>
@@ -374,7 +373,7 @@
         <div class="btn">
           <el-button @click="activeStep -= 1" :disabled="activeStep == 0 || activeStep == 4">上一步</el-button>
           <el-button @click="confirmStep" type="primary" v-if="activeStep < 4">下一步</el-button>
-          <el-button @click="submitComplete" type="primary" v-if="activeStep == 4">完成</el-button>
+          <el-button @click="submitComplete" type="primary" v-if="activeStep == 4">提交流程</el-button>
         </div>
       </div>
 
@@ -552,8 +551,11 @@ export default {
     getAlter() {
       const params = { procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }
       flowRecordFull(params).then(res => {
-        if(res.data.flowList)
-          this.reBackDescription = res.data.flowList[1].comment.type + '：' + res.data.flowList[1].comment.comment
+        if (res.data.flowList) {
+          if (res.data.flowList.length > 1 && res.data.flowList[1].comment && res.data.flowList[1].comment.type == '退回意见') {
+            this.reBackDescription = res.data.flowList[1].comment.type + '：' + res.data.flowList[1].comment.comment
+          }
+        }
       })
     },
     // 初始化预算表，先从后台查询是否有数据
@@ -570,8 +572,10 @@ export default {
             listBudgetStaff({ budgetId }),
           ]);
         }
-      }).then(([response1, response2, response3, response4]) => {
-        if (response1.rows) {
+        return Promise.resolve([])
+      }).then(responses => {
+        const [response1 = null, response2 = null, response3 = null, response4 = null] = responses;
+        if (response1 && response1.rows) {
           this.chooseCar = response1.rows
           for (let car of this.chooseCar) {
             car.licensePlate = car.car.licensePlate
@@ -579,7 +583,7 @@ export default {
             car.brand = car.car.brand
           }
         }
-        if (response2.rows) {
+        if (response2 && response2.rows) {
           this.chooseDevice = response2.rows;
           for (let device of this.chooseDevice) {
             device.brand = device.device.brand
@@ -588,10 +592,10 @@ export default {
             device.series = device.device.series
           }
         }
-        if (response3.rows) {
+        if (response3 && response3.rows) {
           this.contentList = response3.rows;
         }
-        if (response4.rows) {
+        if (response4 && response4.rows) {
           this.chooseUser = response4.rows;
           for (let user of this.chooseUser) {
             user.nickName = this.getUserName(user.userId)
@@ -773,7 +777,6 @@ export default {
       updateBudget(form);
       delBudgetStaff(form.budgetId).then(res => {
         for (let user of form.chooseUser) {
-
           addBudgetStaff(user);
         }
       });

oa-ui/src/views/flowable/form/budget/budgetInfo.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-03 16:28:09
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-12 18:26:04
+ * @LastEditTime: 2024-06-13 13:50:24
 -->
 <template>
   <div class="main">
@@ -374,11 +374,11 @@
 </template>
 
 <script>
-import { listBudget,updateBudget } from "@/api/oa/budget/budget";
-import { listBudgetCar,updateBudgetCar } from "@/api/oa/budget/budgetCar";
-import { listBudgetDevice,updateBudgetDevice } from "@/api/oa/budget/budgetDevice";
-import { listBudgetSettle,updateBudgetSettle } from "@/api/oa/budget/budgetSettle";
-import { listBudgetStaff,updateBudgetStaff } from "@/api/oa/budget/budgetStaff";
+import { listBudget, updateBudget } from "@/api/oa/budget/budget";
+import { listBudgetCar, updateBudgetCar } from "@/api/oa/budget/budgetCar";
+import { listBudgetDevice, updateBudgetDevice } from "@/api/oa/budget/budgetDevice";
+import { listBudgetSettle, updateBudgetSettle } from "@/api/oa/budget/budgetSettle";
+import { listBudgetStaff, updateBudgetStaff } from "@/api/oa/budget/budgetStaff";
 import { listProjectWork } from "@/api/oa/project/projectWork";
 import { mapGetters } from 'vuex';
 import { getProject } from "@/api/oa/project/project";
@@ -489,20 +489,20 @@ export default {
         this.workContentList = res.rows;
       })
     },
-    confirmSucess(taskName) {
+   confirmSucess(taskName) {
       const params = { taskId: this.taskForm.taskId };
       if (taskName == '预算审核') {
         this.updateBudgetForm();
-        // getNextFlowNode(params).then(res => {
-        //   getUsersManageLeader({ userId: this.budgetForm.compiler }).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 => {
+          getUsersManageLeader({ userId: this.budgetForm.compiler }).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");
+            });
+          });
+        });
       } else if (taskName == '预算批准') {
         getNextFlowNode(params).then(res => {
           complete(this.taskForm).then(response => {
@@ -513,24 +513,34 @@ export default {
       }
     },
     updateBudgetForm() {
-      console.log(this.budgetForm);
-      console.log(this.chooseUser);
-      console.log(this.chooseDevice);
-      console.log(this.chooseCar);
-      updateBudget(this.budgetForm);
-      for(let car of this.chooseCar){
-        updateBudgetCar(car)
-      }
-      for(let device of this.chooseDevice){
-        updateBudgetDevice(device)
-      }
-      for(let user of this.chooseUser){
-        updateBudgetStaff(user)
+      updateBudget(this.budgetForm).then(res => {
+        this.updateBudgetSubItem(this.chooseCar, updateBudgetCar);
+        this.updateBudgetSubItem(this.chooseDevice, updateBudgetDevice);
+        this.updateBudgetSubItem(this.chooseUser, updateBudgetStaff);
+        this.updateBudgetSubItem(this.workList, updateBudgetSettle, this.showSuccessMessage);
+      });
+    },
+    updateBudgetSubItem(items, updateFunction, onSuccess) {
+      // 假设所有更新都成功  
+      let allUpdatesSuccessful = true;
+      // 遍历项目数组，并对每个项目调用更新函数  
+      for (let item of items) {
+        try {
+          updateFunction(item);
+        } catch (error) {
+          // 如果有任何更新失败，设置标志并可能记录错误  
+          allUpdatesSuccessful = false;
+          console.error('更新失败:', error);
+        }
       }
-      for(let work of this.workList){
-        updateBudgetSettle(work)
+      // 如果所有更新都成功，调用onSuccess回调函数  
+      if (allUpdatesSuccessful && typeof onSuccess === 'function') {
+        onSuccess();
       }
     },
+    showSuccessMessage() {
+      this.$message.success('预算更新成功！')
+    },
     // 计算作业结算金额
     computeWorkSettle(work) {
       let workload = Number(work.workload);
@@ -538,6 +548,10 @@ export default {
       let coefficient = Number(work.coefficient);
       if (!isNaN(workload) && !isNaN(price) && !isNaN(coefficient)) {
         let result = workload * price * coefficient;
+        if (result < 600) {
+          result = 600
+          this.$message.warning('不足600，按600算')
+        }
         this.$set(work, 'settle', result.toFixed(2));
         this.computedSettleExpense();
         this.computedDirectExpense();

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-06-11 17:11:58
+ * @LastEditTime: 2024-06-13 16:12:41
 -->
 <template>
   <div class="app-container">
@@ -21,7 +21,8 @@
                     }}</el-descriptions-item>
                   <el-descriptions-item label="项目来源" label-class-name="my-label">{{ getProjectSource(chooseTender)
                     }}</el-descriptions-item>
-                  <el-descriptions-item label="招标业主" label-class-name="my-label">{{ chooseTender.partyA
+                  <el-descriptions-item label="招标业主" label-class-name="my-label">{{ chooseTender.partyA ?
+      chooseTender.partyA.partyAName : ''
                     }}</el-descriptions-item>
                   <el-descriptions-item label="联系人" label-class-name="my-label">{{ chooseTender.aPerson
                     }}</el-descriptions-item>
@@ -113,7 +114,8 @@
                   </el-select>
                 </td>
                 <td>
-                  <el-input-number :controls="false" style="width: 60px" v-model="work.workload" clearable :disabled="taskName != '合同拟稿'"></el-input-number>
+                  <el-input-number :controls="false" style="width: 60px" v-model="work.workload" clearable
+                    :disabled="taskName != '合同拟稿'"></el-input-number>
                 </td>
                 <td>
                   <el-date-picker style="width: 140px" v-model="work.deadline" value-format="yyyy-MM-dd" type="date"
@@ -148,16 +150,16 @@
                   {{ index + 1 }}
                 </td>
                 <td>
-                  <el-input v-model="payment.paymentCondition" type="textarea" clearable
-                    :autosize="{ minRows: 4 }" :disabled="taskName != '合同拟稿'"></el-input>
+                  <el-input v-model="payment.paymentCondition" type="textarea" clearable :autosize="{ minRows: 4 }"
+                    :disabled="taskName != '合同拟稿'"></el-input>
                 </td>
                 <td>
                   <el-input-number style="width:100px" :controls="false" v-model="payment.paymentPercentage" clearable
                     :disabled="taskName != '合同拟稿'" @change="calculatePaymentAmount(payment)"></el-input-number>
                 </td>
                 <td>
-                  <el-input-number style="width:150px" :controls="false" :precision="2" v-model="payment.paymentAmount" clearable
-                    :disabled="taskName != '合同拟稿'"></el-input-number>
+                  <el-input-number style="width:150px" :controls="false" :precision="2" v-model="payment.paymentAmount"
+                    clearable :disabled="taskName != '合同拟稿'"></el-input-number>
                 </td>
                 <td>
                   <el-date-picker style="width: 140px" v-model="payment.paymentTime" value-format="yyyy-MM-dd"
@@ -178,7 +180,8 @@
               :disabled="taskName != '合同拟稿'"></el-button>
           </el-form-item>
           <el-form-item label="合同备注" prop="remark">
-            <el-input v-model="form.remark" :autosize="{ minRows: 4 }" type="textarea" placeholder="请输入合同备注" :disabled="taskName != '合同拟稿'" />
+            <el-input v-model="form.remark" :autosize="{ minRows: 4 }" type="textarea" placeholder="请输入合同备注"
+              :disabled="taskName != '合同拟稿'" />
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
@@ -268,8 +271,8 @@
                   <span> {{ comment.commentTime }} </span>
                 </td>
                 <td>
-                  <el-button type="danger" icon="el-icon-minus" size="mini" circle @click="deletCommentItem(index)"
-                    :disabled="taskName != '合同拟稿'"></el-button>
+                  <el-button type="text" style="color: #F56C6C;" size="mini" @click="deletCommentItem(index)"
+                    :disabled="taskName != '合同拟稿'">删除行</el-button>
                 </td>
               </tr>
             </table>
@@ -367,7 +370,8 @@
             </el-date-picker>
           </el-form-item>
           <el-form-item label="签订备注" prop="signRemark">
-            <el-input v-model="form.signRemark" type="textarea" :autosize="{ minRows: 4 }" placeholder="请输入签订备注" :disabled="taskName != '合同签订'" />
+            <el-input v-model="form.signRemark" type="textarea" :autosize="{ minRows: 4 }" placeholder="请输入签订备注"
+              :disabled="taskName != '合同签订'" />
           </el-form-item>
           <el-form-item label="签订扫描件" prop="signScan">
             <!-- <el-input v-model="form.signScan" placeholder="请输入签订扫描件" :disabled="taskName != '合同签订'" /> -->
@@ -430,8 +434,8 @@ import { listProject, getProject } from "@/api/oa/project/project";
 import { listDept } from '@/api/system/dept'
 import { listUser } from '@/api/system/user'
 import { listContract, getContract, delContract, addContract, updateContract } from "@/api/oa/contract/contract";
-import { listContractWork, addContractWork } from "@/api/oa/contract/contractWork";
-import { listContractPayment, addContractPayment } from "@/api/oa/contract/contractPayment";
+import { listContractWork, addContractWork, delContractWork } from "@/api/oa/contract/contractWork";
+import { listContractPayment, addContractPayment, delContractPayment } from "@/api/oa/contract/contractPayment";
 import { listContractComment, addContractComment, updateContractComment } from "@/api/oa/contract/contractComment";
 import { getContractMeeting, addContractMeeting, updateContractMeeting } from "@/api/oa/contract/contractMeeting";
 import { listProjectContract, addProjectContract } from "@/api/oa/contract/projectContract";
@@ -465,7 +469,7 @@ export default {
       type: Boolean,
       default: false
     },
-    flowDisabled:{
+    flowDisabled: {
       type: Boolean,
       default: true
     }
@@ -594,7 +598,7 @@ export default {
     this.getDeptList();
     this.getTenderList();
     this.getUserList();
-    if(this.flowDisabled){
+    if (this.flowDisabled) {
       flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
         this.flowData = res.data;
       })
@@ -661,18 +665,56 @@ export default {
               this.paymentList = res.rows;
           });
           listContractComment({ contractId: this.taskForm.formId }).then(res => {
-            if (res.rows)
+            if (res.rows && res.rows.length != 0) {
               this.commentList = res.rows;
-            for (let comment of this.commentList) {
-              if (comment.commentTime == undefined) {
-                if (comment.userId != this.$store.getters.userId) {
-                  comment.commentUser = undefined;
-                }
-                else {
-                  comment.commentTime = parseTime(new Date(), '{y}-{m}-{d}');
+              for (let comment of this.commentList) {
+                if (comment.commentTime == undefined) {
+                  if (comment.userId != this.$store.getters.userId) {
+                    comment.commentUser = undefined;
+                  }
+                  else {
+                    comment.commentTime = parseTime(new Date(), '{y}-{m}-{d}');
+                  }
                 }
               }
+            } else {
+              this.commentList = [
+                {
+                  deptId: 105,
+                  userId: '',
+                  comment: '',
+                  document: '',
+                  commentTime: undefined
+                },
+                {
+                  deptId: 110,
+                  userId: '',
+                  comment: '',
+                  document: '',
+                  commentTime: undefined
+                },
+                {
+                  deptId: 107,
+                  userId: '',
+                  comment: '',
+                  document: '',
+                  commentTime: undefined
+                },
+                {
+                  deptId: 106,
+                  userId: '',
+                  comment: '',
+                  document: '',
+                  commentTime: undefined
+                },
+              ]
+              for (let comment of this.commentList) {
+                getUsersDeptLeaderByDept({ deptId: comment.deptId }).then(res => {
+                  comment.userId = res.data.userId;
+                })
+              }
             }
+
           });
           getContractMeeting(this.taskForm.formId).then(res => {
             if (res.data) {
@@ -756,7 +798,11 @@ export default {
       return true;
     },
     getProjectSource(chooseTender) {
-      return chooseTender.partyA.indexOf('中国电建集团成都勘测设计研究院有限公司') != -1 ? '院内' : '院外';
+      const TARGET_COMPANY = '中国电建集团成都勘测设计研究院有限公司';
+      if (!chooseTender || !chooseTender.partyA || !chooseTender.partyA.partyAName) {
+        return '';
+      }
+      return chooseTender.partyA.partyAName.includes(TARGET_COMPANY) ? '院内' : '院外';
     },
     addWorkList() {
       this.workList.push({
@@ -910,11 +956,12 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.formTotal != 0) {
-            updateContract(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-            });
             const params = { taskId: this.taskForm.taskId };
+            this.updateContractData();
+            if (this.taskName == '合同拟稿') {
+              this.firstGetNextFlow();
+              return
+            }
             getNextFlowNode(params).then(res => {
               if (this.taskName == '分管审核') {
                 complete(this.taskForm).then(response => {
@@ -975,47 +1022,7 @@ export default {
                 for (let projectId of this.projectContractForm.projectIds) {
                   addProjectContract({ projectId: projectId, contractId: this.form.contractId });
                 }
-                const params = { taskId: this.taskForm.taskId };
-                getNextFlowNode(params).then(res => {
-                  if (this.commentOpen == false && this.meetingOpen == false) {
-                    getUsersManageLeader({ userId: this.$store.getters.userId }).then(res => {
-                      let userId = res.data.userId;
-                      this.$set(this.taskForm.variables, "approval", userId);
-                      this.$set(this.taskForm.variables, "commentType", '0');
-                      complete(this.taskForm).then(response => {
-                        this.$modal.msgSuccess(response.msg);
-                        this.$emit('goBack')
-                      });
-                    })
-                  }
-                  else if (this.commentOpen == true && this.meetingOpen == false) {
-                    let approvalList = [];
-                    for (let comment of this.commentList) {
-                      comment.contractId = this.form.contractId
-                      addContractComment(comment);
-                      approvalList.push(comment.userId)
-                    }
-                    this.$set(this.taskForm.variables, "approvalList", approvalList);
-                    this.$set(this.taskForm.variables, "commentType", '2');
-                    complete(this.taskForm).then(response => {
-                      this.$modal.msgSuccess(response.msg);
-                      this.$emit('goBack')
-                    });
-                  }
-                  else if (this.commentOpen == false && this.meetingOpen == true) {
-                    this.meetingForm.contractId = this.form.contractId;
-                    let formData = new FormData();
-                    let jsonForm = JSON.stringify(this.meetingForm);
-                    formData.append("form", jsonForm);
-                    addContractMeeting(formData);
-                    this.$set(this.taskForm.variables, "approval", this.meetingForm.hostId);
-                    this.$set(this.taskForm.variables, "commentType", '1');
-                    complete(this.taskForm).then(response => {
-                      this.$modal.msgSuccess(response.msg);
-                      this.$emit('goBack')
-                    });
-                  }
-                })
+                this.firstGetNextFlow();
               } else {
                 this.$message.error("新增失败，请确认合同编码是否唯一");
               }
@@ -1024,6 +1031,67 @@ export default {
         }
       });
     },
+    updateContractData() {
+      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);
+          }
+        })
+      });
+    },
+    firstGetNextFlow() {
+      const params = { taskId: this.taskForm.taskId };
+      getNextFlowNode(params).then(res => {
+        if (this.commentOpen == false && this.meetingOpen == false) {
+          getUsersManageLeader({ userId: this.$store.getters.userId }).then(res => {
+            let userId = res.data.userId;
+            this.$set(this.taskForm.variables, "approval", userId);
+            this.$set(this.taskForm.variables, "commentType", '0');
+            complete(this.taskForm).then(response => {
+              this.$modal.msgSuccess(response.msg);
+              this.$emit('goBack')
+            });
+          })
+        }
+        else if (this.commentOpen == true && this.meetingOpen == false) {
+          let approvalList = [];
+          for (let comment of this.commentList) {
+            comment.contractId = this.form.contractId
+            addContractComment(comment);
+            approvalList.push(comment.userId)
+          }
+          this.$set(this.taskForm.variables, "approvalList", approvalList);
+          this.$set(this.taskForm.variables, "commentType", '2');
+          complete(this.taskForm).then(response => {
+            this.$modal.msgSuccess(response.msg);
+            this.$emit('goBack')
+          });
+        }
+        else if (this.commentOpen == false && this.meetingOpen == true) {
+          this.meetingForm.contractId = this.form.contractId;
+          let formData = new FormData();
+          let jsonForm = JSON.stringify(this.meetingForm);
+          formData.append("form", jsonForm);
+          addContractMeeting(formData);
+          this.$set(this.taskForm.variables, "approval", this.meetingForm.hostId);
+          this.$set(this.taskForm.variables, "commentType", '1');
+          complete(this.taskForm).then(response => {
+            this.$modal.msgSuccess(response.msg);
+            this.$emit('goBack')
+          });
+        }
+      })
+    },
     getContractPath(val) {
       let arr = val.split('/upload')
       this.form.contractDocument = arr[1]

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

@@ -25,7 +25,7 @@
       <!-- <el-table-column type="selection" width="50" align="center" :reserve-selection="true" /> -->
       <el-table-column label="投标项目名称" align="center" key="projectName" prop="projectName"
         :show-overflow-tooltip="true"  width="170px" />
-      <el-table-column label="招标业主" align="center" prop="partyA" min-width="100px" />
+      <el-table-column label="招标业主" align="center" prop="partyA.partyAName" min-width="100px" />
       <el-table-column label="招标代理" align="center" prop="agent" min-width="100px" />
       <el-table-column label="招标地点" align="center" prop="place" min-width="100px" />
       <el-table-column label="业主预算" align="center" prop="budget" min-width="100px" />

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-29 11:44:28
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-05 16:05:20
+ * @LastEditTime: 2024-06-13 14:19:03
 -->
 
 <template>
@@ -522,7 +522,6 @@ export default {
         }
         else {
           getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
-            debugger
             if (res.data) {
               this.$set(this.taskForm.variables, "approval", res.data.userId);
               complete(this.taskForm).then(response => {
@@ -706,4 +705,7 @@ export default {
   width: 100px;
   background: #E1F3D8;
 }
+::v-deep .el-textarea.is-disabled .el-textarea__inner {
+  color: #121212 !important;
+}
 </style>

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-03-07 13:44:39
- * @LastEditors: wrh
- * @LastEditTime: 2024-06-12 17:16:48
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-06-13 14:19:38
 -->
 
 <template>
@@ -533,6 +533,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+@import "@/assets/styles/element-reset.scss";
 ::v-deep .el-input.is-disabled .el-input__inner {
   color: #121212 !important;
 }
@@ -540,4 +541,5 @@ export default {
 ::v-deep .el-textarea.is-disabled .el-textarea__inner {
   color: #121212 !important;
 }
+
 </style>

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-03-18 11:00:04
- * @LastEditors: wrh
- * @LastEditTime: 2024-06-12 15:55:43
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-06-13 18:42:56
 -->
 <template>
   <div class="project-wrapper">
@@ -15,7 +15,7 @@
             <el-input v-model="addForm.projectNumber"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="12" v-if="addForm.projectSource == 0">
+        <el-col :span="12" v-if="addForm.projectSource == '0'">
           <el-form-item label="合同编码：">
             <el-input v-model="contractCode" disabled></el-input>
           </el-form-item>
@@ -26,7 +26,7 @@
             <el-input v-model="addForm.projectName"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="12" v-if="addForm.projectSource == 0">
+        <el-col :span="12" v-if="addForm.projectSource == '0'">
           <el-form-item label="合同编号：">
             <el-input v-model="contractNumber" disabled></el-input>
           </el-form-item>
@@ -104,7 +104,7 @@
                 :autosize="{ minRows: 4, maxRows: 10 }"></el-input>
             </td>
             <td>
-              <el-button type="danger" icon="el-icon-minus" size="mini" circle @click="deletWorkItem(index)"></el-button>
+              <el-button type="text" style="color:#F56C6C" size="mini" @click="deletWorkItem(index)">删除行</el-button>
             </td>
           </tr>
         </table>
@@ -262,6 +262,7 @@ export default {
 
     getProjectInfo() {
       getProject(this.taskForm.formId).then(res => {
+        console.log(res.data);
         this.addForm = res.data;
       })
     },

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-15 09:35:41
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-04 16:58:07
+ * @LastEditTime: 2024-06-13 14:39:00
 -->
 <template>
   <div>
@@ -15,7 +15,8 @@
       <el-form ref="progress" :model="form" :disabled="disabled" label-width="100px">
         <el-form-item label="参与人员：">
           <el-select v-model="participates" multiple disabled style="width:84%">
-            <el-option v-for="item in $store.state.user.userList" :label="item.nickName" :value="item.userId" :key="item.userId">
+            <el-option v-for="item in $store.state.user.userList" :label="item.nickName" :value="item.userId"
+              :key="item.userId">
             </el-option>
           </el-select>
           <el-button class="ml10" @click="openPeople = true" type="primary" size="mini" icon="el-icon-plus"></el-button>
@@ -24,7 +25,8 @@
         <el-form-item label="驾驶员：">
           <el-tooltip class="item" effect="dark" content="直接获取用车申请中的驾驶员,若无驾驶员,则需要先提交项目的用车申请" placement="top-end">
             <el-select v-model="form.drivers" multiple disabled style="width:90%">
-              <el-option v-for="item in $store.state.user.userList" :label="item.nickName" :value="item.userId" :key="item.userId">
+              <el-option v-for="item in $store.state.user.userList" :label="item.nickName" :value="item.userId"
+                :key="item.userId">
               </el-option>
             </el-select>
           </el-tooltip>
@@ -349,9 +351,16 @@ export default {
       this.form.participates = this.participates.join(',')
       updateProject(this.form).then(res => {
         this.$message.success("保存成功");
-        this.form.cars = (this.form.cars.split(',')).map(Number);
-        this.form.drivers = (this.form.drivers.split(',')).map(Number);
-        this.form.devices = (this.form.devices.split(',')).map(Number);
+        if (this.form.cars && this.form.cars.trim() !== '') {
+          this.form.cars = (this.form.cars.split(',')).map(item => Number(item.trim()));
+          // 使用 trim() 来移除每个元素前后的空格（如果有的话）  
+        }
+        if (this.form.drivers && this.form.drivers.trim() !== '') {
+          this.form.drivers = (this.form.drivers.split(',')).map(item => Number(item.trim()));
+        }
+        if (this.form.devices && this.form.devices.trim() !== '') {
+          this.form.devices = (this.form.devices.split(',')).map(item => Number(item.trim()));
+        }
       });
     },
     // 查询车辆列表

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-05-31 14:33:25
+ * @LastEditTime: 2024-06-13 18:38:04
 -->
 
 <template>
@@ -11,7 +11,7 @@
       <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>
+            <addproject :taskForm="taskForm" :taskName="taskName" :disabled="taskName != '项目登记'" @goBack="goBack"></addproject>
           </el-tab-pane>
           <el-tab-pane label="项目安排" name="项目安排">
             <arrangeProject :taskForm="taskForm" :disabled="taskName != '项目安排'" @goBack="goBack"></arrangeProject>

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

@@ -53,7 +53,7 @@
             </el-col>
           </el-row>
           <el-form-item label="技术安排意见" prop="planComment">
-            <el-input type="textarea" v-model="form.planComment" placeholder="请输入技术安排意见"
+            <el-input type="textarea" v-model="form.planComment" :autosize="{ minRows: 4 }" placeholder="请输入技术安排意见"
               :disabled="taskName != '技术安排'" />
           </el-form-item>
           <el-row>
@@ -87,7 +87,7 @@
             </div>
           </el-form-item>
           <el-form-item label="方案说明" prop="designDescription">
-            <el-input type="textarea" v-model="form.designDescription" placeholder="请输入方案说明"
+            <el-input type="textarea" v-model="form.designDescription" :autosize="{ minRows: 4 }" placeholder="请输入方案说明"
               :disabled="taskName != '方案上传'" />
           </el-form-item>
           <el-row>
@@ -121,7 +121,7 @@
             </div>
           </el-form-item>
           <el-form-item label="技术部审核意见" prop="technicalComment">
-            <el-input type="textarea" v-model="form.technicalComment" placeholder="请输入技术审核意见"
+            <el-input type="textarea" v-model="form.technicalComment" :autosize="{ minRows: 4 }" placeholder="请输入技术审核意见"
               :disabled="taskName != '技术审核'" />
           </el-form-item>
           <el-row>
@@ -154,7 +154,7 @@
             </div>
           </el-form-item>
           <el-form-item label="总工程师审核意见" prop="manageComment">
-            <el-input type="textarea" v-model="form.manageComment" placeholder="请输入总工审核意见"
+            <el-input type="textarea" v-model="form.manageComment" :autosize="{ minRows: 4 }" placeholder="请输入总工审核意见"
               :disabled="taskName != '总工审核'" />
           </el-form-item>
           <el-row>
@@ -270,7 +270,8 @@ export default {
       // 表单参数
       form: {},
       formTotal: 0,
-      flowData: {}
+      flowData: {},
+      isDocumentValid: true
     };
   },
   created() {
@@ -315,12 +316,6 @@ export default {
             { required: true, message: '请选择质量检查员', trigger: 'change' },
           ],
         }
-      } else if (this.taskName == '方案上传') {
-        this.rules = {
-          technicalDocument: [
-            { required: true, message: '请上传技术方案', trigger: 'blur' }
-          ]
-        }
       } else if (this.taskName == '技术审核') {
         this.rules = {
           technicalComment: [
@@ -404,11 +399,6 @@ export default {
         return arr[arr.length - 1];
       }
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
     isEmptyObject(obj) {
       for (var key in obj) {
         if (obj.hasOwnProperty(key)) {
@@ -417,61 +407,23 @@ export default {
       }
       return true;
     },
-    // 表单重置
-    reset() {
-      this.form = {
-        technicalId: null,
-        projectId: null,
-        technicalDirector: null,
-        technicalDesigner: null,
-        technicalPlanner: null,
-        planComment: null,
-        qualityInspector: null,
-        technicalTime: null,
-        technicalDocument: null,
-        designDescription: null,
-        technicalComment: null,
-        manageComment: null,
-        technicalUploadTime: null,
-        techApprovalTime: null,
-        manageApprovalTime: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.technicalId)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加cmc技术交底";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const technicalId = row.technicalId || this.ids
-      getTechnical(technicalId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改cmc技术交底";
-      });
+    validateDocument(doc) {
+      // 这里添加你的验证逻辑  
+      // 例如，检查tenderId是否为空或者是否符合其他规则  
+      if (!doc || doc.trim() === '') {
+        this.$message.error('请上传技术方案');
+        return false;
+      }
+      return true;
     },
     /** 提交按钮 */
     submitForm() {
+      if (this.taskName == '方案上传') {
+        this.isDocumentValid = this.validateDocument(this.form.technicalDocument);
+        if (!this.isDocumentValid) {
+          return;
+        }
+      }
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.formTotal != 0) {
@@ -529,22 +481,6 @@ export default {
         }
       });
     },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const technicalIds = row.technicalId || this.ids;
-      this.$modal.confirm('是否确认删除cmc技术交底编号为"' + technicalIds + '"的数据项？').then(function () {
-        return delTechnical(technicalIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => { });
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('oa/technical/export', {
-        ...this.queryParams
-      }, `technical_${new Date().getTime()}.xlsx`)
-    },
     showFormItem(name) {
       let isShow = false;
       if (name == '技术安排')

oa-ui/src/views/flowable/task/myProcess/index.vue

@@ -2,7 +2,13 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-06 15:45:51
+ * @LastEditTime: 2024-06-13 18:24:59
+-->
+<!--
+ * @Author: ysh
+ * @Date: 2024-01-03 09:23:11
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-06-13 17:23:42
 -->
 <template>
   <div class="app-container">
@@ -63,8 +69,8 @@
           <el-button @click="handleFlowRecord(scope.row)" type="text" size="small">办理进度</el-button>
           <el-button @click="handleFlowNote(scope.row)" type="text" size="small">表单信息</el-button>
           <!-- <el-button @click="handleStop(scope.row)" type="text" size="small">取消申请</el-button> -->
-          <el-button @click="handleDelete(scope.row)" style="color:#F56C6C" type="text" size="small" :disabled="beDeleted(scope.row)"
-            v-hasPermi="['system:deployment:remove']">删除</el-button>
+          <el-button @click="handleDelete(scope.row)" style="color:#F56C6C" type="text" size="small"
+            :disabled="beDeleted(scope.row)" v-hasPermi="['system:deployment:remove']">取消流程</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -74,7 +80,8 @@
 
     <!-- 发起流程 -->
     <el-dialog :title="title" :visible.sync="open" width="400px" append-to-body>
-      <progress-tree :definitionList="definitionList" @confirm="handleStartProcess"  @close="open =false"></progress-tree>
+      <progress-tree :definitionList="definitionList" @confirm="handleStartProcess"
+        @close="open = false"></progress-tree>
       <!-- <el-form :model="queryProcessParams" ref="queryProcessForm" :inline="true" v-show="showSearch" label-width="68px">
         <el-form-item label="名称" prop="name">
           <el-input v-model="queryProcessParams.name" placeholder="请输入名称" clearable size="small"
@@ -135,6 +142,7 @@ import RowDetail from './send/rowDetail.vue'
 import ProgressTree from './progressTree.vue';
 import { getProcessVariables } from "@/api/flowable/definition";
 import conditionDisplay from '@/views/flowable/form/components/conditionDisplay.vue'
+import { deleteResources } from "@/utils/deleteResource"
 export default {
   name: "Deploy",
   components: {
@@ -452,17 +460,29 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.procInsId || this.ids;// 暂不支持删除多个流程
-      this.$confirm('删除后,流程将会取消,是否确定删除?', "警告", {
+      this.$confirm('是否确定取消流程？', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
       }).then(() => {
-        return delDeployment(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
+        getProcessVariables(row.taskId).then(res => {
+          if (res.data) {
+            let delId = res.data.formId;
+            this.deleteDataByUrl(row.procDefName, delId)
+          }
+          return delDeployment(ids);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("流程取消成功");
+        })
       })
     },
+    deleteDataByUrl(procDefName, id) {
+      switch (procDefName) {
+        case '承接合同评审':
+          return deleteResources(procDefName, id)
+      }
+    },
     // 子流程不可以删除
     beDeleted(row) {
       if (row.procDefName == '项目预算' || row.procDefName == '技术交底' || row.procDefName == '安全交底' || row.finishTime != null) {

oa-ui/src/views/oa/project/info.vue

@@ -473,16 +473,16 @@ export default {
               this.deptLeaderList.push(res.data.nickName);
             })
           }
-          if (this.project.devices) {
+          if (this.project.devices && this.project.devices.trim() !== '') {
             this.devices = (this.project.devices.split(',')).map(Number)
           }
-          if (this.project.cars) {
+          if (this.project.cars && this.project.cars.trim() !== '') {
             this.cars = (this.project.cars.split(',')).map(Number)
           }
-          if (this.project.drivers) {
+          if (this.project.drivers && this.project.drivers.trim() !== '') {
             this.drivers = (this.project.drivers.split(',')).map(Number)
           }
-          if (this.project.participates) {
+          if (this.project.participates && this.project.participates.trim() !== '') {
             this.participates = (this.project.participates.split(',')).map(Number)
           }
         }