From f2dd92deb176ad39b18805d5d2721fad0974a278 Mon Sep 17 00:00:00 2001
From: wk
Date: 星期五, 22 十一月 2024 11:32:35 +0800
Subject: [PATCH] feat:我的
---
pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails.vue | 104 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 74 insertions(+), 30 deletions(-)
diff --git a/pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails.vue b/pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails.vue
index d4f6810..1e88a2b 100644
--- a/pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails.vue
+++ b/pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails.vue
@@ -1,16 +1,16 @@
<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;">
<view class="top-information">
<view class="cutomer-name"
- v-if="orderType == '杞叆' || orderType == '杞嚭'">鐓ゅ満:{{ coalDetailsData.toFiledName || '' }}</view>
+ v-if="orderType == '杞叆' || orderType == '杞嚭'">鍦哄湴:{{ coalDetailsData.toFiledName || '' }}</view>
<view class="cutomer-name"
v-else>瀹㈡埛:{{ coalDetailsData.customerName || '' }}</view>
<view class="fild-name">
<view class="">鐭垮満:{{ coalDetailsData.deptName || '鏆傛棤' }}</view>
<view class=""
- v-if="orderType == '杞叆' || orderType == '杞嚭'">鐓ゅ満:{{ coalDetailsData.filedName || '' }}</view>
+ v-if="orderType == '杞叆' || orderType == '杞嚭'">鍦哄湴:{{ coalDetailsData.filedName || '' }}</view>
<view class=""
v-else>浠撳簱:{{ coalDetailsData.filedName || '鏆傛棤' }}</view>
</view>
@@ -20,7 +20,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>
@@ -46,19 +46,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>
@@ -72,6 +72,7 @@
<view class="table">
<uni-table border
id="table-box"
+ v-if="coalDetailsData.isWeight === 1"
emptyText="鏆傛棤鏇村鏁版嵁">
<uni-tr>
<uni-th align="center" >浜у搧</uni-th>
@@ -102,6 +103,37 @@
></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="center">
+ <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>
+ </uni-tr>
+ </uni-table>
</view>
<!-- 璇疯緭鍏ラ泦瑁呯鍙� -->
<view class="codeBox" v-if="coalDetailsData.isContainerNum">
@@ -118,7 +150,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">
<!-- 鎶樺彔 -->
@@ -200,7 +232,8 @@
<!-- <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 coalDetailsData.tmTaskCoalList" :key="index">
<uni-td align="center">
@@ -230,14 +263,14 @@
<u-form-item prop='contactPicture'>
<view class="label-text">
- <text style="color: #f56c6c;">*</text>鍘熷彂纾呭崟
+ <text style="color: #f56c6c;">*</text>鍘熷彂鍗曟嵁
</view>
<u-upload :fileList="fileList1"
@afterRead="afterRead"
@delete="deletePic"
name="1"
multiple
- :maxCount="2"
+ :maxCount="fileList1.length ? fileList1.length : 2"
width="250"
height="150"
:previewFullImage="true"
@@ -298,7 +331,7 @@
<!-- <view class="completeOutSale">
<u-modal :show="completeOutSaleShow"
title="纭"
- content="鏄惁瀹屾垚澶栭攢鎻愮叅鍗�"
+ content="鏄惁瀹屾垚澶栭攢鏀跺彂鍗�"
:showCancelButton="true"
@confirm="completeOutSaleConfirm"
@cancel="completeOutSaleCancel"></u-modal>
@@ -324,13 +357,13 @@
combinedTitle,
},
onPullDownRefresh() {
- this.getTakeCoal(); //鑾峰彇鎻愮叅鍗曡鎯�
+ this.getTakeCoal(); //鑾峰彇鏀跺彂鍗曡鎯�
// uni.stopPullDownRefresh();
},
onLoad(value) {
this.orderPlanId = value.id;
// this.yyId = value.yyId;
- // this.originInfoVisible = value.orderType === '澶栬喘'
+ this.originInfoVisible = value.orderType === '澶栬喘'
// if (value.overTmWaixiao) {
// this.overTmWaixiao = value.overTmWaixiao
// this.getWeightHouseObj.overTmWaixiao = value.overTmWaixiao
@@ -339,7 +372,7 @@
this.changeglobalIsFirstWeighing(1)
if (this.globalIsFirstWeighing === 1) {
console.log('鑾峰彇璇︽儏 onload');
- this.getTakeCoal(); //鑾峰彇鎻愮叅鍗曡鎯�
+ this.getTakeCoal(); //鑾峰彇鏀跺彂鍗曡鎯�
}
this.init(); //鑾峰彇鏃ュ織
},
@@ -347,7 +380,7 @@
this.coalDayPage(); //鑾峰彇鏃ュ織 瀹氭椂浠诲姟
if (this.globalIsFirstWeighing === 2) {
console.log('鑾峰彇璇︽儏 onShow');
- this.getTakeCoal(); //鑾峰彇鎻愮叅鍗曡鎯�
+ this.getTakeCoal(); //鑾峰彇鏀跺彂鍗曡鎯�
}
},
onHide() {
@@ -368,7 +401,7 @@
return {
swiperList:[],
orderPlanId: null,
- radioValue:'鐓ゅ満',
+ radioValue:'鍦哄湴',
tmTaskCoalList:[],
currentNum:0,
guideLineshow:false,
@@ -381,8 +414,8 @@
},
coalDetailsData: {
tmTaskCoalList:[]
- }, // 鎻愮叅鍗曡鎯�
- currentPageCoalStatus: 0, // 褰撳墠椤甸潰鎻愮叅鍗曠姸鎬�
+ }, // 鏀跺彂鍗曡鎯�
+ currentPageCoalStatus: 0, // 褰撳墠椤甸潰鏀跺彂鍗曠姸鎬�
// 鑾峰彇鎵�鍦ㄧ鎴垮弬鏁�
getWeightHouseObj: {
deptId: '',
@@ -408,8 +441,9 @@
openName: '',
serviecePhone: ''
},
- coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅浠�', '鍑虹叅浠�', '鏀剧┖', '浣滃簾', '鍏ュ満鐢宠',
- '杩涘叆鍦洪櫌', '寮傚父瀹℃牳涓�', '杩斿洖鍔犲噺鍚�', '瓒呮椂', '鎵撳嵃涓�', '鎵撳嵃涓�', '濉啓', '鏀剧┖纭涓�', '瓒呮渶澶ф瘺閲嶇‘璁や腑'
+ coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ヤ粨搴�', '鍑轰粨搴�', '鏀剧┖', '浣滃簾', '鍏ュ満鐢宠',
+ '杩涘叆鍦洪櫌', '寮傚父瀹℃牳涓�', '杩斿洖鍔犲噺鍚�', '瓒呮椂', '鎵撳嵃涓�', '鎵撳嵃涓�', '濉啓', '鏀剧┖纭涓�', '瓒呮渶澶ф瘺閲嶇‘璁や腑','琛ユ墦','鍏ュ満妫�鏌�','璐ㄦ涓�',
+ '绂诲満妫�鏌�','宸叉墦鍗�','瑁呭嵏','杩斿洖鍔犲噺鍚ㄧ‘璁や腑'
], // 鐘舵��
weighHouseCode: '',
// 鏀剧┖寮圭獥鎺у埗鍙橀噺
@@ -569,8 +603,14 @@
return tempArr[index];
}
-
-
+ },
+ //鍒ゆ柇鏄惁灞曠ず 鍘熷彂淇℃伅
+ isShowYuanFa(){
+ if(this.coalContactClean && !this.coalDetailsData.tmTaskCoalList.length){
+ return false
+ }else{
+ return true
+ }
}
},
methods: {
@@ -594,7 +634,7 @@
}
});
},
- // 鑾峰彇鎻愮叅鍗曡鎯�
+ // 鑾峰彇鏀跺彂鍗曡鎯�
getTakeCoal() {
uni.showLoading({
title: '鍔犺浇涓�'
@@ -602,7 +642,7 @@
this.$reqGet('getTakeCoal', { takeCoalId: this.orderPlanId }).then(res => {
if (res.code == 0) {
uni.hideLoading();
- console.log(res, '鎻愮叅鍗曡鎯�');
+ console.log(res, '鏀跺彂鍗曡鎯�');
this.coalDetailsData = res.data;
this.orderType = this.coalDetailsData.orderType;
//
@@ -625,7 +665,7 @@
// 鑾峰彇瀹㈡湇openId鍙傛暟璧嬪��
this.getServiceOpenid.deptId = this.coalDetailsData.deptId;
this.getServiceOpenid.filedId = this.coalDetailsData.filedId;
- // 鑾峰彇鎻愮叅鍗曠姸鎬�
+ // 鑾峰彇鏀跺彂鍗曠姸鎬�
this.currentPageCoalStatus = this.coalDetailsData.status;
// 鑾峰彇鍘熷彂淇℃伅
this.primarySkin = this.coalDetailsData.skinTwo;
@@ -817,7 +857,7 @@
this.guideLineshow = true;
this.swiperList = [];
this.activeText = '';
- this.activeObj.affiliationId = this.coalDetailsData.filedId; //榛樿鏌ョ叅鍦�
+ this.activeObj.affiliationId = this.coalDetailsData.filedId; //榛樿鏌ュ満鍦�
this.getguideFun();
},
@@ -992,11 +1032,15 @@
.coalName,
.order-type {
width: 45%;
- height: 30rpx;
+ height: 60rpx;
font-size: 30rpx;
font-weight: 300;
color: #515151;
position: relative;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+
}
.black-block {
@@ -1009,13 +1053,13 @@
}
.time {
- width: 35%;
+ width: 40%;
height: vww(12);
display: flex;
justify-content: flex-start;
.send-date {
- width: 148rpx;
+ width: 300rpx;
height: 24rpx;
margin-left: vww(14);
font-size: 28rpx;
--
Gitblit v1.9.1