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 | 76 +++++++++++++++++++++++++++++--------
1 files changed, 59 insertions(+), 17 deletions(-)
diff --git a/sub_pages/partner/delivery/delivery-detail.vue b/sub_pages/partner/delivery/delivery-detail.vue
index 3fa0e5a..8e486f2 100644
--- a/sub_pages/partner/delivery/delivery-detail.vue
+++ b/sub_pages/partner/delivery/delivery-detail.vue
@@ -16,7 +16,7 @@
id: '',
status: '',
pictureList: [],
- checkRemarks: '',
+ remarks: '',
deductAmount: 0,
},
check_status: [
@@ -52,7 +52,8 @@
},
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'
@@ -162,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
}
}
@@ -188,7 +212,7 @@
if (code === 0) {
this.$refs.popup_form.close()
await this.$store.dispatch('sign_add', 'delivery')
-
+
await this.$message.showToast('操作成功')
this.init()
@@ -251,6 +275,7 @@
}).catch(res => {
that.$message.hideLoading()
console.error(res)
+ that.$message.showToast('文件上传失败，请联系管理员')
})
}
}
@@ -258,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'
})
@@ -318,21 +345,21 @@
<view class="each-item">
<view class="label">价格</view>
<view class="value">￥{{ item.price || '-' }}</view>
-
+
</view>
<view class="each-item">
- <view class="label">降级</view>
- <view class="value">{{ item.reduceNum || 0 }}</view>
+ <view class="label-color">降级</view>
+ <view class="value-color">{{ item.reduceNum || 0 }}</view>
</view>
<view class="each-item">
- <view class="label">缺货</view>
- <view class="value">{{ item.lackNum || 0 }}</view>
-
+ <view class="label-color">缺货</view>
+ <view class="value-color">{{ item.lackNum || 0 }}</view>
+
</view>
<view class="each-item">
- <view class="label">补货</view>
- <view class="value">{{ item.replaceNum || 0 }}</view>
-
+ <view class="label-color">补货</view>
+ <view class="value-color">{{ item.replaceNum || 0 }}</view>
+
</view>
</view>
</view>
@@ -352,6 +379,7 @@
<view class="button button-0 " @click="printDeliveryOrder(item)">打印</view>
</view>
</view>
+
</view>
<uni-popup ref="popup_form" type="top" :mask-click="false">
@@ -362,7 +390,7 @@
</view>
<view class="submit form">
<view class="form-item" v-if="form.status==='reduce'" style="height: unset;">
- <view class="form-item-label require" style="min-width: 120rpx;margin-right: 10rpx;">
+ <view class="form-item-label require" style="min-width: 140rpx;margin-right: 10rpx;">
降级等级
</view>
<view class="form-item-value flex ">
@@ -388,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"
@@ -398,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>
@@ -512,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;
+ }
}
}
}
--
Gitblit v1.9.3