Преглед изворни кода

上岗证/作业证书一览表 - 移除“开工锅炉”岗位,并入“裂解”岗位

wangggziwen пре 1 година
родитељ
комит
8c8c253a53
1 измењених фајлова са 25 додато и 480 уклоњено
  1. 25 480
      ui/src/views/training/worklicensecertificate/index.vue

+ 25 - 480
ui/src/views/training/worklicensecertificate/index.vue

@@ -19,9 +19,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="开工锅炉" prop="boiler" label-width="50">
-        <el-checkbox v-model="boiler" @change="handleQuery"></el-checkbox>
-      </el-form-item>
       <el-form-item label="裂解" prop="cracking" label-width="50">
         <el-checkbox v-model="cracking" @change="handleQuery"></el-checkbox>
       </el-form-item>
@@ -34,338 +31,6 @@
       <el-form-item label="芳烃" prop="aromatic" label-width="50">
         <el-checkbox v-model="aromatic" @change="handleQuery"></el-checkbox>
       </el-form-item>
-      <!--<el-form-item label="身份证件号" prop="idnum">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.idnum"-->
-          <!--placeholder="请输入身份证件号"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="班组" prop="classes">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.classes"-->
-          <!--placeholder="请输入班组"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="职务" prop="post">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.post"-->
-          <!--placeholder="请输入职务"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="证件类型" prop="post">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.idtype"-->
-          <!--placeholder="请输入证件类型"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="证件号" prop="worklicenseIdnum">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.worklicenseIdnum"-->
-          <!--placeholder="请输入证件号"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="开工锅炉" prop="boiler">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.boiler"-->
-          <!--placeholder="请输入开工锅炉"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="裂解" prop="cracking">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.cracking"-->
-          <!--placeholder="请输入裂解"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="热区" prop="hotarea">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.hotarea"-->
-          <!--placeholder="请输入热区"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="冷区" prop="coldarea">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.coldarea"-->
-          <!--placeholder="请输入冷区"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="芳烃" prop="aromatic">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.aromatic"-->
-          <!--placeholder="请输入芳烃"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="取复证日期" prop="recertificatedate">-->
-        <!--<el-date-picker clearable size="small" style="width: 200px"-->
-          <!--v-model="queryParams.recertificatedate"-->
-          <!--type="date"-->
-          <!--value-format="yyyy-MM-dd"-->
-          <!--placeholder="选择取复证日期">-->
-        <!--</el-date-picker>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="有效期" prop="validity">-->
-        <!--<el-date-picker clearable size="small" style="width: 200px"-->
-          <!--v-model="queryParams.validity"-->
-          <!--type="date"-->
-          <!--value-format="yyyy-MM-dd"-->
-          <!--placeholder="选择有效期">-->
-        <!--</el-date-picker>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="压力容器" prop="container">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.container"-->
-          <!--placeholder="请输入压力容器"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="压力管道" prop="pipe">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.pipe"-->
-          <!--placeholder="请输入压力管道"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="取证日期" prop="reviewdate">-->
-        <!--<el-date-picker clearable size="small" style="width: 200px"-->
-          <!--v-model="queryParams.reviewdate"-->
-          <!--type="date"-->
-          <!--value-format="yyyy-MM-dd"-->
-          <!--placeholder="选择取证日期">-->
-        <!--</el-date-picker>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="有效期" prop="pipevalidity">-->
-        <!--<el-date-picker clearable size="small" style="width: 200px"-->
-          <!--v-model="queryParams.pipevalidity"-->
-          <!--type="date"-->
-          <!--value-format="yyyy-MM-dd"-->
-          <!--placeholder="选择有效期">-->
-        <!--</el-date-picker>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="证件号" prop="certificateNo">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.certificateNo"-->
-          <!--placeholder="请输入证件号"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="锅炉证" prop="boilerid">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.boilerid"-->
-          <!--placeholder="请输入锅炉证"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="有效期" prop="boilvalidity">-->
-        <!--<el-date-picker clearable size="small" style="width: 200px"-->
-          <!--v-model="queryParams.boilvalidity"-->
-          <!--type="date"-->
-          <!--value-format="yyyy-MM-dd"-->
-          <!--placeholder="选择有效期">-->
-        <!--</el-date-picker>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="加氢工艺" prop="hydrogenation">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.hydrogenation"-->
-          <!--placeholder="请输入加氢工艺"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="有效期" prop="hydvalidity">-->
-        <!--<el-date-picker clearable size="small" style="width: 200px"-->
-          <!--v-model="queryParams.hydvalidity"-->
-          <!--type="date"-->
-          <!--value-format="yyyy-MM-dd"-->
-          <!--placeholder="选择有效期">-->
-        <!--</el-date-picker>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="复审" prop="hydnextreview">-->
-        <!--<el-date-picker clearable size="small" style="width: 200px"-->
-          <!--v-model="queryParams.hydnextreview"-->
-          <!--type="date"-->
-          <!--value-format="yyyy-MM-dd"-->
-          <!--placeholder="选择复审">-->
-        <!--</el-date-picker>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="裂化工艺" prop="crackingid">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.crackingid"-->
-          <!--placeholder="请输入裂化工艺"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="有效期" prop="crackingvalidity">-->
-        <!--<el-date-picker clearable size="small" style="width: 200px"-->
-          <!--v-model="queryParams.crackingvalidity"-->
-          <!--type="date"-->
-          <!--value-format="yyyy-MM-dd"-->
-          <!--placeholder="选择有效期">-->
-        <!--</el-date-picker>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="复审" prop="crackingreview">-->
-        <!--<el-date-picker clearable size="small" style="width: 200px"-->
-          <!--v-model="queryParams.crackingreview"-->
-          <!--type="date"-->
-          <!--value-format="yyyy-MM-dd"-->
-          <!--placeholder="选择复审">-->
-        <!--</el-date-picker>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="裂化工艺" prop="refrigeration">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.refrigeration"-->
-          <!--placeholder="请输入裂化工艺"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="有效期" prop="refrigerationvalidity">-->
-        <!--<el-date-picker clearable size="small" style="width: 200px"-->
-          <!--v-model="queryParams.refrigerationvalidity"-->
-          <!--type="date"-->
-          <!--value-format="yyyy-MM-dd"-->
-          <!--placeholder="选择有效期">-->
-        <!--</el-date-picker>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="复审" prop="refrigerationview">-->
-        <!--<el-date-picker clearable size="small" style="width: 200px"-->
-          <!--v-model="queryParams.refrigerationview"-->
-          <!--type="date"-->
-          <!--value-format="yyyy-MM-dd"-->
-          <!--placeholder="选择复审">-->
-        <!--</el-date-picker>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="最近培训日期" prop="foremantrain">-->
-        <!--<el-date-picker clearable size="small" style="width: 200px"-->
-          <!--v-model="queryParams.foremantrain"-->
-          <!--type="date"-->
-          <!--value-format="yyyy-MM-dd"-->
-          <!--placeholder="选择最近培训日期">-->
-        <!--</el-date-picker>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="本次复审" prop="foremanreview">-->
-        <!--<el-date-picker clearable size="small" style="width: 200px"-->
-          <!--v-model="queryParams.foremanreview"-->
-          <!--type="date"-->
-          <!--value-format="yyyy-MM-dd"-->
-          <!--placeholder="选择本次复审">-->
-        <!--</el-date-picker>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="下次复审" prop="foremannextreview">-->
-        <!--<el-date-picker clearable size="small" style="width: 200px"-->
-          <!--v-model="queryParams.foremannextreview"-->
-          <!--type="date"-->
-          <!--value-format="yyyy-MM-dd"-->
-          <!--placeholder="选择下次复审">-->
-        <!--</el-date-picker>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="取证日期" prop="fireProtection">-->
-        <!--<el-date-picker clearable size="small" style="width: 200px"-->
-          <!--v-model="queryParams.fireProtection"-->
-          <!--type="date"-->
-          <!--value-format="yyyy-MM-dd"-->
-          <!--placeholder="选择取证日期">-->
-        <!--</el-date-picker>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="最近培训日期" prop="waterdate">-->
-        <!--<el-date-picker clearable size="small" style="width: 200px"-->
-          <!--v-model="queryParams.waterdate"-->
-          <!--type="date"-->
-          <!--value-format="yyyy-MM-dd"-->
-          <!--placeholder="选择最近培训日期">-->
-        <!--</el-date-picker>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="最近培训日期" prop="energydate">-->
-        <!--<el-date-picker clearable size="small" style="width: 200px"-->
-          <!--v-model="queryParams.energydate"-->
-          <!--type="date"-->
-          <!--value-format="yyyy-MM-dd"-->
-          <!--placeholder="选择最近培训日期">-->
-        <!--</el-date-picker>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="创建人" prop="createrCode">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.createrCode"-->
-          <!--placeholder="请输入创建人"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="创建时间" prop="createdate">-->
-        <!--<el-date-picker clearable size="small" style="width: 200px"-->
-          <!--v-model="queryParams.createdate"-->
-          <!--type="date"-->
-          <!--value-format="yyyy-MM-dd"-->
-          <!--placeholder="选择创建时间">-->
-        <!--</el-date-picker>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="修改人" prop="updaterCode">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.updaterCode"-->
-          <!--placeholder="请输入修改人"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="修改时间" prop="updatedate">-->
-        <!--<el-date-picker clearable size="small" style="width: 200px"-->
-          <!--v-model="queryParams.updatedate"-->
-          <!--type="date"-->
-          <!--value-format="yyyy-MM-dd"-->
-          <!--placeholder="选择修改时间">-->
-        <!--</el-date-picker>-->
-      <!--</el-form-item>-->
-      <!--<el-form-item label="部门编号" prop="deptId">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.deptId"-->
-          <!--placeholder="请输入部门编号"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
-      <!--</el-form-item>-->
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -402,24 +67,13 @@
           v-hasPermi="['training:worklicensecertificate:remove']"
         >删除</el-button>
       </el-col>
