From 1fe4825573349c47e566f2cf0cdfe51ac7ff9c68 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期二, 06 一月 2026 10:06:47 +0800
Subject: [PATCH] 1.页面优化

---
 pages/zlgl/wgjy.vue |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/pages/zlgl/wgjy.vue b/pages/zlgl/wgjy.vue
index d106eaf..ce0298b 100644
--- a/pages/zlgl/wgjy.vue
+++ b/pages/zlgl/wgjy.vue
@@ -46,7 +46,8 @@
 			<!-- :value='parseFloat(item.ordergoodqty)+"/"+parseFloat(item.orderqty)' -->
 			<scroll-view scroll-y :style="{height: 590 + 'px'}" @scrolltolower="loadMore">
 				<u-collapse-item style="position: relative;" :title="item.ordercode" :name='item.ordercode'
-					v-if='item.children.length!==0' :value='parseFloat(item.ordergoodqty)+"/"+parseFloat(item.orderqty)'
+					v-if='item.children.length!==0'
+					:value='parseFloat(item.ordergoodqty)+parseFloat(item.orderngqty)+parseFloat(item.orderlaborbadqty)+parseFloat(item.ordermaterielbadqty)+"/"+parseFloat(item.orderqty)'
 					:label="item.children.length===0?'鏈淳鍙�':''" :disabled='item.children.length===0'
 					v-for="(item,index) in collapseArr" :key="item.ordercode+index">
 
@@ -59,7 +60,8 @@
 					<view style="position: absolute;width: 120px;left: 44%;top:16px;color:#0659ff">
 						<!-- @click="progressClick(item.ordercode)" -->
 						<!-- {{item.partname}}{{item.partspec}} -->
-						<u-line-progress :percentage="parseFloat((item.ordergoodqty*100/item.orderqty).toFixed(2))"
+						<u-line-progress
+							:percentage="parseFloat(((parseFloat(item.ordergoodqty)+parseFloat(item.orderngqty)+parseFloat(item.orderlaborbadqty)+parseFloat(item.ordermaterielbadqty))*100/item.orderqty).toFixed(2))"
 							inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress>
 					</view>
 
@@ -99,18 +101,22 @@
 					<!-- <u--text class="u-collapse-content"> -->
 					<u-steps :current="-1" inactiveColor='#0659FF' direction="column">
 						<view v-for="(it,ind) in item.children" :key="item.ordercode+it.name+ind"
-							@click="gotoPage(item.ordercode,it.code)" style="display: flex;align-items: center;">
+							@click="gotoPage(item.ordercode,it.code,it)" style="display: flex;align-items: center;">
 
 							<!-- <u-steps-item :title="it.code+'/'+it.name+it.spec"></u-steps-item> -->
 							<u-steps-item :title="it.code+'/'+it.name"></u-steps-item>
 							<view class="" style="width: 100px;">
-								<u-line-progress :percentage="parseFloat((it.goodqty*100/it.planqty).toFixed(2))"
+								<u-line-progress
+									:percentage="parseFloat((parseFloat(it.goodqty)+parseFloat(it.ngqty)+parseFloat(it.laborbadqty)+parseFloat(it.materielbadqty)*100/it.planqty).toFixed(2))"
 									inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress>
 							</view>
 							<view style="width: 30%;text-align: right;">
 								<view class="" style="display: flex;justify-content: flex-end;">
 									<view style="color: #0659ff;">
 										{{parseFloat(it.goodqty)}}
+									</view>
+									<view style="color: #ff0000;">
+										+{{parseFloat(it.ngqty)+parseFloat(it.laborbadqty)+parseFloat(it.materielbadqty)}}
 									</view>
 									<view>
 										/{{ parseFloat(it.planqty)}}
@@ -126,6 +132,7 @@
 				</u-collapse-item>
 			</scroll-view>
 		</u-collapse>
+
 
 
 
@@ -215,9 +222,9 @@
 
 
 		<!-- 鎮诞鐞� -->
-		<view @click="scan2">
+		<!-- <view @click="scan2">
 			<drag-ball :x='300' :y="600"></drag-ball>
-		</view>
+		</view> -->
 
 
 		<scan-code></scan-code>

--
Gitblit v1.9.3