修改细节

oa-ui/src/utils/deleteResource.js

@@ -1,8 +1,8 @@
 /*
  * @Author: ysh
  * @Date: 2024-06-13 17:07:59
- * @LastEditors: 
- * @LastEditTime: 2024-06-14 09:55:50
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-06-19 16:43:47
  */
 import request from '@/utils/request'
 
@@ -11,9 +11,11 @@ const apiEndpoints = [
     procDefName: '承接合同评审',
     apiUrl: [
       '/oa/contract/:id',
+      '/oa/contractWork/:id',
       '/oa/contractComment/:id',
       '/oa/contractMeeting/:id',
       '/oa/contractPayment/:id',
+      '/oa/projectContract/:id',
     ]
   },
   {
@@ -25,11 +27,20 @@ const apiEndpoints = [
     ]
   },
   {
-    procDefName: '项目结算',
+    procDefName: '分包合同评审',
     apiUrl: [
-      '/oa/settle/:id',
-      '/oa/settleSummary/:id',
-      '/oa/settleWork/:id',
+      '/oa/subContract/:id',
+      '/oa/contractWork/:id',
+      '/oa/contractComment/:id',
+      '/oa/contractMeeting/:id',
+      '/oa/contractPayment/:id',
+      '/oa/projectSubcontract/:id',
+    ]
+  },
+  {
+    procDefName: '用车审批',
+    apiUrl: [
+      '/oa/carApproval/:id',
     ]
   }
 ]

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

@@ -121,7 +121,6 @@ export default {
       this.chooseUser = val
     },
     handleCurrentChange(val) {
-      console.log(val);
       if (!this.multiple) {
         this.chooseUser = val
       }

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-18 19:11:39
+ * @LastEditTime: 2024-06-19 15:55:48
 -->
 <template>
   <div class="app-container">
@@ -14,29 +14,31 @@
           <el-row :gutter="20">
             <el-col :span="12" :xs="24">
               <el-form-item label="投标项目名称：" prop="tenderId">
-                <el-button type="primary" size="mini" @click="tbOpen = true" v-if="taskName == '合同拟稿'">选择投标项目</el-button>
+                <el-button type="primary" size="mini" @click="tbOpen = true"
+                  v-if="taskName == '合同拟稿'">选择投标项目</el-button>
                 <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="3" direction="vertical">
                   <el-descriptions-item label="投标项目名称" label-class-name="my-label" :span="3">{{ chooseTender.projectName
-                  }}</el-descriptions-item>
+                    }}</el-descriptions-item>
                   <el-descriptions-item label="项目来源" label-class-name="my-label">{{ getProjectSource(chooseTender)
-                  }}</el-descriptions-item>
+                    }}</el-descriptions-item>
                   <el-descriptions-item label="联系人" label-class-name="my-label">{{ chooseTender.aPerson
-                  }}</el-descriptions-item>
+                    }}</el-descriptions-item>
                   <el-descriptions-item label="联系电话" label-class-name="my-label">{{ chooseTender.aPhone
-                  }}</el-descriptions-item>
+                    }}</el-descriptions-item>
                 </el-descriptions>
               </el-form-item>
               <el-form-item label="合同名称" prop="contractName">
-                <el-input type="textarea" :rows="3" style="width: 100%;" v-model="form.contractName" placeholder="请输入合同名称"
-                  :disabled="taskName != '合同拟稿'"></el-input>
+                <el-input type="textarea" :rows="3" style="width: 100%;" v-model="form.contractName"
+                  placeholder="请输入合同名称" :disabled="taskName != '合同拟稿'"></el-input>
               </el-form-item>
               <el-form-item label="甲方单位" prop="partyAId">
                 <el-select v-model="form.partyAId" filterable placeholder="请选择" disabled style="width: 100%;">
-                  <el-option v-for="item in partyAList" :key="item.value" :label="item.partyAName" :value="item.partyAId"
-                    :disabled="taskName != '合同拟稿'">
+                  <el-option v-for="item in partyAList" :key="item.value" :label="item.partyAName"
+                    :value="item.partyAId" :disabled="taskName != '合同拟稿'">
                   </el-option>
                 </el-select>
-                <el-button type="primary" @click="partyAOpen = true" size="mini" v-if="taskName == '合同拟稿'">选择单位</el-button>
+                <el-button type="primary" @click="partyAOpen = true" size="mini"
+                  v-if="taskName == '合同拟稿'">选择单位</el-button>
               </el-form-item>
               <el-form-item label="合同编码" prop="contractCode">
                 <el-input style="width: 100%;" v-model="form.contractCode" placeholder="请输入合同编码"
