From a653bcff54e077ad83e31c8528aa174d7a7348f7 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期二, 24 十月 2023 11:46:51 +0800
Subject: [PATCH] 再生资源 bugfix

---
 pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue |  191 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 187 insertions(+), 4 deletions(-)

diff --git a/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue b/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue
index ce9e833..5fc89a5 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue
@@ -1,7 +1,10 @@
 <!-- 鏌ョ湅鐨瘺鍑�鏄庣粏 -->
 <template>
+
 	<view class="main">
-		<u-empty mode="data"
+		<u-subsection class="tabs"  :fontSize = '30' :list="list" :current="current" @change="tabChange"></u-subsection>
+		<view v-if="current">
+			<u-empty mode="data"
 			icon="http://cdn.uviewui.com/uview/empty/data.png"
 			textSize="30"
 			iconSize="1000"
@@ -42,6 +45,7 @@
 						class="count-input">
 						<u--input placeholder="璇疯緭鍏ユ墸娓�"
 							border="bottom"
+							type="number"
 							clearable
 							v-model="item.cinderWeight"
 							@input='v=>discountInputHandle(v,i,item.clean)'></u--input>
@@ -57,11 +61,14 @@
 					<view class="count">{{ item.weight }}</view>
 				</view>
 			</view>
-			<view class="level">
+			<!-- 鍒ゆ柇鏄惁妫�楠岃川閲� -->
+			<view v-if="isShow(item)">
+				<view class="level">
 				<view style="width: 140rpx;">
 					<u--text text="鐗╄祫鏄庣粏"
 						size='32'></u--text>
 				</view>
+		
 				<view class="tag-select"
 					@click="goodsPopoverShow(i)"
 					v-if='roleType===4'>
@@ -131,6 +138,29 @@
 					{{item.num}}
 				</view>
 			</view>
+			<view class="notice-num">	
+					<view class="num-text"
+					style="margin-left: 10rpx;">
+					<u--text text="閫氱煡閲嶉噺"
+						size='32'></u--text>
+				</view>
+				<view class="num-input"
+				v-if='roleType===4&&!flag'
+				>
+				<u--input placeholder="璇疯緭鍏ラ�氱煡閲嶉噺"
+						border="bottom"
+						clearable
+						v-model="item.weight1"></u--input>
+				</view>
+				<view class="num-show"
+					v-else-if="flag">
+					{{item.weight1}}
+				</view>
+			</view>
+			</view>
+			<u-empty v-else icon-size="200"  text="''" >
+				<text>鏆傛湭楠岃川</text>
+			</u-empty>
 			<view style="display: flex;margin-top: 20rpx;margin-left: 20rpx;"
 				v-if="item.isImage">
 				<view style="width: 100px;"
@@ -193,11 +223,101 @@
 				@click="confirmInput"
 				:loading="loading"
 				loading-text="纭"></u-button>
+		</view></view>
+		<!-- 鐗╂枡鏄庣粏 -->
+		<view v-if="!current">
+			<view class="main-block"
+			v-for="(item,i) in goodsList"
+			:key="item.id">
+			<view class="level">
+				<view style="width: 140rpx;">
+					<u--text text="鐗╄祫鍚嶇О"
+						size='32'></u--text>
+				</view>
+				<view class="tag-select"
+					>
+					<text class="num-text">
+						{{item.breed}}
+					</text>
+				</view>
+			</view>
+			<view class="level">
+				<view style="width: 180rpx;">
+					<u--text text="鏄庣粏缂栧彿"
+						size='32'></u--text>
+				</view>
+				<view class="tag-select">
+					<text>
+						{{item.itemId}}
+					</text>
+				</view>
+			</view>
+			<view class="level">
+				<view style="width: 180rpx;">
+					<u--text text="閫氱煡鏁伴噺"
+						size='32'></u--text>
+				</view>
+				<view class="tag-select">
+					<text>
+						{{item.num}}
+					</text>
+				</view>
+			</view>
+			<view class="level">
+				<view style="width: 180rpx;">
+					<u--text text="瑙勬牸"
+						size='32'></u--text>
+				</view>
+				<view class="tag-select">
+					<text>
+						{{item.spec}}
+					</text>
+				</view>
+			</view>
+			<view class="level">
+				<view style="width: 180rpx;">
+					<u--text text="閫氱煡閲嶉噺"
+						size='32'></u--text>
+				</view>
+				<view class="tag-select">
+					<text>
+						{{item.weight}}
+					</text>
+				</view>
+			</view>
+			<!-- 鐗╄祫鏄庣粏 -->
+			<u-action-sheet :actions="goodsList"
+				:show="goodsShow"
+				cancelText='鍙栨秷'
+				:closeOnClickOverlay='true'
+				@close='goodsNameClose'
+				@select="goodsselectClick"></u-action-sheet>
+			<!-- 鍝佸悕涓庤鏍� -->
+			<view class="">
+				<u-action-sheet :actions="actionsList"
+					:show="actionShow"
+					cancelText='鍙栨秷'
+					:closeOnClickOverlay='true'
+					@close='productNameClose'
+					@select="selectClick"></u-action-sheet>
+			</view>
+			<!-- 涓嶅悎鏍煎搧鍚� -->
+			<view class="">
+				<u-action-sheet :actions="actionsList"
+					:show="unqualifiedShow"
+					cancelText='鍙栨秷'
+					:closeOnClickOverlay='true'
+					@close='unqualifiedClose'
+					@select="selectUnqualifiedClick"></u-action-sheet>
+			</view>
 		</view>
