Merge branch 'fix_foton_20240408' into test_20240409_for39

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue

@@ -535,7 +535,7 @@ export default {
         directorUserId: '',
         directorUserName: '',
       },
-      rh_rules: {},
+      rh_rules: {    comityName:[{required: true, message:' 请选择标委会', trigger: ['blur', 'change']}],},
       roleFormRules: {
         dockUserName: [{required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}],
         startUserName: [{required: true, message: "请选择标准法规部人员", trigger: ['blur', 'change']}],

src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue

@@ -441,6 +441,7 @@ export default {
       loading: false,
       detailData: [],  //审批历史信息
       standardData: [],
+      selectList: [],
       standModel: false,
       pageNo: 1,
       pageSizeNo: this.$store.getters.userInfo.configContent,
@@ -680,6 +681,7 @@ export default {
       this.$http.post("lawss/activiti/completeTask", {
         taskIds: this.$route.query.taskIds,
         userId: this.$store.getters.userInfo.userId,
+        commentText: this.commentStep,
         json: JSON.stringify(json)
       }, {
         _this: this
@@ -709,6 +711,7 @@ export default {
         let json = {
           participantsData: this.participantsData,
           wbbzform: this.wbbzform,
+          commentText: this.commentStep,
           signFlag: '1',
         };
         this.isSubmit = true;
@@ -741,15 +744,46 @@ export default {
         projectName: this.projectName,
         expenses: this.expenses,
         costBudget: this.costBudget,
+        delId: Date.now()
       };
       this.participantsData.push(list);
     },
     //批量刪除按鈕事件
     deleteProject() {
-
+      if(this.selectList.length < 1){
+        this.$message.warning('请选择一条数据进行删除')
+      }else{
+        this.$confirm('您确认删除这些数据？', '提示', {
+          confirmButtonText: "确认",
+          confirmButtonClass: "common-button-primary",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          let exits = [];
+          this.selectList.map(item => {
+            let index;
+            index = this.participantsData.findIndex(items => {
+              return items.delId === item;
+            });
+            if (index > -1) {
+              this.participantsData.splice(index, 1);
+            }
+            exits.push(item);
+          });
+          this.selectList = [];
+        }).catch(() => {
+        });
+      }
     },
     handleSelectionChange1(data) {
-
+      if (this.participantsData.length === 0){
+        this.selectList = []
+        return
+      }
+      this.selectList = []
+      for (let i = 0; i < data.length; i++){
+        this.selectList.push(data[i].delId)
+      }
     }
   },
   computed: {

src/pages/processCenter/pages/creatProcess/cywbbzzxd/step4.vue

@@ -373,6 +373,7 @@ export default {
         let json = {
           participantsData: this.participantsData,
           wbbzform: this.wbbzform,
+          commentText: this.commentText,
           signFlag: '2',
         };
         this.$refs["wbbzForm"].validate((valid) => {
@@ -410,6 +411,7 @@ export default {
         let json = {
           participantsData: this.participantsData,
           wbbzform: this.wbbzform,
+          commentText: this.commentText,
           signFlag: '1',
         };
         this.$refs["wbbzForm"].validate((valid) => {

src/pages/processCenter/pages/creatProcess/cywbbzzxd/step5.vue

@@ -373,6 +373,7 @@ export default {
         let json = {
           participantsData: this.participantsData,
           wbbzform: this.wbbzform,
+          commentText: this.commentText,
           signFlag: "2"
         };
         this.$refs["wbbzForm"].validate((valid) => {
@@ -410,6 +411,7 @@ export default {
         let json = {
           participantsData: this.participantsData,
           wbbzform: this.wbbzform,
+          commentText: this.commentText,
           signFlag: '1',
         };
         this.$refs["wbbzForm"].validate((valid) => {

src/pages/processCenter/pages/creatProcess/cywbbzzxd/step6.vue

@@ -373,6 +373,7 @@ export default {
         let json = {
           participantsData: this.participantsData,
           wbbzform: this.wbbzform,
+          commentText: this.commentText,
           bzFlag: '2',
         };
         this.$refs["wbbzForm"].validate((valid) => {
@@ -410,6 +411,7 @@ export default {
         let json = {
           participantsData: this.participantsData,
           wbbzform: this.wbbzform,
+          commentText: this.commentText,
           bzFlag: '1',
         };
         this.$refs["wbbzForm"].validate((valid) => {

src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue

@@ -670,13 +670,23 @@ export default {
       });
     },
     handleSelectionChange1(data){
+      if (this.participantsData.length === 0){
+        this.selectList1 = []
+        return
+      }
+      this.selectList1 = []
       for (let i = 0; i < data.length; i++){
         this.selectList1.push(data[i].account)
       }
     },
     handleSelectionChange2(data){
+      if (this.associationData.length === 0){
+        this.selectList2 = []
+        return
+      }
+      this.selectList2 = []
       for (let i = 0; i < data.length; i++){
-        this.selectList2.push(data[i].id)
+        this.selectList2.push(data[i].delId)
       }
     },
     //添加参与人信息
@@ -717,6 +727,7 @@ export default {
         contactPerson: this.contactPerson,
         telephone: this.telephone,
         mailbox: this.mailbox,
+        delId: Date.now()
       }
       console.log(this.associationData);
       this.associationData.push(list)
@@ -736,7 +747,7 @@ export default {
           this.selectList2.map(item => {
             let index;
             index = this.associationData.findIndex(items => {
-              return items.account === item;
+              return items.delId === item;
             });
             if (index > -1) {
               this.associationData.splice(index, 1);