init

src/api/cai/accountChangeLog.js

@@ -17,21 +17,12 @@ export function getAccountChangeLog(id) {
   })
 }
 
-// 新增账户明细
-export function addAccountChangeLog(data) {
-  return request({
-    url: '/cai/accountChangeLog',
-    method: 'post',
-    data: data
-  })
-}
 
-// 修改账户明细
+// 查询账户明细详细
-export function updateAccountChangeLog(data) {
+export function listChangeType() {
   return request({
-    url: '/cai/accountChangeLog',
+    url: '/cai/accountChangeLog/listChangeType',
-    method: 'put',
+    method: 'get'
-    data: data
   })
 }
 

src/constant/statusMap.js

@@ -191,3 +191,8 @@ export const ipMicList = [
   { value: 2, label: 'MIC'},
 ]
 
+export const accountTypeList = [
+  { value: 1, label: '余额',listClass: listClass.info},
+  { value: 2, label: '收益',listClass: listClass.primary},
+]
+

src/views/cai/account/account-change-info.vue

@@ -0,0 +1,139 @@
+<template>
+  <el-dialog title="账户明细" :close-on-click-modal="false" :visible.sync="open" width="1000px" append-to-body>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="账户类型" prop="accountType">
+        <el-select v-model="queryParams.accountType" placeholder="账户类型" clearable size="small">
+          <el-option
+              v-for="dict in accountTypeList"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+              @keyup.enter.native="handleQuery"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="业务操作" prop="cateId">
+        <el-select v-model="queryParams.cateId" placeholder="业务操作" clearable size="small">
+          <el-option
+              v-for="dict in changeTypeList"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+              @keyup.enter.native="handleQuery"
+          />
+        </el-select>
+      </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>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="accountChangeLogList" >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="蜜瓜号" align="center" prop="usercode" />
+      <el-table-column label="账户类型" align="center" prop="accountType" >
+        <template v-slot="scope">
+          <cai-dict-tag :options="accountTypeList" :value="scope.row.accountType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="业务操作" align="center" prop="cateAdminName" />
+      <el-table-column label="变动" align="center" prop="changeValue" />
+      <el-table-column label="说明" align="center" prop="remark" />
+      <el-table-column label="后台操作" align="center" prop="isAdmin" >
+        <template v-slot="scope">
+          <cai-dict-tag :options="yesOrNoList" :value="scope.row.isAdmin"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作时间" align="center" prop="createTime" />
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template v-slot="scope">
+        </template>
+      </el-table-column>-->
+    </el-table>
+
+    <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+    />
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="open = false">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import {getUserByUsercode, listUserByUserCode} from "@/api/cai/user";
+import { listMemberPrice } from '@/api/cai/memberPrice'
+import { addUserMember } from '@/api/cai/userMember'
+import {updateAccountCoin} from "@/api/cai/account";
+import {listGoods} from "@/api/cai/goods";
+import {accountTypeList, yesOrNoList} from "@/constant/statusMap";
+import {listAccountChangeLog, listChangeType} from "@/api/cai/accountChangeLog";
+
+export default {
+  components: {
+  },
+  data () {
+    return {
+      accountTypeList,yesOrNoList,
+      open: false,
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 账户明细表格数据
+      accountChangeLogList: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userId: undefined,
+        accountType: undefined,
+        cateId: undefined
+      },
+      changeTypeList:[],
+    }
+  },
+  created() {
+  },
+  methods: {
+    init (id) {
+      this.open = true;
+      this.queryParams.userId = id
+      this.getList();
+      listChangeType().then(res => {
+        this.changeTypeList = res.data
+      })
+    },
+    /** 查询账户明细列表 */
+    getList() {
+      this.loading = true;
+      listAccountChangeLog(this.queryParams).then(response => {
+        this.accountChangeLogList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+  }
+}
+</script>

src/views/cai/account/index.vue

@@ -66,6 +66,16 @@
           <cai-dict-tag :options="userStatusList" :value="scope.row.status"/>
         </template>
       </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template v-slot="scope">
+          <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-info"
+              @click="handleInfo(scope.row)"
+          >账户明细</el-button>
+        </template>
+      </el-table-column>
     </el-table>
 
     <pagination
@@ -77,6 +87,7 @@
     />
 
     <add-account-dialog v-if="addAccountDialogVisible" ref="addAccountDialog" @refreshDataList="getList"/>
+    <account-change-info v-if="accountChangeInfoVisible" ref="accountChangeInfo" />
   </div>
 </template>
 
@@ -84,17 +95,20 @@
 import {listAccount} from "@/api/cai/account";
 import {genderList, isAnchorList, userStatusList, yesOrNoList} from "@/constant/statusMap";
 import AddAccountDialog from "@/views/cai/account/add-account-dialog";
+import AccountChangeInfo from "@/views/cai/account/account-change-info";
 
 
 export default {
   name: "Account",
   components:{
+    AccountChangeInfo,
     AddAccountDialog
   },
   data() {
     return {
       genderList, userStatusList, yesOrNoList, isAnchorList,
       addAccountDialogVisible: false,
+      accountChangeInfoVisible: false,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -122,6 +136,12 @@ export default {
     this.getList();
   },
   methods: {
+    handleInfo(row){
+      this.accountChangeInfoVisible = true
+      this.$nextTick(() => {
+        this.$refs.accountChangeInfo.init(row.id)
+      })
+    },
     /** 查询用户账户列表 */
     getList() {
       this.loading = true;

src/views/cai/accountChangeLog/index.vue

@@ -1,14 +1,6 @@
 <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="用户ID" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入用户ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="蜜瓜号" prop="usercode">
         <el-input
           v-model="queryParams.usercode"
@@ -17,53 +9,27 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="类别" prop="cateId">
+      <el-form-item label="账户类型" prop="accountType">
-        <el-input
+        <el-select v-model="queryParams.accountType" placeholder="账户类型" clearable size="small">
-          v-model="queryParams.cateId"
+          <el-option
-          placeholder="请输入类别"
+              v-for="dict in accountTypeList"
-          clearable
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
               @keyup.enter.native="handleQuery"
           />
+        </el-select>
       </el-form-item>
-      <el-form-item label="名称" prop="cateName">
+      <el-form-item label="业务操作" prop="cateId">
-        <el-input
+        <el-select v-model="queryParams.cateId" placeholder="业务操作" clearable size="small">
-          v-model="queryParams.cateName"
+          <el-option
-          placeholder="请输入名称"
+              v-for="dict in changeTypeList"
-          clearable
+              :key="dict.value"
-          @keyup.enter.native="handleQuery"
+              :label="dict.label"
-        />
+              :value="dict.value"
-      </el-form-item>
-      <el-form-item label="业务码" prop="businessCode">
-        <el-input
-          v-model="queryParams.businessCode"
-          placeholder="请输入业务码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="变化值，为正 或者为负" prop="changeValue">
-        <el-input
-          v-model="queryParams.changeValue"
-          placeholder="请输入变化值，为正 或者为负"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="操作IP" prop="operateIp">
-        <el-input
-          v-model="queryParams.operateIp"
-          placeholder="请输入操作IP"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="是否为后台用户手动调整" prop="isAdmin">
-        <el-input
-          v-model="queryParams.isAdmin"
-          placeholder="请输入是否为后台用户手动调整"
-          clearable
               @keyup.enter.native="handleQuery"
           />
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -72,80 +38,29 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['cai:accountChangeLog:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['cai:accountChangeLog:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['cai:accountChangeLog:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['cai:accountChangeLog:export']"
-        >导出</el-button>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="accountChangeLogList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="积分记录ID" align="center" prop="id" v-if="true"/>
-      <el-table-column label="用户ID" align="center" prop="userId" />
       <el-table-column label="蜜瓜号" align="center" prop="usercode" />
-      <el-table-column label="账户类型 1-余额 2-收益" align="center" prop="accountType" />
+      <el-table-column label="账户类型" align="center" prop="accountType" >
-      <el-table-column label="类别" align="center" prop="cateId" />
+        <template v-slot="scope">
-      <el-table-column label="名称" align="center" prop="cateName" />
+          <cai-dict-tag :options="accountTypeList" :value="scope.row.accountType"/>
-      <el-table-column label="业务码" align="center" prop="businessCode" />
+        </template>
-      <el-table-column label="变化值，为正 或者为负" align="center" prop="changeValue" />
+      </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="业务操作" align="center" prop="cateAdminName" />
-      <el-table-column label="操作IP" align="center" prop="operateIp" />
+      <el-table-column label="客户显示" align="center" prop="cateAppName" />
-      <el-table-column label="是否为后台用户手动调整" align="center" prop="isAdmin" />
+      <el-table-column label="变动" align="center" prop="changeValue" />
+      <el-table-column label="说明" align="center" prop="remark" />
+      <el-table-column label="后台操作" align="center" prop="isAdmin" >
+        <template v-slot="scope">
+          <cai-dict-tag :options="yesOrNoList" :value="scope.row.isAdmin"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作时间" align="center" prop="createTime" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
+        <template v-slot="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['cai:accountChangeLog:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['cai:accountChangeLog:remove']"
-          >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -157,55 +72,18 @@
       :limit.sync="queryParams.pageSize"
       @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="usercode">
-          <el-input v-model="form.usercode" placeholder="请输入蜜瓜号" />
-        </el-form-item>
-        <el-form-item label="类别" prop="cateId">
-          <el-input v-model="form.cateId" placeholder="请输入类别" />
-        </el-form-item>
-        <el-form-item label="名称" prop="cateName">
-          <el-input v-model="form.cateName" placeholder="请输入名称" />
-        </el-form-item>
-        <el-form-item label="业务码" prop="businessCode">
-          <el-input v-model="form.businessCode" placeholder="请输入业务码" />
-        </el-form-item>
-        <el-form-item label="变化值，为正 或者为负" prop="changeValue">
-          <el-input v-model="form.changeValue" placeholder="请输入变化值，为正 或者为负" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
-        <el-form-item label="操作IP" prop="operateIp">
-          <el-input v-model="form.operateIp" placeholder="请输入操作IP" />
-        </el-form-item>
-        <el-form-item label="是否为后台用户手动调整" prop="isAdmin">
-          <el-input v-model="form.isAdmin" 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>
   </div>
 </template>
 
 <script>
-import { listAccountChangeLog, getAccountChangeLog, delAccountChangeLog, addAccountChangeLog, updateAccountChangeLog } from "@/api/cai/accountChangeLog";
+import {listAccountChangeLog, listChangeType} from "@/api/cai/accountChangeLog";
+import {accountTypeList, yesOrNoList} from "@/constant/statusMap";
 
 export default {
   name: "AccountChangeLog",
   data() {
     return {
-      // 按钮loading
+      accountTypeList,yesOrNoList,
-      buttonLoading: false,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -220,69 +98,22 @@ export default {
       total: 0,
       // 账户明细表格数据
       accountChangeLogList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        userId: undefined,
         usercode: undefined,
         accountType: undefined,
-        cateId: undefined,
+        cateId: undefined
-        cateName: undefined,
-        businessCode: undefined,
-        changeValue: undefined,
-        operateIp: undefined,
-        isAdmin: undefined
       },
-      // 表单参数
+      changeTypeList:[],
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "积分记录ID不能为空", trigger: "blur" }
-        ],
-        userId: [
-          { required: true, message: "用户ID不能为空", trigger: "blur" }
-        ],
-        usercode: [
-          { required: true, message: "蜜瓜号不能为空", trigger: "blur" }
-        ],
-        accountType: [
-          { required: true, message: "账户类型 1-余额 2-收益不能为空", trigger: "change" }
-        ],
-        cateId: [
-          { required: true, message: "类别不能为空", trigger: "blur" }
-        ],
-        cateName: [
-          { required: true, message: "名称不能为空", trigger: "blur" }
-        ],
-        businessCode: [
-          { required: true, message: "业务码不能为空", trigger: "blur" }
-        ],
-        changeValue: [
-          { required: true, message: "变化值，为正 或者为负不能为空", trigger: "blur" }
-        ],
-        createTime: [
-          { required: true, message: "创建时间不能为空", trigger: "blur" }
-        ],
-        remark: [
-          { required: true, message: "备注不能为空", trigger: "blur" }
-        ],
-        operateIp: [
-          { required: true, message: "操作IP不能为空", trigger: "blur" }
-        ],
-        isAdmin: [
-          { required: true, message: "是否为后台用户手动调整不能为空", trigger: "blur" }
-        ]
-      }
     };
   },
   created() {
     this.getList();
+    listChangeType().then(res => {
+      this.changeTypeList = res.data
+    })
   },
   methods: {
     /** 查询账户明细列表 */
@@ -294,29 +125,6 @@ export default {
         this.loading = false;
       });
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: undefined,
-        userId: undefined,
-        usercode: undefined,
-        accountType: undefined,
-        cateId: undefined,
-        cateName: undefined,
-        businessCode: undefined,
-        changeValue: undefined,
-        createTime: undefined,
-        remark: undefined,
-        operateIp: undefined,
-        isAdmin: undefined
-      };
-      this.resetForm("form");
-    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -333,70 +141,6 @@ 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
-      getAccountChangeLog(id).then(response => {
-        this.loading = false;
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改账户明细";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          this.buttonLoading = true;
-          if (this.form.id != null) {
-            updateAccountChangeLog(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          } else {
-            addAccountChangeLog(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除账户明细编号为"' + ids + '"的数据项？').then(() => {
-        this.loading = true;
-        return delAccountChangeLog(ids);
-      }).then(() => {
-        this.loading = false;
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {
-      }).finally(() => {
-        this.loading = false;
-      });
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('cai/accountChangeLog/export', {
-        ...this.queryParams
-      }, `accountChangeLog_${new Date().getTime()}.xlsx`)
-    }
   }
 };
 </script>

src/views/cai/user/index.vue

@@ -228,8 +228,7 @@ export default {
     handleInfo(row){
       this.userInfoDialogVisible = true
       this.$nextTick(() => {
-        const id = row.id || this.ids
+        this.$refs.userInfoDialog.init(row.id)
-        this.$refs.userInfoDialog.init(id)
       })
     },
     /** 删除按钮操作 */