init

src/views/cai/userUnion/index.vue

@@ -1,6 +1,22 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="蜜瓜号" prop="usercode">
+        <el-input
+            v-model="queryParams.usercode"
+            placeholder="请输入蜜瓜号"
+            clearable
+            @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="手机号" prop="mobile">
+        <el-input
+            v-model="queryParams.mobile"
+            placeholder="请输入手机号"
+            clearable
+            @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -13,33 +29,44 @@
 
     <el-table v-loading="loading" :data="userUnionList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="蜜瓜号" align="center" prop="usercode"/>
-      <el-table-column label="昵称" align="center" prop="nickname"/>
-      <el-table-column label="手机" align="center" prop="mobile"/>
-      <el-table-column label="头像" align="center" prop="avatar">
+      <el-table-column label="蜜瓜号" align="center" prop="usercode" width="60"/>
+      <el-table-column label="工会名" align="center" prop="name" />
+      <el-table-column label="开启提成" align="center" prop="enableRate" width="80">
         <template v-slot="scope">
-          <image-preview :src="scope.row.avatar"/>
+          <cai-dict-tag :options="booleanList" :value="scope.row.enableRate"/>
         </template>
       </el-table-column>
-      <el-table-column label="性别" align="center" prop="gender">
-        <template v-slot="scope">
-          <cai-dict-tag :options="genderList" :value="scope.row.gender"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="成为管理员时间" align="center" prop="unionTime"/>
+      <el-table-column label="默认提成" align="center" prop="defaultIncomeRate" width="80"/>
+      <el-table-column label="创建时间" align="center" prop="unionTime" width="150"/>
       <el-table-column label="工会人数" align="center" prop="allNum"/>
-      <el-table-column label="在分成的人数" align="center" prop="inDivideNum"/>
-      <el-table-column label="不在分成的人数" align="center" prop="notDivideNum"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
+      <el-table-column label="分成人数" align="center" prop="inDivideNum"/>
+      <el-table-column label="不分成人数" align="center" prop="notDivideNum"/>
+      <el-table-column label="状态" align="center" prop="status">
+        <template v-slot="scope">
+          <cai-dict-tag :options="userStatusList" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width" fixed="right">
         <template v-slot="scope">
           <el-button
               size="mini"
               type="text"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.row)"
+              @click="handleUpdate(scope.row)"
               v-hasPermi="['cai:userUnion:remove']"
-          >删除
+          >修改
           </el-button>
+          <el-button
+              size="mini"
+              type="text"
+              @click="handleDetail(scope.row)"
+          >详情
+          </el-button>
+          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['cai:userUnion:remove']">
+            <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item command="handleDelete" icon="el-icon-delete" v-hasPermi="['cai:userUnion:remove']">解散</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
         </template>
       </el-table-column>
     </el-table>
@@ -52,50 +79,24 @@
         @pagination="getList"
     />
 
-    <!-- 添加或修改工会列表对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="用户id" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入用户id"/>
-        </el-form-item>
-        <el-form-item label="工会名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入工会名称"/>
-        </el-form-item>
-        <el-form-item label="工会默认二级支付奖励比例" prop="unionPayRate">
-          <el-input v-model="form.unionPayRate" placeholder="请输入工会默认二级支付奖励比例"/>
-        </el-form-item>
-        <el-form-item label="工会默认二级收益奖励比例" prop="unionIncomeRate">
-          <el-input v-model="form.unionIncomeRate" placeholder="请输入工会默认二级收益奖励比例"/>
-        </el-form-item>
-        <el-form-item label="全部人数" prop="allNum">
-          <el-input v-model="form.allNum" placeholder="请输入全部人数"/>
-        </el-form-item>
-        <el-form-item label="在分成的人数" prop="inDivideNum">
-          <el-input v-model="form.inDivideNum" placeholder="请输入在分成的人数"/>
-        </el-form-item>
-        <el-form-item label="不分成人数" prop="notDivideNum">
-          <el-input v-model="form.notDivideNum" placeholder="请输入不分成人数"/>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
+    <union-update-dialog v-if="unionUpdateDialogVisible" ref="unionUpdateDialog" @refreshDataList="getList"/>
   </div>
 </template>
 
 <script>
-import { addUserUnion, delUserUnion, getUserUnion, listUserUnion, updateUserUnion } from '@/api/cai/userUnion'
-import { genderList } from '@/constant/statusMap'
+import {delUserUnion, listUserUnion} from '@/api/cai/userUnion'
+import {booleanList, genderList, userStatusList} from '@/constant/statusMap'
+import UnionUpdateDialog from "@/views/cai/userUnion/union-update-dialog";
 
 export default {
   name: 'UserUnion',
+  components: {
+    UnionUpdateDialog
+  },
   data() {
     return {
-      genderList,
-      // 按钮loading
-      buttonLoading: false,
+      genderList, booleanList, userStatusList,
+      unionUpdateDialogVisible: false,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -110,55 +111,13 @@ export default {
       total: 0,
       // 工会列表表格数据
       userUnionList: [],
-      // 弹出层标题
-      title: '',
-      // 是否显示弹出层
-      open: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        userId: undefined,
-        name: undefined,
-        status: undefined,
-        unionPayRate: undefined,
-        unionIncomeRate: undefined,
-        allNum: undefined,
-        inDivideNum: undefined,
-        notDivideNum: undefined
+        usercode: undefined,
+        mobile: undefined,
       },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: '工会id不能为空', trigger: 'blur' }
-        ],
-        userId: [
-          { required: true, message: '用户id不能为空', trigger: 'blur' }
-        ],
-        name: [
-          { required: true, message: '工会名称不能为空', trigger: 'blur' }
-        ],
-        status: [
-          { required: true, message: '0=禁用 1=启用不能为空', trigger: 'change' }
-        ],
-        unionPayRate: [
-          { required: true, message: '工会默认二级支付奖励比例不能为空', trigger: 'blur' }
-        ],
-        unionIncomeRate: [
-          { required: true, message: '工会默认二级收益奖励比例不能为空', trigger: 'blur' }
-        ],
-        allNum: [
-          { required: true, message: '全部人数不能为空', trigger: 'blur' }
-        ],
-        inDivideNum: [
-          { required: true, message: '在分成的人数不能为空', trigger: 'blur' }
-        ],
-        notDivideNum: [
-          { required: true, message: '不分成人数不能为空', trigger: 'blur' }
-        ]
-      }
     }
   },
   created() {
@@ -174,27 +133,6 @@ export default {
         this.loading = false
       })
     },
