From 64ee1d179fa2fc57b7f24698cedbbcc9f30fea8a Mon Sep 17 00:00:00 2001
From: wk
Date: 星期三, 03 七月 2024 17:23:40 +0800
Subject: [PATCH] feat：测试问题
---
pages/loadUnload-page/selectTarget/selectTarget.vue | 66 +++++++++++++++++++++++++--------
1 files changed, 50 insertions(+), 16 deletions(-)
diff --git a/pages/loadUnload-page/selectTarget/selectTarget.vue b/pages/loadUnload-page/selectTarget/selectTarget.vue
index 2621ffa..b43f71e 100644
--- a/pages/loadUnload-page/selectTarget/selectTarget.vue
+++ b/pages/loadUnload-page/selectTarget/selectTarget.vue
@@ -115,7 +115,7 @@
<view class="btnBox">
<!-- -->
<u-button text='鏌ョ湅' @click="viewDetail(subItem)"></u-button>
- <u-button type='primary' text='纭瑁呭嵏' v-if="subItem.flag" @click="enterOk(item,subItem)"></u-button>
+ <u-button type='primary' text='纭瑁呭嵏' v-if="subItem.flag && isBtnShow(subItem)" @click="enterOk(item,subItem)"></u-button>
</view></uni-td>
<uni-td align="center">
<view>{{ subItem.productName }}</view></uni-td>
@@ -164,13 +164,11 @@
鏄惁纭瑁呭嵏锛�
<view v-if="isNumOk || isClean">
<text>浜у搧鍚嶇О锛歿{activeObj.productName}}</text>
-
<view class="queren">
<text>璇疯緭鍏�</text>锛�
<u--input
type='digit'
border="bottom"
- :disabled="activeObj.productName === 'PVC' && activeObj.packingType === 5"
:placeholder="isNumOk ? '鏁伴噺' :'鎶樺惃'"
v-model="checkNum"
>
@@ -183,6 +181,8 @@
</view>
<view v-if="isNumOk && activeObj.productQuantity">褰撳墠鏁伴噺锛歿{activeObj.productQuantity}}浠�</view>
<view v-if="activeObj.containerNumber"><span>闆嗚绠卞彿锛�</span>{{activeObj.containerNumber}}</view>
+
+ </view>
<view>鏄惁绌鸿溅鍑哄巶: <u-radio-group
v-model="isEmptyCar"
placement="row"
@@ -210,8 +210,6 @@
>
</u-radio>
</u-radio-group></view>
- </view>
-
</view>
</u-modal>
<!-- 鐓や粨 -->
@@ -239,6 +237,25 @@
type: Object,
default: {}
}
+ },
+ computed:{
+ isBtnShow(){
+ return function(item){
+ console.log(item,'itemssss')
+ if(!item){
+ return false
+ }else{
+ if(this.errorStatusList.includes(item.status)){
+ return false
+ }else{
+ return true;
+ }
+ }
+
+ }
+
+ }
+
},
watch: {
loadUnloadData: {
@@ -294,6 +311,7 @@
],
isOrderType: '璇烽�夋嫨', //纾呮埧绫诲瀷鏄惁閫夋嫨浜� 閫夋嫨浜嗘竻绌�
cleanIconClick: true, //淇敼鐐瑰嚮娓呯┖纾呮埧閫夋嫨浼氬嚭鐜�
+ errorStatusList:[0,1,6,24,27,26] // 涓嶈兘鐐瑰嚮纭瑁呭嵏鐨勭姸鎬�
};
},
@@ -407,11 +425,12 @@
'CLIENT_TOC': 'Y',
},
success: (res) => {
- console.log(res, '缁戝畾缁撴灉');
- this.pvcWeight = res.data.data[0].value ? Number(res.data.data[0].value) : '';
+ this.pvcWeight = res.data.data.find(item=>item.label === '5') ? Number(res.data.data.find(item=>item.label == '5').value) : '';
}
})
+ // 璁′欢锛� 0 pvc type
+ // 鎶樺惃:
this.activeObj = item;
if( (parintItem.orderType === '澶栬喘' ||parintItem.orderType === '澶栬喘閫�' ) && item.isWeight === 0){
this.isNumOk = true;
@@ -421,18 +440,26 @@
}else if( parintItem.orderType ==='澶栬喘' && item.isWeight === 1){
this.isClean = true;
this.isNumOk = false;
- }else if(parintItem.orderType ==='澶栭攢' && item.productName ==='PVC' && (item.packingType === 3 || item.packingType === 4)){
- this.isNumOk = true;
- this.isClean = false;
- }
- else{
+ }else{
this.isNumOk = false;
this.isClean = false;
}
+ //pvc
+ if(parintItem.orderType ==='澶栭攢' && item.productName ==='PVC' && (item.packingType === 3 || item.packingType === 4)){
+ this.isNumOk = true;
+ this.isClean = false;
+ }
+ //鐡惰娑叉隘鏉′欢
+ //EDC 璐ㄦ瀹屾垚鏂瑰彲纭
+ if(item.packingType === 1){
+ this.isNumOk = true;
+ this.isClean = false;
+ }
+ //
//pvc澶у寘鑷姩璁＄畻鎶樺惃
- if(parintItem.productName === 'PVC' && item.packingType === 5){
- this.checkNum = (Number(item.productQuantity) * this.pvcWeight)
-
+ if(item.productName === 'PVC' && item.packingType === 5){
+ this.isNumOk = true;
+ this.isClean = false;
}
if(parintItem.orderType === '澶栬喘'){
this.isEmptyCar = '1';
@@ -456,7 +483,13 @@
uni.showLoading({
title:'鍔犺浇涓�'
});
- if(!this.checkNum || this.isEmptyCar === null){
+ if(this.activeObj.productName ==='EDC'){
+ if( this.activeObj.checkStatus !== 7){
+ this.$u.toast(`璇锋鏌ュ綋鍓岴DC璁㈠崟璐ㄦ鐘舵�佸悗鍦ㄧ‘璁よ鍗�!`);
+ return
+ }
+
+ }else if( this.isEmptyCar === null){
this.$u.toast(`璇锋鏌�${this.isNumOk ? '璁′欢鏁伴噺' :'鎶樺惃'}锛屼互鍙婃槸鍚︾┖杞﹀嚭鍘傞」!`);
return
}else{
@@ -490,6 +523,7 @@
})
}
+
},
//鍒ゆ柇鏄惁鏄� 涓夌鐗规畩绫诲瀷瀵瑰簲寮圭獥
judgeTypeFun(name){
--
Gitblit v1.9.1