-        <!--<el-col :span="1.5">-->
-            <!--<el-button-->
-                    <!--type="info"-->
-                    <!--icon="el-icon-upload2"-->
-                    <!--size="mini"-->
-                    <!--@click="handleImport"-->
-                    <!--v-hasPermi="['training:worklicensecertificate:edit']"-->
-            <!--&gt;导入</el-button>-->
-        <!--</el-col>-->
-      <!--<el-col :span="1.5">-->
-        <!--<el-button-->
-          <!--type="warning"-->
-          <!--icon="el-icon-download"-->
-          <!--size="mini"-->
-          <!--@click="handleExport"-->
-          <!--v-hasPermi="['training:worklicensecertificate:export']"-->
-        <!--&gt;导出</el-button>-->
-      <!--</el-col>-->
+      <el-col :span="1.5">
+        <el-button
+          v-hasPermi="['training:worklicensecertificate:add']"
+          icon="el-icon-refresh"
+          size="mini"
+        >同步人员数据</el-button>
+      </el-col>
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -435,12 +89,6 @@
       <el-table-column label="证件类型" align="center" prop="idtype" :show-overflow-tooltip="true"/>
       <el-table-column label="证件号" align="center" prop="worklicenseIdnum" :show-overflow-tooltip="true" width="120"/>
       <el-table-column label="岗位">
