充值

src/api/business/accRecharge.js

+import request from '@/utils/request'
+
+// 查询账户充值记录列表
+export function listAccRecharge(query) {
+  return request({
+    url: '/business/accRecharge/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询账户充值记录所有列表
+export function listAllAccRecharge(query) {
+  return request({
+    url: '/business/accRecharge/listAll',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询账户充值记录详细
+export function getAccRecharge(id) {
+  return request({
+    url: '/business/accRecharge/getInfo/' + id,
+    method: 'get'
+  })
+}
+
+// 新增账户充值记录
+export function addAccRecharge(data) {
+  return request({
+    url: '/business/accRecharge/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改账户充值记录
+export function updateAccRecharge(data) {
+  return request({
+    url: '/business/accRecharge/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除账户充值记录
+export function delAccRecharge(id) {
+  return request({
+    url: '/business/accRecharge/remove/' + id,
+    method: 'get'
+  })
+}

src/views/business/accRecharge/index.vue

+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
+      <el-form-item label="付款账户" prop="payerAccNo">
+        <acc-select v-model="queryParams.payerAccNo"></acc-select>
+      </el-form-item>
+      <el-form-item label="收款账户" prop="payeeAccNo">
+        <acc-select v-model="queryParams.payeeAccNo"></acc-select>
+      </el-form-item>
+      <el-form-item label="支付状态" prop="payStatus">
+        <el-select v-model="queryParams.payStatus" placeholder="请选择支付状态" @change="handleQuery" clearable>
+          <el-option v-for="dict in dict.type.pay_status" :key="dict.value" :label="dict.label"
+                     :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="订单号" prop="orderNo">
+        <el-input
+          v-model="queryParams.orderNo"
+          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>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['business:accRecharge:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="accRechargeList" @selection-change="handleSelectionChange">
+      <el-table-column label="订单号" align="center" prop="orderNo" />
+      <el-table-column label="付款账户" align="center" prop="payerAccNo" />
+      <el-table-column label="收款账户" align="center" prop="payeeAccNo" />
+      <el-table-column label="充值金额" align="center" prop="amount" />
+      <el-table-column label="订单状态" align="center" prop="payStatus" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button v-if="scope.row.payStatus && 4 === scope.row.payStatus && scope.row.failReason"
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['business:accRecharge:edit']"
+          >失败原因</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+  </div>
+</template>
+
+<script>
+import { listAccRecharge, getAccRecharge, delAccRecharge, addAccRecharge, updateAccRecharge } from "@/api/business/accRecharge";
+import AccSelect from '@/views/business/accInfo/accSelect.vue'
+
+export default {
+  name: "AccRecharge",
+  components: { AccSelect },
+  dicts: ['pay_status'],
+  data() {
+    return {
+      // 根路径
+      baseURL: process.env.VUE_APP_BASE_API,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 账户充值记录表格数据
+      accRechargeList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        payerAccNo: null,
+        payeeAccNo: null,
+        amount: null,
+        orderNo: null,
+        payStatus: null,
+        failReason: null,
+        deptId: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        id: [
+          { required: true, message: "$comment不能为空", trigger: "blur" }
+        ],
+        payerAccNo: [
+          { required: true, message: "付款账户不能为空", trigger: "blur" }
+        ],
+        payeeAccNo: [
+          { required: true, message: "收款账户不能为空", trigger: "blur" }
+        ],
+        amount: [
+          { required: true, message: "充值金额不能为空", trigger: "blur" }
+        ],
+        orderNo: [
+          { required: true, message: "订单号不能为空", trigger: "blur" }
+        ],
+        payStatus: [
+          { required: true, message: "订单状态不能为空", trigger: "blur" }
+        ],
+        failReason: [
+          { required: true, message: "失败原因不能为空", trigger: "blur" }
+        ],
+        deptId: [
+          { required: true, message: "所属部门不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询账户充值记录列表 */
+    getList() {
+      this.loading = true;
+      listAccRecharge(this.queryParams).then(response => {
+        this.accRechargeList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        payerAccNo: null,
+        payeeAccNo: null,
+        amount: null,
+        orderNo: null,
+        payStatus: 0,
+        failReason: null,
+        deptId: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加账户充值记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getAccRecharge(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改账户充值记录";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateAccRecharge(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addAccRecharge(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除账户充值记录编号为"' + ids + '"的数据项？').then(function() {
+        return delAccRecharge(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('business/accRecharge/export', {
+        ...this.queryParams
+      }, `accRecharge_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/business/payOrder/index.vue

@@ -39,8 +39,8 @@
                      :value="dict.value" />
         </el-select>
       </el-form-item>
-      <el-form-item label="支付状态" prop="payTitle">
-        <el-select v-model="queryParams.payTitle" placeholder="请选择支付状态" @change="handleQuery" clearable>
+      <el-form-item label="支付状态" prop="payStatus">
+        <el-select v-model="queryParams.payStatus" placeholder="请选择支付状态" @change="handleQuery" clearable>
           <el-option v-for="dict in dict.type.pay_status" :key="dict.value" :label="dict.label"
                      :value="dict.value" />
         </el-select>

src/views/business/salaryAccount/index.vue

@@ -34,7 +34,7 @@
                                                 账户：({{ ele.companyName }})
                                             </el-col>
                                             <el-col :span="8">
-                                                <el-button type="info" plain>账户详情</el-button>
+                                                <el-button type="info" @click="viewDetail(ele)" plain>账户详情</el-button>
                                             </el-col>
                                         </el-row>
                                     </div>
@@ -71,8 +71,8 @@
                                 </div>
                                 <div style="width: 90%;">
                                     <el-row>
-                                        <el-col :span="12"><el-button style="width:120px;" type="primary"
-                                                plain>账单查询</el-button></el-col>
+<!--                                        <el-col :span="12"><el-button style="width:120px;" type="primary"-->
+<!--                                                plain @click>账单查询</el-button></el-col>-->
                                         <el-col :span="12"><el-button style="width:120px;" type="primary" plain
                                                 @click="salarySelection(ele.payAccNo)">去发薪</el-button></el-col>
                                     </el-row>
@@ -115,7 +115,7 @@
                                                 账户：{{ ele.companyName }}
                                             </el-col>
                                             <el-col :span="8">
-                                                <el-button type="info" plain>账户详情</el-button>
+                                                <el-button type="info" @click="viewDetail(ele)" plain>账户详情</el-button>
                                             </el-col>
                                         </el-row>
                                     </div>
@@ -210,15 +210,45 @@
                 <el-button @click="aliQRCodeRechargeOpen = false">取 消</el-button>
             </div>
         </el-dialog>
+        <!-- 账户详情弹窗 -->
+      <el-dialog title="账号信息查询" :visible.sync="accDetail.panel" width="30%" center>
+        <el-descriptions :title="accDetail.companyName" :column="1" :label-style="accDetail.label_style"
+                         :contentStyle="accDetail.content_style">
+          <el-descriptions-item label="账号">{{ accDetail.info.cardNo }}</el-descriptions-item>
+          <el-descriptions-item label="户名">{{ accDetail.info.bankAccName }}</el-descriptions-item>
+          <el-descriptions-item label="银行">{{ accDetail.info.cardBank }}</el-descriptions-item>
+          <el-descriptions-item label="支行">{{ accDetail.info.cardBranch }}</el-descriptions-item>
+          <el-descriptions-item label="开户地">{{ accDetail.info.cardLocation }}</el-descriptions-item>
+          <el-descriptions-item label="联行号">{{ accDetail.info.cardDeposit }}</el-descriptions-item>
+          <!--        <el-descriptions-item label="备付金余额">{{ accountDetail.availableAmount }}</el-descriptions-item>-->
+          <el-descriptions-item label="可转账金额">{{ accDetail.info.availableTransferAmount }}</el-descriptions-item>
+          <el-descriptions-item label="可用服务费">{{ accDetail.info.availableFeeAmount }}</el-descriptions-item>
+        </el-descriptions>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="accDetail.panel = false">确 定</el-button>
+        </div>
+      </el-dialog>
     </div>
 </template>
 
 <script>
 import { listAllAccInfo, getAccAliInfo } from '@/api/business/accInfo'
+import { listAllAccInfo, getMerchantDetailsAPI, getAccAliInfo } from '@/api/business/accInfo'
 export default {
     name: 'SalaryAccount',
     data() {
         return {
+          // 账户详情
+          accDetail: {
+            content_style: {
+              'font-size': '16px',
+            },
+            label_style: {
+              'font-size': '16px',
+            },
+            panel: false,
+            info: {}
+          },
             // tab选择参数
             payType: 'first',
             // 发薪选择对话框参数
@@ -308,6 +338,18 @@ export default {
             }
             // console.log(tab, event);
             // console.log('payType', this.payType);
+        },
+      viewDetail(card) {
+          this.$modal.loading("...")
+        getAccAliInfo(card.payAccNo).then(resp => {
+          if (200 === resp.code) {
+            this.accDetail.companyName = card.companyName
+            this.accDetail.info = resp.data
+            this.accDetail.panel = true
+          }
+        }).finally(()=> {
+          this.$modal.closeLoading()
+        })
       }
     }
 }