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

入驻申请修改

Browse Source
This commit is contained in:
DESKTOP-GMUNQ1B\k 2024-02-29 14:16:48 +08:00
parent 54745ffd77
commit 0e67b078d4
6 changed files with 406 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/App.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div id="app"> <div id="app">
<router-view v-if="isRouterAlive"/> <router-view v-if="isRouterAlive" />
</div> </div>
</template> </template>
@ -16,16 +16,17 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
export default { export default {
name: 'App', name: 'App',
provide () { provide() {
return { return {
reload: this.reload reload: this.reload
} }
}, },
data () { data() {
return { return {
isRouterAlive: true isRouterAlive: true
} }
}, },
methods: { methods: {
reload() { reload() {
this.isRouterAlive = false this.isRouterAlive = false
@ -36,3 +37,20 @@ export default {
} }
} }
</script> </script>
<style lang="scss">
.el-notification__title {
position: relative;
&::before {
content: "";
display: inline-block;
width: 3px;
height: 15px;
background: #116BFF;
position: absolute;
left: -10px;
border-radius: 2px;
}
}
</style>

70
src/api/merchant.js
View File

@ -48,7 +48,7 @@ export function merchantCreateApi() {
} }
//新增商户 //新增商户
export function merchantCreate(data) { export function merchantCreate(data) {
return request.post('system/merchant/create',data) return request.post('system/merchant/create', data)
} }
/** /**
* @description 商户列表 -- 编辑表单 * @description 商户列表 -- 编辑表单
@ -59,8 +59,8 @@ export function merchantUpdateApi(id) {
/** /**
* @description 商户列表 -- 更新表单 * @description 商户列表 -- 更新表单
*/ */
export function merchantUpdateA(id,data) { export function merchantUpdateA(id, data) {
return request.post(`system/merchant/update/${id}`,data) return request.post(`system/merchant/update/${id}`, data)
} }
/** /**
* @description 商户列表 -- 删除 * @description 商户列表 -- 删除
@ -165,6 +165,12 @@ export function intentionDelte(mer_id) {
export function intentionStatusApi(mer_id) { export function intentionStatusApi(mer_id) {
return request.get(`merchant/intention/status/${mer_id}/form`) return request.get(`merchant/intention/status/${mer_id}/form`)
} }
// 新增修改状态
export function updateStatus(mer_id, data) {
return request.post(`merchant/intention/status/${mer_id}`, data)
}
/** /**
* @description 申请管理 -- 编辑复制次数 * @description 申请管理 -- 编辑复制次数
*/ */
@ -181,19 +187,19 @@ export function intentionAgreeInfo() {
* @description 申请管理 -- 入驻协议保存 * @description 申请管理 -- 入驻协议保存
*/ */
export function intentionAgreeUpdate(data) { export function intentionAgreeUpdate(data) {
return request.post(`agreement/sys_intention_agree`,data) return request.post(`agreement/sys_intention_agree`, data)
} }
/** /**
* @description 店铺类型 -- 获取说明 * @description 店铺类型 -- 获取说明
*/ */
export function getStoreTypeApi(key) { export function getStoreTypeApi(key) {
return request.get(`agreement/${key}`) return request.get(`agreement/${key}`)
} }
/** /**
* @description 店铺类型 -- 编辑说明 * @description 店铺类型 -- 编辑说明
*/ */
export function updateStoreTypeApi(type, data) { export function updateStoreTypeApi(type, data) {
return request.post(`agreement/${type}`, data) return request.post(`agreement/${type}`, data)
} }
/** /**
* @description 商户列表 -- 开启关闭 * @description 商户列表 -- 开启关闭
@ -212,137 +218,137 @@ export function merchantCountApi() {
* @description 店铺类型 -- 创建店铺类型 * @description 店铺类型 -- 创建店铺类型
*/ */
export function storeTypeCreateApi(data) { export function storeTypeCreateApi(data) {
return request.post(`merchant/type/create`, data) return request.post(`merchant/type/create`, data)
} }
/** /**
* @description 店铺类型 -- 列表 * @description 店铺类型 -- 列表
*/ */
export function storeTypeLstApi(data) { export function storeTypeLstApi(data) {
return request.get(`merchant/type/lst`, data) return request.get(`merchant/type/lst`, data)
} }
/** /**
* @description 店铺类型 -- 店铺权限 * @description 店铺类型 -- 店铺权限
*/ */
export function storeJurisdictionApi() { export function storeJurisdictionApi() {
return request.get(`merchant/mer_auth`) return request.get(`merchant/mer_auth`)
} }
/** /**
* @description 店铺类型 -- 创建店铺类型 * @description 店铺类型 -- 创建店铺类型
*/ */
export function storeTypeUpdateApi(id, data) { export function storeTypeUpdateApi(id, data) {
return request.post(`merchant/type/update/${id}`, data) return request.post(`merchant/type/update/${id}`, data)
} }
/** /**
* @description 店铺类型列表 -- 删除 * @description 店铺类型列表 -- 删除
*/ */
export function storeTypeDeleteApi(id) { export function storeTypeDeleteApi(id) {
return request.delete(`merchant/type/delete/${id}`) return request.delete(`merchant/type/delete/${id}`)
} }
/** /**
* @description 店铺类型列表 -- 备注 * @description 店铺类型列表 -- 备注
*/ */
export function merchantTypeMarkForm(id) { export function merchantTypeMarkForm(id) {
return request.get(`merchant/type/mark/${id}`) return request.get(`merchant/type/mark/${id}`)
} }
/** /**
* @description 店铺类型列表 -- 详情 * @description 店铺类型列表 -- 详情
*/ */
export function merchantTypeMarkApi(id) { export function merchantTypeMarkApi(id) {
return request.get(`/merchant/type/detail/${id}`) return request.get(`/merchant/type/detail/${id}`)
} }
/** /**
* @description 店铺类型 -- 获取选择项 * @description 店铺类型 -- 获取选择项
*/ */
export function getstoreTypeApi() { export function getstoreTypeApi() {
return request.get(`merchant/type/options`) return request.get(`merchant/type/options`)
} }
/** /**
* @description 商户分类 -- 获取选择项 * @description 商户分类 -- 获取选择项
*/ */
export function getMerCateApi() { export function getMerCateApi() {
return request.get(`system/merchant/category/options`) return request.get(`system/merchant/category/options`)
} }
/** /**
* @description 服务申请 -- 列表 * @description 服务申请 -- 列表
*/ */
export function getApplymentLst(data) { export function getApplymentLst(data) {
return request.get(`system/applyments/lst`, data) return request.get(`system/applyments/lst`, data)
} }
/** /**
* @description 服务申请 -- 审核 * @description 服务申请 -- 审核
*/ */
export function applymentStatusApi(id, data) { export function applymentStatusApi(id, data) {
return request.post(`system/applyments/status/${id}`, data) return request.post(`system/applyments/status/${id}`, data)
} }
/** /**
* @description 服务申请 -- 详情 * @description 服务申请 -- 详情
*/ */
export function applymentDetailApi(id) { export function applymentDetailApi(id) {
return request.get(`system/applyments/detail/${id}`) return request.get(`system/applyments/detail/${id}`)
} }
/** /**
* @description 商户 -- 分账列表 * @description 商户 -- 分账列表
*/ */
export function applymentLstApi(data) { export function applymentLstApi(data) {
return request.get(`profitsharing/lst`, data) return request.get(`profitsharing/lst`, data)
} }
/** /**
* @description 商户 -- 分账（立即分账） * @description 商户 -- 分账（立即分账）
*/ */
export function splitAccountApi(id) { export function splitAccountApi(id) {
return request.post(`profitsharing/again/${id}`) return request.post(`profitsharing/again/${id}`)
} }
/** /**
* @description 分账申请 -- 备注 * @description 分账申请 -- 备注
*/ */
export function splitAccountMark(id) { export function splitAccountMark(id) {
return request.get(`system/applyments/mark/${id}/form`) return request.get(`system/applyments/mark/${id}/form`)
} }
/** /**
* @description 分账管理 -- 导出 * @description 分账管理 -- 导出
*/ */
export function ledgerManageExportApi(data) { export function ledgerManageExportApi(data) {
return request.get(`profitsharing/export`, data) return request.get(`profitsharing/export`, data)
} }
/** /**
* @description 缴存保证金 -- 列表 * @description 缴存保证金 -- 列表
*/ */
export function marginLstApi(data) { export function marginLstApi(data) {
return request.get(`margin/lst`, data) return request.get(`margin/lst`, data)
} }
/** /**
* @description 退回保证金 -- 列表 * @description 退回保证金 -- 列表
*/ */
export function marginRefundLstApi(data) { export function marginRefundLstApi(data) {
return request.get(`margin/refund/lst`, data) return request.get(`margin/refund/lst`, data)
} }
/** /**
* @description 退回保证金 -- 审核 * @description 退回保证金 -- 审核
*/ */
export function marginRefundStatus(id) { export function marginRefundStatus(id) {
return request.get(`margin/refund/status/${id}/form`) return request.get(`margin/refund/status/${id}/form`)
} }
/** /**
* @description 退回保证金 -- 备注 * @description 退回保证金 -- 备注
*/ */
export function marginRefundMark(id) { export function marginRefundMark(id) {
return request.get(`margin/refund/mark/${id}/form`) return request.get(`margin/refund/mark/${id}/form`)
} }
/** /**
* @description 退回保证金 -- 退回信息 * @description 退回保证金 -- 退回信息
*/ */
export function marginRefundInfo(id) { export function marginRefundInfo(id) {
return request.get(`margin/refund/show/${id}`) return request.get(`margin/refund/show/${id}`)
} }
/** /**
* @description 退回保证金 -- 扣费记录 * @description 退回保证金 -- 扣费记录
*/ */
export function marginDeductionRecord(id, data) { export function marginDeductionRecord(id, data) {
return request.get(`margin/list/${id}`, data) return request.get(`margin/list/${id}`, data)
} }
/** /**
* @description 退回保证金 -- 保证金扣费 * @description 退回保证金 -- 保证金扣费
*/ */
export function marginDeductionForm(id) { export function marginDeductionForm(id) {
return request.get(`margin/set/${id}/form`) return request.get(`margin/set/${id}/form`)
} }

7
src/libs/modal-form.js
View File

@ -18,12 +18,12 @@ const uniqueId = () => ++unique
export default function modalForm(formRequestPromise, config = {}) { export default function modalForm(formRequestPromise, config = {}) {
const h = this.$createElement const h = this.$createElement
return new Promise((resolve) => { return new Promise((resolve) => {
formRequestPromise.then(({data}) => { formRequestPromise.then(({ data }) => {
data.config.submitBtn = false data.config.submitBtn = false
data.config.resetBtn = false data.config.resetBtn = false
if (!data.config.form) data.config.form = {} if (!data.config.form) data.config.form = {}
if (!data.config.formData) data.config.formData = {} if (!data.config.formData) data.config.formData = {}
data.config.formData = {...data.config.formData, ...config.formData} data.config.formData = { ...data.config.formData, ...config.formData }
data.config.form.labelWidth = '120px' data.config.form.labelWidth = '120px'
data.config.global = { data.config.global = {
upload: { upload: {
@ -40,7 +40,7 @@ export default function modalForm(formRequestPromise, config = {}) {
this.$msgbox({ this.$msgbox({
title: data.title, title: data.title,
customClass: config.class || 'modal-form', customClass: config.class || 'modal-form',
message: h('div', {class: 'common-form-create', key: uniqueId()}, [ message: h('div', { class: 'common-form-create', key: uniqueId() }, [
h('formCreate', { h('formCreate', {
props: { props: {
rule: data.rule, rule: data.rule,
@ -54,7 +54,6 @@ export default function modalForm(formRequestPromise, config = {}) {
}) })
]), ]),
beforeClose: (action, instance, done) => { beforeClose: (action, instance, done) => {
const fn = () => { const fn = () => {
setTimeout(() => { setTimeout(() => {
instance.confirmButtonLoading = false instance.confirmButtonLoading = false

90
src/views/accounts/capitalFlow/index.vue
View File

@ -5,39 +5,18 @@
<div class="container"> <div class="container">
<el-form size="small" label-width="100px"> <el-form size="small" label-width="100px">
<el-form-item label="时间选择：" class="width100"> <el-form-item label="时间选择：" class="width100">
<el-radio-group <el-radio-group v-model="tableFrom.date" type="button" class="mr20" size="small"
v-model="tableFrom.date" @change="selectChange(tableFrom.date)">
type="button" <el-radio-button v-for="(item, i) in fromList.fromTxt" :key="i" :label="item.val">{{ item.text
class="mr20" }}</el-radio-button>
size="small"
@change="selectChange(tableFrom.date)"
>
<el-radio-button
v-for="(item,i) in fromList.fromTxt"
:key="i"
:label="item.val"
>{{ item.text }}</el-radio-button>
</el-radio-group> </el-radio-group>
<el-date-picker <el-date-picker v-model="timeVal" value-format="yyyy/MM/dd" format="yyyy/MM/dd" size="small"
v-model="timeVal" type="daterange" placement="bottom-end" placeholder="自定义时间" style="width: 250px;"
value-format="yyyy/MM/dd" @change="onchangeTime" />
format="yyyy/MM/dd"
size="small"
type="daterange"
placement="bottom-end"
placeholder="自定义时间"
style="width: 250px;"
@change="onchangeTime"
/>
</el-form-item> </el-form-item>
<el-form-item label="关键字：" class="width100"> <el-form-item label="关键字：" class="width100">
<el-input <el-input v-model="tableFrom.keyword" @keyup.enter.native="getList(1)" placeholder="请输入订单号/用户昵称"
v-model="tableFrom.keyword" class="selWidth" size="small">
@keyup.enter.native="getList(1)"
placeholder="请输入订单号/用户昵称"
class="selWidth"
size="small"
>
<el-button slot="append" icon="el-icon-search" size="small" class="el-button-solt" @click="getList(1)" /> <el-button slot="append" icon="el-icon-search" size="small" class="el-button-solt" @click="getList(1)" />
</el-input> </el-input>
<el-button size="small" type="primary" icon="el-icon-top" @click="exports">列表导出</el-button> <el-button size="small" type="primary" icon="el-icon-top" @click="exports">列表导出</el-button>
@ -47,14 +26,8 @@
</div> </div>
<cards-data :card-lists="cardLists" /> <cards-data :card-lists="cardLists" />
</div> </div>
<el-table <el-table v-loading="listLoading" :data="tableData.data" style="width: 100%" size="mini" class="table"
v-loading="listLoading" highlight-current-row>
:data="tableData.data"
style="width: 100%"
size="mini"
class="table"
highlight-current-row
>
<el-table-column label="订单号" min-width="100"> <el-table-column label="订单号" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.financial_type != 'sys_accoubts'">{{ scope.row.order_sn }}</span> <span v-if="scope.row.financial_type != 'sys_accoubts'">{{ scope.row.order_sn }}</span>
@ -64,40 +37,33 @@
<el-table-column prop="financial_record_sn" label="交易流水号" min-width="100" /> <el-table-column prop="financial_record_sn" label="交易流水号" min-width="100" />
<el-table-column prop="create_time" label="交易时间" min-width="100" sortable /> <el-table-column prop="create_time" label="交易时间" min-width="100" sortable />
<el-table-column prop="user_info" label="对方信息" min-width="80" /> <el-table-column prop="user_info" label="对方信息" min-width="80" />
<el-table-column label="交易类型" min-width="100"> <el-table-column prop="financial_type_cn" label="交易类型" min-width="100" />
<template slot-scope="scope"> <el-table-column label="收支金额（元）" min-width="100">
<span>{{ scope.row.financial_type | transactionTypeFilter }}</span>
</template>
</el-table-column>
<el-table-column label="收支金额（元）" min-width="100" >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.financial_pm === 1 ? scope.row.number : -scope.row.number }}</span> <span>{{ scope.row.financial_pm === 1 ? scope.row.number : -scope.row.number }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" min-width="150" fixed="right"> <el-table-column label="操作" min-width="150" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<router-link v-if="scope.row.financial_type == 'sys_accoubts'" :to=" { path:`${roterPre}` + '/accounts/reconciliation?reconciliation_id='+scope.row.order_id } "> <router-link v-if="scope.row.financial_type == 'sys_accoubts'"
:to="{ path: `${roterPre}` + '/accounts/reconciliation?reconciliation_id=' + scope.row.order_id }">
<el-button type="text" size="small" class="mr10">详情</el-button> <el-button type="text" size="small" class="mr10">详情</el-button>
</router-link> </router-link>
<router-link v-else-if="scope.row.financial_type == 'order' || scope.row.financial_type == 'brokerage_one' || scope.row.financial_type == 'brokerage_two'" :to=" { path:`${roterPre}` + '/order/list?order_sn='+scope.row.order_sn } "> <router-link
v-else-if="scope.row.financial_type == 'order' || scope.row.financial_type == 'brokerage_one' || scope.row.financial_type == 'brokerage_two'"
:to="{ path: `${roterPre}` + '/order/list?order_sn=' + scope.row.order_sn }">
<el-button type="text" size="small" class="mr10">详情</el-button> <el-button type="text" size="small" class="mr10">详情</el-button>
</router-link> </router-link>
<router-link v-else :to=" { path:`${roterPre}` + '/order/refund?refund_order_sn='+scope.row.order_sn } "> <router-link v-else :to="{ path: `${roterPre}` + '/order/refund?refund_order_sn=' + scope.row.order_sn }">
<el-button type="text" size="small" class="mr10">详情</el-button> <el-button type="text" size="small" class="mr10">详情</el-button>
</router-link> </router-link>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="block"> <div class="block">
<el-pagination <el-pagination :page-sizes="[20, 40, 60, 80]" :page-size="tableFrom.limit" :current-page="tableFrom.page"
:page-sizes="[20, 40, 60, 80]" layout="total, sizes, prev, pager, next, jumper" :total="tableData.total" @size-change="handleSizeChange"
:page-size="tableFrom.limit" @current-change="pageChange" />
:current-page="tableFrom.page"
layout="total, sizes, prev, pager, next, jumper"
:total="tableData.total"
@size-change="handleSizeChange"
@current-change="pageChange"
/>
</div> </div>
</el-card> </el-card>
<!--导出订单列表--> <!--导出订单列表-->
@ -166,10 +132,10 @@ export default {
this.getStatisticalData() this.getStatisticalData()
}, },
//获取统计数据 //获取统计数据
getStatisticalData(){ getStatisticalData() {
getStatisticsApi({date:this.tableFrom.date}).then((res) => { getStatisticsApi({ date: this.tableFrom.date }).then((res) => {
this.cardLists = res.data; this.cardLists = res.data;
}) })
.catch((res) => { .catch((res) => {
this.$message.error(res.message); this.$message.error(res.message);
}); });
@ -181,13 +147,13 @@ export default {
let lebData = {}; let lebData = {};
for (let i = 0; i < pageCount; i++) { for (let i = 0; i < pageCount; i++) {
lebData = await this.downData(excelData) lebData = await this.downData(excelData)
pageCount = Math.ceil(lebData.count/excelData.limit) pageCount = Math.ceil(lebData.count / excelData.limit)
if (lebData.export.length) { if (lebData.export.length) {
data = data.concat(lebData.export) data = data.concat(lebData.export)
excelData.page++ excelData.page++
} }
} }
createWorkBook(lebData.header, lebData.title, data, lebData.foot,lebData.filename); createWorkBook(lebData.header, lebData.title, data, lebData.foot, lebData.filename);
return return
}, },
/**资金流水 */ /**资金流水 */

163
src/views/merchant/application/index.vue
View File

@ -36,7 +36,6 @@
<el-button slot="append" icon="el-icon-search" class="el-button-solt" @click="getList(1)" /> <el-button slot="append" icon="el-icon-search" class="el-button-solt" @click="getList(1)" />
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
</div> </div>
@ -69,7 +68,7 @@
<el-table-column label="操作" min-width="280" fixed="right" align="center"> <el-table-column label="操作" min-width="280" fixed="right" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="scope.row.status == 0" type="text" size="small" <el-button v-if="scope.row.status == 0" type="text" size="small"
@click="onchangeIsShow(scope.row.mer_intention_id)">审核</el-button> @click="onchangeIsShow(scope.row)">审核</el-button>
<el-button type="text" size="small" @click="onEdit(scope.row.mer_intention_id)">备注</el-button> <el-button type="text" size="small" @click="onEdit(scope.row.mer_intention_id)">备注</el-button>
<el-button type="text" size="small" @click="handleDelete(scope.row.mer_intention_id)">删除</el-button> <el-button type="text" size="small" @click="handleDelete(scope.row.mer_intention_id)">删除</el-button>
</template> </template>
@ -81,6 +80,113 @@
@current-change="pageChange" /> @current-change="pageChange" />
</div> </div>
</el-card> </el-card>
<!-- 审核状态 -->
<el-dialog title="修改审核状态" :visible.sync="statusAuditVisible" width="60%">
<el-form ref="statusAuditForm" :model="statusAuditForm" label-width="120px" @submit.native.prevent>
<el-row>
<el-col :span="12">
<el-form-item label="审核状态：">
<el-select v-model="statusAuditForm.state" placeholder="请选择审核状态" @change="statusChange">
<el-option label="同意" :value="1"> </el-option>
<el-option label="拒绝" :value="2"> </el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="自动创建商户：">
<el-radio-group v-model="statusAuditForm.create_mer" @change="createMerChange">
<el-radio :label="1">创建</el-radio>
<el-radio :label="2">不创建</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="24" v-if="statusAuditForm.state == 2">
<el-form-item label="拒绝原因：" prop="fail_msg">
<el-input type="textarea" :rows="2" placeholder="请输入拒绝原因" v-model="statusAuditForm.fail_msg">
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="申请类型：">
<el-input readony :value="statusAuditForm.type == 1 ? '商户入驻申请' : '商户开通交易申请'" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="商户名称：">
<el-input readony :value="statusAuditForm.mer_name" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="商户分类：">
<el-input readony :value="statusAuditForm.category_name" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="店铺类型：">
<el-input readony :value="statusAuditForm.type_name" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="商户姓名：">
<el-input readony :value="statusAuditForm.name" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="联系方式：">
<el-input readony :value="statusAuditForm.phone" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="申请时间：">
<el-input readony :value="statusAuditForm.create_time" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="法人姓名：">
<el-input readony :value="statusAuditForm.name" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="社会代码：">
<el-input readony :value="statusAuditForm.social_credit_code" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="公司名称：">
<el-input readony :value="statusAuditForm.company_name" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="公司性质：">
<el-input readony :value="statusAuditForm.is_company == 1 ? '对公户' : '个体户'" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注：">
<el-input readony :value="statusAuditForm.mark" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer">
<el-button type="primary" class="submission" size="small" @click="handleSubmit()">提交</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
@ -100,7 +206,8 @@ import {
intentionDelte, intentionDelte,
intentionStatusApi, intentionStatusApi,
getstoreTypeApi, getstoreTypeApi,
getMerCateApi getMerCateApi,
updateStatus
} from "@/api/merchant"; } from "@/api/merchant";
import { categoryListApi } from "@/api/product"; import { categoryListApi } from "@/api/product";
import { fromList, statusList } from "@/libs/constants.js"; import { fromList, statusList } from "@/libs/constants.js";
@ -109,6 +216,8 @@ export default {
name: "MerchantApplication", name: "MerchantApplication",
data() { data() {
return { return {
statusAuditVisible: false,//状态审核
statusAuditForm: {},//状态审核表单
props: { props: {
emitPath: false emitPath: false
}, },
@ -162,6 +271,7 @@ export default {
this.tableFrom.page = 1; this.tableFrom.page = 1;
this.getList(""); this.getList("");
}, },
// 具体日期 // 具体日期
onchangeTime(e) { onchangeTime(e) {
this.timeVal = e; this.timeVal = e;
@ -208,16 +318,57 @@ export default {
this.tableFrom.limit = val; this.tableFrom.limit = val;
this.getList(1); this.getList(1);
}, },
// 修改状态 // 修改状态
onchangeIsShow(id) { onchangeIsShow(item) {
this.$modalForm(intentionStatusApi(id)).then(() => this.getList("")); this.statusAuditVisible = true;
this.statusAuditForm = item;
this.$set(this.statusAuditForm, 'state', 1);
this.$set(this.statusAuditForm, 'create_mer', 1);
},
// 如果审核状态为拒绝，就不能创建商户
statusChange() {
if (this.statusAuditForm.state == 2) {
this.statusAuditForm.create_mer = 2;
} else {
this.statusAuditForm.create_mer = 1;
}
},
// 如果创建商户，则同意审核
createMerChange() {
if (this.statusAuditForm.create_mer == 2) {
this.statusAuditForm.state = 2;
} else {
this.statusAuditForm.state = 1;
}
},
// 提交状态修改
handleSubmit() {
if (this.statusAuditForm.state == 2 && !this.statusAuditForm.fail_msg) {
return this.$message.warning("请输入拒绝原因");
}
updateStatus(this.statusAuditForm.mer_intention_id, {
status: this.statusAuditForm.state,
create_mer: this.statusAuditForm.create_mer,
fail_msg: this.statusAuditForm.fail_msg
}).then(res => {
this.statusAuditVisible = false;
this.$message.success(res.message);
this.getList("");
}).catch(({ message }) => {
this.$message.error(message);
});
}, },
// 添加
// 编辑 // 编辑
onEdit(id) { onEdit(id) {
this.$modalForm(auditApi(id)).then(() => this.getList("")); this.$modalForm(auditApi(id)).then(() => this.getList(""));
}, },
// 删除 // 删除
handleDelete(id) { handleDelete(id) {
this.$deleteSure().then(() => { this.$deleteSure().then(() => {

162
src/views/merchant/open/index.vue
View File

@ -74,7 +74,7 @@
<el-table-column label="操作" min-width="280" fixed="right" align="center"> <el-table-column label="操作" min-width="280" fixed="right" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="scope.row.status == 0" type="text" size="small" <el-button v-if="scope.row.status == 0" type="text" size="small"
@click="onchangeIsShow(scope.row.mer_intention_id)">审核</el-button> @click="onchangeIsShow(scope.row)">审核</el-button>
<el-button type="text" size="small" @click="onEdit(scope.row.mer_intention_id)">备注</el-button> <el-button type="text" size="small" @click="onEdit(scope.row.mer_intention_id)">备注</el-button>
<el-button type="text" size="small" @click="handleDelete(scope.row.mer_intention_id)">删除</el-button> <el-button type="text" size="small" @click="handleDelete(scope.row.mer_intention_id)">删除</el-button>
</template> </template>
@ -86,6 +86,134 @@
@current-change="pageChange" /> @current-change="pageChange" />
</div> </div>
</el-card> </el-card>
<!-- 审核状态 -->
<el-dialog title="修改审核状态" :visible.sync="statusAuditVisible" width="60%">
<el-form ref="statusAuditForm" :model="statusAuditForm" label-width="120px" @submit.native.prevent>
<el-row>
<el-col :span="12">
<el-form-item label="审核状态：" prop="state">
<el-select v-model="statusAuditForm.state" placeholder="请选择审核状态">
<el-option label="同意" :value="1"> </el-option>
<el-option label="拒绝" :value="2"> </el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24" v-if="statusAuditForm.state == 2">
<el-form-item label="拒绝原因：" prop="fail_msg">
<el-input type="textarea" :rows="2" placeholder="请输入拒绝原因" v-model="statusAuditForm.fail_msg">
</el-input>
</el-form-item>
</el-col>
<!-- </el-row>
<el-row> -->
<el-col :span="12">
<el-form-item label="申请类型：">
<el-input readony :value="statusAuditForm.type == 1 ? '商户入驻申请' : '商户开通交易申请'" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="商户名称：">
<el-input readony :value="statusAuditForm.mer_name" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="商户分类：">
<el-input readony :value="statusAuditForm.category_name" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="店铺类型：">
<el-input readony :value="statusAuditForm.type_name" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="商户姓名：">
<el-input readony :value="statusAuditForm.name" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="联系方式：">
<el-input readony :value="statusAuditForm.phone" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="申请时间：">
<el-input readony :value="statusAuditForm.create_time" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="法人姓名：">
<el-input readony :value="statusAuditForm.name" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="社会代码：">
<el-input readony :value="statusAuditForm.social_credit_code" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="公司名称：">
<el-input readony :value="statusAuditForm.company_name" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="公司性质：">
<el-input readony :value="statusAuditForm.is_company == 1 ? '对公户' : '个体户'" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="对公账号：">
<el-input readony :value="statusAuditForm.bank_code" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="开户银行：">
<el-input readony :value="statusAuditForm.bank_username" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="开户网点：">
<el-input readony :value="statusAuditForm.bank_opening" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="开户凭证：">
<div class="demo-image__preview">
<el-image style="width: 80px;height: 60px;margin-right: 10px;"
v-for="(item, index) in statusAuditForm.images" :key="index" :src="item" class="preview"
:preview-src-list="[item]" />
</div>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注：">
<el-input readony :value="statusAuditForm.mark" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer">
<el-button type="primary" class="submission" size="small" @click="handleSubmit()">提交</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
@ -105,7 +233,8 @@ import {
intentionDelte, intentionDelte,
intentionStatusApi, intentionStatusApi,
getstoreTypeApi, getstoreTypeApi,
getMerCateApi getMerCateApi,
updateStatus
} from "@/api/merchant"; } from "@/api/merchant";
import { categoryListApi } from "@/api/product"; import { categoryListApi } from "@/api/product";
import { fromList, statusList } from "@/libs/constants.js"; import { fromList, statusList } from "@/libs/constants.js";
@ -114,6 +243,8 @@ export default {
name: "MerchantApplication", name: "MerchantApplication",
data() { data() {
return { return {
statusAuditVisible: false,//状态审核
statusAuditForm: {},//状态审核表单
props: { props: {
emitPath: false emitPath: false
}, },
@ -215,15 +346,36 @@ export default {
this.getList(1); this.getList(1);
}, },
// 修改状态 // 修改状态
onchangeIsShow(id) { onchangeIsShow(item) {
this.$modalForm(intentionStatusApi(id)).then(() => this.getList("")); this.statusAuditVisible = true;
this.statusAuditForm = item;
this.$set(this.statusAuditForm, 'state', 1);
},
// 提交状态修改
handleSubmit() {
if (this.statusAuditForm.state == 2 && !this.statusAuditForm.fail_msg) {
return this.$message.warning("请输入拒绝原因");
}
updateStatus(this.statusAuditForm.mer_intention_id, {
status: this.statusAuditForm.state,
fail_msg: this.statusAuditForm.fail_msg
}).then(res => {
this.statusAuditVisible = false;
this.$message.success(res.message);
this.getList("");
}).catch(({ message }) => {
this.$message.error(message);
});
}, },
// 添加
// 编辑 // 编辑
onEdit(id) { onEdit(id) {
this.$modalForm(auditApi(id)).then(() => this.getList("")); this.$modalForm(auditApi(id)).then(() => this.getList(""));
}, },
// 删除 // 删除
handleDelete(id) { handleDelete(id) {
this.$deleteSure().then(() => { this.$deleteSure().then(() => {