优化

# Conflicts:
#	src/views/weightManage/index.vue

package-lock.json

@@ -28,6 +28,7 @@
         "crypto-js": "^4.2.0",
         "dayjs": "^1.11.4",
         "echarts": "^5.4.2",
+        "flv.js": "^1.6.2",
         "jsencrypt": "^3.3.2",
         "lint-staged": "^15.2.10",
         "lodash-es": "^4.17.21",
@@ -765,7 +766,6 @@
     },
     "node_modules/@clack/prompts/node_modules/is-unicode-supported": {
       "version": "1.3.0",
-      "extraneous": true,
       "inBundle": true,
       "license": "MIT",
       "engines": {
@@ -6560,6 +6560,12 @@
         "es6-symbol": "^3.1.1"
       }
     },
+    "node_modules/es6-promise": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmmirror.com/es6-promise/-/es6-promise-4.2.8.tgz",
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
+      "license": "MIT"
+    },
     "node_modules/es6-symbol": {
       "version": "3.1.4",
       "resolved": "https://registry.npmmirror.com/es6-symbol/-/es6-symbol-3.1.4.tgz",
@@ -8254,6 +8260,16 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/flv.js": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmmirror.com/flv.js/-/flv.js-1.6.2.tgz",
+      "integrity": "sha512-xre4gUbX1MPtgQRKj2pxJENp/RnaHaxYvy3YToVVCrSmAWUu85b9mug6pTXF6zakUjNP2lFWZ1rkSX7gxhB/2A==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "es6-promise": "^4.2.8",
+        "webworkify-webpack": "^2.1.5"
+      }
+    },
     "node_modules/follow-redirects": {
       "version": "1.15.9",
       "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.9.tgz",
@@ -16043,6 +16059,12 @@
         "node": ">=4.0"
       }
     },
+    "node_modules/webworkify-webpack": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmmirror.com/webworkify-webpack/-/webworkify-webpack-2.1.5.tgz",
+      "integrity": "sha512-2akF8FIyUvbiBBdD+RoHpoTbHMQF2HwjcxfDvgztAX5YwbZNyrtfUMgvfgFVsgDhDPVTlkbb5vyasqDHfIDPQw==",
+      "license": "MIT"
+    },
     "node_modules/which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmmirror.com/which/-/which-2.0.2.tgz",

package.json

@@ -34,6 +34,7 @@
     "crypto-js": "^4.2.0",
     "dayjs": "^1.11.4",
     "echarts": "^5.4.2",
+    "flv.js": "^1.6.2",
     "jsencrypt": "^3.3.2",
     "lint-staged": "^15.2.10",
     "lodash-es": "^4.17.21",

src/apis/material/materialInfo.ts

@@ -1,12 +1,12 @@
 import http from '@/utils/http'
 
-const BASE_URL = '/admin/meterialInfo'
+const BASE_URL = '/admin/materialInfo'
 
