From ba77ea34ba2552b45850f781f6e77a0514397478 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 24 Jun 2025 16:39:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=B8=85=E7=A9=BA?=
 =?UTF-8?q?=E3=80=81=E5=8F=96=E5=80=BC=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/SecondPhase/EmptyVehicleInStore.vue     |  1 +
 pages/SecondPhase/finished/ReturnToStore.vue  |  1 +
 pages/SecondPhase/finished/abnorToStore.vue   |  1 +
 pages/SecondPhase/lvt/EmptyBox.vue            |  1 +
 pages/SecondPhase/point/ErrorOutUnlock.vue    |  2 ++
 pages/SecondPhase/point/ManPass.vue           |  2 ++
 pages/SecondPhase/production/BakeProcess.vue  | 27 ++++++++++++++++---
 pages/SecondPhase/production/BoxStock.vue     |  2 +-
 pages/SecondPhase/production/ManmadeBake.vue  | 19 ++++++++++---
 .../SecondPhase/production/SurfaceProcess.vue |  2 ++
 pages/SecondPhase/slitting/CacheCut.vue       |  1 +
 pages/SecondPhase/slitting/CallShaft.vue      |  1 +
 pages/SecondPhase/slitting/DoInitShaft.vue    |  1 +
 .../SecondPhase/slitting/EmptyAxisReturn.vue  |  1 +
 pages/SecondPhase/slitting/PaperBind.vue      |  1 +
 pages/SecondPhase/slitting/ShaftSave.vue      |  1 +
 pages/SecondPhase/slitting/StockingArea.vue   |  2 ++
 pages/SecondPhase/slitting/SubRollWeight.vue  | 20 +++++++++++---
 pages/SecondPhase/slitting/UpperShaftCut.vue  |  1 +
 19 files changed, 77 insertions(+), 10 deletions(-)

diff --git a/pages/SecondPhase/EmptyVehicleInStore.vue b/pages/SecondPhase/EmptyVehicleInStore.vue
index 448fd39..49e6abf 100644
--- a/pages/SecondPhase/EmptyVehicleInStore.vue
+++ b/pages/SecondPhase/EmptyVehicleInStore.vue
@@ -73,6 +73,7 @@
 						title: res.message,
 						icon: 'none'
 					})
+					this.clearUp()
 					this.disabled = false
 				} catch (e) {
 					this.disabled = false
diff --git a/pages/SecondPhase/finished/ReturnToStore.vue b/pages/SecondPhase/finished/ReturnToStore.vue
index ebdfcbe..77e4846 100644
--- a/pages/SecondPhase/finished/ReturnToStore.vue
+++ b/pages/SecondPhase/finished/ReturnToStore.vue
@@ -75,6 +75,7 @@
 					})
 					this.val1 = ''
 					this.disabled = false
+					this.clearUp()
 				} catch (e) {
 					this.disabled = false
 				}
diff --git a/pages/SecondPhase/finished/abnorToStore.vue b/pages/SecondPhase/finished/abnorToStore.vue
index ecb888b..f987fc3 100644
--- a/pages/SecondPhase/finished/abnorToStore.vue
+++ b/pages/SecondPhase/finished/abnorToStore.vue
@@ -82,6 +82,7 @@
 						title: res.message,
 						icon: 'none'
 					})
+					this.clearUp()
 					this.disabled = false
 				} catch (e) {
 					this.disabled = false
diff --git a/pages/SecondPhase/lvt/EmptyBox.vue b/pages/SecondPhase/lvt/EmptyBox.vue
index 5e0423a..c76b35d 100644
--- a/pages/SecondPhase/lvt/EmptyBox.vue
+++ b/pages/SecondPhase/lvt/EmptyBox.vue
@@ -100,6 +100,7 @@
 				this.index = e
 			},
 			async _queryBoxIvt () {
+				this.dataList = []
 				try {
 					let res = await queryBoxIvt(this.val1, this.val2, this.val3)
 					this.dataList = [...res.data]
diff --git a/pages/SecondPhase/point/ErrorOutUnlock.vue b/pages/SecondPhase/point/ErrorOutUnlock.vue
index 48000e4..5080539 100644
--- a/pages/SecondPhase/point/ErrorOutUnlock.vue
+++ b/pages/SecondPhase/point/ErrorOutUnlock.vue
@@ -65,6 +65,8 @@
 				}
 				try {
 					let res = await abnormalOut(this.val1, this.val2)
+					this.val1 = ''
+					this.val2 = ''
 					this.disabled1 = false
 					uni.showToast({
 						title: res.message,
diff --git a/pages/SecondPhase/point/ManPass.vue b/pages/SecondPhase/point/ManPass.vue
index fe8f47b..0ab060f 100644
--- a/pages/SecondPhase/point/ManPass.vue
+++ b/pages/SecondPhase/point/ManPass.vue
@@ -65,6 +65,7 @@
 						title: res.message,
 						icon: 'none'
 					})
+					this.clearUp()
 					this.disabled = false
 				} catch (e) {
 					this.disabled = false
@@ -81,6 +82,7 @@
 						title: res.message,
 						icon: 'none'
 					})
