From 64c9f7264079eee61b267c01fd23de0764fe48c4 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期三, 31 十二月 2025 09:24:46 +0800
Subject: [PATCH] 1.修复bug

---
 pages/zlgl/wgjy1.vue |   56 +++++++++++++
 pages/zlgl/xjjy.vue  |    2 
 pages/zlgl/sjjy.vue  |    2 
 pages/zlgl/wgjy.vue  |    2 
 pages/zlgl/sjjy1.vue |   71 +++++++++++++++++
 pages/scgl/scbg2.vue |    1 
 pages/zlgl/xjjy1.vue |   54 +++++++++++++
 7 files changed, 181 insertions(+), 7 deletions(-)

diff --git a/pages/scgl/scbg2.vue b/pages/scgl/scbg2.vue
index 2c70efa..cad25df 100644
--- a/pages/scgl/scbg2.vue
+++ b/pages/scgl/scbg2.vue
@@ -535,6 +535,7 @@
 			},
 			userCheckboxChange(val) {
 				this.userCheckBoxValue = val.join(',')
+				this.operSheetValue = this.userCheckBoxValue
 			},
 
 			//鑾峰彇寮�宸ヤ俊鎭�
diff --git a/pages/zlgl/sjjy.vue b/pages/zlgl/sjjy.vue
index 5ef68df..edd53ea 100644
--- a/pages/zlgl/sjjy.vue
+++ b/pages/zlgl/sjjy.vue
@@ -468,7 +468,7 @@
 						// that.scanContent = res.result;
 
 						uni.navigateTo({
-							url: './scbg2?orderstep=' + res.result
+							url: './sjjy1?orderstep=' + res.result
 						})
 
 					},
diff --git a/pages/zlgl/sjjy1.vue b/pages/zlgl/sjjy1.vue
index a3db51c..62dcd70 100644
--- a/pages/zlgl/sjjy1.vue
+++ b/pages/zlgl/sjjy1.vue
@@ -66,7 +66,20 @@
 								<view>鏍锋湰鏁伴噺锛�</view>
 							</view>
 							<view class="flex_column contentFont">
-								<view>{{processObj.checkstandname}}</view>
+
+								<view @click='operSheetClick' class="custominputClass">
+									<view v-show='processObj.checkstandname===""' style="color: rgb(192, 196, 204);">璇烽�夋嫨
+									</view>
+									<view v-show='processObj.checkstandname!==""' class="ellipsis"
+										style="width: 390rpx;">
+										{{processObj.checkstandname}}
+									</view>
+
+									<u-icon :name="!operSheetShow?'arrow-down-fill':'arrow-up-fill'"></u-icon>
+								</view>
+
+
+
 								<view>{{processObj.sampmethod==='FIXED'?'鍥烘椂鎶芥':'姣斾緥鎶芥'}}</view>
 								<view>{{processObj.good_qty}}</view>
 
@@ -210,6 +223,15 @@
 
 
 
+
+		<u-picker :show="operSheetShow" :columns="chekstandArr" :itemHeight='55' :closeOnClickOverlay='true'
+			@close='operSheetShow=false' @confirm='operPickerConfirm' @cancel='operSheetShow=false'>
+		</u-picker>
+
+
+
+
+
 	</view>
 </template>
 
@@ -258,6 +280,11 @@
 
 
 				checkNumber: 1, //妫�楠岄」鐩腑鐨勬楠屾暟閲�  鐜板湪澶勪簬绗嚑涓�
