mkm/new_shop_admin_vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitea.lihaink.cn/mkm/new_shop_admin_vue

Browse Source
This commit is contained in:
weipengfei 2024-04-12 15:15:30 +08:00
commit b4bee074d1
7 changed files with 474 additions and 331 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/api/accounts.js
View File

@ -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 申请转账 -- 转账
*/

2
src/filters/commFilter.js
View File

@ -187,7 +187,7 @@ export function orderPayType(type) {
'10': '对公转账',
'11': '微信收银',
'12': '现金收款',
'13': '支付宝收款'
'13': '支付宝条码',
}
return typeMap[type]
}

53
src/views/accounts/auditRecord/index.vue
View File

@ -82,6 +82,7 @@
@click="transferMark(scope.row, 1)">审核</el-button>
<el-button type="text" size="small" @click="transferMark(scope.row, 2)">修改</el-button>
<el-button type="text" size="small" @click="transferMark(scope.row, 3)">查看</el-button>
<el-button type="text" size="small" @click="onDel(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
@ -98,8 +99,9 @@
<el-row>
<el-col :span="12">
<el-form-item label="审核状态：" prop="status"
:rules="{ required: (auditForm.status == 2 && title == '审核') , message: '审核状态不能为空', trigger: 'change' }">
<el-radio-group v-model="auditForm.status" @change="radioChange" :disabled="(title == '查看' || title == '修改')">
:rules="{ required: (title == '审核'), message: '审核状态不能为空', trigger: 'change' }">
<el-radio-group v-model="auditForm.status" @change="radioChange"
:disabled="(title == '查看' || title == '修改')">
<el-radio :label="1" class="radio">通过</el-radio>
<el-radio :label="2">拒绝</el-radio>
</el-radio-group>
@ -109,37 +111,43 @@
<el-col :span="24">
<el-form-item label="原因：" prop="fail_msg"
:rules="{ required: (auditForm.status == 2 && title == '审核') ? true : false, message: '拒绝原因不能为空', trigger: 'change' }">
<el-input type="textarea" v-model="auditForm.fail_msg" :rows="3" :disabled="title == '查看' || title == '修改'"></el-input>
<el-input type="textarea" v-model="auditForm.fail_msg" :rows="3"
:disabled="title == '查看' || title == '修改'"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="商户名称：">
<el-input v-model="transferData.merchantInfo.mer_name" placeholder="请输入商户名称" :disabled="title == '查看'"></el-input>
<el-input v-model="transferData.merchantInfo.mer_name" placeholder="请输入商户名称"
:disabled="title == '查看'"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="开户银行：">
<el-input v-model="transferData.financial_account.bank" placeholder="请输入开户银行" :disabled="title == '查看'"></el-input>
<el-input v-model="transferData.financial_account.bank" placeholder="请输入开户银行"
:disabled="title == '查看'"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="银行账号：">
<el-input v-model="transferData.financial_account.bank_code" placeholder="请输入银行账号" :disabled="title == '查看'"></el-input>
<el-input v-model="transferData.financial_account.bank_code" placeholder="请输入银行账号"
:disabled="title == '查看'"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="开户户名：">
<el-input v-model="transferData.financial_account.name" placeholder="请输入开户户名" :disabled="title == '查看'"></el-input>
<el-input v-model="transferData.financial_account.name" placeholder="请输入开户户名"
:disabled="title == '查看'"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="开户网点：">
<el-input v-model="transferData.financial_account.bank_branch" placeholder="请输入开户网点" :disabled="title == '查看'"></el-input>
<el-input v-model="transferData.financial_account.bank_branch" placeholder="请输入开户网点"
:disabled="title == '查看'"></el-input>
</el-form-item>
</el-col>
</el-row>
@ -166,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 {
@ -245,10 +253,13 @@ export default {
// 审核
transferReview(id) {
this.$refs.ruleForm.validate(valid => {
if (valid) {
this.auditForm.id = this.transferData.id;
this.auditForm.financial_account = this.transferData.financial_account;
this.auditForm.mer_id = this.transferData.mer_id;
if (this.title == '修改') {
editApi(this.auditForm).then(res => {
this.$message.success(res.message);
@ -259,6 +270,7 @@ export default {
this.$message.error(res.message)
})
} else {
if (!this.auditForm.status) return this.$message.error("请选择审核状态!");
bandAuditApi(this.auditForm).then(res => {
this.$message.success(res.message);
this.dialogVisible = false;
@ -282,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: '已取消删除'
});
});
},
// 具体日期

89
src/views/accounts/subsidy/index.vue
View File

@ -24,13 +24,7 @@
</div>
<cards-data v-if="cardLists.length > 0" :card-lists="cardLists" />
<el-card>
<el-table
v-loading="listLoading"
:data="tableData.data"
size="small"
class="table"
highlight-current-row
>
<el-table v-loading="listLoading" :data="tableData.data" size="small" class="table" highlight-current-row>
<el-table-column label="编号" min-width="80">
<template slot-scope="scope">
<span>{{ scope.row.id }}</span>
@ -44,33 +38,45 @@
<el-table-column prop="extra.official_purchase_target" label="里海云仓采购目标金额" min-width="150" />
<el-table-column prop="extra.purchase_target" label="其他店铺采购目标金额" min-width="150" />
<el-table-column prop="create_time" label="创建时间" min-width="150" sortable />
<el-table-column prop="reason" label="备注" min-width="150" sortable />
<el-table-column label="操作" min-width="150" fixed="right">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click="handleStatus(scope.row.id, scope.$index)"
>审核</el-button>
</template>
<template slot-scope="scope">
<router-link v-if="scope.row.send_status == 0" :to=" { path:`${roterPre}` + '/order/list?order_sn='+scope.row.order_sn } ">
<el-button type="text" size="small" class="mr10">修改</el-button>
</router-link>
<el-button v-if="scope.row.send_status == 0" type="text" size="small"
@click="handleStatus(scope.row.id, scope.$index)">审核</el-button>
<el-button type="text" size="small" class="mr10" @click="showDialog(scope.row)">修改</el-button>
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
background
:page-size="tableFrom.limit"
:current-page="tableFrom.page"
layout="total, prev, pager, next, jumper"
:total="tableData.total"
@size-change="handleSizeChange"
@current-change="pageChange"
/>
<el-pagination background :page-size="tableFrom.limit" :current-page="tableFrom.page"
layout="total, prev, pager, next, jumper" :total="tableData.total" @size-change="handleSizeChange"
@current-change="pageChange" />
</div>
</el-card>
<el-dialog title="修改数据" :visible.sync="dialogVisible">
<el-form ref="editForm" :model="formData" label-width="160px" :rules="rules">
<el-form-item label="销售目标金额">
<el-input type="number" readonly v-model="formData.extra.sale_target" placeholder="销售目标金额" />
</el-form-item>
<el-form-item label="里海云仓采购目标金额">
<el-input type="number" readonly v-model="formData.extra.official_purchase_target" placeholder="里海云仓采购目标金额" />
</el-form-item>
<el-form-item label="其他店铺采购目标金额">
<el-input type="number" readonly v-model="formData.extra.purchase_target" placeholder="其他店铺采购目标金额" />
</el-form-item>
<el-form-item label="重新审核说明">
<el-input type="number" readonly v-model="formData.reason" placeholder="重新审核说明" />
</el-form-item>
<el-form-item label="补贴金额" prop="amount">
<el-input type="number" v-model="formData.amount" placeholder="请输入补贴金额" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button @click="updateInfo" type="primary">确 认</el-button>
</div>
</el-dialog>
<!-- <editForm ref="editForm" @complete="fetchData"></editForm> -->
</div>
</template>
@ -94,6 +100,7 @@ export default {
data: [],
total: 0
},
dialogVisible: false,
roterPre: roterPre,
listLoading: true,
tableFrom: {
@ -106,12 +113,39 @@ export default {
fromList: fromList,
options: [],
cardLists: [],
formData: {
extra: {}
},
rules: {
amount: [{
required: true,
message: '请输入补贴金额',
tigger: 'blur'
}]
}
}
},
mounted() {
this.getList()
},
methods: {
showDialog(row) {
this.formData = { ...row };
this.dialogVisible = true;
},
updateInfo() {
this.$refs.editForm.validate((valid) => {
if (valid) {
subsidyUpdateApi(this.formData).then(res => {
this.$message.success(res.message);
this.dialogVisible = false;
this.getList()
}).catch(res => {
this.$message.error(res.message);
})
}
})
},
/**重置 */
searchReset() {
this.timeVal = []
@ -183,5 +217,4 @@ export default {
}
</script>
<style scoped>
</style>
<style scoped></style>

228
src/views/accounts/transferRecord/index.vue
View File

@ -3,27 +3,12 @@
<div class="selCard mb14">
<el-form :model="tableFrom" ref="searchForm" size="small" inline label-width="85px">
<el-form-item label="时间选择：">
<el-date-picker
v-model="timeVal"
value-format="yyyy/MM/dd"
format="yyyy/MM/dd"
size="small"
type="daterange"
placement="bottom-end"
placeholder="自定义时间"
style="width: 280px;"
:picker-options="pickerOptions"
@change="onchangeTime"
/>
<el-date-picker v-model="timeVal" value-format="yyyy/MM/dd" format="yyyy/MM/dd" size="small" type="daterange"
placement="bottom-end" placeholder="自定义时间" style="width: 280px;" :picker-options="pickerOptions"
@change="onchangeTime" />
</el-form-item>
<el-form-item label="审核状态：" prop="status">
<el-select
v-model="tableFrom.status"
clearable
placeholder="请选择"
class="selWidth"
@change="getList(1)"
>
<el-select v-model="tableFrom.status" clearable placeholder="请选择" class="selWidth" @change="getList(1)">
<el-option label="全部" value="" />
<el-option label="待审核" value="0" />
<el-option label="已审核" value="1" />
@ -31,42 +16,20 @@
</el-select>
</el-form-item>
<el-form-item label="商户名称：" prop="mer_id">
<el-select
v-model="tableFrom.mer_id"
clearable
filterable
placeholder="请选择"
class="selWidth"
@change="getList(1)"
>
<el-option
v-for="item in merSelect"
:key="item.mer_id"
:label="item.mer_name"
:value="item.mer_id"
/>
<el-select v-model="tableFrom.mer_id" clearable filterable placeholder="请选择" class="selWidth"
@change="getList(1)">
<el-option v-for="item in merSelect" :key="item.mer_id" :label="item.mer_name" :value="item.mer_id" />
</el-select>
</el-form-item>
<el-form-item label="商户类别：" prop="is_trader">
<el-select
v-model="tableFrom.is_trader"
clearable
placeholder="请选择"
class="selWidth"
@change="getList(1)"
>
<el-select v-model="tableFrom.is_trader" clearable placeholder="请选择" class="selWidth" @change="getList(1)">
<el-option label="自营" value="1" />
<el-option label="非自营" value="0" />
</el-select>
</el-form-item>
<el-form-item label="收款方式：" prop="financial_type">
<el-select
v-model="tableFrom.financial_type"
clearable
placeholder="请选择"
class="selWidth"
@change="getList(1)"
>
<el-select v-model="tableFrom.financial_type" clearable placeholder="请选择" class="selWidth"
@change="getList(1)">
<el-option label="全部" value="" />
<el-option label="银行卡" value="1" />
<el-option label="支付宝" value="3" />
@ -74,29 +37,14 @@
</el-select>
</el-form-item>
<el-form-item label="转账状态：" prop="financial_status">
<el-select
v-model="tableFrom.financial_status"
placeholder="请选择"
class="selWidth"
clearable
@change="getList"
>
<el-option
v-for="item in arrivalStatusList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
<el-select v-model="tableFrom.financial_status" placeholder="请选择" class="selWidth" clearable
@change="getList">
<el-option v-for="item in arrivalStatusList" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="关键字：" prop="keyword">
<el-input
v-model="tableFrom.keyword"
@keyup.enter.native="getList(1)"
placeholder="请输入管理员姓名"
class="selWidth"
size="small"
/>
<el-input v-model="tableFrom.keyword" @keyup.enter.native="getList(1)" placeholder="请输入管理员姓名" class="selWidth"
size="small" />
</el-form-item>
<el-form-item>
<el-button type="primary" size="small" @click="getList(1)">搜索</el-button>
@ -109,13 +57,7 @@
<div class="mb20">
<el-button size="small" type="primary" @click="exports">导出列表</el-button>
</div>
<el-table
v-loading="listLoading"
tooltip-effect="dark"
:data="tableData.data"
size="small"
class="table"
>
<el-table v-loading="listLoading" tooltip-effect="dark" :data="tableData.data" size="small" class="table">
<el-table-column label="序号" min-width="60">
<template scope="scope">
<span>{{ scope.$index + (tableFrom.page - 1) * tableFrom.limit + 1 }}</span>
@ -136,7 +78,9 @@
<el-table-column prop="admin_id" label="平台管理员姓名" min-width="120" />
<el-table-column label="收款方式" min-width="100">
<template slot-scope="scope">
<span v-if="scope.row.financial_type">{{scope.row.financial_type == 1 ? '银行' : scope.row.financial_type == 2 ? '微信' : '支付宝' }}</span>
<span v-if="scope.row.financial_type">{{ scope.row.financial_type == 1 ? '银行' : scope.row.financial_type ==
2
? '微信' : '支付宝' }}</span>
<span v-else>--</span>
</template>
</el-table-column>
@ -157,54 +101,80 @@
<el-table-column prop="mer_money" label="商户余额（元）" min-width="120" />
<el-table-column label="操作" min-width="180" fixed="right">
<template slot-scope="scope">
<el-button v-if="scope.row.status == 0" type="text" size="small" @click="transferDetail(scope.row.financial_id)">审核</el-button>
<el-button v-if="scope.row.status == 1 && scope.row.financial_status != 1" type="text" size="small" @click="transferDetail(scope.row.financial_id,1)">转账</el-button>
<el-button v-if="scope.row.status == 1 && scope.row.financial_status == 1" type="text" size="small" @click="transferDetail(scope.row.financial_id,0)">转账信息</el-button>
<el-button v-if="scope.row.status == 0" type="text" size="small"
@click="transferDetail(scope.row.financial_id)">审核</el-button>
<el-button v-if="scope.row.status == 1 && scope.row.financial_status != 1" type="text" size="small"
@click="transferDetail(scope.row.financial_id, 1)">转账</el-button>
<el-button v-if="scope.row.status == 1 && scope.row.financial_status == 1" type="text" size="small"
@click="transferDetail(scope.row.financial_id, 0)">转账信息</el-button>
<el-button type="text" size="small" v-if="scope.row.status == 1 && scope.row.financial_status != 1"
@click="onBackInfo(scope.row)">驳回</el-button>
<el-button type="text" size="small" @click="transferMark(scope.row.financial_id)">备注</el-button>
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
background
:page-size="tableFrom.limit"
:current-page="tableFrom.page"
layout="total, prev, pager, next, jumper"
:total="tableData.total"
@size-change="handleSizeChange"
@current-change="pageChange"
/>
<el-pagination background :page-size="tableFrom.limit" :current-page="tableFrom.page"
layout="total, prev, pager, next, jumper" :total="tableData.total" @size-change="handleSizeChange"
@current-change="pageChange" />
</div>
</el-card>
<!--转账信息-->
<el-dialog :title="transferData.status == 0 ? '审核' : '转账信息'" :visible.sync="dialogVisible" width="700px" v-if="dialogVisible">
<el-dialog :title="transferData.status == 0 ? '审核' : '转账信息'" :visible.sync="dialogVisible" width="700px"
v-if="dialogVisible">
<div class="box-container">
<el-form ref="ruleForm" size="small">
<div class="section">
<div class="title">商户信息</div>
<div class="list">
<div class="item"><label class="name">商户名称：</label>{{ transferData.merchant && transferData.merchant.mer_name }}</div>
<div class="item"><label class="name">商户ID：</label>{{ transferData.merchant && transferData.merchant.mer_id }}</div>
<div class="item"><label class="name">商户名称：</label>{{ transferData.merchant &&
transferData.merchant.mer_name
}}</div>
<div class="item"><label class="name">商户ID：</label>{{ transferData.merchant &&
transferData.merchant.mer_id }}
</div>
<div class="item"><label class="name">商户余额：</label>{{ transferData.mer_money }}</div>
<div class="item"><label class="name">商户收款方式：</label>{{ transferData.financial_type == 1 ? '银行卡' : transferData.financial_type == 2 ? '微信' : '支付宝' }}</div>
<div class="item" v-if="transferData.financial_type == 1"><label class="name">开户银行：</label>{{ transferData.financial_account.bank }}</div>
<div class="item" v-if="transferData.financial_type == 1"><label class="name">银行账号：</label>{{ transferData.financial_account.bank_code }}</div>
<div class="item" v-if="transferData.financial_type == 1"><label class="name">开户户名：</label>{{ transferData.financial_account.name }}</div>
<div class="item" v-if="transferData.financial_type == 1"><label class="name">开户网点：</label>{{ transferData.financial_account.bank_branch }}</div>
<div class="item" v-if="transferData.financial_type != 1"><label class="name">真实姓名：</label>{{ transferData.financial_account.name }}</div>
<div class="item"><label class="name">商户收款方式：</label>{{ transferData.financial_type == 1 ? '银行卡' :
transferData.financial_type == 2 ? '微信' : '支付宝' }}</div>
<div class="item" v-if="transferData.financial_type == 1"><label class="name">开户银行：</label>{{
transferData.financial_account.bank }}</div>
<div class="item" v-if="transferData.financial_type == 1"><label class="name">银行账号：</label>{{
transferData.financial_account.bank_code }}</div>
<div class="item" v-if="transferData.financial_type == 1"><label class="name">开户户名：</label>{{
transferData.financial_account.name }}</div>
<div class="item" v-if="transferData.financial_type == 1"><label class="name">开户网点：</label>{{
transferData.financial_account.bank_branch }}</div>
<div class="item" v-if="transferData.financial_type != 1"><label class="name">真实姓名：</label>{{
transferData.financial_account.name }}</div>
</div>
</div>
<div class="section">
<div class="title">收款信息</div>
<div class="list">
<div class="item" v-if="transferData.financial_type == 2"><label class="name">微信号：</label>{{ transferData.financial_account.wechat }}</div>
<div class="item image" v-if="transferData.financial_type == 2"><label class="name">微信收款二维码：</label><img style="max-width: 150px; height: 80px;" @click="getPicture(transferData.financial_account.wechat_code);return false;" :src="transferData.financial_account.wechat_code"/></div>
<div class="item" v-if="transferData.financial_type == 3"><label class="name">支付宝账号：</label>{{ transferData.financial_account.alipay }}</div>
<div class="item image" v-if="transferData.financial_type == 3"><label class="name">支付宝收款二维码：</label><img style="max-width: 150px; height: 80px;" @click="getPicture(transferData.financial_account.alipay_code);return false;" :src="transferData.financial_account.alipay_code"/></div>
<div class="item"><label class="name">本次申请转账金额：</label><span class="font-red">{{ transferData.extract_money }}</span></div>
<div class="item" v-if="transferData.status != 0"><label class="name">审核状态：</label>{{ transferData.status == 0 ? '待审核' : transferData.status == 1 ? '已审核' : '审核失败' }}</div>
<div class="item" v-if="transferData.status == 1"><label class="name">审核时间：</label>{{ transferData.status_time }}</div>
<div class="item" v-if="transferData.status == -1"><label class="name">审核未通过原因：</label>{{ transferData.refusal }}</div>
<div class="item" v-if="transferData.financial_type == 2"><label class="name">微信号：</label>{{
transferData.financial_account.wechat }}</div>
<div class="item image" v-if="transferData.financial_type == 2"><label class="name">微信收款二维码：</label><img
style="max-width: 150px; height: 80px;"
@click="getPicture(transferData.financial_account.wechat_code); return false;"
:src="transferData.financial_account.wechat_code" /></div>
<div class="item" v-if="transferData.financial_type == 3"><label class="name">支付宝账号：</label>{{
transferData.financial_account.alipay }}</div>
<div class="item image" v-if="transferData.financial_type == 3"><label class="name">支付宝收款二维码：</label><img
style="max-width: 150px; height: 80px;"
@click="getPicture(transferData.financial_account.alipay_code); return false;"
:src="transferData.financial_account.alipay_code" /></div>
<div class="item"><label class="name">本次申请转账金额：</label><span class="font-red">{{
transferData.extract_money
}}</span></div>
<div class="item" v-if="transferData.status != 0"><label class="name">审核状态：</label>{{ transferData.status
== 0
? '待审核' : transferData.status == 1 ? '已审核' : '审核失败' }}</div>
<div class="item" v-if="transferData.status == 1"><label class="name">审核时间：</label>{{
transferData.status_time
}}</div>
<div class="item" v-if="transferData.status == -1"><label class="name">审核未通过原因：</label>{{
transferData.refusal
}}</div>
<el-form-item label="审核状态：" required v-if="transferData.status == 0" class="item">
<el-radio-group v-model="formValidate.status">
<el-radio :label="1" class="radio">通过</el-radio>
@ -216,7 +186,8 @@
</el-form-item>
<el-form-item label="转账凭证：" v-if="transferData.status == 1" class="item">
<div class="acea-row">
<div v-if="voucher_image.length > 0" v-for="(item,index) in voucher_image" :key="index" class="pictrue">
<div v-if="voucher_image.length > 0" v-for="(item, index) in voucher_image" :key="index"
class="pictrue">
<img :src="item" @click="getPicture(item)" />
<i class="el-icon-error btndel" @click="handleRemove(index)" />
</div>
@ -233,8 +204,10 @@
</div>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="dialogVisible = false">取消</el-button>
<el-button v-if="transferData.status == 0" type="primary" size="small" @click="transferReview(transferData.financial_id)">提交</el-button>
<el-button v-if="transferData.status == 1" type="primary" size="small" @click="onSubmit(transferData.financial_id)">提交</el-button>
<el-button v-if="transferData.status == 0" type="primary" size="small"
@click="transferReview(transferData.financial_id)">提交</el-button>
<el-button v-if="transferData.status == 1" type="primary" size="small"
@click="onSubmit(transferData.financial_id)">提交</el-button>
</span>
</el-dialog>
<!--查看二维码-->
@ -256,7 +229,7 @@
// | Author: CRMEB Team <admin@crmeb.com>
// +----------------------------------------------------------------------
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'
@ -403,6 +376,31 @@ export default {
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) {
@ -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,17 +545,21 @@ 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 {
padding: 30px 0 0;
border-bottom: none;
}
.title {
padding-left: 10px;
border-left: 3px solid var(--prev-color-primary);
@ -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,25 +582,31 @@ export default {
flex: 0 0 calc(100% / 2);
color: #606266;
}
.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 .list .name {
align-items: center;
display: inline-block;
color: #909399;
}
.pictures {
width: 100%;
max-width: 100%;

5
src/views/order/list/index.vue
View File

@ -54,6 +54,7 @@
@change="getList(1), getCardList()">
<el-option label="余额支付" value="0" />
<el-option label="微信支付" value="1" />
<el-option label="支付宝" value="2" />
<el-option label="商户余额支付" value="9" />
<el-option label="对公转账" value="10" />
<el-option label="微信收银" value="11" />
@ -176,7 +177,9 @@
</el-table-column>
<el-table-column label="支付类型" min-width="80">
<template slot-scope="scope">
<span v-if="scope.row.paid === 1">{{ scope.row.pay_type | orderPayType }}</span>
<span v-if="scope.row.pay_type == 10">对公转账</span>
<span v-else-if="scope.row.pay_type != 10 && scope.row.paid == 1">{{ scope.row.pay_type | orderPayType
}}</span>
<span v-else>--</span>
</template>
</el-table-column>

70
src/views/product/productExamine/index.vue
View File

@ -12,10 +12,10 @@
<el-option v-for="item in merSelect" :key="item.mer_id" :label="item.mer_name" :value="item.mer_id" />
</el-select>
</el-form-item>
<el-form-item label="商户类别：" prop="is_trader">
<el-select v-model="tableFrom.is_trader" clearable placeholder="请选择" class="selWidth" @change="getList(1)">
<el-option label="自营" value="1" />
<el-option label="非自营" value="0" />
<el-form-item label="店铺类型：" prop="type_id">
<el-select v-model="tableFrom.type_id" clearable filterable placeholder="请选择店铺类型" class="selWidth"
@change="getList(1)">
<el-option v-for="item in storeType" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="商品状态：" prop="us_status">
@ -221,14 +221,22 @@
<el-form-item label="排序：">
<el-input-number v-model="formValidate.rank" size="small" placeholder="请输入排序序号" style="width: 200px;" />
</el-form-item>
<el-col :span="24">
<el-form-item label="商品详情：">
<ueditor-from v-model="formValidate.content" :content="formValidate.content" />
<div class="upLoadPicBox" title="750*750px" style="display: flex;" @click="modalPicTap">
<div v-for="(item, index) in formValidate.content.image" class="pictrue details_pictrue"
@click.stop="deleteContentImg(index)" :key="index + item">
<img :src="item" :key="index" />
</div>
<div class="upLoad details_pictrue">
<i class="el-icon-camera cameraIconfont" />
</div>
</div>
</el-form-item>
</el-col>
<el-form-item style="margin-top:30px;">
<el-button type="primary" class="submission" size="small" @click="handleSubmit('formValidate')">提交</el-button>
</el-form-item>
<el-button style="margin-left:22px;" type="primary" class="submission" size="small"
@click="handleSubmit('formValidate')">提交</el-button>
</el-form>
</el-dialog>
<!--预览商品-->
@ -300,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'
@ -413,6 +424,7 @@ export default {
hot_type: '',
star: '',
date: '',
type_id: '',
svip_price_type: '',
product_id: this.$route.query.id ? this.$route.query.id : ""
},
@ -433,7 +445,8 @@ export default {
isBatch: false,
labelForm: {},
recommendForm: {},
drawer: false
drawer: false,
storeType: []
}
},
mounted() {
@ -441,10 +454,30 @@ 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;
this.$modalUpload(function (img) {
that.formValidate.content.image = that.formValidate.content.image.concat(img);
}, 10);
},
// 删除详情图片
deleteContentImg(index) {
this.formValidate.content.image.splice(index, 1)
},
tableRowClassName({ row, rowIndex }) {
if (this.product_id == row.product_id) {
return "success-row"
@ -562,7 +595,7 @@ export default {
content: info.content,
store_name: info.store_name,
rank: info.rank,
star: info.star
star: info.star ? info.star : 0
}
if (info.is_benefit === 1) this.checkboxGroup.push('is_benefit')
if (info.is_hot === 1) this.checkboxGroup.push('is_hot')
@ -586,7 +619,6 @@ export default {
},
// 提交
handleSubmit(name) {
console.log(this.formValidate)
this.$refs[name].validate((valid) => {
if (valid) {
productUpdateApi(this.productId, this.formValidate).then(async res => {
@ -783,6 +815,20 @@ export default {
</script>
<style lang="scss" scoped>
.pictrue {
width: 60px;
height: 60px;
border: 1px dotted rgba(0, 0, 0, 0.1);
margin-right: 10px;
position: relative;
cursor: pointer;
img {
width: 100%;
height: 100%;
}
}
/deep/.el-select-dropdown__item {
max-width: 350px !important;
}