From e1ef803199831657c6420006bef33a223390a41c Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 15 Apr 2025 13:38:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E7=A0=81=E4=B8=8B=E5=8D=B7=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                    |  4 ++--
 pages/ProductManage/ScanRoll.vue | 32 ++++++++++++++++++--------------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/manifest.json b/manifest.json
index 74abbca..f3696ac 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "海亮铜箔",
     "appid" : "__UNI__3A002CD",
     "description" : "海亮铜箔二期手持系统",
-    "versionName" : "1.2.4",
-    "versionCode" : 124,
+    "versionName" : "1.2.5",
+    "versionCode" : 125,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/ProductManage/ScanRoll.vue b/pages/ProductManage/ScanRoll.vue
index 5303906..0737a02 100644
--- a/pages/ProductManage/ScanRoll.vue
+++ b/pages/ProductManage/ScanRoll.vue
@@ -24,17 +24,22 @@
 				</view>
 			</view>
 			<view class="zd_wrapper">
-				<view class="filter_item">
-					<view class="filter_label_wraper">
-						<span class="filter_label">子卷号</span>
+				<view class="zd-row">
+					<view class="zd-col-19">
+						<view class="filter_item">
+							<view class="filter_label">子卷号</view>
+							<view class="filter_input_wraper">
+								<search-box
+								v-model="val1"
+								/>
+							</view>
+						</view>
 					</view>
-					<view class="filter_input_wraper">
-						<search-box
-						v-model="val1"
-						/>
+					<view class="zd-col-4">
+						<button class="mini-btn" size="mini" style="display: block;" type="primary" @tap="handleAdd">添加</button>
 					</view>
 				</view>
-				<view class="zd-row">
+				<!-- <view class="zd-row">
 					<view class="zd-col-19">
 						<view class="filter_item">
 							<view class="filter_label">轴位置</view>
@@ -51,22 +56,21 @@
 					<view class="zd-col-4">
 						<button class="mini-btn" size="mini" style="display: block;" type="primary" @tap="handleAdd">添加</button>
 					</view>
-				</view>
+				</view> -->
 			</view>
 			<view class="zd_wrapper grid-wraper">
 				<view class="slide_new slide">
 					<table>
 						<thead>
 							<tr>
-								<th width="60%">子卷号</th>
-								<th width="20%">轴位置</th>
-								<th width="20%">操作</th>
+								<th width="70%">子卷号</th>
+								<!-- <th width="20%">轴位置</th> -->
+								<th width="30%">操作</th>
 							</tr>
 						</thead>
 						<tbody>
 							<tr v-for="(e, i) in dataList" :key="i">
 								<td>{{e.container_name}}</td>
-								<td>{{ options1 | findByValue(e.site)}}</td>
 								<td><button class="mini-btn" size="mini" type="primary" @tap="handleDelete(i)">删除</button></td>
 							</tr>
 						</tbody>
@@ -159,7 +163,7 @@
 				if (index !== -1) {
 					this.dataList.splice(index, 1)
 				}
-				this.dataList.push({container_name: this.val1, site: this.index1})
+				this.dataList.push({container_name: this.val1})
 				this.val1 = ''
 			},
 			handleDelete (index) {