diff --git a/src/api/qms/QcInspectionMain/types.ts b/src/api/qms/QcInspectionMain/types.ts
index 5c881b1..58d815a 100644
--- a/src/api/qms/QcInspectionMain/types.ts
+++ b/src/api/qms/QcInspectionMain/types.ts
@@ -90,9 +90,14 @@ export interface QcInspectionMainVO {
team: string;
/**
- * 检验时间
+ * 检验开始时间
*/
- inspectionTime: string;
+ inspectionStartTime: string;
+
+ /**
+ * 检验结束时间
+ */
+ inspectionEndTime: string;
/**
* 生产订单号
@@ -219,9 +224,14 @@ export interface QcInspectionMainForm extends BaseEntity {
team?: string;
/**
- * 检验时间
+ * 检验开始时间
*/
- inspectionTime?: string;
+ inspectionStartTime?: string;
+
+ /**
+ * 检验结束时间
+ */
+ inspectionEndTime?: string;
/**
* 生产订单号
@@ -348,9 +358,14 @@ export interface QcInspectionMainQuery extends PageQuery {
team?: string;
/**
- * 检验时间
+ * 检验开始时间
*/
- inspectionTime?: string;
+ inspectionStartTime?: string;
+
+ /**
+ * 检验结束时间
+ */
+ inspectionEndTime?: string;
/**
* 生产订单号
@@ -372,12 +387,12 @@ export interface QcInspectionMainQuery extends PageQuery {
*/
supplierName?: string;
-
+
/**
* 模板名称
*/
templateName?: string;//join
-
+
/**
* 日期范围参数
diff --git a/src/api/qms/qcUnqualifiedReview/types.ts b/src/api/qms/qcUnqualifiedReview/types.ts
index 5e45b47..6ee51b9 100644
--- a/src/api/qms/qcUnqualifiedReview/types.ts
+++ b/src/api/qms/qcUnqualifiedReview/types.ts
@@ -95,9 +95,14 @@ export interface QcUnqualifiedReviewVO {
reviewerId: string | number;
/**
- * 评审时间
+ * 评审开始时间
*/
- reviewTime: string;
+ reviewStartTime: string;
+
+ /**
+ * 评审结束时间
+ */
+ reviewEndTime: string;
/**
* 备注
@@ -203,9 +208,14 @@ export interface QcUnqualifiedReviewForm extends BaseEntity {
reviewerId?: string | number;
/**
- * 评审时间
+ * 评审开始时间
*/
- reviewTime?: string;
+ reviewStartTime?: string;
+
+ /**
+ * 评审结束时间
+ */
+ reviewEndTime?: string;
/**
* 备注
@@ -312,10 +322,14 @@ export interface QcUnqualifiedReviewQuery extends PageQuery {
reviewerId?: string | number;
/**
- * 评审时间
+ * 评审开始时间
*/
- reviewTime?: string;
+ reviewStartTime?: string;
+ /**
+ * 评审结束时间
+ */
+ reviewEndTime?: string;
/**
* 日期范围参数
*/
diff --git a/src/views/qms/QcInspectionMain/index.vue b/src/views/qms/QcInspectionMain/index.vue
index 2db1bcd..5343e52 100644
--- a/src/views/qms/QcInspectionMain/index.vue
+++ b/src/views/qms/QcInspectionMain/index.vue
@@ -31,14 +31,14 @@
-
-
-
+
+
+
+
+
+
+
+
搜索
重置
@@ -106,16 +106,21 @@
-
+
- {{ parseTime(scope.row.inspectionTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+ {{ parseTime(scope.row.inspectionStartTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
-
-
-
-
-
+
+
+ {{ parseTime(scope.row.inspectionEndTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+
+
+
@@ -345,9 +350,9 @@
-
+
+
+
+
+
+
+
@@ -631,12 +647,13 @@ const columns = ref([
{ 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: 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 },
]);
const initFormData: QcInspectionMainForm = {
@@ -658,7 +675,8 @@ const initFormData: QcInspectionMainForm = {
inspector: undefined,
shift: undefined,
team: undefined,
- inspectionTime: undefined,
+ inspectionStartTime: undefined,
+ inspectionEndTime: undefined,
productionOrder: undefined,
batchNo: undefined,
barcode: undefined,
@@ -713,7 +731,8 @@ const data = reactive>({
inspector: undefined,
shift: undefined,
team: undefined,
- inspectionTime: undefined,
+ inspectionStartTime: undefined,
+ inspectionEndTime: undefined,
productionOrder: undefined,
batchNo: undefined,
barcode: undefined,
diff --git a/src/views/qms/qcUnqualifiedReview/index.vue b/src/views/qms/qcUnqualifiedReview/index.vue
index d30ae99..e6dfd8a 100644
--- a/src/views/qms/qcUnqualifiedReview/index.vue
+++ b/src/views/qms/qcUnqualifiedReview/index.vue
@@ -68,14 +68,6 @@
-
-
-
搜索
重置
@@ -151,12 +143,17 @@
-
+
- {{ parseTime(scope.row.reviewTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+ {{ parseTime(scope.row.reviewStartTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
-
+
+
+ {{ parseTime(scope.row.reviewEndTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
@@ -312,15 +309,25 @@
-
+
+
+
+
+
+
+
@@ -485,8 +492,9 @@ const columns = ref([
// { key: 16, label: `质检人ID`, visible: true },
{ key: 16, label: `评审人`, visible: true },
// { key: 18, label: `评审人ID`, visible: true },
- { key: 17, label: `评审时间`, visible: true },
- { key: 18, label: `备注`, visible: true },
+ { key: 17, label: `评审开始时间`, visible: true },
+ { key: 18, label: `评审结束时间`, visible: true },
+ { key: 19, label: `备注`, visible: true },
]);
@@ -510,7 +518,8 @@ const initFormData: QcUnqualifiedReviewForm = {
inspectorId: undefined,
reviewer: undefined,
reviewerId: undefined,
- reviewTime: undefined,
+ reviewStartTime: undefined,
+ reviewEndTime: undefined,
remark: undefined,
}
const data = reactive>({
@@ -537,7 +546,8 @@ const data = reactive