From 64f0734954a188b32d0f870aab174703df85e115 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期日, 22 九月 2024 20:30:28 +0800
Subject: [PATCH] updatge
---
manifest.json | 2 +-
sub_pages/partner/delivery/delivery-detail.vue | 15 +++++++++++----
sub_pages/partner/delivery/delivery-supplier-detail-list.vue | 8 +++++++-
sub_pages/supplier/order-manage/order-manage-settlement-op-detail.vue | 5 ++---
4 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/manifest.json b/manifest.json
index 2848179..f2448bf 100644
--- a/manifest.json
+++ b/manifest.json
@@ -49,7 +49,7 @@
"quickapp" : {},
/* 快应用特有相关 */
"mp-weixin" : {
- "appid" : "wx1441324401626290",
+ "appid" : "wx3203fd935a6ffe09",
"setting" : {
"urlCheck" : false,
"es6" : true,
diff --git a/sub_pages/partner/delivery/delivery-detail.vue b/sub_pages/partner/delivery/delivery-detail.vue
index 618ff2b..fda4359 100644
--- a/sub_pages/partner/delivery/delivery-detail.vue
+++ b/sub_pages/partner/delivery/delivery-detail.vue
@@ -185,6 +185,12 @@
return
}
}
+ if (this.form.status == 'lack') {
+ if (!this.form.pictureList || this.form.pictureList.length < 1) {
+ this.$message.showToast('未上传图片')
+ return
+ }
+ }
if (this.form.status == 'replace' || this.form.status == 'lack') {
if (isNaN(parseInt(this.form.num)) || this.form.num < 0) {
this.$message.showToast('数量需要大于等于0')
@@ -372,7 +378,7 @@
<view class="button button-0 " @click="printDeliveryOrder(item)">打印</view>
</view>
</view>
-
+
</view>
<uni-popup ref="popup_form" type="top" :mask-click="false">
@@ -409,7 +415,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"
@@ -426,7 +432,7 @@
<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>
@@ -533,7 +539,7 @@
font-size: 24rpx;
color: #666666;
}
-
+
.label-color {
font-weight: 400;
font-size: 24rpx;
@@ -541,6 +547,7 @@
text-align: left;
padding-right: 10rpx;
}
+
.value-color {
font-weight: 400;
font-size: 24rpx;
diff --git a/sub_pages/partner/delivery/delivery-supplier-detail-list.vue b/sub_pages/partner/delivery/delivery-supplier-detail-list.vue
index 48c7dd7..e96bcde 100644
--- a/sub_pages/partner/delivery/delivery-supplier-detail-list.vue
+++ b/sub_pages/partner/delivery/delivery-supplier-detail-list.vue
@@ -441,6 +441,12 @@
<view class="line-gray"></view>
+ <view class="m-t-12 flex" v-if="item.arriveRemarks">
+ <view>备注:</view>
+ <view class="text-left m-l-10 m-r-0 flex1">
+ {{item.arriveRemarks}}
+ </view>
+ </view>
<view class="m-t-12 flex" v-if="item.arriveImageList&&item.arriveImageList.length>0">
<view class="m-t-12 m-r-10 " v-for="(timg,vv) of item.arriveImageList" :key="vv">
<image class="arrive-img" :src="timg" @click.stop="previewImg(timg)">
@@ -567,7 +573,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"
diff --git a/sub_pages/supplier/order-manage/order-manage-settlement-op-detail.vue b/sub_pages/supplier/order-manage/order-manage-settlement-op-detail.vue
index ca65b29..bde1740 100644
--- a/sub_pages/supplier/order-manage/order-manage-settlement-op-detail.vue
+++ b/sub_pages/supplier/order-manage/order-manage-settlement-op-detail.vue
@@ -83,14 +83,14 @@
<!-- <view class="name" v-if="dto.type">处理类型：{{ dto.type || '-'}}</view> -->
<view class="name">处理数量：{{ dto.num || '-' }}</view>
- <view class="name">扣款金额：￥{{ dto.deductAmount || '-'}}</view>
+ <view class="name">扣款金额/每扎：￥{{ dto.deductAmount || '-'}}</view>
</view>
</view>
</view>
- <!-- #ifndef PUB_CUSTOMER -->
+
<view class="p10" style="margin-top: 0rpx;padding-top: 0rpx;" v-if="dto.pictureList&&dto.pictureList.length>0">
<view class="line-gray"></view>
@@ -104,7 +104,6 @@
</view>
</view>
</view>
- <!-- #endif -->
</view>
--
Gitblit v1.9.3