From 006130b4b71fcca9d755d8a72e723185f83d014b Mon Sep 17 00:00:00 2001
From: zc <jingyun1127@outlook.com>
Date: Fri, 6 Mar 2026 16:29:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/weightManage/index.vue | 6 +++++-
 src/views/workOrder/index.vue    | 7 ++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/views/weightManage/index.vue b/src/views/weightManage/index.vue
index 358f520..1a4a553 100644
--- a/src/views/weightManage/index.vue
+++ b/src/views/weightManage/index.vue
@@ -497,6 +497,10 @@ const handleConfirm = () => {
     Message.error('请输入数量')
     return
   }
+  if (!ahDeviceWeight.value || ahDeviceWeight.value.trim() === '') {
+    Message.error('电子秤称重结果为空！')
+    return
+  }
   
   // 生成新的列表数据
   const newItem = {
@@ -512,7 +516,7 @@ const handleConfirm = () => {
   weighingList.value.push(newItem)
   // 重置输入
   inputQuantity.value = ''
-  ahDeviceWeight.value = ''
+  ahDeviceWeight.value = '10'
   calculatedWeight.value = ''
   // 称重次数累加
   weighingCount.value = weighingList.value.length + 1
diff --git a/src/views/workOrder/index.vue b/src/views/workOrder/index.vue
index 5ab2035..5903c5c 100644
--- a/src/views/workOrder/index.vue
+++ b/src/views/workOrder/index.vue
@@ -18,7 +18,7 @@
       <template #toolbar-left>
         <a-input-search v-model="queryForm.userName" placeholder="请输入姓名" allow-clear @search="search" />
         <a-input-search v-model="queryForm.carNo" placeholder="请输入人员卡号" allow-clear @search="search" />
-	      <a-input-search v-model="queryForm.orderNo" placeholder="请输入订单号" allow-clear @search="search" />
+	      <a-input-search v-model="queryForm.orderNo" placeholder="请输入任务工单号" allow-clear @search="search" />
         <a-input-search v-model="queryForm.materialName" placeholder="请输入物料名称" allow-clear @search="search" />
         <a-input-search v-model="queryForm.encoding" placeholder="请输入物料编码" allow-clear @search="search" />
         <a-date-picker
@@ -160,9 +160,10 @@ const processColumns = (columns: TableInstanceColumns[]): TableInstanceColumns[]
 
 // 定义列配置，使用工具函数处理
 const columns = ref<TableInstanceColumns[]>(processColumns([
-  { title: '创建人', dataIndex: 'createUserString' },
-  { title: '卡号', dataIndex: 'cardNo' },
   { title: '标题', dataIndex: 'title', width: 180 },
+  { title: '创建人', dataIndex: 'createUserString' },
+  { title: '人员卡号', dataIndex: 'cardNo' },
+  { title: '任务工单号', dataIndex: 'orderNo' },
   { title: '物料图片', dataIndex: 'photoUrl', slotName: 'photoUrl', minWidth: 180, ellipsis: true, tooltip: true },
   { title: '物料名称', dataIndex: 'materialName' },
   { title: '物料编码', dataIndex: 'encoding' },