@@ -47,7 +49,8 @@
                   :disabled="taskName != '合同拟稿'"></el-input>
               </el-form-item>
               <el-form-item label="合同金额" prop="amount">
-                <el-input style="width:100%;" v-model="form.amount" placeholder="请输入合同金额" :disabled="taskName != '合同拟稿'">
+                <el-input style="width:100%;" v-model="form.amount" placeholder="请输入合同金额"
+                  :disabled="taskName != '合同拟稿'">
                   <template slot="append">元</template>
                 </el-input>
               </el-form-item>
@@ -168,8 +171,8 @@
                     clearable :disabled="taskName != '合同拟稿'"></el-input-number>
                 </td>
                 <td>
-                  <el-date-picker style="width: 140px" v-model="payment.paymentTime" value-format="yyyy-MM-dd" type="date"
-                    placeholder="选择日期" :disabled="taskName != '合同拟稿'">
+                  <el-date-picker style="width: 140px" v-model="payment.paymentTime" value-format="yyyy-MM-dd"
+                    type="date" placeholder="选择日期" :disabled="taskName != '合同拟稿'">
                   </el-date-picker>
                 </td>
                 <td>
@@ -371,8 +374,8 @@
           </el-row>
           <el-divider></el-divider>
           <el-form-item label="签订日期" prop="signDate">
-            <el-date-picker clearable v-model="form.signDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择签订日期"
-              :disabled="taskName != '合同签订'">
+            <el-date-picker clearable v-model="form.signDate" type="date" value-format="yyyy-MM-dd"
+              placeholder="请选择签订日期" :disabled="taskName != '合同签订'">
             </el-date-picker>
           </el-form-item>
           <el-form-item label="签订备注" prop="signRemark">
@@ -447,7 +450,7 @@ import { listContractWork, addContractWork, delContractWork } from "@/api/oa/con
 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";
+import { listProjectContract, addProjectContract, delProjectContract } from "@/api/oa/contract/projectContract";
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm, } from "@/api/flowable/todo";
 import { listTender, getTender } from "@/api/oa/tender/tender";
 import { getUsersDeptLeader, getUsersManageLeader, getUsersDeptLeaderByDept } from '@/api/system/post.js'
@@ -458,7 +461,7 @@ import ChooseTender from '../components/chooseTender.vue';
 import { listPartyA } from "@/api/oa/partyA/partyA";
 import FileItem from './fileItem.vue';
 import { mapGetters } from "vuex";
