From ba39f5ab545a809afc438de069eee5477c943b17 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Tue, 24 Jun 2025 15:03:44 +0800
Subject: [PATCH] change

---
 locale/en-1.json                            |  1 +
 locale/id-1.json                            |  1 +
 locale/zh-Hans-1.json                       |  1 +
 pages/SecondPhase/slitting/StockingArea.vue | 13 ++++---------
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/locale/en-1.json b/locale/en-1.json
index 9912fba..c7d9499 100644
--- a/locale/en-1.json
+++ b/locale/en-1.json
@@ -23,6 +23,7 @@
 	"button.returnaxis": "Withdrawal axis",
 	"button.stockup": "Stock up",
 	"button.confirmlowershaft": "Confirm axis below",
+	"button.emptydiskrecycle": "Empty disk recycle",
 	"filter.bill-code": "Bill code",
 	"filter.warehouse": "Warehouse",
 	"filter.woodenbox": "Woodenbox",
diff --git a/locale/id-1.json b/locale/id-1.json
index 60d0832..a769564 100644
--- a/locale/id-1.json
+++ b/locale/id-1.json
@@ -23,6 +23,7 @@
 	"button.returnaxis": "Pulang",
 	"button.stockup": "Persediaan",
 	"button.confirmlowershaft": "Konfirmasi sumbu bawah",
+	"button.emptydiskrecycle": "Daur Ulang Disk Kosong",
 	"filter.bill-code": "Kode dokumen",
 	"filter.warehouse": "gudang",
 	"filter.woodenbox": "Kotak kayu",
diff --git a/locale/zh-Hans-1.json b/locale/zh-Hans-1.json
index 418bf59..e3439ad 100644
--- a/locale/zh-Hans-1.json
+++ b/locale/zh-Hans-1.json
@@ -23,6 +23,7 @@
 	"button.returnaxis": "退轴",
 	"button.stockup": "备货",
 	"button.confirmlowershaft": "确认下轴",
+	"button.emptydiskrecycle": "空盘回收",
 	"filter.bill-code": "单据编码",
 	"filter.warehouse": "仓库",
 	"filter.woodenbox": "木箱",
diff --git a/pages/SecondPhase/slitting/StockingArea.vue b/pages/SecondPhase/slitting/StockingArea.vue
index a436cda..9546aba 100644
--- a/pages/SecondPhase/slitting/StockingArea.vue
+++ b/pages/SecondPhase/slitting/StockingArea.vue
@@ -23,10 +23,10 @@
 			</view>
 		</view>
 		<view class="zd-row submitbar">
-			<button class="zd-col-5 btn-submit btn-default" @tap="clearUp">{{$t('button.clear')}}</button>
 			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !val1 || !val2}" :disabled="disabled" @tap="_doStockAreaBinding">{{$t('button.bind')}}</button>
 			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled" @tap="_doStockAreaUnbinding">{{$t('button.unbind')}}</button>
-			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !val1 || !val2}" :disabled="disabled" @tap="_instorStock">{{$t('button.tubeinstore')}}</button>
+			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !val1 || !val2}" :disabled="disabled" @tap="_instorStock('1')">{{$t('button.tubeinstore')}}</button>
+			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !val1 || !val2}" :disabled="disabled" @tap="_instorStock('0')">{{$t('button.emptydiskrecycle')}}</button>
 		</view>
 	</view>
 </template>
@@ -86,14 +86,14 @@
 					this.disabled = false
 				}
 			},
-			async _instorStock () {
+			async _instorStock (type) {
 				this.disabled = true
 				if (!this.val1 || !this.val2) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await instorStock(this.val1, this.val2, '1')
+					let res = await instorStock(this.val1, this.val2, type)
 					uni.showToast({
 						title: res.message,
 						icon: 'none'
@@ -102,11 +102,6 @@
 				} catch (e) {
 					this.disabled = false
 				}
-			},
-			clearUp () {
-				this.val1 = ''
-				this.val2 = ''
-				this.disabled = false
 			}
 		}
 	}