diff --git a/src/views/qms/QcInspectionMain/index.vue b/src/views/qms/QcInspectionMain/index.vue
index fa83e7f..d341da9 100644
--- a/src/views/qms/QcInspectionMain/index.vue
+++ b/src/views/qms/QcInspectionMain/index.vue
@@ -90,43 +90,43 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
{{ parseTime(scope.row.inspectionStartTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
-
+
{{ parseTime(scope.row.inspectionEndTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
-
-
-
-
-
+
+
+
+
+
@@ -655,27 +655,27 @@ const columns = ref([
{ key: 1, label: `检测单号/卡号`, visible: true },
{ key: 2, label: `关联模板主表`, visible: true },
{ key: 3, label: `物料编码`, visible: true },
- { key: 4, label: `物料类型`, visible: true },
- { key: 5, label: `物料名称`, visible: true },
- { key: 6, label: `工序名称`, visible: true },
- { key: 7, label: `工位名称`, visible: true },
- { key: 8, label: `质检数量`, visible: true },
- { key: 9, label: `合格数`, visible: true },
- { key: 10, label: `不合格数`, visible: true },
- { key: 11, label: `质检结果`, visible: true },
- { key: 12, label: `车间`, visible: true },
- { key: 13, label: `检测类别`, visible: true },
- { key: 14, label: `单据状态`, visible: true },
- { key: 15, label: `检测人员`, visible: true },
- { key: 16, label: `班次`, visible: true },
- { key: 17, label: `班组`, visible: true },
- { key: 18, label: `检验开始时间`, visible: true },
- { key: 19, label: `检验结束时间`, visible: true },
- { key: 20, label: `生产订单号`, visible: true },
- { key: 21, label: `批次号`, visible: true },
- { key: 22, label: `条码号`, visible: true },
- { key: 23, label: `供应商名称`, visible: true },
- { key: 24, label: `备注`, visible: true },
+ // { key: 4, label: `物料类型`, visible: true },
+ { key: 4, label: `物料名称`, visible: true },
+ { key: 5, label: `工序名称`, visible: true },
+ { key: 6, label: `工位名称`, visible: true },
+ { key: 7, label: `质检数量`, visible: true },
+ { key: 8, label: `合格数`, visible: true },
+ { key: 9, label: `不合格数`, visible: true },
+ { key: 10, label: `质检结果`, visible: true },
+ { key: 11, label: `车间`, visible: true },
+ { key: 12, label: `检测类型`, visible: true },
+ { key: 13, label: `单据状态`, visible: true },
+ { key: 14, label: `检测人员`, visible: true },
+ { key: 15, label: `班次`, visible: true },
+ { key: 16, label: `班组`, visible: true },
+ { key: 17, label: `检验开始时间`, visible: true },
+ { key: 18, label: `检验结束时间`, visible: true },
+ { key: 19, label: `生产订单号`, visible: true },
+ { key: 20, label: `批次号`, visible: true },
+ { key: 21, label: `条码号`, visible: true },
+ { key: 22, label: `供应商名称`, visible: true },
+ { key: 23, label: `备注`, visible: true },
]);
const initFormData: QcInspectionMainForm = {