From df1cc5d412c69dea148c4cbdb314db8ff6e521a2 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期三, 10 七月 2024 16:20:18 +0800
Subject: [PATCH] feat;再生首页样式更改，部分问题修改
---
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 290 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 249 insertions(+), 41 deletions(-)
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
index f68f8af..6629ea3 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
@@ -19,7 +19,7 @@
<view class="block-information">
<view class="block-main">
<view class="basic">
- <view class="coalName">{{ coalDetailsData.coalName||'' }}</view>
+ <view class="coalName"><text> {{ coalDetailsData.coalName||'' }}</text></view>
<view class="status-button"
:style="{ backgroundImage: `url(${onlineurl}/appimg/image/banner/statusbutton.png)`, backgroundSize: 'cover', backgroundRepeat: 'no-repeat' }">
{{ coalStatus[coalDetailsData.statusWeigh] || '' }}
@@ -29,7 +29,7 @@
<view class="time-icon"><u-icon name="clock"
color="#515151"
size="40"></u-icon></view>
- <view class="send-date">{{ coalDetailsData.sendDate }}</view>
+ <view class="send-date" >{{ coalDetailsData.sendDate }}</view>
</view>
<view class="coal-code">閫氱煡鍗曠紪鍙�: {{ coalDetailsData.code || '' }}</view>
<view class="order-code">
@@ -44,7 +44,7 @@
</view>
<!-- 绉伴噸鍘嗗彶-->
- <weigh-item :list="showWeigh"></weigh-item>
+ <weigh-item :list="showWeigh" class="weighing-item"></weigh-item>
<!-- 鏃堕棿绾� -->
<view class="timeLine">
<u-steps :current="dayRZ.length - 1"
@@ -59,20 +59,20 @@
</view>
<view class="utilsBox">
- <view class="utils_chil utils_chilTop">
+ <view class="utils_chil utils_chilTop" v-if="!isReservation">
<view class="top-button">
<u-button text="绛惧埌"
type="primary"
plain
@click="arriveClick"
shape="circle"
- :disabled="coalDetailsData.status >= 2"></u-button>
- <u-button text="鍏ュ満鐢宠"
+ :disabled="coalDetailsData.status > 2"></u-button>
+ <u-button text="鎵撳嵃纾呭崟"
type="primary"
plain
- @click="rcsqClick"
+ @click="printOrder"
shape="circle"
- :disabled="coalDetailsData.status >= 3"></u-button>
+ :disabled="(currentPageCoalStatus != 3) || !printNum"></u-button>
</view>
<view class="bottom-button">
<u-button text="鏀剧┖"
@@ -90,16 +90,28 @@
</view>
</view>
</view>
- <view class="weigh-ability">
- <view class="weigh-button"><u-button text="灞曠ず閫氱煡鍗�"
+ <view class="weigh-ability" v-if="!isReservation && noCarNo != 1">
+<!-- <view class="weigh-ability" v-if="!isReservation">-->
+ <!-- <view class="weigh-button"><u-button text="灞曠ず閫氱煡鍗�"
@click="showCaolPickUpBill"
type="primary"
- shape="circle"></u-button></view>
- <view class="weigh-button"><u-button text="涓婄璁￠噺"
+ shape="circle"></u-button></view> -->
+ <view class="weigh-button"><u-button
+ :disabled="!isapproach"
+ text="涓婄璁￠噺"
@click="cengZhongClick"
type="primary"
shape="circle"></u-button></view>
</view>
+ <view class="weigh-ability" v-if="noCarNo == 1">
+ <view class="weigh-button"><u-button
+ :disabled="!isapproach"
+ text="鐢宠璁￠噺"
+ @click="shenqingjiliangClick"
+ type="primary"
+ shape="circle"></u-button></view>
+
+ </view>
<view class="evacuationModal">
<u-modal :show="evacuationModalShow"
:title="evacuationTitle"
@@ -116,6 +128,31 @@
@confirm="completeOutSaleConfirm"
@cancel="completeOutSaleCancel"></u-modal>
</view>
+ <u-action-sheet
+ :actions="list"
+ :show="show"
+ :closeOnClickOverlay="true"
+ :closeOnClickAction="true"
+ @select="selectClick"
+ @close="sheetClose" >
+ </u-action-sheet>
+ <view class="serviece-customer">
+ <u-action-sheet :actions="hujiaolist"
+ @select="selectClickhujiao"
+ @close='serviceClose'
+ title="鍛煎彨鏂瑰紡"
+ :show="servieceShow"
+ cancelText="鍙栨秷"></u-action-sheet>
+ </view>
+<!-- 纾呮埧鍒楄〃 -->
+ <u-action-sheet
+ :actions="bangfangList"
+ title="閫夋嫨纾呮埧"
+ :closeOnClickAction="true"
+ :closeOnClickOverlay="true"
+ @select="bangfangSelectClick"
+ :show="bangfangListShow"
+ @close="bangfangSheetClose"></u-action-sheet>
</view>
</template>
@@ -129,6 +166,7 @@
weighItem
},
onLoad(value) {
+ console.log(value,'valyue')
this.orderPlanId = value.orderPlanId;
this.yyId = value.yyId;
if (value.overTmWaixiao) {
@@ -140,7 +178,22 @@
return {
orderPlanId: null,
yyId: null,
+ show:false,
+ hujiaolist: [{ name: '鎵嬫満鍙�', subname: '1213456', id: 1 }, { name: '寰俊璇煶', id: 2 }], //鍛煎彨瀹㈡湇閫夐」
+ servieceShow:false,
+ chengZhongFlag:true, // 涓婃绉伴噸鐘舵��
dayRZ: [],
+ list: [
+ {
+ name:'閫夐」涓�',
+ },
+ {
+ name: '閫夐」浜岀鐢�',
+ },
+ {
+ name: '寮�鍚痩oad鍔犺浇', //寮�鍚悗鏂囧瓧涓嶆樉绀�
+ }
+ ],
coalDetailsData: {}, // 閫氱煡鍗曡鎯�
currentPageCoalStatus: 0, // 褰撳墠椤甸潰閫氱煡鍗曠姸鎬�
// 鑾峰彇鎵�鍦ㄧ鎴垮弬鏁�
@@ -165,9 +218,10 @@
// 瀹㈡湇淇℃伅
serviceInfoObj: {
openId: null,
- openName: ''
+ openName: '',
+ serviecePhone: ''
},
- coalStatus: ['鏈О閲�', '绉伴噸涓�', '楠岃川涓�', '绉伴噸瀹屾垚', '楠岃川瀹屾垚'], // 鐘舵��
+ coalStatus: ['鏈О閲�', '绉伴噸涓�', '楠岃川涓�', '绉伴噸瀹屾垚', '璐ㄦ瀹屾垚'], // 鐘舵�乕0,1,3,4]
weighHouseCode: '',
// 鏀剧┖寮圭獥鎺у埗鍙橀噺
evacuationModalShow: false,
@@ -197,10 +251,14 @@
clean: ""
},
completeOutSaleShow: false,
+ reservationIsShow:false,
overTmWaixiao: null,
// 鍒よ缃戠粶鐘舵�侊紝
normalCode: true,
onlineurl,
+ bangfangListShow: false,
+ bangfangList: [],
+ noCarNo:0, //鏄惁鏈夎溅鐗屽彿(鏈夎溅鐗�0锛屾棤杞︾墝1)
};
},
onShow() {
@@ -235,16 +293,24 @@
return this.coalDetailsData.hair !== 0 || this.coalDetailsData.skin !== 0;
},
isapproach() {
- return this.currentPageCoalStatus !== 3;
+ return this.currentPageCoalStatus != 3;
},
// 灞曠ず鐨瘺鍑�
showWeigh() {
return this.coalDetailsData.tmTaskCoalItems ? this.coalDetailsData.tmTaskCoalItems : []
+ },
+ //鍙告満棰嗗彇鐘舵�佹寜閽叏涓嶅睍绀�
+ isReservation(){
+ return this.reservationIsShow < 1;
+ },
+ //鍒ゆ柇鎵撳嵃鍗曟鏁�
+ printNum(){
+ return this.coalDetailsData.printTimes2 <= this.coalDetailsData.tmTaskCoalItems?.length
}
},
methods: {
- init() {
- this.$reqGet('coalDayPage', { id: this.orderPlanId }).then(res => {
+ init() {
+ this.$reqGet('coalDayPage', { id: this.orderPlanId }).then(res => {
if (res.code == 0) {
this.dayRZ = res.data.map(v => {
let slicedate = v.taskStatusDes.slice(0, 10);
@@ -259,9 +325,8 @@
});
}
});
- this.coalDayPage(); //鑾峰彇鏃ュ織
- this.getTakeCoal(); //鑾峰彇閫氱煡鍗曡鎯�
- this.getgetService(); //鑾峰彇瀹㈡湇
+ this.coalDayPage(); //鑾峰彇鏃ュ織
+ this.getTakeCoal(); //鑾峰彇閫氱煡鍗曡鎯�
},
// 鑾峰彇瀹㈡湇openid
getgetService() {
@@ -272,6 +337,8 @@
} else {
this.serviceInfoObj.openId = res.data.openId;
this.serviceInfoObj.openName = res.data.openName;
+ this.serviceInfoObj.serviecePhone = res.data.serviecePhone
+ this.$set(this.hujiaolist[0], 'subname', this.serviceInfoObj.serviecePhone)
uni.setStorageSync('customeropenId', this.serviceInfoObj.openId);
uni.setStorageSync('customerName', this.serviceInfoObj.openName);
}
@@ -288,7 +355,8 @@
console.log(res, '閫氱煡鍗曡鎯�');
this.coalDetailsData = res.data;
this.orderType = this.coalDetailsData.orderType;
- // 鍒ゆ柇鏄惁瀹屾垚澶栭攢璁㈠崟
+ this.noCarNo = res.data.noCarNo
+ // 鍒ゆ柇鏄惁瀹屾垚澶栭攢璁㈠崟
this.completeOutSale.orderType = this.coalDetailsData.orderType;
this.completeOutSale.deptId = this.coalDetailsData.deptId;
this.completeOutSale.filedId = this.coalDetailsData.filedId;
@@ -308,10 +376,17 @@
this.getServiceOpenid.filedId = this.coalDetailsData.filedId;
// 鑾峰彇閫氱煡鍗曠姸鎬�
this.currentPageCoalStatus = this.coalDetailsData.statusWeigh;
+ this.reservationIsShow = this.coalDetailsData.status;
// 鑾峰彇鍘熷彂淇℃伅
this.primarySkin = this.coalDetailsData.skinTwo;
this.primaryHair = this.coalDetailsData.hairTwo;
this.primaryClean = this.coalDetailsData.cleanTwo;
+
+ //鍒濆鍖栫鍗曟暟鎹�
+ this.list = this.coalDetailsData.tmTaskCoalItems.map(item=>{
+ return {name:item.breed + '/' + item.spec,id:item.id}
+ })
+ this.getPoundRoomByList()
} else {
this.$u.toast('鍔犺浇澶辫触');
}
@@ -331,6 +406,7 @@
})
}
}
+ this.getgetService(); //鑾峰彇瀹㈡湇
})
},
// 鏃ュ織鏌ヨ
@@ -372,7 +448,7 @@
uni.navigateTo({
url: `/pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock?orderPlanId=${this.orderPlanId}&coalStatus=${
this.currentPageCoalStatus
- }&tmId=${this.getWeightHouseObj.tmId}`
+ }&tmId=${this.getWeightHouseObj.tmId}&yyId=${this.yyId}`
});
},
// 鍏ュ満鐢宠
@@ -388,6 +464,63 @@
// if (!this.serviceInfoObj.openId) {
// this.$u.toast('鏃犲鏈嶄俊鎭�');
// }
+ // wx.getSetting({
+ // success(res) {
+ // console.log('鎺堟潈success', res);
+ // if (!res.authSetting['scope.camera'] || !res.authSetting['scope.record']) {
+ // if (!res.authSetting['scope.camera']) {
+ // uni.showToast({
+ // title: '鏃犵浉鏈烘潈闄�'
+ // });
+ // } else if (!res.authSetting['scope.record']) {
+ // uni.showToast({
+ // title: '鏃犻害鍏嬮鏉冮檺'
+ // });
+ // }
+ // } else {
+ // wx.join1v1Chat({
+ // caller: {
+ // nickname: uni.getStorageSync('name'),
+ // openid: uni.getStorageSync(
+ // 'openid')
+ // },
+ // listener: {
+ // nickname: uni.getStorageSync('customerName'),
+ // openid: uni.getStorageSync(
+ // 'customeropenId')
+ // },
+ // backgroundType: 2,
+ // roomType: 'voice',
+ // success() {
+ // console.log('涓�瀵逛竴鎴愬姛');
+ // },
+ // fail(err) {
+ // console.log('涓�瀵逛竴澶辫触', err);
+ // }
+ // });
+ // }
+ // },
+ // fail() {
+ // console.log('鑾峰彇澶辫触');
+ // }
+ // });
+ this.servieceShow = true
+ },
+ serviceClose() {
+ this.servieceShow = false
+ },
+ selectClickhujiao(v){
+ console.log(v,'vvvv')
+ if (v.id === 2) {
+ this.callCustomerServiceImpl()
+ } else if (v.id === 1) {
+ console.log(this.serviceInfoObj,'w123456+')
+ wx.makePhoneCall({
+ phoneNumber: this.serviceInfoObj.serviecePhone
+ })
+ }
+ },
+ callCustomerServiceImpl(){
wx.getSetting({
success(res) {
console.log('鎺堟潈success', res);
@@ -404,7 +537,7 @@
} else {
wx.join1v1Chat({
caller: {
- nickname: uni.getStorageSync('name'),
+ nickname: uni.getStorageSync('username'),
openid: uni.getStorageSync(
'openid')
},
@@ -444,13 +577,45 @@
res.data.id
}&gateCameraId=${res.data.lastEquipmentId}&gateCameraCode=${res.data.lastEquipmentCode}&weighHouseCode=${res.data.code}&primarySkin=${
this.primarySkin
- }&primaryHair=${this.primaryHair}&psrimaryClean=${this.primaryClean}&sceneInOut=${res.data.sceneInOut}&overTmWaixiao=${this.overTmWaixiao}`
+ }&primaryHair=${this.primaryHair}&psrimaryClean=${this.primaryClean}&sceneInOut=${res.data.sceneInOut}&overTmWaixiao=${this.overTmWaixiao}
+ &isWeighing=${this.coalDetailsData.weighingType}`
});
} else {
- this.$u.toast('鏈湪纾呮埧锛岃鍓嶅線纾呮埧鍚庡啀璇曪紒锛�');
+ this.$u.toast(res.msg ? res.msg : '鏈湪纾呮埧锛岃鍓嶅線纾呮埧鍚庡啀璇曪紒锛�');
}
});
},
+ //鐢宠璁￠噺
+ shenqingjiliangClick() {
+ this.bangfangListShow = true
+ },
+ bangfangSelectClick(val) { //閫変腑纾呮埧(鍙告満閫夋嫨纾呮埧)
+ console.log(val,'id----')
+ this.$reqPost('applyWeight',{tmId:this.getWeightHouseObj.tmId,houseId:val.id},'params').then(res => {
+ console.log(res,'閫夋嫨纾呮埧====')
+ if(res.code == 0) {
+ uni.navigateTo({
+ url: `/pages/driver-page/driver-index/bill-of-lading-details/nocarNoWeighingDevice/nocarNoWeighingDevice?tmId=${this.getWeightHouseObj.tmId}&houseId=${val?.id}&weighHouseCode=${val?.code}`
+ })
+ }else {
+ this.$u.toast(res.msg);
+ }
+ })
+
+ },
+ bangfangSheetClose() {
+ this.bangfangListShow = false
+ },
+ getPoundRoomByList() {
+ console.log(this.getWeightHouseObj.tmId,'this.getWeightHouseObj.tmId===')
+ this.$reqGet('getPoundRoomByList',{tmId:this.getWeightHouseObj.tmId}).then(res => {
+ console.log(res,'res')
+ if(res.data) {
+ this.bangfangList = res.data
+ }
+ })
+ },
+
// 鏀剧┖
evacuation() {
this.evacuationModalShow = true;
@@ -491,15 +656,52 @@
// 鏌ョ湅璐ㄩ噺鏄庣粏
jumpWeighDetail() {
uni.navigateTo({
- url: `/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail?orderPlanId=${this.orderPlanId}`
+ url: `/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail?orderPlanId=${this.orderPlanId}&flag=${true}`
})
- }
+ },
+ //鎵撳嵃纾呭崟
+ printOrder(){
+ this.show = true;
+ },
+ selectClick(obj){
+ this.$reqGet('printerHandler',{tmItemId:obj.id}).then(res => {
+ uni.hideLoading();
+ this.$u.toast(res.msg ? res.msg : '鍘绘墦鍗�')
+ if (res.data) {
+ // this.$u.toast('鎵撳嵃鎴愬姛')
+ // this.orderPlanData = res.data
+ }
+ }).catch((err) => {
+ uni.hideLoading();
+ this.$u.toast('鎵撳嵃澶辫触')
+ }).finally(() => {
+ this.show = false;
+ })
+
+ },
+ sheetClose(){
+ this.show = false;
+ },
+ onPullDownRefresh() { //涓嬫媺鍒锋柊
+ setTimeout(() => {
+ this.getTakeCoal(() => { //鑾峰彇閫氱煡鍗曡鎯�
+ uni.stopPullDownRefresh()
+ })
+ },1000)
+ }
}
};
</script>
<style lang="scss"
scoped>
+ .send-date{
+ font-size: 12px;
+ color: #eee;
+ }
+ .weighing-item{
+ min-height: 200rpx!important;
+ }
/deep/.u-steps {
.u-steps-item {
.u-steps-item__content {
@@ -569,8 +771,8 @@
.block-information {
width: 690rpx;
height: 100%;
- min-height: 420rpx;
- margin: vww(40) auto;
+ min-height: 400rpx;
+ margin: vww(40) auto 0rpx;
background: #ffffff;
box-shadow: 4rpx 6rpx 51rpx 0rpx rgba(73, 120, 240, 0.11);
border-radius: 20rpx;
@@ -587,8 +789,8 @@
gap: auto 5rpx;
width: 94%;
height: 100%;
- min-height: 380rpx;
- margin: vww(18) vww(7) vww(11) vww(17);
+ min-height: 360rpx;
+ margin: vww(18) vww(7) vww(8) vww(17);
}
.status-button {
@@ -611,12 +813,15 @@
.coalName,
.order-type {
- width: 45%;
- height: 30rpx;
+ width: 370rpx;
+ height: 55rpx;
font-size: 30rpx;
font-weight: 300;
color: #515151;
position: relative;
+ overflow: hidden; //婧㈠嚭闅愯棌
+ text-overflow: ellipsis; //瓒呭嚭閮ㄥ垎鐪佺暐鍙�
+ white-space: nowrap; //涓嶆崲琛�
}
.black-block {
@@ -629,7 +834,7 @@
}
.time {
- width: 35%;
+ width: 100%;
height: vww(12);
display: flex;
justify-content: flex-start;
@@ -658,12 +863,7 @@
// 绉伴噸鍘嗗彶
.weigh-history {
- @extend .block-information;
-
.block-main {
- @extend .block-main;
- gap: 10rpx 20rpx;
-
.weigh-item {
width: 100%;
height: vww(80);
@@ -708,7 +908,6 @@
.timeLine {
height: 300rpx;
min-height: 300rpx;
- margin: vww(20);
position: relative;
// top: vww(120);
overflow-y: overlay;
@@ -791,4 +990,13 @@
}
}
}
-</style>
\ No newline at end of file
+ ::v-deep{
+ .u-action-sheet{
+ max-height: 900rpx;
+ overflow-y: auto;
+ }
+ .u-action-sheet__item-wrap__item{
+ padding: 10px 15px!important;
+ }
+ }
+</style>
--
Gitblit v1.9.1