From ac789dd1780603c4e96f254035d73ec8818c3dc3 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 25 三月 2024 15:17:22 +0800
Subject: [PATCH] #

---
 pages/phyz/AGV/AGVPakin2.vue       |    8 +++-----
 pages/phyz/order/purchaseOrder.vue |   15 ++++++++++++++-
 pages/phyz/wrkMast/wrkMast.vue     |    5 +++--
 static/css/common/order.css        |    9 ++++++---
 4 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/pages/phyz/AGV/AGVPakin2.vue b/pages/phyz/AGV/AGVPakin2.vue
index fe3e4f5..5dd4e47 100644
--- a/pages/phyz/AGV/AGVPakin2.vue
+++ b/pages/phyz/AGV/AGVPakin2.vue
@@ -538,14 +538,12 @@
 						var res = result.data
 						if (res.code === 200) {
 							that.dataList = []
-							that.findOrder()
-							// that.resst();
 							that.barcode = ''
 							that.messageText = "缁勬墭鎴愬姛"
 							that.messageToggle('success')
-							const innerAudioContext = uni.createInnerAudioContext();
-							innerAudioContext.src = '/static/music/pakinOk.mp3';
-							innerAudioContext.play()
+							uni.navigateBack({
+								delta: 2
+							});
 						} else if (res.code == 403) {
 							that.messageText = res.msg
 							that.messageToggle('error')
diff --git a/pages/phyz/order/purchaseOrder.vue b/pages/phyz/order/purchaseOrder.vue
index f31898f..5daa42a 100644
--- a/pages/phyz/order/purchaseOrder.vue
+++ b/pages/phyz/order/purchaseOrder.vue
@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="container">
 		<view class="code">
 			<uni-search-bar :focus="searchValueFocus" v-model="searchValue"  @input="searchValueInput()"
 				maxlength="500" ancel="cancel" @clear="clear" placeholder="杈撳叆 / 鎵弿 璁㈠崟鍙�">
@@ -19,6 +19,7 @@
 				<!-- <view class="card-id">{{i + 1}}</view> -->
 				<view class="card-status-1" v-if="item.settle == 1">{{item.settle$}}</view>
 				<view class="card-status-2" v-if="item.settle == 2">{{item.settle$}}</view>
+				<view class="card-status-4" v-if="item.settle == 4">{{item.settle$}}</view>
 			</view>
 			<!-- <view class="list-right" @click="checkboxChange(item)">
 				<label >
@@ -187,4 +188,16 @@
 		border: 1px solid #b7eb8f;
 		border-radius: 6rpx;
 	}
+	.card-status-4 {
+		position: absolute;
+		right: 20rpx;
+		top: 30rpx;
+		padding: 4rpx 20rpx;
+		text-align: center;
+		font-size: 10px;
+		color: #1890ff;
+		background-color: #e6f7ff;
+		border: 1px solid #91d5ff;
+		border-radius: 6rpx;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/phyz/wrkMast/wrkMast.vue b/pages/phyz/wrkMast/wrkMast.vue
index 8b36464..a18a608 100644
--- a/pages/phyz/wrkMast/wrkMast.vue
+++ b/pages/phyz/wrkMast/wrkMast.vue
@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="container">
 		<view class="code">
 			<uni-search-bar :focus="searchFocus" v-model="searchValue"  @input="searchInput()" ma
 				maxlength="500" ancel="cancel" @clear="clear" placeholder="杈撳叆 / 鎵弿鍟嗗搧">
@@ -77,11 +77,12 @@
 </script>
 
 <style>
+	@import url('../../../static/css/common/order.css');
 	.code {
 		background-color: #d9d9d9;
 		z-index: 99;
 		position: sticky;
-		top: 80rpx;
+		top: 0rpx;
 		left: 0;
 	}
 	.list {
diff --git a/static/css/common/order.css b/static/css/common/order.css
index a64e023..a20807a 100644
--- a/static/css/common/order.css
+++ b/static/css/common/order.css
@@ -1,8 +1,11 @@
-.code {
+	.container {
+		position: relative;
+	}
+	.code {
 		background-color: #d9d9d9;
 		z-index: 99;
 		position: sticky;
-		top: 80rpx;
+		top: 0rpx;
 		left: 0;
 	}
 	.code-title {
@@ -37,7 +40,7 @@
 		position: relative;
 	}
 	.list-right {
-		width: 100rpx;
+		width: 70rpx;
 		border-left: 1px solid #eeeeee;
 		display: flex;
 		align-items: center;

--
Gitblit v1.9.1