From 5211e91aa2a919a9026b1db61bc1740c97d78c51 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期二, 15 十月 2024 09:29:24 +0800
Subject: [PATCH] feat:液氯瓶装同步pvc
---
pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue | 63 ++++++++++++++++++-------------
1 files changed, 36 insertions(+), 27 deletions(-)
diff --git a/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue b/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
index 8eda1fa..1141048 100644
--- a/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
+++ b/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
@@ -84,13 +84,13 @@
<text
v-if="value.orderType == '澶栭攢' || value.orderType == '鍐呴攢' || value.orderType == '澶栭攢閫�' || value.orderType == '杞嚭'">{{ value.customerName || '' }}</text>
<text
- v-else-if="value.orderType == '澶栬喘' || value.orderType == '鍐呰喘' || value.orderType == '澶栬喘閫�' || value.orderType == '杞叆'">{{ value.deptName || '' }}</text>
+ v-else-if="value.orderType == '澶栬喘' || value.orderType == '鍐呰喘' || value.orderType == '澶栬喘閫�' || value.orderType == '杞叆'">{{ value.filedName || '' }}</text>
</view>
</view>
</view>
<view class="second-line">
<view class="coal-name">
- <view class="">{{ value.productNames || value.productName }}</view>
+ <view class="productName">{{ value.productNames || value.productName }}</view>
<view class="black-bar"></view>
<view class="coal-type"
v-if="value.orderType">{{ value.orderType }}</view>
@@ -100,7 +100,7 @@
</view>
<view class="third-line">
<view class="carnum-icon">
- <image src="https://mx.jzeg.cn:9096/appimg/image/banner/carNO.png"
+ <image src="https://wrzs.czjlchem.com:9090/appimg/image/banner/carNO.png"
mode="widthFix"></image>
</view>
<view class="carnum-text">{{ value.carNo || '' }}</view>
@@ -184,7 +184,7 @@
v-for="(item, index) in customerList"
:key="index"
@click="filterCondition(2, index, item.condition)">
- <u-button :text="item.condition"
+ <u-button :text="item.name"
:type="item.active ? 'primary' : ''"
size="small"></u-button>
</view>
@@ -193,9 +193,9 @@
</view> -->
</view>
</view>
- <view class="filter-body"
+ <!-- <view class="filter-body"
v-if="roleType == 1">
- <view class="condition-name">璐т唬</view>
+ <view class="condition-name">鎵胯繍鍟�</view>
<view class="filter-name">
<view class="filter-button"
v-for="(item, index) in forwarderList"
@@ -204,18 +204,9 @@
<u-button :text="item.condition"
:type="item.active ? 'primary' : ''"></u-button>
</view>
- <!-- <view class="toggle-button">
- <u-button
- :text="forwarderShow < forwarderTotal ? '鏌ョ湅鏇村' : '鏀惰捣'"
- type="primary"
- size="small"
- @click="toggle(3)"
- v-if="forwarderTotal > 3"
- ></u-button>
- </view> -->
</view>
- </view>
- <view class="filter-body"
+ </view> -->
+ <!-- <view class="filter-body"
v-if="roleType != 3">
<view class="condition-name">杞﹂槦</view>
<view class="filter-name">
@@ -227,11 +218,7 @@
:type="item.active ? 'primary' : ''"
size="small"></u-button>
</view>
- <!-- <view class="toggle-button">
- <u-button :text="fleetShow < fleetTotal ? '鏌ョ湅鏇村' : '鏀惰捣'" type="primary" size="small" @click="toggle(4)" v-if="fleetTotal > 3"></u-button>
- </view> -->
- </view>
- </view>
+ </view> -->
<view class="filter-body" v-if="false">
<view class="condition-name">鐭垮満</view>
<view class="filter-name">
@@ -339,7 +326,7 @@
// 鐐瑰嚮鍙崇澶磋鎯呭脊绐�
faYunDetailobj: {},
modalShow: false,
- coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅浠�', '鍑虹叅浠�', '鏀剧┖', '浣滃簾', '鍏ュ満鐢宠',
+ coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ヤ粨搴�', '鍑轰粨搴�', '鏀剧┖', '浣滃簾', '鍏ュ満鐢宠',
'杩涘叆鍦洪櫌', '寮傚父瀹℃牳涓�', '杩斿洖鍔犲噺鍚�', '瓒呮椂', '鎵撳嵃涓�', '鎵撳嵃涓�', '濉啓'
]
};
@@ -438,6 +425,7 @@
this.$reqGet('getTmTaskCoalData', { startTime: this.first, endTime: this.last }).then(res => {
this.filterList = this.taskList = res.data;
if (this.filterList.length != 0) {
+ let customerTemp;
this.totalLength = this.filterList.map(v => v.taskCoalList.length).reduce((x, y) => x + y);
this.totalTon = this.filterList.map(v =>
v.taskCoalList.reduce((prev, cur) => {
@@ -450,6 +438,20 @@
let yy = new BigNumber(y)
return xx.plus(yy).toNumber().toFixed(2)
}, new BigNumber(0));
+ customerTemp = res.data.map(item=>item.taskCoalList.map(val=>{
+ return {
+ name:val.customerName,
+ active:false
+ }
+ })).flat(Infinity);
+ console.log(customerTemp,'')
+ if(customerTemp.length){
+ let obj = {};
+ this.customerList = customerTemp.reduce(function (item, next) {
+ obj[next.name] ? '' : obj[next.name] = true && item.push(next)
+ return item
+ }, [])
+ }
} else {
this.totalLength = 0;
this.totalTon = 0;
@@ -493,7 +495,7 @@
let conditionMapping = {
productName: this.coalList.filter(v => v.active == true).map(item => item.condition),
orderType: this.typeList.filter(v => v.active == true).map(item => item.condition),
- customerName: this.customerList.filter(v => v.active == true).map(item => item.condition),
+ customerName: this.customerList.filter(v => v.active == true).map(item => item.name), //瀹㈡埛绛涢�夋潯浠跺墠绔嚜宸卞仛 鎵�浠ユ槸name
xsUser2Name: this.forwarderList.filter(v => v.active == true).map(item => item.condition),
fleetName: this.fleetList.filter(v => v.active == true).map(item => item.condition),
filedName: this.filedList.filter(v => v.active == true).map(item => item.condition),
@@ -890,7 +892,7 @@
padding: 0 vww(5);
@include flex .date-text {
- width: 330rpx;
+ width: 360rpx;
height: 40rpx;
font-size: 28rpx;
font-weight: 400;
@@ -977,7 +979,7 @@
height: vww(28);
line-height: vww(28);
text-align: center;
- background: url('https://mx.jzeg.cn:9096/appimg/image/banner/blueblock.png') no-repeat;
+ background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/blueblock.png') no-repeat;
background-size: contain;
font-size: 30rpx;
font-weight: 400;
@@ -1034,7 +1036,7 @@
// display: flex;
// justify-content: center;
// align-items: center;
- background: url('https://mx.jzeg.cn:9096/appimg/image/banner/redblock.png') no-repeat;
+ background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/redblock.png') no-repeat;
background-size: contain;
font-size: 30rpx;
font-weight: 400;
@@ -1062,11 +1064,18 @@
flex-grow: 1;
height: 30rpx;
font-size: 30rpx;
+ width: 50%;
font-weight: 300;
color: #515151;
position: relative;
display: flex;
align-items: center;
+ .productName{
+ width: 50%;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
.black-bar {
width: 2rpx;
--
Gitblit v1.9.1