-export interface MeterialInfoResp {
+export interface MaterialInfoResp {
   materialName: string
   encoding: string
   unitWeight: string
-  maxWeight: string
+  materialSpec: string
   photoUrl: string
   createUser: string
   createTime: string
@@ -19,16 +19,33 @@ export interface MaterialInfoQuery {
   encoding: string | undefined
   sort: Array<string>
 }
+
+/* 物料信息导入结果类型 */
+export interface MaterialImportResp {
+  importKey: string
+  totalRows: number
+  validRows: number
+  duplicateNameRows: number
+  duplicateCodeRows: number
+}
 export interface MaterialInfoPageQuery extends MaterialInfoQuery, PageQuery {}
 
 /** @desc 查询物料信息列表 */
 export function listMaterialInfo(query: MaterialInfoPageQuery) {
-  return http.get<PageRes<MeterialInfoResp[]>>(`${BASE_URL}`, query)
+  return http.get<PageRes<MaterialInfoResp[]>>(`${BASE_URL}`, query)
+}
+
+interface MaterialInfoDetailResp {
+}
+
+/** @desc 下载物料信息导入模板 */
+export function downloadMaterialInfoImportTemplate() {
+  return http.download(`${BASE_URL}/import/template`)
 }
 
 /** @desc 查询物料信息详情 */
 export function getMaterialInfo(id: string) {
-  return http.get<MeterialInfoDetailResp>(`${BASE_URL}/${id}`)
+  return http.get<MaterialInfoDetailResp>(`${BASE_URL}/${id}`)
 }
 
 /** @desc 新增物料信息 */
@@ -47,6 +64,26 @@ export function deleteMaterialInfo(id: string) {
 }
 
 /** @desc 导出物料信息 */
-export function exportMaterialInfo(query: MeterialInfoQuery) {
+export function exportMaterialInfo(query: MaterialInfoQuery) {
   return http.download(`${BASE_URL}/export`, query)
 }
+
+/** @desc 解析物料信息导入数据 */
+export function parseImportMaterial(data: FormData) {
+  return http.post(`${BASE_URL}/import/parse`, data)
+}
+
+/** @desc 导入物料信息 */
+export function importMaterial(data: any) {
+  return http.post(`${BASE_URL}/import`, data)
+}
+
+/** @desc 物料照片批量导入数据 */
+export function uploadMaterialPhotos(data: FormData) {
+  return http.post(`${BASE_URL}/import/uploadMaterialPhotos`, data)
+}
+
+/** @desc 物料照片抓取数据 */
+export function catchPhoto(data: FormData) {
+  return http.post(`${BASE_URL}/import/catch`, data)
+}

src/apis/weightManage/weightManage.ts

@@ -1,6 +1,6 @@
 import http from '@/utils/http'
 
-const BASE_URL = '/weighManage/material'
+const BASE_URL = '/weighManage/workOrder'
 
 export interface WeighManageResp {
   id: string
@@ -21,7 +21,17 @@ export function getMaterialDetail(code: string) {
   return http.get<WeighManageResp>(`/admin/materialInfo/code/${code}`)
 }
 
-/** @desc 新增人员管理 */
+/** @desc 校验称重信息 */
-export function addPeople(data: any) {
+export function validateWeighing(data: any) {
-  return http.post(`${BASE_URL}`, data)
+  return http.post(`${BASE_URL}/validateWeighing`, data)
+}
+
+/** @desc 校验称重信息 */
+export function vmSend(code: string) {
+  return http.get<WeighManageResp>(`/vm/send?msg=${code}`)
+}
+
+/** @desc 获取图片 */
+export function getImg() {
+  return http.get<string>(`/vm/latest-photo`)
 }

src/apis/workOrder/workOrder.ts

@@ -0,0 +1,75 @@
+import http from '@/utils/http'
+
+const BASE_URL = '/weighManage/workOrder'
+
+export interface WorkOrderResp {
+  id: string
+  title: string
+  orderNo: string
+  materialName: string
+  encoding: string
+  unitWeight: string
+  materialSpec: string
+  photoUrl: string
+  totalWeight: string
+  totalCalculatedWeight: string
+  totalCount: string
+  createUserString: string
+  updateUserString: string
+  matchResult: string
+  workOrderInfos: Array<WorkOrderInfoResp>
+  qrCodeData: string
+}
+
+export interface WorkOrderInfoResp {
+  id: string
+  workOrderId: string
+  materialId: string
+  weightTime: string
+  quantity: string
+  weight: string
+  imgUrl: string
+  calculatedWeight: string
+}
+
+export interface WorkOrderQuery {
+  orderNo: string | undefined
+  materialName: string | undefined
+  encoding: string | undefined
+  userName: string | undefined
+  carNo: string | undefined
+  startDate: string | undefined
+  endDate: string | undefined
+  sort: Array<string>
+}
+export interface WorkOrderPageQuery extends WorkOrderQuery, PageQuery {}
+
+/** @desc 查询工作订单列表 */
+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<WorkOrderResp>(`${BASE_URL}/${id}`)
+}
+
+/** @desc 新增工作订单 */
+export function addWorkOrder(data: any) {
+  return http.post(`${BASE_URL}`, data)
+}
+
+/** @desc 删除工作订单 */
+export function deleteWorkOrder(ids: string | Array<string>) {
+  return http.del(`${BASE_URL}/${ids}`)
+}
+
+/** @desc 导出工作订单 */
+export function exportWorkOrder(query: WorkOrderQuery) {
+  return http.download(`${BASE_URL}/export`, query)
+}

src/types/components.d.ts

@@ -13,10 +13,10 @@ declare module 'vue' {
     ABreadcrumb: typeof import('@arco-design/web-vue')['Breadcrumb']
     ABreadcrumbItem: typeof import('@arco-design/web-vue')['BreadcrumbItem']
     AButton: typeof import('@arco-design/web-vue')['Button']
-    ACard: typeof import('@arco-design/web-vue')['Card']
     ACheckbox: typeof import('@arco-design/web-vue')['Checkbox']
     ACol: typeof import('@arco-design/web-vue')['Col']
     AConfigProvider: typeof import('@arco-design/web-vue')['ConfigProvider']
+    ADatePicker: typeof import('@arco-design/web-vue')['DatePicker']
     ADescriptions: typeof import('@arco-design/web-vue')['Descriptions']
     ADescriptionsItem: typeof import('@arco-design/web-vue')['DescriptionsItem']
     ADivider: typeof import('@arco-design/web-vue')['Divider']
@@ -35,17 +35,14 @@ declare module 'vue' {
     AInputPassword: typeof import('@arco-design/web-vue')['InputPassword']
     AInputSearch: typeof import('@arco-design/web-vue')['InputSearch']
     ALayout: typeof import('@arco-design/web-vue')['Layout']
-    ALayoutContent: typeof import('@arco-design/web-vue')['LayoutContent']
     ALayoutHeader: typeof import('@arco-design/web-vue')['LayoutHeader']
     ALayoutSider: typeof import('@arco-design/web-vue')['LayoutSider']
     ALink: typeof import('@arco-design/web-vue')['Link']
     AMenu: typeof import('@arco-design/web-vue')['Menu']
     AMenuItem: typeof import('@arco-design/web-vue')['MenuItem']
     AModal: typeof import('@arco-design/web-vue')['Modal']
-    AOption: typeof import('@arco-design/web-vue')['Option']
     AOverflowList: typeof import('@arco-design/web-vue')['OverflowList']
     APagination: typeof import('@arco-design/web-vue')['Pagination']
-    APopconfirm: typeof import('@arco-design/web-vue')['Popconfirm']
     APopover: typeof import('@arco-design/web-vue')['Popover']
     AProgress: typeof import('@arco-design/web-vue')['Progress']
     ARadio: typeof import('@arco-design/web-vue')['Radio']
@@ -55,6 +52,7 @@ declare module 'vue' {
     AScrollbar: typeof import('@arco-design/web-vue')['Scrollbar']
     ASelect: typeof import('@arco-design/web-vue')['Select']
     ASpace: typeof import('@arco-design/web-vue')['Space']
+    ASpin: typeof import('@arco-design/web-vue')['Spin']
     AStatistic: typeof import('@arco-design/web-vue')['Statistic']
     ASubMenu: typeof import('@arco-design/web-vue')['SubMenu']
     ASwitch: typeof import('@arco-design/web-vue')['Switch']
@@ -63,10 +61,8 @@ declare module 'vue' {
     ATabs: typeof import('@arco-design/web-vue')['Tabs']
     ATag: typeof import('@arco-design/web-vue')['Tag']
     ATooltip: typeof import('@arco-design/web-vue')['Tooltip']
-    ATree: typeof import('@arco-design/web-vue')['Tree']
     ATreeSelect: typeof import('@arco-design/web-vue')['TreeSelect']
     ATypographyParagraph: typeof import('@arco-design/web-vue')['TypographyParagraph']
-    ATypographyTitle: typeof import('@arco-design/web-vue')['TypographyTitle']
     AUpload: typeof import('@arco-design/web-vue')['Upload']
     Avatar: typeof import('./../components/Avatar/index.vue')['default']
     AWatermark: typeof import('@arco-design/web-vue')['Watermark']

src/views/barcodePrint/index.vue

@@ -0,0 +1,484 @@
+<template>
+  <div class="gi_page">
+    <div class="container">
+      <h2 class="page-title">标签打印</h2>
+      
+      <!-- 标签参数设置 -->
+      <div class="form-section">
+        <a-form :model="formData" layout="vertical">
+          <div class="form-grid">
+            <div class="form-grid-item">
+              <a-form-item label="物料名称">
+                <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="true" />
+              </a-form-item>
+            </div>
+            <div class="form-grid-item">
+              <a-form-item label="工单编号">
+                <a-input v-model="formData.orderNo" placeholder="未获取到工单编号" :disabled="true" />
+              </a-form-item>
+            </div>
+            <div class="form-grid-item">
+              <a-form-item label="生产批次" required>
+                <a-input v-model="formData.productionBatch" placeholder="请输入生产批次" />
+              </a-form-item>
+            </div>
+          </div>
+          <div class="form-actions">
+            <a-button type="primary" @click="generateLabel" :disabled="!formData.productionBatch">生成标签</a-button>
+          </div>
+        </a-form>
+      </div>
+      
+      <!-- 标签预览 -->
+      <div v-if="labelData.partName" class="label-preview-section">
+<!--      <div  class="label-preview-section">-->
+        <h3>标签预览</h3>
+        <div class="label-container" ref="labelContainer">
+          <div class="label" v-for="index in 1" :key="index">
+            <table class="label-table">
+              <tr>
+                <td class="label-cell">
+                  <div class="label-row">
+                    <div class="label-field">零件名称</div>
+                    <div class="label-value">{{ labelData.partName }}</div>
+                  </div>
+                </td>
+                <td class="label-cell">
+                  <div class="label-row">
+                    <div class="label-field">生产日期</div>
+                    <div class="label-value">{{ labelData.productionDate }}</div>
+                  </div>
+                </td>
+                <td class="label-cell qr-cell" rowspan="4">
+                  <div class="qr-code">
+                    <img :src="`https://api.qrserver.com/v1/create-qr-code/?size=120x120&data=${encodeURIComponent(labelData.qrCodeData)}`" alt="QR Code" />
+                  </div>
+                </td>
+              </tr>
+              <tr>
+                <td class="label-cell">
+                  <div class="label-row">
+                    <div class="label-field">零件号</div>
+                    <div class="label-value">{{ labelData.partNumber }}</div>
+                  </div>
+                </td>
+                <td class="label-cell">
+                  <div class="label-row">
+                    <div class="label-field">数量</div>
+                    <div class="label-value">{{ labelData.totalCount }}</div>
+                  </div>
+                </td>
+              </tr>
+              <tr>
+                <td class="label-cell">
+                  <div class="label-row">
+                    <div class="label-field">标重(kg)</div>
+                    <div class="label-value">{{ labelData.totalCalculatedWeight }}</div>
+                  </div>
+                </td>
+                <td class="label-cell">
+                  <div class="label-row">
+                    <div class="label-field">包装签字</div>
+                    <div class="label-value">{{ labelData.packingSignature || '' }}</div>
+                  </div>
+                </td>
+              </tr>
+              <tr>
+                <td class="label-cell">
+                  <div class="label-row">
+                    <div class="label-field">实重(kg)</div>
+                    <div class="label-value">{{ labelData.totalWeight || '' }}</div>
+                  </div>
+                </td>
+                <td class="label-cell">
+                  <div class="label-row">
+                    <div class="label-field">检验签字</div>
+                    <div class="label-value">{{ labelData.inspectionSignature || '' }}</div>
+                  </div>
+                </td>
+              </tr>
+            </table>
+          </div>
+        </div>
+        <div class="label-actions">
+          <a-button type="primary" @click="printLabel">打印标签</a-button>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+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: '',
+  qrCodeData: '',
+})
+
+// 标签数据
+const labelData = reactive({
+  partName: '',
+  partNumber: '',
+  totalCalculatedWeight: '',
+  totalWeight: '',
+  productionDate: '',
+  totalCount: '',
+  packingSignature: '',
+  inspectionSignature: '',
+  qrCodeData: '',
+})
+
+// 标签数据
+// const labelData = reactive({
+//   partName: '物料3',
+//   partNumber: '1',
+//   totalCalculatedWeight: '100',
+//   totalWeight: '100',
+//   productionDate: '202401010000',
+//   totalCount: '100',
+//   packingSignature: '',
+//   inspectionSignature: '',
+//   qrCodeData: '10#$$DY',
+// })
+
+// 标签容器引用
+const labelContainer = ref<HTMLElement | null>(null)
+
+// 生成标签
+const generateLabel = async () => {
+  if (!formData.productionBatch) {
+    Message.error('请输入生产批次')
+    return
+  }
+  if (!formData.materialName) {
+    Message.error('未获取到物料信息')
+    return
+  }
+  
+  try {
+    // 格式化生产日期为 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 formattedDate2 = now.getFullYear().toString() +
+        String(now.getMonth() + 1).padStart(2, '0') +
+        String(now.getDate()).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: '',
+      //10#零件号$11#供应商代码$12#生产批次$17#数量$20#包装日期$31#唯一号$DY
+      qrCodeData: `10#${formData.materialName}$11#9DP$12#${formData.productionBatch}$17#${formData.totalCount}$20#${formattedDate2}$31#${formData.orderNo}$DY`
+    })
+    
+    Message.success('标签生成成功')
+  } catch (error) {
+    console.error('生成标签失败:', error)
+    Message.error('生成标签失败')
+  }
+}
+
+// 组件挂载时，检查是否有参数传递
+onMounted(() => {
+  // 从路由参数中获取数据
+  const workerOrderId = route.query.workerOrderId as string
+  // 如果有参数传递，设置表单数据并标记为不可修改
+  if (workerOrderId) {
+    formData.workerOrderId = workerOrderId
+    getWorkOrder(workerOrderId).then(res => {
+      if (res.code == '0') {
+        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()
+  }
+})
+
+// 打印标签
+const printLabel = async () => {
+  await nextTick()
+  if (labelContainer.value) {
+    // 创建打印窗口
+    const printWindow = window.open('', '_blank')
+    if (printWindow) {
+      // 直接构建打印内容，确保二维码图片正确生成
+      const printHTML = `
+        <html>
+          <head>
+            <title>标签打印</title>
+            <style>
+              body { margin: 0; padding: 10mm; font-family: Arial, sans-serif; }
+              .label-container { display: flex; flex-wrap: wrap; gap: 10mm; justify-content: center; }
+              .label { width: 90mm; height: 38.5mm; border: 1px solid #000; padding: 0; box-sizing: border-box; page-break-inside: avoid; }
+              .label-table { width: 100%; height: 100%; border-collapse: collapse; }
+              .label-cell { border: 1px solid #000; padding: 1mm; vertical-align: top; }
+              .qr-cell { width: 24mm; text-align: center; vertical-align: middle; border: 1px solid #000; }
+              .label-row { display: flex; align-items: center; }
+              .label-field { font-size: 7pt; font-weight: bold; margin-right: 2mm; min-width: 25pt; }
+              .label-value { font-size: 7pt; flex: 1; }
+              .qr-code img { width: 20mm; height: 20mm; margin: 1mm 0; }
+              .serial-number { font-size: 7pt; margin-top: 1mm; }
+            </style>
+          </head>
+          <body>
+            <div class="label-container">
+              <div class="label">
+                <table class="label-table">
+                  <tr>
+                    <td class="label-cell">
+                      <div class="label-row">
+                        <div class="label-field">零件名称</div>
+                        <div class="label-value">${labelData.partName}</div>
+                      </div>
+                    </td>
+                    <td class="label-cell">
+                      <div class="label-row">
+                        <div class="label-field">生产日期</div>
+                        <div class="label-value">${labelData.productionDate}</div>
+                      </div>
+                    </td>
+                    <td class="label-cell qr-cell" rowspan="4">
+                      <div class="qr-code">
+                        <img src="https://api.qrserver.com/v1/create-qr-code/?size=120x120&data=${encodeURIComponent(labelData.qrCodeData)}" alt="QR Code" />
+                      </div>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td class="label-cell">
+                      <div class="label-row">
+                        <div class="label-field">零件号</div>
+                        <div class="label-value">${labelData.partNumber}</div>
+                      </div>
+                    </td>
+                    <td class="label-cell">
+                      <div class="label-row">
+                        <div class="label-field">数量</div>
+                        <div class="label-value">${labelData.totalCount}</div>
+                      </div>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td class="label-cell">
+                      <div class="label-row">
+                        <div class="label-field">标重(kg)</div>
+                        <div class="label-value">${labelData.totalCalculatedWeight}</div>
+                      </div>
+                    </td>
+                    <td class="label-cell">
+                      <div class="label-row">
+                        <div class="label-field">包装签字</div>
+                        <div class="label-value">${labelData.packingSignature || ''}</div>
+                      </div>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td class="label-cell">
+                      <div class="label-row">
+                        <div class="label-field">实重(kg)</div>
+                        <div class="label-value">${labelData.totalWeight || ''}</div>
+                      </div>
+                    </td>
+                    <td class="label-cell">
+                      <div class="label-row">
+                        <div class="label-field">检验签字</div>
+                        <div class="label-value">${labelData.inspectionSignature || ''}</div>
+                      </div>
+                    </td>
+                  </tr>
+                </table>
+              </div>
+            </div>
+          </body>
+        </html>
+      `
+
+      printWindow.document.write(printHTML)
+      printWindow.document.close()
+
+      // 等待图片加载完成后再打印
+      printWindow.onload = () => {
+        setTimeout(() => {
+          printWindow.focus()
+          printWindow.print()
+          printWindow.close()
+        }, 500)
+      }
+    }
+  }
+}
+
+defineOptions({ name: 'BarcodePrint' })
+</script>
+
+<style scoped lang="scss">
+.container {
+  max-width: 1200px;
+  margin: 0 auto;
+  padding: 20px;
+}
+
+.page-title {
+  margin-bottom: 30px;
+  text-align: center;
+  color: #333;
+}
+
+/* 表单区域 */
+.form-section {
+  background-color: var(--color-bg-2);
+  padding: 20px;
+  border-radius: 4px;
+  margin-bottom: 30px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
+}
+
+.form-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
+  gap: 16px;
+  margin-bottom: 20px;
+}
+
+.form-grid-item {
+  width: 100%;
+}
+
+.form-actions {
+  margin-top: 20px;
+  display: flex;
+  justify-content: center;
+}
+
+/* 标签预览 */
+.label-preview-section {
+  margin-top: 30px;
+  padding: 20px;
+  background-color: var(--color-bg-2);
+  border-radius: 4px;
+}
+
+.label-preview-section h3 {
+  margin: 0 0 20px 0;
+  font-size: 16px;
+  font-weight: bold;
+  text-align: center;
+}
+
+.label-container {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 20px;
+  justify-content: center;
+  margin-bottom: 20px;
+}
+
+.label {
+  width: 450px;
+  height: 180px;
+  border: 1px solid #000;
+  padding: 0;
+  box-sizing: border-box;
+  font-family: Arial, sans-serif;
+}
+
+.label-table {
+  width: 100%;
+  height: 100%;
+  border-collapse: collapse;
+}
+
+.label-cell {
+  border: 1px solid #000;
+  padding: 5px;
+  vertical-align: top;
+}
+
+.qr-cell {
+  width: 120px;
+  text-align: center;
+  vertical-align: middle;
+}
+
+.label-row {
+  display: flex;
+  align-items: center;
+}
+
+.label-field {
+  font-size: 12px;
+  font-weight: bold;
+  margin-right: 10px;
+  min-width: 60px;
+}
+
+.label-value {
+  font-size: 12px;
+  flex: 1;
+}
+
+.qr-code img {
+  width: 100px;
+  height: 100px;
+  margin: 5px 0;
+}
+
+.serial-number {
+  font-size: 12px;
+  margin-top: 5px;
+}
+
+.label-actions {
+  display: flex;
+  justify-content: center;
+  margin-top: 20px;
+}
+
+/* 确保输入框宽度一致 */
+:deep(.arco-input-wrapper) {
+  width: 100%;
+  height: 35px;
+}
+
+:deep(.arco-input) {
+  font-size: 16px;
+}
+</style>

src/views/dashboard/analysis/index.vue

@@ -5,9 +5,10 @@
       <div class="guide-section full-background">
         <div class="guide-content full-height">
           <!-- 标题 -->
+          <!-- 注意：标题现在不再强制占满全宽，而是适应内容 -->
           <h1 class="page-title">物料领取流程</h1>
 
-          <!-- 图片和按钮卡片 - 确保在任何比例下完全显示 -->
+          <!-- 图片和按钮卡片 -->
           <div class="guide-card centered">
             <!-- 图片展示区 -->
             <div class="image-wrapper">
@@ -36,7 +37,7 @@ defineOptions({ name: 'Analysis' })
 const router = useRouter()
 
 const handleStart = () => {
-  router.push('')
+  router.push('/weightManage')
 }
 </script>
 
@@ -66,10 +67,10 @@ const handleStart = () => {
     height: 100%;
     min-height: 100vh;
     display: flex;
-    justify-content: center;
+    justify-content: flex-start; // 整体靠左，由子元素 margin 控制位置
     align-items: center;
     background: #f5f7fa;
-    padding: 10px; // 减小内边距
+    padding: 10px;
     box-sizing: border-box;
 
     .guide-content.full-height {
@@ -79,10 +80,13 @@ const handleStart = () => {
       margin: 0;
       display: flex;
       flex-direction: column;
+      align-items: flex-start; // 【关键】让子元素（标题和卡片）从左侧开始排列，而不是拉伸
 
       .page-title {
-        text-align: center;
+        // 【修改】让标题宽度适应内容，以便通过 margin 控制其整体位置
-        font-size: 42px; // 稍微减小字体
+        width: fit-content;
+        text-align: center; // 文字本身在标题块内居中
+        font-size: 42px;
         font-weight: 800;
         color: #1e293b;
         margin-bottom: 15px;
@@ -92,13 +96,17 @@ const handleStart = () => {
         flex-shrink: 0;
         padding: 0 10px;
 
+        // 【关键修改】应用与卡片相同的左侧偏移，确保标题在卡片正上方
+        margin-left: 30%; // 必须与 .guide-card 的 margin-left 一致
+        margin-right: auto;
+
         &::after {
           content: '';
           display: block;
-          width: 80px; // 减小下划线宽度
+          width: 80px;
           height: 4px;
           background: linear-gradient(90deg, #165dff, #6aa1ff);
-          margin: 10px auto 0;
+          margin: 10px auto 0; // 下划线在标题块内居中
           border-radius: 2px;
         }
       }
@@ -108,22 +116,23 @@ const handleStart = () => {
   .guide-card {
     display: flex;
     align-items: center;
-    justify-content: center;
+    gap: 40px;
-    gap: 40px; // 减小间距
     background: white;
-    border-radius: 30px; // 减小圆角
+    border-radius: 30px;
     box-shadow: 0 20px 40px rgba(0, 0, 0, 0.1);
-    padding: 20px 30px; // 减小内边距
+    padding: 20px 30px;
     flex-wrap: wrap;
     border: 1px solid rgba(0, 0, 0, 0.05);
-    min-height: 400px; // 减小最小高度
+    min-height: 400px;
     width: auto;
-    max-width: 90vw; // 使用视口宽度的90%，确保有边距
+    max-width: 90vw;
-    margin: 0 auto;
+
+    // 【核心修改】设置左边距实现左偏移
+    margin-left: 10%;  // 与标题保持一致
+    margin-right: auto;
 
     &.centered {
-      margin-left: auto;
+      // 移除原本的居中逻辑
-      margin-right: auto;
     }
 
     .image-wrapper {
@@ -131,16 +140,16 @@ const handleStart = () => {
       display: flex;
       justify-content: center;
       align-items: center;
-      min-width: 300px; // 减小最小宽度
+      min-width: 300px;
-      max-width: 600px; // 减小最大宽度
+      max-width: 600px;
       height: 100%;
 
       .guide-image.enlarged {
         max-width: 100%;
         width: auto;
         height: auto;
-        max-height: 50vh; // 减小最大高度
+        max-height: 50vh;
-        min-height: 250px; // 减小最小高度
+        min-height: 250px;
         object-fit: contain;
         border-radius: 16px;
         filter: drop-shadow(0 10px 20px rgba(0, 0, 0, 0.08));
@@ -159,13 +168,13 @@ const handleStart = () => {
       align-items: center;
       justify-content: center;
       gap: 12px;
-      min-width: 180px; // 减小最小宽度
+      min-width: 180px;
 
       .button-hint {
-        font-size: 14px; // 减小字体
+        font-size: 14px;
         color: #475569;
         background: #f1f5f9;
-        padding: 6px 18px; // 减小内边距
+        padding: 6px 18px;
         border-radius: 24px;
         white-space: nowrap;
         box-shadow: 0 2px 6px rgba(0, 0, 0, 0.02);
@@ -180,9 +189,9 @@ const handleStart = () => {
       }
 
       .start-button.enlarged {
-        min-width: 160px; // 减小按钮宽度
+        min-width: 160px;
-        height: 56px; // 减小按钮高度
+        height: 56px;
-        font-size: 22px; // 减小字体
+        font-size: 22px;
         border-radius: 40px;
         box-shadow: 0 10px 20px rgba(22, 93, 255, 0.2);
         transition: all 0.3s ease;
@@ -209,12 +218,11 @@ const handleStart = () => {
 // 针对不同屏幕尺寸的精细调整
 @media (min-width: 1920px) {
   .guide-card {
-    max-width: 1600px; // 超大屏幕限制最大宽度
+    max-width: 1600px;
     padding: 30px 50px;
-
-    .image-wrapper {
-      max-width: 800px;
   }
+  .guide-content.full-height .page-title {
+    // 大屏幕保持同步
   }
 }
 
@@ -222,15 +230,7 @@ const handleStart = () => {
   .guide-card {
     gap: 30px;
     padding: 20px 25px;
-
+    // 如果需要，可以在这里微调 margin-left，记得同时微调 title
-    .image-wrapper {
-      min-width: 280px;
-      max-width: 500px;
-
-      .guide-image.enlarged {
-        max-height: 45vh;
-      }
-    }
   }
 }
 
@@ -242,43 +242,26 @@ const handleStart = () => {
   .guide-card {
     gap: 25px;
     padding: 15px 20px;
-    max-width: 95vw; // 在小屏幕上使用更宽的百分比
+    max-width: 95vw;
-
+    // 平板端如果需要调整偏移，请同时调整下方 title 的 margin
-    .image-wrapper {
-      min-width: 250px;
-      max-width: 450px;
-
-      .guide-image.enlarged {
-        max-height: 40vh;
-        min-height: 200px;
-      }
-    }
-
-    .button-wrapper {
-      min-width: 160px;
-
-      .button-hint {
-        font-size: 13px;
-        padding: 5px 15px;
-      }
-
-      .start-button.enlarged {
-        min-width: 150px;
-        height: 50px;
-        font-size: 20px;
-      }
-    }
   }
 }
 
 @media (max-width: 768px) {
   .guide-section.full-background {
     padding: 5px;
+    justify-content: center; // 移动端恢复整体居中
 
     .guide-content.full-height {
+      align-items: center; // 移动端子元素也居中
+
       .page-title {
         font-size: 28px;
         margin-bottom: 10px;
+        // 【重要】移动端重置 margin，恢复自动居中
+        margin-left: auto;
+        margin-right: auto;
+        width: fit-content; // 保持适应内容
 
         &::after {
           width: 60px;
@@ -294,7 +277,11 @@ const handleStart = () => {
     padding: 20px 15px;
     gap: 20px;
     min-height: auto;
-    max-width: 98vw; // 移动端几乎占满宽度
+    max-width: 98vw;
+
+    // 【重要】移动端强制居中
+    margin-left: auto;
+    margin-right: auto;
 
     .image-wrapper {
       min-width: auto;
@@ -334,14 +321,12 @@ const handleStart = () => {
   .guide-section.full-background {
     .guide-card {
       @media (min-width: 1025px) {
-        margin-left: 5%; // 在有侧边栏时左移
+        // 如果有侧边栏，确保标题和卡片偏移量依然一致
-        margin-right: auto;
       }
     }
   }
 }
 
-// 确保父容器占满且无滚动问题
 html, body {
   margin: 0;
   padding: 0;
@@ -359,22 +344,22 @@ html, body {
   overflow-y: auto;
 }
 
-// 针对100%缩放比例的特殊处理
+// 针对特定分辨率的微调（可选）
 @media screen and (min-width: 1280px) and (max-width: 1366px) {
   .guide-card {
-    max-width: 85vw; // 在常见笔记本屏幕上使用85%宽度
+    max-width: 85vw;
   }
 }
 
 @media screen and (min-width: 1367px) and (max-width: 1440px) {
   .guide-card {
-    max-width: 80vw; // 在1440p屏幕上使用80%宽度
+    max-width: 80vw;
   }
 }
 
 @media screen and (min-width: 1441px) and (max-width: 1680px) {
   .guide-card {
-    max-width: 75vw; // 在更大屏幕上使用75%宽度
+    max-width: 75vw;
   }
 }
 </style>

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/material/MaterialInfoAddModal.vue

@@ -58,9 +58,9 @@ const columns: ColumnItem[] = reactive([
     span: 24,
   },
   {
-    label: '物料单次可称量最大重量(kg)',
+    label: '物料规格',
-    field: 'maxWeight',
+    field: 'materialSpec',
-    type: 'input-number',
+    type: 'input',
     span: 24,
   },
   {

src/views/material/MaterialInfoImportDrawer.vue

@@ -0,0 +1,201 @@
+<template>
+  <a-drawer
+    v-model:visible="visible"
+    title="导入物料信息"
+    :mask-closable="false"
+    :esc-to-close="false"
+    :width="width >= 600 ? 600 : '100%'"
+    ok-text="确认导入"
+    cancel-text="取消导入"
+    @before-ok="save"
+    @close="reset"
+  >
+    <a-form ref="formRef" :model="form" size="large" auto-label-width>
+      <a-alert v-if="!form.disabled" style="margin-bottom: 15px">
+        请按照模板要求填写数据，填写完毕后，请先上传并进行解析。
+        <template #action>
+          <a-link @click="downloadTemplate">
+            <template #icon><GiSvgIcon name="file-excel" :size="16" /></template>
+            <template #default>下载模板</template>
+          </a-link>
+        </template>
+      </a-alert>
+      <fieldset>
+        <legend>1.解析数据</legend>
+        <div class="file-box">
+          <a-upload
+            draggable
+            :custom-request="handleUpload"
+            :limit="1"
+            :show-retry-butto="false"
+            :show-cancel-button="false" tip="仅支持xls、xlsx格式"
+            :file-list="uploadFile"
+            accept=".xls, .xlsx, application/vnd.ms-excel, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+          />
+        </div>
+        <div v-if="dataResult.importKey">
+          <div class="file-box">
+            <a-space size="large">
+              <a-statistic title="总计行数" :value="dataResult.totalRows" />
+              <a-statistic title="正常行数" :value="dataResult.validRows" />
+            </a-space>
+          </div>
+          <div class="file-box">
+            <a-space size="large">
+              <a-statistic title="已存在物料名" :value="dataResult.duplicateNameRows" />
+              <a-statistic title="已存在编码" :value="dataResult.duplicateCodeRows" />
+            </a-space>
+          </div>
+        </div>
+      </fieldset>
+      <fieldset>
+        <legend>2.导入策略</legend>
+        <a-form-item label="物料名已存在" field="duplicateName">
+          <a-radio-group v-model="form.duplicateName" type="button">
+            <a-radio :value="1">跳过该行</a-radio>
+            <a-radio :value="2">修改数据</a-radio>
+            <a-radio :value="3">停止导入</a-radio>
+          </a-radio-group>
+        </a-form-item>
+        <a-form-item label="编码已存在" field="duplicateCode">
+          <a-radio-group v-model="form.duplicateCode" type="button">
+            <a-radio :value="1">跳过该行</a-radio>
+            <a-radio :value="2">修改数据</a-radio>
+            <a-radio :value="3">停止导入</a-radio>
+          </a-radio-group>
+        </a-form-item>
+        <a-form-item label="默认状态" field="defaultStatus">
+          <a-switch
+            v-model="form.defaultStatus"
+            :checked-value="1"
+            :unchecked-value="2"
+            checked-text="启用"
+            unchecked-text="禁用"
+            type="round"
+          />
+        </a-form-item>
+      </fieldset>
+    </a-form>
+  </a-drawer>
+</template>
+
+<script setup lang="ts">
+import { type FormInstance, Message, type RequestOption } from '@arco-design/web-vue'
+import { useWindowSize } from '@vueuse/core'
+import {
+  type MaterialImportResp,
+  downloadMaterialInfoImportTemplate,
+  importMaterial,
+  parseImportMaterial,
+} from '@/apis/material/materialInfo'
+import { useDownload, useResetReactive } from '@/hooks'
+
+const emit = defineEmits<{
+  (e: 'save-success'): void
+}>()
+
+const { width } = useWindowSize()
+
+const visible = ref(false)
+const formRef = ref<FormInstance>()
+const uploadFile = ref([])
+
+const [form, resetForm] = useResetReactive({
+  importKey: '',
+  errorPolicy: 1,
+  duplicateName: 1,
+  duplicateCode: 1,
+  defaultStatus: 1,
+})
+
+const dataResult = ref<MaterialImportResp>({
+  importKey: '',
+  totalRows: 0,
+  validRows: 0,
+  duplicateNameRows: 0,
+  duplicateCodeRows: 0,
+})
+
+// 重置
+const reset = () => {
+  formRef.value?.resetFields()
+  dataResult.value.importKey = ''
+  uploadFile.value = []
+  resetForm()
+}
+
+// 下载模板
+const downloadTemplate = () => {
+  useDownload(() => downloadMaterialInfoImportTemplate())
+}
+
+// 上传解析导入数据
+const handleUpload = (options: RequestOption) => {
+  const controller = new AbortController();
+  (async function requestWrap() {
+    const { onProgress, onError, onSuccess, fileItem, name = 'file' } = options
+    onProgress(20)
+    const formData = new FormData()
+    formData.append(name as string, fileItem.file as Blob)
+    try {
+      const res = await parseImportMaterial(formData)
+      dataResult.value = res.data
+      Message.success('上传解析成功')
+      onSuccess(res)
+    } catch (error) {
+      onError(error)
+    }
+  })()
+  return {
+    abort() {
+      controller.abort()
+    },
+  }
+}
+
+// 执行导入
+const save = async () => {
+  try {
+    if (!dataResult.value.importKey) {
+      Message.warning('请先上传文件，解析导入数据')
+      return false
+    }
+    form.importKey = dataResult.value.importKey
+    const res = await importMaterial(form)
+    Message.success(`导入成功! 新增${res.data.insertRows}, 修改${res.data.updateRows},总计处理${res.data.totalRows}`)
+    emit('save-success')
+    return true
+  } catch (error) {
+    return false
+  }
+}
+
+// 打开
+const onOpen = () => {
+  reset()
+  visible.value = true
+}
+
+defineExpose({ onOpen })
+</script>
+
+<style scoped lang="scss">
+fieldset {
+  padding: 15px 15px 0 15px;
+  margin-bottom: 15px;
+  border: 1px solid var(--color-neutral-3);
+  border-radius: 3px;
+}
+
+fieldset legend {
+  color: rgb(var(--gray-10));
+  padding: 2px 5px 2px 5px;
+  border: 1px solid var(--color-neutral-3);
+  border-radius: 3px;
+}
+
+.file-box {
+  margin-bottom: 20px;
+  margin-left: 10px;
+}
+</style>

src/views/material/PhotosImport.vue

@@ -0,0 +1,134 @@
+<template>
+  <a-drawer
+    v-model:visible="visible"
+    title="批量导入物料照片"
+    :mask-closable="false"
+    :esc-to-close="false"
+    :width="width >= 600 ? 600 : '100%'"
+    ok-text="确认导入"
+    cancel-text="取消导入"
+    @before-ok="save"
+    @close="reset"
+  >
+    <a-form ref="formRef" :model="form" size="large" auto-label-width>
+      <fieldset>
+        <legend>zip文件上传</legend>
+        <div class="file-box">
+          <a-upload
+            draggable
+            :custom-request="handleUpload"
+            :limit="1"
+            :show-retry-button="false"
+            :show-cancel-button="false"
+            tip="仅支持zip格式"
+            :file-list="uploadFile"
+            accept=".zip"
+          />
+        </div>
+      </fieldset>
+    </a-form>
+  </a-drawer>
+</template>
+
+<script setup lang="ts">
+import { type FormInstance, Message, type RequestOption } from '@arco-design/web-vue'
+import { useWindowSize } from '@vueuse/core'
+import { uploadMaterialPhotos } from '@/apis/material/materialInfo'
+import { useResetReactive } from '@/hooks'
+
+const emit = defineEmits<{
+  (e: 'save-success'): void
+}>()
+
+const { width } = useWindowSize()
+
+const visible = ref(false)
+const formRef = ref<FormInstance>()
+const uploadFile = ref([])
+// 新增：保存上传的文件对象
+const uploadFileObj = ref<File | null>(null)
+
+// 移除不必要的表单字段，只保留空对象即可
+const [form, resetForm] = useResetReactive({})
+
+// 重置
+const reset = () => {
+  formRef.value?.resetFields()
+  uploadFile.value = []
+  uploadFileObj.value = null // 重置文件对象
+  resetForm()
+}
+
+// 修改上传逻辑：仅保存文件对象，不做解析
+const handleUpload = (options: RequestOption) => {
+  const { onProgress, onError, onSuccess, fileItem } = options
+  onProgress(100) // 直接标记上传完成（仅前端显示）
+
+  // 保存文件对象供后续提交使用
+  uploadFileObj.value = fileItem.file as File
+  uploadFile.value = [fileItem] // 更新文件列表显示
+
+  Message.success('文件已选择，点击确认导入即可上传')
+  onSuccess({}) // 通知上传组件完成
+  return {
+    abort() {
+      // 空实现，取消时会走reset逻辑
+    },
+  }
+}
+
+// 执行导入：直接上传文件到后端
+const save = async () => {
+  try {
+    // 校验是否选择了文件
+    if (!uploadFileObj.value) {
+      Message.warning('请先选择要上传的ZIP文件')
+      return false
+    }
+
+    // 构建FormData
+    const formData = new FormData()
+    formData.append('zipFile', uploadFileObj.value) // 后端接收参数名保持为zipFile
+
+    // 调用后端照片批量导入接口
+    await uploadMaterialPhotos(formData)
+
+    Message.success('物料照片批量导入成功！')
+    emit('save-success') // 通知父组件刷新列表
+    visible.value = false // 关闭抽屉
+    return true
+  } catch (error) {
+    Message.error('物料照片导入失败，请重试！')
+    return false
+  }
+}
+
+// 打开抽屉
+const onOpen = () => {
+  reset()
+  visible.value = true
+}
+
+defineExpose({ onOpen })
+</script>
+
+<style scoped lang="scss">
+fieldset {
+  padding: 15px 15px 0 15px;
+  margin-bottom: 15px;
+  border: 1px solid var(--color-neutral-3);
+  border-radius: 3px;
+}
+
+fieldset legend {
+  color: rgb(var(--gray-10));
+  padding: 2px 5px 2px 5px;
+  border: 1px solid var(--color-neutral-3);
+  border-radius: 3px;
+}
+
+.file-box {
+  margin-bottom: 20px;
+  margin-left: 10px;
+}
+</style>

src/views/material/index.vue

@@ -12,6 +12,7 @@
         :disabled-column-keys="['name']"
         @refresh="search"
     >
+      <!-- toolbar 部分保持不变 -->
       <template #toolbar-left>
         <a-input-search v-model="queryForm.materialName" placeholder="请输入物料名称" allow-clear @search="search" />
         <a-input-search v-model="queryForm.encoding" placeholder="请输入物料编码" allow-clear @search="search" />
@@ -25,24 +26,44 @@
           <template #icon><icon-plus /></template>
           <template #default>新增</template>
         </a-button>
+        <a-button v-permission="['admin:materialInfo:import']" @click="onImport">
+          <template #icon><icon-upload /></template>
+          <template #default>导入</template>
+        </a-button>
         <a-button v-permission="['admin:materialInfo:export']" @click="onExport">
           <template #icon><icon-download /></template>
           <template #default>导出</template>
         </a-button>
+        <a-button v-permission="['admin:materialInfo:import']" @click="onPhotosImport">
+          <template #icon><icon-upload /></template>
+          <template #default>照片批量导入</template>
+        </a-button>
       </template>
-      <!-- 物料照片插槽：核心新增部分 -->
+
+      <!-- 【修改点】照片列插槽 -->
       <template #photoUrl="{ record }">
         <div class="photo-container">
+          <!-- 1. 正常显示图片：有地址 且 未标记为错误 -->
           <img
-            v-if="record.photoUrl"
+              v-if="record.photoUrl && !record.photoLoadError"
               :src="record.photoUrl"
               alt="物料照片"
               class="material-photo"
-            @error="handleImgError($event)"
+              @load="handleImgLoad(record)"
+              @error="handleImgError(record, $event)"
           />
-          <span v-else class="no-photo">暂无照片</span>
+
+          <!-- 2. 无地址 -->
+          <span v-else-if="!record.photoUrl" class="no-photo">暂无照片</span>
+
+          <!-- 3. 地址存在但加载失败 -->
+          <span v-else class="photo-error">
+            <icon-exclamation-circle-fill class="error-icon" />
+            照片异常
+          </span>
         </div>
       </template>
+
       <template #action="{ record }">
         <a-space>
           <a-link v-permission="['admin:materialInfo:update']" title="修改" @click="onUpdate(record)">修改</a-link>
@@ -60,11 +81,16 @@
     </GiTable>
 
     <MaterialInfoAddModal ref="MaterialInfoAddModalRef" @save-success="search" />
+    <MaterialInfoImportDrawer ref="MaterialInfoImportDrawerRef" @save-success="search" />
+    <PhotosImport ref="PhotosImportRef" @save-success="search"/>
   </div>
 </template>
 
 <script setup lang="ts">
+// ... 保持原有的 import 不变
 import MaterialInfoAddModal from './MaterialInfoAddModal.vue'
+import MaterialInfoImportDrawer from './MaterialInfoImportDrawer.vue'
+import PhotosImport from '@/views/material/PhotosImport.vue';
 import { type MaterialInfoQuery, type MaterialInfoResp, deleteMaterialInfo, exportMaterialInfo, listMaterialInfo } from '@/apis/material/materialInfo'
 import type { TableInstanceColumns } from '@/components/GiTable/type'
 import { useDownload, useTable } from '@/hooks'
@@ -73,6 +99,12 @@ import has from '@/utils/has'
 
 defineOptions({ name: 'MaterialInfo' })
 
+// 扩展类型定义，允许动态添加 photoLoadError 属性
+// 如果 TS 报错，可以在 MaterialInfoResp 接口定义中添加 photoLoadError?: boolean;
+interface MaterialInfoRespWithStatus extends MaterialInfoResp {
+  photoLoadError?: boolean;
+}
+
 const queryForm = reactive<MaterialInfoQuery>({
   materialName: undefined,
   encoding: undefined,
@@ -86,12 +118,12 @@ const {
   search,
   handleDelete,
 } = useTable((page) => listMaterialInfo({ ...queryForm, ...page }), { immediate: true })
+
 const columns = ref<TableInstanceColumns[]>([
   { title: '物料名称', dataIndex: 'materialName', slotName: 'materialName' },
   { title: '物料编码', dataIndex: 'encoding', slotName: 'encoding' },
   { title: '物料单位重量(g)', dataIndex: 'unitWeight', slotName: 'unitWeight' },
-  { title: '物料单次可称量最大重量(kg)', dataIndex: 'maxWeight', slotName: 'maxWeight' },
+  { title: '物料规格', dataIndex: 'materialSpec', slotName: 'materialSpec' },
-  // 可给photoUrl列添加宽度，优化显示
   { title: '物料照片', dataIndex: 'photoUrl', slotName: 'photoUrl', width: 120, align: 'center' },
   { title: '创建人', dataIndex: 'createUserString', slotName: 'createUser' },
   { title: '创建时间', dataIndex: 'createTime', slotName: 'createTime' },
@@ -106,14 +138,12 @@ const columns = ref<TableInstanceColumns[]>([
   },
 ])
 
-// 重置
 const reset = () => {
   queryForm.materialName = undefined
   queryForm.encoding = undefined
   search()
 }
 
-// 删除
 const onDelete = (record: MaterialInfoResp) => {
   return handleDelete(() => deleteMaterialInfo(record.id), {
     content: `是否确定删除该条数据？`,
@@ -121,54 +151,79 @@ const onDelete = (record: MaterialInfoResp) => {
   })
 }
 
-// 导出
 const onExport = () => {
   useDownload(() => exportMaterialInfo(queryForm))
 }
 
-// 图片加载失败处理函数（新增）
+// 【修改点】图片加载处理逻辑
-const handleImgError = (e: Event) => {
+const handleImgLoad = (record: MaterialInfoRespWithStatus) => {
-  // 替换为你的默认图片地址（建议放在/static目录下）
+  record.photoLoadError = false
-  const target = e.target as HTMLImageElement
+}
-  target.src = '/static/images/default-material.png'
+
+const handleImgError = (record: MaterialInfoRespWithStatus, e: Event) => {
+  // 标记为加载错误，触发模板渲染 "照片异常"
+  record.photoLoadError = true
+  console.warn(`物料照片加载失败: ${record.photoUrl}`)
 }
 
 const MaterialInfoAddModalRef = ref<InstanceType<typeof MaterialInfoAddModal>>()
-// 新增
 const onAdd = () => {
   MaterialInfoAddModalRef.value?.onAdd()
 }
 
-// 修改
 const onUpdate = (record: MaterialInfoResp) => {
   MaterialInfoAddModalRef.value?.onUpdate(record.id)
 }
 
-// 详情（补充定义，避免报错）
+const MaterialInfoImportDrawerRef = ref<InstanceType<typeof MaterialInfoImportDrawer>>()
-const onDetail = (record: MaterialInfoResp) => {
+const onImport = () => {
-  // 可补充详情逻辑，如打开详情弹窗
+  MaterialInfoImportDrawerRef.value?.onOpen()
-  console.log('物料详情', record)
+}
+
+const PhotosImportRef = ref<InstanceType<typeof PhotosImport>>()
+const onPhotosImport = () => {
+  PhotosImportRef.value?.onOpen()
 }
 </script>
 
 <style scoped lang="scss">
-// 物料照片样式（新增）
 .photo-container {
   display: flex;
   align-items: center;
   justify-content: center;
   height: 80px;
+  width: 100%;
+  overflow: hidden;
 }
 
 .material-photo {
-  width: 80px;
+  width: 100%;
-  height: 80px;
+  height: 100%;
-  object-fit: cover; // 保持图片比例，避免拉伸
+  object-fit: cover;
   border-radius: 4px;
+  transition: opacity 0.3s;
 }
 
 .no-photo {
   color: #999;
   font-size: 12px;
+  text-align: center;
+}
+
+// 新增样式
+.photo-error {
+  color: #ff4d4f; // 阿里红/危险色
+  font-size: 12px;
+  text-align: center;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  line-height: 1.4;
+
+  .error-icon {
+    font-size: 18px;
+    margin-bottom: 2px;
+  }
 }
 </style>

src/views/system/sysConfig/ConfigAddModal.vue

@@ -49,7 +49,7 @@ const columns: ColumnItem[] = reactive([
     field: 'configKey',
     type: 'input',
     span: 24,
-    disabled: true,
+    disabled: isUpdate.value,
   },
   {
     label: '参数键值',

src/views/system/user/UserAddDrawer.vue

@@ -13,7 +13,7 @@
 </template>
 
 <script setup lang="ts">
-import { Message, type TreeNodeData } from '@arco-design/web-vue'
+import { Message } from '@arco-design/web-vue'
 import { useWindowSize } from '@vueuse/core'
 import { addUser, getUser, updateUser } from '@/apis/system/user'
 import { type ColumnItem, GiForm } from '@/components/GiForm'

src/views/system/user/index.vue

@@ -102,6 +102,7 @@ import { DisEnableStatusList } from '@/constant/common'
 import { useDownload, useResetReactive, useTable } from '@/hooks'
 import { isMobile } from '@/utils'
 import has from '@/utils/has'
+import type {ColumnItem} from "@/components/GiForm";
 
 defineOptions({ name: 'SystemUser' })
 
@@ -122,7 +123,7 @@ const queryFormColumns: ColumnItem[] = reactive([
       hideLabel: true,
     },
     props: {
-      placeholder: '搜索用户名/昵称/描述',
+      placeholder: '搜索用户名',
       showWordLimit: false,
     },
   },
@@ -226,11 +227,6 @@ const onUpdate = (record: UserResp) => {
   UserAddDrawerRef.value?.onUpdate(record.id)
 }
 
-const UserDetailDrawerRef = ref<InstanceType<typeof UserDetailDrawer>>()
-const onDetail = (record: UserResp) => {
-  UserDetailDrawerRef.value?.onOpen(record.id)
-}
-
 const UserResetPwdModalRef = ref<InstanceType<typeof UserResetPwdModal>>()
 const onResetPwd = (record: UserResp) => {
   UserResetPwdModalRef.value?.onOpen(record.id)

src/views/workOrder/index.vue

@@ -0,0 +1,282 @@
+<template>
+  <div class="gi_table_page">
+    <GiTable
+        row-key="id"
+        :data="dataList"
+        :columns="columns"
+        :loading="loading"
+        :scroll="{ x: '100%', y: '100%', minWidth: 1600 }"
+        :pagination="pagination"
+        :disabled-tools="['size']"
+        :disabled-column-keys="['name']"
+        :selected-keys="selectedKeys"
+        :row-selection="{ type: 'checkbox', showCheckedAll: true }"
+        @select-all="selectAll"
+        @select="select"
+        @refresh="search"
+    >
+      <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.materialName" placeholder="请输入物料名称" allow-clear @search="search" />
+        <a-input-search v-model="queryForm.encoding" placeholder="请输入物料编码" allow-clear @search="search" />
+        <a-date-picker
+          v-model="queryForm.startDate"
+          placeholder="请选择开始时间"
+          show-time
+          format="YYYY-MM-DD HH:mm:ss"
+          style="height: 32px"
+          @change="search"
+        />
+        <a-date-picker
+          v-model="queryForm.endDate"
+          placeholder="请选择结束时间"
+          show-time
+          format="YYYY-MM-DD HH:mm:ss"
+          style="height: 32px"
+          @change="search"
+        />
+
+        <a-button @click="reset">
+          <template #icon><icon-refresh /></template>
+          <template #default>重置</template>
+        </a-button>
+      </template>
+      <template #toolbar-right>
+        <a-button v-permission="['workOrder:record:delete']" type="outline" status="danger" @click="onDelete">
+          <template #icon><icon-delete /></template>
+          <template #default>删除</template>
+        </a-button>
+        <a-button v-permission="['workOrder:record:export']" @click="onExport">
+          <template #icon><icon-download /></template>
+          <template #default>导出</template>
+        </a-button>
+      </template>
+
+      <template #photoUrl="{ record }">
+        <a-image :src="record.photoUrl" width="55" />
+      </template>
+      <template #unitWeight="{ record }">
+        {{ record.unitWeight + 'g' }}
+      </template>
+      <template #totalWeight="{ record }">
+        {{ record.totalWeight + 'g' }}
+      </template>
+
+      <template #action="{ record }">
+        <a-space>
+          <a-link v-permission="['workOrder:record:detail']" title="详情" @click="onDetail(record)">详情</a-link>
+          <a-link v-permission="['workOrder:record:print']" title="打印" @click="onPrint(record)">打印</a-link>
+          <a-link v-permission="['workOrder:record:delete']" status="danger" :title="'删除'" @click="onDeleteOne(record.id)">删除</a-link>
+        </a-space>
+      </template>
+    </GiTable>
+
+    <!-- 详情弹窗 -->
+    <a-modal
+      v-model:visible="detailModalVisible"
+      title="称重详情"
+      width="800px"
+      :loading="detailLoading"
+    >
+      <GiTable
+        v-if="detailData.length > 0"
+        row-key="id"
+        :data="detailData"
+        :columns="detailColumns"
+        :scroll="{ x: '100%', y: '100%', minWidth: 700 }"
+      >
+        <template #imgUrl="{ record }">
+          <a-image :src="record.imgUrl" width="50" />
+        </template>
+        <template #calculatedWeight="{ record }">
+          {{ record.calculatedWeight + 'g' }}
+        </template>
+        <template #weight="{ record }">
+          {{ record.weight + 'g' }}
+        </template>
+      </GiTable>
+      <div v-else class="no-data">
+        <icon-loading style="font-size: 48px; color: rgb(var(--arcoblue-6));" />
+        <p>暂无称重数据</p>
+      </div>
+    </a-modal>
+
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { TableInstanceColumns } from '@/components/GiTable/type'
+import { useDownload, useTable } from '@/hooks'
+import { isMobile } from '@/utils'
+import has from '@/utils/has'
+import type GiTable from "@/components/GiTable/index.vue";
+import {ref, reactive} from "vue";
+import {Message} from "@arco-design/web-vue";
+import { useRouter } from 'vue-router';
+import {
+  deleteWorkOrder,
+  exportWorkOrder, getWorkOrderInfos,
+  listWorkOrder,
+  type WorkOrderQuery,
+  type WorkOrderResp
+} from "@/apis/workOrder/workOrder";
+
+defineOptions({ name: 'Record' })
+
+const router = useRouter()
+
+
+const queryForm = reactive<WorkOrderQuery>({
+  orderNo: undefined,
+  materialName: undefined,
+  encoding: undefined,
+  userName: undefined,
+  carNo: undefined,
+  startDate: undefined,
+  endDate: undefined,
+  sort: ['w.id,desc']
+})
+
+const {
+  tableData: dataList,
+  loading,
+  pagination,
+  selectedKeys,
+  select,
+  selectAll,
+  search,
+  handleDelete,
+} = useTable((page) => listWorkOrder({ ...queryForm, ...page }), { immediate: true })
+
+// 创建工具函数统一处理列配置
+const processColumns = (columns: TableInstanceColumns[]): TableInstanceColumns[] => {
+  return columns.map(column => {
+    const defaultConfig = {
+      ellipsis: true,
+      tooltip: true
+    };
+    return { ...defaultConfig, ...column };
+  });
+};
+
+// 定义列配置，使用工具函数处理
+const columns = ref<TableInstanceColumns[]>(processColumns([
+  { 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' },
+  { title: '单位克重', dataIndex: 'unitWeight' ,slotName: 'unitWeight'},
+  { title: '总重量', dataIndex: 'totalWeight' ,slotName: 'totalWeight'},
+  { title: '总数量', dataIndex: 'totalCount' },
+  { title: '创建时间', dataIndex: 'createTime', width: 180 },
+  {
+    title: '操作',
+    dataIndex: 'action',
+    slotName: 'action',
+    width: 160,
+    align: 'center',
+    fixed: !isMobile() ? 'right' : undefined,
+    show: has.hasPermOr(['workOrder:record:detail', 'workOrder:record:update', 'workOrder:record:delete'])
+  }
+]))
+
+// 重置
+const reset = () => {
+  queryForm.orderNo = undefined
+  queryForm.materialName = undefined
+  queryForm.encoding = undefined
+  queryForm.userName = undefined
+  queryForm.carNo = undefined
+  queryForm.startDate = undefined
+  queryForm.endDate = undefined
+  search()
+}
+
+// 详情弹窗状态
+const detailModalVisible = ref(false)
+const detailLoading = ref(false)
+const detailData = ref<any[]>([])
+
+// 详情列配置
+const detailColumns = ref<TableInstanceColumns[]>([
+  { title: '称重次数', dataIndex: 'weightTime' },
+  { title: '物料名称', dataIndex: 'materialName' },
+  { title: '数量', dataIndex: 'quantity' },
+  { title: '重量', dataIndex: 'weight', slotName: 'weight' },
+  { title: '计算重量', dataIndex: 'calculatedWeight', slotName: 'calculatedWeight' },
+  { title: '抓拍图片', dataIndex: 'imgUrl', slotName: 'imgUrl' }
+])
+
+// 详情
+const onDetail = async (record: WorkOrderResp) => {
+  detailLoading.value = true
+  detailModalVisible.value = true
+  detailData.value = []
+
+  getWorkOrderInfos(record.id).then(res => {
+    if (res.code == '0') {
+      detailData.value = res.data;
+      detailLoading.value = false
+    } else {
+      Message.error('获取详情失败')
+    }
+  });
+};
+
+// 删除
+const onDeleteOne = (id) => {
+  return handleDelete(() => deleteWorkOrder(id), {
+    content: `是否确定删除该条数据？`,
+    showModal: true
+  })
+}
+
+// 删除
+const onDelete = () => {
+  if (!selectedKeys.value.length) {
+    return Message.warning('请选择数据')
+  }
+  return handleDelete(() => deleteWorkOrder(selectedKeys.value), {
+    content: `是否确定删除选中的 ${selectedKeys.value.length} 条数据？`,
+    showModal: true
+  })
+}
+
+// 导出
+const onExport = () => {
+  useDownload(() => exportWorkOrder(queryForm))
+}
+
+// 打印
+const onPrint = (record: WorkOrderResp) => {
+  // 跳转到标签打印页面，并传递数据
+  router.push({
+    path: '/print',
+    query: {
+      workerOrderId: record.id,
+    }
+  })
+}
+
+</script>
+
+<style scoped lang="scss">
+.no-data {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 40px 0;
+  color: var(--color-text-4);
+  
+  p {
+    margin-top: 16px;
+    font-size: 14px;
+  }
+}
+</style>