-        <el-table-column label="开工锅炉" align="center" prop="boiler" :show-overflow-tooltip="true" style="background:#DDFFDD;">
-          <template slot-scope="scope">
-            <span>{{ scope.row.boiler == 1 ? "YES" : "NO" }}</span>
-            <el-button v-if="scope.row.boiler == 1" icon="el-icon-folder" style="color:#6e96fa;" @click="handleDoc(scope.row , 'license-boiler')"  circle></el-button>
-          </template>
-        </el-table-column>
         <el-table-column label="裂解" align="center" prop="cracking" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span>{{ scope.row.cracking == 1 ? "YES" : "NO" }}</span>
@@ -622,19 +270,6 @@
           </template>
         </el-table-column>
       </el-table-column>
-      <!--<el-table-column label="创建人" align="center" prop="createrCode" :show-overflow-tooltip="true"/>-->
-      <!--<el-table-column label="创建时间" align="center" prop="createdate" width="100">-->
-        <!--<template slot-scope="scope">-->
-          <!--<span>{{ parseTime(scope.row.createdate, '{y}-{m}-{d}') }}</span>-->
-        <!--</template>-->
-      <!--</el-table-column>-->
-      <!--<el-table-column label="修改人" align="center" prop="updaterCode" :show-overflow-tooltip="true"/>-->
-      <!--<el-table-column label="修改时间" align="center" prop="updatedate" width="100">-->
-        <!--<template slot-scope="scope">-->
-          <!--<span>{{ parseTime(scope.row.updatedate, '{y}-{m}-{d}') }}</span>-->
-        <!--</template>-->
-      <!--</el-table-column>-->
-      <!--<el-table-column label="部门编号" align="center" prop="deptId" :show-overflow-tooltip="true"/>-->
       <el-table-column label="操作" align="center" fixed="right" width="180" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -673,9 +308,6 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">
