From f833e3d516178e022d2457eb25b0ef6dbc02f304 Mon Sep 17 00:00:00 2001
From: wk
Date: 星期四, 29 八月 2024 16:46:09 +0800
Subject: [PATCH] feat:临时司机
---
pages/loadUnload-page/selectTarget/selectTarget.vue | 44 ++++++++++++++++++++++++++------------------
1 files changed, 26 insertions(+), 18 deletions(-)
diff --git a/pages/loadUnload-page/selectTarget/selectTarget.vue b/pages/loadUnload-page/selectTarget/selectTarget.vue
index f18c4e9..3406203 100644
--- a/pages/loadUnload-page/selectTarget/selectTarget.vue
+++ b/pages/loadUnload-page/selectTarget/selectTarget.vue
@@ -79,7 +79,7 @@
<view class="third-line_text">瀹㈡埛鍚嶇О:</view>
<view>{{ item.customerName }}</view>
</view>
- <view class="third-line" v-if="item.productName === 'EDC'">
+ <view class="third-line" v-if="item.productName === '浜屾隘涔欑兎(EDC)'">
<view class="third-line_text">璐ㄦ鐘舵��:</view>
<view> <u-tag :text="checkStatusList[item.checkStatus]" plain > </u-tag></view>
</view>
@@ -87,7 +87,7 @@
<view class="fourth">
<view class="fourth-icon">
<view
- style="width: 24rpx;height: 24rpx;line-height: 24rpx;background: url('https://mx.jzeg.cn:9096/appimg/image/banner/clock.png') no-repeat;background-size: cover">
+ style="width: 24rpx;height: 24rpx;line-height: 24rpx;background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/clock.png') no-repeat;background-size: cover">
</view>
</view>
<view class="senddate">{{ item.sendDate }}</view>
@@ -95,7 +95,7 @@
<view class="fourth">
<view class="fourth-icon">
<view
- style="width: 26rpx;height: 26rpx;line-height: 26rpx;background: url('https://mx.jzeg.cn:9096/appimg/image/banner/carnNUm.png') no-repeat;background-size: cover;">
+ style="width: 26rpx;height: 26rpx;line-height: 26rpx;background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/carnNUm.png') no-repeat;background-size: cover;">
</view>
</view>
<view class="senddate">{{ item.orderCode }}</view>
@@ -181,8 +181,8 @@
</u--input>
<text> {{isNumOk ? '浠�' : '鍚�' }}</text>
</view>
- <!-- pvc 骞朵笖鏄ぇ鍖� -->
- <view class="pvcBig" v-if="activeObj.productName === 'PVC' && activeObj.packingType === 5">
+ <!-- 鑱氭隘涔欑儻鏍戣剛 骞朵笖鏄ぇ鍖� -->
+ <view class="pvcBig" v-if="activeObj.productName === '鑱氭隘涔欑儻鏍戣剛' && activeObj.packingType === 5">
</view>
<view v-if="isNumOk && activeObj.productQuantity">褰撳墠鏁伴噺锛歿{activeObj.productQuantity}}浠�</view>
@@ -236,7 +236,6 @@
</template>
<script>
- import { BaseUrl } from '@/api/publicInterface.js'
import { mapState, mapMutations, mapGetters } from 'vuex';
export default {
props: {
@@ -254,6 +253,8 @@
}else{
if(this.errorStatusList.includes(item.status)){
return false
+ }else if (item.productName ==='浜屾隘涔欑兎(EDC)' && item.checkStatus !== 7){
+ return false;
}else{
return true;
}
@@ -384,11 +385,18 @@
uni.hideLoading()
if (res.code === 0) {
this.firstClassActionsList = res.data;
+ this.firstClassActionsList.unshift({name:'鍏ㄩ儴',id:res.data.map(item=>item.id).join(',')})
if(res.data.length){
- this.dataForm.bunkerIds = res.data.map(item=>item.id).join(',')
- uni.setStorageSync('bunkerIds',res.data.map(item=>item.id).join(','))
- this.firstClassActionsList.unshift({name:'鍏ㄩ儴',id:res.data.map(item=>item.id).join(',')})
- this.dataForm.firstClass = '鍏ㄩ儴'
+ if(!uni.getStorageSync('bunkerIds')){
+ this.dataForm.firstClass = '鍏ㄩ儴'
+ this.dataForm.bunkerIds = res.data.map(item=>item.id).join(',')
+ uni.setStorageSync('bunkerIds',res.data.map(item=>item.id).join(','))
+ }else{
+ this.dataForm.bunkerIds = uni.getStorageSync('bunkerIds');
+ uni.setStorageSync('bunkerIds',this.dataForm.bunkerIds)
+ }
+
+
this.getDetailData();
}
@@ -396,7 +404,7 @@
this.$u.toast('鍔犺浇澶辫触')
}
}).then(() => {
- this.getUserInfo()
+
})
},
firstClassSelect() {
@@ -469,7 +477,7 @@
// }
// })
- // 璁′欢锛� 0 pvc type
+ // 璁′欢锛� 0 鑱氭隘涔欑儻鏍戣剛 type
// 鎶樺惃:
this.activeObj = item;
if( (parintItem.orderType === '澶栬喘' ||parintItem.orderType === '澶栬喘閫�' ) && item.isWeight === 0){
@@ -484,8 +492,8 @@
this.isNumOk = false;
this.isClean = false;
}
- //pvc
- if(parintItem.orderType ==='澶栭攢' && item.productName ==='PVC' && (item.packingType === 3 || item.packingType === 4)){
+ //鑱氭隘涔欑儻鏍戣剛
+ if(parintItem.orderType ==='澶栭攢' && (/鑱氭隘涔欑儻鏍戣剛/.test(item.productName) || item.productName === 'PVC') && (item.packingType === 3 || item.packingType === 4)){
this.isNumOk = true;
this.isClean = false;
}
@@ -497,7 +505,7 @@
}
//
//pvc澶у寘鑷姩璁＄畻鎶樺惃
- if(item.productName === 'PVC' && item.packingType === 5){
+ if((/鑱氭隘涔欑儻鏍戣剛/.test(item.productName) || item.productName === 'PVC') && item.packingType === 5){
this.isNumOk = true;
this.isClean = false;
}
@@ -523,11 +531,11 @@
uni.showLoading({
title:'鍔犺浇涓�'
});
- console.log(this.activeObj,this.activeObj.productName ==='EDC' && this.activeObj.checkStatus !== 7,'12313')
- if(this.activeObj.productName ==='EDC' && this.activeObj.checkStatus !== 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(`璇锋鏌ュ綋鍓岴DC璁㈠崟璐ㄦ鐘舵�佸悗鍦ㄧ‘璁よ鍗�!`);
+ this.$u.toast(`璇锋鏌ュ綋鍓嶄簩姘箼鐑�(EDC)DC璁㈠崟璐ㄦ鐘舵�佸悗鍦ㄧ‘璁よ鍗�!`);
}else if( this.isEmptyCar === null){
this.$u.toast(`璇锋鏌�${this.isNumOk ? '璁′欢鏁伴噺' :'鎶樺惃'}锛屼互鍙婃槸鍚︾┖杞﹀嚭鍘傞」!`);
--
Gitblit v1.9.1