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

add

This commit is contained in:
faiz 2024-04-13 18:17:12 +08:00
parent 6f9b4285bb
commit d2919817e6
15 changed files with 333 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/api/merchant.js
View File

@ -340,10 +340,10 @@ export function marginGoodsLstApi(data) {
return request.get(`margin/goods_lst`, data) return request.get(`margin/goods_lst`, data)
} }
/** /**
* @description 待缴保证金 -- 列表 * @description 线下转账 -- 列表
*/ */
export function marginDepositLstApi(data) { export function marginDepositLstApi(data) {
return request.get(`margin/make_up`, data) return request.get(`margin/make_offline`, data)
} }
/** /**
* @description 待缴服务费 -- 列表 * @description 待缴服务费 -- 列表
@ -361,7 +361,7 @@ export function marginGoodsDepositLstApi(data) {
* @description 待缴保证金 -- 线下付款 * @description 待缴保证金 -- 线下付款
*/ */
export function marginPaymentApi(id) { export function marginPaymentApi(id) {
return request.get(`margin/local/${id}/form`) return request.get(`margin/offline/${id}/form`)
} }
/** /**
* @description 待缴服务费 -- 财务审核 * @description 待缴服务费 -- 财务审核

6
src/api/user.js
View File

@ -475,3 +475,9 @@ export function memberRecordCard(data) {
export function memberGrowthLog(data) { export function memberGrowthLog(data) {
return request.get(`user/member_log`, data) return request.get(`user/member_log`, data)
} }
/**
* @description 验证码 -- 查询
*/
export function sysVerifyCodeApi(data) {
return request.post(`verify_code`, data)
}

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

