From 8d80e8c9a3feb6c7e4c3d5dd9aa18f74885d1435 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期四, 07 十一月 2024 10:48:27 +0800
Subject: [PATCH] feat:修改逻辑条件
---
pages/loadUnload-page/selectTarget/selectTarget.vue | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/pages/loadUnload-page/selectTarget/selectTarget.vue b/pages/loadUnload-page/selectTarget/selectTarget.vue
index 423c9dc..add4917 100644
--- a/pages/loadUnload-page/selectTarget/selectTarget.vue
+++ b/pages/loadUnload-page/selectTarget/selectTarget.vue
@@ -348,13 +348,21 @@
<view v-if="activeObj.skin">鐨噸锛歿{activeObj.skin.toFixed(2) || ''}}</view>
<view v-if="activeObj.hair">姣涢噸锛歿{activeObj.hair.toFixed(2) || ''}}</view>
</view>
+ <view v-if="activeObj.isContainerNum"><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 v-if="/鑱氭隘涔欑儻鏍戣剛/.test(activeObj.productName)">
<view>璁″垝閲忥細{{Number(activeObj.planMeasure)}}</view>
<view >瀹為檯閲忥細{{ Number(activeObj.productQuantity)}}</view>
</view> -->
<view class="queren" v-show="isCleanFlag === '1'">
- <text v-if="isNumOk">纭閲忥細</text>
- <text v-if="isNumOk || isFlagNum || blend">璇疯緭鍏ワ細</text>
+ <text v-if="isNumOk || isFlagNum">纭閲忥細</text>
+ <text v-if="isClean || blend">璇疯緭鍏ワ細</text>
<u--input
type='digit'
:disabled="yelvFlag"
@@ -367,14 +375,8 @@
<text v-if="isClean"> {{'鍚�' }}</text>
</view>
<!-- v-if="activeObj.containerNumber" -->
- <view style="display: flex;"><span>闆嗚绠卞彿锛� </span>
- <u--input v-model="activeObj.containerNumber"
- clearable
- style="border: solid 1px #ccc;"
- placeholder="杈撳叆闆嗚绠卞彿"
- prefixIconStyle="color: #909399"></u--input>
- </view>
- <view><text style="color: red;">璇疯鐪熸牳瀵归泦瑁呯鍙峰啀鎻愪氦锛�</text></view>
+
+
<!-- 鏄惁杈撳叆鎶樺惃 -->
<view style="display:flex;margin-top:20rpx" v-if="isClean">鏄惁闇�瑕佹姌鍚細 <u-radio-group
v-model="isCleanFlag"
@@ -1022,8 +1024,6 @@
uni.showLoading({
title:'鍔犺浇涓�'
});
- console.log(this.activeObj,(this.activeObj.isWeight === 2 || this.activeObj.packingType === 1) && (this.activeObj.skin || this.activeObj.hair),'activeObj')
- console.log(this.activeObj,this.activeObj.productName ==='浜屾隘涔欑兎(EDC)' && this.activeObj.checkStatus !== 7,'12313')
if(this.activeObj.productName ==='浜屾隘涔欑兎(EDC)' && this.activeObj.checkStatus !== 7){
this.enterZx = false;
this.$u.toast(`璇锋鏌ュ綋鍓嶄簩姘箼鐑�(EDC)DC璁㈠崟璐ㄦ鐘舵�佸悗鍦ㄧ‘璁よ鍗�!`);
@@ -1031,6 +1031,10 @@
}else if( this.isEmptyCar === null){
this.$u.toast(`璇锋鏌�${this.isNumOk ? '璁′欢鏁伴噺' :'鎶樺惃'}锛屼互鍙婃槸鍚︾┖杞﹀嚭鍘傞」!`);
//瑁呭嵏 涓� 2 锛屼絾鏄繀椤诲緱绉伴噸
+ }else if( (this.activeObj.isWeight === 2 ) && (!this.activeObj.skin && !this.activeObj.hair) ){
+ console.log('銆嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬨�嬭Е鍙�')
+ this.enterZx = false;
+ this.$u.toast(`璇峰厛绉伴噸鍚庤鍗哥‘璁わ紒`);
}
else{
this.enterZx = false;
--
Gitblit v1.9.1