From a28d0135ee42809b2c5863609da37155d3ecba5b Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期二, 29 四月 2025 15:11:39 +0800
Subject: [PATCH] feat:增加类型显示
---
subPages/bill-of-lading-details/bill-of-lading-details.vue | 124 +++++++++++++++++++++++++++++++++--------
1 files changed, 99 insertions(+), 25 deletions(-)
diff --git a/subPages/bill-of-lading-details/bill-of-lading-details.vue b/subPages/bill-of-lading-details/bill-of-lading-details.vue
index da90a83..6b09211 100644
--- a/subPages/bill-of-lading-details/bill-of-lading-details.vue
+++ b/subPages/bill-of-lading-details/bill-of-lading-details.vue
@@ -1,7 +1,7 @@
<template>
<view class="bill-of-lading-details">
<view class="top-banner"
- style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/loadingbanner.png') no-repeat;background-size: cover;">
+ style="background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/loadingbanner.png') no-repeat;background-size: cover;">
<u-notice-bar :text="originInfoNotice"
v-if="haveInputOrigin&&!isSpecial"
fontSize='36'></u-notice-bar>
@@ -11,11 +11,11 @@
<view class="cutomer-name"
v-else>瀹㈡埛:{{ coalDetailsData.customerName || '' }}</view>
<view class="fild-name">
- <view class="">鐭垮満:{{ coalDetailsData.deptName || '鏆傛棤' }}</view>
+ <view class="">鍗曚綅:{{ coalDetailsData.deptName || '鏆傛棤' }}</view>
<view class=""
v-if="orderType == '杞叆' || orderType == '杞嚭'">鍦哄湴:{{ coalDetailsData.filedName || '' }}</view>
<view class=""
- v-else>浠撳簱:{{ coalDetailsData.filedName || '鏆傛棤' }}</view>
+ v-else>鍦哄尯:{{ coalDetailsData.filedName || '鏆傛棤' }}</view>
</view>
</view>
<view class="block-information">
@@ -23,7 +23,7 @@
<view class="basic">
<view class="coalName">{{ coalDetailsData.productNames || coalDetailsData.productName }}</view>
<view class="status-button"
- style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/statusbutton.png') no-repeat;
+ style="background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/statusbutton.png') no-repeat;
background-size: cover;">
{{coalDetailsData.statusView||''}}
</view>
@@ -49,19 +49,19 @@
<view class="weigh-item" v-if="isShowClean">
<view class="item">
<view class="concrete"
- style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/skin.png') no-repeat;background-size: cover;">
+ style="background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/skin.png') no-repeat;background-size: cover;">
鐨�</view>
<view class="num" v-if="weightObj.skin">{{ Number(weightObj.skin).toFixed(2) ||"" }}</view>
</view>
<view class="item">
<view class="concrete"
- style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/hair.png') no-repeat;background-size: cover;">
+ style="background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/hair.png') no-repeat;background-size: cover;">
姣�</view>
<view class="num" v-if="weightObj.hair">{{ Number(weightObj.hair).toFixed(2) ||"" }}</view>
</view>
<view class="item">
<view class="concrete"
- style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/clean.png') no-repeat;background-size: cover;">
+ style="background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/clean.png') no-repeat;background-size: cover;">
鍑�</view>
<view class="num" v-if="(weightObj.clean || (weightObj.clean && weightObj.clean === 0) )">{{ Number(weightObj.clean).toFixed(2) ||"" }}</view>
</view>
@@ -75,6 +75,7 @@
<view class="table">
<uni-table border
id="table-box"
+ v-if='coalDetailsData.isWeight === 1'
emptyText="鏆傛棤鏇村鏁版嵁">
<uni-tr>
<uni-th align="center" >浜у搧</uni-th>
@@ -82,7 +83,7 @@
<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-tr>
<uni-tr v-for="(subItem, index) in tmTaskCoalList" :key="index">
<uni-td align="center">
@@ -100,6 +101,37 @@
聽 <uni-td align="right">
<view>{{ subItem.discount }}</view
></uni-td>
+ <!-- <uni-td align="right">
+ <view>{{ subItem.productQuantity }}</view
+ ></uni-td> -->
+ </uni-tr>
+ </uni-table>
+ <uni-table border
+ id="table-box"
+ v-else
+ emptyText="鏆傛棤鏇村鏁版嵁">
+ <uni-tr>
+ <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-tr>
+ <uni-tr v-for="(subItem, index) in tmTaskCoalList" :key="index">
+ <uni-td align="left">
+ <view class="name">{{ subItem.productName }}</view></uni-td>
+ <!-- <uni-td align='right'>
+ <view v-if="subItem.skin">{{ Number( subItem.skin).toFixed(2) || ''}}</view>
+ </uni-td>
+ <uni-td align='right'>
+ <view class="name" v-if="subItem.hair">{{ Number(subItem.hair) .toFixed(2) || '' }}</view>
+ </uni-td>
+ <uni-td align='right'>
+ <view class="name" v-if="(subItem.clean || (subItem.clean && subItem.clean === 0))">{{ Number( subItem.clean).toFixed(2) || '' }}</view>
+ </uni-td> -->
+
+
<uni-td align="right">
<view>{{ subItem.productQuantity }}</view
></uni-td>
@@ -121,7 +153,7 @@
</view>
</view>
<view class="origin-info"
- v-if="originInfoVisible&&!isSpecial">
+ v-if="originInfoVisible&&!isSpecial&&isShowYuanFa">
<view class="origin-info_wrapper">
<view class="origin-info_content">
<!-- 鎶樺彔 -->
@@ -184,7 +216,7 @@
<u--input placeholder="鍑�閲�"
border="surround"
v-model="coalContactClean"
- :disabled="isModifyoriginInfo"></u--input>
+ disabled></u--input>
</view>
<view class="unit">鍚�</view>
</view>
@@ -281,7 +313,7 @@
plain
@click="rcsqClick"
shape="circle"
- :disabled="currentPageCoalStatus>= 3"></u-button>
+ :disabled="currentPageCoalStatus>= 3 && currentPageCoalStatus!==24"></u-button>
<!-- <u-button text="鍏ュ満鐢宠"
type="primary"
plain
@@ -307,14 +339,14 @@
</view>
</view>
<view class="weigh-ability">
- <view class="weigh-button">
+ <!-- <view class="weigh-button">
<u-button text="涓婄璁￠噺"
@click="cengZhongClick"
type="primary"
shape="circle"
:disabled="haveInputOrigin&&!isSpecial"
:loading="weighHouseLoading"></u-button>
- </view>
+ </view> -->
<!-- <view class="weigh-button"
v-show='ablePrintInduction&&!(coalDetailsData.skin&&coalDetailsData.hair)'>
<u-button text="鎵撳嵃鍏ラ棬璇�"
@@ -586,6 +618,9 @@
name() {
return uni.getStorageSync('name');
},
+ roleType() {
+ return uni.getStorageSync('roleType');
+ },
openid() {
return uni.getStorageSync('openid');
},
@@ -670,9 +705,16 @@
return tempArr[index];
}
-
-
+
+ },
+ isShowYuanFa(){
+ if(this.coalContactClean && !this.coalDetailsData.tmTaskCoalList.length){
+ return false
+ }else{
+ return true
+ }
}
+
},
methods: {
...mapMutations(['changewsgVisiable', 'changeisUploadimg', 'changeglobalIsFirstWeighing']),
@@ -774,7 +816,7 @@
}
})
} else {
- this.fileList1 = []
+ this.fileList1 = ['']
}
} else {
@@ -799,7 +841,7 @@
}
}, 1000)
}
-
+ this.coalDayPage();
})
},
// 鏃ュ織鏌ヨ
@@ -809,17 +851,32 @@
if (res.code == 0) {
this.timeLineStatus = res.data[0].taskStatus
this.timeLineEqCode = res.data[0].eqCode
- this.dayRZ = res.data.map(v => {
- let slicedate = v.taskStatusDes.slice(0, 10);
- if (slicedate == this.currentDate) {
+ this.dayRZ = res.data.map((v,i) => {
+ let slicedate = v.taskStatusDes.slice(0, 10);
+ if(this.coalDetailsData.packingType === 1 && (this.roleType == 3 || this.roleType ==1 )){
+ if (slicedate == this.currentDate && !/[鐨瘺鍑�]/.test(v.taskStatusDes)) {
return {
...v,
taskStatusDes: v.taskStatusDes.slice(10)
};
- } else {
- return { ...v }
+ } else if( /[鐨瘺鍑�]/.test(v.taskStatusDes)){
+ return null
+ }else{
+ return {...v}
}
- });
+ }else{
+ if (slicedate == this.currentDate) {
+ return {
+ ...v,
+ taskStatusDes: v.taskStatusDes.slice(10)
+ };
+ } else {
+ return { ...v }
+ }
+ }
+
+
+ }).filter(Boolean);
}
});
}, 5000);
@@ -1433,11 +1490,21 @@
height: vww(15);
@include flex;
justify-content: flex-start;
+ .coalName{
+ width: 45%;
+ height: 40rpx;
+ font-size: 30rpx;
+ font-weight: 300;
+ color: #515151;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
.coalName,
.order-type {
width: 45%;
- height: 30rpx;
+ height: 42rpx;
font-size: 30rpx;
font-weight: 300;
color: #515151;
@@ -1460,7 +1527,7 @@
justify-content: flex-start;
.send-date {
- width: 148rpx;
+ min-width: 148rpx;
height: 24rpx;
margin-left: vww(14);
font-size: 28rpx;
@@ -1528,10 +1595,17 @@
position: relative;
top: vww(130);
align-items: flex-start;
+ .table{
+ width: 98%!important;
+ }
/deep/ .uni-table{
+ width: 96%;
min-width: 0!important;
}
+ .uni-table-scroll {
+ overflow-x: hidden!important;
+ }
.uni-table::-webkit-scrollbar {
display: none;
}
--
Gitblit v1.9.1