-            <!--<el-form-item label="唯一标识ID" prop="id">-->
-            <!--<el-input v-model="form.id" placeholder="请输入唯一标识ID" />-->
-            <!--</el-form-item>-->
             <el-form-item label="姓名" prop="name">
               <el-input v-model="form.name" placeholder="请输入姓名" />
             </el-form-item>
@@ -697,46 +329,26 @@
             <el-form-item label="证件号" prop="worklicenseIdnum">
               <el-input v-model="form.worklicenseIdnum" placeholder="请输入证件号" />
             </el-form-item>
-            <el-col :span="4">
-              <el-form-item :label="$t('开工锅炉')" prop="boiler">
-                <el-checkbox v-model="form.boiler"></el-checkbox>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
+            <el-col :span="6">
               <el-form-item :label="$t('裂解')" prop="cracking">
                 <el-checkbox v-model="form.cracking"></el-checkbox>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col :span="6">
               <el-form-item :label="$t('压缩')" prop="hotarea">
                 <el-checkbox v-model="form.hotarea"></el-checkbox>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col :span="6">
               <el-form-item :label="$t('分离')" prop="coldarea">
                 <el-checkbox v-model="form.coldarea"></el-checkbox>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col :span="6">
               <el-form-item :label="$t('芳烃')" prop="aromatic">
                 <el-checkbox v-model="form.aromatic"></el-checkbox>
               </el-form-item>
             </el-col>
-            <!--<el-form-item label="开工锅炉" prop="boiler">-->
-              <!--<el-input v-model="form.boiler" placeholder="请输入开工锅炉" />-->
-            <!--</el-form-item>-->
-            <!--<el-form-item label="裂解" prop="cracking">-->
-              <!--<el-input v-model="form.cracking" placeholder="请输入裂解" />-->
-            <!--</el-form-item>-->
-            <!--<el-form-item label="热区" prop="hotarea">-->
-              <!--<el-input v-model="form.hotarea" placeholder="请输入热区" />-->
-            <!--</el-form-item>-->
-            <!--<el-form-item label="冷区" prop="coldarea">-->
-              <!--<el-input v-model="form.coldarea" placeholder="请输入冷区" />-->
-            <!--</el-form-item>-->
-            <!--<el-form-item label="芳烃" prop="aromatic">-->
-              <!--<el-input v-model="form.aromatic" placeholder="请输入芳烃" />-->
-            <!--</el-form-item>-->
             <el-form-item label="取复证日期" prop="recertificatedate">
               <el-date-picker clearable size="small" style="width: 200px"
                               v-model="form.recertificatedate"
@@ -899,34 +511,6 @@
                               placeholder="选择锅炉能效最近培训日期">
               </el-date-picker>
             </el-form-item>
-            <!--<el-form-item label="删除状态" prop="delFlag">-->
-            <!--<el-input v-model="form.delFlag" placeholder="请输入删除状态" />-->
-            <!--</el-form-item>-->
-            <!--<el-form-item label="创建人" prop="createrCode">-->
-            <!--<el-input v-model="form.createrCode" placeholder="请输入创建人" />-->
-            <!--</el-form-item>-->
-            <!--<el-form-item label="创建时间" prop="createdate">-->
-            <!--<el-date-picker clearable size="small" style="width: 200px"-->
-            <!--v-model="form.createdate"-->
-            <!--type="date"-->
-            <!--value-format="yyyy-MM-dd"-->
-            <!--placeholder="选择创建时间">-->
-            <!--</el-date-picker>-->
-            <!--</el-form-item>-->
-            <!--<el-form-item label="修改人" prop="updaterCode">-->
-            <!--<el-input v-model="form.updaterCode" placeholder="请输入修改人" />-->
-            <!--</el-form-item>-->
-            <!--<el-form-item label="修改时间" prop="updatedate">-->
-            <!--<el-date-picker clearable size="small" style="width: 200px"-->
-            <!--v-model="form.updatedate"-->
-            <!--type="date"-->
-            <!--value-format="yyyy-MM-dd"-->
-            <!--placeholder="选择修改时间">-->
-            <!--</el-date-picker>-->
-            <!--</el-form-item>-->
-            <!--<el-form-item label="部门编号" prop="deptId">-->
-            <!--<el-input v-model="form.deptId" placeholder="请输入部门编号" />-->
-            <!--</el-form-item>-->
           </el-col>
         </el-row>
       </el-form>
