Merge branch 'dev-yqLive-20200611' into 'release'

更改成员管理本省数据和新建直播嘉宾，Code Review：bo.dang



See merge request !173

src/components/yqrange/baseinfo.vue

@@ -55,6 +55,9 @@
     <el-form-item label="圈子介绍" prop="introduce">
       <el-col :span="13">
         <el-input
+          type="textarea"
+          rows="2"
+          maxlength="40"
           size="small"
           v-model="formData.introduce"
           placeholder="请输入圈子介绍"

src/components/yqrange/organzation.vue

@@ -103,11 +103,11 @@
         totalOrganization: 10,
         pageSizeOrganization: 2,
         activeName:"",
-        selectionList:"",
+        selectionList:[],
         formOrganization: {
           name: "",
-          administrativeId: "0",
-          administrativeIdList: ["0"],
+          administrativeId: "",
+          administrativeIdList: [],
           level: "",
           chechAll: true,
           pageNum: 1,
@@ -136,7 +136,8 @@
         this.activeName = "second";
         this.formOrganization.pageNum = 1;
         this.formOrganization.name = "";
-        this.formOrganization.administrativeIdList = ["0"];
+        // this.formOrganization.administrativeIdList = ["0"];
+        // this.formOrganization.administrativeIdList = ["310"];
         this.formOrganization.level = "";
       },
       setMoreOption(data, type) {
@@ -175,9 +176,9 @@
               vm.optionsRegion = operationData.setRegionOption3(
               res.data.provinceList
             );
-
             }
-            this.getOrganization();
+            vm.formOrganization.administrativeIdList.push(vm.optionsRegion[0].value);
+            vm.getOrganization();
           } else {
             this.$message(res.message);
           }
@@ -378,6 +379,7 @@
           if (row.status == 1) {
             this.$nextTick(function () {
               this.$refs.multipleOrganization.toggleRowSelection(row);
+              this.selectionList.push(row);
             });
           }
         });
@@ -385,8 +387,11 @@
       //重置机构、人员查询
       resetOrgOrPerson() {
         vm.formOrganization.name = "";
-        vm.formOrganization.administrativeId = "0";
-        vm.formOrganization.administrativeIdList = ["0"];
+        // vm.formOrganization.administrativeId = "0";
+        // vm.formOrganization.administrativeIdList = ["0"];
+        vm.formOrganization.administrativeId = vm.optionsRegion[0].id;
+        vm.formOrganization.administrativeIdList = [];
+        vm.formOrganization.administrativeIdList.push(vm.optionsRegion[0].value);
         vm.formOrganization.level = "";
         vm.formOrganization.pageNum = 1;
         vm.searchOrganization();

src/utils/operation.js

@@ -309,8 +309,10 @@ export function setRegionOption3(data) {
   let option = [];
   for (let i = 0; i < data.length; i++) {
     let obj = data[i];
+    obj.id = data[i].id;
     obj.label = data[i].provinceName;
-    obj.value = data[i].provinceId;
+    obj.value = data[i].provinceId + "";
+    // obj.leaf = true;
     option.push(obj);
   }
   return option;

src/views/yqrange/create-live.vue

@@ -184,49 +184,59 @@
           <el-form-item label="直播角色">
             <div style="color:#666666;font-size:10px;">讲师（必填）</div>
             <el-col :span="10">
-              <el-form-item label="姓名" prop="lecturesUserName" label-width="60px;">
+              <el-form-item label="姓名" prop="lecturesUserName" label-width="80px">
                   <el-input
                     size="small"
                     v-model="formData.lecturesUserName"
                     placeholder="请输入姓名"
-                    style="width:70%;"
+                    style="width:85%;"
                   ></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="13">
-            <el-form-item label="手机" prop="lecturesPhone">
+            <el-col :span="1">
+              <img style="vertical-align: middle" src="../../assets/image/lianjie_icon.png" />
+            </el-col>
+            <el-col :span="10">
+              <!--<img src="../../assets/image/lianjie_icon.png" />-->
+            <el-form-item label="手机号" prop="lecturesPhone" label-width="80px">
               <el-input maxlength="11"
                 size="small"
                 v-model="formData.lecturesPhone"
                 placeholder="请输入手机号"
-                style="width:70%;"
+                style="width:85%;"
               ></el-input>
             </el-form-item>
             </el-col>
-            <el-col :span="15">
+            <el-col :span="24">
               <div style="color:#666666;font-size:10px;">嘉宾（选填）</div>
             </el-col>
             <div v-for="(item, index) in formData.guests" :key="index">
+              <el-row>
                 <el-col :span="10">
-              <el-form-item label="姓名" label-width="60px;">
+                  <el-form-item label=" 姓名" label-width="80px">
                     <el-input
                         size="small"
                         v-model="item.username"
                         placeholder="请输入姓名"
-                  style="width:70%;"
+                        style="width:85%;"
                     ></el-input>
                   </el-form-item>
                 </el-col>
-            <el-col :span="13">
-              <el-form-item label="手机">
+                <el-col :span="1">
+                  <img style="vertical-align: middle" src="../../assets/image/lianjie_icon.png" />
+                </el-col>
+                <el-col :span="10">
+                  <el-form-item label="手机号" label-width="80px">
                     <el-input maxlength="11"
                               size="small"
                               v-model="item.phone"
                               placeholder="请输入手机号"
-                  style="width:70%;"
+                              style="width:85%;"
                     ></el-input>
-
-               <img
+                  </el-form-item>
+                </el-col>
+                <el-col :span="2">
+                  <img
                       @click="addGuest(index)"
                       class="edit-img"
                       src="../../assets/image/plus.png"
@@ -238,8 +248,8 @@
                       class="edit-img"
                       src="../../assets/image/trash.png"
                   />
-              </el-form-item>
                 </el-col>
+              </el-row>
             </div>
             <!--<el-col :span="15">-->
               <!--<p class="err-text" v-if="guestErrFlag"><img src="../../assets/image/err-icon.svg" alt="">{{guestErrText}}</p>-->
@@ -925,4 +935,7 @@
     width: 20px;
     vertical-align: middle;
   }
+  .guest-label .el-form-item__label{
+    width: 57px;
+  }
   </style>

src/views/yqrange/role-manage.vue

@@ -422,15 +422,15 @@ export default {
                 });
                 // vm.search();
                 this.searchList();
-                if (res.message != "success") {
-                  vm.$message({
-                    message: res.message,
-                    type: "warning"
-                  });
-                }
+                // if (res.message != "success") {
+                //   vm.$message({
+                //     message: res.message,
+                //     type: "warning"
+                //   });
+                // }
               } else {
                 // vm.$message.info(res.message);
-                vm.$message.info("操作失败，请重试");
+                vm.$message.error("操作失败，请重试");
               }
             })
             .catch(function(error) {