From 9ce29adedcf18609d91db1f7c1d91c4bf7cfeb53 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 21 Mar 2024 11:25:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/ProductManage/BakeProcess.vue       | 10 +++++-----
 pages/ProductManage/EmptyPipeInStore.vue  |  6 +++---
 pages/ProductManage/EmptyPipeOutStore.vue |  6 +++---
 pages/ProductManage/ManmadeBake.vue       |  8 ++++----
 pages/ProductManage/PointManage.vue       |  6 +++---
 pages/ProductManage/SboProcess.vue        | 12 ++++++------
 pages/ProductManage/SboProdProgress.vue   |  4 ++--
 pages/ProductManage/ZjCasing.vue          | 10 +++++-----
 pages/ProductManage/ZjDelivery.vue        | 16 +++++++++-------
 pages/ProductManage/ZjInStore.vue         |  6 +++---
 10 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/pages/ProductManage/BakeProcess.vue b/pages/ProductManage/BakeProcess.vue
index 7f8cfb8..df6282f 100644
--- a/pages/ProductManage/BakeProcess.vue
+++ b/pages/ProductManage/BakeProcess.vue
@@ -33,11 +33,11 @@
 				</view>
 			</view>
 		</view>
-		<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}" :disabled="disabled4" @tap="_bakingrelease">解警</button>
+		<view class="zd-row submitbar">
+			<button class="zd-col-5 btn-submit btn-success letter-30" :class="{'btn-info': !val1 || !val2 || !val3 || !val4}" :disabled="disabled" @tap="_ovenInAndOut1('1')">入箱</button>
+			<button class="zd-col-5 btn-submit btn-success letter-30" :class="{'btn-info': !val1 || !val2}" :disabled="disabled" @tap="_ovenInAndOut2('2')">出箱</button>
+			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !val1 || !val2}" :disabled="disabled3" @tap="_inCoolIvt">质检合格</button>
+			<button class="zd-col-5 btn-submit btn-success letter-30" :class="{'btn-info': !val1}" :disabled="disabled4" @tap="_bakingrelease">解警</button>
 		</view>
 	</view>
 </template>
diff --git a/pages/ProductManage/EmptyPipeInStore.vue b/pages/ProductManage/EmptyPipeInStore.vue
index 043ac42..b4e25d0 100644
--- a/pages/ProductManage/EmptyPipeInStore.vue
+++ b/pages/ProductManage/EmptyPipeInStore.vue
@@ -29,9 +29,9 @@
 				</view>
 			</view>
 		</view>
-		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !index1 || !index3}" :disabled="disabled" @tap="_emptyConfirm">入库设置</button>
-			<button class="submit-button" :class="{'btn-disabled': !index2}" @tap="_taskQuerydevice">查询</button>
+		<view class="zd-row submitbar">
+			<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !index1 || !index3}" :disabled="disabled" @tap="_emptyConfirm">入库设置</button>
+			<button class="zd-col-6 btn-submit btn-success letter-30" :class="{'btn-info': !index2}" @tap="_taskQuerydevice">查询</button>
 		</view>
 	</view>
 </template>
diff --git a/pages/ProductManage/EmptyPipeOutStore.vue b/pages/ProductManage/EmptyPipeOutStore.vue
index 42dac6f..f01c7d9 100644
--- a/pages/ProductManage/EmptyPipeOutStore.vue
+++ b/pages/ProductManage/EmptyPipeOutStore.vue
@@ -37,9 +37,9 @@
 				</view>
 			</view>
 		</view>
-		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !pkId || !qty}" :disabled="disabled" @tap="_emptyConfirm">确认</button>
-			<button class="submit-button" @tap="_queryPaperTubeInfo">查询</button>
+		<view class="zd-row submitbar">
+			<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !pkId || !qty}" :disabled="disabled" @tap="_emptyConfirm">确认</button>
+			<button class="zd-col-6 btn-submit btn-success letter-30" @tap="_queryPaperTubeInfo">查询</button>
 		</view>
 	</view>
 </template>
diff --git a/pages/ProductManage/ManmadeBake.vue b/pages/ProductManage/ManmadeBake.vue
index efdd0ae..fa0bb4d 100644
--- a/pages/ProductManage/ManmadeBake.vue
+++ b/pages/ProductManage/ManmadeBake.vue
@@ -41,10 +41,10 @@
 				</view>
 			</view>
 		</view>
