From 8a8564207b3777893a2797aa6bd7ca9b6d000f3d Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期四, 14 九月 2023 10:16:54 +0800
Subject: [PATCH] 小程序

---
 minipro_standard/pages_adjust/pages/workOrderReporting/workOrderReporting.vue |   35 ++++++++++++++++++++---------------
 1 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/minipro_standard/pages_adjust/pages/workOrderReporting/workOrderReporting.vue b/minipro_standard/pages_adjust/pages/workOrderReporting/workOrderReporting.vue
index 1cbbb33..39de708 100644
--- a/minipro_standard/pages_adjust/pages/workOrderReporting/workOrderReporting.vue
+++ b/minipro_standard/pages_adjust/pages/workOrderReporting/workOrderReporting.vue
@@ -252,7 +252,7 @@
 				<div class="tg_footer">
 					<!-- proxy.$auth('h5:workorderoutput:confirm') &&  -->
 					<button class="tg_footer_qr" @click="submitBG" v-if="isSubmit">纭鎶ュ伐</button>
-					<div class="tg_footer_fh" @click="gofh" v-else-if="!isSubmit">杩斿洖淇敼</div>
+					<div class="tg_footer_fh" @click="statistics = false" v-else-if="!isSubmit">杩斿洖淇敼</div>
 				</div>
 			</div>
 		</u-popup>
@@ -344,7 +344,8 @@
 			this.workorderId = obj.id
 			this.queryByIds()
 			this.getOrocessRecords()
-			this.getData()
+			this.getData()
+			this.pageDJs()
 			uni.$on('spotAdd', () => {
 				if (this.typeView == 1) {
 					this.pages.page = 1
@@ -414,7 +415,8 @@
 										item.id = item.type
 										item.active = index == 0
 									})
-									this.arrType = result.data
+									this.arrType = result.data
+									
 								} else {
 									this.arrType = []
 								}
@@ -641,8 +643,11 @@
 							num: this.produceFrom.undesirable
 						})
 						this.isSubmit = Number(this.produceFrom.qualified) + Number(this.produceFrom.undesirable) <= this
-							.info.planNum;
-					}
+							.info.planNum;
+						console.log(this.isSubmit);
+						debugger
+					}
+					
 				} else {
 					console.log('鎺ㄥ紡')
 					if (this.feedingData.length === 0) {
@@ -652,7 +657,6 @@
 					}
 					if (this.produceFrom.qualified <= 0 && this.produceFrom.undesirable <= 0) {
 						uni.$u.toast('浜у嚭鏄庣粏涓嶈兘涓虹┖')
-
 						return
 					}
 					this.statisticsData = []
@@ -953,14 +957,14 @@
 		width: 100%;
 		display: flex;
 		flex-direction: column;
-		margin-top: 30rpx;
+		// margin-top: 30rpx;
 
 		.bg_list_item {
 			display: flex;
 			flex-direction: column;
 			// margin-bottom: 40rpx;
-			border-bottom: 40rpx #f7f7f7 solid;
-
+			// border-bottom: 40rpx #f7f7f7 solid;
+			// 
 			.kong {
 				text-align: center;
 				padding: 30rpx 0;
@@ -975,10 +979,10 @@
 			.bg_list_item_top {
 				display: flex;
 				align-items: center;
-				justify-content: space-between;
-				padding-left: 30rpx;
-				padding-right: 30rpx;
-				margin-bottom: 30rpx;
+				justify-content: space-between;
+				background-color: #f7f7f7;
+				padding: 30rpx;
+				// padding-right: 30rpx;
 
 				.bg_list_item_top_left {
 					display: flex;
@@ -1223,7 +1227,8 @@
 	}
 
 	.bg_plan {
-		width: 100%;
+		width: 100%;
+		border-top: 20rpx #f7f7f7 solid;
 		// height: 98px;
 		padding: 30rpx;
 		box-sizing: border-box;
@@ -1409,7 +1414,7 @@
 	.bottom-view {
 		left: 40rpx;
 		right: 40rpx;
-		bottom: 0
+		bottom: 20rpx
 	}
 
 	.bl_list {

--
Gitblit v1.9.3