From 809c3efe51b885eff6badca88f6965368cddf757 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期日, 18 二月 2024 14:19:56 +0800
Subject: [PATCH] fix:通知单详情打印磅单按钮bug
---
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 237 +++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 148 insertions(+), 89 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 02a916c..633a658 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
@@ -1,28 +1,27 @@
<template>
<view class="bill-of-lading-details">
<view class="top-banner"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/loadingbanner.png') no-repeat;background-size: cover;">
+ :style="{ backgroundImage: `url(${onlineurl}/appimg/image/banner/loadingbanner.png)`, backgroundSize: 'cover', backgroundRepeat: 'no-repeat' }">
</view>
<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="">鍩哄湴:{{ 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>
+ v-else>浠撳簱:{{ coalDetailsData.filedName || '鏆傛棤' }}</view>
</view>
</view>
<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="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/statusbutton.png') no-repeat;
- background-size: cover;">
+ :style="{ backgroundImage: `url(${onlineurl}/appimg/image/banner/statusbutton.png)`, backgroundSize: 'cover', backgroundRepeat: 'no-repeat' }">
{{ coalStatus[coalDetailsData.statusWeigh] || '' }}
</view>
</view>
@@ -32,7 +31,7 @@
size="40"></u-icon></view>
<view class="send-date">{{ coalDetailsData.sendDate }}</view>
</view>
- <view class="coal-code">鎻愮叅鍗曠紪鍙�: {{ coalDetailsData.code || '' }}</view>
+ <view class="coal-code">閫氱煡鍗曠紪鍙�: {{ coalDetailsData.code || '' }}</view>
<view class="order-code">
璁㈠崟缂栧彿: {{ coalDetailsData.orderCode || '' }}</view>
<view class="coal-code"
@@ -40,32 +39,13 @@
style="color: rgb(73, 123, 251);">
鏌ョ湅鏄庣粏
</view>
- <view class="weigh-item"
- v-for='item in showWeigh'
- :key="item.id">
- <view class="item">
- <view class="concrete"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/skin.png') no-repeat;background-size: cover;">
- 鐨�</view>
- <view class="num">{{ item.skin }}</view>
- </view>
- <view class="item">
- <view class="concrete"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/hair.png') no-repeat;background-size: cover;">
- 姣�</view>
- <view class="num">{{ item.hair }}</view>
- </view>
- <view class="item">
- <view class="concrete"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/clean.png') no-repeat;background-size: cover;">
- 鍑�</view>
- <view class="num">{{ item.clean }}</view>
- </view>
- </view>
+
</view>
</view>
-
+ <!-- 绉伴噸鍘嗗彶-->
+ <weigh-item :list="showWeigh" class="weighing-item"></weigh-item>
+ <!-- 鏃堕棿绾� -->
<view class="timeLine">
<u-steps :current="dayRZ.length - 1"
direction="column"
@@ -79,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"></u-button>
</view>
<view class="bottom-button">
<u-button text="鏀剧┖"
@@ -110,12 +90,14 @@
</view>
</view>
</view>
- <view class="weigh-ability">
- <view class="weigh-button"><u-button text="灞曠ず鎻愮叅鍗�"
+ <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>
@@ -131,19 +113,32 @@
<view class="completeOutSale">
<u-modal :show="completeOutSaleShow"
title="纭"
- content="鏄惁瀹屾垚澶栭攢鎻愮叅鍗�"
+ content="鏄惁瀹屾垚澶栭攢閫氱煡鍗�"
:showCancelButton="true"
@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>
</template>
<script>
+ import { onlineurl } from '@/api/request.js'
import { webSocketUrl } from '@/api/request.js';
import { mapState, mapMutations } from 'vuex';
+ import weighItem from '@/components/weighItem.vue'
export default {
+ components: {
+ weighItem
+ },
onLoad(value) {
+ console.log(value,'valyue')
this.orderPlanId = value.orderPlanId;
this.yyId = value.yyId;
if (value.overTmWaixiao) {
@@ -155,9 +150,22 @@
return {
orderPlanId: null,
yyId: null,
+ show:false,
+ chengZhongFlag:true, // 涓婃绉伴噸鐘舵��
dayRZ: [],
- coalDetailsData: {}, // 鎻愮叅鍗曡鎯�
- currentPageCoalStatus: 0, // 褰撳墠椤甸潰鎻愮叅鍗曠姸鎬�
+ list: [
+ {
+ name:'閫夐」涓�',
+ },
+ {
+ name: '閫夐」浜岀鐢�',
+ },
+ {
+ name: '寮�鍚痩oad鍔犺浇', //寮�鍚悗鏂囧瓧涓嶆樉绀�
+ }
+ ],
+ coalDetailsData: {}, // 閫氱煡鍗曡鎯�
+ currentPageCoalStatus: 0, // 褰撳墠椤甸潰閫氱煡鍗曠姸鎬�
// 鑾峰彇鎵�鍦ㄧ鎴垮弬鏁�
getWeightHouseObj: {
deptId: '',
@@ -182,7 +190,7 @@
openId: null,
openName: ''
},
- coalStatus: ['鏈О閲�', '绉伴噸涓�', '楠岃川涓�', '绉伴噸瀹屾垚'], // 鐘舵��
+ coalStatus: ['鏈О閲�', '绉伴噸涓�', '楠岃川涓�', '绉伴噸瀹屾垚', '澶勭悊瀹屾垚'], // 鐘舵��
weighHouseCode: '',
// 鏀剧┖寮圭獥鎺у埗鍙橀噺
evacuationModalShow: false,
@@ -212,9 +220,11 @@
clean: ""
},
completeOutSaleShow: false,
+ reservationIsShow:false,
overTmWaixiao: null,
// 鍒よ缃戠粶鐘舵�侊紝
- normalCode: null
+ normalCode: true,
+ onlineurl,
};
},
onShow() {
@@ -249,11 +259,15 @@
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;
}
},
methods: {
@@ -274,7 +288,7 @@
}
});
this.coalDayPage(); //鑾峰彇鏃ュ織
- this.getTakeCoal(); //鑾峰彇鎻愮叅鍗曡鎯�
+ this.getTakeCoal(); //鑾峰彇閫氱煡鍗曡鎯�
this.getgetService(); //鑾峰彇瀹㈡湇
},
// 鑾峰彇瀹㈡湇openid
@@ -291,7 +305,7 @@
}
});
},
- // 鑾峰彇鎻愮叅鍗曡鎯�
+ // 鑾峰彇閫氱煡鍗曡鎯�
getTakeCoal() {
uni.showLoading({
title: '鍔犺浇涓�'
@@ -299,7 +313,7 @@
this.$reqGet('getTakeCoal', { takeCoalId: this.orderPlanId }).then(res => {
uni.hideLoading();
if (res.code == 0) {
- console.log(res, '鎻愮叅鍗曡鎯�');
+ console.log(res, '閫氱煡鍗曡鎯�');
this.coalDetailsData = res.data;
this.orderType = this.coalDetailsData.orderType;
// 鍒ゆ柇鏄惁瀹屾垚澶栭攢璁㈠崟
@@ -320,12 +334,17 @@
// 鑾峰彇瀹㈡湇openId鍙傛暟璧嬪��
this.getServiceOpenid.deptId = this.coalDetailsData.deptId;
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}
+ })
} else {
this.$u.toast('鍔犺浇澶辫触');
}
@@ -375,7 +394,7 @@
this.$u.toast('鏈嶅姟鍣ㄩ敊璇�,璇风◢鍚庨噸璇�')
}
},
- // 灞曠ず鎻愮叅鍗曡鎯�
+ // 灞曠ず閫氱煡鍗曡鎯�
showCaolPickUpBill() {
uni.navigateTo({
url: `/pages/driver-page/driver-index/bill-of-lading-details/coal-pick-up-bill/coal-pick-up-bill?orderPlanId=${this.orderPlanId}`
@@ -386,7 +405,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}`
});
},
// 鍏ュ満鐢宠
@@ -443,14 +462,6 @@
}
});
},
- calling() {
- // wx.join1v1Chat({
- // caller: { nickname: this.name, openid: this.openid }, //oZjXk5RRmbroAfl1m5aZ6hRNvqh4
- // listener: { nickname: this.serviceInfoObj.openName, openid: 'orutI5YT0yEvARVngdsTmBpisWmw' }, // 杩欓噷鐨刼penid鏄痜yy鐨勶紝鍏呭綋鍥哄畾鐨勫鏈峯penid
- // backgroundType: 2,
- // roomType: 'voice'
- // });
- },
// 绉伴噸
cengZhongClick() {
this.$reqGet('getWeighHouse', this.getWeightHouseObj).then(res => {
@@ -466,7 +477,8 @@
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('鏈湪纾呮埧锛岃鍓嶅線纾呮埧鍚庡啀璇曪紒锛�');
@@ -513,8 +525,31 @@
// 鏌ョ湅璐ㄩ噺鏄庣粏
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)
+ 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;
}
}
};
@@ -522,6 +557,9 @@
<style lang="scss"
scoped>
+ .weighing-item{
+ min-height: 200rpx!important;
+ }
/deep/.u-steps {
.u-steps-item {
.u-steps-item__content {
@@ -611,9 +649,6 @@
height: 100%;
min-height: 380rpx;
margin: vww(18) vww(7) vww(11) vww(17);
- // flex-direction: column;
- // justify-content: space-between;
- // align-items: flex-start;
}
.status-button {
@@ -636,12 +671,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 {
@@ -678,37 +716,58 @@
color: #7d7d7d;
}
- .weigh-item {
- width: 100%;
- height: vww(36);
- @include flex;
- justify-content: space-around;
- .item {
- min-width: vww(50);
- height: vww(45);
- font-size: 21rpx;
- font-weight: 400;
- color: #ffffff;
- text-align: center;
- line-height: vww(30);
+ }
+
+ // 绉伴噸鍘嗗彶
+ .weigh-history {
+ @extend .block-information;
+
+ .block-main {
+ @extend .block-main;
+ gap: 10rpx 20rpx;
+
+ .weigh-item {
+ width: 100%;
+ height: vww(80);
@include flex;
+ flex-direction: column;
+ justify-content: space-around;
+ align-items: flex-start;
- .concrete {
- width: vww(36);
+ .item-block {
+ width: 100%;
height: vww(36);
- }
+ @include flex;
+ justify-content: space-around;
- .num {
- font-size: 40rpx;
- font-weight: 300;
- color: #303030;
+ .item {
+ min-width: vww(50);
+ height: vww(45);
+ font-size: 21rpx;
+ font-weight: 400;
+ color: #ffffff;
+ text-align: center;
+ line-height: vww(30);
+ @include flex;
+
+ .concrete {
+ width: vww(36);
+ height: vww(36);
+ }
+
+ .num {
+ font-size: 40rpx;
+ font-weight: 300;
+ color: #303030;
+ }
+ }
}
}
}
}
-
+ // 鏃堕棿绾�
.timeLine {
height: 300rpx;
min-height: 300rpx;
--
Gitblit v1.9.1