From 4367a5ff0770311e6fdccc64cdd33f7d46e75140 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Tue, 1 Jul 2025 09:46:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=88=87=E4=B8=8B=E6=96=992-=E5=B7=A6?=
 =?UTF-8?q?=E5=8F=B3=E5=8D=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locale/en-1.json                              |  5 ++-
 locale/id-1.json                              |  5 ++-
 locale/zh-Hans-1.json                         | 10 +++--
 .../SecondPhase/slitting/SlittingCutting2.vue | 39 ++++++++++++++++++-
 4 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/locale/en-1.json b/locale/en-1.json
index c7d9499..0c027cf 100644
--- a/locale/en-1.json
+++ b/locale/en-1.json
@@ -43,6 +43,7 @@
 	"filter.tubecore-l": "Left tube core",
 	"filter.tubecore-r": "Right tube core",
 	"filter.axisposition": "Axis position",
+	"filter.rollposition": "Roll position",
 	"filter.staginglocationA": "Staging location A",
 	"filter.staginglocationB": "Staging location B",
 	"filter.corespecifications": "Core specifications",
@@ -80,5 +81,7 @@
 	"grid.corename": "Core name",
 	"grid.areaname": "Area name",
 	"select.uppershaft": "Upper shaft",
-	"select.lowershaft": "Lower shaft"
+	"select.lowershaft": "Lower shaft",
+	"select.leftroll": "Left roll",
+	"select.rightroll": "Right roll"
 }
\ No newline at end of file
diff --git a/locale/id-1.json b/locale/id-1.json
index a769564..95ddb0c 100644
--- a/locale/id-1.json
+++ b/locale/id-1.json
@@ -43,6 +43,7 @@
 	"filter.tubecore-l": "Core kiri",
 	"filter.tubecore-r": "Tubula kanan",
 	"filter.axisposition": "Posisi sumbu",
+	"filter.rollposition": "Lokasi Volume",
 	"filter.staginglocationA": "Temporary A",
 	"filter.staginglocationB": "Temporary B",
 	"filter.corespecifications": "Spesifikasi inti",
@@ -78,5 +79,7 @@
 	"grid.corename": "Nama inti",
 	"grid.areaname": "Nama daerah",
 	"select.uppershaft": "Poros Atas",
-	"select.lowershaft": "Poros bawah"
+	"select.lowershaft": "Poros bawah",
+	"select.leftroll": "Gulung Kiri",
+	"select.rightroll": "Gulung kanan"
 }
\ No newline at end of file
diff --git a/locale/zh-Hans-1.json b/locale/zh-Hans-1.json
index e3439ad..433fb47 100644
--- a/locale/zh-Hans-1.json
+++ b/locale/zh-Hans-1.json
@@ -44,7 +44,8 @@
 	"filter.staginglocationB": "暂存B位",
 	"filter.tubecore-l": "管芯左",
 	"filter.tubecore-r": "管芯右",
-	"filter.axisposition": "轴位置",
+	"filter.axisposition": "轴上下位置",
+	"filter.rollposition": "卷左右位置",
 	"filter.corespecifications": "管芯规格",
 	"grid.bill-code": "单据号",
 	"grid.bill-type": "单据类型",
@@ -70,7 +71,8 @@
 	"grid.expected-end-time": "预计结束时间",
 	"grid.remain-time": "剩余时间(分)",
 	"grid.jtcode": "机台编号",
-	"grid.axisposition": "轴位置",
+	"grid.axisposition": "轴上下位置",
+	"grid.rollposition": "卷左右位置",
 	"grid.operate": "操作",
 	"grid.tip": "提示",
 	"grid.staginglocationA": "暂存A位",
@@ -80,5 +82,7 @@
 	"grid.corename": "管芯名称",
 	"grid.areaname": "区域名称",
 	"select.uppershaft": "上轴",
-	"select.lowershaft": "下轴"
+	"select.lowershaft": "下轴",
+	"select.leftroll": "左卷",
+	"select.rightroll": "右卷"
 }
\ No newline at end of file
diff --git a/pages/SecondPhase/slitting/SlittingCutting2.vue b/pages/SecondPhase/slitting/SlittingCutting2.vue
index e613598..2bae83c 100644
--- a/pages/SecondPhase/slitting/SlittingCutting2.vue
+++ b/pages/SecondPhase/slitting/SlittingCutting2.vue
@@ -51,14 +51,33 @@
 						<button class="mini-btn" size="mini" style="display: block;" type="primary" @tap="handleAdd">{{$t('button.add')}}</button>
 					</view>
 				</view>
+				<view class="zd-row">
+					<view class="zd-col-19">
+						<view class="filter_item">
+							<view class="filter_label">{{$t('grid.rollposition')}}</view>
+							<view class="filter_input_wraper">
+								<radio-group @change="radioChange02">
+									<label class="mgr20" v-for="(item, index) in options02" :key="item.value">
+										<radio :value="item.value" :checked="index === current02" style="transform:scale(0.8)" />
+										<text class="filter_unit">{{item.text}}</text>
+									</label>
+								</radio-group>
+							</view>
+						</view>
+					</view>
+					<view class="zd-col-4">
+						<button class="mini-btn" size="mini" style="display: block;" type="primary" @tap="handleAdd02">{{$t('button.add')}}</button>
+					</view>
+				</view>
 			</view>
 			<view class="zd_wrapper grid-wraper">
 				<view class="slide_new slide">
 					<table>
 						<thead>
 							<tr>
-								<th width="60%">{{$t('grid.sub-roll-number')}}</th>
+								<th width="40%">{{$t('grid.sub-roll-number')}}</th>
 								<th width="20%">{{$t('grid.axisposition')}}</th>
+								<th width="20%">{{$t('grid.rollposition')}}</th>
 								<th width="20%">{{$t('grid.operate')}}</th>
 							</tr>
 						</thead>
@@ -66,6 +85,7 @@
 							<tr v-for="(e, i) in dataList" :key="i">
 								<td>{{e.container_name}}</td>
 								<td>{{ options1 | findByValue(e.site)}}</td>
+								<td>{{ options02 | findByValue(e.roll)}}</td>
 								<td><button class="mini-btn" size="mini" type="primary" @tap="handleDelete(i)">{{$t('button.delete')}}</button></td>
 							</tr>
 						</tbody>
@@ -98,8 +118,11 @@
 				options2: [],
 				index2: '',
 				options1: [{value: '1', text: this.$t('select.uppershaft')}, {value: '2', text: this.$t('select.lowershaft')}],
+				options02: [{value: '1', text: this.$t('select.leftroll')}, {value: '2', text: this.$t('select.rightroll')}],
 				index1: '1',
+				index02: '1',
 				current: 0,
+				current02: 0,
 				val1: '',
 				dataList: [],
 				disabled: false
@@ -135,6 +158,9 @@
 			radioChange (e) {
 				this.index1 = e.detail.value
 			},
+			radioChange02 (e) {
+				this.index02 = e.detail.value
+			},
 			handleAdd () {
 				if (!this.val1.trim()) {
 					return
@@ -146,6 +172,17 @@
 				this.dataList.push({container_name: this.val1, site: this.index1})
 				this.val1 = ''
 			},
+			handleAdd02 () {
+				if (!this.val1.trim()) {
+					return
+				}
+				const index = this.dataList.findIndex(item => item === this.val1)
+				if (index !== -1) {
+					this.dataList.splice(index, 1)
+				}
+				this.dataList.push({container_name: this.val1, site: this.index1, roll: this.index02})
+				this.val1 = ''
+			},
 			handleDelete (index) {
 				this.dataList.splice(index, 1)
 			},