From 7f11cb1230e1d89a4a4f476b6cd98d9a13ee482c Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 19 Feb 2024 13:40:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=88=87=E4=B8=8A=E6=96=99=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/style/layout.css                 | 20 ++++++
 common/style/reset.css                  | 83 +++++++++++++++++++++++++
 pages/ProductManage/BakeProcess.vue     |  2 +-
 pages/ProductManage/SlittingFeeding.vue | 15 ++---
 utils/getData2.js                       |  3 +-
 5 files changed, 114 insertions(+), 9 deletions(-)

diff --git a/common/style/layout.css b/common/style/layout.css
index 613b6ef..0b956b3 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -277,6 +277,26 @@ uni-button:after {
 	margin: 0 40rpx 10rpx 0;
 	border-radius: 30rpx;
 }
+.submit-bar_new {
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+	z-index: 200;
+	background-color: #fff;
+	padding: 10rpx 0;
+	box-shadow: 0 0 20rpx 0 rgba(160,160,160,0.7);
+}
+.submit-button_new {
+	font-size: 30rpx;
+	line-height: 62rpx;
+	color: #ff6a00;
+	padding: 0;
+	text-align: center;
+	background-color: #fff;
+	border: 1px solid #ff6a00;
+	border-radius: 30rpx;
+}
 .btn-disabled, .submit-button[disabled] {
 	background-color: #c9c9c9;
 	border: 1px solid #c9c9c9;
diff --git a/common/style/reset.css b/common/style/reset.css
index 8355389..0890ca5 100644
--- a/common/style/reset.css
+++ b/common/style/reset.css
@@ -40,4 +40,87 @@ input[type="button"], input[type="submit"], input[type="search"], input[type="re
 	overflow: hidden;
 	text-overflow: ellipsis;
 	white-space: nowrap;
+}
+.flexstart {
+	align-items: flex-start !important;
+}
+.jcflexstart {
+	justify-content: flex-start !important;
+}
+.zd-row {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+.zd-col-24 {
+	width: 100%;
+}
+.zd-col-23 {
+    width: 95.83333%
+}
+.zd-col-22 {
+    width: 91.66667%
+}
+.zd-col-21 {
+    width: 87.5%
+}
+.zd-col-20 {
+    width: 83.33333%
+}
+.zd-col-19 {
+    width: 79.16667%
+}
+.zd-col-18 {
+    width: 75%
+}
+.zd-col-17 {
+    width: 70.83333%
+}
+.zd-col-16 {
+    width: 66.66667%
+}
+.zd-col-15 {
+    width: 62.5%
+}
+.zd-col-14 {
+    width: 58.33333%
+}
+.zd-col-13 {
+    width: 54.16667%
+}
+.zd-col-12 {
+	width: 50%;
+}
+.zd-col-11 {
+    width: 45.83333%
+}
+.zd-col-10 {
+    width: 41.66667%
+}
+.zd-col-9 {
+    width: 37.5%
+}
+.zd-col-8 {
+    width: 33.33333%
+}
+.zd-col-7 {
+    width: 29.16667%
+}
+.zd-col-6 {
+    width: 25%
+}
+.zd-col-5 {
+    width: 20.83333%
+}
+.zd-col-4 {
+    width: 16.66667%
+}
+.zd-col-3 {
+    width: 12.5%
+}
+.zd-col-2 {
+    width: 8.33333%
+}
+.zd-col-1 {
+    width: 4.16667%
 }
\ No newline at end of file
diff --git a/pages/ProductManage/BakeProcess.vue b/pages/ProductManage/BakeProcess.vue
index 4134ffc..7f8cfb8 100644
--- a/pages/ProductManage/BakeProcess.vue
+++ b/pages/ProductManage/BakeProcess.vue
@@ -36,7 +36,7 @@
 		<view class="submit-bar">
 			<button class="submit-button" :class="{'btn-disabled': !val1 || !val2 || !val3 || !val4}" :disabled="disabled" @tap="_ovenInAndOut1('1')">入箱</button>
 			<button class="submit-button" :class="{'btn-disabled': !val1 || !val2}" :disabled="disabled" @tap="_ovenInAndOut2('2')">出箱</button>
-			<button class="submit-button" :class="{'btn-disabled': !val1 || !val2}" :disabled="disabled3" @tap="_inCoolIvt">入冷却</button>
+			<button class="submit-button" :class="{'btn-disabled': !val1 || !val2}" :disabled="disabled3" @tap="_inCoolIvt">质检合格</button>
 			<button class="submit-button" :class="{'btn-disabled': !val1}" :disabled="disabled4" @tap="_bakingrelease">解警</button>
 		</view>
 	</view>
diff --git a/pages/ProductManage/SlittingFeeding.vue b/pages/ProductManage/SlittingFeeding.vue
index f0d78ff..8954f9a 100644
--- a/pages/ProductManage/SlittingFeeding.vue
+++ b/pages/ProductManage/SlittingFeeding.vue
@@ -76,11 +76,12 @@
 			</view>
 			<uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/>
 		</view>
-		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !val1}" :disabled="disabled2" @tap="_feedingVehicleReturn">空轴送回</button>
-			<button class="submit-button" @tap="handleSure">人工呼叫</button>
-			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled" @tap="toSure">呼叫</button>
-			<button class="submit-button" @tap="searchList">查询</button>
+		<view class="zd-row submit-bar_new">
+			<button class="zd-col-5 submit-button_new" :class="{'btn-disabled': !val1}" :disabled="disabled2" @tap="_feedingVehicleReturn('2')">满轴送回</button>
+			<button class="zd-col-5 submit-button_new" :class="{'btn-disabled': !val1}" :disabled="disabled2" @tap="_feedingVehicleReturn('1')">空轴送回</button>
+			<button class="zd-col-5 submit-button_new" @tap="handleSure">人工呼叫</button>
+			<button class="zd-col-3 submit-button_new" :class="{'btn-disabled': !pkId}" :disabled="disabled" @tap="toSure">呼叫</button>
+			<button class="zd-col-3 submit-button_new" @tap="searchList">查询</button>
 		</view>
 		<view v-if="active" class="msg_wrapper msg_wrapper_1">
 			<view class="msg_box">
@@ -287,7 +288,7 @@
 				}
 			},
 			/** 空轴送回 */
-			async _feedingVehicleReturn () {
+			async _feedingVehicleReturn (type) {
 				this.disabled2 = true
 				if (!this.val1) {
 					this.disabled2 = false
@@ -298,7 +299,7 @@
 					return
 				}
 				try {
-					let res = await feedingVehicleReturn(this.val1)
+					let res = await feedingVehicleReturn(this.val1, type)
 					this.disabled2 = false
 					this.active = false
 					this.val1 = ''
diff --git a/utils/getData2.js b/utils/getData2.js
index 90bb9f2..5911f8e 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -457,7 +457,8 @@ export const feedingHandleConfirm = (code, cn, ncode) => request({
 export const feedingVehicleReturn = (code) => request({
 	url:'api/pda/feeding/vehicleReturn',
 	data: {
-		point_code: code
+		point_code: code,
+		type: type
 	}
 })