From 7a46c8d845c32757257674e1747eb1752374d2d7 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Wed, 31 Dec 2025 15:59:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E4=B8=8B=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locale/en.json                    |  2 +-
 locale/jp.json                    |  2 +-
 locale/zh-Hans.json               |  2 +-
 pages/ftdlDTY/line-down-mater.vue | 10 +++++-----
 pages/ftdlDTY/man-load-goods.vue  |  3 ++-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/locale/en.json b/locale/en.json
index 798570a..0bea678 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -23,7 +23,7 @@
 	"button.force-complete": "强制完成",
 	"button.enter": "进入",
 	"button.quit": "退出",
-	"button.scxl": "产线下料",
+	"button.zyps": "作业配送",
 	"button.zjps": "质检配送",
 	"button.zjxl": "质检下料",
 	"button.control": "管制",
diff --git a/locale/jp.json b/locale/jp.json
index d0d9feb..6ce6e12 100644
--- a/locale/jp.json
+++ b/locale/jp.json
@@ -23,7 +23,7 @@
 	"button.force-complete": "強制完了",
 	"button.enter": "に入る",
 	"button.quit": "終了",
-	"button.scxl": "ラインダウン",
+	"button.zyps": "作業配送",
 	"button.zjps": "品質検査配送",
 	"button.zjxl": "品質検査で材料を落とす",
 	"button.control": "せいぎょ",
diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json
index 798570a..0bea678 100644
--- a/locale/zh-Hans.json
+++ b/locale/zh-Hans.json
@@ -23,7 +23,7 @@
 	"button.force-complete": "强制完成",
 	"button.enter": "进入",
 	"button.quit": "退出",
-	"button.scxl": "产线下料",
+	"button.zyps": "作业配送",
 	"button.zjps": "质检配送",
 	"button.zjxl": "质检下料",
 	"button.control": "管制",
diff --git a/pages/ftdlDTY/line-down-mater.vue b/pages/ftdlDTY/line-down-mater.vue
index 919f762..06fae8a 100644
--- a/pages/ftdlDTY/line-down-mater.vue
+++ b/pages/ftdlDTY/line-down-mater.vue
@@ -61,9 +61,9 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<!-- <button class="zd-col-22 button-primary" :class="{'button-info': !val1 || !dataList.length || !index}" :disabled="disabled" @tap="_productBlanking">{{$t('button.confirm-down-material')}}</button> -->
-			<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || !dataList.length}" :disabled="disabled" @tap="handleConfirm('1')">{{$t('button.scxl')}}</button>
-			<button class="zd-col-8 button-default" :class="{'button-info': !val1 || !dataList.length}" :disabled="disabled" @tap="handleConfirm('2')">{{$t('button.zjps')}}</button>
-			<button class="zd-col-8 button-default" :class="{'button-info': !val1 || !index || !dataList.length}" :disabled="disabled" @tap="handleConfirm('3')">{{$t('button.zjxl')}}</button>
+			<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || !dataList.length}" :disabled="disabled" @tap="handleConfirm('1', $t('button.zyps'))">{{$t('button.zyps')}}</button>
+			<button class="zd-col-8 button-default" :class="{'button-info': !val1 || !dataList.length}" :disabled="disabled" @tap="handleConfirm('2', $t('button.zjps'))">{{$t('button.zjps')}}</button>
+			<button class="zd-col-8 button-default" :class="{'button-info': !val1 || !index || !dataList.length}" :disabled="disabled" @tap="handleConfirm('3', $t('button.zjxl'))">{{$t('button.zjxl')}}</button>
 		</view>
 	</view>
 </template>
@@ -184,7 +184,7 @@
 				this.currentData = {}
 				this.disabled = false
 			},
-			async handleConfirm(type) {
+			async handleConfirm(type, name) {
 				if (type === '3') {
 					if (!this.val1 || !this.dataList.length || !this.index) {
 						return
@@ -194,7 +194,7 @@
 						return
 					}
 				}
-				const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？")
+				const isConfirmed = await confirmAction("确认操作", "确定要执行" + name + "吗？")
 				if (isConfirmed) {
 					this._productBlanking(type)
 				}
diff --git a/pages/ftdlDTY/man-load-goods.vue b/pages/ftdlDTY/man-load-goods.vue
index b87f376..373ce2a 100644
--- a/pages/ftdlDTY/man-load-goods.vue
+++ b/pages/ftdlDTY/man-load-goods.vue
@@ -207,7 +207,8 @@
 				let currObj = {
 					mid: 'mid_' + Date.now() + '_' + Math.random().toString(36).substr(2, 9),
 					container_code: '',
-					material_name: '物料',
+					material_code: '0001542',
+					material_name: 'ET02560/T (1250X1000)',
 					pscn: '',
 					qty: '1',
 					measure_unit_id: '单位'