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

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

@@ -46,7 +46,6 @@
                 row-key="standId"
                 height="70%"
                 border
-                @selection-change="selectStandChange"
                 :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
           fontWeight: 'bold', height: '48px'}"
         >
@@ -175,6 +174,12 @@
               </el-table-column>
             </el-table-column>
           </el-table-column>
+            <el-table-column
+                    prop="workPeople"
+                    align="center"
+                    width="200"
+                    label="责任人">
+            </el-table-column>
         </el-table>
       </div>
       <div>
@@ -387,6 +392,7 @@ export default {
         this.listForm.bzFlag = "1";
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
+        console.log(json)
         this.$http.post("lawss/activiti/completeTask", {
           taskIds: this.taskIds,
           userId: this.userId,

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

@@ -46,7 +46,6 @@
                 row-key="standId"
                 height="70%"
                 border
-                @selection-change="selectStandChange"
                 :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
           fontWeight: 'bold', height: '48px'}"
         >
@@ -175,6 +174,12 @@
               </el-table-column>
             </el-table-column>
           </el-table-column>
+            <el-table-column
+                    prop="workPeople"
+                    align="center"
+                    width="200"
+                    label="责任人">
+            </el-table-column>
         </el-table>
       </div>
       <div>
@@ -335,6 +340,7 @@ export default {
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
+            console.log(res.mesg)
           if (res) {
             const processForm = JSON.parse(res.mesg);
             this.getFormFieldList(processForm);

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

@@ -46,7 +46,6 @@
                 row-key="standId"
                 height="70%"
                 border
-                @selection-change="selectStandChange"
                 :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
           fontWeight: 'bold', height: '48px'}"
         >
@@ -175,6 +174,12 @@
               </el-table-column>
             </el-table-column>
           </el-table-column>
+            <el-table-column
+                    prop="workPeople"
+                    align="center"
+                    width="200"
+                    label="责任人">
+            </el-table-column>
         </el-table>
       </div>
       <div>

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

@@ -312,6 +312,9 @@ export default {
     },
     //驳回事件
     beforeBack() {
+      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
+        this.$message.warning('审批意见不能为空')
+      }else{
         this.listForm.BZFlag = "2";
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
@@ -328,9 +331,13 @@ export default {
           }
         }, e => {
         });
+      }
     },
     //提交事件
     handleSubmit() {
+      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
+        this.$message.warning('审批意见不能为空')
+      }else{
         this.listForm.BZFlag = "1";
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
@@ -348,6 +355,7 @@ export default {
         }, e => {
         });
       }
+      }
   },
   computed: {
     listNoDataText() {

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

@@ -46,7 +46,6 @@
                         row-key="standId"
                         height="70%"
                         border
-                        @selection-change="selectStandChange"
                         :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
           fontWeight: 'bold', height: '48px'}"
                 >
@@ -175,6 +174,12 @@
                             </el-table-column>
                         </el-table-column>
                     </el-table-column>
+                    <el-table-column
+                            prop="workPeople"
+                            align="center"
+                            width="200"
+                            label="责任人">
+                    </el-table-column>
                 </el-table>
             </div>
             <div>
@@ -335,6 +340,7 @@
                         taskIds: this.taskIds,
                         pId: this.pId
                     }).then(res => {
+                        console.log(res.mesg)
                         if (res) {
                             const processForm = JSON.parse(res.mesg);
                             this.getFormFieldList(processForm);

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

@@ -46,7 +46,6 @@
                 row-key="standId"
                 height="70%"
                 border
-                @selection-change="selectStandChange"
                 :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
           fontWeight: 'bold', height: '48px'}"
         >
@@ -175,6 +174,12 @@
               </el-table-column>
             </el-table-column>
           </el-table-column>
+            <el-table-column
+                    prop="workPeople"
+                    align="center"
+                    width="200"
+                    label="责任人">
+            </el-table-column>
         </el-table>
       </div>
       <div>

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

@@ -46,7 +46,6 @@
                 row-key="standId"
                 height="70%"
                 border
-                @selection-change="selectStandChange"
                 :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
           fontWeight: 'bold', height: '48px'}"
         >
@@ -175,6 +174,12 @@
               </el-table-column>
             </el-table-column>
           </el-table-column>
+            <el-table-column
+                    prop="workPeople"
+                    align="center"
+                    width="200"
+                    label="责任人">
+            </el-table-column>
         </el-table>
       </div>
       <div>

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue

@@ -1173,7 +1173,6 @@ export default {
               return items.id == item.id
             })
           if(addList > -1){
-              this.$message.warning('请勿添加重复数据')
               // this.$refs.accessTypeSelect.clearSelection()
               this.$refs.entryTable.clearSelection()
               this.$refs.searchTable.clearSelection()
@@ -1184,6 +1183,7 @@ export default {
               this.$refs.searchTable.clearSelection()
             }
         })
+        this.$message.warning('请勿添加重复数据')
       } else {
         this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
       }

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue

@@ -1142,7 +1142,6 @@ export default {
               return items.id == item.id
             })
           if(addList > -1){
-            this.$message.warning('请勿添加重复数据')
             // this.$refs.accessTypeSelect.clearSelection()
             this.$refs.entryTable.clearSelection()
             this.$refs.searchTable.clearSelection()
@@ -1153,6 +1152,7 @@ export default {
             this.$refs.searchTable.clearSelection()
           }
         })
+        this.$message.warning('请勿添加重复数据')
         this.selectedAccInfoSearchList = []
         this.$refs.entryTable.clearSelection()
         this.$refs.searchTable.clearSelection()
@@ -1326,7 +1326,6 @@ export default {
               loading: 'loadData'
             }, res => {
               if (res.ok) {
-                this.$message.success('编辑成功')
                 this.isNext = true
                 this.$router.push({
                   name: 'AccessStandardsAndRegulations'

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue

@@ -1141,7 +1141,6 @@ export default {
               return items.id == item.id
             })
           if(addList > -1){
-            this.$message.warning('请勿添加重复数据')
             // this.$refs.accessTypeSelect.clearSelection()
             this.$refs.entryTable.clearSelection()
             this.$refs.searchTable.clearSelection()
@@ -1152,6 +1151,7 @@ export default {
             this.$refs.searchTable.clearSelection()
           }
         })
+        this.$message.warning('请勿添加重复数据')
         this.selectedAccInfoSearchList = []
         this.$refs.entryTable.clearSelection()
         this.$refs.searchTable.clearSelection()
@@ -1325,7 +1325,6 @@ export default {
               loading: 'loadData'
             }, res => {
               if (res.ok) {
-                this.$message.success('编辑成功')
                 this.isNext = true
                 this.$router.push({
                   name: 'AccessStandardsAndRegulations'