+				chekstandAll: [], //
+				chekstandArr: [], //
+
+				operSheetShow: false,
+
 			}
 		},
 		created() {
@@ -266,12 +293,31 @@
 		mounted() {
 			this.init()
 
-			// this.getStepCheckSearch('MO-2025-10-0008_1;001')
+			// this.getStepCheckSearch('MO-2025-11-0002_6;ZP005')
 
 		},
 		methods: {
 			init() {
 				uni.stopPullDownRefresh();
+			},
+
+			operSheetClick() {
+				this.operSheetShow = true
+			},
+			async operPickerConfirm(val) {
+				this.processObj.checkstandname = val.value[0]
+				this.operSheetShow = false
+
+				let t = this.chekstandAll.find(i => i.checkstandname === this.processObj.checkstandname)
+				this.processObj.checkstandcode = t.checkstandcode
+				this.processObj.sampmethod = t.sampmethod
+				this.processObj.sampscare = t.sampmethod === 'FIXED' ? t.sampscare : Math.ceil(this
+					.processObj.good_qty * t.sampscare / 100)
+				this.processObj.sampscare = this.processObj.sampscare <= this.processObj.good_qty ? this.processObj
+					.sampscare : this.processObj.good_qty
+
+				await this.getStepCheckItemList(this.processObj.checkstandcode)
+
 			},
 
 			async getStepCheckSearch(orderstepqrcode) {
@@ -288,6 +334,10 @@
 
 
 				if (res.code === '200') {
+					this.chekstandAll = res.data.chekstand
+					this.chekstandArr = [this.chekstandAll.map(i => i.checkstandname)]
+
+
 					this.processObj = {
 						wo_code: res.data.labcont[0].wo_code,
 						partcode: res.data.labcont[0].partcode,
@@ -562,4 +612,21 @@
 	::v-deep .u-number-box__plus {
 		height: 50rpx !important;
 	}
+
+
+	.custominputClass {
+		width: 412rpx;
+		display: flex;
+		justify-content: space-between;
+		border: 3rpx #eff0f1 solid;
+		border-radius: 10rpx;
+		padding: 0 16rpx;
+
+	}
+
+	.ellipsis {
+		text-overflow: ellipsis;
+		overflow: hidden;
+		white-space: nowrap;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/zlgl/wgjy.vue b/pages/zlgl/wgjy.vue
index 82b8ed5..75ee945 100644
--- a/pages/zlgl/wgjy.vue
+++ b/pages/zlgl/wgjy.vue
@@ -468,7 +468,7 @@
 						// that.scanContent = res.result;
 
 						uni.navigateTo({
-							url: './scbg2?orderstep=' + res.result
+							url: './wgjy1?orderstep=' + res.result
 						})
 
 					},
diff --git a/pages/zlgl/wgjy1.vue b/pages/zlgl/wgjy1.vue
index 49b54aa..384019b 100644
--- a/pages/zlgl/wgjy1.vue
+++ b/pages/zlgl/wgjy1.vue
@@ -66,7 +66,16 @@
 								<view>鏍锋湰鏁伴噺锛�</view>
 							</view>
 							<view class="flex_column contentFont">
-								<view>{{processObj.checkstandname}}</view>
+								<view @click='operSheetClick' class="custominputClass">
+									<view v-show='processObj.checkstandname===""' style="color: rgb(192, 196, 204);">璇烽�夋嫨
+									</view>
+									<view v-show='processObj.checkstandname!==""' class="ellipsis"
+										style="width: 390rpx;">
+										{{processObj.checkstandname}}
+									</view>
+
+									<u-icon :name="!operSheetShow?'arrow-down-fill':'arrow-up-fill'"></u-icon>
+								</view>
 								<view>{{processObj.sampmethod==='FIXED'?'鍥烘椂鎶芥':'姣斾緥鎶芥'}}</view>
 								<view>{{processObj.good_qty}}</view>
 
@@ -209,6 +218,12 @@
 		</view>
 
 
+		<u-picker :show="operSheetShow" :columns="chekstandArr" :itemHeight='55' :closeOnClickOverlay='true'
+			@close='operSheetShow=false' @confirm='operPickerConfirm' @cancel='operSheetShow=false'>
+		</u-picker>
+
+
+
 
 	</view>
 </template>
@@ -258,6 +273,10 @@
 
 
 				checkNumber: 1, //妫�楠岄」鐩腑鐨勬楠屾暟閲�  鐜板湪澶勪簬绗嚑涓�
+				chekstandAll: [], //
+				chekstandArr: [], //
+
+				operSheetShow: false,
 			}
 		},
 		created() {
@@ -273,7 +292,24 @@
 			init() {
 				uni.stopPullDownRefresh();
 			},
+			operSheetClick() {
+				this.operSheetShow = true
+			},
+			async operPickerConfirm(val) {
+				this.processObj.checkstandname = val.value[0]
+				this.operSheetShow = false
 
+				let t = this.chekstandAll.find(i => i.checkstandname === this.processObj.checkstandname)
+				this.processObj.checkstandcode = t.checkstandcode
+				this.processObj.sampmethod = t.sampmethod
+				this.processObj.sampscare = t.sampmethod === 'FIXED' ? t.sampscare : Math.ceil(this
+					.processObj.good_qty * t.sampscare / 100)
+				this.processObj.sampscare = this.processObj.sampscare <= this.processObj.good_qty ? this.processObj
+					.sampscare : this.processObj.good_qty
+
+				await this.getStepCheckItemList(this.processObj.checkstandcode)
+
+			},
 			async getStepCheckSearch(orderstepqrcode) {
 				console.log('鎵ц浜�')
 				// 妫�楠屾柟寮廎irstCheck锛堥妫�锛� PatroCheck(宸℃) EndCheck(瀹屽伐妫�)
@@ -288,6 +324,8 @@
 
 
 				if (res.code === '200') {
+					this.chekstandAll = res.data.chekstand
+					this.chekstandArr = [this.chekstandAll.map(i => i.checkstandname)]
 					this.processObj = {
 						wo_code: res.data.labcont[0].wo_code,
 						partcode: res.data.labcont[0].partcode,
@@ -562,4 +600,20 @@
 	::v-deep .u-number-box__plus {
 		height: 50rpx !important;
 	}
+
+	.custominputClass {
+		width: 412rpx;
+		display: flex;
+		justify-content: space-between;
+		border: 3rpx #eff0f1 solid;
+		border-radius: 10rpx;
+		padding: 0 16rpx;
+
+	}
+
+	.ellipsis {
+		text-overflow: ellipsis;
+		overflow: hidden;
+		white-space: nowrap;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/zlgl/xjjy.vue b/pages/zlgl/xjjy.vue
index 5dc5409..77032ca 100644
--- a/pages/zlgl/xjjy.vue
+++ b/pages/zlgl/xjjy.vue
@@ -468,7 +468,7 @@
 						// that.scanContent = res.result;
 
 						uni.navigateTo({
-							url: './scbg2?orderstep=' + res.result
+							url: './xjjy1?orderstep=' + res.result
 						})
 
 					},
diff --git a/pages/zlgl/xjjy1.vue b/pages/zlgl/xjjy1.vue
index 319854b..fd4aa61 100644
--- a/pages/zlgl/xjjy1.vue
+++ b/pages/zlgl/xjjy1.vue
@@ -66,7 +66,16 @@
 								<view>鏍锋湰鏁伴噺锛�</view>
 							</view>
 							<view class="flex_column contentFont">
-								<view>{{processObj.checkstandname}}</view>
+								<view @click='operSheetClick' class="custominputClass">
+									<view v-show='processObj.checkstandname===""' style="color: rgb(192, 196, 204);">璇烽�夋嫨
+									</view>
+									<view v-show='processObj.checkstandname!==""' class="ellipsis"
+										style="width: 390rpx;">
+										{{processObj.checkstandname}}
+									</view>
+
+									<u-icon :name="!operSheetShow?'arrow-down-fill':'arrow-up-fill'"></u-icon>
+								</view>
 								<view>{{processObj.sampmethod==='FIXED'?'鍥烘椂鎶芥':'姣斾緥鎶芥'}}</view>
 								<view>{{processObj.good_qty}}</view>
 
@@ -209,6 +218,10 @@
 		</view>
 
 
+		<u-picker :show="operSheetShow" :columns="chekstandArr" :itemHeight='55' :closeOnClickOverlay='true'
+			@close='operSheetShow=false' @confirm='operPickerConfirm' @cancel='operSheetShow=false'>
+		</u-picker>
+
 
 	</view>
 </template>
@@ -258,6 +271,10 @@
 
 
 				checkNumber: 1, //妫�楠岄」鐩腑鐨勬楠屾暟閲�  鐜板湪澶勪簬绗嚑涓�
+				chekstandAll: [], //
+				chekstandArr: [], //
+
+				operSheetShow: false,
 			}
 		},
 		created() {
@@ -273,7 +290,24 @@
 			init() {
 				uni.stopPullDownRefresh();
 			},
+			operSheetClick() {
+				this.operSheetShow = true
+			},
+			async operPickerConfirm(val) {
+				this.processObj.checkstandname = val.value[0]
+				this.operSheetShow = false
 
+				let t = this.chekstandAll.find(i => i.checkstandname === this.processObj.checkstandname)
+				this.processObj.checkstandcode = t.checkstandcode
+				this.processObj.sampmethod = t.sampmethod
+				this.processObj.sampscare = t.sampmethod === 'FIXED' ? t.sampscare : Math.ceil(this
+					.processObj.good_qty * t.sampscare / 100)
+				this.processObj.sampscare = this.processObj.sampscare <= this.processObj.good_qty ? this.processObj
+					.sampscare : this.processObj.good_qty
+
+				await this.getStepCheckItemList(this.processObj.checkstandcode)
+
+			},
 			async getStepCheckSearch(orderstepqrcode) {
 				console.log('鎵ц浜�')
 				// 妫�楠屾柟寮廎irstCheck锛堥妫�锛� PatroCheck(宸℃) EndCheck(瀹屽伐妫�)
@@ -288,6 +322,8 @@
 
 
 				if (res.code === '200') {
+					this.chekstandAll = res.data.chekstand
+					this.chekstandArr = [this.chekstandAll.map(i => i.checkstandname)]
 					this.processObj = {
 						wo_code: res.data.labcont[0].wo_code,
 						partcode: res.data.labcont[0].partcode,
@@ -562,4 +598,20 @@
 	::v-deep .u-number-box__plus {
 		height: 50rpx !important;
 	}
+
+	.custominputClass {
+		width: 412rpx;
+		display: flex;
+		justify-content: space-between;
+		border: 3rpx #eff0f1 solid;
+		border-radius: 10rpx;
+		padding: 0 16rpx;
+
+	}
+
+	.ellipsis {
+		text-overflow: ellipsis;
+		overflow: hidden;
+		white-space: nowrap;
+	}
 </style>
\ No newline at end of file

--
Gitblit v1.9.3