Merge remote-tracking branch 'origin/master'

yudao-ui/yudao-ui-admin-vue3/src/components/Qms/StatusBadge.vue

@@ -16,12 +16,14 @@ const props = defineProps({
 
 const statusNameMap: Record<string, string> = {
   draft: '草稿', submitted: '已提交', approved: '已审批', rejected: '已驳回', cancelled: '已作废',
-  pending: '待检验', processing: '检验中', completed: '已完成'
+  pending: '待检验', processing: '检验中', completed: '已完成',
+  '待检验': '待检验', '检验中': '检验中', '检验完成': '检验完成'
 }
 
 const statusClassMap: Record<string, string> = {
   draft: 'draft', submitted: 'submitted', approved: 'approved', rejected: 'rejected', cancelled: 'cancelled',
-  pending: 'pending', processing: 'processing', completed: 'completed'
+  pending: 'pending', processing: 'processing', completed: 'completed',
+  '待检验': 'pending', '检验中': 'processing', '检验完成': 'completed'
 }
 
 const statusName = computed(() => statusNameMap[props.status] || '未知状态')

yudao-ui/yudao-ui-admin-vue3/src/config/qmsModules.ts

@@ -20,8 +20,6 @@ export const QMS_MODULES: Record<string, any> = {
       title: '来料检验申请',
       actionButtons: {
         create: '新建申请',
-        import: true,
-        export: true,
         guide: true
       },
       keywordFields: ['id', 'remark'],

yudao-ui/yudao-ui-admin-vue3/src/store/modules/qms/application.ts

@@ -12,17 +12,17 @@ const createDefaultPagination = () => ({ currentPage: 1, pageSize: 20, total: 0
 
 const createSampleData = () => ({
   iqc: [
-    { id: 'IQC001', applicantId: '1', applicantName: '张三', applyTime: '2024-01-15 09:30:00', status: 'submitted', materialCount: 5, remark: '紧急物料，请优先处理', businessType: '常规', department: '生产部' },
-    { id: 'IQC002', applicantId: '2', applicantName: '李四', applyTime: '2024-01-14 14:20:00', status: 'draft', materialCount: 3, remark: '常规检验物料', businessType: '常规', department: '采购部' },
-    { id: 'IQC003', applicantId: '1', applicantName: '张三', applyTime: '2024-01-13 16:45:00', status: 'approved', materialCount: 8, remark: '精密器件，需要特殊检验', businessType: '精密', department: '研发部' }
+    { id: 'IQC001', applicantId: '1', applicantName: '张三', applyTime: '2024-01-15 09:30:00', status: '待检验', materialCount: 5, remark: '紧急物料，请优先处理', businessType: '常规', department: '生产部' },
+    { id: 'IQC002', applicantId: '2', applicantName: '李四', applyTime: '2024-01-14 14:20:00', status: '检验中', materialCount: 3, remark: '常规检验物料', businessType: '常规', department: '采购部' },
+    { id: 'IQC003', applicantId: '1', applicantName: '张三', applyTime: '2024-01-13 16:45:00', status: '检验完成', materialCount: 8, remark: '精密器件，需要特殊检验', businessType: '精密', department: '研发部' }
   ],
   ipqc: [
-    { id: 'IPQC001', applicantId: '3', applicantName: '王五', applyTime: '2024-01-16 08:10:00', status: 'submitted', workOrder: 'WO-202401-001', process: '焊接', step: '点焊', line: 'L01', station: 'W02', equipment: 'EQ-09', shift: '夜班', detailCount: 8, remark: '首件验证需现场确认' },
-    { id: 'IPQC002', applicantId: '4', applicantName: '赵六', applyTime: '2024-01-15 13:25:00', status: 'draft', workOrder: 'WO-202401-009', process: '组装', step: '装配', line: 'L03', station: 'W05', equipment: 'EQ-22', shift: '中班', detailCount: 5, remark: '' }
+    { id: 'IPQC001', applicantId: '3', applicantName: '王五', applyTime: '2024-01-16 08:10:00', status: '检验中', workOrder: 'WO-202401-001', process: '焊接', step: '点焊', line: 'L01', station: 'W02', equipment: 'EQ-09', shift: '夜班', detailCount: 8, remark: '首件验证需现场确认' },
+    { id: 'IPQC002', applicantId: '4', applicantName: '赵六', applyTime: '2024-01-15 13:25:00', status: '待检验', workOrder: 'WO-202401-009', process: '组装', step: '装配', line: 'L03', station: 'W05', equipment: 'EQ-22', shift: '中班', detailCount: 5, remark: '' }
   ],
   fqc: [
-    { id: 'FQC001', applicantId: '5', applicantName: '钱七', applyTime: '2024-01-16 10:20:00', status: 'submitted', productCode: 'P-900-XL', productName: '蓝牙耳机', productModel: 'Pro X', customer: 'ABC Corp', salesOrder: 'SO-202401-12', shippingOrder: 'SH-202401-02', packageBatch: 'BX001', detailCount: 9, remark: '客户指定抽检' },
-    { id: 'FQC002', applicantId: '2', applicantName: '李四', applyTime: '2024-01-15 17:40:00', status: 'draft', productCode: 'P-700-M', productName: '智能手环', productModel: 'Mini', customer: 'XYZ Ltd', salesOrder: 'SO-202401-08', shippingOrder: 'SH-202401-05', packageBatch: 'BX016', detailCount: 6, remark: '新增国家标准' }
+    { id: 'FQC001', applicantId: '5', applicantName: '钱七', applyTime: '2024-01-16 10:20:00', status: '检验完成', productCode: 'P-900-XL', productName: '蓝牙耳机', productModel: 'Pro X', customer: 'ABC Corp', salesOrder: 'SO-202401-12', shippingOrder: 'SH-202401-02', packageBatch: 'BX001', detailCount: 9, remark: '客户指定抽检' },
+    { id: 'FQC002', applicantId: '2', applicantName: '李四', applyTime: '2024-01-15 17:40:00', status: '待检验', productCode: 'P-700-M', productName: '智能手环', productModel: 'Mini', customer: 'XYZ Ltd', salesOrder: 'SO-202401-08', shippingOrder: 'SH-202401-05', packageBatch: 'BX016', detailCount: 6, remark: '新增国家标准' }
   ]
 })
 

yudao-ui/yudao-ui-admin-vue3/src/views/qms/ApplicationList.vue

@@ -208,11 +208,9 @@ const filterOptions = computed(() => {
   return {
     applicants: uniqueOptions(list, 'applicantId', 'applicantName'),
     applicationStatuses: [
-      { label: '草稿', value: 'draft' },
-      { label: '已提交', value: 'submitted' },
-      { label: '已审批', value: 'approved' },
-      { label: '已驳回', value: 'rejected' },
-      { label: '已作废', value: 'cancelled' }
+      { label: '待检验', value: '待检验' },
+      { label: '检验中', value: '检验中' },
+      { label: '检验完成', value: '检验完成' }
     ],
     processes: processOptions,
     lines: lineOptions,