diff --git a/src/api/accounts.js b/src/api/accounts.js
index 8021034..d18a35f 100644
--- a/src/api/accounts.js
+++ b/src/api/accounts.js
@@ -9,6 +9,12 @@
// +----------------------------------------------------------------------
import request from './request'
+/**
+ * @description 银行卡审核 -- 删除
+ */
+export function delApi(id) {
+ return request.post('merchant/intention/del/' + id)
+}
/**
* @description 银行卡审核 -- 修改 /sys/merchant/intention/edit/155
@@ -209,6 +215,14 @@ export function transferReviewApi(id, data) {
export function transferMarkApi(id) {
return request.get(`financial/mark/${id}/form`)
}
+
+/**
+ * @description 申请转账 -- 驳回
+ */
+export function refuseApi(id, data) {
+ return request.post(`financial/refuse/${id}`, data)
+}
+
/**
* @description 申请转账 -- 转账
*/
diff --git a/src/views/accounts/auditRecord/index.vue b/src/views/accounts/auditRecord/index.vue
index 5287d19..f042fa9 100644
--- a/src/views/accounts/auditRecord/index.vue
+++ b/src/views/accounts/auditRecord/index.vue
@@ -82,6 +82,7 @@
@click="transferMark(scope.row, 1)">审核
修改
查看
+ 删除
@@ -173,7 +174,7 @@
// +----------------------------------------------------------------------
import { merSelectApi } from '@/api/product'
import { bankListApi, bandAuditApi, editApi } from "@/api/accounts";
-import { transferRecordApi, transferDetailApi, transferReviewApi, transferEditApi, transferMarkApi, transferHeaderDataApi, transferRecordsExportApi } from '@/api/accounts'
+import { delApi, transferRecordApi, transferDetailApi, transferReviewApi, transferEditApi, transferMarkApi, transferHeaderDataApi, transferRecordsExportApi } from '@/api/accounts'
import createWorkBook from '@/utils/newToExcel.js';
import timeOptions from '@/utils/timeOptions';
export default {
@@ -293,7 +294,30 @@ export default {
if (type == 1) this.title = '审核';
if (type == 2) this.title = '修改';
if (type == 3) this.title = '查看';
+ },
+ // 删除
+ onDel(item) {
+ this.$confirm('您确定要删除商户名称为 "' + item.merchantInfo.mer_name + '" 的" ' + (item.is_own == 1 ? '对公账户' : "法人账户") + '" 吗?', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ delApi(item.id).then(res => {
+ this.$message.success('操作成功!');
+ this.getList();
+ }).catch((ree) => {
+ this.$message({
+ type: 'info',
+ message: ree
+ });
+ });
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '已取消删除'
+ });
+ });
},
// 具体日期
diff --git a/src/views/accounts/transferRecord/index.vue b/src/views/accounts/transferRecord/index.vue
index f681ecc..2a4c0bc 100644
--- a/src/views/accounts/transferRecord/index.vue
+++ b/src/views/accounts/transferRecord/index.vue
@@ -3,27 +3,12 @@
-
+
-
+
@@ -31,42 +16,20 @@
-
-
+
+
-
+
-
+
@@ -74,29 +37,14 @@
-
-
-
+
+
+
-
+
搜索
@@ -104,39 +52,35 @@
-
+
导出列表
-
+
-
- {{ scope.$index+(tableFrom.page - 1) * tableFrom.limit + 1 }}
-
+
+ {{ scope.$index + (tableFrom.page - 1) * tableFrom.limit + 1 }}
+
- {{ scope.row.merchant .is_trader ? '自营' : '非自营' }}
+ {{ scope.row.merchant.is_trader ? '自营' : '非自营' }}
-
+
{{ scope.row.merchant ? scope.row.merchant.mer_name : '' }}
-
+
- {{scope.row.financial_type == 1 ? '银行' : scope.row.financial_type == 2 ? '微信' : '支付宝' }}
+ {{ scope.row.financial_type == 1 ? '银行' : scope.row.financial_type ==
+ 2
+ ? '微信' : '支付宝' }}
--
@@ -154,57 +98,83 @@
{{ scope.row.financial_status == 1 ? '已到账' : '未到账' }}
-
+
- 审核
- 转账
- 转账信息
+ 审核
+ 转账
+ 转账信息
+ 驳回
备注
-
+
-
+
商户信息
-
{{ transferData.merchant && transferData.merchant.mer_name }}
-
{{ transferData.merchant && transferData.merchant.mer_id }}
+
{{ transferData.merchant &&
+ transferData.merchant.mer_name
+ }}
+
{{ transferData.merchant &&
+ transferData.merchant.mer_id }}
+
{{ transferData.mer_money }}
-
{{ transferData.financial_type == 1 ? '银行卡' : transferData.financial_type == 2 ? '微信' : '支付宝' }}
-
{{ transferData.financial_account.bank }}
-
{{ transferData.financial_account.bank_code }}
-
{{ transferData.financial_account.name }}
-
{{ transferData.financial_account.bank_branch }}
-
{{ transferData.financial_account.name }}
+
{{ transferData.financial_type == 1 ? '银行卡' :
+ transferData.financial_type == 2 ? '微信' : '支付宝' }}
+
{{
+ transferData.financial_account.bank }}
+
{{
+ transferData.financial_account.bank_code }}
+
{{
+ transferData.financial_account.name }}
+
{{
+ transferData.financial_account.bank_branch }}
+
{{
+ transferData.financial_account.name }}
收款信息
-
{{ transferData.financial_account.wechat }}
-
![]()
-
{{ transferData.financial_account.alipay }}
-
![]()
-
{{ transferData.extract_money }}
-
{{ transferData.status == 0 ? '待审核' : transferData.status == 1 ? '已审核' : '审核失败' }}
-
{{ transferData.status_time }}
-
{{ transferData.refusal }}
+
{{
+ transferData.financial_account.wechat }}
+
![]()
+
{{
+ transferData.financial_account.alipay }}
+
![]()
+
{{
+ transferData.extract_money
+ }}
+
{{ transferData.status
+ == 0
+ ? '待审核' : transferData.status == 1 ? '已审核' : '审核失败' }}
+
{{
+ transferData.status_time
+ }}
+
{{
+ transferData.refusal
+ }}
通过
@@ -216,8 +186,9 @@
-
-
![]()
+
+
@@ -231,15 +202,17 @@
-