+		</view>
+	
 	</view>
 </template>
 
 <script>
+
 	import BigNumber from "bignumber.js"
 	import { BaseUrl } from '@/api/publicInterface.js';
 	import { onlineurl } from '@/api/request.js'
@@ -206,8 +326,23 @@
 		data() {
 			return {
 				orderPlanId: "",
+				title: '绱犺儦鍕惧嫆鍑洪潚鑺憋紝绗旈攱娴撹浆娣�',
+			subTitle: '2020-05-15',
+			thumb: 'http://pic2.sc.chinaz.com/Files/pic/pic9/202002/hpic2119_s.jpg',
 				coalDetailsData: {},
+				list: [
+					{
+						name: '鐗╄祫鏄庣粏'
+					}, 
+					{
+						name: '绉伴噸鏄庣粏'
+					}, 
+				],
+				current: 1,
 				showWeigh: [],
+
+                cityPickerValueDefault: [0, 0, 1],
+				form:{},
 				showWeighCopy: [],
 				discountrate: "",
 				loading: false,
@@ -253,16 +388,29 @@
 			},
 			showWeighCopyStorgeOther() {
 				return uni.getStorageSync('showWeighCopyStorgeOther')
+			},
+			isShow(){
+				 //鏄惁鏄剧ず 鏄惁宸查獙璐�
+				return function(item){
+				return	 uni.getStorageSync('roleType')!== 4 && item.iszj == 1 ? true :  uni.getStorageSync('roleType')== 4 ? true : false;
+					 // 宸茬粡楠岃川
+				}
 			}
 		},
+		onUnload(){
+         console.log(this.globalShowWeigh,'鍗歌浇')
+
+		},
 		onLoad(params) {
+			console.log(params,this.showWeighCopyStorge,'params璺敱')
 			this.orderPlanId = params.orderPlanId ? params.orderPlanId : '';
 			this.flag = params.flag ? params.flag : false;
 			this.roleType === 1 ? this.GetOrderPlan() : this.getTakeCoal()
 			this.ModifiedOrderIndex = params.index
 			this.alterProductName = params.productName === "true" || false
 			this.alterUnqualified = params.unqualified === "true" || false
-			this.havedSubmit = params.havedSubmit === "true" || false
+			this.havedSubmit = params.havedSubmit === "true" || false;
+			console.log(this.havedSubmit,'this.havedSubmit')
 		},
 		methods: {
 			...mapMutations(['changeglobalShowWeigh']),
@@ -408,12 +556,15 @@
 			},
 			// 鎶樻墸鐜囪緭鍏�
 			discountInputHandle(value, index, clean) {
+				console.log('璁$畻鍑�閲�',value, index, clean)
+				value = Number(value)
 				this.showWeigh[index].cinderWeight = Number(value)
 				if (clean) {
 					let x = new BigNumber(clean)
 					let y = new BigNumber(value)
 					this.showWeigh[index].weight = x.minus(y).toFixed(2)
 				}
+				
 			},
 			// 閫夋嫨涓嶅悎鏍煎搧鍚�
 			selectunqualifiedBreed(index) {
@@ -433,9 +584,16 @@
 			},
 			// 涓嶅悎鏍奸噸閲忚緭鍏�
 			unqualifiedWeightInputHandle(value, index, clean) {
+				value = value + 0;
 				let x = new BigNumber(clean)
 				let y = new BigNumber(value)
-				let z = new BigNumber(this.showWeigh[index].cinderWeight)
+				let z;
+				if(!this.showWeigh[index].cinderWeight){
+				 z = 0;
+				}else{
+				 z = new BigNumber(this.showWeigh[index].cinderWeight);
+				}
+				console.log(value, index, clean,'涓嶅悎鏍奸噸閲忚緭鍏�')
 				this.showWeigh[index].weight = x.minus(y).minus(z).toFixed(2) || ''
 			},
 			// 鍒犻櫎鍥剧墖
@@ -482,6 +640,10 @@
 					});
 				});
 			},
+			//鐐瑰嚮tab 鍒囨崲灞曠ず鏄庣粏
+			tabChange(val){
+				this.current = val;
+			}
 		},
 	}
 </script>
@@ -657,4 +819,25 @@
 			margin-bottom: 40rpx;
 		}
 	}
+	.tabs{
+		font-size: 20rpx!important;
+	}
+	.u-card-wrap { 
+		background-color: $u-bg-color;
+		padding: 1px;
+	}
+	
+	.u-body-item {
+		font-size: 32rpx;
+		color: #333;
+		padding: 20rpx 10rpx;
+	}
+		
+	.u-body-item image {
+		width: 120rpx;
+		flex: 0 0 120rpx;
+		height: 120rpx;
+		border-radius: 8rpx;
+		margin-left: 12rpx;
+	}
 </style>
\ No newline at end of file

--
Gitblit v1.9.1