@@ -935,36 +519,6 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-      <!-- 用户导入对话框 -->
-      <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-          <el-upload
-                  ref="upload"
-                  :limit="1"
-                  accept=".xlsx, .xls"
-                  :headers="upload.headers"
-                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
-                  :disabled="upload.isUploading"
-                  :on-progress="handleFileUploadProgress"
-                  :on-success="handleFileSuccess"
-                  :auto-upload="false"
-                  drag
-          >
-              <i class="el-icon-upload"></i>
-              <div class="el-upload__text">
-                  将文件拖到此处,或
-                  <em>点击上传</em>
-              </div>
-              <div class="el-upload__tip" slot="tip">
-                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
-                  <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
-              </div>
-              <div class="el-upload__tip" style="color:red" slot="tip">提示:仅允许导入“xls”或“xlsx”格式文件!</div>
-          </el-upload>
-          <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="submitFileForm">确 定</el-button>
-              <el-button @click="upload.open = false">取 消</el-button>
-          </div>
-      </el-dialog>
     <!-- 报告附件对话框 -->
     <el-dialog  :close-on-click-modal="false" v-dialogDrag :title="doc.title" :visible.sync="doc.open" width="1000px" append-to-body >
       <el-upload ref="doc"
@@ -1041,9 +595,7 @@
           <iframe :src="pdf.pdfUrl" frameborder="0" width="100%" height="700px"></iframe>
         </div>
       </el-dialog>
-
       <div slot="footer" class="dialog-footer">
-        <!--        <el-button type="primary" @click="submitFileForm">{{ $t('确 定') }}</el-button>-->
         <el-button @click="doc.open = false">{{ $t('返 回') }}</el-button>
       </div>
     </el-dialog>
