隐患整改列表修改

huaxin-web/src/views/checktask/danger/index.vue

@@ -31,13 +31,13 @@
         </el-select>
       </el-form-item>-->
 
-      <el-form-item label="责任归属" prop="flag">
+      <!--<el-form-item label="责任归属" prop="flag">
         <el-select v-model="queryParams.flag" placeholder="请选择责任归属" clearable size="small">
           <el-option label="安全管理部" value="1" />
           <el-option label="客服运营部" value="2" />
           <el-option label="生产运营部" value="3" />
         </el-select>
-      </el-form-item>
+      </el-form-item>-->
 
 
       <el-form-item label="隐患状态" prop="status">
@@ -74,7 +74,7 @@
         </el-date-picker>
       </el-form-item>
 
-      <el-form-item label="营业网点" prop="branch">
+     <!-- <el-form-item label="营业网点" prop="branch">
         <el-select v-model="queryParams.branch" placeholder="请选择营业网点">
           <el-option
             v-for="dict in sceneOptions"
@@ -83,7 +83,7 @@
             :value="dict.dictValue"
           />
         </el-select>
-      </el-form-item>
+      </el-form-item>-->
 
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -92,7 +92,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!--<el-col :span="1.5">
         <el-button
           type="primary"
           plain
@@ -101,7 +101,7 @@
           @click="handleAdd"
           v-hasPermi="['checkTask:danger:add']"
         >新增</el-button>
-      </el-col>
+      </el-col>-->
 
       <el-col :span="1.5">
         <el-button
@@ -136,8 +136,8 @@
         </template>
       </el-table-column>
       <el-table-column label="隐患来源" align="center" prop="type" :formatter="typeFormatter"/>
-      <el-table-column label="营业网点" align="center" prop="branch" :formatter="branchFormat"/>
-      <el-table-column label="表具编号" align="center" prop="meterNum" />
+      <!--<el-table-column label="营业网点" align="center" prop="branch" :formatter="branchFormat"/>
+      <el-table-column label="表具编号" align="center" prop="meterNum" />-->
       <!--<el-table-column label="责任归属" align="center" prop="flag">
         <template slot-scope="scope">
           <span v-if="scope.row.flag == 1">安全管理部</span>
@@ -168,6 +168,18 @@
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="整改人" align="center" prop="reformName">
+        <template slot-scope="scope">
+          <span v-if="scope.row.reformName">{{ scope.row.reformName }}</span>
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="整改时间" align="center" prop="reformTime" width="150">
+        <template slot-scope="scope">
+          <span v-if="scope.row.reformTime">{{ parseTime(scope.row.reformTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
       <!--<el-table-column label="备注" align="center" prop="remark" width="100" :show-overflow-tooltip="true"/>-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">