@ -93,7 +93,8 @@
<el-table-column prop="com.number" label="对接人编号" min-width="100" /> <el-table-column prop="com.number" label="对接人编号" min-width="100" />
<el-table-column prop="com.initiator" label="发起人姓名" min-width="100" /> <el-table-column prop="com.initiator" label="发起人姓名" min-width="100" />
<el-table-column prop="com.inti_numbe" label="发起人编号" min-width="100" /> <el-table-column prop="com.inti_numbe" label="发起人编号" min-width="100" />
<el-table-column prop="com.inti_mobile" 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="create_time" label="申请时间" min-width="150" /> <el-table-column prop="create_time" label="申请时间" min-width="150" />
<!-- <el-table-column prop="create_time" label="资质图片" min-width="150"> <!-- <el-table-column prop="create_time" label="资质图片" min-width="150">
<template slot-scope="scope"> <template slot-scope="scope">
@ -116,6 +117,7 @@
<div v-if="scope.row.status == 2">原因：{{ scope.row.fail_msg }}</div> <div v-if="scope.row.status == 2">原因：{{ scope.row.fail_msg }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="audit_name" label="审核人" min-width="80" />
<el-table-column prop="mark" label="备注" min-width="150" /> <el-table-column prop="mark" label="备注" min-width="150" />
<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">

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

@ -26,13 +26,13 @@
<div class="section" v-if="merData.com"> <div class="section" v-if="merData.com">
<ul class="list"> <ul class="list">
<li class="item"> <li class="item">
<div>企业名称</div> <div>企业名称：</div>
<div class="value"> <div class="value">
{{merData.com.name}} {{merData.com.name}}
</div> </div>
</li> </li>
<li class="item"> <li class="item">
<div>企业类型</div> <div>企业类型：</div>
<div class="value"> <div class="value">
{{merData.com.type}} {{merData.com.type}}
</div> </div>

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

@ -57,7 +57,7 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="店铺类型：" prop="type_id"> <!-- <el-form-item label="店铺类型：" prop="type_id">
<el-select <el-select
v-model="tableFrom.type_id" v-model="tableFrom.type_id"
clearable clearable
@ -72,7 +72,7 @@
:value="item.value" :value="item.value"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item v-if="type == 0" label="退回状态：" prop="status"> <el-form-item v-if="type == 0" label="退回状态：" prop="status">
<el-select <el-select
v-model="tableFrom.status" v-model="tableFrom.status"
@ -134,7 +134,17 @@
<span>{{(scope.row.merchant&&scope.row.merchant.mer_name) || scope.row.mer_name}}</span> <span>{{(scope.row.merchant&&scope.row.merchant.mer_name) || scope.row.mer_name}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column v-if="type!=0" key="10" label="店铺类型" min-width="120"> <el-table-column
v-if="type == 2"
key="18"
label="转账类型"
min-width="100"
>
<template slot-scope="scope">
<span>{{ scope.row.type==10?'保证金':scope.row.type==30?'技术服务费':'上架费' }}</span>
</template>
</el-table-column>
<!-- <el-table-column v-if="type!=0" key="10" label="店铺类型" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="type != 2" class="spBlock">{{ <span v-if="type != 2" class="spBlock">{{
scope.row.merchantType && scope.row.merchantType &&
@ -149,7 +159,7 @@
: "" : ""
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column <el-table-column
label="商户姓名" label="商户姓名"
min-width="100" min-width="100"
@ -231,11 +241,11 @@
<el-table-column <el-table-column
v-if="type == 2" v-if="type == 2"
key="15" key="15"
label="待缴金额" label="转账金额"
min-width="100" min-width="100"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.is_margin == 1 ? scope.row.margin : (scope.row.ot_margin-scope.row.margin).toFixed(2) }}</span> <span>{{ scope.row.pay_price }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -258,7 +268,7 @@
<span>{{ scope.row.is_goods == 1 ? scope.row.goods_cost : (scope.row.ot_goods_cost-scope.row.goods_cost).toFixed(2) }}</span> <span>{{ scope.row.is_goods == 1 ? scope.row.goods_cost : (scope.row.ot_goods_cost-scope.row.goods_cost).toFixed(2) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <!-- <el-table-column
v-if="type == 2" v-if="type == 2"
key="18" key="18"
label="保证金额度" label="保证金额度"
@ -267,12 +277,24 @@
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.ot_margin }}</span> <span>{{ scope.row.ot_margin }}</span>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column label="备注" min-width="120"> <el-table-column label="备注" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ type == 0 ? scope.row.admin_mark : scope.row.mark }}</span> <span>{{ type == 0 ? scope.row.admin_mark : scope.row.mark }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
v-if="type == 2"
key="18"
label="缴费凭证"
min-width="100"
>
<template slot-scope="scope">
<div class="demo-image__preview">
<el-image :src="scope.row.image" :preview-src-list="[scope.row.image]" />
</div>
</template>
</el-table-column>
<el-table-column <el-table-column
label="操作" label="操作"
min-width="150" min-width="150"
@ -323,7 +345,7 @@
v-if="type == 2 || type == 3 || type == 4" v-if="type == 2 || type == 3 || type == 4"
type="text" type="text"
size="small" size="small"
@click="offline(scope.row.mer_id)" @click="offline(scope.row.order_id)"
>财务审核</el-button> >财务审核</el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -517,18 +539,18 @@ export default {
{ {
count: "", count: "",
type: "2", type: "2",
title: "待缴保证金", title: "线下转账",
},
{
count: "",
type: "3",
title: "待缴服务费",
},
{
count: "",
type: "4",
title: "待缴上架费",
}, },
// {
// count: "",
// type: "3",
// title: "待缴服务费",
// },
// {
// count: "",
// type: "4",
// title: "待缴上架费",
// },
{ {
count: "", count: "",
type: "1", type: "1",

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

@ -13,17 +13,17 @@
<div class="title">基础信息</div> <div class="title">基础信息</div>
<el-row :gutter="24" class="mt20"> <el-row :gutter="24" class="mt20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="商户名称：" prop="mer_name"> <el-form-item label="店铺名称：" prop="mer_name">
<el-input <el-input
size="small" size="small"
v-model="merData.mer_name" v-model="merData.mer_name"
placeholder="请填写商户名称" placeholder="请填写店铺名称"
class="selWidth" class="selWidth"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="商户地址：" prop="mer_address"> <el-form-item label="店铺地址：" prop="mer_address">
<el-input <el-input
size="small" size="small"
v-model="merData.mer_address" v-model="merData.mer_address"
@ -33,6 +33,18 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="24" class="mt20">
<el-col :span="12">
<el-form-item label="企业名称：" prop="ext.com.contact" v-if="merData.ext.com">
<el-input
size="small"
v-model="merData.ext.com.contact"
placeholder="请填写企业名称"
class="selWidth"
/>
</el-form-item>
</el-col>
</el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="商户分类：" prop="category_id"> <el-form-item label="商户分类：" prop="category_id">
@ -207,7 +219,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="产品服务费保证金：" label-width="146px"> <el-form-item label="技术服务费：" label-width="146px">
<el-radio-group v-model="merData.is_service"> <el-radio-group v-model="merData.is_service">
<el-radio :label="0" class="radio">无</el-radio> <el-radio :label="0" class="radio">无</el-radio>
<el-radio :label="1">有</el-radio> <el-radio :label="1">有</el-radio>
@ -215,7 +227,7 @@
<span v-if="merData.is_service == 1"> <span v-if="merData.is_service == 1">
<el-input <el-input
v-model="merData.service_cost" v-model="merData.service_cost"
placeholder="请填写保证金" placeholder="请填写技术服务费"
style="width:120px;margin-left: 8px;" style="width:120px;margin-left: 8px;"
/> 元, /> 元,
</span> </span>
@ -230,7 +242,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="上架费保证金：" label-width="146px"> <el-form-item label="上架费：" label-width="146px">
<el-radio-group v-model="merData.is_goods"> <el-radio-group v-model="merData.is_goods">
<el-radio :label="0" class="radio">无</el-radio> <el-radio :label="0" class="radio">无</el-radio>
<el-radio :label="1">有</el-radio> <el-radio :label="1">有</el-radio>
@ -238,7 +250,7 @@
<span v-if="merData.is_goods == 1"> <span v-if="merData.is_goods == 1">
<el-input <el-input
v-model="merData.goods_cost" v-model="merData.goods_cost"
placeholder="请填写保证金" placeholder="请填写上架费"
style="width:120px;margin-left: 8px;" style="width:120px;margin-left: 8px;"
/> 元, /> 元,
</span> </span>
@ -274,7 +286,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col v-if="!isAdd" :span="8"> <el-col v-if="!isAdd" :span="8">
<el-form-item label="产品服务费支付状态：" label-width="142px"> <el-form-item label="技术服务费支付状态：" label-width="142px">
<span>{{merData.is_service == 1 ? '待缴' : merData.is_service == 0 ? '无' : '已缴' }}</span> <span>{{merData.is_service == 1 ? '待缴' : merData.is_service == 0 ? '无' : '已缴' }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -291,7 +303,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col v-if="!isAdd" :span="8"> <el-col v-if="!isAdd" :span="8">
<el-form-item label="产品服务费余额："> <el-form-item label="技术服务费余额：">
<span>{{merData.service_cost}}</span> <span>{{merData.service_cost}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>

32
src/views/merchant/list/handle/merInfo.vue
View File

@ -11,6 +11,12 @@
{{merData.mer_name}} {{merData.mer_name}}
</div> </div>
</li> </li>
<li class="item" v-if="merData.ext">
<div>企业名称：</div>
<div class="value">
{{merData.ext.com?merData.ext.com.contact:'无'}}
</div>
</li>
<li class="item"> <li class="item">
<div>商户类型：</div> <div>商户类型：</div>
<div class="value">{{merData.is_trader == 1 ? "自营" : "非自营"}}</div> <div class="value">{{merData.is_trader == 1 ? "自营" : "非自营"}}</div>
@ -122,11 +128,35 @@
</div> </div>
</li> </li>
<li class="item"> <li class="item">
<div>产品服务费：</div> <div>技术服务费：</div>
<div class="value"> <div class="value">
{{merData.is_service == 0 ? '无' : merData.service_cost}} {{merData.is_service == 0 ? '无' : merData.service_cost}}
</div> </div>
</li> </li>
<li class="item">
<div>上架费支付状态：</div>
<div class="value">
{{merData.is_goods == 1 ? '待缴' : merData.is_goods == 0 ? '无' : '已缴' }}
</div>
</li>
<li class="item">
<div>技术服务费支付状态：</div>
<div class="value">
{{merData.is_service == 1 ? '待缴' : merData.is_service == 0 ? '无' : '已缴' }}
</div>
</li>
<li class="item">
<div>上架费余额：</div>
<div class="value">
{{merData.goods_cost == 0 ? '无' : merData.goods_cost}}
</div>
</li>
<li class="item">
<div>技术服务费余额：</div>
<div class="value">
{{merData.service_cost == 0 ? '无' : merData.service_cost}}
</div>
</li>
<li v-if="merData.is_margin != 0" class="item"> <li v-if="merData.is_margin != 0" class="item">
<div>保证金支付状态：</div> <div>保证金支付状态：</div>
<div class="value">{{merData.is_margin == 1 ? '待缴' : merData.is_margin == 0 ? '无' : '已缴' }} <div class="value">{{merData.is_margin == 1 ? '待缴' : merData.is_margin == 0 ? '无' : '已缴' }}

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

@ -118,7 +118,7 @@
> >
<el-table-column prop="mer_id" label="ID" min-width="60" /> <el-table-column prop="mer_id" label="ID" min-width="60" />
<el-table-column prop="mer_name" label="店铺名称" min-width="150" /> <el-table-column prop="mer_name" label="店铺名称" min-width="150" />
<el-table-column prop="mer_name" label="企业名称" min-width="150" /> <el-table-column prop="ext.com.contact" label="企业名称" min-width="150" />
<el-table-column prop="type_name" label="店铺类型" min-width="150" /> <el-table-column prop="type_name" label="店铺类型" min-width="150" />
<el-table-column prop="is_huimei" label="是否惠美乡村" min-width="100"> <el-table-column prop="is_huimei" label="是否惠美乡村" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
@ -162,7 +162,8 @@
<el-table-column prop="ext.com.number" label="对接人编号" min-width="100" /> <el-table-column prop="ext.com.number" label="对接人编号" min-width="100" />
<el-table-column prop="ext.com.initiator" label="发起人姓名" min-width="100" /> <el-table-column prop="ext.com.initiator" label="发起人姓名" min-width="100" />
<el-table-column prop="ext.com.inti_numbe" label="发起人编号" min-width="100" /> <el-table-column prop="ext.com.inti_numbe" label="发起人编号" min-width="100" />
<el-table-column prop="ext.com.inti_mobile" 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="create_time" label="创建时间" min-width="150" /> <el-table-column prop="create_time" label="创建时间" min-width="150" />
<el-table-column prop="margin" label="保证金" min-width="150"> <el-table-column prop="margin" label="保证金" min-width="150">
<template slot-scope="scope"> <template slot-scope="scope">

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

@ -146,7 +146,7 @@
<el-input <el-input
v-model="tableFrom.keywords" v-model="tableFrom.keywords"
@keyup.enter.native="getList(1),getCardList()" @keyup.enter.native="getList(1),getCardList()"
placeholder="请输入订单号/收货人/联系方式" placeholder="请输入订单号/收货人/联系方式/ID/商品编号"
class="selWidth" class="selWidth"
clearable clearable
/> />
@ -169,6 +169,24 @@
clearable clearable
/> />
</el-form-item> </el-form-item>
<!-- <el-form-item label="商品ID：" prop="product_id">
<el-input
v-model="tableFrom.product_id"
@keyup.enter.native="getList(1),getCardList()"
placeholder="请输入商品ID"
class="selWidth"
clearable
/>
</el-form-item>
<el-form-item label="商品编号：" prop="bar_code">
<el-input
v-model="tableFrom.bar_code"
@keyup.enter.native="getList(1),getCardList()"
placeholder="请输入商品编号"
class="selWidth"
clearable
/>
</el-form-item> -->
<el-form-item> <el-form-item>
<el-button type="primary" size="small" @click="getList(1)">搜索</el-button> <el-button type="primary" size="small" @click="getList(1)">搜索</el-button>
<el-button size="small" @click="searchReset()">重置</el-button> <el-button size="small" @click="searchReset()">重置</el-button>
@ -388,7 +406,9 @@ export default {
pay_type: "", pay_type: "",
filter_delivery: '', filter_delivery: '',
filter_product : '', filter_product : '',
activity_type: '' activity_type: '',
product_id:'',
bar_code:''
}, },
dliveryWayList: [ dliveryWayList: [
{ value: 1, label: '快递订单' }, { value: 1, label: '快递订单' },

18
src/views/order/list/orderDetails.vue
View File

@ -194,6 +194,24 @@
<el-tab-pane label="商品信息" name="goods"> <el-tab-pane label="商品信息" name="goods">
<template v-if="activeName == 'goods'"> <template v-if="activeName == 'goods'">
<el-table :data="orderDetailList.orderProduct" size="small"> <el-table :data="orderDetailList.orderProduct" size="small">
<el-table-column label="ID" min-width="90">
<template slot-scope="scope">
<div class="tab">
<div class="line1">
{{ scope.row.cart_info.productAttr.product_id ? scope.row.cart_info.productAttr.product_id : '-' }}
</div>
</div>
</template>
</el-table-column>
<el-table-column label="商品编号" min-width="90">
<template slot-scope="scope">
<div class="tab">
<div class="line1">
{{ scope.row.cart_info.productAttr.bar_code ? scope.row.cart_info.productAttr.bar_code : '-' }}
</div>
</div>
</template>
</el-table-column>
<el-table-column label="商品信息" min-width="300"> <el-table-column label="商品信息" min-width="300">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="tab"> <div class="tab">

60
src/views/product/productExamine/editAttr.vue
View File

@ -50,7 +50,7 @@
</el-table-column> </el-table-column>
<el-table-column label="成本价" min-width="100" align="center"> <el-table-column label="成本价" min-width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input-number :disabled="true" v-model="oneFormBatch[0].cost" :min="0" class="priceBox" controls-position="right"/> <el-input @input="handleOnform('cost')" v-model="oneFormBatch[0].cost" class="priceBox" controls-position="right"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="市场价" min-width="100" align="center"> <el-table-column label="市场价" min-width="100" align="center">
@ -111,7 +111,7 @@
<el-table-column v-for="(item,iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center" min-width="120"> <el-table-column v-for="(item,iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="formThead[iii].title==='商品编号'" v-model="scope.row[iii]" type="text" class="priceBox" /> <el-input v-if="formThead[iii].title==='商品编号'" v-model="scope.row[iii]" type="text" class="priceBox" />
<el-input v-else @input="handleCost(scope.row,iii,$event)" :disabled="formThead[iii].title === '成本价'||formThead[iii].title === '占比'||formThead[iii].title === '成长值'" v-model="scope.row[iii]" class="priceBox" controls-position="right"/> <el-input v-else @input="handleCost(scope.row,iii)" :disabled="formThead[iii].title === '占比'||formThead[iii].title === '成长值'" v-model="scope.row[iii]" class="priceBox" controls-position="right"/>
</template> </template>
</el-table-column> </el-table-column>
<template v-if="formValidate.extension_type === 1"> <template v-if="formValidate.extension_type === 1">
@ -150,7 +150,7 @@
<el-table-column v-for="(item,iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center" min-width="120"> <el-table-column v-for="(item,iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="formThead[iii].title==='商品编号'" v-model="scope.row[iii]" type="text" class="priceBox" /> <el-input v-if="formThead[iii].title==='商品编号'" v-model="scope.row[iii]" type="text" class="priceBox" />
<el-input v-else @input="handleCost(scope.row,iii,$event)" :disabled="formThead[iii].title === '成本价'||formThead[iii].title === '占比'||formThead[iii].title === '成长值'" v-model="scope.row[iii]" class="priceBox" controls-position="right"/> <el-input v-else @input="handleCost(scope.row,iii)" :disabled="formThead[iii].title === '占比'||formThead[iii].title === '成长值'" v-model="scope.row[iii]" class="priceBox" controls-position="right"/>
</template> </template>
</el-table-column> </el-table-column>
<template v-if="formValidate.extension_type === 1"> <template v-if="formValidate.extension_type === 1">
@ -353,21 +353,36 @@ export default {
handleOnform(type){ handleOnform(type){
if(type=='ot_price'){ if(type=='ot_price'){
this.oneFormBatch[0].ot_price = this.oneFormBatch[0].ot_price.replace(/^([0-9-]\d*\.?\d{0,2})?.*$/,'$1') this.oneFormBatch[0].ot_price = this.oneFormBatch[0].ot_price.replace(/^([0-9-]\d*\.?\d{0,2})?.*$/,'$1')
}else if(type=='cost'){
this.oneFormBatch[0].cost = this.oneFormBatch[0].cost.replace(/^([0-9-]\d*\.?\d{0,2})?.*$/,'$1')
this.oneFormBatch[0].growth = parseInt( this.oneFormBatch[0].price*(0.9-( this.oneFormBatch[0].cost/ this.oneFormBatch[0].price)))
this.oneFormBatch[0].proportion = (this.oneFormBatch[0].cost/this.oneFormBatch[0].price).toFixed(2)
}else{ }else{
this.oneFormBatch[0].price = this.oneFormBatch[0].price.replace(/^([0-9-]\d*\.?\d{0,2})?.*$/,'$1') this.oneFormBatch[0].price = this.oneFormBatch[0].price.replace(/^([0-9-]\d*\.?\d{0,2})?.*$/,'$1')
this.oneFormBatch[0].cost = (this.oneFormBatch[0].price * 0.6).toFixed(2) this.oneFormBatch[0].growth = parseInt( this.oneFormBatch[0].price*(0.9-( this.oneFormBatch[0].cost/ this.oneFormBatch[0].price)))
this.oneFormBatch[0].growth = parseInt(this.oneFormBatch[0].price * 0.3) this.oneFormBatch[0].proportion = (this.oneFormBatch[0].cost/this.oneFormBatch[0].price).toFixed(2)
}
}
}, },
handleCost(val,i,e){ handleCost(val,i){
console.log(val);
if(i=='price'){ if(i=='price'){
val.price=val.price.replace(/^([0-9-]\d*\.?\d{0,2})?.*$/,'$1') val.price=val.price.replace(/^([0-9-]\d*\.?\d{0,2})?.*$/,'$1')
val.cost = (e * 0.6).toFixed(2) // val.cost = (e * 0.6).toFixed(2)
val.growth = parseInt(e*0.3) // val.growth = parseInt(e*0.3)
val.growth = parseInt(val.price*(0.9-(val.cost/val.price)))
val.proportion = (val.cost/val.price).toFixed(2)
}
if(i=='cost'){
val.cost=val.cost.replace(/^([0-9-]\d*\.?\d{0,2})?.*$/,'$1')
val.growth = parseInt(val.price*(0.9-(val.cost/val.price)))
val.proportion = (val.cost/val.price).toFixed(2)
} }
if(i=='ot_price'){ if(i=='ot_price'){
val.ot_price=val.ot_price.replace(/^([0-9-]\d*\.?\d{0,2})?.*$/,'$1') val.ot_price=val.ot_price.replace(/^([0-9-]\d*\.?\d{0,2})?.*$/,'$1')
// val.proportion = (val.cost/val.price).toFixed(2)
// val.growth = parseInt(val.price*(0.9-(val.cost/val.price)))
if(!val.price){ if(!val.price){
this.$message.error('成本价低于0') this.$message.error('成本价低于0')
} }
@ -528,18 +543,25 @@ export default {
content: info.content, content: info.content,
store_info: info.store_info store_info: info.store_info
} }
let oneFormBatch= [
{
image: '',
price: 0,
proportion:0.6,
growth:0,
cost: 0,
ot_price: 0,
stock: 0,
bar_code: '',
weight: 0,
volume: 0
}
]
this.oneFormBatch = oneFormBatch
if (this.formValidate.spec_type === 0) { if (this.formValidate.spec_type === 0) {
this.OneattrValue = info.attrValue.map((item) => { this.OneattrValue = info.attrValue
item.growth = (item.price * 0.3).toFixed(2)
item.proportion = '0.6'
return item
})
} else { } else {
this.ManyAttrValue = info.attrValue.map((item) => { this.ManyAttrValue = info.attrValue
item.growth = (item.price * 0.3).toFixed(2)
item.proportion = '0.6'
return item
})
console.log(this.ManyAttrValue); console.log(this.ManyAttrValue);
this.ManyAttrValue.forEach(val => { this.ManyAttrValue.forEach(val => {
if (val.detail !== 'undefined' && val.detail !== null) { if (val.detail !== 'undefined' && val.detail !== null) {

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

@ -155,6 +155,11 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="remark" label="商家备注" min-width="100" /> <el-table-column prop="remark" label="商家备注" min-width="100" />
<el-table-column label="是否惠美乡村店铺" min-width="100">
<template slot-scope="scope">
<span>{{ scope.row.merchant.is_huimei ? '是' : '否' }}</span>
</template>
</el-table-column>
<el-table-column label="是否惠美乡村产品" min-width="100"> <el-table-column label="是否惠美乡村产品" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.is_huimei ? '是' : '否' }}</span> <span>{{ scope.row.is_huimei ? '是' : '否' }}</span>
@ -188,7 +193,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="refusal" label="拒绝/锁定原因" min-width="110" /> <el-table-column prop="refusal" label="拒绝/锁定原因" min-width="110" />
<el-table-column prop="create_time" label="创建时间" min-width="120" /> <el-table-column prop="create_time" label="创建时间" min-width="120" />
<el-table-column v-if="Number(tableFrom.type) != 7" key="8" label="操作" min-width="210" fixed="right"> <el-table-column key="8" label="操作" min-width="210" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" @click="onDetails(scope.row.product_id)">详情</el-button> <el-button type="text" size="small" @click="onDetails(scope.row.product_id)">详情</el-button>
<el-button v-if="tableFrom.type === '6' || tableFrom.type === '10' || tableFrom.type === '11'" type="text" size="small" @click.native="toExamine(scope.row.product_id)">审核</el-button> <el-button v-if="tableFrom.type === '6' || tableFrom.type === '10' || tableFrom.type === '11'" type="text" size="small" @click.native="toExamine(scope.row.product_id)">审核</el-button>
@ -221,6 +226,9 @@
<info-from ref="infoFrom" :is-show="isShow" :ids="OffId" @subSuccess="subSuccess" /> <info-from ref="infoFrom" :is-show="isShow" :ids="OffId" @subSuccess="subSuccess" />
<el-dialog title="商品编辑" :visible.sync="dialogVisible" width="960px" :before-close="handleClose" :append-to-body='append'> <el-dialog title="商品编辑" :visible.sync="dialogVisible" width="960px" :before-close="handleClose" :append-to-body='append'>
<el-form ref="formValidate" v-loading="fullscreenLoading" class="formValidate mt20" :rules="ruleValidate" :model="formValidate" size="small" label-width="100px" @submit.native.prevent> <el-form ref="formValidate" v-loading="fullscreenLoading" class="formValidate mt20" :rules="ruleValidate" :model="formValidate" size="small" label-width="100px" @submit.native.prevent>
<el-form-item label="品牌名称：" prop="store_name">
<el-input :disabled='true' :value="formValidate.qualification&&formValidate.qualification.brands_name" size="small" placeholder="请输入商品名称" />
</el-form-item>
<el-form-item label="商品名称：" prop="store_name"> <el-form-item label="商品名称：" prop="store_name">
<el-input v-model="formValidate.store_name" size="small" placeholder="请输入商品名称" /> <el-input v-model="formValidate.store_name" size="small" placeholder="请输入商品名称" />
</el-form-item> </el-form-item>
@ -474,6 +482,7 @@ export default {
keyword:'', keyword:'',
cate_id:0, cate_id:0,
slider_image: [], slider_image: [],
qualification:{}
}, },
productStatusList: [ productStatusList: [
{ label: "上架显示", value: 1 }, { label: "上架显示", value: 1 },
@ -741,7 +750,8 @@ export default {
star: info.star, star: info.star,
keyword:info.keyword, keyword:info.keyword,
cate_id:info.cate_id, cate_id:info.cate_id,
slider_image: info.slider_image slider_image: info.slider_image,
qualification:info.qualification
} }
if(info.is_benefit === 1) this.checkboxGroup.push('is_benefit') if(info.is_benefit === 1) this.checkboxGroup.push('is_benefit')
if(info.is_hot === 1) this.checkboxGroup.push('is_hot') if(info.is_hot === 1) this.checkboxGroup.push('is_hot')

12
src/views/product/productExamine/info.vue
View File

@ -332,7 +332,7 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column v-for="(item,iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center" min-width="120"> <el-table-column v-for="(item,iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center" min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<a v-if="iii==='gist_url'" :href="scope.row[iii]" target="_blank">{{ scope.row[iii] }}</a> <a v-if="iii==='gist_url'" :href="scope.row[iii]" target="_blank">{{ scope.row[iii] }}</a>
<span v-else class="priceBox" v-text="scope.row[iii]" /> <span v-else class="priceBox" v-text="scope.row[iii]" />
@ -492,7 +492,9 @@ const defaultObj = {
svip_price: null, svip_price: null,
cost: null, cost: null,
ot_price: null, ot_price: null,
stock: null, proportion:0.6,
stock: 0,
growth:0,
bar_code: '', bar_code: '',
weight: null, weight: null,
volume: null, volume: null,
@ -517,9 +519,15 @@ const objTitle = {
ot_price: { ot_price: {
title: '市场价' title: '市场价'
}, },
proportion: {
title: '占比'
},
stock: { stock: {
title: '库存' title: '库存'
}, },
growth: {
title: '成长值'
},
bar_code: { bar_code: {
title: '商品编号' title: '商品编号'
}, },

26
src/views/product/productExamine/proDetails.vue
View File

@ -67,11 +67,19 @@
<!-- <img v-for="(pic,idx) in productData.slider_image" :key="idx" :src="pic" style="width:40px;height:40px;margin-right:12px;"/> --> <!-- <img v-for="(pic,idx) in productData.slider_image" :key="idx" :src="pic" style="width:40px;height:40px;margin-right:12px;"/> -->
</li> </li>
</ul> </ul>
<li class="item item100"> <ul class="list">
<li class="item">
<div class="item-title">商品简介：</div> <div class="item-title">商品简介：</div>
<div class="value">{{productData.store_info}}</div> <div class="value">{{productData.store_info}}</div>
</li> </li>
<ul class="list"> <li class="item">
<div class="item-title">商品名称：</div>
<div class="value">{{productData.store_name}}</div>
</li>
<li class="item">
<div class="item-title">品牌名称：</div>
<div class="value">{{productData.qualification&&productData.qualification.brands_name}}</div>
</li>
<li class="item"> <li class="item">
<div class="item-title">平台分类：</div> <div class="item-title">平台分类：</div>
<div class="value">{{productData.storeCategory&&productData.storeCategory.cate_name || '-'}}</div> <div class="value">{{productData.storeCategory&&productData.storeCategory.cate_name || '-'}}</div>
@ -173,7 +181,7 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column v-for="(item,iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center" min-width="120"> <el-table-column v-for="(item,iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center" min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="priceBox" v-text="scope.row[iii]" /> <span class="priceBox" v-text="scope.row[iii]" />
</template> </template>
@ -208,7 +216,7 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column v-for="(item,iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center" min-width="100"> <el-table-column v-for="(item,iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center" min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="priceBox">{{ scope.row[iii] }}</span> <span class="priceBox">{{ scope.row[iii] }}</span>
</template> </template>
@ -777,7 +785,9 @@ const defaultObj = {
svip_price: null, svip_price: null,
cost: null, cost: null,
ot_price: null, ot_price: null,
stock: null, proportion:0.6,
stock: 0,
growth:0,
bar_code: '', bar_code: '',
weight: null, weight: null,
volume: null volume: null
@ -801,9 +811,15 @@ const objTitle = {
ot_price: { ot_price: {
title: '市场价' title: '市场价'
}, },
proportion: {
title: '占比'
},
stock: { stock: {
title: '库存' title: '库存'
}, },
growth: {
title: '成长值'
},
bar_code: { bar_code: {
title: '商品编号' title: '商品编号'
}, },

67
src/views/user/list/index.vue
View File

@ -19,6 +19,9 @@
<el-option v-for="(item, index) in groupList" :key="index" :value="item.group_id" :label="item.group_name" /> <el-option v-for="(item, index) in groupList" :key="index" :value="item.group_id" :label="item.group_name" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="身份证号码：" prop="card_id" label-width="100px">
<el-input placeholder="请输入身份证号码" v-model="userFrom.card_id" clearable></el-input>
</el-form-item>
<el-form-item label="用户标签：" prop="label_id"> <el-form-item label="用户标签：" prop="label_id">
<el-select v-model="userFrom.label_id" placeholder="请选择" class="selWidth" clearable filterable @change="changeSearch(1)"> <el-select v-model="userFrom.label_id" placeholder="请选择" class="selWidth" clearable filterable @change="changeSearch(1)">
<el-option v-for="(item, index) in labelLists" :key="index" :value="item.label_id" :label="item.label_name" /> <el-option v-for="(item, index) in labelLists" :key="index" :value="item.label_id" :label="item.label_name" />
@ -144,6 +147,7 @@
</el-tabs> </el-tabs>
<div class="mb20"> <div class="mb20">
<el-button type="primary" size="small" @click="createUser">创建用户</el-button> <el-button type="primary" size="small" @click="createUser">创建用户</el-button>
<el-button type="primary" size="small" @click="GetverifyCode">验证码查询</el-button>
<el-button v-show="user_type === 'wechat'" size="small" @click="sendNews">发送图文消息</el-button> <el-button v-show="user_type === 'wechat'" size="small" @click="sendNews">发送图文消息</el-button>
<el-button :disabled="checkedIds.length == 0" size="small" @click="batchGroup">批量设置分组</el-button> <el-button :disabled="checkedIds.length == 0" size="small" @click="batchGroup">批量设置分组</el-button>
<el-button :disabled="checkedIds.length == 0" size="small" @click="batchlabel">批量设置标签</el-button> <el-button :disabled="checkedIds.length == 0" size="small" @click="batchlabel">批量设置标签</el-button>
@ -224,6 +228,8 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="phone" label="手机号" min-width="120" /> <el-table-column prop="phone" label="手机号" min-width="120" />
<el-table-column prop="real_name" label="真实姓名" min-width="120" />
<el-table-column prop="card_id" label="身份证号码" min-width="120" />
<el-table-column label="等级" min-width="100"> <el-table-column label="等级" min-width="100">
<template slot-scope="{row}"> <template slot-scope="{row}">
<span>{{ row.member?row.member.brokerage_name:'-' }}</span> <span>{{ row.member?row.member.brokerage_name:'-' }}</span>
@ -279,6 +285,20 @@
<news-category v-if="visible" :is-show-send="isShowSend" :wechat-ids="wechatIds" :user-ids="ids" :max-cols="maxCols" /> <news-category v-if="visible" :is-show-send="isShowSend" :wechat-ids="wechatIds" :user-ids="ids" :max-cols="maxCols" />
<!--<span slot="footer" class="dialog-footer" />--> <!--<span slot="footer" class="dialog-footer" />-->
</el-dialog> </el-dialog>
<el-dialog title="验证码查询" :visible.sync="verifyCode" width="800px" :before-close="()=>verifyCode=false">
<el-form ref="verify" :model="verify" :rules="rules" label-width="80px">
<el-form-item label="手机号" prop="phone">
<el-input v-model="verify.phone" placeholder="请输入手机号" />
</el-form-item>
<el-form-item label="验证码信息" v-if="verifyInfo">
<span style="font-size: 24px;color: green;">{{verifyInfo}}</span>
</el-form-item>
<div class="btn_bottom">
<el-button type="primary" size="small" @click="handleRefer">查询</el-button>
</div>
</el-form>
<!--<span slot="footer" class="dialog-footer" />-->
</el-dialog>
<!--创建用户--> <!--创建用户-->
<user-create <user-create
@closeDrawer="closeDrawer" @closeDrawer="closeDrawer"
@ -343,13 +363,22 @@ import {
extendInfo, extendInfo,
exportUserApi, exportUserApi,
userInfoSelectApi, userInfoSelectApi,
userMemberListApi userMemberListApi,
sysVerifyCodeApi
} from '@/api/user' } from '@/api/user'
import newsCategory from '@/components/newsCategory/index.vue' import newsCategory from '@/components/newsCategory/index.vue'
import userDetail from './userDetails' import userDetail from './userDetails'
import userCreate from './userCreate' import userCreate from './userCreate'
import couponList from './couponList' import couponList from './couponList'
import createWorkBook from '@/utils/newToExcel.js' import createWorkBook from '@/utils/newToExcel.js'
const checkMobile = (rule, value, cb) => {
const regMobile = /^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57])[0-9]{8}$/;
if (regMobile.test(value)) {
// 合法的手机号码
return cb();
}
cb(new Error("手机号码格式不正确"));
};
export default { export default {
name: 'UserList', name: 'UserList',
components: { components: {
@ -361,6 +390,14 @@ export default {
data() { data() {
return { return {
moren: require("@/assets/images/f.png"), moren: require("@/assets/images/f.png"),
verifyCode:false,
verifyInfo:'',
verify:{
phone:''
},
rules :{
phone: [{ required: true, message: "手机号不能为空", trigger: "blur" },{ validator: checkMobile, trigger: ["blur"] }],
},
pickerOptions: { pickerOptions: {
shortcuts: [{ shortcuts: [{
text: '今天', text: '今天',
@ -535,6 +572,24 @@ export default {
this.$refs.searchForm.resetFields() this.$refs.searchForm.resetFields()
this.changeSearch(1) this.changeSearch(1)
}, },
handleRefer(){
this.$refs['verify'].validate((valid) => {
if (valid) {
sysVerifyCodeApi(this.verify).then((res)=>{
if(res.status == 200){
this.verifyInfo = res.message
}else{
this.verifyInfo = ''
this.$message.warning(res.message)
}
}).catch((res)=>{
this.verifyInfo = ''
this.$message.error(res.message)
})
}
});
},
changeSearch(num){ changeSearch(num){
this.resetSearchVal() this.resetSearchVal()
switch(this.select){ switch(this.select){
@ -723,6 +778,12 @@ export default {
// this.$modalForm(createUserApi()).then(() => this.getList('')) // this.$modalForm(createUserApi()).then(() => this.getList(''))
this.createDrawer = true this.createDrawer = true
}, },
// 验证码查询
GetverifyCode() {
this.verify.phone = ''
this.verifyInfo = ''
this.verifyCode = true
},
// 分组列表 // 分组列表
groupLists() { groupLists() {
groupLstApi({ groupLstApi({
@ -939,6 +1000,10 @@ export default {
.check { .check {
color: #00a2d4; color: #00a2d4;
} }
.btn_bottom{
display: flex;
justify-content: end
}
.dia ::v-deep .el-dialog__body { .dia ::v-deep .el-dialog__body {
height: 700px !important; height: 700px !important;
} }