修改承接合同中，修改功能中的关联项目、关联合同

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

@@ -162,7 +162,6 @@ export default {
           map[item.procInsId].children.push(item);
         }
       });
-      console.log(processed);
       return processed;
     },
   },

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

@@ -213,7 +213,6 @@ export default {
   },
   created() {
     this.getList();
-    console.log(this.taskForm);
   },
   methods: {
     /** 查询cmc考核列表 */

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

@@ -245,12 +245,9 @@ export default {
       connectProjectList: [],
       connectSubContractList: [],
       deleteSubList: [],
-      projectContractForm: {
-        projectIds: [],
-      },
       taskForm: {
         formId: ''
-      }
+      },
     }
   },
   watch: {
@@ -270,13 +267,18 @@ export default {
       this.connectProjectList = [];
       this.connectSubContractList = [];
       this.deleteSubList = [];
-      this.projectloading = true;
-      this.subloading = true;
       listContractComment({ pageNum: 1, pageSize: 100, contractId: contractId }).then(res => {
         if (res.rows && res.rows.length != 0) {
           this.commentList = res.rows;
         }
       })
+      this.getProjectContractList();
+      this.getContractSubcontractList();
+    },
+    // 获取关联项目
+    getProjectContractList() {
+      this.projectloading = true;
+      const contractId = this.form.contractId;
       listProjectContract({ contractId: contractId }).then(async res => {
         if (res.rows) {
           let list = []
@@ -288,11 +290,18 @@ export default {
           this.projectloading = false;
         }
       })
+    },
+    // 获取关联分包合同
+    getContractSubcontractList() {
+      this.subloading = true;
+      const contractId = this.form.contractId;
       listContractSubcontract({ contractId: contractId }).then(async res => {
+        let list = []
         for (let r of res.rows) {
           let obj = await getSubContract(r.subContractId)
-          this.connectSubContractList.push(obj.data)
+          list.push(obj.data)
         }
+        this.connectSubContractList = list
         this.subloading = false;
       })
     },
@@ -306,7 +315,6 @@ export default {
             }
             this.updateContractData();
             this.updateRelatedProject();
-            this.updateRelatedSub();
             this.$emit('cancel')
           }
         }
@@ -340,12 +348,19 @@ export default {
       return chooseTender.partyA.partyAName.includes(TARGET_COMPANY) ? '院内' : '院外';
     },
     confirmProject(val) {
+      let isSame = this.haveSameIds(val, this.connectProjectList, 'projectId');
+      if (isSame) {
+        this.$message.error('请勿重复添加已有项目')
+        return
+      }
       this.open = false
       for (let v of val) {
-        this.projectContractForm.projectIds.push(v.projectId);
         this.connectProjectList.push(v)
       }
     },
+    haveSameIds(arr1, arr2, key) {
+      return arr1.some(obj1 => arr2.some(obj2 => obj1[key] === obj2[key]))
+    },
     confirmTender(val) {
       this.tbOpen = false
       this.form.amount = val.quote
@@ -365,11 +380,18 @@ export default {
         this.$set(this.form, 'partyAId', val[0].partyAId)
       }
     },
-    confirmSubContract(val) {
+    async confirmSubContract(val) {
+      let isSame = this.haveSameIds(val, this.connectSubContractList, 'subContractId');
+      if (isSame) {
+        this.$message.error('请勿重复添加已有的分包合同')
+        return
+      }
       this.subOpen = false
       for (let v of val) {
         this.connectSubContractList.push(v)
+        await addContractSubcontract({ contractId: this.form.contractId, subContractId: v.subContractId })
       }
+      this.getContractSubcontractList()
     },
     getContractPath(val) {
       let arr = val.split('/upload')
@@ -398,26 +420,12 @@ export default {
         })
       });
     },
-    updateRelatedProject() {
-      delProjectContract(this.form.contractId).then(() => {
-        for (let projectId of this.projectContractForm.projectIds) {
-          addProjectContract({ projectId: projectId, contractId: this.form.contractId });
-        }
-      })
-    },
-    updateRelatedSub() {
-      let subIds = this.deleteSubList.map(item => item.subContractId);
-      console.log(subIds);
-      delContractSubcontract(subIds).then(() => {
-        this.connectSubContractList.forEach(item => {
-          item.contractId = this.form.contractId;
-          let obj = {
-            contractId: this.form.contractId,
-            subContractId: item.subContractId
-          }
-          addContractSubcontract(obj)
-        })
-      })
+    async updateRelatedProject() {
+      let projectIds = this.connectProjectList.map(item => item.projectId);
+      await delProjectContract(this.form.contractId)
+      for (let projectId of projectIds) {
+        await addProjectContract({ projectId: projectId, contractId: this.form.contractId });
+      }
     },
     clickProjectFn(row) {
       this.$router.replace({ query: { ...this.$route.query, projectId: row.projectId } });
@@ -425,13 +433,13 @@ export default {
     },
     handleDelete(index, row) {
       this.connectProjectList.splice(index, 1)
-      this.projectContractForm.projectIds.splice(row.contractId)
     },
     clickSubFn(row) {
       this.taskForm.formId = row.subContractId
       this.subInfoOpen = true
     },
     handleDeleteSub(index, row) {
+      delContractSubcontract(row.subContractId)
       this.deleteSubList.push(row)
       this.connectSubContractList.splice(index, 1)
     },

oa-ui/src/views/oa/material/buy.vue

@@ -303,7 +303,6 @@ export default {
     },
     computeAmount() {
       let amount = (this.form.totalNum * this.form.price).toFixed(2);
-      console.log(amount);
       this.$set(this.form, 'amount', amount);
       this.$set(this.form, 'buyer', 17);
     },

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

@@ -481,7 +481,6 @@ export default {
     }
   },
   created() {
-    console.log(this.dict.type.sys_post_status);
     this.getList();
     this.getDeptTree();
     this.getConfigKey("sys.user.initPassword").then(response => {