Merge remote-tracking branch 'origin/develop' into develop

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

@@ -142,6 +142,7 @@
               >
               </el-input>
               <el-input
+                @click.native="handlePrice(scope.row)"
                 v-else
                 :disabled="acceptShow"
                 v-model="scope.row.complianceReasons"
@@ -171,6 +172,7 @@
                 <el-input
                   v-else
                   :disabled="acceptShow"
+                  @click.native="handlePrice(scope.row)"
                   v-model="scope.row.noCompliance"
                   placeholder="请输入不合规项目"
                 >
@@ -193,6 +195,7 @@
                 <el-input
                   v-else
                   :disabled="acceptShow"
+                  @click.native="handlePrice(scope.row)"
                   v-model="scope.row.countermeasures"
                   placeholder="请输入应对措施"
                 >
@@ -217,8 +220,10 @@
                   :disabled="acceptShow"
                   class="datePickLen"
                   clearable
+                  @click.native="handlePrice(scope.row)"
                   v-model="scope.row.completionTime"
                   type="date"
+                  value-format="yyyy-MM-dd HH:mm:ss"
                   placeholder="请选择日期">
                 </el-date-picker>
               </template>
@@ -582,6 +587,7 @@ export default {
   },
   data() {
     return {
+      comFlag: true,
       total: 0,
       currentPage: 1,
       pageSize: 20,
@@ -640,20 +646,10 @@ export default {
       listForm: {
         projectNumber: "",  //项目编号
         projectName: "",  //项目名称
-        dataList: [
+        dataList: [], //项目下的标准数据
-          {
-            complianceReasons: "",
-            zcComplianceReasons: ""
-          }
-        ], //项目下的标准数据
         children: [] //标准下的分解单数据
       },
-      dataList: [
+      dataList: [], //展示的标准数据
-        {
-          complianceReasons: "",
-          zcComplianceReasons: ""
-        }
-      ], //展示的标准数据
       commentText: "", //审批意见
       detailData: [], //流程历史数据
       userId: this.$store.getters.userInfo.userId,
@@ -716,54 +712,17 @@ export default {
             item.countermeasures = this.batchEditForm.countermeasures;
             //完成时间
             item.completionTime = this.batchEditForm.completionTime;
+          }else if(item.standId === items){
+            item.complianceReasons = this.batchEditForm.complianceReasons;
+            //不合规
+            item.noCompliance = this.batchEditForm.noCompliance;
+            //应对措施
+            item.countermeasures = this.batchEditForm.countermeasures;
+            //完成时间
+            item.completionTime = this.batchEditForm.completionTime;
           }
         });
       });
