From 87a9e71e1d768a1a6471e059109579518fe16271 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期四, 25 七月 2024 08:46:23 +0800
Subject: [PATCH] fix:库管首页异常
---
pages/loadUnload-page/selectTarget/selectTarget.vue | 93 ++++++++++++++++++++++------------------------
1 files changed, 44 insertions(+), 49 deletions(-)
diff --git a/pages/loadUnload-page/selectTarget/selectTarget.vue b/pages/loadUnload-page/selectTarget/selectTarget.vue
index b43f71e..71fd9d3 100644
--- a/pages/loadUnload-page/selectTarget/selectTarget.vue
+++ b/pages/loadUnload-page/selectTarget/selectTarget.vue
@@ -48,7 +48,7 @@
text="鏌ョ湅璇ヤ粨搴撴敹鍙戝崟"
@click.stop="formHandle"></u-button>
</view> -->
- <!-- 鐓ゅ満 -->
+ <!-- 鍦哄湴 -->
<view class='div-box'>
<u-empty mode="data"
icon="http://cdn.uviewui.com/uview/empty/data.png"
@@ -101,11 +101,11 @@
<uni-th width='140'
align="center">鎿嶄綔</uni-th>
<uni-th align="center" width='120'>浜у搧</uni-th>
- <uni-th align="center">浠撳簱</uni-th>
- <uni-th align="center">鐨噸</uni-th>
- <uni-th align="center">姣涢噸</uni-th>
- <uni-th align="center">鍑�閲�</uni-th>
- <uni-th align="center">鏁伴噺</uni-th>
+ <uni-th align="center" width='220'>浠撳簱</uni-th>
+ <uni-th align="center" width='120'>鐨噸</uni-th>
+ <uni-th align="center" width='120'>姣涢噸</uni-th>
+ <uni-th align="center" width='120'>鍑�閲�</uni-th>
+ <uni-th align="center" width='120'>鏁伴噺</uni-th>
<!-- <uni-th align="center">浠撳簱</uni-th> -->
<!-- <uni-th align="center">鐘舵��</uni-th> -->
@@ -115,21 +115,21 @@
<view class="btnBox">
<!-- -->
<u-button text='鏌ョ湅' @click="viewDetail(subItem)"></u-button>
- <u-button type='primary' text='纭瑁呭嵏' v-if="subItem.flag && isBtnShow(subItem)" @click="enterOk(item,subItem)"></u-button>
+ <u-button type='primary' text='纭瑁呭嵏' v-if="subItem.flag && isBtnShow(item)" @click="enterOk(item,subItem)"></u-button>
</view></uni-td>
<uni-td align="center">
<view>{{ subItem.productName }}</view></uni-td>
<uni-td>
- <view class="name">{{ subItem.bunkerName }}</view>
+ <view>{{ subItem.bunkerName }}</view>
</uni-td>
<uni-td>
- <view class="name">{{ subItem.skin }}</view>
+ <view class="name" v-if="subItem.skin">{{ Number(subItem.skin).toFixed(2) || '' }}</view>
</uni-td>
<uni-td>
- <view class="name">{{ subItem.hair }}</view>
+ <view class="name" v-if="subItem.hair"> {{ Number(subItem.hair).toFixed(2) || '' }}</view>
</uni-td>
<uni-td>
- <view class="name">{{ subItem.clean }}</view>
+ <view class="name" v-if="(subItem.clean || (subItem.clean && subItem.clean === 0))">{{ Number(subItem.clean).toFixed(2) || ''}}</view>
</uni-td>
<uni-td>
<view class="name">{{ subItem.productQuantity }}</view>
@@ -212,7 +212,7 @@
</u-radio-group></view>
</view>
</u-modal>
- <!-- 鐓や粨 -->
+ <!-- 浠撳簱 -->
<!-- <u-action-sheet :actions="secondClassActionsList"
:show="secondClassShow"
cancelText='鍙栨秷'
@@ -284,10 +284,10 @@
typeText:'', // 纭瑁呭嵏涓夌绫诲瀷
isNumOk:false, //璁′欢
isClean:false, // 鎶樺惃
- // 鐓ゅ満鎿嶄綔鑿滃崟
+ // 鍦哄湴鎿嶄綔鑿滃崟
firstClassActionsList: [],
firstClassShow: false,
- // 鐓や粨鎿嶄綔鑿滃崟
+ // 浠撳簱鎿嶄綔鑿滃崟
secondClassActionsList: [],
secondClassShow: false,
coalList: [],
@@ -322,7 +322,7 @@
viewDetail(item){
//鏌ョ湅鏀跺彂鍗曡鎯�
uni.navigateTo({
- url: `/pages/loadUnload-page/loadUnlaodPageDetail/detail?id=${item.id}&checkId=${item.checkId}`
+ url: `/subPages/loadUnlaodPageDetail/detail?id=${item.id}&checkId=${item.checkId}`
});
},
@@ -333,7 +333,7 @@
})
},
- // 鑾峰彇鐓ゅ満
+ // 鑾峰彇鍦哄湴
getDeptIdFiled() {
uni.showLoading({
title: "鍔犺浇涓�"
@@ -394,41 +394,37 @@
this.getDetailData();
this.filedId = val.id
},
- formHandle() {
- if (!this.dataForm.firstClass) return this.$u.toast('璇烽�夋嫨鐓ゅ満鎴栬�呯叅浠�');
- this.$nextTick(()=>{
- uni.navigateTo({
- url: `/pages/loadUnload-page/loadUnload-detail/loadUnload-detail?bunkerId=${this.dataForm.bunkerId}`
- })
- })
+ // formHandle() {
+ // if (!this.dataForm.firstClass) return this.$u.toast('璇烽�夋嫨鍦哄湴鎴栬�呬粨搴�');
+ // this.$nextTick(()=>{
+ // uni.navigateTo({
+ // url: `/pages/loadUnload-page/loadUnload-detail/loadUnload-detail?bunkerId=${this.dataForm.bunkerId}`
+ // })
+ // })
- },
+ // },
change(){
},
close(){
},
-
-
-
-
open(){},
enterOk(parintItem,item){
console.log(parintItem,'priintItem')
- uni.request({
- url: `${BaseUrl}/admin/dict/type/tray_weight`,
- method: 'GET',
- header: {
- Authorization: 'Bearer' + ' ' + uni.getStorageSync('token'),
- clientToc: 'Y',
- 'CLIENT_TOC': 'Y',
- },
- success: (res) => {
- this.pvcWeight = res.data.data.find(item=>item.label === '5') ? Number(res.data.data.find(item=>item.label == '5').value) : '';
+ // uni.request({
+ // url: `${BaseUrl}/admin/dict/type/tray_weight`,
+ // method: 'GET',
+ // header: {
+ // Authorization: 'Bearer' + ' ' + uni.getStorageSync('token'),
+ // clientToc: 'Y',
+ // 'CLIENT_TOC': 'Y',
+ // },
+ // success: (res) => {
+ // 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;
@@ -483,15 +479,14 @@
uni.showLoading({
title:'鍔犺浇涓�'
});
- if(this.activeObj.productName ==='EDC'){
- if( this.activeObj.checkStatus !== 7){
- this.$u.toast(`璇锋鏌ュ綋鍓岴DC璁㈠崟璐ㄦ鐘舵�佸悗鍦ㄧ‘璁よ鍗�!`);
- return
- }
+ 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璁㈠崟璐ㄦ鐘舵�佸悗鍦ㄧ‘璁よ鍗�!`);
}else if( this.isEmptyCar === null){
this.$u.toast(`璇锋鏌�${this.isNumOk ? '璁′欢鏁伴噺' :'鎶樺惃'}锛屼互鍙婃槸鍚︾┖杞﹀嚭鍘傞」!`);
- return
}else{
this.enterZx = false;
this.$reqPost('confirmLoadAndUnload',{
@@ -534,7 +529,7 @@
todoDetail(){
console.log()
uni.navigateTo({
- url: `/pages/loadUnload-page/checkTestDetails/index`
+ url: `/subPages/checkTestDetails/index`
})
}
@@ -584,7 +579,7 @@
.self-deliver {
position: relative;
top: vww(10);
- width: 95%;
+ width: 98%;
height: vww(40);
margin: vww(8) 10rpx;
padding: 0 vww(8);
@@ -596,7 +591,7 @@
justify-content: space-between;
/deep/.u-button {
width: 100%;
- height: 28px !important;
+ // height: 28px !important;
line-height: 40px;
padding: 0 12px;
font-size: 28rpx;
--
Gitblit v1.9.1