From 374daf69074e24958fe8e3166d611f409a9dcb3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=94=A1=E7=8E=B2?=
 <8702040+cai-ling@user.noreply.gitee.com>
Date: Tue, 24 Dec 2024 14:38:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E7=AE=94=E5=B7=A5=E5=BA=8F=E5=8A=A0?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/style/layout.styl           | 14 ++++++++++++++
 common/style/reset.css             |  9 +++++++++
 pages/ProductManage/SboProcess.vue | 30 ++++++++++++++++++++++++++----
 utils/getData1.js                  |  6 ++++--
 4 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/common/style/layout.styl b/common/style/layout.styl
index de584f2..2222e82 100644
--- a/common/style/layout.styl
+++ b/common/style/layout.styl
@@ -222,6 +222,20 @@ uni-button:after {
 .filter_input_disabled {
 	background-color: #eee;
 }
+.filter_tip {
+	top: 80rpx;
+	color: #ff6a00;
+	font-size: 22rpx;
+	line-height: 30rpx;
+	padding: 0 15rpx;
+}
+.filter_unit {
+	width: 70rpx;
+	font-size: 28rpx;
+	color: #606266;
+	text-align: right;
+	margin-left: 10rpx;
+}
 .scan_input {
 	width: 100%;
 	height: 80rpx;
diff --git a/common/style/reset.css b/common/style/reset.css
index 682929d..0fed431 100644
--- a/common/style/reset.css
+++ b/common/style/reset.css
@@ -27,6 +27,9 @@ input[type="button"], input[type="submit"], input[type="search"], input[type="re
 .relative {
 	position: relative;
 }
+.absolute {
+	position: absolute;
+}
 .hide {
 	display: none;
 }
@@ -137,6 +140,12 @@ input[type="button"], input[type="submit"], input[type="search"], input[type="re
 .mgb10 {
 	margin-bottom: 10rpx;
 }
+.mgb20 {
+	margin-bottom: 20rpx;
+}
+.mgb40 {
+	margin-bottom: 40rpx !important;
+}
 .mgr20 {
 	margin-right: 20rpx;
 }
diff --git a/pages/ProductManage/SboProcess.vue b/pages/ProductManage/SboProcess.vue
index 49c2472..01f3205 100644
--- a/pages/ProductManage/SboProcess.vue
+++ b/pages/ProductManage/SboProcess.vue
@@ -29,11 +29,31 @@
 					<view class="filter_label_wraper">
 						<span class="filter_label filter_label_1"></span>
 					</view>
-					<view class="filter_input_wraper filter_input_wraper_1">
+					<view class="filter_input_wraper filter_input_wraper_1 mgb20">
 						<view class="iconfont icon_unchecked" :class="{'icon_checked': isV === '1'}" @tap="isVirtual">&#xe66b;</view>
-						<view class="filter_input_wraper_inn_text">是否大车</view>
+						<view class="filter_input_wraper_inn_text">是否大车(A2车间使用)</view>
 					</view>
 				</view>
+				<view class="filter_item mgb40">
+					<view class="filter_label_wraper">
+						<span class="filter_label">温度</span>
+					</view>
+					<view class="relative filter_input_wraper">
+						<view class="absolute filter_tip">B2车间需要输入温度</view>
+						<input type="number" class="filter_input" v-model="val3">
+					</view>
+					<view class="filter_unit">度</view>
+				</view>
+				<view class="filter_item mgb40">
+					<view class="filter_label_wraper">
+						<span class="filter_label">时间</span>
+					</view>
+					<view class="relative filter_input_wraper">
+						<view class="absolute filter_tip">B2车间需要输入时间</view>
+						<input type="number" class="filter_input" v-model="val4">
+					</view>
+					<view class="filter_unit">小时</view>
+				</view>
 			</view>
 			<view class="zd_wrapper grid-wraper">
 				<view class="slide_new">
@@ -118,7 +138,9 @@
 				totalCount: 0,
 				pageNum: 1,
 				pageSize: 10,
-				isV: '0'
+				isV: '0',
+				val3: '',
+				val4: ''
 			};
 		},
 		created () {
@@ -180,7 +202,7 @@
 					return
 				}
 				try {
-					let res = await needEmptyAxis(this.pkObj, this.isV)
+					let res = await needEmptyAxis(this.pkObj, this.isV, this.val3, this.val4)
 					this.disabled1 = false
 					this.pkId = ''
 					this.pkObj = {}
diff --git a/utils/getData1.js b/utils/getData1.js
index 0ed4877..99818c6 100644
--- a/utils/getData1.js
+++ b/utils/getData1.js
@@ -35,11 +35,13 @@ export const queryRawFoilList = (pcode, cname, page, size) => request({
 	}
 })
 // 1.2呼叫
-export const needEmptyAxis = (rjo, type) => request({
+export const needEmptyAxis = (rjo, type, temperature, hours) => request({
 	url: 'api/pda/raw/needEmptyAxis',
 	data: {
 		raw_jo: rjo,
-		big_type: type
+		big_type: type,
+		temperature: temperature,
+		hours: hours
 	}
 })
 // 1.3呼叫空轴