From 9591af95946cbecf7b96666877565035b98deb72 Mon Sep 17 00:00:00 2001
From: huangyuxuan <huangyuxuan@zcloudchina.com>
Date: Thu, 6 Mar 2025 18:53:50 +0800
Subject: [PATCH] =?UTF-8?q?[=E7=B3=BB=E7=BB=9F=E4=BC=98=E5=8C=96](dev):=20?=
 =?UTF-8?q?=20-=20=E9=83=A8=E9=97=A8=E6=8E=92=E5=BA=8F=EF=BC=8C=E5=8A=A8?=
 =?UTF-8?q?=E7=81=AB=E6=97=B6=E9=97=B4=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/hotwork/hotwork_list/components/list.vue  | 9 ++++++---
 .../hotwork/hotwork_list/components/list_cfd.vue         | 9 ++++++---
 src/views/xgf/flow/components/list.vue                   | 3 +--
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list.vue b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list.vue
index fdb2df3..e6c55d3 100644
--- a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list.vue
+++ b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list.vue
@@ -7,12 +7,15 @@
             <el-input v-model="KEYWORDS" placeholder="请输入编号"/>
           </el-form-item>
         </el-col>
-        <el-col :span="4">
-          <el-form-item label="动火时间">
+        <el-col :span="6">
+          <el-form-item label="动火时间范围">
             <el-date-picker
               v-model="WORK_TIME"
-              type="datetime"
+              type="daterange"
               unlink-panels
+              range-separator="至"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
               value-format="yyyy-MM-dd HH:mm:SS"
               format="yyyy-MM-dd HH:mm:SS"
               style="width: 100%;" />
diff --git a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list_cfd.vue b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list_cfd.vue
index 66d0292..cb28370 100644
--- a/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list_cfd.vue
+++ b/src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list_cfd.vue
@@ -7,12 +7,15 @@
             <el-input v-model="KEYWORDS" placeholder="请输入编号"/>
           </el-form-item>
         </el-col>
-        <el-col :span="4">
-          <el-form-item label="动火时间">
+        <el-col :span="6">
+          <el-form-item label="动火时间范围">
             <el-date-picker
               v-model="WORK_TIME"
-              type="datetime"
+              type="daterange"
               unlink-panels
+              range-separator="至"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
               value-format="yyyy-MM-dd HH:mm:SS"
               format="yyyy-MM-dd HH:mm:SS"
               style="width: 100%;" />
diff --git a/src/views/xgf/flow/components/list.vue b/src/views/xgf/flow/components/list.vue
index e9de514..86b9184 100644
--- a/src/views/xgf/flow/components/list.vue
+++ b/src/views/xgf/flow/components/list.vue
@@ -42,8 +42,7 @@
       <el-table-column prop="USERNAME" label="用户名" align="center"/>
       <el-table-column prop="NAME" label="姓名" align="center"/>
       <el-table-column prop="BELONG_TO_CORP_NAME" label="外派公司名称" align="center"/>
-      <el-table-column prop="VALIDITY_PERIOD_START" label="培训有效期开始时间" align="center"/>
-      <el-table-column prop="VALIDITY_PERIOD_END" label="培训有效期结束时间" align="center"/>
+      <el-table-column prop="LIMIT_END_TIME" label="培训有效期结束时间" align="center"/>
       <el-table-column label="操作" align="center" width="300">
         <template slot-scope="{row}">
           <el-row>