Parcourir la source

分组模块完成

yxc il y a 2 ans
Parent
commit
c78945b449
3 fichiers modifiés avec 20 ajouts et 54 suppressions
  1. 8 25
      src/views1/Group/Groups/GroupsView.vue
  2. 10 28
      src/views1/Group/Groups/selectUser.vue
  3. 2 1
      vue.config.js

+ 8 - 25
src/views1/Group/Groups/GroupsView.vue

@@ -28,18 +28,10 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="分组管理员" prop="groupManager">
-            <el-input
-              v-model="queryParams.groupManager"
-              placeholder="请输入分组管理员"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="分组管理员姓名" prop="groupManagerName">
+          <el-form-item label="分组管理员" prop="groupManagerName">
             <el-input
               v-model="queryParams.groupManagerName"
-              placeholder="请输入分组管理员姓名"
+              placeholder="请输入分组管理员"
               clearable
               @keyup.enter.native="handleQuery"
             />
@@ -117,16 +109,10 @@
           @selection-change="handleSelectionChange"
         >
           <el-table-column type="selection" width="55" align="center" />
-          <el-table-column label="分组ID" align="center" prop="groupId" />
           <el-table-column label="分组名称" align="center" prop="groupName" />
           <el-table-column
             label="分组管理员"
             align="center"
-            prop="groupManager"
-          />
-          <el-table-column
-            label="分组管理员姓名"
-            align="center"
             prop="groupManagerName"
           />
           <el-table-column
@@ -174,19 +160,13 @@
             <el-form-item label="分组名称" prop="groupName">
               <el-input v-model="form.groupName" placeholder="请输入分组名称" />
             </el-form-item>
-            <el-form-item label="分组管理员" prop="groupManager">
+            <el-form-item label="分组管理员" prop="groupManagerName">
               <el-input
-                v-model="form.groupManager"
+                v-model="form.groupManagerName"
                 placeholder="请输入分组管理员"
                 @click.native="select()"
               />  
             </el-form-item>
-            <!-- <el-form-item label="分组管理员姓名" prop="groupManagerName">
-              <el-input
-                v-model="form.groupManagerName"
-                placeholder="请输入分组管理员姓名"
-              />
-            </el-form-item> -->
             <el-form-item label="备注" prop="remark">
               <el-input v-model="form.remark" placeholder="请输入备注" />
             </el-form-item>
@@ -207,6 +187,8 @@
 <script>
 import selectUser from "./selectUser";
 
+import "@/styles1/element-ui1.scss";
+
 import {
   listGroup,
   getGroup,
@@ -285,7 +267,8 @@ export default {
     },
     // 返回数据
     handleTest(a) {
-     this.form.groupManager  =a;
+      this.form.groupManagerName=a.name;
+      this.form.groupManager=a.id;
     },
     // 表单重置
     reset() {

+ 10 - 28
src/views1/Group/Groups/selectUser.vue

@@ -87,8 +87,8 @@
               <template >  
                 <input type="radio" name="a">
               </template>
-              <template #header >  
-              </template>
+              <!-- <template #header >  
+              </template> -->
             </el-table-column>
             <el-table-column
               label="用户名称"
@@ -160,6 +160,10 @@ export default {
   },
   data() {
     return {
+      information:{
+        name:'',
+        id:''
+      },
       // 遮罩层
       loading: true,
       // 选中数组
@@ -372,37 +376,15 @@ export default {
     },
     // 单选选中数据
     handleSelectionChange(selection) {
-      var name=this.ids = selection.userId
-      // this.ids = selection.map((item) => item.userId);
-      // this.single = selection.length != 1;
-      // this.multiple = !selection.length;
-      // console.log(selection);
-      this.$emit("okk", name)
+      this.information.id = selection.userId;
+      this.information.name = selection.userName;
     },
 
     /** 提交按钮 */
     submitForm() {
-      // console.log(this.selection[0].userName);
-      // this.$emit();
-      // this.open = false;
-     
-      // var name = this.userList.find(val => this.ids == val.userId).userName;
-      
-      // const userIds = this.userIds.join(",");
-      // if (userIds == "") {
-      //   this.$modal.msgError("请选择要分配的用户");
-      //   return;
-      // }
-
-      
+      // var name = this.userList.find(val => this.ids == val.userId).userName
+      this.$emit("okk", this.information)
       this.open = false;
-      // groupUserSelectAll({ groupId: groupId, userIds: userIds }).then((res) => {
-      //   this.$modal.msgSuccess(res.msg);
-      //   if (res.code === 200) {
-      //     this.open = false;
-      //     this.$emit("okk", userIds);
-      //   }
-      // });
     },
 
     // 更多操作触发

+ 2 - 1
vue.config.js

@@ -35,7 +35,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.188.99:8080`,
+        // target: `http://192.168.188.99:8080`,
+        target: `http://192.168.1.13:8080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''