-      // for (let a = 0; a < this.dataList.length; a++) {
-      //   for (let b = 0; b < this.selectList.length; b++) {
-      //     if (this.dataList[a].id === this.selectList[b]) {
-      //       console.log('11');
-      //       //合规
-      //       this.dataList[a].complianceReasons = this.batchEditForm.complianceReasons
-      //       //不合规
-      //       this.dataList[a].noCompliance = this.batchEditForm.noCompliance
-      //       //应对措施
-      //       this.dataList[a].countermeasures = this.batchEditForm.countermeasures
-      //       //完成时间
-      //       this.dataList[a].completionTime = this.batchEditForm.completionTime
-      //       //合规
-      //       this.dataList[a].zcComplianceReasons = this.batchEditForm.zcComplianceReasons
-      //       //不合规
-      //       this.dataList[a].zcNoCompliance = this.batchEditForm.zcNoCompliance
-      //       //应对措施
-      //       this.dataList[a].zcCountermeasures = this.batchEditForm.zcCountermeasures
-      //       //完成时间
-      //       this.dataList[a].zcCompletionTime = this.batchEditForm.zcCompletionTime
-      //     } else {
-      //       for (let i = 0; i < this.dataList[a].children.length; i++) {
-      //         if (this.dataList[a].children[i].id === this.selectList[b]) {
-      //           //合规
-      //           this.dataList[a].children[i].complianceReasons = this.batchEditForm.complianceReasons
-      //           //不合规
-      //           this.dataList[a].children[i].noCompliance = this.batchEditForm.noCompliance
-      //           //应对措施
-      //           this.dataList[a].children[i].countermeasures = this.batchEditForm.countermeasures
-      //           //完成时间
-      //           this.dataList[a].children[i].completionTime = this.batchEditForm.completionTime
-      //           //合规
-      //           this.dataList[a].children[i].zcComplianceReasons = this.batchEditForm.zcComplianceReasons
-      //           //不合规
-      //           this.dataList[a].children[i].zcNoCompliance = this.batchEditForm.zcNoCompliance
-      //           //应对措施
-      //           this.dataList[a].children[i].zcCountermeasures = this.batchEditForm.zcCountermeasures
-      //           //完成时间
-      //           this.dataList[a].children[i].zcCompletionTime = this.batchEditForm.zcCompletionTime
-      //         }
-      //       }
-      //     }
-      //
-      //   }
-      // }
       this.modalshowflag = false;
     },
     cancelBatchEditForm() {
@@ -871,6 +830,7 @@ export default {
     },
     //动态表单读取
     getFormFieldList(item) {
+      console.log(item);
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
         if (item.form === undefined) {
@@ -881,6 +841,9 @@ export default {
           this.listForm["id"] = item.id;
           this.listForm.dataList = item.dataList;
           this.listForm.dataList.forEach(item => {
+            if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
+                this.dataList.push(item)
+            }
               item.children.forEach(items=> {
                 if(items.key === item.standId){
                   this.$set(items, "standName", item.standName);
@@ -897,6 +860,7 @@ export default {
           dataChildren.forEach((item,index) => {
             dataListChildren = dataListChildren.concat(item)
           })
+          dataListChildren = this.dataList.concat(dataListChildren)
           this.dataList = dataListChildren
           this.total = this.dataList.length;
         } else {
@@ -904,6 +868,9 @@ export default {
           let dataChildren = []
           let dataListChildren = []
           this.listForm.dataList.forEach(item => {
+            if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
+              this.dataList.push(item)
+            }
             item.children.forEach(items=> {
               if(items.key === item.standId){
                 this.$set(items, "standName", item.standName);
@@ -920,6 +887,7 @@ export default {
           dataChildren.forEach((item,index) => {
             dataListChildren = dataListChildren.concat(item)
           })
+          dataListChildren = this.dataList.concat(dataListChildren)
           this.dataList = dataListChildren
           this.total = this.dataList.length;
           // this.dataList = item.form.dataList[0].children;
@@ -964,31 +932,42 @@ export default {
         this.isSubmit = false;
       });
     },
+    handlePrice(row){
+      if(row.complianceReasons !== '' || (row.noCompliance !== '' && row.countermeasures !== '' && row.completionTime !== '') || (row.complianceReasons === '' && row.noCompliance === '' && row.countermeasures === '' && row.completionTime === '')){
+        this.comFlag = true
+      }else{
+        this.comFlag = false
+      }
+    },
     //提交事件
     handleSubmit() {
-      this.isSubmit = true;
+      if(!this.comFlag){
-      this.listForm.commentText = this.commentText;
+        this.$message.warning('请填写完整的不符合项信息')
-      const json = JSON.stringify(this.listForm);
+      }else{
-      this.$http.post("lawss/activiti/completeTask", {
+        this.isSubmit = true;
-        taskIds: this.taskIds,
+        this.listForm.commentText = this.commentText;
-        userId: this.userId,
+        const json = JSON.stringify(this.listForm);
-        json: json
+        this.$http.post("lawss/activiti/completeTask", {
-      }, {
+          taskIds: this.taskIds,
-        _this: this
+          userId: this.userId,
-      }, res => {
+          json: json
-        if (res.success) {
+        }, {
-          this.$message.success(res.message);
+          _this: this
-          this.$router.push("/processCenter");
+        }, res => {
-        }
+          if (res.success) {
-        this.isSubmit = false;
+            this.$message.success(res.message);
-      }, e => {
+            this.$router.push("/processCenter");
-      });
+          }
+          this.isSubmit = false;
+        }, e => {
+        });
+      }
     },
     //标准表格选择框改变
     selectStandChange(data) {
       this.selectList = [];
       for (let i = 0; i < data.length; i++) {
-        this.selectList.push(data[i].id);
+        this.selectList.push(data[i].id || data[i].standId);
         localStorage.setItem("selectList", JSON.stringify(this.selectList));
       }
     },

src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue

@@ -468,36 +468,70 @@ export default {
     },
     //动态表单读取
     getFormFieldList(item) {
+      console.log(item);
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
-        this.listForm.prcNum = this.prcNum;
+        if (item.form === undefined) {
-        this.listForm.prcName = this.prcName;
+          let dataChildren = []
-        this.listForm["id"] = item.id;
+          let dataListChildren = []
-        this.listForm.dataList = item.dataList;
+          this.listForm.prcNum = this.prcNum;
-        let dataChildren = []
+          this.listForm.prcName = this.prcName;
-        let dataListChildren = []
+          this.listForm["id"] = item.id;
-        this.listForm.dataList.forEach(item => {
+          this.listForm.dataList = item.dataList;
-          item.children.forEach(items=> {
+          this.listForm.dataList.forEach(item => {
-            if(items.key === item.standId){
+            if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
-              this.$set(items, "standName", item.standName);
+              this.dataList.push(item)
-              this.$set(items, "standEnName", item.standEnName);
-              this.$set(items, "standYear", item.standYear);
-              this.$set(items, "standSort", item.standSort);
-              this.$set(items, "standNumber", item.standNumber);
             }
+            item.children.forEach(items=> {
+              if(items.key === item.standId){
+                this.$set(items, "standName", item.standName);
+                this.$set(items, "standEnName", item.standEnName);
+                this.$set(items, "standYear", item.standYear);
+                this.$set(items, "standSort", item.standSort);
+                this.$set(items, "standNumber", item.standNumber);
+              }
+            })
           })
-        })
+          this.listForm.dataList.forEach(item => {
-        this.listForm.dataList.forEach(item => {
+            dataChildren.push(item.children)
-          dataChildren.push(item.children)
+          })
-        })
+          dataChildren.forEach((item,index) => {
-        dataChildren.forEach((item,index) => {
+            dataListChildren = dataListChildren.concat(item)
-          dataListChildren = dataListChildren.concat(item)
+          })
-        })
+          dataListChildren = this.dataList.concat(dataListChildren)
-        this.dataList = dataListChildren
+          this.dataList = dataListChildren
-        this.total = this.dataList.length;
+          this.total = this.dataList.length;
-        // this.dataList = item.dataList;
+        } else {
-        // this.dataList.distributePerson = item.dataList[0].distributePerson;
+          this.listForm = item.form;
-        // this.listForm.breakdownList = item.breakdownList;
+          let dataChildren = []
+          let dataListChildren = []
+          this.listForm.dataList.forEach(item => {
+            if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
+              this.dataList.push(item)
+            }
+            item.children.forEach(items=> {
+              if(items.key === item.standId){
+                this.$set(items, "standName", item.standName);
+                this.$set(items, "standEnName", item.standEnName);
+                this.$set(items, "standYear", item.standYear);
+                this.$set(items, "standSort", item.standSort);
+                this.$set(items, "standNumber", item.standNumber);
+              }
+            })
+          })
+          this.listForm.dataList.forEach(item => {
+            dataChildren.push(item.children)
+          })
+          dataChildren.forEach((item,index) => {
+            dataListChildren = dataListChildren.concat(item)
+          })
+          dataListChildren = this.dataList.concat(dataListChildren)
+          this.dataList = dataListChildren
+          this.total = this.dataList.length;
+          // this.dataList = item.form.dataList[0].children;
+          // this.total = item.form.dataList[0].children.length;
+        }
+
       });
     },
     //驳回事件