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

---
 pages/scgl/scbg.vue |  103 +++++++++++++++++++++++++++++++--------------------
 1 files changed, 62 insertions(+), 41 deletions(-)

diff --git a/pages/scgl/scbg.vue b/pages/scgl/scbg.vue
index e5e99c3..68cf44d 100644
--- a/pages/scgl/scbg.vue
+++ b/pages/scgl/scbg.vue
@@ -34,7 +34,7 @@
 		</view>
 
 
-		<u-alert :title="alertTitle" type="info"></u-alert>
+		<u-alert :title="'宸ュ崟鏁伴噺锛�'+total+'锛�'" type="info"></u-alert>
 
 
 		<!-- 鎶樺彔闈㈡澘 -->
@@ -42,13 +42,14 @@
 		<!-- @change="collapseChange" -->
 
 
-		<u-collapse style="max-height: 65vh;overflow: auto;">
+		<u-collapse style="max-height: 62vh;overflow: auto;">
 			<!-- :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 in collapseArr" :key="item.ordercode">
+					v-for="(item,index) in collapseArr" :key="item.ordercode+index">
 
 
 					<view style="position: absolute;left: 30rpx;top:34px;font-size: 24rpx;color: #999;">
@@ -56,10 +57,11 @@
 					</view>
 
 					<!-- <view style="position: absolute;width: 26%;left: 44%;top:16px;"> -->
-					<view style="position: absolute;width: 120px;left: 44%;top:16px;color:#0659ff"
-						@click="progressClick(item.ordercode)">
+					<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)}}
@@ -215,9 +221,13 @@
 
 
 		<!-- 鎮诞鐞� -->
-		<view @click="scan2">
+		<!-- 	<view @click="scan2">
 			<drag-ball :x='300' :y="600"></drag-ball>
-		</view>
+		</view> -->
+
+
+		<scan-code></scan-code>
+
 	</view>
 </template>
 
@@ -226,7 +236,12 @@
 	import {
 		ProductOrderSearch
 	} from '../../config/api.js';
+	import scanCode from '@/components/scan-code/scan-code.vue'
+
 	export default {
+		components: {
+			scanCode
+		},
 		onLoad(option) {
 			const _this = this
 			uni.$off('scancodedate') // 姣忔杩涙潵鍏� 绉婚櫎鍏ㄥ眬鑷畾涔変簨浠剁洃鍚櫒
@@ -234,9 +249,6 @@
 				console.log("鎵弿鍒扮殑鍐呭涓�:", content)
 				_this.getCheckScanDeviceQrCodeData(content)
 			})
-
-
-			console.log(option, 8)
 		},
 
 		onPullDownRefresh() {
@@ -306,7 +318,7 @@
 				], //宸查�変腑鐨勪骇鍝佹爣绛�
 				order: '', //鍗曞彿
 				placeholder2: '鐢熶骇璁㈠崟',
-				total: 10,
+				total: 0,
 				currentpage: 1, //绗嚑椤�
 				pageSize: 10, //姣忛〉鏄剧ず澶氬皯鏉�
 
