原因：{{ scope.row.refusal }} @@ -203,199 +121,119 @@
-
-
- {{ transferData.merchant && transferData.merchant.mer_name }}
+ {{ transferData.merchant && transferData.merchant.mer_name }}
- {{ transferData.merchant && transferData.merchant.mer_id }}
+ {{ transferData.merchant && transferData.merchant.mer_id }}
{{ transferData.mer_money }}
- {{
- transferData.financial_type == 1
- ? "银行卡"
- : transferData.financial_type == 2
- ? "微信"
- : "支付宝"
- }}
+ {{
+ transferData.financial_type == 1
+ ? "银行卡"
+ : transferData.financial_type == 2
+ ? "微信"
+ : "支付宝"
+ }}
- {{ transferData.financial_account.name }}
+ {{ transferData.financial_account.name }}
- {{ transferData.financial_account.bank_code }}
+ {{ transferData.financial_account.bank_code }}
- {{ transferData.financial_account.name }}
+ {{ transferData.financial_account.name }}
- {{ transferData.financial_account.bank }}
+ {{ transferData.financial_account.bank }}
- {{ transferData.financial_account.bank_branch }}
+ {{ transferData.financial_account.bank_branch }}
- {{ transferData.financial_account.wechat }}
+ {{ transferData.financial_account.wechat }}
- ![]()
微信收款二维码：![]()
+ return false;
+ " :src="transferData.financial_account.wechat_code" />
- {{ transferData.financial_account.alipay }}
+ {{ transferData.financial_account.alipay }}
- ![]()
支付宝收款二维码：![]()
+ return false;
+ " :src="transferData.financial_account.alipay_code" />
- {{ transferData.extract_money }}
+ {{ transferData.extract_money }}
- {{
- transferData.status == 0
- ? "待审核"
- : transferData.status == 1
- ? "已审核"
- : "审核失败"
- }}
+ {{
+ transferData.status == 0
+ ? "待审核"
+ : transferData.status == 1
+ ? "已审核"
+ : "审核失败"
+ }}
{{ transferData.status_time }}
- {{ transferData.refusal }}
+ {{ transferData.refusal }}
-
+
![]()
@@ -445,14 +271,14 @@
// | Author: CRMEB Team
// +----------------------------------------------------------------------
import { merSelectApi } from '@/api/product'
-import { transferRecordApi, transferDetailApi, transferReviewApi, transferEditApi, transferMarkApi, transferHeaderDataApi, transferRecordsExportApi } from '@/api/accounts'
+import { transferRecordApi, transferDetailApi, transferReviewApi, transferEditApi, transferMarkApi, transferHeaderDataApi, transferRecordsExportApi, transferBill } from '@/api/accounts'
import cardsData from "@/components/cards/index";
import createWorkBook from '@/utils/newToExcel.js';
import fileList from '@/components/exportFile/fileList'
export default {
components: { cardsData, fileList },
name: 'transferRecord',
- data () {
+ data() {
return {
type: '',
tableData: {
@@ -514,7 +340,7 @@ export default {
},
}
},
- mounted () {
+ mounted() {
this.getList(1);
this.getMerSelect();
this.getHeaderData();
@@ -522,7 +348,7 @@ export default {
methods: {
// 商户列表；
- getMerSelect () {
+ getMerSelect() {
merSelectApi()
.then((res) => {
this.merSelect = res.data;
@@ -532,7 +358,7 @@ export default {
});
},
// 头部数据
- getHeaderData () {
+ getHeaderData() {
transferHeaderDataApi().then((res) => {
this.cardLists = res.data
})
@@ -541,7 +367,7 @@ export default {
});
},
// 转账信息
- transferDetail (id, num) {
+ transferDetail(id, num) {
if (num) this.voucher_image = []
transferDetailApi(id).then(res => {
this.listLoading = false;
@@ -560,12 +386,12 @@ export default {
})
},
//获取支付二维码
- getPicture (url) {
+ getPicture(url) {
this.pictureVisible = true;
this.pictureUrl = url;
},
// 审核
- transferReview (id) {
+ transferReview(id) {
let parmas = {
status: this.formValidate.status,
refusal: this.formValidate.refusal
@@ -582,11 +408,11 @@ export default {
},
// 备注
- transferMark (id) {
+ transferMark(id) {
this.$modalForm(transferMarkApi(id)).then(() => this.getList('1'))
},
// 转账提交
- onSubmit (id) {
+ onSubmit(id) {
if (this.voucher_image == 0) {
return this.$message.error('请上传转账凭证！')
} else {
@@ -601,7 +427,7 @@ export default {
},
// 点击商品图
- modalPicTap (tit, num, i) {
+ modalPicTap(tit, num, i) {
const _this = this;
const attr = [];
this.$modalUpload(function (img) {
@@ -616,23 +442,42 @@ export default {
}
}, tit);
},
- handleRemove (i) {
+ handleRemove(i) {
this.voucher_image.splice(i, 1);
},
// 选择时间
- selectChange (tab) {
+ selectChange(tab) {
this.tableFrom.date = tab
this.timeVal = []
this.getList(1)
},
// 具体日期
- onchangeTime (e) {
+ onchangeTime(e) {
this.timeVal = e
this.tableFrom.date = e ? this.timeVal.join('-') : ''
this.getList(1)
},
- async exports () {
+
+ // 转账单
+ async exportBill() {
+ let excelData = JSON.parse(JSON.stringify(this.tableFrom)), data = []
+ excelData.page = 1
+ let pageCount = 1
+ let lebData = {};
+ for (let i = 0; i < pageCount; i++) {
+ lebData = await this.downData(excelData, 1)
+ pageCount = Math.ceil(lebData.count / excelData.limit)
+ if (lebData.export.length) {
+ data = data.concat(lebData.export)
+ excelData.page++
+ }
+ }
+ createWorkBook(lebData.header, lebData.title, data, lebData.foot, lebData.filename);
+ return
+ },
+
+ async exports() {
let excelData = JSON.parse(JSON.stringify(this.tableFrom)), data = []
excelData.page = 1
let pageCount = 1
@@ -648,16 +493,24 @@ export default {
createWorkBook(lebData.header, lebData.title, data, lebData.foot, lebData.filename);
return
},
+
/**订单列表 */
- downData (excelData) {
+ downData(excelData, type) {
return new Promise((resolve, reject) => {
- transferRecordsExportApi(excelData).then((res) => {
- return resolve(res.data)
- })
+ if (type == 1) {
+ transferBill(excelData).then((res) => {
+ return resolve(res.data)
+ })
+ } else {
+ transferRecordsExportApi(excelData).then((res) => {
+ return resolve(res.data)
+ })
+ }
})
},
+
// 导出
- exportRecord () {
+ exportRecord() {
transferRecordsExportApi(this.tableFrom)
.then((res) => {
/*this.$message.success(res.message)
@@ -680,11 +533,11 @@ export default {
})
},
// 导出列表
- getExportFileList () {
+ getExportFileList() {
this.$refs.exportList.exportFileList()
},
// 列表
- getList (num) {
+ getList(num) {
this.listLoading = true
this.tableFrom.page = num ? num : this.tableFrom.page;
transferRecordApi(this.tableFrom)
@@ -698,16 +551,16 @@ export default {
this.listLoading = false
})
},
- pageChange (page) {
+ pageChange(page) {
this.tableFrom.page = page
this.getList()
},
- handleSizeChange (val) {
+ handleSizeChange(val) {
this.tableFrom.limit = val
this.getList()
},
- handleClose () {
+ handleClose() {
this.dialogLogistics = false
},
}
@@ -718,14 +571,17 @@ export default {
/deep/ .el-dialog__title {
font-weight: bold;
}
+
.selWidth {
width: 300px;
}
+
.el-dropdown-link {
cursor: pointer;
color: #409eff;
font-size: 12px;
}
+
.el-icon-arrow-down {
font-size: 12px;
}
@@ -738,6 +594,7 @@ export default {
padding: 5px 0;
box-sizing: border-box;
}
+
.pictrue {
width: 60px;
height: 60px;
@@ -745,11 +602,13 @@ export default {
margin-right: 10px;
position: relative;
cursor: pointer;
+
img {
width: 100%;
height: 100%;
}
}
+
.btndel {
position: absolute;
z-index: 1;
@@ -758,10 +617,12 @@ export default {
left: 46px;
top: -4px;
}
+
.box-container {
overflow: hidden;
padding: 0 10px;
}
+
.box-container .title {
margin: 15px 0 10px;
color: #333;
@@ -773,29 +634,37 @@ export default {
float: left;
line-height: 40px;
}
+
.box-container .list .info {
display: block;
+
.el-textarea {
margin-top: 10px;
}
}
+
.box-container .list.image {
margin: 20px 0;
position: relative;
}
+
.box-container .list.image img {
position: absolute;
top: -20px;
}
+
.box-container .sp {
width: 50%;
}
+
.box-container .sp3 {
width: 33.3333%;
}
+
.box-container .sp100 {
width: 100%;
}
+
.box-container .list .name {
align-items: center;
display: inline-block;
@@ -803,9 +672,11 @@ export default {
color: #606266;
text-align: right;
}
+
.acea-row {
margin-bottom: 25px;
}
+
.pictures {
width: 100%;
max-width: 100%;
diff --git a/src/views/merchant/application/index.vue b/src/views/merchant/application/index.vue
index 50cb16b..2d57c21 100644
--- a/src/views/merchant/application/index.vue
+++ b/src/views/merchant/application/index.vue
@@ -178,6 +178,17 @@
+
+
+
+
-
-
+
+
@@ -351,14 +362,16 @@ export default {
// 修改状态
onchangeIsShow(item) {
this.statusAuditVisible = true;
- this.statusAuditForm = item;
if (item.financial_bank) {
let bi = JSON.parse(item.financial_bank);
item.bank_username = bi.bank;
item.bank_code = bi.bank_code;
item.bank_opening = bi.bank_branch;
- this.$set(item, 'image', [bi.bank_front])
+ if (bi.bank_front[0]) {
+ this.$set(item, 'image', bi.bank_front);
+ }
}
+ this.statusAuditForm = item;
this.$set(this.statusAuditForm, 'state', 1);
this.$set(this.statusAuditForm, 'create_mer', 1);
},
+
![]()
-
+
- 提交
- 提交
+ 提交
+ 提交
-
@@ -405,29 +243,17 @@
+
+