src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list.vue

@@ -7,15 +7,12 @@
             <el-input v-model="KEYWORDS" placeholder="请输入编号"/>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label="动火时间范围">
+        <el-col :span="4">
+          <el-form-item label="动火时间">
             <el-date-picker
               v-model="WORK_TIME"
-              type="daterange"
+              type="datetime"
               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%;" />

src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list_cfd.vue

@@ -7,15 +7,12 @@
             <el-input v-model="KEYWORDS" placeholder="请输入编号"/>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label="动火时间范围">
+        <el-col :span="4">
+          <el-form-item label="动火时间">
             <el-date-picker
               v-model="WORK_TIME"
-              type="daterange"
+              type="datetime"
               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%;" />

src/views/xgf/flow/components/list.vue

@@ -42,7 +42,8 @@
       <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="LIMIT_END_TIME" 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 label="操作" align="center" width="300">
         <template slot-scope="{row}">
           <el-row>