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

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

@@ -312,8 +312,13 @@ export default {
           let listJSON = JSON.parse(JSON.stringify(item.responUserList))
           this.dataList = [listJSON][0].standardInfoList
         } else {
-          let listJSONInfo = item.info
-          this.dataList = [listJSONInfo]
+          if (item.dockUserList !== undefined) {
+            let listJSON = JSON.parse(JSON.stringify(item.dockUserList))
+            this.dataList = listJSON[0].standardInfoList
+          }else {
+            let listJSONInfo = item.info
+            this.dataList = [listJSONInfo]
+          }
         }
         this.dataList.forEach(item => {
           if (item.fileText.length !== 0) {

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

@@ -226,7 +226,7 @@
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.statuteMinister" style="display: none;"></el-input>
                     <el-input v-model="roleForm.statuteMinisterName" placeholder="选择标准法规部部长"
-                              @click.native="choiceZRR('statuteMinister', '选择技术管理中心主任', roleForm.statuteMinister)"></el-input>
+                              @click.native="choiceZRR('statuteMinister', '选择标准法规部部长', roleForm.statuteMinister)"></el-input>
                   </div>
                 </el-form-item>
               </el-card>
@@ -533,6 +533,13 @@ export default {
     },
     //项目的多选框改变
     selectListChange(data) {
+      // 单选
+      if (data.length > 1) {
+        this.$refs.selection.clearSelection()
+        this.$refs.selection.toggleRowSelection(data.pop())
+      }
+      this.multipleSelection = data
+
       this.selectedList = data;
     },
     pageChange(page) {

src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue

@@ -592,10 +592,24 @@ export default {
     },
     //清单勾选框数据
     selectListChange(data) {
+      // 单选
+      if (data.length > 1) {
+        this.$refs.selection.clearSelection()
+        this.$refs.selection.toggleRowSelection(data.pop())
+      }
+      this.multipleSelection = data
+
       this.selectedList = data;
     },
     //项目勾选框数据
     selectProjectChange(data) {
+      // 单选
+      if (data.length > 1) {
+        this.$refs.selection.clearSelection()
+        this.$refs.selection.toggleRowSelection(data.pop())
+      }
+      this.multipleSelection = data
+
       this.selectProject = data;
     },
     //提交事件

src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue

@@ -372,6 +372,7 @@ export default {
   },
   data() {
     return {
+      multipleSelection:[],
       active: "1", //默认显示
       commentText: "",
       modalshowflag: false,
@@ -434,6 +435,15 @@ export default {
     };
   },
   methods: {
+    // 表格勾选
+    handleSelectionChange(val) {
+      // 单选
+      if (val.length > 1) {
+        this.$refs.table.clearSelection()
+        this.$refs.table.toggleRowSelection(val.pop())
+      }
+      this.multipleSelection = val
+    },
     handleTabs(type) {
       this.active = type;
     },
@@ -581,10 +591,24 @@ export default {
     },
     //清单勾选框数据
     selectListChange(data) {
+      // 单选
+      if (data.length > 1) {
+        this.$refs.selection.clearSelection()
+        this.$refs.selection.toggleRowSelection(data.pop())
+      }
+      this.multipleSelection = data
+
       this.selectedList = data;
     },
     //项目勾选框数据
     selectProjectChange(data) {
+      // 单选
+      if (data.length > 1) {
+        this.$refs.selection.clearSelection()
+        this.$refs.selection.toggleRowSelection(data.pop())
+      }
+      this.multipleSelection = data
+
       this.selectProject = data;
     },
     //提交事件