Compare commits
No commits in common. "8cc04a5b352c42c15db407eee68a581ef20cd917" and "ccea6bf39a5978c474f6072a43a2521737f53b1f" have entirely different histories.
8cc04a5b35
...
ccea6bf39a
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB |
|
|
@ -58,7 +58,7 @@
|
|||
<el-table-column prop="MAIN_DEPARTMENT_NAME" label="股份主管部门" width="200" />
|
||||
<el-table-column prop="SUPERVISE_CORPINFO_NAME" label="基层单位主管公司" width="200" />
|
||||
<el-table-column prop="SUPERVISE_DEPARTMENT_NAME" label="基层单位主管部门" width="200" />
|
||||
<!-- <el-table-column prop="userCount" label="人员数"/>-->
|
||||
<el-table-column prop="userCount" label="人员数"/>
|
||||
<el-table-column prop="trainingQualifiedCount" label="参与培训合格人员数"/>
|
||||
<el-table-column prop="expireSoonCount" label="证件即将过期人员数"/>
|
||||
<el-table-column prop="expiredCount" label="证件已过期人员数"/>
|
||||
|
|
@ -70,7 +70,6 @@
|
|||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="page-btn-group">
|
||||
<div></div>
|
||||
<pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,5 @@
|
|||
<template>
|
||||
<div>
|
||||
<CardOverdueList v-show="activeName==='CardOverdueList'" />
|
||||
<CorpUserList v-if="activeName==='corpUserList'" />
|
||||
</div>
|
||||
<component :is="activeName" />
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@
|
|||
<el-option :value="2" label="清单排查"/>
|
||||
<el-option :value="4" label="安全环保检查(监管端)"/>
|
||||
<el-option :value="5" label="安全环保检查(企业端)"/>
|
||||
<el-option :value="6" label="消防检查"/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
|
@ -150,6 +149,14 @@
|
|||
highlight-current-row
|
||||
>
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<!-- <el-table-column prop="SOURCE" label="隐患来源">-->
|
||||
<!-- <template slot-scope="{row}">-->
|
||||
<!-- <span v-if="row.SOURCE == 1">隐患快报</span>-->
|
||||
<!-- <span v-else-if="row.SOURCE == 4">安全环保检查(监管端)</span>-->
|
||||
<!-- <span v-else-if="row.SOURCE == 5">安全环保检查(企业端)</span>-->
|
||||
<!-- <span v-else>清单排查</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<el-table-column label="隐患来源" >
|
||||
<template slot-scope="{row}">
|
||||
<template v-if="row.SOURCE=='1'">隐患快报 </template>
|
||||
|
|
@ -157,7 +164,6 @@
|
|||
<template v-else-if="row.SOURCE=='3'">清单排查 </template>
|
||||
<template v-else-if="row.SOURCE=='4'">安全环保检查(监管端) </template>
|
||||
<template v-else-if="row.SOURCE=='5'">安全环保检查(企业端) </template>
|
||||
<template v-else-if="row.SOURCE=='6'">消防检查 </template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="HIDDENDESCR" label="隐患描述"/>
|
||||
|
|
@ -165,6 +171,12 @@
|
|||
<el-table-column prop="DISCOVERYTIME" label="隐患发现时间" width="160"/>
|
||||
<el-table-column prop="CONFIRM_USER" label="确认人" width="120"/>
|
||||
<el-table-column prop="RECTIFICATIONOR_NAME" label="整改负责人" width="120"/>
|
||||
<!-- <template slot-scope="{row}">-->
|
||||
<!-- <template v-if="row.SOURCE == 4">{{ row.RECTIFICATIONOR_NAME }}</template>-->
|
||||
<!-- <template v-else-if="row.SOURCE == 5">{{ row.RECTIFICATIONOR_NAME }}</template>-->
|
||||
<!-- <template v-else>{{ row.RECTIFICATIONOR }}</template>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<el-table-column prop="STATE" label="隐患状态">
|
||||
<template slot-scope="{row}">
|
||||
<span v-if="row.STATE == 0">未提交</span>
|
||||
|
|
|
|||
|
|
@ -22,9 +22,6 @@
|
|||
<template v-else-if="pd.SOURCE=='5'">
|
||||
<td colspan="3">安全环保检查(企业端)</td>
|
||||
</template>
|
||||
<template v-else-if="pd.SOURCE=='6'">
|
||||
<td colspan="3">消防检查</td>
|
||||
</template>
|
||||
</tr>
|
||||
<!--<tr>
|
||||
<td class="tbg">检查内容</td>
|
||||
|
|
|
|||
|
|
@ -15,39 +15,6 @@
|
|||
highlight-current-row>
|
||||
<el-table-column :reserve-selection="true" type="selection" width="55" align="center" />
|
||||
<el-table-column type = "index" label="序号" width="50" align = "center" />
|
||||
|
||||
<el-table-column label="隐患来源" >
|
||||
<template slot-scope="{row}">
|
||||
<template v-if="row.SOURCE=='1'">隐患快报 </template>
|
||||
<template v-else-if="row.SOURCE=='2'">清单排查 </template>
|
||||
<template v-else-if="row.SOURCE=='3'">清单排查 </template>
|
||||
<template v-else-if="row.SOURCE=='4'">安全环保检查(监管端) </template>
|
||||
<template v-else-if="row.SOURCE=='5'">安全环保检查(企业端) </template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="HIDDENDESCR" label="隐患描述"/>
|
||||
<el-table-column prop="findUserNames" label="隐患发现人" width="120"/>
|
||||
<el-table-column prop="DISCOVERYTIME" label="隐患发现时间" width="160"/>
|
||||
<el-table-column prop="CONFIRM_USER" label="确认人" width="120"/>
|
||||
<el-table-column prop="RECTIFICATIONOR_NAME" label="整改负责人" width="120"/>
|
||||
<el-table-column prop="STATE" label="隐患状态">
|
||||
<template slot-scope="{row}">
|
||||
<span v-if="row.STATE == 0">未提交</span>
|
||||
<span v-else-if="row.STATE == 1">未整改</span>
|
||||
<span v-else-if="row.STATE == 2">已整改</span>
|
||||
<span v-else-if="row.STATE == 3">已复查</span>
|
||||
<span v-else-if="row.STATE == 4">已验收</span>
|
||||
<span v-else-if="row.STATE == 5">忽略隐患</span>
|
||||
<span v-else-if="row.STATE == 6">重大隐患</span>
|
||||
<span v-else-if="row.STATE == -1">已过期</span>
|
||||
<span v-else-if="row.STATE ==-2">待确认</span>
|
||||
<span v-else-if="row.STATE == 7">待处理的特殊申请隐患</span>
|
||||
<span v-else-if="row.STATE == 8">已处理的特殊申请隐患</span>
|
||||
<span v-else-if="row.STATE == 16">确认打回</span>
|
||||
<span v-else-if="row.STATE == 10">验收打回</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="CHECK_NAME" label="验收人" width="120"/>
|
||||
<el-table-column label="隐患图片预览" align = "center">
|
||||
<template slot-scope="scope">
|
||||
<el-tooltip placement="top">
|
||||
|
|
|
|||
|
|
@ -514,8 +514,8 @@ export default {
|
|||
label: '人员',
|
||||
dialog_width: '800px',
|
||||
check: false,
|
||||
img: require('../../assets/map/gangkou_index/buttom/01.png'),
|
||||
checkImg: require('../../assets/map/gangkou_index/buttom/01_on.png'),
|
||||
img: require('../../assets/map/gangkou_index/buttom/ico1.png'),
|
||||
checkImg: require('../../assets/map/gangkou_index/buttom/ico1_on.png'),
|
||||
type: 'PERSON',
|
||||
containAuthorization: ['035958e685cf4850bc40151c5e0617a6'],
|
||||
eliminateAuthorization: []
|
||||
|
|
|
|||
|
|
@ -482,9 +482,7 @@ export default {
|
|||
if (this.userPhotoFile.length > 0) {
|
||||
this.imgUrl = config.fileUrl + this.userPhotoFile[0].FILEPATH
|
||||
}
|
||||
if (picture.photosOfLevel){
|
||||
this.photosOfLevel = picture.photosOfLevel
|
||||
}
|
||||
this.specialUsersList = picture.specialUsers
|
||||
this.insuranceFileList = picture.insuranceFile
|
||||
this.contractFileList = picture.contractFile
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@
|
|||
<el-table-column :formatter="(row) => formatDictionaryLabel(row, '0')" prop="EMPLOYMENT_FORM" label="用工形式" />
|
||||
<el-table-column :formatter="(row) => formatDictionaryLabel(row, '1')" prop="SELECT_FORM" label="选取形式" />
|
||||
<el-table-column prop="ruserCount" label="持证人员数"/>
|
||||
<el-table-column prop="specialUserCount" label="证书数"/>
|
||||
<el-table-column prop="userCount" label="证书数"/>
|
||||
<el-table-column label="操作" align="left" width="110">
|
||||
<template slot-scope="{row}">
|
||||
<el-button type="success" icon="el-icon-view" size="mini" @click="toCorpUserPage(row.CORPINFO_ID)">查看</el-button>
|
||||
|
|
|
|||
Loading…
Reference in New Issue