feat(qms): 将检验时间和评审时间都各自拆分为开始时间和结束时间

- 在 QcInspectionMain 和 qcUnqualifiedReview 组件中，将单一的检验时间和评审时间字段拆分为开始时间和结束时间字段
- 更新了相应的 API 类型定义，增加了新的字段
-调整了表格列和表单字段以适应新的时间范围格式

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
-    
+
 
     /**
      * 日期范围参数

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;
     /**
      * 日期范围参数
      */

src/views/qms/QcInspectionMain/index.vue

@@ -31,14 +31,14 @@
                 <el-option v-for="dict in qc_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
               </el-select>
             </el-form-item>
-            <el-form-item label="检验时间" prop="inspectionTime">
+<!--            <el-form-item label="检验时间" prop="inspectionTime">-->
-              <el-date-picker clearable
+<!--              <el-date-picker clearable-->
-                              v-model="queryParams.inspectionTime"
+<!--                              v-model="queryParams.inspectionTime"-->
-                              type="date"
+<!--                              type="date"-->
-                              value-format="YYYY-MM-DD"
+<!--                              value-format="YYYY-MM-DD"-->
-                              placeholder="请选择检验时间"
+<!--                              placeholder="请选择检验时间"-->
-              />
+<!--              />-->
-            </el-form-item>
+<!--            </el-form-item>-->
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -106,16 +106,21 @@
         <el-table-column label="检测人员" align="center" prop="inspector" v-if="columns[15].visible"/>
         <el-table-column label="班次" align="center" prop="shift" v-if="columns[16].visible"/>
         <el-table-column label="班组" align="center" prop="team" v-if="columns[17].visible"/>
-        <el-table-column label="检验时间" align="center" prop="inspectionTime" width="180" v-if="columns[18].visible">
+        <el-table-column label="检验时间" align="center" prop="inspectionStartTime" width="180" v-if="columns[18].visible">
           <template #default="scope">