+					this.clearUp()
 					this.disabled = false
 					this.btn_active = false
 				} catch (e) {
diff --git a/pages/SecondPhase/production/BakeProcess.vue b/pages/SecondPhase/production/BakeProcess.vue
index daf8c4c..b807104 100644
--- a/pages/SecondPhase/production/BakeProcess.vue
+++ b/pages/SecondPhase/production/BakeProcess.vue
@@ -23,13 +23,24 @@
 				<view class="filter_item">
 					<view class="filter_label">{{$t('filter.temperature')}}</view>
 					<view class="filter_input_wraper">
-						<input type="number" class="filter_input" v-model="val3">
+						<!-- <input type="number" class="filter_input" v-model="val3"> -->
+						<NumberInput
+						v-model="val3"
+						input-class="filter_input"
+						mode="mixed"
+						:decimalLength="3"
+						/>
 					</view>
 				</view>
 				<view class="filter_item">
 					<view class="filter_label">{{$t('filter.time')}}({{$t('unit.minute')}})</view>
 					<view class="filter_input_wraper">
-						<input type="number" class="filter_input" v-model="val4">
+						<!-- <input type="number" class="filter_input" v-model="val4"> -->
+						<NumberInput
+						v-model="val4"
+						input-class="filter_input"
+						mode="integer"
+						/>
 					</view>
 				</view>
 				<view class="filter_item">
@@ -52,11 +63,13 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
+	import NumberInput from '@/components/NumberInput.vue'
 	import {ovenInAndOut, inCoolIvt, bakingquery, inCoolOrOven} from '@/utils/getData1.js'
 	export default {
 		components: {
 			NavBar,
-			SearchBox
+			SearchBox,
+			NumberInput
 		},
 		data() {
 			return {
@@ -141,6 +154,10 @@
 						title: res.message,
 						icon: 'none'
 					})
+					this.val1 = ''
+					this.val2 = ''
+					this.val3 = ''
+					this.val4 = ''
 					this.disabled3 = false
 				} catch (e) {
 					this.disabled3 = false
@@ -159,6 +176,10 @@
 						title: res.message,
 						icon: 'none'
 					})
