From 5d1fee5bb28015f427c53ee36ba2c7fe513226c0 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期二, 22 十月 2024 17:16:22 +0800
Subject: [PATCH] feat:确认装卸文字误删，供应商提交细节
---
pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue | 45 ++++++++++++++++++++++++---------------------
1 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue b/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
index 9e562a4..37394ea 100644
--- a/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
+++ b/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
@@ -2,7 +2,7 @@
<view class="freightForwarder-index">
<view class="freightForwarder-index-body">
<view class="wait-collection"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/customerbanner.png') no-repeat;background-size:contain">
+ style="background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/customerbanner.png') no-repeat;background-size:contain">
</view>
<view style="position: relative;top: -120px;">
<u-empty mode="data"
@@ -22,9 +22,9 @@
<view class="sign">瑁�</view>
<view class="filedname exceedHide">
<text
- v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'">{{ item.deptName }}</text>
+ v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '澶栭攢閫�'|| item.orderType == '杞嚭'">{{ item.deptName }}</text>
<text
- v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">{{ item.customerName }}</text>
+ v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘'|| item.orderType == '澶栬喘閫�' || item.orderType == '杞叆'">{{ item.customerName || item.customerNameCopy }}</text>
</view>
</view>
<view class="main-divider"></view>
@@ -38,24 +38,27 @@
<view class="sign">鍗�</view>
<view class="filedname exceedHide">
<text
- v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'">{{ item.customerName }}</text>
+ v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢'|| item.orderType == '澶栭攢閫�' || item.orderType == '杞嚭'">{{ item.customerName || item.customerNameCopy }}</text>
<text
- v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">{{ item.deptName }}</text>
+ v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘'|| item.orderType == '澶栬喘閫�' || item.orderType == '杞叆'">{{ item.deptName }}</text>
</view>
</view>
</view>
<view class="second-line">
<view class="coal-name">
- <view class="">{{ item.coalName }}</view>
+ <view class="">{{ item.productNames }}</view>
<view class="black-bar"></view>
<view class="coal-type"
v-if="item.orderType">{{ item.orderType }}</view>
</view>
</view>
+ <view class="second-line">
+ {{item.orderCode}}
+ </view>
<view class="third-line">
<view class="time-icon">
<view
- style="width: 24rpx;height: 24rpx;line-height: 24rpx;background: url('https://mx.jzeg.cn:9095/appimg/image/banner/clock.png') no-repeat;background-size: cover">
+ style="width: 24rpx;height: 24rpx;line-height: 24rpx;background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/clock.png') no-repeat;background-size: cover">
</view>
</view>
<view class="send-date">{{ item.sendDate }}</view>
@@ -72,7 +75,7 @@
<u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" textSize="30" iconSize="1000" v-if="orderPlanData.length == 0"></u-empty>
</view> -->
<view class="history-numbers">
- <combined-title title="鍘嗗彶鎻愮叅鍗�"></combined-title>
+ <combined-title title="鍘嗗彶鏀跺彂鍗�"></combined-title>
<scroll-view :scroll-top="scrollTop"
scroll-y="true"
class="scroll-Y"
@@ -94,7 +97,7 @@
size="40"></u-icon></view>
</view>
<view class="second">
- <view class="coal-name">{{ item.coalName || '' }}</view>
+ <view class="coal-name">{{ item.item.productNames || '' }}</view>
<view class="order-type"
v-if="item.orderType">{{ item.orderType || '' }}</view>
</view>
@@ -108,14 +111,14 @@
<view class="third-line_num">{{ item.carNumSurplus }}</view>
</view>
<view class="third-line">
- <view class="third-line_text">鎻愮叅鍗曚釜鏁帮細</view>
+ <view class="third-line_text">鏀跺彂鍗曚釜鏁帮細</view>
<view class="third-line_num">{{ item.tmCount }}</view>
</view>
</view>
<view class="fourth">
<view class="fourth-icon">
<view
- style="width: 24rpx;height: 24rpx;line-height: 24rpx;background: url('https://mx.jzeg.cn:9095/appimg/image/banner/clock.png') no-repeat;background-size: cover">
+ style="width: 24rpx;height: 24rpx;line-height: 24rpx;background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/clock.png') no-repeat;background-size: cover">
</view>
</view>
<view class="senddate">{{ item.sendDate }}</view>
@@ -123,7 +126,7 @@
<view class="fourth">
<view class="fourth-icon">
<view
- style="width: 26rpx;height: 26rpx;line-height: 26rpx;background: url('https://mx.jzeg.cn:9095/appimg/image/banner/carnNUm.png') no-repeat;background-size: cover">
+ style="width: 26rpx;height: 26rpx;line-height: 26rpx;background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/carnNUm.png') no-repeat;background-size: cover">
</view>
</view>
<view class="senddate">{{ item.orderCode }}</view>
@@ -196,7 +199,7 @@
}
},
methods: {
- // 鑾峰彇鍘嗗彶鎻愮叅鍗�
+ // 鑾峰彇鍘嗗彶鏀跺彂鍗�
getJhOrderPlanDataPage() {
uni.showLoading({
title: '鍔犺浇涓�'
@@ -220,7 +223,7 @@
this.pageCurrent++;
this.getJhOrderPlanDataPage();
},
- //fix 鐐瑰嚮鎻愮叅鍗曡繑鍥炰細澧炲姞閲嶅鏁版嵁
+ //fix 鐐瑰嚮鏀跺彂鍗曡繑鍥炰細澧炲姞閲嶅鏁版嵁
ArrSet(Arr, id) {
var obj = {};
const arrays = Arr.reduce((setArr, item) => {
@@ -247,7 +250,7 @@
// }
// });
uni.navigateTo({
- url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${item.orderPlanId}&carNum=${item.carNum}`
+ url: `/subPages/fayunPlanDetails?orderPlanId=${item.orderPlanId}&carNum=${item.carNum}`
});
},
// 杞彂
@@ -256,10 +259,10 @@
url: `/pages/public-page/forward/forward?orderPlanId=${value.orderPlanId}&carNumSurplusHuodai=${value.carNumSurplusHuodai}&carNum=${value.carNum}`
});
},
- // 鐐瑰嚮鍘嗗彶鎻愮叅鍗曚竴琛岃幏鍙栬鎯�
+ // 鐐瑰嚮鍘嗗彶鏀跺彂鍗曚竴琛岃幏鍙栬鎯�
faYundetail(v) {
uni.navigateTo({
- url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${v.id}&cars2=${v.cars2}`
+ url: `/subPages/fayunPlanDetails?orderPlanId=${v.id}&cars2=${v.cars2}`
});
}
}
@@ -416,7 +419,7 @@
.collection-form-item {
width: 690rpx;
- height: 340rpx;
+ height: 370rpx;
background: #ffffff;
box-shadow: 4rpx 6rpx 25rpx 0rpx rgba(73, 120, 240, 0.15);
border-radius: 20rpx;
@@ -446,7 +449,7 @@
height: vww(28);
line-height: vww(28);
text-align: center;
- background: url('https://mx.jzeg.cn:9095/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;
@@ -498,7 +501,7 @@
height: vww(28);
line-height: vww(28);
text-align: center;
- background: url('https://mx.jzeg.cn:9095/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;
@@ -554,7 +557,7 @@
align-items: center;
.send-date {
- width: 148rpx;
+ width: 170rpx;
height: 24rpx;
margin-left: vww(14);
line-height: 24rpx;
--
Gitblit v1.9.1