From 23403350e547605e22b13b9dd5e126a6f78e5fe8 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Thu, 26 Jun 2025 10:50:20 +0800
Subject: [PATCH] change

---
 pages/SecondPhase/slitting/SlittingFeeding.vue | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/pages/SecondPhase/slitting/SlittingFeeding.vue b/pages/SecondPhase/slitting/SlittingFeeding.vue
index 9a08cfa..929b3b4 100644
--- a/pages/SecondPhase/slitting/SlittingFeeding.vue
+++ b/pages/SecondPhase/slitting/SlittingFeeding.vue
@@ -39,6 +39,7 @@
 						<thead>
 							<tr>
 								<th>{{$t('grid.number')}}</th>
+								<th>{{$t('grid.status')}}</th>
 								<th class="th_2">{{$t('grid.mother-roll-number')}}</th>
 								<th>{{$t('grid.sub-roll-number')}}</th>
 								<th>{{$t('grid.jtcode')}}</th>
@@ -58,6 +59,7 @@
 						<tbody>
 							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.container_name === pkId}">
 								<td>{{Number(i) + 1}}</td>
+								<td>{{e.status}}</td>
 								<td class="td_2">{{e.source_container_name}}</td>
 								<td>{{e.container_name}}</td>
 								<td>{{e.point_code}}</td>
@@ -131,7 +133,8 @@
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
 	import UpTop from '@/components/upTop.vue'
-	import {queryProductArea, feedingQueryMaterialInfo, feedingConfirm, feedingQueryPoint, feedingHandleConfirm, feedingVehicleReturn, feedinghandleConfirm} from '@/utils/getData2.js'
+	import {queryProductArea, feedingQueryMaterialInfo, feedingConfirm, feedingQueryPoint, feedingVehicleReturn} from '@/utils/getData2.js'
+	import {feedinghandleConfirm} from '@/utils/getData4.js'
 	export default {
 		components: {
 			NavBar,
@@ -221,6 +224,7 @@
 			},
 			/** 人工呼叫-改直接调用 */
 			async manCall () {
+				console.log(this.disabled, this.pkId, 666)
 				this.disabled = true
 				if (!this.pkId) {
 					this.disabled = false
@@ -230,6 +234,8 @@
 					let res = await feedinghandleConfirm(this.pkObj)
 					this.disabled = false
 					this.pkId = ''
+					this.pkObj = {}
+					this.clearUp()
 					this.searchList()
 					uni.showToast({
 						title: res.message,
@@ -250,6 +256,8 @@
 					let res = await feedingConfirm(this.pkObj)
 					this.disabled = false
 					this.pkId = ''
+					this.pkObj = {}
+					this.clearUp()
 					this.searchList()
 					uni.showToast({
 						title: res.message,
@@ -316,6 +324,7 @@
 					this.val4 = ''
 					this.val5 = ''
 					this.pkId = ''
+					this.clearUp()
 					this.searchList()
 					uni.showToast({
 						title: res.message,
@@ -342,6 +351,7 @@
 					this.active = false
 					this.val1 = ''
 					this.pkId = ''
+					this.clearUp()
 					this.searchList()
 					uni.showToast({
 						title: res.message,
@@ -351,6 +361,11 @@
 					this.disabled2 = false
 				}
 			},
+			clearUp () {
+				this.index = ''
+				this.val1 = ''
+				this.val2 = ''
+			}
 		}
 	}
 </script>
\ No newline at end of file