From dbae85a492c7cee07f1115757615df910583ad8a Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期一, 05 一月 2026 10:59:24 +0800
Subject: [PATCH] 1.递交

---
 pages/scgl/scbg.vue |  131 +++++++++++++++++++++++--------------------
 1 files changed, 70 insertions(+), 61 deletions(-)

diff --git a/pages/scgl/scbg.vue b/pages/scgl/scbg.vue
index e5e99c3..53fa0ef 100644
--- a/pages/scgl/scbg.vue
+++ b/pages/scgl/scbg.vue
@@ -42,28 +42,28 @@
 		<!-- @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)'
-					:label="item.children.length===0?'鏈淳鍙�':''" :disabled='item.children.length===0'
-					v-for="item in collapseArr" :key="item.ordercode">
+			<!-- 	<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)'
+				:label="item.children.length===0?'鏈淳鍙�':''" :disabled='item.children.length===0'
+				v-for="item in collapseArr" :key="item.ordercode">
 
 
-					<view style="position: absolute;left: 30rpx;top:34px;font-size: 24rpx;color: #999;">
-						{{item.partname}} {{item.partspec}}
-					</view>
+				<view style="position: absolute;left: 30rpx;top:34px;font-size: 24rpx;color: #999;">
+					{{item.partname}} {{item.partspec}}
+				</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)">
-						<!-- {{item.partname}}{{item.partspec}} -->
-						<u-line-progress :percentage="parseFloat((item.ordergoodqty*100/item.orderqty).toFixed(2))"
-							inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress>
-					</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)">
+					<!-- {{item.partname}}{{item.partspec}} -->
+					<u-line-progress :percentage="parseFloat((item.ordergoodqty*100/item.orderqty).toFixed(2))"
+						inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress>
+				</view>
 
-					<!-- 			<view style="position: absolute;width: 100px;right: 33px;  top:13px; ">
+				<!-- 			<view style="position: absolute;width: 100px;right: 33px;  top:13px; ">
 					<view class="" style="display: flex;justify-content: flex-end;">
 						<view style="color: #0659ff;">
 							{{parseFloat(item.ordergoodqty)}}
@@ -76,55 +76,55 @@
  -->
 
 
-					<view v-if="radiovalue==='鐢熶骇宸ュ崟'" style="margin:0 0  5px">
-						<view class="flex_column">
-							<view style="display:flex">
-								<view class="titleFont" style="font-size: 14px;">浜у搧缂栫爜锛�</view>
-								<view class="contentFont" style="font-size: 14px;">{{item.partcode}}</view>
+				<view v-if="radiovalue==='鐢熶骇宸ュ崟'" style="margin:0 0  5px">
+					<view class="flex_column">
+						<view style="display:flex">
+							<view class="titleFont" style="font-size: 14px;">浜у搧缂栫爜锛�</view>
+							<view class="contentFont" style="font-size: 14px;">{{item.partcode}}</view>
+						</view>
+						<view style="display:flex">
+							<view class="titleFont" style="font-size: 14px;">浜у搧鍚嶇О锛�</view>
+							<view class="contentFont" style="font-size: 14px;">{{item.partname}}</view>
+						</view>
+						<view style="display:flex">
+							<view class="titleFont" style="font-size: 14px;">浜у搧瑙勬牸锛�</view>
+							<view class="contentFont" style="font-size: 14px;">{{item.partspec?item.partspec:'/'}}
 							</view>
-							<view style="display:flex">
-								<view class="titleFont" style="font-size: 14px;">浜у搧鍚嶇О锛�</view>
-								<view class="contentFont" style="font-size: 14px;">{{item.partname}}</view>
-							</view>
-							<view style="display:flex">
-								<view class="titleFont" style="font-size: 14px;">浜у搧瑙勬牸锛�</view>
-								<view class="contentFont" style="font-size: 14px;">{{item.partspec?item.partspec:'/'}}
+						</view>
+					</view>
+				</view>
+
+
+				<!-- {{item.children}} -->
+				<!-- <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;">
+
+						<!-- <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))"
+								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>
+									/{{ parseFloat(it.planqty)}}
 								</view>
 							</view>
 						</view>
 					</view>
 
-
-					<!-- {{item.children}} -->
-					<!-- <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;">
-
-							<!-- <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))"
-									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>
-										/{{ parseFloat(it.planqty)}}
-									</view>
-								</view>
-							</view>
-						</view>
-
-					</u-steps>
-					<!-- </u--text> -->
+				</u-steps>
+				<!-- </u--text> -->
 
 
-				</u-collapse-item>
-			</scroll-view>
+			</u-collapse-item>
+			<!-- </scroll-view> -->
 		</u-collapse>
 
 
@@ -218,6 +218,10 @@
 		<view @click="scan2">
 			<drag-ball :x='300' :y="600"></drag-ball>
 		</view>
+
+
+		<scan-code></scan-code>
+
 	</view>
 </template>
 
@@ -226,13 +230,18 @@
 	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') // 姣忔杩涙潵鍏� 绉婚櫎鍏ㄥ眬鑷畾涔変簨浠剁洃鍚櫒
 			uni.$on('scancodedate', function(content) {
 				console.log("鎵弿鍒扮殑鍐呭涓�:", content)
-				_this.getCheckScanDeviceQrCodeData(content)
+				// _this.getCheckScanDeviceQrCodeData(content)
 			})
 
 
@@ -317,7 +326,7 @@
 			let that = this
 			uni.startPullDownRefresh({
 				success() {
-					that.getProductOrderSearch()
+					that.getProductOrderSearch(that.currentpage)
 					uni.showToast({
 						title: "涓嬫媺鍒锋柊",
 						icon: 'none'
@@ -368,7 +377,7 @@
 
 			// 椤垫暟鏀瑰彉鏃�  鍒嗛〉瑙﹀彂
 			pageChange(e) {
-
+				this.currentpage = e.current
 				this.getProductOrderSearch(e.current)
 			},
 

--
Gitblit v1.9.3