Merge branch 'insp'

src/views/inspection/businessChannel/index.vue

@@ -52,17 +52,24 @@
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
-<!--          <el-col :span="24">-->
-<!--            <el-form-item label="上级菜单">-->
-<!--              <treeselect v-model="form.pid" :options="menuOptions" :normalizer="normalizer" :show-count="true"-->
-<!--                          placeholder="选择上级菜单"/>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
+          <!--          <el-col :span="24">-->
+          <!--            <el-form-item label="上级菜单">-->
+          <!--              <treeselect v-model="form.pid" :options="menuOptions" :normalizer="normalizer" :show-count="true"-->
+          <!--                          placeholder="选择上级菜单"/>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
           <el-col :span="12">
             <el-form-item label="名称" prop="name">
               <el-input v-model="form.name" placeholder="请输入名称"/>
             </el-form-item>
           </el-col>
+          <el-col :span="12" v-if="form.pid !=  0">
+            <el-form-item label="人员" prop="postId">
+              <el-select multiple filterable v-model="form.userIdList" placeholder="请选择人员">
+                <el-option v-for="item in staffList" :key="item.id" :label="item.nickname" :value="item.id"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -89,6 +96,7 @@ import {
   listBusiness,
   updateBusiness
 } from "@/views/inspection/businessChannel/api";
+import {listUser} from "@/views/inspection/staff/api/staff";
 
 export default {
   name: "BusinessChannel",
@@ -101,6 +109,7 @@ export default {
       showSearch: true,
       // 菜单表格树数据
       menuList: [],
+      staffList: [],
       // 菜单树选项
       menuOptions: [],
       // 弹出层标题
@@ -144,6 +153,7 @@ export default {
   },
   created() {
     this.getList();
+    this.getStaff();
   },
   methods: {
     // 选择图标
@@ -158,6 +168,15 @@ export default {
         this.loading = false;
       });
     },
+    getStaff() {
+      const params = {
+        pageNo: 1,
+        pageSize: 99999
+      }
+      listUser(params).then(response => {
+        this.staffList = response.data.records;
+      });
+    },
     /** 转换菜单数据结构 */
     normalizer(node) {
       if (node.children && !node.children.length) {