From 725325a5bdfac73de8e8cbec2ba71a4923883529 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期四, 17 十月 2024 16:04:27 +0800
Subject: [PATCH] Merge branch 'master' of http://39.96.92.240:10000/r/~fyy/unattended-app
---
pages/customer-page/customer-index/customer-index.vue | 69 ++++++++++++++++++++++++++--------
1 files changed, 53 insertions(+), 16 deletions(-)
diff --git a/pages/customer-page/customer-index/customer-index.vue b/pages/customer-page/customer-index/customer-index.vue
index 499b969..08cda39 100644
--- a/pages/customer-page/customer-index/customer-index.vue
+++ b/pages/customer-page/customer-index/customer-index.vue
@@ -4,13 +4,14 @@
<view class="customer-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://mr1.res.jzeg.cn:9096/appimg/image/banner/customerbanner.png') no-repeat;background-size:contain">
</view>
<view style="position: relative;top: -120px;">
<u-empty mode="data"
icon="http://cdn.uviewui.com/uview/empty/data.png"
textSize="30"
iconSize="1000"
+ text="鏆傛棤鏁版嵁"
v-if="orderPlanData.length == 0"></u-empty>
</view>
<view class="collection-form">
@@ -20,12 +21,19 @@
@click="cardBodyClick(item)">
<view class="first-line">
<view class="dispatch-receive">
+ <view class="dispatch-dept">{{ item.deptName }}</view>
+ <view class="black-bar"></view>
<view class="dispatch">{{ item.filedName }}</view>
</view>
<view class="point-number">
<text class="residue">{{ item.cars2 }}</text>
<text>/{{ item.carNum }}</text>
</view>
+ </view>
+ <view class="second-line"
+ style="width: 94%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"
+ v-if="item.orderType==='鍐呴攢'||item.orderType==='澶栬喘'">
+ {{item.customerName}}
</view>
<view class="second-line">
<view class="coal-name">
@@ -35,10 +43,13 @@
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;li ne-height: 24rpx;background: url('https://mx.jzeg.cn:9095/appimg/image/banner/clock.png') no-repeat;background-size: cover">
+ style="width: 24rpx;height: 24rpx;li ne-height: 24rpx;background: url('https://mr1.res.jzeg.cn:9096/appimg/image/banner/clock.png') no-repeat;background-size: cover">
</view>
</view>
<view class="send-date">{{ item.sendDate }}</view>
@@ -67,6 +78,7 @@
icon="http://cdn.uviewui.com/uview/empty/data.png"
textSize="30"
iconSize="1000"
+ text="鏆傛棤鏁版嵁"
v-if="historyCoalData.length == 0"></u-empty>
<view class="history-information"
v-for="(item, index) in historyCoalData"
@@ -102,7 +114,7 @@
<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://mr1.res.jzeg.cn:9096/appimg/image/banner/clock.png') no-repeat;background-size: cover">
</view>
</view>
<view class="senddate">{{ item.sendDate }}</view>
@@ -110,7 +122,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://mr1.res.jzeg.cn:9096/appimg/image/banner/carnNUm.png') no-repeat;background-size: cover;">
</view>
</view>
<view class="senddate">{{ item.orderCode }}</view>
@@ -138,7 +150,8 @@
<view class="receiverPopup__btn"><u-button text="纭畾"
type="primary"
@click="popupDetermineClick"
- :disabled="canClick"></u-button></view>
+ :disabled="canClick"
+ :loading="popupDetermineClickLoading"></u-button></view>
</view>
</u-popup>
</view>
@@ -195,15 +208,15 @@
total: 0,
// 鏄惁鏄剧ず鏇村鏁版嵁
showMoreData: false,
- cars2: "",
- carNum: "",
+ cars2: "", //棰嗗彇鏃ヨ鍒掔殑杞︽暟
+ carNum: "", //鏃ヨ鍒掔殑鎬昏溅鏁�
// 鍓╀綑鐨勬彁鐓ゅ崟鏁伴噺
carNumSurplus: '',
- canClick: false
+ canClick: false,
+ popupDetermineClickLoading: false
};
},
- onLoad() {},
- onShow() {
+ onLoad() {
this.init();
},
methods: {
@@ -255,13 +268,16 @@
}, []);
return arrays;
},
+ //棰嗗彇寮规
popupDetermineClick() {
if (this.receiveNum > 0) {
+ this.popupDetermineClickLoading = true;
this.getOrderNum.num = this.receiveNum;
uni.showLoading({ title: '鍔犺浇涓�...' });
this.$reqPost('customerGet', this.getOrderNum, 'params').then(res => {
uni.hideLoading();
if (res.code == 0) {
+ this.popupDetermineClickLoading = false;
this.getOrderNum.num = '';
this.GetOrderPlan();
this.show = false;
@@ -271,6 +287,7 @@
duration: 1000
});
} else {
+ this.popupDetermineClickLoading = false;
this.$u.toast(res.msg ? res.msg : '棰嗗彇澶辫触');
}
});
@@ -310,10 +327,10 @@
this.$u.toast('宸茶秴杩囧綋鍓嶆棩璁″垝鎻愮叅鍗曟暟閲�,璇烽噸鏂拌緭鍏�')
}
},
- // 鎻愮叅鍗曡鎯�
+ // 锛堥《閮級鍙戣繍璁″垝璇︽儏
cardBodyClick(v) {
uni
- .navigateTo({ url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${v.id}&code=${v.code}&cars2=${v.cars2}` });
+ .navigateTo({ url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${v.id}&code=${v.code}&cars2=${v.cars2}` });
},
// 鐐瑰嚮鍘嗗彶鎻愮叅鍗曡幏鍙栬鎯�
faYundetail(v) {
@@ -473,12 +490,13 @@
.collection-form-item {
width: 690rpx;
- height: 300rpx;
+ height: 370rpx;
background: #ffffff;
box-shadow: 4rpx 6rpx 25rpx 0rpx rgba(73, 120, 240, 0.15);
border-radius: 20rpx;
overflow: hidden;
- @include flex flex-direction: column;
+ @include flex;
+ flex-direction: column;
position: relative;
align-items: flex-start;
margin-top: vww(10);
@@ -493,8 +511,27 @@
.dispatch-receive {
width: 70%;
display: flex;
- justify-content: space-between;
+ justify-content: flex-start;
align-items: center;
+
+ .dispatch-dept {
+
+ display: flex;
+ align-items: center;
+ }
+
+ .black-bar {
+ width: 2rpx;
+ height: 30rpx;
+ background: #515151;
+ margin-left: vww(12);
+ }
+
+ .dispatch {
+ margin-left: vww(12);
+ min-width: vww(50);
+ }
+
}
.point-number {
@@ -656,4 +693,4 @@
}
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.1