From 1a92541e81f43ea9b544919400b0835bb2b7ee2b Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期一, 05 八月 2024 17:18:23 +0800
Subject: [PATCH] fix:库管日计划模块修改
---
pages/loadUnload-page/selectTarget/selectTarget.vue | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/pages/loadUnload-page/selectTarget/selectTarget.vue b/pages/loadUnload-page/selectTarget/selectTarget.vue
index ddc800c..64fce36 100644
--- a/pages/loadUnload-page/selectTarget/selectTarget.vue
+++ b/pages/loadUnload-page/selectTarget/selectTarget.vue
@@ -24,9 +24,9 @@
</view>
</view>
<view
+ v-if="messageObj.carNo"
class="notice-bar"><u-notice-bar :text="messageText"
:fontSize="30" :showIcon = 'true'
- :direction='messageObj.carNo ? "row" :"column"'
></u-notice-bar></view>
<!-- <u--form labelPosition="top"
labelWidth="20%"
@@ -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: {
@@ -384,11 +383,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 +402,7 @@
this.$u.toast('鍔犺浇澶辫触')
}
}).then(() => {
- this.getUserInfo()
+
})
},
firstClassSelect() {
@@ -469,7 +475,7 @@
// }
// })
- // 璁′欢锛� 0 pvc type
+ // 璁′欢锛� 0 鑱氭隘涔欑儻鏍戣剛 type
// 鎶樺惃:
this.activeObj = item;
if( (parintItem.orderType === '澶栬喘' ||parintItem.orderType === '澶栬喘閫�' ) && item.isWeight === 0){
@@ -484,8 +490,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 +503,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;
}
@@ -628,12 +634,13 @@
}
// 鑷富閰嶉��
.self-deliver {
- position: relative;
- text-indent: 20rpx;
+ position: relative;
+ text-indent: 20rpx;
top: vww(10);
- width: 96%;
+ width: 95%;
height: vww(40);
margin: vww(13) 10rpx;
+ margin-left: 20rpx;
padding: 0 vww(8);
background: #ffffff;
box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
@@ -711,7 +718,7 @@
top: vww(-160);
.top-tag{
width: 60%;
- margin-left: 55%!important;
+ margin-left: 55%;
height: 100rpx;
margin-left: 50%;
display: flex;
--
Gitblit v1.9.1