@@ -1232,40 +784,33 @@ export default {
   methods: {
     tableHeaderStyle({row, column, rowIndex, columnIndex}) {
       let style = "text-align:center;";
-      // if (column.label==='岗位'||column.label==='开工锅炉'||column.label==='裂解'
-      //   ||column.label==='热区'||column.label==='冷区'||column.label==='芳烃') {
-      //   console.log(column.label)
-      //   console.log(rowIndex)
-      //   console.log(columnIndex)
-      //   return style += "background:#DDFFDD;";
-      // }
       if ((rowIndex === 0 && columnIndex === 8) || (rowIndex === 1 && columnIndex === 0)
         || (rowIndex === 1 && columnIndex === 1) || (rowIndex === 1 && columnIndex === 2)
-        || (rowIndex === 1 && columnIndex === 3) || (rowIndex === 1 && columnIndex === 4)
+        || (rowIndex === 1 && columnIndex === 3)
         ||(rowIndex === 0 && columnIndex === 9) || (rowIndex === 0 && columnIndex === 10)
         || (rowIndex === 1 && columnIndex === 21) || (rowIndex === 1 && columnIndex === 22)
-        || (rowIndex === 1 && columnIndex === 23) || (rowIndex === 1 && columnIndex === 24)
+        || (rowIndex === 1 && columnIndex === 23) || (rowIndex === 1 && columnIndex === 20)
         || (rowIndex === 0 && columnIndex === 14)) {
         return style += "background:#DDFFDD;";
       }
       if ((rowIndex === 0 && columnIndex === 11) || (rowIndex === 1 && columnIndex === 5)
         || (rowIndex === 1 && columnIndex === 6) || (rowIndex === 1 && columnIndex === 7)
-        || (rowIndex === 1 && columnIndex === 8) || (rowIndex === 1 && columnIndex === 9)
-        || (rowIndex === 1 && columnIndex === 25) || (rowIndex === 1 && columnIndex === 26)
+        || (rowIndex === 1 && columnIndex === 8) || (rowIndex === 1 && columnIndex === 4)
+        || (rowIndex === 1 && columnIndex === 25) || (rowIndex === 1 && columnIndex === 24)
         || (rowIndex === 0 && columnIndex === 15)) {
         return style += "background:#FFFFDD;";
       }
       if ((rowIndex === 0 && columnIndex === 12) || (rowIndex === 1 && columnIndex === 10)
-        || (rowIndex === 1 && columnIndex === 11) || (rowIndex === 1 && columnIndex === 27)
-        || (rowIndex === 1 && columnIndex === 28) || (rowIndex === 0 && columnIndex === 16)) {
+        || (rowIndex === 1 && columnIndex === 9) || (rowIndex === 1 && columnIndex === 27)
+        || (rowIndex === 1 && columnIndex === 26) || (rowIndex === 0 && columnIndex === 16)) {
         return style += "background:#DDFFFF;";
       }
       if ((rowIndex === 0 && columnIndex === 13) || (rowIndex === 1 && columnIndex === 12)
         || (rowIndex === 1 && columnIndex === 13) || (rowIndex === 1 && columnIndex === 14)
         || (rowIndex === 1 && columnIndex === 15) || (rowIndex === 1 && columnIndex === 16)
         || (rowIndex === 1 && columnIndex === 17) || (rowIndex === 1 && columnIndex === 18)
-        || (rowIndex === 1 && columnIndex === 19) || (rowIndex === 1 && columnIndex === 20)
-        || (rowIndex === 1 && columnIndex === 29) || (rowIndex === 1 && columnIndex === 30
+        || (rowIndex === 1 && columnIndex === 19) || (rowIndex === 1 && columnIndex === 11)
+        || (rowIndex === 1 && columnIndex === 29) || (rowIndex === 1 && columnIndex === 28
           || (rowIndex === 0 && columnIndex === 17))) {
         return style += "background:rgb(229, 249, 175);";
       }
@@ -1277,17 +822,17 @@ export default {
         style += " color: red;";
       }
       if (columnIndex === 8||columnIndex === 9||columnIndex === 10||columnIndex === 11
-        ||columnIndex === 12||columnIndex === 13||columnIndex === 14 ||columnIndex === 31
-        ||columnIndex === 32||columnIndex === 33||columnIndex === 34) {
+        ||columnIndex === 12||columnIndex === 13 ||columnIndex === 31
+        ||columnIndex === 32||columnIndex === 33||columnIndex === 30) {
         return style += "background:#DDFFDD;";
       } else if (columnIndex === 15||columnIndex === 16||columnIndex === 17||columnIndex === 18
-        ||columnIndex === 19 ||columnIndex === 35||columnIndex === 36) {
+        ||columnIndex === 14 ||columnIndex === 35||columnIndex === 34) {
         return style += "background:#FFFFDD;";
-      } else if (columnIndex === 20||columnIndex === 21||columnIndex === 37||columnIndex === 38) {
+      } else if (columnIndex === 20||columnIndex === 19||columnIndex === 37||columnIndex === 36) {
         return style += "background:#DDFFFF;";
       } else if (columnIndex === 22||columnIndex === 23||columnIndex === 24 ||columnIndex === 25
         ||columnIndex === 26||columnIndex === 27 ||columnIndex === 28||columnIndex === 29
-        ||columnIndex === 30 ||columnIndex === 39||columnIndex === 40) {
+        ||columnIndex === 21 ||columnIndex === 39||columnIndex === 38) {
         return style += "background:rgb(229, 249, 175);";
       } else {
         return style;
@@ -1377,7 +922,7 @@ export default {
       var workType = "";
       if (fileType === "license-boiler"){
         workType = '开工锅炉上岗证';
-      }else if (fileType === "license-cracking"){
+      } else if (fileType === "license-cracking"){
         workType = '裂解上岗证';
       }else if (fileType === "license-hotarea"){
         workType = '压缩上岗证';