From fc83822df8fffc62f726d3811dd72e43d7b62a90 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期四, 28 十一月 2024 13:54:07 +0800
Subject: [PATCH] feat:大厅检查对应提示
---
pages/loadUnload-page/selectTarget/selectTarget.vue | 44 +++++++++++++++++++++++++++++---------------
1 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/pages/loadUnload-page/selectTarget/selectTarget.vue b/pages/loadUnload-page/selectTarget/selectTarget.vue
index 365df40..4f9699e 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"
@@ -363,18 +371,11 @@
v-model="checkNum"
>
</u--input>
- <text v-if="isNumOk || isFlagNum || blend"> {{isNumOk ? activeObj.productUnit : '浠�' }}</text>
- <text v-if="isClean"> {{'鍚�' }}</text>
+ <text v-if="isNumOk || isFlagNum || blend"> {{ activeObj.productUnit || '浠�' }}</text>
+ <text v-if="isClean"> {{activeObj.productUnit || '鍚�' }}</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
@@ -442,6 +443,18 @@
>
</u-radio>
</u-radio-group></view>
+ <!-- 鎶樺惃鍘熷洜 -->
+ <view class="queren" style="display: flex;" v-if="isClean && isCleanFlag === '1'">
+ <text>鎶樺惃鍘熷洜锛�
+ </text><u--input
+ clearable
+ type='text'
+ border="bottom"
+ v-model="discountReason"
+ placeholder="璇疯緭鍏ユ姌鍚ㄥ師鍥�"
+ />
+
+ </view>
<view v-if="isClean && isCleanFlag === '1'"><text>鎶樺惃鐓х墖:</text><u-upload :fileList="fileList1"
@afterRead="afterRead"
@delete="deletePic"
@@ -605,6 +618,7 @@
enterXg:false,
isOkNum:'',
fileList1:[],
+ discountReason:'',
activeObjedit:{},
discountJpg:'',
proType:['鏁ｈ','娑叉隘鐡惰','缃愯','PVC25','PVC80','PVC1150','PVc1200'],
@@ -1014,6 +1028,7 @@
cancelModal(){
this.enterZx = false;
this.checkNum = '';
+ this.discountReason = ''; //鎯呭喌澶囨敞
this.isEmptyCar = null;
},
cancelModaledit(){
@@ -1023,8 +1038,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璁㈠崟璐ㄦ鐘舵�佸悗鍦ㄧ‘璁よ鍗�!`);
@@ -1044,7 +1057,8 @@
realityMeasure:this.isFlagNum ? this.checkNum : null,
productId:this.isFlagNum ? this.activeObj.productId : null,
discountJpg:this.discountJpg,
- containerNumber:this.activeObj.containerNumber ? this.activeObj.containerNumber : null
+ containerNumber:this.activeObj.containerNumber ? this.activeObj.containerNumber : null,
+ discountReason:this.discountReason,
},'json').then(res=>{
uni.hideLoading();
console.log(res,'rez')
--
Gitblit v1.9.1