faiz
/
hy-shop-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

edit

This commit is contained in:
faiz 2024-04-26 10:00:36 +08:00
parent 18770314f9
commit cafd3771dd
6 changed files with 176 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/api/merchant.js
View File

@ -397,6 +397,12 @@ export function marginRefundInfo(id) {
export function marginDeductionRecord(id, data) {
return request.get(`margin/list/${id}`, data)
}
/**
* @description 转账记录 -- 记录列表
*/
export function marginofflineLstRecord(id, data) {
return request.get(`margin/offline_lst/${id}`, data)
}
/**
* @description 退回保证金 -- 保证金扣费
*/

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

@ -107,7 +107,7 @@
<!-- <el-table-column prop="com.initiator" label="发起人姓名" min-width="100" />
<el-table-column prop="com.inti_number" label="发起人编号" min-width="100" />
<el-table-column prop="com.inti_mobile" label="发起人电话" min-width="100" /> -->
<el-table-column prop="biz.city" label="所属城市" min-width="100" />
<el-table-column prop="biz.cityInfo" label="所属城市" min-width="100" />
<el-table-column prop="create_time" label="申请时间" min-width="150" />
<!-- <el-table-column prop="create_time" label="资质图片" min-width="150">
<template slot-scope="scope">

7
src/views/merchant/application/merInfo.vue
View File

@ -229,7 +229,7 @@
</li>
<li class="item">
<div>营业执照地址：</div>
<div class="value">{{merData.biz.address}}</div>
<div class="value">{{cityInfo}}</div>
</li>
<li class="item">
<div>实际经营地址：</div>
@ -317,6 +317,11 @@ export default {
},
};
},
computed: {
cityInfo(){
return this.merData.biz?.cityInfo?this.merData.biz.cityInfo+this.merData.biz.address:this.merData.biz.address
}
},
filters: {
},
methods: {

150
src/views/merchant/deposit/index.vue
View File

@ -127,16 +127,17 @@
min-width="60"
/>
<el-table-column
label="商户名称"
label="店铺名称"
min-width="100"
>
<template slot-scope="scope">
<span>{{(scope.row.merchant&&scope.row.merchant.mer_name) || scope.row.mer_name}}</span>
</template>
</el-table-column>
<el-table-column prop="ext.com.name" label="企业名称" min-width="150" />
<el-table-column
v-if="type == 2"
key="18"
key="20"
label="转账类型"
min-width="100"
>
@ -169,12 +170,47 @@
</template>
</el-table-column>
<el-table-column
v-if="type != 2"
v-if="type == 0 || type==10"
key="1"
:prop="type == 0 ? 'merchant.ot_margin' : 'ot_margin'"
label="保证金额度"
min-width="80"
/>
<el-table-column
v-if="type == 0 || type==10"
key="20"
prop="margin"
label="保证金余额"
min-width="80"
/>
<el-table-column
v-if="type == 30"
key="21"
prop="service_cost"
label="技术服务费余额"
min-width="80"
/>
<el-table-column
v-if="type == 30"
key="22"
prop="ot_service_cost"
label="技术服务费额度"
min-width="80"
/>
<el-table-column
v-if="type == 40"
key="23"
prop="goods_cost"
label="上架费余额"
min-width="80"
/>
<el-table-column
v-if="type == 40"
key="24"
prop="ot_goods_cost"
label="上架费额度"
min-width="80"
/>
<el-table-column
v-if="type == 0"
key="3"
@ -285,7 +321,7 @@
</el-table-column>
<el-table-column
v-if="type == 2"
key="18"
key="19"
label="缴费凭证"
min-width="100"
>
@ -299,7 +335,6 @@
label="操作"
min-width="150"
fixed="right"
v-if="type != 5 && type !=6"
>
<template slot-scope="scope">
<el-button
@ -317,12 +352,19 @@
>审核</el-button
>
<el-button
v-if="type == 1"
v-if="type == 10"
type="text"
size="small"
@click="handleDeduction(scope.row.mer_id)"
>保证金扣费</el-button
>
<el-button
v-if="type == 10 || type==30 || type==40"
type="text"
size="small"
@click="viewOffRecords(scope.row.mer_id)"
>转账记录</el-button
>
<el-button
v-if="
scope.row.status == 1 &&
@ -335,7 +377,7 @@
>退回信息</el-button
>
<el-button
v-if="type != 2 && type != 3 && type != 4"
v-if="type != 30 && type != 40"
type="text"
size="small"
@click="handleRecord(scope.row.mer_id)"
@ -484,6 +526,48 @@
/>
</div>
</el-dialog>
<!--查看记录-->
<el-dialog
v-if="offRecord"
:visible.sync="offRecord"
title="操作记录"
width="800px"
close-on-click-modal
class="mapBox"
custom-class="dialog-scustom"
>
<el-table :data="tableOffData.data" :loading="loading" size="small">
<el-table-column label="序号" min-width="50">
<template scope="scope">
<span>{{ scope.$index+(tableOffFrom.page - 1) * tableOffFrom.limit + 1 }}</span>
</template>
</el-table-column>
<el-table-column label="缴费截图" min-width="90" prop="image">
<template scope="scope">
<el-image
v-if="scope.row.image"
style="width: 30px; height: 30px"
:src="scope.row.image"
:preview-src-list="[scope.row.image]">
</el-image>
</template>
</el-table-column>
<el-table-column prop="pay_price" label="支付金额" min-width="60"></el-table-column>
<el-table-column label="备注" min-width="100" prop="mark" />
<el-table-column label="操作" min-width="100" prop="refuse" />
<el-table-column prop="pay_time" label="申请时间" min-width="120" />
</el-table>
<div class="acea-row row-right page">
<el-pagination
:page-size="tableOffFrom.limit"
:current-page="tableOffFrom.page"
layout="prev, pager, next, jumper"
:total="tableOffData.total"
@size-change="handleOffSizeChange"
@current-change="pageOffChange"
/>
</div>
</el-dialog>
</div>
</template>
<script>
@ -506,6 +590,7 @@ import {
getMerCateApi,
marginRefundInfo,
marginDeductionRecord,
marginofflineLstRecord
} from "@/api/merchant";
import timeOptions from '@/utils/timeOptions';
import { fromList } from "@/libs/constants.js";
@ -518,6 +603,7 @@ export default {
fromList: fromList,
roterPre: roterPre,
isChecked: false,
offRecord: false,
listLoading: true,
recordLoading: true,
merCateList: [],
@ -526,7 +612,15 @@ export default {
modalRecord: false,
formValidate: {},
isReturn: false,
type: "1",
type: "10",
tableOffFrom: {
page: 1,
limit: 20
},
tableOffData: {
total: 0,
data: []
},
headeNum: [
{
count: "",
@ -545,17 +639,17 @@ export default {
// },
{
count: "",
type: "1",
type: "10",
title: "缴存保证金",
},
{
count: "",
type: "5",
type: "30",
title: "缴存服务费",
},
{
count: "",
type: "6",
type: "40",
title: "缴存上架费",
},
{
@ -634,11 +728,19 @@ export default {
this.$message.error(res.message);
});
},
handleOffSizeChange(val) {
this.tableFrom.limit = val
this.getOffRecordList()
},
pageOffChange(page) {
this.tableFrom.page = page
this.getOffRecordList()
},
// 列表
getList(num) {
this.listLoading = true;
this.tableFrom.page = num ? num : this.tableFrom.page;
this.type == 1
this.type == 10
? marginLstApi(this.tableFrom) //缴存
.then((res) => {
this.tableData.data = res.data.list;
@ -679,7 +781,7 @@ export default {
this.listLoading = false;
this.$message.error(res.message);
})
: this.type == 5 ? marginServiceLstApi(this.tableFrom) //缴存服务费
: this.type == 30 ? marginServiceLstApi(this.tableFrom) //缴存服务费
.then((res) => {
this.tableData.data = res.data.list;
this.tableData.total = res.data.count;
@ -689,7 +791,7 @@ export default {
this.listLoading = false;
this.$message.error(res.message);
})
: this.type == 6 ? marginGoodsLstApi(this.tableFrom) //缴存上架费
: this.type == 40 ? marginGoodsLstApi(this.tableFrom) //缴存上架费
.then((res) => {
this.tableData.data = res.data.list;
this.tableData.total = res.data.count;
@ -741,6 +843,26 @@ export default {
this.$message.error(res.message);
});
},
// 查看记录
viewOffRecords(id) {
this.tableOffFrom.page = 1
this.tableOffFrom.type = this.type
this.offRecord = true
this.getOffRecordList(id)
},
// 记录列表
getOffRecordList(id) {
const that = this
that.loading = true
marginofflineLstRecord(id,that.tableOffFrom).then(async(res) => {
that.tableOffData.data = res.data.list
that.tableOffData.total = res.data.count
that.loading = false
}).catch((res) => {
that.loading = false
that.$message.error(res.message)
})
},
// 审核
handleAudit(id) {
this.$modalForm(marginRefundStatus(id)).then(() => this.getList(""));

13
src/views/merchant/list/handle/merEditForm.vue
View File

@ -217,16 +217,17 @@
<el-form-item label="店铺保证金：" label-width="146px">
<el-radio-group v-model="merData.is_margin">
<el-radio :label="0" class="radio">无</el-radio>
<el-radio :label="1">有</el-radio>
<el-radio v-if="merData.is_margin!=10" :label="1">有</el-radio>
<el-radio v-else :label="10">有</el-radio>
</el-radio-group>
<span v-if="merData.is_margin == 1">
<span v-if="merData.is_margin != 0">
<el-input
v-model="merData.margin"
placeholder="请填写保证金"
style="width:120px;margin-left: 8px;"
/> 元,
</span>
<span v-if="merData.is_margin == 1">
<span v-if="merData.is_margin != 0">
额度
<el-input
v-model="merData.ot_margin"
@ -319,18 +320,18 @@
<el-row :gutter="24" class="mt20">
<el-col v-if="!isAdd" :span="8">
<el-form-item label="保证金应缴费用：">
<span>{{merData.is_margin != 0?(merData.ot_margin<+merData.margin)?merData.margin:(merData.ot_margin-merData.margin):'0'}}</span>
<span>{{merData.ot_margin-merData.margin}}</span>
</el-form-item>
</el-col>
<el-col v-if="!isAdd" :span="8">
<el-form-item label="技术服务费应缴费用：" label-width="150px">
<span>{{merData.is_service != 0?(merData.ot_service_cost<+merData.service_cost)?merData.service_cost:(merData.ot_service_cost-merData.service_cost):'0'}}</span>
<span>{{merData.ot_service_cost-merData.service_cost}}</span>
<!-- <span>{{merData.ot_service_cost-merData.service_cost}}</span> -->
</el-form-item>
</el-col>
<el-col v-if="!isAdd" :span="8">
<el-form-item label="上架费应缴费用：">
<span>{{merData.is_goods != 0?(merData.ot_goods_cost<+merData.goods_cost)?merData.goods_cost:(merData.ot_goods_cost-merData.goods_cost):'0'}}</span>
<span>{{merData.ot_goods_cost-merData.goods_cost}}</span>
<!-- <span>{{merData.ot_goods_cost-merData.goods_cost}}</span> -->
</el-form-item>
</el-col>

23
src/views/merchant/list/index.vue
View File

@ -176,12 +176,21 @@
<!-- <el-table-column prop="ext.com.initiator" label="发起人姓名" min-width="100" />
<el-table-column prop="ext.com.inti_number" label="发起人编号" min-width="100" />
<el-table-column prop="ext.com.inti_mobile" label="发起人电话" min-width="100" /> -->
<el-table-column prop="ext.biz.city" label="所属城市" min-width="100" />
<el-table-column prop="ext.biz.cityInfo" label="所属城市" min-width="100" />
<el-table-column prop="create_time" label="创建时间" min-width="150" />
<el-table-column prop="margin" label="保证金" min-width="150">
<template slot-scope="scope">
<span>{{scope.row.is_margin == 1 ? '未支付' : scope.row.is_margin == 0 ? '无' : '已支付'}}</span>
<span>{{getNumber(scope.row,'margin')}}</span>
</template>
</el-table-column>
<el-table-column prop="service" label="技术服务费" min-width="150">
<template slot-scope="scope">
<span>{{getNumber(scope.row,'service')}}</span>
</template>
</el-table-column>
<el-table-column prop="goods" label="上架费" min-width="150">
<template slot-scope="scope">
<span>{{getNumber(scope.row,'goods')}}</span>
</template>
</el-table-column>
<el-table-column prop="sort" label="排序" min-width="100" />
@ -309,6 +318,14 @@ export default {
this.getList("");
},
methods: {
getNumber(row,name){
if(name=='margin'){
return row[`is_${name}`] == 0?'无':row[`ot_${name}`]-row[`${name}`]>0 ? '待缴' : '已缴'
}else{
return row[`is_${name}`] == 0?'无':row[`ot_${name}_cost`]-row[`${name}_cost`]>0 ? '待缴' : '已缴'
}
},
handleCascader(){
this.tableFrom.city = this.$refs["cascader"]?.getCheckedNodes()[0]?.label
this.getList(1)