-		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !val1 || !val2 || !val5}" :disabled="disabled" @tap="_handleBakingovenInAndOut1('1')">入箱</button>
-			<button class="submit-button" :class="{'btn-disabled': !val1 || !val2 || !val5}" :disabled="disabled" @tap="_handleBakingovenInAndOut2('2')">出箱</button>
-			<button class="submit-button" :class="{'btn-disabled': !val1 || !val2}" :disabled="disabled3" @tap="_handleBakingcheckConfirm">质检合格</button>
+		<view class="zd-row submitbar">
+			<button class="zd-col-7 btn-submit btn-success letter-30" :class="{'btn-info': !val1 || !val2 || !val5}" :disabled="disabled" @tap="_handleBakingovenInAndOut1('1')">入箱</button>
+			<button class="zd-col-7 btn-submit btn-success letter-30" :class="{'btn-info': !val1 || !val2 || !val5}" :disabled="disabled" @tap="_handleBakingovenInAndOut2('2')">出箱</button>
+			<button class="zd-col-7 btn-submit btn-success" :class="{'btn-info': !val1 || !val2}" :disabled="disabled3" @tap="_handleBakingcheckConfirm">质检合格</button>
 		</view>
 	</view>
 </template>
diff --git a/pages/ProductManage/PointManage.vue b/pages/ProductManage/PointManage.vue
index d75d311..dc5b6e2 100644
--- a/pages/ProductManage/PointManage.vue
+++ b/pages/ProductManage/PointManage.vue
@@ -29,9 +29,9 @@
 				</view>
 			</view>
 		</view>
-		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !val1 || !val2}" :disabled="disabled" @tap="_pointOperate('1')">绑定</button>
-			<button class="submit-button" :class="{'btn-disabled': !val1 || !val2}" :disabled="disabled" @tap="_pointOperate('2')">解绑</button>
+		<view class="zd-row submitbar">
+			<button class="zd-col-11 btn-submit btn-success letter-30" :class="{'btn-info': !val1 || !val2}" :disabled="disabled" @tap="_pointOperate('1')">绑定</button>
+			<button class="zd-col-11 btn-submit btn-success letter-30" :class="{'btn-info': !val1 || !val2}" :disabled="disabled" @tap="_pointOperate('2')">解绑</button>
 		</view>
 	</view>
 </template>
diff --git a/pages/ProductManage/SboProcess.vue b/pages/ProductManage/SboProcess.vue
index 8333abc..e0191f2 100644
--- a/pages/ProductManage/SboProcess.vue
+++ b/pages/ProductManage/SboProcess.vue
@@ -65,13 +65,13 @@
 			</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': !pkId}" :disabled="disabled1" @tap="_needEmptyAxis">呼叫</button>
-			<button class="submit-button" :class="{'btn-disabled': !(val1 && !pkId)}" :disabled="disabled5" @tap="_needEmptyVehicle">呼叫空轴</button>
-			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled2" @tap="_confirmBlanking">准备就绪</button>
-			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled3" @tap="_finishBlanking">确认下卷</button>
+		<view class="zd-row submitbar">
+			<button class="zd-col-3 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="disabled1" @tap="_needEmptyAxis">呼叫</button>
+			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !(val1 && !pkId)}" :disabled="disabled5" @tap="_needEmptyVehicle">呼叫空轴</button>
+			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="disabled2" @tap="_confirmBlanking">准备就绪</button>
+			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="disabled3" @tap="_finishBlanking">确认下卷</button>
 			<!-- <button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled4" @tap="_finish">结束</button> -->
-			<button class="submit-button" @tap="searchList">查询</button>
+			<button class="zd-col-4 btn-submit btn-success" @tap="searchList">查询</button>
 		</view>
 	</view>
 </template>
diff --git a/pages/ProductManage/SboProdProgress.vue b/pages/ProductManage/SboProdProgress.vue
index e576553..4a7f3c7 100644
--- a/pages/ProductManage/SboProdProgress.vue
+++ b/pages/ProductManage/SboProdProgress.vue
@@ -60,8 +60,8 @@
 			</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" @tap="searchList">查询</button>
+		<view class="zd-row submitbar">
+			<button class="zd-col-22 btn-submit btn-success" @tap="searchList">查询</button>
 		</view>
 	</view>
 </template>
diff --git a/pages/ProductManage/ZjCasing.vue b/pages/ProductManage/ZjCasing.vue
index 277c881..995812f 100644
--- a/pages/ProductManage/ZjCasing.vue
+++ b/pages/ProductManage/ZjCasing.vue
@@ -94,11 +94,11 @@
 			</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 || !val2}" :disabled="disabled2" @tap="_casingWearConfirm">穿轴确认</button>