@@ -317,7 +329,7 @@
 			let that = this
 			uni.startPullDownRefresh({
 				success() {
-					that.getProductOrderSearch()
+					that.getProductOrderSearch(that.currentpage)
 					uni.showToast({
 						title: "涓嬫媺鍒锋柊",
 						icon: 'none'
@@ -340,7 +352,13 @@
 			init() {
 				uni.stopPullDownRefresh();
 			},
-			gotoPage(p1, p2) {
+			gotoPage(p1, p2, it) {
+
+				if (parseFloat(it.goodqty) + parseFloat(it.ngqty) + parseFloat(it.laborbadqty) + parseFloat(it
+						.materielbadqty) === parseFloat(it.planqty)) {
+					return uni.$u.toast('褰撳墠宸ュ簭鏃犲彲鎶ユ暟閲忥紒')
+				}
+
 				let orderstep = null
 
 				if (p1) {
@@ -351,7 +369,7 @@
 
 
 				uni.navigateTo({
-					url: './scbg2?orderstep=' + orderstep
+					url: './scbg2?orderstep=' + orderstep + '&currentpage=' + this.currentpage
 				})
 			},
 
@@ -368,7 +386,7 @@
 
 			// 椤垫暟鏀瑰彉鏃�  鍒嗛〉瑙﹀彂
 			pageChange(e) {
-
+				this.currentpage = e.current
 				this.getProductOrderSearch(e.current)
 			},
 
@@ -377,20 +395,20 @@
 				let ordertype = '' // SO锛氶攢鍞鍗�  MO锛氱敓浜ц鍗�  PO锛氱敓浜у伐鍗�
 				switch (this.radiovalue) {
 					case '鐢熶骇宸ュ崟':
-						this.alertTitle = '宸ュ崟鏁伴噺锛堝叡/涓級'
-						this.placeholder = '璇疯緭鍏ュ伐鍗曚俊鎭�'
+						// this.alertTitle = '宸ュ崟鏁伴噺锛堝叡/涓級'
+						// this.placeholder = '璇疯緭鍏ュ伐鍗曚俊鎭�'
 						ordertype = 'PO'
 						break
 					case '鐢熶骇璁㈠崟':
 						// this.alertTitle = '鐢熶骇璁㈠崟鏁伴噺锛堝叡/涓級'
-						this.alertTitle = '宸ュ崟鏁伴噺锛堝叡/涓級'
-						this.placeholder = '璇疯緭鍏ョ敓浜ц鍗曚俊鎭�'
+						// this.alertTitle = '宸ュ崟鏁伴噺锛堝叡/涓級'
+						// this.placeholder = '璇疯緭鍏ョ敓浜ц鍗曚俊鎭�'
 						ordertype = 'MO'
 						break
 					case '閿�鍞鍗�':
 						// this.alertTitle = '閿�鍞鍗曟暟閲忥紙鍏�/涓級'
-						this.alertTitle = '宸ュ崟鏁伴噺锛堝叡/涓級'
-						this.placeholder = '璇疯緭鍏ラ攢鍞鍗曚俊鎭�'
+						// this.alertTitle = '宸ュ崟鏁伴噺锛堝叡/涓級'
+						// this.placeholder = '璇疯緭鍏ラ攢鍞鍗曚俊鎭�'
 						ordertype = 'SO'
 						break
 				}
@@ -415,8 +433,8 @@
 
 				this.collapseArr = res.data
 				this.collapseArrAll = res.data
-				this.alertTitle = this.alertTitle.split('/')[0] + this.total + this.alertTitle.split('/')[
-					1]
+				// this.alertTitle = this.alertTitle.split('/')[0] + this.total + this.alertTitle.split('/')[
+				// 	1]
 
 			},
 			loadMore() {
@@ -425,22 +443,25 @@
 
 			//杈撳叆妗嗗洖杞︾‘璁や簨浠�
 			confirmInputBoxValue(val) {
-				this.collapseArr = this.collapseArrAll.filter((p) => {
-					return p.ordercode.indexOf(val) !== -1
-				})
+				this.order = val
+				this.currentpage = 1
+				this.getProductOrderSearch(1)
+				// this.collapseArr = this.collapseArrAll.filter((p) => {
+				// 	return p.ordercode.indexOf(val) !== -1
+				// })
 
 
-				switch (this.radiovalue) {
-					case '鐢熶骇宸ュ崟':
-						this.alertTitle = '宸ュ崟鏁伴噺锛堝叡' + this.total + '涓級'
-						break
-					case '鐢熶骇璁㈠崟':
-						this.alertTitle = '宸ュ崟鏁伴噺锛堝叡' + this.total + '涓級'
-						break
-					case '閿�鍞鍗�':
-						this.alertTitle = '宸ュ崟鏁伴噺锛堝叡' + this.total + '涓級'
-						break
-				}
+				// switch (this.radiovalue) {
+				// 	case '鐢熶骇宸ュ崟':
+				// 		this.alertTitle = '宸ュ崟鏁伴噺锛堝叡' + this.total + '涓級'
+				// 		break
+				// 	case '鐢熶骇璁㈠崟':
+				// 		this.alertTitle = '宸ュ崟鏁伴噺锛堝叡' + this.total + '涓級'
+				// 		break
+				// 	case '閿�鍞鍗�':
+				// 		this.alertTitle = '宸ュ崟鏁伴噺锛堝叡' + this.total + '涓級'
+				// 		break
+				// }
 
 
 

--
Gitblit v1.9.3