From b85e774f58609cb9e975731e355bdfa5ab679236 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期五, 19 一月 2024 17:34:38 +0800
Subject: [PATCH] feat:小程序验质页面提交新功能(拆分净重、扣罚种类改为多选、品名规格支持手动输入)

---
 pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue |   48 +++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 43 insertions(+), 5 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 1167428..dec747f 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
@@ -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"
@@ -66,7 +66,7 @@
 						plain
 						@click="arriveClick"
 						shape="circle"
-						:disabled="coalDetailsData.status >= 2"></u-button>
+						:disabled="coalDetailsData.status > 2"></u-button>
 					<u-button text="鎵撳嵃纾呭崟"
 						type="primary"
 						plain
@@ -118,6 +118,13 @@
 				@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>
 
@@ -131,6 +138,7 @@
 			weighItem
 		},
 		onLoad(value) {
+			console.log(value,'valyue')
 			this.orderPlanId = value.orderPlanId;
 			this.yyId = value.yyId;
 			if (value.overTmWaixiao) {
@@ -142,8 +150,20 @@
 			return {
 				orderPlanId: null,
 				yyId: null,
+				show:false,
 				chengZhongFlag:true, // 涓婃绉伴噸鐘舵��
 				dayRZ: [],
+				list: [
+				{
+					name:'閫夐」涓�',
+				},
+				{
+					name: '閫夐」浜岀鐢�',
+				},
+				{
+					name: '寮�鍚痩oad鍔犺浇', //寮�鍚悗鏂囧瓧涓嶆樉绀�
+				}
+			],
 				coalDetailsData: {}, // 閫氱煡鍗曡鎯�
 				currentPageCoalStatus: 0, // 褰撳墠椤甸潰閫氱煡鍗曠姸鎬�
 				// 鑾峰彇鎵�鍦ㄧ鎴垮弬鏁�
@@ -321,6 +341,10 @@
 						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('鍔犺浇澶辫触');
 					}
@@ -381,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}`
 				});
 			},
 			// 鍏ュ満鐢宠
@@ -506,15 +530,26 @@
 			},
 			//鎵撳嵃纾呭崟
 			printOrder(){
-				this.$reqGet('printerHandler',{tmId:this.orderPlanId}).then(res => {
+			  this.show = true;
+			},
+			selectClick(obj){
+				this.$reqGet('printerHandler',{tmItemId:obj.id}).then(res => {
+					uni.hideLoading();
+					this.$u.toast(res.msg)
 					if (res.data) {
-						uni.hideLoading();
+						// 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 {

--
Gitblit v1.9.1