-    // 取消按钮
-    cancel() {
-      this.open = false
-      this.reset()
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: undefined,
-        userId: undefined,
-        name: undefined,
-        status: undefined,
-        unionPayRate: undefined,
-        unionIncomeRate: undefined,
-        createTime: undefined,
-        allNum: undefined,
-        inDivideNum: undefined,
-        notDivideNum: undefined
-      }
-      this.resetForm('form')
-    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1
@@ -211,48 +149,16 @@ export default {
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset()
-      this.open = true
-      this.title = '添加工会列表'
-    },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.loading = true
-      this.reset()
-      const id = row.id || this.ids
-      getUserUnion(id).then(response => {
-        this.loading = false
-        this.form = response.data
-        this.open = true
-        this.title = '修改工会列表'
+      this.unionUpdateDialogVisible = true
+      this.$nextTick(() => {
+        this.$refs.unionUpdateDialog.init(row)
       })
     },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs['form'].validate(valid => {
-        if (valid) {
-          this.buttonLoading = true
-          if (this.form.id != null) {
-            updateUserUnion(this.form).then(response => {
-              this.$modal.msgSuccess('修改成功')
-              this.open = false
-              this.getList()
-            }).finally(() => {
-              this.buttonLoading = false
-            })
-          } else {
-            addUserUnion(this.form).then(response => {
-              this.$modal.msgSuccess('新增成功')
-              this.open = false
-              this.getList()
-            }).finally(() => {
-              this.buttonLoading = false
-            })
-          }
-        }
-      })
+    handleDetail(row){
+      const params = { unionId: row.id };
+      this.$tab.openPage("["+row.name+"]工会详情", '/tool/union-user/index', params);
     },
     /** 删除按钮操作 */
     handleDelete(row) {
@@ -269,12 +175,15 @@ export default {
         this.loading = false
       })
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('cai/userUnion/export', {
-        ...this.queryParams
-      }, `userUnion_${new Date().getTime()}.xlsx`)
-    }
+    handleCommand(command, row) {
+      switch (command) {
+        case "handleDelete":
+          this.handleDelete(row);
+          break;
+        default:
+          break;
+      }
+    },
   }
 }
 </script>

src/views/cai/userUnion/union-update-dialog.vue

@@ -0,0 +1,96 @@
+<template>
+  <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="700px" append-to-body>
+    <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-form-item label="昵称" prop="nickname">
+        <el-input v-model="form.nickname" placeholder="" disabled />
+      </el-form-item>
+      <el-form-item label="手机号" prop="mobile">
+        <el-input v-model="form.mobile" placeholder="" disabled />
+      </el-form-item>
+      <el-form-item label="蜜瓜号" prop="usercode">
+        <el-input v-model="form.usercode" placeholder="" disabled />
+      </el-form-item>
+      <el-form-item label="开启提成" prop="enableRate">
+        <el-radio-group v-model="form.enableRate">
+          <el-radio :label="true">开启</el-radio>
+          <el-radio :label="false">关闭</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="默认提成" prop="defaultIncomeRate">
+        <el-input v-model="form.defaultIncomeRate" />
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="open = false">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import {getUserUnion, updateUserUnion} from "@/api/cai/userUnion";
+
+export default {
+  components: {
+  },
+  data () {
+    return {
+      open: false,
+      title: '',
+      form:{
+        id: undefined,
+        nickname: undefined,
+        mobile: undefined,
+        usercode: undefined,
+        defaultIncomeRate: undefined,
+        enableRate: undefined,
+      },
+      // 表单校验
+      rules: {
+        enableRate: [
+          { required: true, message: "数据不能为空", trigger: "blur" }
+        ],
+        defaultIncomeRate: [
+          { required: true, message: "数据不能为空", trigger: "blur" }
+        ],
+      },
+      buttonLoading: false,
+    }
+  },
+  created() {
+  },
+  methods: {
+    init (row) {
+      let id = row.id;
+      this.form.id = id || undefined;
+      this.title = "修改工会配置";
+      this.open = true;
+      this.$nextTick(() => {
+        this.$refs['form'].resetFields();
+        getUserUnion(id).then(response => {
+          this.form = response.data;
+          this.form.nickname = row.nickname;
+          this.form.usercode = row.usercode;
+          this.form.mobile = row.mobile;
+        });
+      })
+    },
+    // 表单提交
+    submitForm () {
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          this.buttonLoading = true;
+          updateUserUnion(this.form).then(data => {
+            this.$modal.msgSuccess("修改成功");
+            this.buttonLoading = false;
+            this.open = false
+            this.$emit('refreshDataList')
+          }).finally(() => {
+            this.buttonLoading = false;
+          });
+        }
+      })
+    },
+  }
+}
+</script>