1.新增银行账号管理功能

2.完善货币单位、计量单位的搜索、列表、状态切换、字典查询

src/api/ecw/bankAccount.js

+import request from '@/utils/request'
+
+// 创建银行账户
+export function createBankAccount(data) {
+  return request({
+    url: '/ecw/bank-account/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新银行账户
+export function updateBankAccount(data) {
+  return request({
+    url: '/ecw/bank-account/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除银行账户
+export function deleteBankAccount(id) {
+  return request({
+    url: '/ecw/bank-account/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得银行账户
+export function getBankAccount(id) {
+  return request({
+    url: '/ecw/bank-account/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得银行账户分页
+export function getBankAccountPage(query) {
+  return request({
+    url: '/ecw/bank-account/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出银行账户 Excel
+export function exportBankAccountExcel(query) {
+  return request({
+    url: '/ecw/bank-account/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/utils/dict.js

@@ -55,6 +55,8 @@ export const DICT_TYPE = {
   PAY_ORDER_REFUND_STATUS: 'pay_order_refund_status', // 商户支付订单退款状态
   PAY_REFUND_ORDER_STATUS: 'pay_refund_order_status', // 退款订单状态
   PAY_REFUND_ORDER_TYPE: 'pay_refund_order_type', // 退款订单类别
+  ECW_BANK_TYPE: 'bank_type', // 银行账号类型
+  ECW_DATA_SOURCE: 'data_source', // 数据来源
 }
 
 /**

src/views/ecw/bankAccount/index.vue

+<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="baAccountName">
+        <el-input v-model="queryParams.baAccountName" placeholder="请输入户名" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="开户银行" prop="baBankName">
+        <el-input v-model="queryParams.baBankName" placeholder="请输入开户银行" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="银行账号" prop="baAccountNum">
+        <el-input v-model="queryParams.baAccountNum" placeholder="请输入银行账号" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="银行代码" prop="baSwiftCode">
+        <el-input v-model="queryParams.baSwiftCode" placeholder="请输入银行代码" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="开户银行地址" prop="baBankAdd">
+        <el-input v-model="queryParams.baBankAdd" placeholder="请输入开户银行地址" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="类型" prop="baType">
+<!--        <el-select v-model="queryParams.baType" placeholder="请选择类型字典（1公账,2私账）" clearable size="small">-->
+<!--          <el-option label="请选择字典生成" value="" />-->
+<!--        </el-select>-->
+        <el-select v-model="queryParams.baType" placeholder="请选择类型字典" clearable style="width: 240px">
+          <el-option v-for="dict in bankTypeDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="数据来源" prop="source">
+<!--        <el-input v-model="queryParams.source" placeholder="请输入数据来源字典（pc端，mobile端）" clearable @keyup.enter.native="handleQuery"/>-->
+        <el-select v-model="queryParams.source" placeholder="请选择数据来源" clearable style="width: 240px">
+          <el-option v-for="dict in sourceDatas" :key="dict.value" :label="dict.label" :value="dict.value"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 240px">
+          <el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间">
+        <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
+                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </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="['ecw:bank-account:create']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
+                   v-hasPermi="['ecw:bank-account:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <!-- 列表 -->
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="银行账号编号" align="center" prop="id" />
+      <el-table-column label="户名" align="center" prop="baAccountName" />
+      <el-table-column label="开户银行" align="center" prop="baBankName" />
+      <el-table-column label="银行账号" align="center" prop="baAccountNum" />
+      <el-table-column label="银行代码" align="center" prop="baSwiftCode" />
+      <el-table-column label="开户银行地址" align="center" prop="baBankAdd" />
+      <el-table-column label="类型" align="center" prop="baType" >
+        <template slot-scope="scope">
+          <dict-tag :type="DICT_TYPE.ECW_BANK_TYPE" :value="scope.row.baType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="数据来源" align="center" prop="source" >
+        <template slot-scope="scope">
+          <dict-tag :type="DICT_TYPE.ECW_DATA_SOURCE" :value="scope.row.source"/>
+        </template>
+      </el-table-column>
+
+<!--      <el-table-column label="状态" align="center" prop="status" />-->
+      <el-table-column label="状态" key="status" align="center">
+        <template slot-scope="scope">
+          <el-switch v-model="scope.row.status" :active-value="0" :inactive-value="1" @change="handleStatusChange(scope.row)" />
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                     v-hasPermi="['ecw:bank-account:update']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['ecw:bank-account:delete']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :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="户名" prop="baAccountName">
+          <el-input v-model="form.baAccountName" placeholder="请输入户名" />
+        </el-form-item>
+        <el-form-item label="开户银行" prop="baBankName">
+          <el-input v-model="form.baBankName" placeholder="请输入开户银行" />
+        </el-form-item>
+        <el-form-item label="银行账号" prop="baAccountNum">
+          <el-input v-model="form.baAccountNum" placeholder="请输入银行账号" />
+        </el-form-item>
+        <el-form-item label="银行代码" prop="baSwiftCode">
+          <el-input v-model="form.baSwiftCode" placeholder="请输入银行代码" />
+        </el-form-item>
+        <el-form-item label="开户银行地址" prop="baBankAdd">
+          <el-input v-model="form.baBankAdd" placeholder="请输入开户银行地址" />
+        </el-form-item>
+        <el-form-item label="类型" prop="baType">
+<!--          <el-select v-model="form.baType" placeholder="请选择类型">-->
+<!--            <el-option label="请选择字典生成" value="" />-->
+<!--          </el-select>-->
+          <el-select v-model="form.baType" placeholder="请选择类型" clearable style="width: 240px">
+            <el-option v-for="dict in bankTypeDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="数据字典" prop="source">
+          <!--          <el-select v-model="form.baType" placeholder="请选择类型">-->
+          <!--            <el-option label="请选择字典生成" value="" />-->
+          <!--          </el-select>-->
+          <el-select v-model="form.source" placeholder="请选择数据来源" clearable style="width: 240px">
+            <el-option v-for="dict in sourceDatas" :key="dict.value" :label="dict.label" :value="dict.value"/>
+          </el-select>
+        </el-form-item>
+<!--        <el-form-item label="状态" prop="status">-->
+<!--          <el-radio-group v-model="form.status">-->
+<!--&lt;!&ndash;            <el-radio label="1">请选择字典生成</el-radio>&ndash;&gt;-->
+<!--            <el-radio v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>-->
+
+<!--          </el-radio-group>-->
+<!--        </el-form-item>-->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { createBankAccount, updateBankAccount, deleteBankAccount, getBankAccount, getBankAccountPage, exportBankAccountExcel } from "@/api/ecw/bankAccount";
+import {DICT_TYPE, getDictDatas} from "@/utils/dict";
+import {CommonStatusEnum} from "@/utils/constants";
+import {changeUserStatus} from "@/api/system/user";
+
+export default {
+  name: "BankAccount",
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 银行账户列表
+      list: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      dateRangeCreateTime: [],
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        baAccountName: null,
+        baBankName: null,
+        baAccountNum: null,
+        baSwiftCode: null,
+        baBankAdd: null,
+        baType: null,
+        source: null,
+        status: null,
+      },
+      // 表单参数
+      form: {},
+
+      // 表单校验
+      rules: {
+        baAccountName: [{ required: true, message: "户名不能为空", trigger: "blur" }],
+        baBankName: [{ required: true, message: "开户银行不能为空", trigger: "blur" }],
+        baAccountNum: [{ required: true, message: "银行账号不能为空", trigger: "blur" }],
+        baSwiftCode: [{ required: true, message: "银行代码不能为空", trigger: "blur" }],
+        baBankAdd: [{ required: true, message: "开户银行地址不能为空", trigger: "blur" }],
+        baType: [{ required: true, message: "类型不能为空", trigger: "change" }],
+        // status: [{ required: true, message: "状态（0正常 1停用）不能为空", trigger: "blur" }],
+      },
+      statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS),
+      bankTypeDatas: getDictDatas(DICT_TYPE.ECW_BANK_TYPE),
+      sourceDatas: getDictDatas(DICT_TYPE.ECW_DATA_SOURCE),
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // 处理查询参数
+      let params = {...this.queryParams};
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
+      // 执行查询
+      getBankAccountPage(params).then(response => {
+        this.list = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    /** 取消按钮 */
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    /** 表单重置 */
+    reset() {
+      this.form = {
+        id: undefined,
+        baAccountName: undefined,
+        baBankName: undefined,
+        baAccountNum: undefined,
+        baSwiftCode: undefined,
+        baBankAdd: undefined,
+        baType: undefined,
+        status: undefined,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRangeCreateTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加银行账户";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id;
+      getBankAccount(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改银行账户";
+      });
+    },
+    // 用户状态修改
+    handleStatusChange(row) {
+      let text = row.status === CommonStatusEnum.ENABLE ? "启用" : "停用";
+      this.$modal.confirm('确认要' + text + '编号为' + row.id + '的数据吗?').then(function() {
+        return changeUserStatus(row.id, row.status);
+      }).then(() => {
+        this.$modal.msgSuccess(text + "成功");
+      }).catch(function() {
+        row.status = row.status === CommonStatusEnum.ENABLE ? CommonStatusEnum.DISABLE
+          : CommonStatusEnum.ENABLE;
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (!valid) {
+          return;
+        }
+        // 修改的提交
+        if (this.form.id != null) {
+          updateBankAccount(this.form).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.open = false;
+            this.getList();
+          });
+          return;
+        }
+        // 添加的提交
+        createBankAccount(this.form).then(response => {
+          this.$modal.msgSuccess("新增成功");
+          this.open = false;
+          this.getList();
+        });
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const id = row.id;
+      this.$modal.confirm('是否确认删除银行账户编号为"' + id + '"的数据项?').then(function() {
+          return deleteBankAccount(id);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      // 处理查询参数
+      let params = {...this.queryParams};
+      params.pageNo = undefined;
+      params.pageSize = undefined;
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
+      // 执行导出
+      this.$modal.confirm('是否确认导出所有银行账户数据项?').then(() => {
+          this.exportLoading = true;
+          return exportBankAccountExcel(params);
+        }).then(response => {
+          this.$download.excel(response, '${table.classComment}.xls');
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>

src/views/ecw/currency/index.vue

@@ -12,9 +12,11 @@
       <el-form-item label="货币符号" prop="fuhao">
         <el-input v-model="queryParams.fuhao" placeholder="请输入货币符号" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-<!--      <el-form-item label="状态" prop="show">-->
-<!--        <el-input v-model="queryParams.show" placeholder="请输入状态" clearable @keyup.enter.native="handleQuery"/>-->
-<!--      </el-form-item>-->
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 240px">
+          <el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
+        </el-select>
+      </el-form-item>
 <!--      <el-form-item label="汇率" prop="huilv">-->
 <!--        <el-input v-model="queryParams.huilv" placeholder="请输入汇率" clearable @keyup.enter.native="handleQuery"/>-->
 <!--      </el-form-item>-->
@@ -52,7 +54,11 @@
       <el-table-column label="中文名称" align="center" prop="titleZh" />
       <el-table-column label="英文名称" align="center" prop="titleEn" />
       <el-table-column label="货币符号" align="center" prop="fuhao" />
-      <el-table-column label="状态" align="center" prop="show" />
+      <el-table-column label="状态" align="center" prop="show" >
+      <template slot-scope="scope">
+        <el-switch v-model="scope.row.status" :active-value="0" :inactive-value="1" @change="handleStatusChange(scope.row)" />
+      </template>
+      </el-table-column>
       <el-table-column label="汇率" align="center" prop="huilv" />
       <el-table-column label="排序" align="center" prop="aorder" />
       <el-table-column label="" align="center" prop="createAt" width="180">
@@ -116,6 +122,9 @@
 
 <script>
 import { createCurrency, updateCurrency, deleteCurrency, getCurrency, getCurrencyPage, exportCurrencyExcel } from "@/api/ecw/currency";
+import {CommonStatusEnum} from "@/utils/constants";
+import {changeUserStatus} from "@/api/system/user";
+import {DICT_TYPE, getDictDatas} from "@/utils/dict";
 
 export default {
   name: "Currency",
@@ -144,7 +153,7 @@ export default {
         titleZh: null,
         titleEn: null,
         fuhao: null,
-        show: null,
+        status: null,
         huilv: null,
         aorder: null,
         createAt: null,
@@ -154,7 +163,9 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS),
+
     };
   },
   created() {
@@ -185,7 +196,7 @@ export default {
         titleZh: undefined,
         titleEn: undefined,
         fuhao: undefined,
-        show: undefined,
+        status: undefined,
         huilv: undefined,
         aorder: undefined,
         createAt: undefined,
@@ -209,6 +220,18 @@ export default {
       this.open = true;
       this.title = "添加";
     },
+    // 用户状态修改
+    handleStatusChange(row) {
+      let text = row.status === CommonStatusEnum.ENABLE ? "启用" : "停用";
+      this.$modal.confirm('确认要' + text + '"' + row.titleZh + '"吗?').then(function() {
+        return changeUserStatus(row.id, row.status);
+      }).then(() => {
+        this.$modal.msgSuccess(text + "成功");
+      }).catch(function() {
+        row.status = row.status === CommonStatusEnum.ENABLE ? CommonStatusEnum.DISABLE
+          : CommonStatusEnum.ENABLE;
+      });
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();

src/views/ecw/unit/index.vue

@@ -14,7 +14,7 @@
       </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择0显示 1不显示" clearable size="small">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
+          <el-option v-for="dict in statusDictDatas"
                        :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
@@ -50,9 +50,9 @@
       <el-table-column label="中文名称" align="center" prop="titleZh" />
       <el-table-column label="英文名称" align="center" prop="titleEn" />
       <el-table-column label="单位符号" align="center" prop="fuhao" />
-      <el-table-column label="状态" align="center" prop="status">
+      <el-table-column label="状态" align="center" prop="show" >
         <template slot-scope="scope">
-          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+          <el-switch v-model="scope.row.status" :active-value="0" :inactive-value="1" @change="handleStatusChange(scope.row)" />
         </template>
       </el-table-column>
       <el-table-column label="排序" align="center" prop="aorder" />
@@ -86,12 +86,12 @@
         <el-form-item label="单位符号" prop="fuhao">
           <el-input v-model="form.fuhao" placeholder="请输入单位符号" />
         </el-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-radio-group v-model="form.status">
-            <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
-                      :key="dict.value" :label="parseInt(dict.value)">{{dict.label}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
+<!--        <el-form-item label="状态" prop="status">-->
+<!--          <el-radio-group v-model="form.status">-->
+<!--            <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"-->
+<!--                      :key="dict.value" :label="parseInt(dict.value)">{{dict.label}}</el-radio>-->
+<!--          </el-radio-group>-->
+<!--        </el-form-item>-->
         <el-form-item label="排序" prop="aorder">
           <el-input v-model="form.aorder" placeholder="请输入排序" />
         </el-form-item>
@@ -109,6 +109,9 @@
 
 <script>
 import { createUnit, updateUnit, deleteUnit, getUnit, getUnitPage, exportUnitExcel } from "@/api/ecw/unit";
+import {DICT_TYPE, getDictDatas} from "@/utils/dict";
+import {CommonStatusEnum} from "@/utils/constants";
+import {changeUserStatus} from "@/api/system/user";
 
 export default {
   name: "Unit",
@@ -145,7 +148,9 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS),
+
     };
   },
   created() {
@@ -194,6 +199,18 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    // 用户状态修改
+    handleStatusChange(row) {
+      let text = row.status === CommonStatusEnum.ENABLE ? "启用" : "停用";
+      this.$modal.confirm('确认要' + text + '"' + row.titleZh + '"吗?').then(function() {
+        return changeUserStatus(row.id, row.status);
+      }).then(() => {
+        this.$modal.msgSuccess(text + "成功");
+      }).catch(function() {
+        row.status = row.status === CommonStatusEnum.ENABLE ? CommonStatusEnum.DISABLE
+          : CommonStatusEnum.ENABLE;
+      });
+    },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();

src/views/login.vue

@@ -63,7 +63,7 @@ export default {
     return {
       codeUrl: "",
       captchaEnable: true,
-      tenantEnable: true,
+      tenantEnable: false,
       loginForm: {
         username: "admin",
         password: "admin123",