-import ChoosePartyA from '../components/choosePartyA.vue';
+import ChoosePartyA from '@/views/flowable/form/components/choosePartyA.vue';
 export default {
   dicts: ['cmc_scale_grade', 'cmc_unit'],
   components: {
@@ -519,7 +522,7 @@ export default {
       // 是否显示弹出层
       open: false,
       tbOpen: false,
-      partyAOpen:false,
+      partyAOpen: false,
       // 表单参数
       form: {
         amount: 0,
@@ -771,7 +774,6 @@ export default {
         pageSize: 99999999
       }).then(response => {
         this.partyAList = response.rows;
-        console.log(this.partyAList)
       })
     },
     // 查询项目列表
@@ -984,6 +986,7 @@ export default {
           if (this.formTotal != 0) {
             const params = { taskId: this.taskForm.taskId };
             this.updateContractData();
+            this.updateRelatedProject();
             if (this.taskName == '合同拟稿') {
               this.firstGetNextFlow();
               return
@@ -1075,6 +1078,13 @@ export default {
         })
       });
     },
+    updateRelatedProject() {
+      delProjectContract(this.taskForm.formId).then(() => {
+        for (let projectId of this.projectContractForm.projectIds) {
+          addProjectContract({ projectId: projectId, contractId: this.taskForm.formId });
+        }
+      })
+    },
     firstGetNextFlow() {
       const params = { taskId: this.taskForm.taskId };
       getNextFlowNode(params).then(res => {
@@ -1158,13 +1168,13 @@ export default {
       this.isSelect = true
       this.form.partyAId = val.partyAId
     },
-    confirmPartyA(val){
+    confirmPartyA(val) {
       this.partyAOpen = false
-      if(val && val.length > 1 ){
+      if (val && val.length > 1) {
         return this.$message.error('请选择一个甲方单位')
       }
       if (val) {
-        this.$set(this.form,'partyAId',val[0].partyAId)
+        this.$set(this.form, 'partyAId', val[0].partyAId)
       }
     },
     calculatePaymentAmount(payment) {

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

@@ -2,7 +2,13 @@
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-18 18:41:01
+ * @LastEditTime: 2024-06-19 16:18:08
+-->
+<!--
+ * @Author: ysh
+ * @Date: 2024-05-10 15:31:57
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-06-19 10:26:51
 -->
 <template>
   <div class="app-container">
@@ -13,7 +19,7 @@
           <el-divider></el-divider>
           <el-form-item label="项目编号：" prop="projectId">
             <el-button type="primary" size="mini" @click="open = true" v-if="taskName == '合同拟稿'">选择项目</el-button>
-            <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="1">
+            <!-- <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="1">
               <el-descriptions-item label="项目编号" label-class-name="my-label">
                 {{ chooseProject.projectNumber }}</el-descriptions-item>
               <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
@@ -25,25 +31,18 @@
               </el-descriptions-item>
               <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
                 }}</el-descriptions-item>
-            </el-descriptions>
+            </el-descriptions> -->
+            <el-table :data="chooseProjectList" border v-if="isSelect">
+              <el-table-column type="index" width="50" label="序号" />
+              <el-table-column label="项目编号" align="center" key="projectNumber" prop="projectNumber" />
+              <el-table-column label="项目名称" align="center" key="projectName" prop="projectName" />
+              <el-table-column label="项目负责人" align="center" key="projectLeaderName" prop="projectLeaderUser.nickName" />
+              <el-table-column label="主合同编码" align="center" key="contractCode" prop="contractCode" />
+              <el-table-column label="主合同编号" align="center" key="contractNumber" prop="contractNumber" />
+              <el-table-column label="主合同金额" align="center" key="amount" prop="amount" />
+            </el-table>
           </el-form-item>
-          <el-row :gutter="20">
-            <el-col :span="8" :xs="24">
-              <el-form-item label="主合同金额" prop="amount">
-                <el-input v-model="amount" :disabled="true" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" :xs="24">
-              <el-form-item label="合同编码" prop="contractCode">
-                <el-input v-model="contractCode" :disabled="true" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" :xs="24">
-              <el-form-item label="合同编号" prop="contractNumber">
-                <el-input v-model="contractNumber" :disabled="true" />
-              </el-form-item>
-            </el-col>
-          </el-row>
+
           <el-divider></el-divider>
           <el-row :gutter="20">
             <el-col :span="16" :xs="24">
@@ -67,7 +66,8 @@
                     :value="item.partnerId">
                   </el-option>
                 </el-select>
-                <el-button type="primary" @click="partnerOpen = true" size="mini" v-if="taskName == '合同拟稿'">选择单位</el-button>
+                <el-button type="primary" @click="partnerOpen = true" size="mini"
+                  v-if="taskName == '合同拟稿'">选择单位</el-button>
               </el-form-item>
             </el-col>
             <el-col :span="8" :xs="24">
@@ -426,13 +426,14 @@ import { listProject, getProject } from "@/api/oa/project/project";
 import { listDept } from '@/api/system/dept'
 import { listUser } from '@/api/system/user'
 import { listPartner, getPartner } from "@/api/oa/partner/partner";
-import { listContractWork, addContractWork } from "@/api/oa/contract/contractWork";
-import { listContractPayment, addContractPayment } from "@/api/oa/contract/contractPayment";
-import { listContractComment, addContractComment, updateContractComment } from "@/api/oa/contract/contractComment";
-import { getContractMeeting, addContractMeeting, updateContractMeeting } from "@/api/oa/contract/contractMeeting";
+import { listContractWork, addContractWork, delContractWork } from "@/api/oa/contract/contractWork";
+import { listContractPayment, addContractPayment, delContractPayment } from "@/api/oa/contract/contractPayment";
+import { listContractComment, addContractComment, updateContractComment, delContractComment } from "@/api/oa/contract/contractComment";
+import { getContractMeeting, addContractMeeting, updateContractMeeting, delContractMeeting } from "@/api/oa/contract/contractMeeting";
 import { listProjectContract } from "@/api/oa/contract/projectContract";
 import { getContract } from "@/api/oa/contract/contract";
 import { listSubContract, getSubContract, delSubContract, addSubContract, updateSubContract } from "@/api/oa/contract/subContract";
+import { listProjectSubcontract, addProjectSubcontract, delProjectSubcontract } from '@/api/oa/contract/projectSubcontract'
 import { getUsersDeptLeader, getUsersManageLeader, getUsersDeptLeaderByDept } from '@/api/system/post.js'
 import flow from '@/views/flowable/task/todo/detail/flow'
 import { flowXmlAndNode } from "@/api/flowable/definition";
@@ -523,6 +524,7 @@ export default {
       projectList: [],
       partnerList: [],
       chooseProject: {},
+      chooseProjectList: [],
       chooseContract: {
         contractCode: [],
         contractNumber: [],
@@ -660,28 +662,18 @@ export default {
             this.commentOpen = true;
             this.meetingOpen = false;
           }
-          if (res.data.projectId) {
-            getProject(res.data.projectId).then(res => {
-              this.chooseProject = res.data;
-              this.isSelect = true
-              listProjectContract({ projectId: this.chooseProject.projectId }).then(response => {
-                if (response.rows) {
-                  for (let row of response.rows) {
-                    getContract(row.contractId).then(r => {
-                      this.chooseContract.amount.push(r.data.amount);
-                      this.chooseContract.contractCode.push(r.data.contractCode);
-                      this.chooseContract.contractNumber.push(r.data.contractNumber);
-                      this.amount = this.chooseContract.amount.join('、');
-                      this.contractCode = this.chooseContract.contractCode.join('、');
-                      this.contractNumber = this.chooseContract.contractNumber.join('、');
-                    });
+          listProjectSubcontract({ subContractId: res.data.subContractId }).then(res => {
+            if (res.rows) {
+              res.rows.forEach(project => {
+                getProject(project.projectId).then(res => {
+                  if (res.data) {
+                    this.chooseProjectList.push(res.data);
+                    this.confirmProject(this.chooseProjectList)
                   }
-                }
-                else
-                  this.chooseContract = {};
+                })
               })
-            })
-          }
+            }
+          })
           listContractWork({ contractId: this.taskForm.formId }).then(res => {
             if (res.rows)
               this.workList = res.rows;
@@ -863,7 +855,7 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      let isProjectValid = this.validateManual(this.form.projectId);
+      let isProjectValid = this.validateManual(this.chooseProjectList);
       let isDocValid = this.validateDocument(this.form.contractDocument)
       if (!(isProjectValid || isDocValid)) {
         // 无效，阻止提交  
@@ -878,16 +870,22 @@ export default {
             })
           };
           if (this.formTotal != 0) {
+            if (this.form.partnerId)
+              this.form.partnerId = this.form.partnerId.join(',')
             updateSubContract(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
+              this.updateChooseProjectList()
             });
             const params = { taskId: this.taskForm.taskId };
             getNextFlowNode(params).then(res => {
               if (this.taskName == '分管审核') {
                 handleComplete(this.taskForm);
               }
+              else if (this.taskName == '合同拟稿') {
+                this.contractDraftSubmit(handleComplete)
+              }
               else if (this.taskName == '线上会审') {
                 for (let comment of this.commentList) {
                   updateContractComment(comment);
@@ -924,6 +922,9 @@ export default {
               this.getList();
             });
             const subContractId = this.form.subContractId;
+            this.chooseProjectList.forEach(item => {
+              addProjectSubcontract({ subContractId: subContractId, projectId: item.projectId })
+            })
             for (let work of this.workList) {
               work.contractId = subContractId;
               addContractWork(work);
@@ -934,62 +935,65 @@ export default {
             }
             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');
-                  handleComplete(this.taskForm);
-                })
-              }
-              else if (this.commentOpen == true && this.meetingOpen == false) {
-                let approvalList = [];
-                for (let comment of this.commentList) {
-                  comment.contractId = this.form.subContractId
-                  addContractComment(comment);
-                  approvalList.push(comment.userId)
-                }
-                this.$set(this.taskForm.variables, "approvalList", approvalList);
-                this.$set(this.taskForm.variables, "commentType", '2');
-                handleComplete(this.taskForm);
-              }
-              else if (this.commentOpen == false && this.meetingOpen == true) {
-                this.meetingForm.contractId = this.form.subContractId;
-                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');
-                handleComplete(this.taskForm);
-              }
+              this.contractDraftSubmit(handleComplete)
             })
+
           }
         }
       });
     },
-    confirmProject(val) {
-      this.open = false
-      if (val.length > 1) {
-        this.$message.error('请选择一个项目');
-        return;
+    // 合同拟稿提交事件
+    contractDraftSubmit(handleComplete) {
+      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');
+          handleComplete(this.taskForm);
+        })
       }
-
-      if (val.length === 1) {
-        this.chooseProject = val[0];
-        this.isSelect = true;
-        this.form.projectId = val[0].projectId;
-
-        this.fetchContracts(this.form.projectId)
-          .then(contractData => {
-            this.processContractData(contractData);
-          })
-          .catch(error => {
-            console.error('获取合同列表时出错:', error);
-            this.$message.error('获取合同列表时出错');
-          });
+      else if (this.commentOpen == true && this.meetingOpen == false) {
+        let approvalList = [];
+        for (let comment of this.commentList) {
+          comment.contractId = this.form.subContractId
+          addContractComment(comment);
+          approvalList.push(comment.userId)
+        }
+        this.$set(this.taskForm.variables, "approvalList", approvalList);
+        this.$set(this.taskForm.variables, "commentType", '2');
+        handleComplete(this.taskForm);
+      }
+      else if (this.commentOpen == false && this.meetingOpen == true) {
+        this.meetingForm.contractId = this.form.subContractId;
+        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');
+        handleComplete(this.taskForm);
       }
     },
+    updateChooseProjectList() {
+      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);
+        }
+      })
+    },
     // 确定合作单位
     confirmPartners(val) {
       this.partnerOpen = false
@@ -1009,6 +1013,40 @@ export default {
         this.form.partnerId = ids
       }
     },
+    confirmProject(val) {
+      this.open = false
+      // if (val.length > 1) {
+      //   this.$message.error('请选择一个项目');
+      //   return;
+      // }
+      // if (val.length === 1) {
+      //   this.chooseProject = val[0];
+      //   this.isSelect = true;
+      //   this.form.projectId = val[0].projectId;
+
+      //   this.fetchContracts(this.form.projectId)
+      //     .then(contractData => {
+      //       this.processContractData(contractData);
+      //     })
+      //     .catch(error => {
+      //       console.error('获取合同列表时出错:', error);
+      //       this.$message.error('获取合同列表时出错');
+      //     });
+      // }
+      if (val) {
+        this.chooseProjectList = val;
+        this.isSelect = true
+        val.map(item => {
+          this.fetchContracts(item.projectId)
+            .then(contractData => {
+              let [contractCode, contractNumber, amount] = this.processContractData(contractData);
+              this.$set(item, 'contractCode', contractCode)
+              this.$set(item, 'contractNumber', contractNumber)
+              this.$set(item, 'amount', amount)
+            })
+        })
+      }
+    },
     // 获取合同详情
     fetchContracts(projectId) {
       return new Promise((resolve, reject) => {
@@ -1032,22 +1070,22 @@ export default {
     },
     // 处理合同编码、合同编号的格式
     processContractData(contractData) {
-      this.chooseContract = {
+      let chooseContract = {
         amount: [],
         contractCode: [],
         contractNumber: []
-      };
+      }
       contractData.forEach(contract => {
         if (contract.data) {
-          this.chooseContract.amount.push(contract.data.amount);
-          this.chooseContract.contractCode.push(contract.data.contractCode);
-          this.chooseContract.contractNumber.push(contract.data.contractNumber);
+          chooseContract.amount.push(contract.data.amount);
+          chooseContract.contractCode.push(contract.data.contractCode);
+          chooseContract.contractNumber.push(contract.data.contractNumber);
         }
       });
-
-      this.amount = this.chooseContract.amount.join('、');
-      this.contractCode = this.chooseContract.contractCode.join('、');
-      this.contractNumber = this.chooseContract.contractNumber.join('、');
+      let amount = chooseContract.amount.join('、');
+      let contractCode = chooseContract.contractCode.join('、');
+      let contractNumber = chooseContract.contractNumber.join('、');
+      return [contractCode, contractNumber, amount]
     },
     getFileName(name) {
       if (name) {
@@ -1090,15 +1128,15 @@ export default {
     validateManual(name) {
       // 这里添加你的验证逻辑  
       // 例如，检查tenderId是否为空或者是否符合其他规则  
-      if (!name || name.trim() === '') {
-        this.$message.error('请选择一个有效项目');
+      if (name && name.length == 0) {
+        this.$message.error('请选择至少一个有效项目');
         return false;
       }
       return true;
     },
     calculatePaymentAmount(payment) {
       let amount = (payment.paymentPercentage / 100) * this.form.subAmount
-      this.$set(payment, 'paymentAmount', Number(amount))
+      this.$set(payment, 'paymentAmount', Number(amount).toFixed(2))
     },
   }
 };

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

@@ -14,8 +14,7 @@
     </el-form>
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-          v-hasPermi="['oa:partner:add']">新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>

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

@@ -29,7 +29,7 @@
       <el-table-column label="项目名称" align="center" key="projectName" prop="projectName" :show-overflow-tooltip="true" />
       <el-table-column label="项目负责人" align="center" key="projectLeader" prop="projectLeaderUser.nickName"
         :show-overflow-tooltip="true" />
-      <el-table-column label="甲方公司" align="center" key="partyA" prop="partyA.partyName" :show-overflow-tooltip="true" />
+      <el-table-column label="甲方单位" align="center" key="partyA" prop="partyA.partyName" :show-overflow-tooltip="true" />
       <el-table-column label="项目类型" align="center" key="projectType" prop="projectType" />
     </el-table>
     <div style="text-align: right;" class="mt20 mr20">

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-13 14:19:03
+ * @LastEditTime: 2024-06-19 16:36:07
 -->
 
 <template>
@@ -500,6 +500,8 @@ export default {
     // 获取下一个审批人
     getNextFlowNodeApproval() {
       if (this.taskName == '用车申请') {
+        if (this.dept < 102 && this.dept != 0)
+          this.dept = 102
         this.$set(this.taskForm.variables, "dept", this.dept);
         if (this.dept == 102) {
           getUserByPost({ postName: '总经理' }).then(result => {
@@ -705,6 +707,7 @@ export default {
   width: 100px;
   background: #E1F3D8;
 }
+
 ::v-deep .el-textarea.is-disabled .el-textarea__inner {
   color: #121212 !important;
 }

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

@@ -329,7 +329,6 @@ export default {
         partyAName: partyAName
       }).then(response => {
         this.partyAList = response.rows;
-        console.log(this.addForm, this.partyAList);
       })
     },
     cancel() {

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-19 15:32:00
- * @LastEditors: wrh
- * @LastEditTime: 2024-06-19 15:56:42
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-06-19 17:36:00
 -->
 <template>
   <div class="app-container">
@@ -164,8 +164,8 @@ export default {
   },
   watch: {
     'taskForm.formId'(newval) {
-      this.getUserList();
       this.initForm();
+      this.getUserList();
     },
     projectNumber(newval) {
       this.$set(this.form, "projectNumber", newval);
@@ -190,35 +190,41 @@ export default {
   methods: {
     /** 查询cmc技术交底列表 */
     initForm() {
-      getTechnical(this.taskForm.formId).then((res) => {
-        if (res.data) {
+      this.loadTechnicalAndProjectData();
+    },
+    async loadTechnicalAndProjectData() {
+      try {
+        const technicalRes = await getTechnical(this.taskForm.formId);
+        if (technicalRes.data) {
           this.haveTechnical = true;
-          this.form = res.data;
-          if (this.projectNumber != '' && this.projectName != '') {
-            this.$set(this.form, "projectNumber", this.projectNumber);
-            this.$set(this.form, "projectName", this.projectName);
-          } else {
-            getProject(this.taskForm.formId).then(res => {
-              if (res.data) {
-                this.$set(this.form, "projectNumber", res.data.projectNumber);
-                this.$set(this.form, "projectName", res.data.projectName);
-              }
-            })
-          }
-          let data = res.data;
-          if (res.data.qualityInspector == null || res.data.qualityInspector == undefined || res.data.qualityInspector == "") {
-            data.qualityInspector = []
-          } else {
-            let arr = []
-            data.qualityInspector = data.qualityInspector.split(',');
-            for (let inspector of data.qualityInspector) {
-              arr.push(parseInt(inspector))
+          this.form = technicalRes.data;
+          if (!this.projectNumber || !this.projectName) {
+            // 仅在需要时调用getProject  
+            const projectRes = await getProject(this.taskForm.formId);
+            if (projectRes.data) {
+              this.$set(this.form, "projectNumber", projectRes.data.projectNumber);
+              this.$set(this.form, "projectName", projectRes.data.projectName);
             }
-            data.qualityInspector = arr
           }
-          this.$set(this.form, "qualityInspector", data.qualityInspector);
+          this.processQualityInspector(this.form);
         }
-      });
+      } catch (error) {
+      }
+    },
+    processQualityInspector(form) {
+      debugger
+      if (Array.isArray(form.qualityInspector)) {
+        // 如果已经是数组，则不需要进一步处理  
+        // 除非你想将数组中的字符串元素转换为整数  
+        // 例如：form.qualityInspector = form.qualityInspector.map(inspector => parseInt(inspector, 10));  
+      } else if (typeof form.qualityInspector === 'string') {
+        // 如果是一个字符串，则按逗号分割并转换为整数数组  
+        const qualityInspectorArr = form.qualityInspector.split(',').map(inspector => parseInt(inspector, 10));
+        this.$set(form, "qualityInspector", qualityInspectorArr);
+      } else if (form.qualityInspector === null || form.qualityInspector === undefined || form.qualityInspector === '') {
+        // 如果为空、null或undefined，则设置为空数组  
+        this.$set(form, "qualityInspector", []);
+      }
     },
     // 查询用户列表
     getUserList() {

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

@@ -2,13 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @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
+ * @LastEditTime: 2024-06-19 16:29:56
 -->
 <template>
   <div class="app-container">
@@ -478,10 +472,7 @@ export default {
       })
     },
     deleteDataByUrl(procDefName, id) {
-      switch (procDefName) {
-        case '承接合同评审':
-          return deleteResources(procDefName, id)
-      }
+      return deleteResources(procDefName, id)
     },
     // 子流程不可以删除
     beDeleted(row) {

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

@@ -230,7 +230,6 @@ export default {
       });
     },
     remoteMethod(val) {
-      console.log(val);
       listProject({
         pageNum: 1,
         pageSize: 20, 

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-18 09:05:41
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-06-18 17:34:15
+ * @LastEditTime: 2024-06-19 11:03:15
 -->
 <template>
   <div class="app-container">
@@ -60,6 +60,7 @@
     <el-table v-loading="loading" border :data="contractList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="合同id" align="center" prop="contractId" /> -->
+      <el-table-column label="甲方单位" align="center" prop="partyA.partyAName" width="220px" />
       <el-table-column label="合同名称" align="center" prop="contractName" width="220px" />
       <el-table-column label="合同编码" align="center" prop="contractCode" />
       <el-table-column label="合同编号" align="center" prop="contractNumber" />
@@ -229,6 +230,7 @@ export default {
       this.loading = true;
       listContract(this.queryParams).then(response => {
         this.contractList = response.rows;
+
         this.total = response.total;
         this.loading = false;
       });

oa-ui/src/views/oa/contract/subContract.vue

@@ -1,11 +1,8 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="128px">
-      <el-form-item label="主合同id" prop="contractId">
-        <el-input v-model="queryParams.contractId" placeholder="请输入主合同id" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="承接单位id" prop="partnerId">
-        <el-input v-model="queryParams.partnerId" placeholder="请输入承接单位id" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item label="承接单位" prop="partnerId">
+        <el-input v-model="queryParams.partnerId" placeholder="请输入承接单位" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="拟稿人" prop="drafter">
         <el-select v-model="queryParams.drafter" filterable clearable @change="handleQuery">
@@ -28,14 +25,18 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="subContractList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="subContractList" @selection-change="handleSelectionChange">
       <el-table-column type="index" label="序号" width="55" align="center" />
-      <el-table-column label="主合同id" align="center" prop="contractId" />
-      <el-table-column label="合同名称" align="center" prop="subContractName" />
+      <el-table-column label="合同名称" align="center" prop="subContractName" width="200px" />
       <el-table-column label="分包合同金额" align="center" prop="subAmount" />
       <el-table-column label="承接单位id" align="center" prop="partnerId" />
       <!-- <el-table-column label="承接单位联系人" align="center" prop="contactPerson" /> -->
-      <el-table-column label="拟稿人" align="center" prop="drafter" />
+      <el-table-column label="拟稿人" align="center" prop="drafter">
+        <template slot-scope="scope">
+          {{ getUserName(scope.row.drafter) }}
+        </template>
+      </el-table-column>
+
       <el-table-column label="拟稿日期" align="center" prop="draftTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.draftTime, '{y}-{m}-{d}') }}</span>
@@ -48,8 +49,20 @@
         </template>
       </el-table-column>
       <el-table-column label="签订备注" align="center" prop="signRemark" />
-      <el-table-column label="签订扫描件" align="center" prop="signScan" />
-      <el-table-column label="评审方式" align="center" prop="commentType" />
+      <el-table-column label="签订扫描件" align="center" prop="signScan">
+        <template slot-scope="scope">
+          <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + scope.row.signScan}`)">
+            {{ getFileName(scope.row.signScan) }}
+          </el-link>
+        </template>
+      </el-table-column>
+      <el-table-column label="评审方式" align="center" prop="commentType" >
+        <template slot-scope="scope">
+          <el-tag :type="scope.row.commentType == '2' ? 'success':'warning'">
+            {{ setCommentType(scope.row.commentType) }}
+          </el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
           v-hasPermi="['oa:subContract:query']">查看</el-button>
@@ -104,6 +117,10 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog :title="title" :visible.sync="openInfo" append-to-body>
+      
+    </el-dialog>
   </div>
 </template>
 
@@ -114,6 +131,7 @@ export default {
   name: "SubContract",
   data() {
     return {
+      baseUrl: process.env.VUE_APP_BASE_API,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -265,6 +283,15 @@ export default {
       this.download('oa/subContract/export', {
         ...this.queryParams
       }, `subContract_${new Date().getTime()}.xlsx`)
+    },
+    setCommentType(commentType){
+      if(commentType == '2'){
+        return '线上评审'
+      }else if (commentType == '0'){
+        return '无须评审'
+      }else{
+        return '会议评审'
+      }
     }
   }
 };

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

@@ -153,7 +153,7 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <el-dialog :title="title" :visible.sync="infoOpen" width="70%" append-to-body>
+    <el-dialog :title="title" :visible.sync="infoOpen" width="50%" append-to-body>
       <technical-tab :taskForm="taskForm"></technical-tab>
     </el-dialog>
   </div>
@@ -208,7 +208,9 @@ export default {
       },
       // 表单参数
       form: {},
-      taskForm: {},
+      taskForm: {
+        formId:''
+      },
       // 表单校验
       rules: {
       }

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

@@ -2,7 +2,8 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="投标项目名称" prop="projectName" label-width="100px">
-        <el-input v-model="queryParams.projectName" placeholder="请输入投标项目名称" clearable @keyup.enter.native="handleQuery" />
+        <el-input v-model="queryParams.projectName" placeholder="请输入投标项目名称" clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="投标时间" prop="tenderTime">
         <el-date-picker clearable v-model="queryParams.tenderTime" type="date" value-format="yyyy-MM-dd"
@@ -38,14 +39,9 @@
     <el-table v-loading="loading" :data="tenderList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" min-width="100px" />
       <el-table-column type="index" label="序号" width="55" align="center" min-width="100px" />
-      <!-- <el-table-column label="投标id" align="center" prop="tenderId" min-width="100px" /> -->
       <el-table-column label="投标项目名称" align="center" prop="projectName" min-width="100px" />
       <el-table-column label="招标业主" align="center" prop="partyA.partyAName" min-width="100px" />
-      <!-- <el-table-column label="业主联系人" align="center" prop="aPerson" min-width="100px" /> -->
-      <!-- <el-table-column label="业主联系电话" align="center" prop="aPhone" min-width="100px" /> -->
       <el-table-column label="招标代理" align="center" prop="agent" min-width="100px" />
-      <!-- <el-table-column label="代理联系人" align="center" prop="agentPerson" min-width="100px" /> -->
-      <!-- <el-table-column label="代理联系电话" align="center" prop="agentPhone" min-width="100px" /> -->
       <el-table-column label="招标地点" align="center" prop="place" min-width="100px" />
       <!-- <el-table-column label="投标部门" align="center" prop="dept" min-width="100px">
         <template slot-scope="scope">
@@ -121,10 +117,12 @@
               <span class="require_input">* </span>招标业主
             </template>
             <el-form-item prop="partyAId">
-              <el-select allow-create v-model="form.partyAId" filterable placeholder="请选择" style="width: 100%;" clearable>
+              <el-select allow-create v-model="form.partyAId" filterable disabled placeholder="请选择" style="width: 100%;"
+                clearable>
                 <el-option v-for="item in partyAList" :key="item.value" :label="item.partyAName" :value="item.partyAId">
                 </el-option>
               </el-select>
+              <el-button type="primary" @click="partyAOpen = true" size="mini">选择单位</el-button>
             </el-form-item>
           </el-descriptions-item>
           <el-descriptions-item>
@@ -381,6 +379,10 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog title="选择甲方单位" :visible.sync="partyAOpen" width="70%" append-to-body>
+      <ChoosePartyA @confirm="confirmPartyA"></ChoosePartyA>
+    </el-dialog>
   </div>
 </template>
 
@@ -390,8 +392,12 @@ import { listDept } from '@/api/system/dept'
 import { listUser, deptTreeSelect } from "@/api/system/user";
 import { Snowflake } from '@/utils/snowFlake.js'
 import { listPartyA } from "@/api/oa/partyA/partyA";
+import ChoosePartyA from '@/views/flowable/form/components/choosePartyA.vue';
 export default {
   name: "Tender",
+  components:{
+    ChoosePartyA
+  },
   data() {
     return {
       baseUrl: process.env.VUE_APP_BASE_API,
@@ -414,6 +420,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      partyAOpen: false,
       isView: true,
       // 对话框属性
       dialogProperty: {
@@ -725,6 +732,16 @@ export default {
     toPath(url) {
       this.open = false
       this.reviewWord(url)
+    },
+    confirmPartyA(val) {
+      this.partyAOpen = false
+      if (val && val.length > 1) {
+        return this.$message.error('请选择一个甲方单位')
+      }
+      if (val) {
+        this.getPartyAList();
+        this.$set(this.form, 'partyAId', val[0].partyAId)
+      }
     }
   }
 };