-			<button class="submit-button" :class="{'btn-disabled': !val1 || !val2}" :disabled="disabled1" @tap="_casingOutConfirm">拔轴确认</button>
-			<button class="submit-button" :class="{'btn-disabled': !checkArr.length || !val2}" :disabled="disabled" @tap="_casingConfirm">套轴确认</button>
-			<button class="submit-button" @tap="searchList">查询</button>
+		<view class="zd-row submitbar">
+			<button class="zd-col-6 btn-submit btn-success" :class="{'btn-info': !val1 || !val2}" :disabled="disabled2" @tap="_casingWearConfirm">穿轴确认</button>
+			<button class="zd-col-6 btn-submit btn-success" :class="{'btn-info': !val1 || !val2}" :disabled="disabled1" @tap="_casingOutConfirm">拔轴确认</button>
+			<button class="zd-col-6 btn-submit btn-success" :class="{'btn-info': !checkArr.length || !val2}" :disabled="disabled" @tap="_casingConfirm">套轴确认</button>
+			<button class="zd-col-4 btn-submit btn-success" @tap="searchList">查询</button>
 		</view>
 	</view>
 </template>
diff --git a/pages/ProductManage/ZjDelivery.vue b/pages/ProductManage/ZjDelivery.vue
index 9549b07..36f9fe4 100644
--- a/pages/ProductManage/ZjDelivery.vue
+++ b/pages/ProductManage/ZjDelivery.vue
@@ -47,6 +47,9 @@
 						/>
 					</view>
 				</view>
+				<view class="zd-row">
+					<button class="zd-col-22 btn-submit btn-success letter-30" @tap="_queryMaterialInfo">查询</button>
+				</view>
 			</view>
 			<view class="zd_wrapper grid-wraper">
 				<view class="slide_new">
@@ -95,13 +98,12 @@
 				</view>
 			</view>
 		</view>
-		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !val3}" :disabled="disabled5" @tap="_acrossVehicle">载具横移</button>
-			<button class="submit-button" :class="{'btn-disabled': checkArr.length === 0 || checkArr.length > 1}" :disabled="disabled1" @tap="_needVehicle">呼叫载具</button>
-			<button class="submit-button" :class="{'btn-disabled': !val1 || !val2}" :disabled="disabled4" @tap="_shippingCheck">配送校验</button>
-			<button class="submit-button" :class="{'btn-disabled': !checkArr.length || !val3}" :disabled="disabled2" @tap="_shippingConfirm">配送确认</button>
-			<button class="submit-button" :class="{'btn-disabled': !val3 || checkArr.length > 0}" :disabled="disabled3" @tap="_returnVehicle">载具送回</button>
-			<button class="submit-button" @tap="_queryMaterialInfo">查询</button>
+		<view class="zd-row submitbar">
+			<button class="zd-col-4 btn-submit btn-success" :class="{'btn-info': !val3}" :disabled="disabled5" @tap="_acrossVehicle">载具横移</button>
+			<button class="zd-col-4 btn-submit btn-success" :class="{'btn-info': checkArr.length === 0 || checkArr.length > 1}" :disabled="disabled1" @tap="_needVehicle">呼叫载具</button>
+			<button class="zd-col-4 btn-submit btn-success" :class="{'btn-info': !val1 || !val2}" :disabled="disabled4" @tap="_shippingCheck">配送校验</button>
+			<button class="zd-col-4 btn-submit btn-success" :class="{'btn-info': !checkArr.length || !val3}" :disabled="disabled2" @tap="_shippingConfirm">配送确认</button>
+			<button class="zd-col-4 btn-submit btn-success" :class="{'btn-info': !val3 || checkArr.length > 0}" :disabled="disabled3" @tap="_returnVehicle">载具送回</button>
 		</view>
 	</view>
 </template>
diff --git a/pages/ProductManage/ZjInStore.vue b/pages/ProductManage/ZjInStore.vue
index 2d059b3..ab6ab73 100644
--- a/pages/ProductManage/ZjInStore.vue
+++ b/pages/ProductManage/ZjInStore.vue
@@ -59,9 +59,9 @@
 				</view>
 			</view>
 		</view>
-		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !index1 || !pkId}" :disabled="disabled" @tap="_inConfirm">上空轴</button>
-			<button class="submit-button" @tap="_queryMaterialInfo">查询</button>
+		<view class="zd-row submitbar">
+			<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !index1 || !pkId}" :disabled="disabled" @tap="_inConfirm">上空轴</button>
+			<button class="zd-col-6 btn-submit btn-success letter-30" @tap="_queryMaterialInfo">查询</button>
 		</view>
 	</view>
 </template>