+					this.val1 = ''
+					this.val2 = ''
+					this.val3 = ''
+					this.val4 = ''
 					this.disabled4 = false
 				} catch (e) {
 					this.disabled4 = false
diff --git a/pages/SecondPhase/production/BoxStock.vue b/pages/SecondPhase/production/BoxStock.vue
index b1d36b8..a8fb423 100644
--- a/pages/SecondPhase/production/BoxStock.vue
+++ b/pages/SecondPhase/production/BoxStock.vue
@@ -28,8 +28,8 @@
 							<tr v-for="(e, i) in dataList" :key="i">
 								<td>{{e.box_no}}</td>
 								<td>{{e.material_code}}</td>
-								<td>{{e.material_name}}</td>
 								<td>{{e.struct_code}}</td>
+								<td>{{e.material_name}}</td>
 							</tr>
 						</tbody>
 					</table>
diff --git a/pages/SecondPhase/production/ManmadeBake.vue b/pages/SecondPhase/production/ManmadeBake.vue
index 35983ae..9122032 100644
--- a/pages/SecondPhase/production/ManmadeBake.vue
+++ b/pages/SecondPhase/production/ManmadeBake.vue
@@ -23,13 +23,24 @@
 				<view class="filter_item">
 					<view class="filter_label">{{$t('filter.temperature')}}</view>
 					<view class="filter_input_wraper">
-						<input type="text" class="filter_input" v-model="val3">
+						<!-- <input type="text" class="filter_input" v-model="val3"> -->
+						<NumberInput
+						v-model="val3"
+						input-class="filter_input"
+						mode="mixed"
+						:decimalLength="3"
+						/>
 					</view>
 				</view>
 				<view class="filter_item">
 					<view class="filter_label">{{$t('filter.time')}}</view>
 					<view class="filter_input_wraper">
-						<input type="text" class="filter_input" v-model="val4">
+						<!-- <input type="text" class="filter_input" v-model="val4"> -->
+						<NumberInput
+						v-model="val4"
+						input-class="filter_input"
+						mode="integer"
+						/>
 					</view>
 				</view>
 				<view class="filter_item">
@@ -53,11 +64,13 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
+	import NumberInput from '@/components/NumberInput.vue'
 	import {handleBakingovenInAndOut, handleBakingcheckConfirm, bakingquery} from '@/utils/getData1.js'
 	export default {
 		components: {
 			NavBar,
-			SearchBox
+			SearchBox,
+			NumberInput
 		},
 		data() {
 			return {
diff --git a/pages/SecondPhase/production/SurfaceProcess.vue b/pages/SecondPhase/production/SurfaceProcess.vue
index b7f4cb7..538c668 100644
--- a/pages/SecondPhase/production/SurfaceProcess.vue
+++ b/pages/SecondPhase/production/SurfaceProcess.vue
@@ -69,6 +69,7 @@
 						title: res.message,
 						icon: 'none'
 					})
+					this.cleanUp()
 				} catch (e) {
 					this.disabled = false
 				}
@@ -82,6 +83,7 @@
 						title: res.message,
 						icon: 'none'
 					})
+					this.cleanUp()
 				} catch (e) {
 					this.disabled = false
 				}
diff --git a/pages/SecondPhase/slitting/CacheCut.vue b/pages/SecondPhase/slitting/CacheCut.vue
index 00c36c3..6c8dfb8 100644
--- a/pages/SecondPhase/slitting/CacheCut.vue
+++ b/pages/SecondPhase/slitting/CacheCut.vue
@@ -135,6 +135,7 @@
 						title: res.message,
 						icon: 'none'
 					})
+					this.clearUp()
 					this.disabled = false
 				} catch (e) {
 					this.disabled = false
diff --git a/pages/SecondPhase/slitting/CallShaft.vue b/pages/SecondPhase/slitting/CallShaft.vue
index 5ebaa8f..efedec0 100644
--- a/pages/SecondPhase/slitting/CallShaft.vue
+++ b/pages/SecondPhase/slitting/CallShaft.vue
@@ -196,6 +196,7 @@
 				try {
 					let res = await forcedFeedShaft(this.index1, deviceT, this.index2, upLT, this.upL, upRT, this.upR, lowLT, this.lowL, lowRT, this.lowR)
 					this.disabled = false
+					this.dataList = []
 					uni.showToast({
 						title: res.message,
 						icon: 'none'
diff --git a/pages/SecondPhase/slitting/DoInitShaft.vue b/pages/SecondPhase/slitting/DoInitShaft.vue
index 2594561..6698e0c 100644
--- a/pages/SecondPhase/slitting/DoInitShaft.vue
+++ b/pages/SecondPhase/slitting/DoInitShaft.vue
@@ -76,6 +76,7 @@
 						title: res.message,
 						icon: 'none'
 					})
+					this.index = ''
 					this.disabled = false
 				} catch (e) {
 					this.disabled = false
diff --git a/pages/SecondPhase/slitting/EmptyAxisReturn.vue b/pages/SecondPhase/slitting/EmptyAxisReturn.vue
index 9b11c76..56133f3 100644
--- a/pages/SecondPhase/slitting/EmptyAxisReturn.vue
+++ b/pages/SecondPhase/slitting/EmptyAxisReturn.vue
@@ -153,6 +153,7 @@
 						title: res.message,
 						icon: 'none'
 					})
