From db681121cc34b908e1b2960d27d75affb40a46ca Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期二, 05 十一月 2024 09:28:17 +0800
Subject: [PATCH] feat:确认量
---
pages/loadUnload-page/selectTarget/selectTarget.vue | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/pages/loadUnload-page/selectTarget/selectTarget.vue b/pages/loadUnload-page/selectTarget/selectTarget.vue
index 33d42fb..df5292b 100644
--- a/pages/loadUnload-page/selectTarget/selectTarget.vue
+++ b/pages/loadUnload-page/selectTarget/selectTarget.vue
@@ -130,7 +130,7 @@
<uni-th align="center" width='100'>鏁伴噺</uni-th> -->
<uni-th align="center" width='120'>纭閲�</uni-th>
<uni-th align="center" width='120'>璁″垝閲�</uni-th>
- <uni-th align="center" width='120'>璁￠噸鏂瑰紡</uni-th>
+ <uni-th align="center" width='150'>璁￠噸鏂瑰紡</uni-th>
<!-- <uni-th align="center" width='100'>瀹為檯閲�</uni-th> -->
@@ -264,7 +264,7 @@
<uni-th align="center" width='100'>鏁伴噺</uni-th> -->
<uni-th align="center" width='120'>纭閲�</uni-th>
<uni-th align="center" width='120'>璁″垝閲�</uni-th>
- <uni-th align="center" width='120'>璁￠噸鏂瑰紡</uni-th>
+ <uni-th align="center" width='150'>璁￠噸鏂瑰紡</uni-th>
</uni-tr>
@@ -353,7 +353,8 @@
<view >瀹為檯閲忥細{{ Number(activeObj.productQuantity)}}</view>
</view> -->
<view class="queren" v-show="isCleanFlag === '1'">
- <text>璇疯緭鍏�</text>锛�
+ <text v-if="isNumOk">纭閲忥細</text>
+ <text v-if="isClean || isFlagNum || blend">璇疯緭鍏ワ細</text>
<u--input
type='digit'
:disabled="yelvFlag"
@@ -362,8 +363,19 @@
v-model="checkNum"
>
</u--input>
- <text> {{isNumOk ? activeObj.productUnit : '鍚�' }}</text>
+ <text v-if="isNumOk || isFlagNum || blend"> {{isNumOk ? activeObj.productUnit : '浠�' }}</text>
+ <text v-if="isClean"> {{'鍚�' }}</text>
</view>
+ <!-- v-if="activeObj.containerNumber" -->
+ <view v-if="activeObj.containerNumber" style="display: flex;"><span>闆嗚绠卞彿锛� </span>
+ <u--input v-model="activeObj.containerNumber"
+ clearable
+ style="border: solid 1px #ccc;"
+ placeholder="杈撳叆闆嗚绠卞彿"
+ prefixIconStyle="color: #909399"></u--input>
+ <view><text style="color: red;">璇疯鐪熸牳瀵归泦瑁呯鍙峰啀鎻愪氦锛�</text></view>
+ </view>
+
<!-- 鏄惁杈撳叆鎶樺惃 -->
<view style="display:flex;margin-top:20rpx" v-if="isClean">鏄惁闇�瑕佹姌鍚細 <u-radio-group
v-model="isCleanFlag"
@@ -397,10 +409,10 @@
<view class="pvcBig" v-if="activeObj.productName === '鑱氭隘涔欑儻鏍戣剛' && activeObj.packingType === 5">
</view>
+
+
<view v-if=" activeObj.planMeasure">璁″垝閲忥細{{activeObj.planMeasure}}{{ activeObj.productUnit || '浠�' }}</view>
- <view v-if=" activeObj.productQuantity">纭閲忥細{{activeObj.productQuantity}}{{ activeObj.productUnit || '浠�' }}</view>
-
- <view v-if="activeObj.containerNumber"><span>闆嗚绠卞彿锛�</span>{{activeObj.containerNumber}}</view>
+
</view>
<view style="display:flex;margin-top:20rpx">鏄惁绌鸿溅鍑哄巶: <u-radio-group
@@ -952,14 +964,14 @@
this.isCleanFlag = '1';
this.blend = false;
this.isFlagNum = true;;
- this.checkNum = item.planMeasure;
+ this.checkNum = item.productQuantity;
}
//鐡惰娑叉隘鏉′欢
//EDC 璐ㄦ瀹屾垚鏂瑰彲纭
if(item.packingType === 1){
this.isNumOk = true;
this.isClean = false;
- this.yelvFlag = true;
+ // this.yelvFlag = true;
this.checkNum = item.productQuantity;
this.blend = false;
this.isCleanFlag = '1';
@@ -1032,6 +1044,7 @@
realityMeasure:this.isFlagNum ? this.checkNum : null,
productId:this.isFlagNum ? this.activeObj.productId : null,
discountJpg:this.discountJpg,
+ containerNumber:this.activeObj.containerNumber ? this.activeObj.containerNumber : null
},'json').then(res=>{
uni.hideLoading();
console.log(res,'rez')
--
Gitblit v1.9.1