소스 검색

Merge remote-tracking branch 'origin/master'

jiangbiao 6 달 전
부모
커밋
fea29feaed
1개의 변경된 파일1개의 추가작업 그리고 12개의 파일을 삭제
  1. 1 12
      ui/src/views/pssr/patrol/index.vue

+ 1 - 12
ui/src/views/pssr/patrol/index.vue

@@ -1,17 +1,6 @@
 <template>
   <div class="app-container">
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-if="isApprove==0"
-          v-hasPermi="['pssr:patrol:export']"
-        >导出
-        </el-button>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -26,7 +15,7 @@
           <el-tag v-if="scope.row.planStatus==2" type="success">已确认</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="确认人" align="center" prop="confirmer" :show-overflow-tooltip="true"/>
+      <el-table-column label="确认人" align="center" prop="confirm1Name" :show-overflow-tooltip="true"/>
       <el-table-column label="确认时间" align="center" prop="confirmDate">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.confirmDate, '{y}-{m}-{d}') }}</span>