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 @@
- +
导出列表
- + - + - + - + @@ -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 @@
- - 取消 - 提交 - 提交 + + 取消 + 提交 + 提交 - + @@ -256,7 +229,7 @@ // | Author: CRMEB Team // +---------------------------------------------------------------------- import { merSelectApi } from '@/api/product' -import { transferRecordApi, transferDetailApi, transferReviewApi, transferEditApi, transferMarkApi, transferHeaderDataApi, transferRecordsExportApi } from '@/api/accounts' +import { refuseApi, transferRecordApi, transferDetailApi, transferReviewApi, transferEditApi, transferMarkApi, transferHeaderDataApi, transferRecordsExportApi } from '@/api/accounts' import cardsData from "@/components/cards/index"; import createWorkBook from '@/utils/newToExcel.js'; import fileList from '@/components/exportFile/fileList' @@ -334,7 +307,7 @@ export default { }, methods: { /**重置 */ - searchReset(){ + searchReset() { this.timeVal = [] this.tableFrom.date = "" this.$refs.searchForm.resetFields() @@ -351,45 +324,45 @@ export default { }); }, // 头部数据 - getHeaderData(){ + getHeaderData() { transferHeaderDataApi().then((res) => { this.cardLists = res.data }) - .catch((res) => { - this.$message.error(res.message); - }); + .catch((res) => { + this.$message.error(res.message); + }); }, // 转账信息 - transferDetail(id,num){ - if(num) this.voucher_image = [] + transferDetail(id, num) { + if (num) this.voucher_image = [] transferDetailApi(id).then(res => { this.listLoading = false; this.dialogVisible = true; this.transferData = res.data this.formValidate.status = res.data.status - if(num){ + if (num) { this.voucher_image = [] - }else{ - this.voucher_image = res.data.image + } else { + this.voucher_image = res.data.image } }) - .catch(res => { - this.listLoading = false; - this.$message.error(res.message) - }) + .catch(res => { + this.listLoading = false; + this.$message.error(res.message) + }) }, //获取支付二维码 - getPicture(url){ + getPicture(url) { this.pictureVisible = true; this.pictureUrl = url; }, // 审核 - transferReview(id){ + transferReview(id) { let parmas = { status: this.formValidate.status, refusal: this.formValidate.refusal } - transferReviewApi(id,parmas).then(res => { + transferReviewApi(id, parmas).then(res => { this.listLoading = false; this.$message.success(res.message); this.dialogVisible = false; @@ -400,24 +373,49 @@ export default { }) }, // 备注 - transferMark(id){ + transferMark(id) { this.$modalForm(transferMarkApi(id)).then(() => this.getList('1')) }, + + // 驳回 + onBackInfo(item) { + this.$confirm('您确定要驳回商户名称为 "' + item.merchant.mer_name + '" 的"提现申请吗?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + transferReviewApi(item.financial_id, { status: 0 }).then(res => { + this.$message.success('操作成功!'); + this.getList(); + }).catch((ree) => { + this.$message({ + type: 'info', + message: ree + }); + }); + }).catch(() => { + this.$message({ + type: 'info', + message: '已取消删除' + }); + }); + }, + // 转账提交 - onSubmit(id){ - if(this.voucher_image == 0){ + onSubmit(id) { + if (this.voucher_image == 0) { return this.$message.error('请上传转账凭证!') - }else{ - transferEditApi(id,{image: this.voucher_image}).then(res => { - this.$message.success(res.message) - this.dialogVisible = false; - this.getList(1); + } else { + transferEditApi(id, { image: this.voucher_image }).then(res => { + this.$message.success(res.message) + this.dialogVisible = false; + this.getList(1); }).catch(res => { this.$message.error(res.message) }) } }, - // 点击商品图 + // 点击商品图 modalPicTap(tit, num, i) { const _this = this; const attr = []; @@ -425,9 +423,9 @@ export default { if (tit === "2" && !num) { img.map((item) => { attr.push(item.attachment_src); - _this.voucher_image.push(item); - if(_this.voucher_image.length > 6){ - _this.voucher_image.length = 6 + _this.voucher_image.push(item); + if (_this.voucher_image.length > 6) { + _this.voucher_image.length = 6 } }); } @@ -449,13 +447,13 @@ export default { let lebData = {}; for (let i = 0; i < pageCount; i++) { lebData = await this.downData(excelData) - pageCount = Math.ceil(lebData.count/excelData.limit) + 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); + createWorkBook(lebData.header, lebData.title, data, lebData.foot, lebData.filename); return }, /**订单列表 */ @@ -532,11 +530,13 @@ export default { margin-right: 10px; position: relative; cursor: pointer; + img { width: 100%; height: 100%; } } + .btndel { position: absolute; z-index: 1; @@ -545,18 +545,22 @@ export default { left: 46px; top: -4px; } + .box-container { overflow: hidden; padding: 0 10px; } + .section { padding: 15px 0 30px; border-bottom: 1px dashed #eeeeee; - &:last-child{ + + &:last-child { padding: 30px 0 0; border-bottom: none; } - .title{ + + .title { padding-left: 10px; border-left: 3px solid var(--prev-color-primary); font-size: 14px; @@ -565,10 +569,12 @@ export default { font-weight: bold; } } + .box-container .list { display: flex; flex-wrap: wrap; } + .box-container .item { margin-top: 16px; font-size: 13px; @@ -576,26 +582,32 @@ export default { flex: 0 0 calc(100% / 2); color: #606266; } -.box-container .list .info{ + +.box-container .list .info { display: block; - .el-textarea{ - margin-top: 10px; + + .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 .list .name { align-items: center; display: inline-block; color: #909399; } -.pictures{ + +.pictures { width: 100%; max-width: 100%; } diff --git a/src/views/product/productExamine/index.vue b/src/views/product/productExamine/index.vue index c4b423b..8c28d95 100644 --- a/src/views/product/productExamine/index.vue +++ b/src/views/product/productExamine/index.vue @@ -12,10 +12,10 @@ - - - - + + + @@ -308,6 +308,9 @@ import { batchesOnOffApi, outportApi } from '@/api/product' +import { + getstoreTypeApi, +} from "@/api/merchant"; import { roterPre } from '@/settings' import infoFrom from './info' import ueditorFrom from '@/components/ueditorFrom' @@ -421,6 +424,7 @@ export default { hot_type: '', star: '', date: '', + type_id: '', svip_price_type: '', product_id: this.$route.query.id ? this.$route.query.id : "" }, @@ -441,7 +445,8 @@ export default { isBatch: false, labelForm: {}, recommendForm: {}, - drawer: false + drawer: false, + storeType: [] } }, mounted() { @@ -449,9 +454,18 @@ export default { this.getList('') this.getCategorySelect() this.getLstFilterApi() - this.getLabelLst() + this.getLabelLst(); + this.getStoreType(); }, methods: { + + /**获取店铺类型 */ + getStoreType() { + getstoreTypeApi().then(res => { + this.storeType = res.data + }) + }, + // 点击商品图 modalPicTap() { let that = this;