+					this.clearUp()
 					this.disabled = false
 				} catch (e) {
 					this.disabled = false
diff --git a/pages/SecondPhase/slitting/PaperBind.vue b/pages/SecondPhase/slitting/PaperBind.vue
index be225dd..e99985b 100644
--- a/pages/SecondPhase/slitting/PaperBind.vue
+++ b/pages/SecondPhase/slitting/PaperBind.vue
@@ -101,6 +101,7 @@
 						title: res.message,
 						icon: 'none'
 					})
+					this.clearUp()
 					this.disabled = false
 				} catch (e) {
 					this.disabled = false
diff --git a/pages/SecondPhase/slitting/ShaftSave.vue b/pages/SecondPhase/slitting/ShaftSave.vue
index 881854d..3beb5f3 100644
--- a/pages/SecondPhase/slitting/ShaftSave.vue
+++ b/pages/SecondPhase/slitting/ShaftSave.vue
@@ -52,6 +52,7 @@
 						title: res.message,
 						icon: 'none'
 					})
+					this.clearUp()
 					this.disabled = false
 				} catch (e) {
 					this.disabled = false
diff --git a/pages/SecondPhase/slitting/StockingArea.vue b/pages/SecondPhase/slitting/StockingArea.vue
index 9546aba..fd06e44 100644
--- a/pages/SecondPhase/slitting/StockingArea.vue
+++ b/pages/SecondPhase/slitting/StockingArea.vue
@@ -64,6 +64,7 @@
 						title: res.message,
 						icon: 'none'
 					})
+					this.clearUp()
 					this.disabled = false
 				} catch (e) {
 					this.disabled = false
@@ -81,6 +82,7 @@
 						title: res.message,
 						icon: 'none'
 					})
+					this.clearUp()
 					this.disabled = false
 				} catch (e) {
 					this.disabled = false
diff --git a/pages/SecondPhase/slitting/SubRollWeight.vue b/pages/SecondPhase/slitting/SubRollWeight.vue
index 14d5eb5..e4e7d08 100644
--- a/pages/SecondPhase/slitting/SubRollWeight.vue
+++ b/pages/SecondPhase/slitting/SubRollWeight.vue
@@ -17,7 +17,13 @@
 						<span class="filter_label">{{$t('filter.chipweight')}}</span>
 					</view>
 					<view class="filter_input_wraper">
-						<input type="number" class="filter_input" v-model="val2">
+						<!-- <input type="number" class="filter_input" v-model="val2"> -->
+						<NumberInput
+						v-model="val2"
+						input-class="filter_input"
+						mode="decimal"
+						:decimalLength="3"
+						/>
 					</view>
 				</view>
 				<view class="filter_item">
@@ -25,7 +31,13 @@
 						<span class="filter_label">{{$t('grid.sub-roll-weight')}}</span>
 					</view>
 					<view class="filter_input_wraper">
-						<input type="number" class="filter_input" v-model="val3">
+						<!-- <input type="number" class="filter_input" v-model="val3"> -->
+						<NumberInput
+						v-model="val3"
+						input-class="filter_input"
+						mode="decimal"
+						:decimalLength="3"
+						/>
 					</view>
 				</view>
 				<view class="msg_item">{{$t('grid.tip')}}：{{obj.tip}}</view>
@@ -41,11 +53,13 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
+	import NumberInput from '@/components/NumberInput.vue'
 	import {doSubRollWeightBindingTip, doSubRollWeightBinding} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
-			SearchBox
+			SearchBox,
+			NumberInput
 		},
 		data() {
 			return {
diff --git a/pages/SecondPhase/slitting/UpperShaftCut.vue b/pages/SecondPhase/slitting/UpperShaftCut.vue
index a03a817..7bef450 100644
--- a/pages/SecondPhase/slitting/UpperShaftCut.vue
+++ b/pages/SecondPhase/slitting/UpperShaftCut.vue
@@ -136,6 +136,7 @@
 						title: res.message,
 						icon: 'none'
 					})
