From f2bfc5f4c74afdbb32a2597f16434ec13394c706 Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Fri, 23 Aug 2024 10:26:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=85=AC=E5=8F=B8=E9=9A=90=E6=82=A3?=
 =?UTF-8?q?=E8=80=83=E8=AF=84=20-=20=E6=94=AF=E6=8C=81=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E6=9C=AC=E4=BA=BA=E8=80=83=E8=AF=84=E6=97=B6=E9=97=B4=E8=8C=83?=
 =?UTF-8?q?=E5=9B=B4=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/evaluation.vue                 | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/views/evaluation/branch_hazard_assessment/components/evaluation.vue b/src/views/evaluation/branch_hazard_assessment/components/evaluation.vue
index 65cc3e4..49734de 100644
--- a/src/views/evaluation/branch_hazard_assessment/components/evaluation.vue
+++ b/src/views/evaluation/branch_hazard_assessment/components/evaluation.vue
@@ -82,6 +82,19 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="8" v-if="searchForm.userIs == '1'">
+          <el-form-item label="本人考评时间">
+            <el-date-picker
+              v-model="searchForm.userIsDate"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              style="width: 100%;"/>
+          </el-form-item>
+        </el-col>
         <el-col :span="4">
           <el-form-item label-width="10px">
             <el-button v-waves type="primary" icon="el-icon-search" @click="getList">
@@ -154,6 +167,13 @@
           </template>
         </template>
       </el-table-column>
+      <el-table-column prop="userIsTime" label="本人考评时间" v-if="searchForm.userIsDate != undefined && searchForm.userIsDate != '' && searchForm.userIsDate[0]">
+        <template slot-scope="{row}">
+          <template>
+            <span>{{ row.userIsTime }}</span>
+          </template>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" width="400px">
         <template slot-scope="{row}">
           <el-button type="info" icon="el-icon-view" @click="fnViewHidden(row.HIDDEN_ID)">查看隐患详情</el-button>
@@ -267,7 +287,8 @@ export default {
         DEPARTMENT_ID: null,
         STATE: '',
         hiddendescr: '',
-        userIs: ''
+        userIs: '',
+        userIsDate : []
       },
       evaluationDialog: {
         visible: false,
@@ -325,6 +346,7 @@ export default {
       this.searchForm.STATE = ''
       this.searchForm.hiddendescr = ''
       this.searchForm.userIs = ''
+      this.searchForm.userIsDate = ''
       this.getList()
     },
     // 获取列表
@@ -336,6 +358,8 @@ export default {
           ...this.searchForm,
           START_TIME: this.searchForm.dates && this.searchForm.dates[0],
           END_TIME: this.searchForm.dates && this.searchForm.dates[1],
+          USER_IS_START_TIME: this.searchForm.userIsDate && this.searchForm.userIsDate[0],
+          USER_IS_END_TIME: this.searchForm.userIsDate && this.searchForm.userIsDate[1],
           CORPINFO_ID: this.$parent.CORPINFO_ID,
           EVALUATIONCONFIG_ID: this.$parent.EVALUATIONCONFIG_ID,
           TYPE: this.$parent.TYPE