-            <span>{{ parseTime(scope.row.inspectionTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+            <span>{{ parseTime(scope.row.inspectionStartTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="生产订单号" align="center" prop="productionOrder" v-if="columns[19].visible"/>
+        <el-table-column label="检验结束时间" align="center" prop="inspectionEndTime" width="180" v-if="columns[19].visible">
-        <el-table-column label="批次号" align="center" prop="batchNo" v-if="columns[20].visible"/>
+          <template #default="scope">
-        <el-table-column label="条码号" align="center" prop="barcode" v-if="columns[21].visible"/>
+            <span>{{ parseTime(scope.row.inspectionEndTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-        <el-table-column label="供应商名称" align="center" prop="supplierName" v-if="columns[22].visible"/>
+          </template>
-        <el-table-column label="备注" align="center" prop="remark" v-if="columns[23].visible"/>
+        </el-table-column>
+        <el-table-column label="生产订单号" align="center" prop="productionOrder" v-if="columns[20].visible"/>
+        <el-table-column label="批次号" align="center" prop="batchNo" v-if="columns[21].visible"/>
+        <el-table-column label="条码号" align="center" prop="barcode" v-if="columns[22].visible"/>
+        <el-table-column label="供应商名称" align="center" prop="supplierName" v-if="columns[23].visible"/>
+        <el-table-column label="备注" align="center" prop="remark" v-if="columns[24].visible"/>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
@@ -345,9 +350,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="检验时间" prop="inspectionTime">
+            <el-form-item label="检验开始时间" prop="inspectionStartTime">
               <el-date-picker clearable
-                              v-model="form.inspectionTime"
+                              v-model="form.inspectionStartTime"
                               type="datetime"
                               value-format="YYYY-MM-DD HH:mm:ss"
                               placeholder="请选择检验时间"
@@ -355,6 +360,17 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="检验结束时间" prop="inspectionEndTime">
+              <el-date-picker clearable
+                              v-model="form.inspectionEndTime"
+                              type="datetime"
+                              value-format="YYYY-MM-DD HH:mm:ss"
+                              placeholder="请选择检验结束时间"
+                              style="width: 100%;">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="生产订单号" prop="productionOrder">
               <el-input v-model="form.productionOrder" placeholder="请输入生产订单号" />
@@ -631,12 +647,13 @@ const columns = ref<FieldOption[]>([
   { key: 15, label: `检测人员`, visible: true },
   { key: 16, label: `班次`, visible: true },
   { key: 17, label: `班组`, visible: true },
-  { key: 18, label: `检验时间`, visible: true },
+  { key: 18, label: `检验开始时间`, visible: true },
-  { key: 19, label: `生产订单号`, visible: true },
+  { key: 19, label: `检验结束时间`, visible: true },
-  { key: 20, label: `批次号`, visible: true },
+  { key: 20, label: `生产订单号`, visible: true },
-  { key: 21, label: `条码号`, visible: true },
+  { key: 21, label: `批次号`, visible: true },
-  { key: 22, label: `供应商名称`, visible: true },
+  { key: 22, label: `条码号`, visible: true },
-  { key: 23, 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<PageData<QcInspectionMainForm, QcInspectionMainQuery>>({
     inspector: undefined,
     shift: undefined,
     team: undefined,
-    inspectionTime: undefined,
+    inspectionStartTime: undefined,
+    inspectionEndTime: undefined,
     productionOrder: undefined,
     batchNo: undefined,
     barcode: undefined,

src/views/qms/qcUnqualifiedReview/index.vue

@@ -68,14 +68,6 @@
             <!-- <el-form-item label="评审人ID" prop="reviewerId">
               <el-input v-model="queryParams.reviewerId" placeholder="请输入评审人ID" clearable @keyup.enter="handleQuery" />
             </el-form-item> -->
-            <el-form-item label="评审时间" prop="reviewTime">
-              <el-date-picker clearable
-                v-model="queryParams.reviewTime"
-                type="date"
-                value-format="YYYY-MM-DD"
-                placeholder="请选择评审时间"
-              />
-            </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -151,12 +143,17 @@
         <!-- <el-table-column label="质检人ID" align="center" prop="inspectorId" v-if="columns[16].visible"/> -->
         <el-table-column label="评审人" align="center" prop="reviewer" v-if="columns[16].visible"/>
         <!-- <el-table-column label="评审人ID" align="center" prop="reviewerId" v-if="columns[19].visible"/> -->
-        <el-table-column label="评审时间" align="center" prop="reviewTime" width="180" v-if="columns[17].visible">
+        <el-table-column label="评审开始时间" align="center" prop="reviewStartTime" width="180" v-if="columns[17].visible">
           <template #default="scope">
-            <span>{{ parseTime(scope.row.reviewTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+            <span>{{ parseTime(scope.row.reviewStartTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="备注" align="center" prop="remark" v-if="columns[18].visible"/>
+        <el-table-column label="评审结束时间" align="center" prop="reviewEndTime" width="180" v-if="columns[18].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.reviewEndTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark" v-if="columns[19].visible"/>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
@@ -312,15 +309,25 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="评审时间" prop="reviewTime">
+            <el-form-item label="评审开始时间" prop="reviewStartTime">
               <el-date-picker clearable
-                v-model="form.reviewTime"
+                v-model="form.reviewStartTime"
                 type="datetime"
                 value-format="YYYY-MM-DD HH:mm:ss"
                 placeholder="请选择评审时间">
               </el-date-picker>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="评审结束时间" prop="reviewEndTime">
+              <el-date-picker clearable
+                              v-model="form.reviewEndTime"
+                              type="datetime"
+                              value-format="YYYY-MM-DD HH:mm:ss"
+                              placeholder="请选择评审时间">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
@@ -485,8 +492,9 @@ const columns = ref<FieldOption[]>([
         // { key: 16, label: `质检人ID`, visible: true },
         { key: 16, label: `评审人`, visible: true },
         // { key: 18, label: `评审人ID`, visible: true },
-        { key: 17, label: `评审时间`, visible: true },
+        { key: 17, label: `评审开始时间`, visible: true },
-        { key: 18, 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<PageData<QcUnqualifiedReviewForm, QcUnqualifiedReviewQuery>>({
@@ -537,7 +546,8 @@ const data = reactive<PageData<QcUnqualifiedReviewForm, QcUnqualifiedReviewQuery
     inspectorId: undefined,
     reviewer: undefined,
     reviewerId: undefined,
-    reviewTime: undefined,
+    reviewStartTime: undefined,
+    reviewEndTime: undefined,
     params: {
     }
   },