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

src/pages/config/pages/mechanismManage/pages/committee.vue

@@ -113,7 +113,7 @@
             </el-form-item>
             <el-form-item label="副主任" prop="committeeDeputy" label-width="100px" class="add-form-item">
               <el-input
-                v-model="addForm.committeeDeputy"
+                v-model="addForm.committeeDeputyName"
                 placeholder="请选择副主任"
                 @click.native="choiceZRR('committeeDeputy', '选择副主任', addForm.committeeDeputy)"
               />
@@ -148,7 +148,7 @@
       ></Role-tree>
       <!--    多选择人-->
       <Role-tree
-        is-title="选择委员"
+        is-title="选择成员"
         :is-visible.sync="modalshowflag2"
         @checkedRole="drawerCheck2"
         :nodeList="nodeList2"
@@ -178,6 +178,8 @@ export default {
         committeeName: "", //委员会名称
         committeeDirector: "", //主任
         committeeDirectorName: "", //主任
+        committeeDeputy: '', // 副主任
+        committeeDeputyName: '', // 副主任
         committeeSecretary: "", //秘书长
         committeeSecretaryName: "", //秘书长
         committor: "", //委员
@@ -194,7 +196,7 @@ export default {
           { required: true, message: "请填写秘书长", trigger: "blur" }
         ],
         committor: [
-          { required: true, message: "请填写委员", trigger: "blur" }
+          { required: true, message: "请填写成员", trigger: "blur" }
         ]
 
       },
@@ -241,6 +243,8 @@ export default {
         committeeName: "", //委员会名称
         committeeDirector: "", //主任
         committeeDirectorName: "", //主任
+        committeeDeputy: '', // 副主任
+        committeeDeputyName: '', // 副主任
         committeeSecretary: "", //秘书长
         committeeSecretaryName: "", //秘书长
         committor: "", //委员
@@ -266,6 +270,8 @@ export default {
         this.addForm.committeeDirectorName = this.committeeChangeList[0].committeeDirectorName;
         this.addForm.committeeSecretary = this.committeeChangeList[0].committeeSecretary;
         this.addForm.committeeSecretaryName = this.committeeChangeList[0].committeeSecretaryName;
+        this.addForm.committeeDeputy = this.committeeChangeList[0].committeeDeputy;
+        this.addForm.committeeDeputyName = this.committeeChangeList[0].committeeDeputyName;
       }
     },
     //批量删除
@@ -321,6 +327,8 @@ export default {
           committeeName: "", //委员会名称
           committeeDirector: "", //主任
           committeeDirectorName: "", //主任
+          committeeDeputy: '', // 副主任
+          committeeDeputyName: '', // 副主任
           committeeSecretary: "", //秘书长
           committeeSecretaryName: "", //秘书长
           committor: "", //委员
@@ -388,6 +396,10 @@ export default {
       } else if (this.type === "committeeSecretary") {
         this.addForm.committeeSecretary = data[0].id;
         this.addForm.committeeSecretaryName = data[0].name;
+      }else if (this.type === "committeeDeputy") {
+        console.log('data = ', data)
+        this.addForm.committeeDeputy = data[0].id;
+        this.addForm.committeeDeputyName = data[0].name;
       }
       this.modalshowflag = false;
     },

src/pages/personal/pages/my-questions/index.vue

@@ -557,7 +557,7 @@
                   暂无数据
                 </div>
               </div>
-              <div style="height: 100%" v-else-if="activeType === 'FOREIGN'">
+              <div style="height: 100%" v-else-if="activeType === 'INLAND'">
                 <el-tabs
                   class="question-box"
                   type="border-card"

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

@@ -1367,7 +1367,7 @@ export default {
             }
           });
         } else {
-          return this.$message.warning("请完善基础信息");
+          return this.$message.warning("请选择清单");
         }
       });
     },