From 336cf4455e755f9b814b98ad929c9e672bc09f57 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 8 Sep 2025 16:45:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/General/distribution-box.vue |  6 +++---
 pages/General/line-transfer.vue    |  4 ++--
 pages/General/machine-order.vue    |  2 +-
 pages/General/material.vue         |  2 +-
 pages/General/pick-place-goods.vue | 18 ++++++++++++------
 pages/General/pt-update.vue        |  4 ++--
 pages/General/supplier.vue         |  2 +-
 pages/General/warehouse-box.vue    |  9 +++++----
 8 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/pages/General/distribution-box.vue b/pages/General/distribution-box.vue
index 492f6e0..8485cea 100644
--- a/pages/General/distribution-box.vue
+++ b/pages/General/distribution-box.vue
@@ -81,7 +81,7 @@
 								<td>{{e.material_spec}}</td>
 								<td>{{e.material_model}}</td>
 								<td>{{e.quality_time_day}}</td>
-								<td>{{['待检', '合格', '不合格'][Number(e.quality_type) - 1]}}</td>
+								<td>{{['', '待检', '合格', '不合格'][Number(e.quality_type)]}}</td>
 								<td>{{e.bake_num}}</td>
 							</tr>
 						</tbody>
@@ -99,8 +99,8 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {queryGroupInfo} from '@/utils/mork2.js'
-	import {deliveryBox} from '@/utils/getData2.js'
+	// import {queryGroupInfo} from '@/utils/mork2.js'
+	import {queryGroupInfo, deliveryBox} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
diff --git a/pages/General/line-transfer.vue b/pages/General/line-transfer.vue
index 466f3bc..7ed949e 100644
--- a/pages/General/line-transfer.vue
+++ b/pages/General/line-transfer.vue
@@ -48,8 +48,8 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {queryVehicleType} from '@/utils/mork2.js'
-	import {createTask} from '@/utils/getData2.js'
+	// import {queryVehicleType} from '@/utils/mork2.js'
+	import {queryVehicleType, createTask} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
diff --git a/pages/General/machine-order.vue b/pages/General/machine-order.vue
index c148dbf..57dc74d 100644
--- a/pages/General/machine-order.vue
+++ b/pages/General/machine-order.vue
@@ -65,7 +65,7 @@
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
 	import {getDate} from '@/utils/utils.js'
-	import {queryBomInfo} from '@/utils/mork2.js'
+	import {queryBomInfo} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
diff --git a/pages/General/material.vue b/pages/General/material.vue
index 6bfdcb6..8a685ff 100644
--- a/pages/General/material.vue
+++ b/pages/General/material.vue
@@ -50,7 +50,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {queryMaterial} from '@/utils/mork2.js'
+	import {queryMaterial} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
diff --git a/pages/General/pick-place-goods.vue b/pages/General/pick-place-goods.vue
index 22dbf01..88ccb5d 100644
--- a/pages/General/pick-place-goods.vue
+++ b/pages/General/pick-place-goods.vue
@@ -73,13 +73,19 @@
 						<tbody>
 							<tr v-for="(e, i) in dataList" :key="i">
 								<td>{{i+1}}</td>
-								<td>{{e.source_form_type}}</td>
-								<td>{{e.source_form_date}}</td>
+								<td>{{e.vehicle_code}}</td>
 								<td>{{e.material_code}}</td>
-								<td>{{e.material_spec}}</td>
+								<td>{{e.material_name}}</td>
 								<td>{{e.pcsn}}</td>
-								<td>{{e.assign_qty}}</td>
 								<td>{{e.qty}}</td>
+								<td>{{e.produce_time}}</td>
+								<td>{{e.supp_code}}</td>
+								<td>{{e.supp_name}}</td>
+								<td>{{['', '待检', '合格', '不合格'][Number(e.quality_type)]}}</td>
+								<td>{{e.bake_num}}</td>
+								<td>{{e.sect_code}}</td>
+								<td>{{e.device_code}}</td>
+								<td>{{e.bom_code}}</td>
 							</tr>
 						</tbody>
 					</table>
@@ -97,8 +103,8 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {queryPointInfo} from '@/utils/mork2.js'
-	import {confirmGet, confirmPut} from '@/utils/getData2.js'
+	// import {queryPointInfo} from '@/utils/mork2.js'
+	import {queryPointInfo, confirmGet, confirmPut} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
diff --git a/pages/General/pt-update.vue b/pages/General/pt-update.vue
index d43cfdb..7b505ac 100644
--- a/pages/General/pt-update.vue
+++ b/pages/General/pt-update.vue
@@ -61,8 +61,8 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {updatePointqueryPointInfo} from '@/utils/mork2.js'
-	import {bindVehicle, clearVehicle, clearMaterial} from '@/utils/getData2.js'
+	// import {updatePointqueryPointInfo} from '@/utils/mork2.js'
+	import {updatePointqueryPointInfo, bindVehicle, clearVehicle, clearMaterial} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
diff --git a/pages/General/supplier.vue b/pages/General/supplier.vue
index c4e598b..c71d908 100644
--- a/pages/General/supplier.vue
+++ b/pages/General/supplier.vue
@@ -44,7 +44,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {querySupp} from '@/utils/mork2.js'
+	import {querySupp} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
diff --git a/pages/General/warehouse-box.vue b/pages/General/warehouse-box.vue
index 79281d8..55bb110 100644
--- a/pages/General/warehouse-box.vue
+++ b/pages/General/warehouse-box.vue
@@ -113,8 +113,8 @@
 	import SearchBox from '@/components/SearchBox.vue'
 	import {getDate} from '@/utils/utils.js'
 	const currentDate = getDate({format: true})
-	import {queryGroupQuality, queryBoxType} from '@/utils/mork2.js'
-	import {confirmBox} from '@/utils/getData2.js'
+	// import {queryGroupQuality, queryBoxType} from '@/utils/mork2.js'
+	import {queryGroupQuality, queryBoxType, confirmBox} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -226,7 +226,7 @@
 				}
 			},
 			labelPrint () {
-				this.disabled = true
+				this.disabled1 = true
 				let data = Object.assign({}, this.materialData, this.suppData, {pcsn: this.pcsn, produce_time: this.date, bake_num: this.num})
 				this.toPrint(data)
 			},
@@ -240,7 +240,7 @@
 						icon: 'none',
 						duration: 5000
 					})
-					this.disabled = false
+					this.disabled1 = false
 				    return
 				}
 				LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮
@@ -272,6 +272,7 @@
 					title: '打印成功',
 					icon: 'none'
 				})
+				this.disabled1 = false
 			}
 		}
 	}