From 0eab6dcc163bec041d44bc27c9c89ef9c6ec988d Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期四, 26 九月 2024 17:17:39 +0800
Subject: [PATCH] feat:确认装卸bug提交
---
pages/loadUnload-page/selectTarget/selectTarget.vue | 42 ++++++++++++++++++++++++------------------
1 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/pages/loadUnload-page/selectTarget/selectTarget.vue b/pages/loadUnload-page/selectTarget/selectTarget.vue
index 71c98ac..5f92bde 100644
--- a/pages/loadUnload-page/selectTarget/selectTarget.vue
+++ b/pages/loadUnload-page/selectTarget/selectTarget.vue
@@ -519,7 +519,7 @@
'杩涘叆鍦洪櫌', '寮傚父瀹℃牳涓�', '杩斿洖鍔犲噺鍚�', '瓒呮椂', '鎵撳嵃涓�', '鎵撳嵃涓�', '濉啓', '鏀剧┖纭涓�', '瓒呮渶澶ф瘺閲嶇‘璁や腑','琛ユ墦','鍏ュ満妫�鏌�','璐ㄦ涓�',
'绂诲満妫�鏌�','宸叉墦鍗�','瑁呭嵏','杩斿洖鍔犲噺鍚ㄧ‘璁や腑'
],
- isCleanFlag:'0',
+ isCleanFlag:'1',
dataForm: {
firstClass: "",
secondClass: "",
@@ -597,7 +597,7 @@
},
//鑾峰彇宸茶鍗告敹鍙戝崟
getTodayOrder(){
- this.$reqGet('getTodayConfirmedTaskCoalList',{ bunkerIds:this.dataForm.bunkerIds }).then(res=>{
+ this.$reqGet('getTodayConfirmedTaskCoalList',{ bunkerIds:this.dataForm.bunkerIds,productIds:uni.getStorageSync('productIds')}).then(res=>{
if(res.code === 0){
this.historyData = res.data;
}else{
@@ -654,7 +654,7 @@
uni.showLoading({
title:'鍔犺浇涓�'
})
- this.$reqGet('getTaskCoalListByBunkerId', { bunkerIds:this.dataForm.bunkerIds }).then(res => {
+ this.$reqGet('getTaskCoalListByBunkerId', { bunkerIds:this.dataForm.bunkerIds, productIds:uni.getStorageSync('productIds')}).then(res => {
uni.hideLoading();
if (res.code === 0) {
this.detailData = res.data.map(item=>{
@@ -742,11 +742,8 @@
this.isClean = true;
this.isNumOk = false;
this.isFlagNum = false;
- }else{
- this.isNumOk = false;
- this.isClean = false;
- this.isFlagNum = false;
}
+
//鑱氭隘涔欑儻鏍戣剛
if(parintItem.orderType ==='澶栭攢' && (/鑱氭隘涔欑儻鏍戣剛/.test(item.productName) || item.productName === 'PVC') && (item.packingType === 3 || item.packingType === 4)){
this.isNumOk = false;
@@ -763,22 +760,31 @@
}
//
//pvc澶у寘鑷姩璁＄畻鎶樺惃
- if((/鑱氭隘涔欑儻鏍戣剛/.test(item.productName) || item.productName === 'PVC') && item.packingType === 5){
- this.isNumOk = false;
- this.isClean = false;
- this.isFlagNum = true;
- }
+
if(parintItem.orderType === '澶栬喘'){
this.isEmptyCar = '1';
}else if(parintItem.orderType === '澶栭攢' || parintItem.orderType === '澶栬喘閫�'){
this.isEmptyCar = '0';
}
-
- //澶栭攢涓嶇敤 杈撳叆鎶樺惃
- if(parintItem.orderType ==='澶栭攢'){
- this.isClean = false;
-
+ if(item.isWeight === 1){
+ this.isNumOk = false;
+ this.isClean = true;
+ this.isFlagNum = false;
+ }else{
+ this.isNumOk = true;
+ this.isClean = false;
+ this.isFlagNum = false;
}
+ if((/鑱氭隘涔欑儻鏍戣剛/.test(item.productName) || item.productName === 'PVC') && item.packingType === 5){
+ this.isNumOk = false;
+ this.isClean = false;
+ this.isFlagNum = true;
+ }
+ //澶栭攢涓嶇敤 杈撳叆鎶樺惃
+ // if(parintItem.orderType ==='澶栭攢'){
+ // this.isClean = false;
+
+ // }
this.enterZx = true;
},
@@ -798,7 +804,7 @@
});
console.log(this.activeObj,this.activeObj.productName ==='浜屾隘涔欑兎(EDC)' && this.activeObj.checkStatus !== 7,'12313')
if(this.activeObj.productName ==='浜屾隘涔欑兎(EDC)' && this.activeObj.checkStatus !== 7){
- console.log('瑙﹀彂锛屸��13131')
+
this.enterZx = false;
this.$u.toast(`璇锋鏌ュ綋鍓嶄簩姘箼鐑�(EDC)DC璁㈠崟璐ㄦ鐘舵�佸悗鍦ㄧ‘璁よ鍗�!`);
--
Gitblit v1.9.1