优化

src/apis/workOrder/workOrder.ts

@@ -12,10 +12,12 @@ export interface WorkOrderResp {
   materialSpec: string
   photoUrl: string
   totalWeight: string
+  totalCalculatedWeight: string
   totalCount: string
   createUserString: string
   updateUserString: string
   matchResult: string
+  workOrderInfos: Array<WorkOrderInfoResp>
 }
 
 export interface WorkOrderInfoResp {
@@ -46,9 +48,14 @@ export function listWorkOrder(query: WorkOrderPageQuery) {
   return http.get<PageRes<WorkOrderResp[]>>(`${BASE_URL}`, query)
 }
 
+/** @desc 查询工作订单详情 */
+export function getWorkOrderInfos(id: string) {
+  return http.get<Array<WorkOrderInfoResp>>(`${BASE_URL}/info/${id}`)
+}
+
 /** @desc 查询工作订单详情 */
 export function getWorkOrder(id: string) {
-  return http.get<Array<WorkOrderInfoResp>>(`${BASE_URL}/${id}`)
+  return http.get<WorkOrderResp>(`${BASE_URL}/${id}`)
 }
 
 /** @desc 新增工作订单 */

src/views/barcodePrint/index.vue

@@ -9,17 +9,17 @@
           <div class="form-grid">
             <div class="form-grid-item">
               <a-form-item label="物料名称">
-                <a-input v-model="formData.materialName" placeholder="请输入物料名称" :disabled="isFromWorkOrder" />
+                <a-input v-model="formData.materialName" placeholder="未获取到物料名称" :disabled="true" />
               </a-form-item>
             </div>
             <div class="form-grid-item">
               <a-form-item label="物料编码">
-                <a-input v-model="formData.encoding" placeholder="请输入物料编码" :disabled="isFromWorkOrder" />
+                <a-input v-model="formData.encoding" placeholder="未获取到物料编码" :disabled="true" />
               </a-form-item>
             </div>
             <div class="form-grid-item">
               <a-form-item label="工单编号">
-                <a-input v-model="formData.orderNo" placeholder="请输入工单编号" :disabled="isFromWorkOrder" />
+                <a-input v-model="formData.orderNo" placeholder="未获取到工单编号" :disabled="true" />
               </a-form-item>
             </div>
             <div class="form-grid-item">
@@ -62,13 +62,13 @@
                 </td>
                 <td class="label-cell">
                   <div class="label-field">数量</div>
-                  <div class="label-value">{{ labelData.quantity }}</div>
+                  <div class="label-value">{{ labelData.totalCount }}</div>
                 </td>
               </tr>
               <tr>
                 <td class="label-cell">
                   <div class="label-field">标重(kg)</div>
-                  <div class="label-value">{{ labelData.standardWeight }}</div>
+                  <div class="label-value">{{ labelData.totalCalculatedWeight }}</div>
                 </td>
                 <td class="label-cell">
                   <div class="label-field">包装签字</div>
@@ -78,19 +78,13 @@
               <tr>
                 <td class="label-cell">
                   <div class="label-field">实重(kg)</div>
-                  <div class="label-value">{{ labelData.actualWeight || '' }}</div>
+                  <div class="label-value">{{ labelData.totalWeight || '' }}</div>
                 </td>
                 <td class="label-cell">
                   <div class="label-field">检验签字</div>
                   <div class="label-value">{{ labelData.inspectionSignature || '' }}</div>
                 </td>
               </tr>
-<!--              <tr>-->
-<!--                <td class="label-cell" colspan="2"></td>-->
-<!--                <td class="label-cell qr-cell">-->
-<!--                  <div class="serial-number">序号: {{ labelData.serialNumber }}</div>-->
-<!--                </td>-->
-<!--              </tr>-->
             </table>
           </div>
         </div>
@@ -106,80 +100,71 @@
 import { ref, reactive, nextTick, onMounted } from 'vue'
 import { Message } from '@arco-design/web-vue'
 import { useRoute } from 'vue-router'
+import {getWorkOrder} from "@/apis/workOrder/workOrder";
 
 const route = useRoute()
 
 // 表单数据
 const formData = reactive({
+  workerOrderId: '',
   encoding: '',
   materialName: '',
   orderNo: '',
+  totalCalculatedWeight: '',
+  totalWeight: '',
+  totalCount: '',
   productionBatch: ''
 })
 
-// 是否是从工单页面跳转过来的
-const isFromWorkOrder = ref(false)
-
 // 标签数据
 const labelData = reactive({
   partName: '',
   partNumber: '',
-  standardWeight: '',
+  totalCalculatedWeight: '',
-  actualWeight: '',
+  totalWeight: '',
   productionDate: '',
-  quantity: '',
+  totalCount: '',
   packingSignature: '',
   inspectionSignature: '',
-  serialNumber: '',
   qrCodeData: '',
 })
 
 // 标签容器引用
 const labelContainer = ref<HTMLElement | null>(null)
 
-// 模拟获取标签数据的接口
-const fetchLabelData = async (params: any) => {
-  // 模拟后端接口延迟
-  return new Promise((resolve) => {
-    setTimeout(() => {
-      // 格式化生产日期为 yyyyMMddHHmm 格式
-      const now = new Date()
-      const formattedDate = now.getFullYear().toString() + 
-        String(now.getMonth() + 1).padStart(2, '0') + 
-        String(now.getDate()).padStart(2, '0') + 
-        String(now.getHours()).padStart(2, '0') + 
-        String(now.getMinutes()).padStart(2, '0')
-      
-      // 模拟返回数据
-      const mockData = {
-        partName: params.materialName || 'PP0449002护套',
-        partNumber: params.encoding || 'PP0449002',
-        standardWeight: '0.39500',
-        actualWeight: '',
-        productionDate: formattedDate,
-        quantity: '200',
-        packingSignature: '',
-        inspectionSignature: '',
-        serialNumber: '4',
-        qrCodeData: `PART:${params.encoding || 'PP0449002'},NAME:${params.materialName || 'PP0449002护套'},DATE:${formattedDate},QTY:200`,
-      }
-      resolve(mockData)
-    }, 500)
-  })
-}
-
 // 生成标签
 const generateLabel = async () => {
-  
   if (!formData.productionBatch) {
     Message.error('请输入生产批次')
     return
   }
+  if (!formData.materialName) {
+    Message.error('未获取到物料信息')
+    return
+  }
   
   try {
-    // 获取标签数据
+    // 格式化生产日期为 yyyyMMddHHmm 格式
-    const result = await fetchLabelData(formData)
+    const now = new Date()
-    Object.assign(labelData, result)
+    const formattedDate = now.getFullYear().toString() + 
+      String(now.getMonth() + 1).padStart(2, '0') + 
+      String(now.getDate()).padStart(2, '0') + 
+      String(now.getHours()).padStart(2, '0') + 
+      String(now.getMinutes()).padStart(2, '0')
+    
+    // 直接从 formData 中获取数据
+    Object.assign(labelData, {
+      partName: formData.materialName || '',
+      partNumber: formData.encoding || '',
+      totalCalculatedWeight: formData.totalCalculatedWeight || '',
+      totalWeight: formData.totalWeight || '',
+      productionDate: formattedDate,
+      totalCount: formData.totalCount || '',
+      packingSignature: '',
+      inspectionSignature: '',
+      qrCodeData: `PART:${formData.encoding || 'PP0449002'},NAME:${formData.materialName || 'PP0449002护套'},DATE:${formattedDate},QTY:200`,
+    })
+    
     Message.success('标签生成成功')
   } catch (error) {
     console.error('生成标签失败:', error)
@@ -190,16 +175,23 @@ const generateLabel = async () => {
 // 组件挂载时，检查是否有参数传递
 onMounted(() => {
   // 从路由参数中获取数据
-  const materialName = route.query.materialName as string
+  const workerOrderId = route.query.workerOrderId as string
-  const encoding = route.query.encoding as string
-  const orderNo = route.query.orderNo as string
-  
   // 如果有参数传递，设置表单数据并标记为不可修改
-  if (materialName && encoding && orderNo) {
+  if (workerOrderId) {
-    formData.materialName = materialName
+    formData.workerOrderId = workerOrderId
-    formData.encoding = encoding
+    getWorkOrder(workerOrderId).then(res => {
-    formData.orderNo = orderNo
+      if (res.code == '0') {
-    isFromWorkOrder.value = true
+        formData.encoding = res.data.encoding
+        formData.materialName = res.data.materialName
+        formData.orderNo = res.data.orderNo
+        formData.totalCalculatedWeight = res.data.totalCalculatedWeight
+        formData.totalWeight = res.data.totalWeight
+        formData.totalCount = res.data.totalCount
+
+      } else {
+        Message.error('获取详情失败')
+      }
+    });
 
     // 自动生成标签
     generateLabel()

src/views/login/components/card/index.vue

@@ -20,7 +20,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, reactive, onMounted } from 'vue'
+import { ref, reactive, onMounted, onUnmounted } from 'vue'
 import { type FormInstance, Message } from '@arco-design/web-vue'
 import { useTabsStore, useUserStore } from '@/stores'
 
@@ -42,12 +42,24 @@ const loading = ref(false)
 
 // 登录
 const handleLogin = async () => {
+  // 检查用户是否已经登录
+  if (userStore.token) {
+    return
+  }
+  
   const isInvalid = await formRef.value?.validate()
   if (isInvalid) return
   try {
     loading.value = true
     // 调用后端接口校验卡号
     await userStore.cardLogin(form)
+    
+    // 登录成功后移除事件监听器
+    if (keyDownListener) {
+      document.removeEventListener('keydown', keyDownListener)
+      keyDownListener = null
+    }
+    
     tabsStore.reset()
     const { redirect, ...othersQuery } = router.currentRoute.value.query
     await router.push({
@@ -64,24 +76,30 @@ const handleLogin = async () => {
   }
 }
 
+// 键盘事件监听器引用
+let keyDownListener: ((e: KeyboardEvent) => void) | null = null
+
 // 监听键盘输入，实现自动识别卡号
 onMounted(() => {
-  // 监听全局键盘事件，用于识别刷卡输入
+  // 只监听Enter键，用于自动登录
-  document.addEventListener('keydown', (e) => {
+  keyDownListener = (e) => {
     // 刷卡器通常会快速输入卡号并以Enter键结束
     if (e.key === 'Enter') {
       // 遇到Enter键，尝试登录
       if (form.cardNumber.trim()) {
         handleLogin()
       }
-    } else if (e.key.length === 1 && !e.ctrlKey && !e.altKey && !e.metaKey) {
-      // 只捕获单个字符的按键，忽略控制键和功能键
-      form.cardNumber += e.key
-    } else if (e.key === 'Backspace') {
-      // 处理退格键
-      form.cardNumber = form.cardNumber.slice(0, -1)
     }
-  })
+  }
+  
+  document.addEventListener('keydown', keyDownListener)
+})
+
+// 组件卸载时移除事件监听器
+onUnmounted(() => {
+  if (keyDownListener) {
+    document.removeEventListener('keydown', keyDownListener)
+  }
 })
 </script>
 

src/views/weightManage/index.vue

@@ -792,7 +792,7 @@ const calculateWeight = () => {
 
 
 // 处理确定
-const handleConfirm = () => {
+const handleConfirm =  () => {
   // 校验输入数量是否为空
   if (!inputQuantity.value || inputQuantity.value.trim() === '') {
     Message.error('请输入数量')
@@ -803,6 +803,12 @@ const handleConfirm = () => {
     return
   }
 
+  // 2. 抓拍当前画面
+  let captureUrl = ''
+  if (cameraVideo.value && cameraStatus.value === 'connected') {
+    captureUrl =  capturePhoto();
+  }
+
   // 生成新的列表数据
   const newItem = {
     key: (weighingList.value.length + 1).toString(),
@@ -825,7 +831,7 @@ const handleConfirm = () => {
 }
 
 // 抓拍功能 - 内部方法，不暴露按钮
-const capturePhoto = async (): Promise<string> => {
+const capturePhoto = (): Promise<string> => {
   return new Promise(async (resolve, reject) => {
     try {
       const video = cameraVideo.value
@@ -852,7 +858,7 @@ const capturePhoto = async (): Promise<string> => {
 
       // 调用后端接口
       const response = await catchPhoto(formData)
-      if (!response.code === '200') {
+      if (response.code !== '200') {
         reject(new Error('上传失败'))
         return
       }

src/views/workOrder/index.vue

@@ -117,7 +117,7 @@ import {Message} from "@arco-design/web-vue";
 import { useRouter } from 'vue-router';
 import {
   deleteWorkOrder,
-  exportWorkOrder, getWorkOrder,
+  exportWorkOrder, getWorkOrderInfos,
   listWorkOrder,
   type WorkOrderQuery,
   type WorkOrderResp
@@ -218,7 +218,7 @@ const onDetail = async (record: WorkOrderResp) => {
   detailModalVisible.value = true
   detailData.value = []
 
-  getWorkOrder(record.id).then(res => {
+  getWorkOrderInfos(record.id).then(res => {
     if (res.code == '0') {
       detailData.value = res.data;
       detailLoading.value = false
@@ -258,9 +258,7 @@ const onPrint = (record: WorkOrderResp) => {
   router.push({
     path: '/print',
     query: {
-      materialName: record.materialName,
+      workerOrderId: record.id,
-      encoding: record.encoding,
-      orderNo: record.orderNo
     }
   })
 }