This commit is contained in:
SK-20231103YIXF\Administrator 2024-04-08 16:42:44 +08:00
parent 20834e3d99
commit 7ce2829aa5
5 changed files with 595 additions and 512 deletions

View File

@ -7,7 +7,8 @@
<view class="c-head">
<view :class="type==2?'left':'right'" @click="changeType(2)">增收销售补贴</view>
<!-- <view :class="type==1?'left':'right'" @click="changeType(1)">春耕采购补贴</view> -->
<view v-if="mer_info.type_code=='PersonalStore'" :class="type==1?'left':'right'" @click="changeType(1)">春耕采购补贴</view>
<view v-if="mer_info.type_code=='PersonalStore'" :class="type==1?'left':'right'"
@click="changeType(1)">春耕采购补贴</view>
<view v-else></view>
</view>
<view class="c-body-title">
@ -27,7 +28,7 @@
<image @click="back" class="bg_back"
src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/back.png"></image>
<view class="bg_title">补贴进度</view>
<view class="body" >
<view class="body">
<view class="b-card" v-if="type==1">
<view class="b-top">
<view>春耕采购金额{{info.spring_subsidy}}</view>
@ -36,7 +37,9 @@
<view class="b-bottom">
<view class="pro">
<view class="loss" :style="{left: `-${100-info.spring_subsidy_rate}%`}">
<image class="image" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/f805f20240229155704834.webp"></image>
<image class="image"
src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/f805f20240229155704834.webp">
</image>
<view class="text">{{info.spring_subsidy_rate}}%</view>
</view>
@ -53,7 +56,9 @@
<view class="b-bottom">
<view class="pro">
<view class="loss" :style="{left: `-${100-info.sale_finish_rate}%`}">
<image class="image" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/f805f20240229155704834.webp"></image>
<image class="image"
src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/f805f20240229155704834.webp">
</image>
<view class="text">{{info.sale_finish_rate}}%</view>
</view>
</view>
@ -69,7 +74,9 @@
<view class="b-bottom">
<view class="pro">
<view class="loss" :style="{left: `-${100-info.purchase_finish_rate}%`}">
<image class="image" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/f805f20240229155704834.webp"></image>
<image class="image"
src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/f805f20240229155704834.webp">
</image>
<view class="text">{{info.purchase_finish_rate}}%</view>
</view>
@ -87,7 +94,9 @@
<view class="b-bottom">
<view class="pro">
<view class="loss" :style="{left: `-${100-info.official_purchase_finish_rate}%`}">
<image class="image" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/f805f20240229155704834.webp"></image>
<image class="image"
src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/f805f20240229155704834.webp">
</image>
<view class="text">{{info.official_purchase_finish_rate}}%</view>
</view>
@ -104,7 +113,9 @@
<view class="b-bottom">
<view class="pro">
<view class="loss" :style="{left: `-${100-info.purchase_finish_rate}%`}">
<image class="image" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/f805f20240229155704834.webp"></image>
<image class="image"
src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/f805f20240229155704834.webp">
</image>
<view class="text">{{info.purchase_finish_rate}}%</view>
</view>
@ -115,7 +126,11 @@
</view>
</block>
<view class="b-tips" v-if="type==1">
*春耕采购余额使用完采购金额和销售金额达到后才可获取补贴
*春耕采购余额使用完采购金额和销售金额达到后才可获取补贴<br>
*当进度完成时将在每月月底进行统计审核审核完成后经本人确认一个季度内到账
</view>
<view class="b-tips" v-if="type==2">
*当进度完成时将在每月月底进行统计审核审核完成后经本人确认一个季度内到账
</view>
<view class="b-list">
<view class="list-head"></view>
@ -127,7 +142,8 @@
<view>状态</view>
</view>
<view class="list-b-text" v-for="(item,index) in list" :key="index">
<view class="item1">{{ cPrice2(item.extra.official_purchase_target, item.extra.purchase_target) }}</view>
<view class="item1">
{{ cPrice2(item.extra.official_purchase_target, item.extra.purchase_target) }}</view>
<view class="item2">{{ item.extra.sale_target }}</view>
<view class="item3">
<text v-if="item.id==0">{{cPrice(item.coupon_price)}}</text>
@ -135,7 +151,8 @@
</view>
<view class="item4" @click="showPopup(item.send_status, item.id)">
<!-- send_status 发放状态-1未激活0待审核1待领取2已完成 -->
<text v-if="item.send_status==2||item.send_status==1" style="color: #FF5E0C;">{{item.send_status_cn}}</text>
<text v-if="item.send_status==2||item.send_status==1"
style="color: #FF5E0C;">{{item.send_status_cn}}</text>
<text v-else>{{item.send_status_cn}}</text>
</view>
</view>
@ -147,11 +164,15 @@
<uni-popup type="center" ref="pupRef">
<view style="width: 630rpx;height: 500rpx;position: relative;">
<view style="position: absolute;top: 0;right: 10rpx;" @click="closePopup">
<image style="width: 50rpx;height: 50rpx;" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/c8b19202403201714381681.webp"></image>
<image style="width: 50rpx;height: 50rpx;"
src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/c8b19202403201714381681.webp"></image>
</view>
<view style="width: 630rpx;position: absolute;top: 70rpx;right: 0;" :class="[send_status_cn>0?'h430':'h310']">
<image style="width: 100%;" :class="[send_status_cn>0?'h430':'h310']" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/23ad8202403201716417527.webp"></image>
<view style="position: absolute;top: 0;left: 0;width: 100%;height: 100%;padding: 30rpx;display: flex;flex-direction: column;justify-content: center;">
<view style="width: 630rpx;position: absolute;top: 70rpx;right: 0;"
:class="[send_status_cn>0?'h430':'h310']">
<image style="width: 100%;" :class="[send_status_cn>0?'h430':'h310']"
src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/23ad8202403201716417527.webp"></image>
<view
style="position: absolute;top: 0;left: 0;width: 100%;height: 100%;padding: 30rpx;display: flex;flex-direction: column;justify-content: center;">
<view style="padding-bottom: 50rpx;font-size: 32rpx;color: #2E2E2E;">
<text v-if="send_status_cn==-1">补贴未激活</text>
<text v-else-if="send_status_cn==0">补贴审核中</text>
@ -166,15 +187,24 @@
电话13627640188
</text>
</view>
<view v-if="send_status_cn==10" style="background-color: #fff;border-radius: 20rpx;padding: 20rpx;">
<textarea v-model="reason" placeholder="请填写错误内容" style="height: 100rpx;"/>
<view v-if="send_status_cn==10"
style="background-color: #fff;border-radius: 20rpx;padding: 20rpx;">
<textarea v-model="reason" placeholder="请填写错误内容" style="height: 100rpx;" />
</view>
<view v-if="send_status_cn==1" style="display: flex;justify-content: center;margin-top: 30rpx;color: #F98144;">
<view @click="reAudit" style="padding: 9rpx 50rpx 12rpx 50rpx;border-radius: 40rpx;border: 4rpx solid #F98144;margin-right: 100rpx;">错误</view>
<view @click="couponReceive" style="padding: 9rpx 50rpx 12rpx 50rpx;border-radius: 40rpx;border: 4rpx solid #F98144;color: #FFF;background-color: #F98144;">正确</view>
<view v-if="send_status_cn==1"
style="display: flex;justify-content: center;margin-top: 30rpx;color: #F98144;">
<view @click="reAudit"
style="padding: 9rpx 50rpx 12rpx 50rpx;border-radius: 40rpx;border: 4rpx solid #F98144;margin-right: 100rpx;">
错误</view>
<view @click="couponReceive"
style="padding: 9rpx 50rpx 12rpx 50rpx;border-radius: 40rpx;border: 4rpx solid #F98144;color: #FFF;background-color: #F98144;">
正确</view>
</view>
<view v-else-if="send_status_cn==10" style="display: flex;justify-content: center;margin-top: 30rpx;color: #F98144;">
<view @click="couponRefuse" style="padding: 9rpx 50rpx 12rpx 50rpx;border-radius: 40rpx;border: 4rpx solid #F98144;color: #FFF;background-color: #F98144;">提交</view>
<view v-else-if="send_status_cn==10"
style="display: flex;justify-content: center;margin-top: 30rpx;color: #F98144;">
<view @click="couponRefuse"
style="padding: 9rpx 50rpx 12rpx 50rpx;border-radius: 40rpx;border: 4rpx solid #F98144;color: #FFF;background-color: #F98144;">
提交</view>
</view>
</view>
</view>
@ -186,8 +216,15 @@
</template>
<script>
import { getSubsidy, getSubsidyRecord, couponReceive, couponRefuse } from "@/api/admin.js"
import { Toast } from "../../libs/uniApi";
import {
getSubsidy,
getSubsidyRecord,
couponReceive,
couponRefuse
} from "@/api/admin.js"
import {
Toast
} from "../../libs/uniApi";
export default {
data() {
return {
@ -198,19 +235,19 @@
send_status_cn: '1',
send_id: 0,
reason: '',
where:{
where: {
page: 1,
limit: 20,
type: 2
},
mer_info:{
mer_info: {
type_code: ''
}
}
},
onLoad() {
let user = this.$store.state.app.userInfo;
if(typeof user == 'string') user = JSON.parse(user);
if (typeof user == 'string') user = JSON.parse(user);
this.mer_info.type_code = user.mer_info.type_code;
this.mer_id = user.service.mer_id;
this.getSubsidy();
@ -221,82 +258,83 @@
},
onShow() {},
methods: {
showPopup(type, send_id){
showPopup(type, send_id) {
this.send_status_cn = type;
this.send_id = send_id;
if(type==2) Toast('已经领取过啦');
if (type == 2) Toast('已经领取过啦');
else this.$refs.pupRef.open();
},
closePopup(){
closePopup() {
this.$refs.pupRef.close();
},
back() {
uni.navigateBack();
},
changeType(type){
changeType(type) {
this.type = type;
this.where.type = type;
this.getSubsidy();
this.getSubsidyRecord();
},
getSubsidy(){
if(!this.mer_id) return ;
getSubsidy() {
if (!this.mer_id) return;
getSubsidy(this.mer_id, {
type: this.type
}).then(res=>{
}).then(res => {
this.info = res.data;
})
},
couponReceive(){
couponReceive() {
this.closePopup();
couponReceive({
mer_id: this.mer_id,
id: this.send_id,
}).then(res=>{
this.$nextTick(()=>{
}).then(res => {
this.$nextTick(() => {
Toast('领取成功')
})
}).catch(err=>{
this.$nextTick(()=>{
}).catch(err => {
this.$nextTick(() => {
Toast(err)
})
})
},
reAudit(){
reAudit() {
this.send_status_cn = 10;
},
couponRefuse(){
if(this.reason=='') return Toast('错误内容不能为空');
couponRefuse() {
if (this.reason == '') return Toast('错误内容不能为空');
this.closePopup();
couponRefuse({
mer_id: this.mer_id,
id: this.send_id,
reason: this.reason
}).then(res=>{
this.$nextTick(()=>{
}).then(res => {
this.$nextTick(() => {
Toast('提交成功')
})
}).catch(err=>{
this.$nextTick(()=>{
}).catch(err => {
this.$nextTick(() => {
Toast(err)
})
})
},
getSubsidyRecord(){
getSubsidyRecord(this.mer_id, this.where).then(res=>{
getSubsidyRecord() {
getSubsidyRecord(this.mer_id, this.where).then(res => {
this.list = res.data.record;
})
},
cPrice(n){ //
let t = Number(this.info.official_purchase_finish_rate) + Number(this.info.purchase_finish_rate) + Number(this.info.sale_finish_rate);
t/=3*100;
t==0?t=1:null;
return (+n*t).toFixed(2);
cPrice(n) { //
let t = Number(this.info.official_purchase_finish_rate) + Number(this.info.purchase_finish_rate) + Number(
this.info.sale_finish_rate);
t /= 3 * 100;
t == 0 ? t = 1 : null;
return (+n * t).toFixed(2);
},
cPrice2(a,b){
cPrice2(a, b) {
a = Number(a);
b = Number(b);
return (a+b).toFixed(2)
return (a + b).toFixed(2)
}
},
onPullDownRefresh() {
@ -306,9 +344,10 @@
</script>
<style lang="scss">
page{
page {
background-color: #fff;
}
.page {
position: relative;
font-size: 28rpx;
@ -321,7 +360,8 @@
left: 0;
width: 750rpx;
height: 530rpx;
.card{
.card {
position: absolute;
transition: 300ms;
bottom: 30rpx;
@ -333,48 +373,57 @@
background-size: 100% 100%;
background-repeat: no-repeat;
padding-bottom: 40rpx;
.c-head{
.c-head {
display: flex;
justify-content: space-around;
height: 90rpx;
overflow: hidden;
margin-top: 20rpx;
view{
view {
flex: 1;
text-align: center;
}
.left{
.left {
font-size: 32rpx;
color: #DF4104;
line-height: 80rpx;
}
.right{
.right {
color: #7A7A7A;
line-height: 100rpx;
}
}
.c-body-title{
.c-body-title {
display: flex;
justify-content: space-around;
color: #2E2E2E;
height: 70rpx;
align-items: center;
}
.c-body-text{
.c-body-text {
display: flex;
justify-content: space-around;
color: #7A7A7A;
height: 70rpx;
align-items: center;
.price{
.price {
color: #F13B3B;
}
}
}
.card2{
.card2 {
background-image: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e5b2e202402291538018132.webp');
}
.bottom{
.bottom {
position: absolute;
left: 0;
bottom: -1px;
@ -403,40 +452,46 @@
transform: translate(-50%);
}
.body{
.body {
padding: 530rpx 30rpx 30rpx 30rpx;
.b-card{
.b-card {
padding-bottom: 30rpx;
.b-top{
.b-top {
display: flex;
justify-content: space-between;
font-size: 26rpx;
}
.b-bottom{
.b-bottom {
display: flex;
justify-content: space-between;
align-items: center;
height: 80rpx;
.pro{
.pro {
width: 570rpx;
height: 28rpx;
border-radius: 28rpx;
overflow: hidden;
position: relative;
background-color: #ffdfce;
.loss{
.loss {
width: 570rpx;
height: 28rpx;
position: absolute;
top: 0;
left: -100%;
}
.image{
.image {
width: 570rpx;
height: 28rpx;
}
.text{
.text {
position: absolute;
right: 0;
top: 0;
@ -451,61 +506,73 @@
}
}
}
.b-tips{
.b-tips {
color: #7A7A7A;
font-size: 24rpx;
margin-bottom: 30rpx;
}
.b-list{
.list-head{
.b-list {
.list-head {
width: 690rpx;
height: 45rpx;
background: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/def/7bc46202402291702073308.webp');
background-size: 100% 100%;
background-repeat: no-repeat;
}
.list-body{
.list-b-title{
.list-body {
.list-b-title {
padding: 20rpx 0;
display: flex;
view{
view {
flex: 1;
text-align: center;
flex-shrink: 0;
}
}
.list-b-text{
.list-b-text {
background-color: #F9F9F9;
border-radius: 12rpx;
padding: 20rpx 0;
margin-bottom: 20rpx;
display: flex;
font-size: 24rpx;
view{
view {
flex: 1;
text-align: center;
flex-shrink: 0;
}
.item1{
.item1 {
color: #F13B3B;
}
.item2{
.item2 {
color: #20A162;
}
.item3{
.item3 {
color: #FF8056;
}
.item4{
.item4 {
color: #2E2E2E;
}
}
}
}
}
.h430{
.h430 {
height: 430rpx;
}
.h310{
.h310 {
height: 310rpx;
}
</style>

View File

@ -651,6 +651,9 @@
let userInfo = this.$store.state.app.userInfo;
if (typeof userInfo == 'string') userInfo = JSON.parse(userInfo);
let showFlag = '';
console.log(postData);
postData.attrValue.forEach(t => {
if (userInfo.mer_info.wholesale && (!t.wholesale_price || +t.wholesale_price <= 0)) {
showFlag = '批发价不能小于0'

View File

@ -104,10 +104,9 @@
form: {
handler(val) {
this.formData = val;
//
this.formData.price = '';
this.formData.stock = '';
if (!this.formData.price || this.formData.price == '0.00') this.formData.price = '';
if (!this.formData.stock) this.formData.stock = '';
},
deep: true
}

View File

@ -82,7 +82,7 @@
</view>
<!-- 相关凭证 -->
<view class="withdrawal-envidence">
<view class="withdrawal-envidence" v-if="isCompany == 1">
<view class="withdrawal-envidence">
<text class="withdrawal-envidence-main">请上传相关凭证</text>
<text class="withdrawal-envidence-sub">(图片格式支持JPGPNGJPEG)</text>
@ -164,8 +164,19 @@
</view>
<!-- 提现账户 -->
<u-action-sheet title="请选择提现账户" :actions="list" :show="show" round="15" @select="handleSelected"
@close="show = false" :safeAreaInsetBottom='true'></u-action-sheet>
<u-action-sheet title="请选择提现账户" :show="show" round="15" @close="show = false">
<view class="actions" style="padding-bottom: 0;">
<view class="actions-wrap">
<block v-for="(item ,indx) in list" :key="indx">
<view class="actions-item" @click="handleSelected(item)">
<text :class="{'textactive':bindForm.bank == item.name}">{{item.name}}</text>
</view>
</block>
</view>
</view>
<!-- 底部安全范围 -->
<u-safe-bottom></u-safe-bottom>
</u-action-sheet>
<!-- 银行 -->
<u-action-sheet title="请选择银行" :show="bankShow" round="15" @close="bankShow = false">
@ -214,7 +225,8 @@
id: 0,
icon: ''
},
mer_id: ''
mer_id: '',
isCompany: ''
}
},
@ -230,7 +242,7 @@
name: '对公账户'
}];
this.bindForm.is_own = 1;
//
//
this.bindForm.name = JSON.parse(this.$Cache.get("USER_INFO")).mer_info.company_name;
} else if (opt.hasOwnProperty('isOwn') && opt.isOwn == 1) {
this.list = [{
@ -241,8 +253,8 @@
this.bindForm.name = JSON.parse(this.$Cache.get("USER_INFO")).mer_info.real_name;
} else {
this.bindForm.is_own = 1;
//
this.bindForm.name = JSON.parse(this.$Cache.get("USER_INFO")).mer_info.real_name;
//
this.bindForm.name = JSON.parse(this.$Cache.get("USER_INFO")).mer_info.company_name;
this.list = [{
name: '对公账户'
}, {
@ -252,6 +264,7 @@
// , is_company =0
const isCompany = JSON.parse(this.$Cache.get("USER_INFO")).mer_info.is_company;
this.isCompany = isCompany;
if (isCompany != 1) {
this.bindForm.is_own = 0;
this.list = [{
@ -372,7 +385,8 @@
}).catch(err => {
uni.showToast({
title: err,
duration: 3000
duration: 3000,
icon: "none"
})
})
},

View File

@ -104,7 +104,7 @@
<!-- 协议 -->
<view class="withdrawal-pro">
<text class="withdrawal-pro-progress" @click="viewProgress">查看审核进度</text>
<text class="withdrawal-pro-progress" @click="viewProgress">账户开通审核进度</text>
</view>
<!-- 提示 -->