From efa9bfe98ba906e4c9b8f49c89f5da162a46bb0f Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期一, 13 一月 2025 10:21:24 +0800
Subject: [PATCH] 1.微信一键登录：新增“同意用户协议”之后才可登录
---
sub_pages/partner/delivery/delivery-detail.vue | 138 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 105 insertions(+), 33 deletions(-)
diff --git a/sub_pages/partner/delivery/delivery-detail.vue b/sub_pages/partner/delivery/delivery-detail.vue
index cae20ce..8e486f2 100644
--- a/sub_pages/partner/delivery/delivery-detail.vue
+++ b/sub_pages/partner/delivery/delivery-detail.vue
@@ -15,8 +15,8 @@
form: {
id: '',
status: '',
- checkImageList: [],
- checkRemarks: '',
+ pictureList: [],
+ remarks: '',
deductAmount: 0,
},
check_status: [
@@ -44,9 +44,16 @@
target_levels: [],
};
},
+ async onShow() {
+ if (this.sign['delivery']) {
+ await this.$store.dispatch('sign_clear', 'delivery');
+ this.refreshList()
+ }
+ },
async onLoad(options) {
this.id = options.id || ''
-
+ // this.form.status='reduce'
+ // this.$refs.popup_form.open()
this.$http.request('get', '/api/code/value', {
params: {
type: 'FLOWER_LEVEL'
@@ -82,10 +89,11 @@
})
this.$message.hideLoading()
if (code === 0) {
- this.$message.showToast('操作成功')
- setTimeout(() => {
- this.init()
- }, 500)
+ await this.$message.showToast('操作成功')
+ this.init()
+ // setTimeout(() => {
+ // this.init()
+ // }, 500)
}
return
}
@@ -103,16 +111,16 @@
statusStr: '',
num: 0,
remarks: '',
+ pictureList: [],
}
if (status === 'reduce') {
this.form = {
...this.form,
- pictureList: [item.id],
deductAmount: 0,
targetLevel: '',
- checkImageList: [],
+ pictureList: [],
}
}
@@ -136,10 +144,12 @@
})
this.$message.hideLoading()
if (code === 0) {
- this.$message.showToast('操作成功')
this.form = {
...this.form,
...(data || {})
+ }
+ if (!this.form.pictureList) {
+ this.form.pictureList = []
}
//显示
this.$refs.popup_form.open()
@@ -153,8 +163,31 @@
this.$message.showToast('扣款金额需要大于等于0')
return
}
+ if (this.form.deductAmount) {
+ if ((parseInt(this.form.deductAmount * 100) / 100) != this.form.deductAmount) {
+ this.$message.showToast('扣款金额最多2位小数字')
+ return
+ }
+ }
+ if (parseInt(this.form.deductAmount * 100) / 100 != this.form.deductAmount) {
+
+ }
if (isNaN(parseInt(this.form.num)) || this.form.num < 0) {
this.$message.showToast('数量需要大于等于0')
+ return
+ }
+ if (!this.form.pictureList || this.form.pictureList.length < 1) {
+ this.$message.showToast('未上传图片')
+ return
+ }
+ if (!this.form.targetLevel) {
+ this.$message.showToast('未选择降级等级')
+ return
+ }
+ }
+ if (this.form.status == 'lack') {
+ if (!this.form.pictureList || this.form.pictureList.length < 1) {
+ this.$message.showToast('未上传图片')
return
}
}
@@ -177,11 +210,15 @@
})
this.$message.hideLoading()
if (code === 0) {
- this.$message.showToast('操作成功')
this.$refs.popup_form.close()
- setTimeout(() => {
- this.init()
- }, 500)
+ await this.$store.dispatch('sign_add', 'delivery')
+
+ await this.$message.showToast('操作成功')
+ this.init()
+
+ // setTimeout(() => {
+ // this.init()
+ // }, 500)
}
},
async init() {
@@ -209,7 +246,7 @@
}
},
deleteCheckImage(index) {
- this.form.checkImageList.splice(index, 1)
+ this.form.pictureList.splice(index, 1)
},
uploadCheckImage() {
let that = this
@@ -232,12 +269,13 @@
0]
.url || ''
that.$message.hideLoading()
- that.form.checkImageList.push(pic)
+ that.form.pictureList.push(pic)
console.log('form', that.form)
that.$forceUpdate()
}).catch(res => {
that.$message.hideLoading()
console.error(res)
+ that.$message.showToast('文件上传失败，请联系管理员')
})
}
}
@@ -245,7 +283,9 @@
},
printDeliveryOrder(item) {
// this.$message.showToast('敬请期待')
- this.$storage.setItem('cache_delivery_order_print', JSON.stringify(item))
+ var arr = []
+ arr.push(item)
+ this.$storage.setItem('cache_delivery_order_print', JSON.stringify(arr))
uni.navigateTo({
url: '/sub_pages/supplier/print/print-list'
})
@@ -300,17 +340,34 @@
<view class="value">{{ item.num || 0 }}</view>
</view>
- <!-- <view class="each-item">
+ </view>
+ <view class="each-list">
+ <view class="each-item">
<view class="label">价格</view>
- <view class="value">{{ item.price || '-' }}</view>
- </view> -->
+ <view class="value">￥{{ item.price || '-' }}</view>
+
+ </view>
+ <view class="each-item">
+ <view class="label-color">降级</view>
+ <view class="value-color">{{ item.reduceNum || 0 }}</view>
+ </view>
+ <view class="each-item">
+ <view class="label-color">缺货</view>
+ <view class="value-color">{{ item.lackNum || 0 }}</view>
+
+ </view>
+ <view class="each-item">
+ <view class="label-color">补货</view>
+ <view class="value-color">{{ item.replaceNum || 0 }}</view>
+
+ </view>
</view>
</view>
</view>
- <view class="line-gray" v-if="item.status == 'ARRIVED'||item.status == 'PENDING'||!item.status">
+ <view class="line-gray" v-if="item.status == 'ARRIVED'||item.status == 'PENDING'||!item.status||true">
</view>
- <view class="buttons" v-if="item.status == 'ARRIVED'||item.status == 'PENDING'||!item.status">
+ <view class="buttons" v-if="item.status == 'ARRIVED'||item.status == 'PENDING'||!item.status||true">
<view class="button text-center" v-for="button of check_status" :key="button.value"
@click.stop="clickCheck(item,button.value)">{{ button.label }}
</view>
@@ -322,20 +379,21 @@
<view class="button button-0 " @click="printDeliveryOrder(item)">打印</view>
</view>
</view>
+
</view>
<uni-popup ref="popup_form" type="top" :mask-click="false">
- <view class="popup-check-form">
+ <view class="popup-check-form" style="min-height: 880rpx;height: unset;">
<view class="close-parent">
质检操作-{{ form.statusStr || '-' }}
<uni-icons class="close" type="closeempty" @click="closeCheckForm"></uni-icons>
</view>
<view class="submit form">
- <view class="form-item" v-if="form.status==='reduce'">
- <view class="form-item-label require">
+ <view class="form-item" v-if="form.status==='reduce'" style="height: unset;">
+ <view class="form-item-label require" style="min-width: 140rpx;margin-right: 10rpx;">
降级等级
</view>
- <view class="form-item-value">
+ <view class="form-item-value flex ">
<view class="value-item" @click="()=>{
if(form.targetLevel!==query.value){
form.targetLevel = each.value
@@ -358,7 +416,7 @@
</view>
<view class="form-item" v-if="form.status==='reduce'">
<view class="form-item-label require">
- 扣款金额
+ 每扎扣款
</view>
<view class="form-item-value">
<input v-model="form.deductAmount" placeholder="请输入扣款金额" type="digit"
@@ -368,14 +426,14 @@
</view>
<view class="form-item"
v-if="form.status==='reduce'||form.status==='replace' || form.status==='lack'">
- <view class="form-item-label require">
+ <view class="form-item-label">
质检备注
</view>
<view class="form-item-value">
<input v-model="form.remarks" placeholder="请输入质检备注" class="form-input"></input>
</view>
</view>
- <view class="form-item" v-if="form.status==='reduce'">
+ <view class="form-item" v-if="form.status==='reduce'||form.status==='lack'">
<view class="form-item-label require">
图片
</view>
@@ -383,8 +441,8 @@
<view class="t-red" @click="uploadCheckImage()">上传</view>
</view>
</view>
- <view class="flex p20" v-if="form.checkImageList&&form.checkImageList.length>0">
- <view class="m-t-12 m-r-10 " v-for="(timg,index) of form.checkImageList" :key="index">
+ <view class="flex p20" v-if="form.pictureList&&form.pictureList.length>0">
+ <view class="m-t-12 m-r-10 " v-for="(timg,index) of form.pictureList" :key="index">
<image class="check-img" :src="timg" @click.stop="previewImg(timg)">
</image>
<view class="t-red text-center" @click.stop="deleteCheckImage(index)">删除</view>
@@ -482,6 +540,20 @@
font-size: 24rpx;
color: #666666;
}
+
+ .label-color {
+ font-weight: 400;
+ font-size: 24rpx;
+ color: #FD191C;
+ text-align: left;
+ padding-right: 10rpx;
+ }
+
+ .value-color {
+ font-weight: 400;
+ font-size: 24rpx;
+ color: #FD191C;
+ }
}
}
}
@@ -524,8 +596,8 @@
line-height: 58rpx;
padding: 8rpx 24rpx;
color: #33a868;
- margin-left: 6rpx;
- margin-right: 6rpx;
+ margin-left: 16rpx;
+ margin-right: 16rpx;
border: 2rpx solid #F1F5F2;
}
--
Gitblit v1.9.3