+					this.clearUp()
 					this.disabled = false
 				} catch (e) {
 					this.disabled = false

From 4c926e91fc7b8bb761c7d5bd51f521b956307135 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 24 Jun 2025 16:46:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=94=9F=E7=AE=94=E5=B7=A5=E5=BA=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/SecondPhase/production/SboProcess.vue | 38 +++++----------------
 utils/getData1.js                           |  4 +--
 2 files changed, 10 insertions(+), 32 deletions(-)

diff --git a/pages/SecondPhase/production/SboProcess.vue b/pages/SecondPhase/production/SboProcess.vue
index a3893bc..3b17bd7 100644
--- a/pages/SecondPhase/production/SboProcess.vue
+++ b/pages/SecondPhase/production/SboProcess.vue
@@ -11,8 +11,9 @@
 					</view>
 				</view>
 				<view class="zd-row jccenter mgt20">
-					<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="val1 && type === '2' && disabled4" style="margin-right: 15px" @tap="_rawScrollDowm('2')">{{$t('button.upper-axis')}}</button>
-					<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="val1 && type === '4' && disabled4" @tap="_rawScrollDowm('4')">{{$t('button.lower-axis')}}</button>
+					<button class="zd-col-7 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="val1 && type === '2' && disabled4" style="margin-right: 15px" @tap="_rawScrollDowm('2')">{{$t('button.upper-axis')}}</button>
+					<button class="zd-col-7 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="val1 && type === '4' && disabled4" @tap="_rawScrollDowm('4')">{{$t('button.lower-axis')}}</button>
+					<button class="zd-col-7 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled2" @tap="_confirmBlanking">{{$t('button.ready-to-go')}}</button>
 				</view>
 			</view>
 			<view class="zd_wrapper">
@@ -68,10 +69,8 @@
 			<uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/>
 		</view>
 		<view class="zd-row submitbar">
-			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="disabled2" @tap="_confirmBlanking">{{$t('button.ready-to-go')}}</button>
-			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="disabled3" @tap="_rawStart">{{$t('button.start-work-order')}}</button>
-			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="type === '1' && disabled4" @tap="_rawScrollDowm('1')">{{$t('button.roll-down')}}</button>
-			<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="type === '3' && disabled4" @tap="_rawScrollDowm('3')">{{$t('button.single-volume')}}</button>
+			<button class="zd-col-11 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="type === '1' && disabled4" @tap="_rawScrollDowm('1')">{{$t('button.roll-down')}}</button>
+			<button class="zd-col-11 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="type === '3' && disabled4" @tap="_rawScrollDowm('3')">{{$t('button.single-volume')}}</button>
 		</view>
 		<up-top ref="UT" :scrollTop="top"></up-top>
 	</view>
@@ -81,7 +80,7 @@
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
 	import UpTop from '@/components/upTop.vue'
-	import {queryRawFoilList, createOrder, confirmBlanking, rawStart, rawScrollDowm} from '@/utils/getData1.js'
+	import {queryRawFoilList, createOrder, confirmBlanking, rawScrollDowm} from '@/utils/getData1.js'
 	export default {
 		components: {
 			NavBar,
@@ -161,12 +160,12 @@
 			// 准备就绪
 			async _confirmBlanking () {
 				this.disabled2 = true
-				if (!this.pkId) {
+				if (!this.val1) {
 					this.disabled2 = false
 					return
 				}
 				try {
-					let res = await confirmBlanking(this.pkObj)
+					let res = await confirmBlanking(this.val1)
 					this.disabled2 = false
 					this.pkId = ''
 					this.pkObj = {}
@@ -179,27 +178,6 @@
 					this.disabled2 = false
 				}
 			},
-			// 开始工单
-			async _rawStart () {
-				this.disabled3 = true
-				if (!this.pkId) {
-					this.disabled3 = false
-					return
-				}
-				try {
-					let res = await rawStart(this.pkObj)
-					this.disabled3 = false
-					this.pkId = ''
-					this.pkObj = {}
-					this.searchList()
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled3 = false
-				}
-			},
 			// 正常下卷/单下卷/单上轴/单下轴
 			async _rawScrollDowm (type) {
 				this.disabled4 = true
diff --git a/utils/getData1.js b/utils/getData1.js
index 4dd296b..350fe70 100644
--- a/utils/getData1.js
+++ b/utils/getData1.js
@@ -50,10 +50,10 @@ export const createOrder = (code, name) => request({
 	}
 })
 // 确认下卷-改为：准备就绪
-export const confirmBlanking = (rjo) => request({
+export const confirmBlanking = (code) => request({
 	url: 'api/pda/raw/confirmBlanking',
 	data: {
-		raw_jo: rjo
+		point_code: code
 	}
 })
 // 开始工单