From 060d415c545ca19a70d937f53f10d72d5484e48f Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 19 Mar 2024 17:29:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E6=9C=9F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locale/en.json                           | 1 +
 locale/id.json                           | 1 +
 locale/zh-Hans.json                      | 1 +
 pages/ProductManage/BakeProcess.vue      | 2 +-
 pages/ProductManage/EmptyPipeInStore.vue | 3 ++-
 pages/ProductManage/SboProcess.vue       | 3 +++
 pages/ProductManage/SlittingFeeding.vue  | 9 +++++----
 utils/getData2.js                        | 5 +++--
 8 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/locale/en.json b/locale/en.json
index 1047017..fa9d9c7 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -10,6 +10,7 @@
 	"button.confirm-receipt": "Confirm receipt",
 	"button.confirm-outbound": "Confirm outbound",
 	"button.empty-shaft-return": "Empty shaft return",
+	"button.full-shaft-return": "Full shaft return",
 	"button.through-shaft-confirm": "Through shaft confirm",
 	"button.pull-shaft-confirm": "Pull shaft confirm",
 	"button.overlap-shaft-confirm": "Overlap shaft confirm",
diff --git a/locale/id.json b/locale/id.json
index fe5e14e..0ea29ec 100644
--- a/locale/id.json
+++ b/locale/id.json
@@ -10,6 +10,7 @@
 	"button.confirm-receipt": "Konfirmasi penerimaan",
 	"button.confirm-outbound": "Konfirmasi keluar",
 	"button.empty-shaft-return": "Kembali shaft kosong",
+	"button.full-shaft-return": "Paksi penuh kembali",
 	"button.through-shaft-confirm": "Melalui konfirmasi shaft",
 	"button.pull-shaft-confirm": "Pull shaft konfirmasi",
 	"button.overlap-shaft-confirm": "Konfirmasi paksi Overlap",
diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json
index 8475f46..6faa0ae 100644
--- a/locale/zh-Hans.json
+++ b/locale/zh-Hans.json
@@ -10,6 +10,7 @@
 	"button.confirm-receipt": "确认入库",
 	"button.confirm-outbound": "确认出库",
 	"button.empty-shaft-return": "空轴送回",
+	"button.full-shaft-return": "满轴送回",
 	"button.through-shaft-confirm": "穿轴确认",
 	"button.pull-shaft-confirm": "拔轴确认",
 	"button.overlap-shaft-confirm": "套轴确认",
diff --git a/pages/ProductManage/BakeProcess.vue b/pages/ProductManage/BakeProcess.vue
index 4134ffc..7f8cfb8 100644
--- a/pages/ProductManage/BakeProcess.vue
+++ b/pages/ProductManage/BakeProcess.vue
@@ -36,7 +36,7 @@
 		<view class="submit-bar">
 			<button class="submit-button" :class="{'btn-disabled': !val1 || !val2 || !val3 || !val4}" :disabled="disabled" @tap="_ovenInAndOut1('1')">入箱</button>
 			<button class="submit-button" :class="{'btn-disabled': !val1 || !val2}" :disabled="disabled" @tap="_ovenInAndOut2('2')">出箱</button>
-			<button class="submit-button" :class="{'btn-disabled': !val1 || !val2}" :disabled="disabled3" @tap="_inCoolIvt">入冷却</button>
+			<button class="submit-button" :class="{'btn-disabled': !val1 || !val2}" :disabled="disabled3" @tap="_inCoolIvt">质检合格</button>
 			<button class="submit-button" :class="{'btn-disabled': !val1}" :disabled="disabled4" @tap="_bakingrelease">解警</button>
 		</view>
 	</view>
diff --git a/pages/ProductManage/EmptyPipeInStore.vue b/pages/ProductManage/EmptyPipeInStore.vue
index e544fda..959861e 100644
--- a/pages/ProductManage/EmptyPipeInStore.vue
+++ b/pages/ProductManage/EmptyPipeInStore.vue
@@ -136,7 +136,8 @@
 				let res = await taskQuerydevice([{product_area: this.index1, device_code: this.index2}])
 				let data = res.data[0]
 				this.qty = data.qty
-				this._queryPaperMaterial(data.material_code)
+				// this._queryPaperMaterial(data.material_code)
+				this.index3 = data.material_code
 			},
 			/** 确认 */
 			async _emptyConfirm () {
diff --git a/pages/ProductManage/SboProcess.vue b/pages/ProductManage/SboProcess.vue
index d221ffb..429297b 100644
--- a/pages/ProductManage/SboProcess.vue
+++ b/pages/ProductManage/SboProcess.vue
@@ -114,6 +114,9 @@
 		},
 		methods: {
 			searchList () {
+				this.pkId = ''
+				this.pkObj = {}
+				this.totalCount = 0
 				this.dataList = []
 				this.pageNum = 1
 				this._queryRawFoilList()
diff --git a/pages/ProductManage/SlittingFeeding.vue b/pages/ProductManage/SlittingFeeding.vue
index 6f3fe84..152ed7b 100644
--- a/pages/ProductManage/SlittingFeeding.vue
+++ b/pages/ProductManage/SlittingFeeding.vue
@@ -100,10 +100,11 @@
 		</view>
 		<view class="more_btns_wraper" :class="btn_active ? 'popshow' : 'pophide'">
 			<view class="more_btns_items">
-				<button class="more-button" :class="{'btn-disabled': !val1}" :disabled="disabled2" @tap="_feedingVehicleReturn">{{$t('button.empty-shaft-return')}}</button>
+				<button class="more-button" :class="{'btn-disabled': !val1}" :disabled="disabled2" @tap="_feedingVehicleReturn('2')">{{$t('button.full-shaft-return')}}</button>
+				<button class="more-button" :class="{'btn-disabled': !val1}" :disabled="disabled2" @tap="_feedingVehicleReturn('1')">{{$t('button.empty-shaft-return')}}</button>
 				<button class="more-button" @tap="handleSure">{{$t('button.manual-call')}}</button>
 			</view>
-			<view class="more_btns_cancle" @tap="btn_active = false">取消</view>
+			<view class="more_btns_cancle" @tap="btn_active = false">{{$t('button.cancel')}}</view>
 		</view>
 		<view v-if="btn_active" class="msg_mask"></view>
 		<view v-if="active" class="msg_wrapper msg_wrapper_1">
@@ -320,7 +321,7 @@
 				}
 			},
 			/** 空轴送回 */
-			async _feedingVehicleReturn () {
+			async _feedingVehicleReturn (type) {
 				this.disabled2 = true
 				if (!this.val1) {
 					this.disabled2 = false
@@ -332,7 +333,7 @@
 					return
 				}
 				try {
-					let res = await feedingVehicleReturn(this.val1)
+					let res = await feedingVehicleReturn(this.val1, type)
 					this.disabled2 = false
 					this.active = false
 					this.val1 = ''
diff --git a/utils/getData2.js b/utils/getData2.js
index 4afa46e..128d711 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -632,10 +632,11 @@ export const feedingHandleConfirm = (code, cn, ncode) => request({
 	}
 })
 // 1.5空轴送回
-export const feedingVehicleReturn = (code) => request({
+export const feedingVehicleReturn = (code, type) => request({
 	url:'api/pda/feeding/vehicleReturn',
 	data: {
-		point_code: code
+		point_code: code,
+		type: type
 	}
 })