liux
/
nxdt-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修复

This commit is contained in:
BianLzhaoMin 2025-03-28 17:52:14 +08:00
parent 2d8fc3ef40
commit aff59d97be
3 changed files with 338 additions and 342 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

206
src/views/pro/apply/list/subPersonEnterList.vue
View File

@ -29,15 +29,10 @@
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="personQueryParams.status" placeholder="请选择状态" clearable>
<el-option
v-for="dict in statusDict"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
<el-option v-for="dict in statusDict" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item style="display: flex; justify-content: flex-end;">
<el-form-item style="display: flex; justify-content: flex-end">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQueryPerson">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQueryPerson">重置</el-button>
</el-form-item>
@ -58,22 +53,22 @@
<el-table-column label="特殊工种种类" width="100" align="center" prop="specialJobType" />
<el-table-column label="体检文件" width="100" align="center">
<template slot-scope="scope">
<el-button size="mini" @click="handleShow(scope.row,1)">查看</el-button>
<el-button size="mini" @click="handleShow(scope.row, 1)">查看</el-button>
</template>
</el-table-column>
<el-table-column label="保险文件" width="100" align="center">
<template slot-scope="scope">
<el-button size="mini" @click="handleShow(scope.row,2)">查看</el-button>
<el-button size="mini" @click="handleShow(scope.row, 2)">查看</el-button>
</template>
</el-table-column>
<el-table-column label="特殊工种文件" width="100" align="center">
<template slot-scope="scope">
<el-button size="mini" @click="handleShow(scope.row,3)">查看</el-button>
<el-button size="mini" @click="handleShow(scope.row, 3)">查看</el-button>
</template>
</el-table-column>
<el-table-column label="其他文件" width="100" align="center">
<template slot-scope="scope">
<el-button size="mini" @click="handleShow(scope.row,4)">查看</el-button>
<el-button size="mini" @click="handleShow(scope.row, 4)">查看</el-button>
</template>
</el-table-column>
<el-table-column label="性别" width="50" align="center" prop="sex" />
@ -99,9 +94,17 @@
<el-table-column label="人脸照片" align="center" prop="faceUrl">
<template slot-scope="scope">
<el-popover placement="right" title="" trigger="hover">
<img :src="`${scope.row.facePath ? lookFaceFile+scope.row.facePath : ''}`" :min-width="300" :height="300" alt="照片" />
<img slot="reference" :src="`${scope.row.facePath ? lookFaceFile+scope.row.facePath : ''}`" style="max-height: 50px; max-width: 50px"
:alt="`${scope.row.facePath ? lookFaceFile+scope.row.facePath : ''}`"
<img
:src="`${scope.row.facePath ? lookFaceFile + scope.row.facePath : ''}`"
:min-width="300"
:height="300"
alt="照片"
/>
<img
slot="reference"
:src="`${scope.row.facePath ? lookFaceFile + scope.row.facePath : ''}`"
style="max-height: 50px; max-width: 50px"
:alt="`${scope.row.facePath ? lookFaceFile + scope.row.facePath : ''}`"
/>
</el-popover>
</template>
@ -109,14 +112,11 @@
<el-table-column label="审批状态" align="center" prop="intoStatus">
<template slot-scope="scope">
<!-- 检查是否存在身份证号 -->
<span v-if="scope.row.intoStatus">{{ updateStatus(scope.row.intoStatus)
}}</span>
<span v-if="scope.row.intoStatus">{{ updateStatus(scope.row.intoStatus) }}</span>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="150" align="center"
class-name="small-padding fixed-width"
>
<el-table-column label="操作" fixed="right" width="150" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
@ -124,28 +124,19 @@
@click="handleApprove(scope.row)"
v-if="scope.row.status == '1'"
v-has-permission="['system:subPersonApply:list']"
>审批
>
审批
</el-button>
<el-button
size="mini"
type="text"
v-else
@click="handleView(scope.row)"
>查看
</el-button>
<el-button
size="mini"
type="text"
v-hasPermi="['system:audit:query']"
@click="handleAuditRecord(scope.row)"
>审核记录
<el-button size="mini" type="text" v-else @click="handleView(scope.row)">查看</el-button>
<el-button size="mini" type="text" v-hasPermi="['system:audit:query']" @click="handleAuditRecord(scope.row)">
审核记录
</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="personTotal>0"
v-show="personTotal > 0"
:total="personTotal"
:page.sync="personQueryParams.pageNum"
:limit.sync="personQueryParams.pageSize"
@ -153,12 +144,12 @@
/>
<el-dialog title="文件查看" :visible.sync="document" width="80%" top="5vh" append-to-body>
<div style="width: 100%;height:720px">
<div style="width: 100%; height: 720px">
<bns-file-list-tabs :items="fileList" />
</div>
</el-dialog>
<el-dialog title="文件查看" :visible.sync="documentPreview" width="80%" top="5vh" append-to-body>
<div style="width: 100%;height:720px">
<div style="width: 100%; height: 720px">
<bns-kkFile-preview :items="kkFilePreview"></bns-kkFile-preview>
</div>
</el-dialog>
@ -178,10 +169,11 @@ import { selectFile } from '@/api/tool/select'
export default {
components: {
bnsKkFilePreview, bnsFileListTabs,
bnsKkFilePreview,
bnsFileListTabs,
BnsPersonApprovalTabs,
bnsConsPersonDetailsTabs,
bnsGenerateWorkCardTabs
bnsGenerateWorkCardTabs,
},
data() {
return {
@ -191,12 +183,12 @@ export default {
name: undefined,
status: '1',
admissionDate: undefined,
departureDate: undefined
departureDate: undefined,
},
personList: [],
proOptions: [],//工程下拉选项
consOptions: [],//承包商下拉选项
subOptions: [],//分包商拉选项
proOptions: [], //工程下拉选项
consOptions: [], //承包商下拉选项
subOptions: [], //分包商拉选项
personTotal: 0,
loading: false,
constructionPersonnelOpen: false,
@ -206,43 +198,38 @@ export default {
kkFilePreview: {
filePreviewUrl: '',
fileName: '',
showDownloadButton: false
showDownloadButton: false,
},
statusDict: [
{
value: '1',
label: '待审批'
label: '待审批',
},
{
value: '2',
label: '审批中'
label: '审批中',
},
{
value: '3',
label: '已通过'
label: '已通过',
},
{
value: '4',
label: '已驳回'
label: '已驳回',
},
{
value: '5',
label: '已撤销'
}
label: '已撤销',
},
],
auditStatusDict: {
'1':
'待审批',
'2':
'审批中',
'3':
'已通过',
'4':
'已驳回',
'5':
'已撤销'
1: '待审批',
2: '审批中',
3: '已通过',
4: '已驳回',
5: '已撤销',
},
lookFaceFile:''
lookFaceFile: '',
}
},
created() {
@ -266,13 +253,13 @@ export default {
1: '体检文件',
2: '保险文件',
3: '特殊工种文件',
4: '其他文件'
4: '其他文件',
}
selectFile({
classification: 9,
uuid: row.uuid,
informationType: informationType,
fromType: 2
fromType: 2,
}).then(response => {
console.log(response)
if (response.data.length === 0) {
@ -282,7 +269,7 @@ export default {
this.kkFilePreview = {
filePreviewUrl: response.data[0].filePath,
fileName: response.data[0].fileName,
showDownloadButton: false
showDownloadButton: false,
}
this.documentPreview = true
} else {
@ -295,7 +282,7 @@ export default {
//获取工程下拉选项
getProOption() {
const params = {
id: ''
id: '',
}
getProOptions(params).then(res => {
this.proOptions = res.data
@ -304,7 +291,7 @@ export default {
//获取承包商下拉选项
getConsOption() {
const params = {
id: ''
id: '',
}
getConsOptions(params).then(res => {
this.consOptions = res.data
@ -313,7 +300,7 @@ export default {
//获取分包商下拉选项
getSubOption() {
const params = {
id: ''
id: '',
}
getSubOptions(params).then(res => {
this.subOptions = res.data
@ -330,11 +317,11 @@ export default {
consUuid: this.$store.state.user.userType === '00' ? '' : consUuid,
type: '入场',
enterType: '业主-分包审核',
...this.personQueryParams
...this.personQueryParams,
}
getList(params).then(res => {
this.personList = res.rows
this.total = res.total
this.personTotal = res.total
this.loading = false
})
},
@ -350,52 +337,63 @@ export default {
name: undefined,
status: undefined,
admissionDate: undefined,
departureDate: undefined
departureDate: undefined,
}
this.getList()
},
//审核
handleApprove(row) {
this.$router.push('/system/subManagement-personApproval-auth/personApproval/' + encryptCBC(JSON.stringify({
uuid: row.uuid,
taskId: row.taskId,
procInstId: row.procInsId,
contUuid: row.contUuid,
consUuid: row.consUuid,
subUuid: row.subUuid,
showType: 2,
isExamine: true,
btnShow: true,
finalCheck: row.finalCheck
})))
this.$router.push(
'/system/subManagement-personApproval-auth/personApproval/' +
encryptCBC(
JSON.stringify({
uuid: row.uuid,
taskId: row.taskId,
procInstId: row.procInsId,
contUuid: row.contUuid,
consUuid: row.consUuid,
subUuid: row.subUuid,
showType: 2,
isExamine: true,
btnShow: true,
finalCheck: row.finalCheck,
})
)
)
},
//查看
handleView(row) {
this.$router.push('/system/subManagement-personApproval-auth/personApproval/' + encryptCBC(JSON.stringify({
uuid: row.uuid,
taskId: row.taskId,
procInstId: row.procInsId,
contUuid: row.contUuid,
consUuid: row.consUuid,
subUuid: row.subUuid,
showType: 1,
isExamine: false,
btnShow: false,
finalCheck: row.finalCheck
})))
this.$router.push(
'/system/subManagement-personApproval-auth/personApproval/' +
encryptCBC(
JSON.stringify({
uuid: row.uuid,
taskId: row.taskId,
procInstId: row.procInsId,
contUuid: row.contUuid,
consUuid: row.consUuid,
subUuid: row.subUuid,
showType: 1,
isExamine: false,
btnShow: false,
finalCheck: row.finalCheck,
})
)
)
},
//审核记录
handleAuditRecord(row) {
this.$router.push("/flow/auditRecord/" + encryptCBC(JSON.stringify({
taskId: row.taskId,
checkType:'2'
})));
}
}
this.$router.push(
'/flow/auditRecord/' +
encryptCBC(
JSON.stringify({
taskId: row.taskId,
checkType: '2',
})
)
)
},
},
}
</script>
<style scoped lang="scss">
</style>
<style scoped lang="scss"></style>

240
src/views/pro/apply/list/subPersonOutList.vue
View File

@ -29,15 +29,10 @@
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="personQueryParams.status" placeholder="请选择状态" clearable>
<el-option
v-for="dict in statusDict"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
<el-option v-for="dict in statusDict" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item style="display: flex; justify-content: flex-end;">
<el-form-item style="display: flex; justify-content: flex-end">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQueryPerson">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQueryPerson">重置</el-button>
</el-form-item>
@ -58,22 +53,22 @@
<el-table-column label="特殊工种种类" width="100" align="center" prop="specialJobType" />
<el-table-column label="体检文件" width="100" align="center">
<template slot-scope="scope">
<el-button size="mini" @click="handleShow(scope.row,1)">查看</el-button>
<el-button size="mini" @click="handleShow(scope.row, 1)">查看</el-button>
</template>
</el-table-column>
<el-table-column label="保险文件" width="100" align="center">
<template slot-scope="scope">
<el-button size="mini" @click="handleShow(scope.row,2)">查看</el-button>
<el-button size="mini" @click="handleShow(scope.row, 2)">查看</el-button>
</template>
</el-table-column>
<el-table-column label="特殊工种文件" width="100" align="center">
<template slot-scope="scope">
<el-button size="mini" @click="handleShow(scope.row,3)">查看</el-button>
<el-button size="mini" @click="handleShow(scope.row, 3)">查看</el-button>
</template>
</el-table-column>
<el-table-column label="其他文件" width="100" align="center">
<template slot-scope="scope">
<el-button size="mini" @click="handleShow(scope.row,4)">查看</el-button>
<el-button size="mini" @click="handleShow(scope.row, 4)">查看</el-button>
</template>
</el-table-column>
<el-table-column label="性别" width="50" align="center" prop="sex" />
@ -99,52 +94,43 @@
<el-table-column label="人脸照片" align="center" prop="faceUrl">
<template slot-scope="scope">
<el-popover placement="right" title="" trigger="hover">
<img :src="`${scope.row.facePath ? lookFaceFile+scope.row.facePath : ''}`" :min-width="300" :height="300" alt="照片" />
<img slot="reference" :src="`${scope.row.facePath ? lookFaceFile+scope.row.facePath : ''}`" style="max-height: 50px; max-width: 50px"
:alt="`${scope.row.facePath ? lookFaceFile+scope.row.facePath : ''}`"
<img
:src="`${scope.row.facePath ? lookFaceFile + scope.row.facePath : ''}`"
:min-width="300"
:height="300"
alt="照片"
/>
<img
slot="reference"
:src="`${scope.row.facePath ? lookFaceFile + scope.row.facePath : ''}`"
style="max-height: 50px; max-width: 50px"
:alt="`${scope.row.facePath ? lookFaceFile + scope.row.facePath : ''}`"
/>
</el-popover>
</template>
</el-table-column>
<el-table-column label="审批状态" align="center" prop="intoStatus" >
<el-table-column label="审批状态" align="center" prop="intoStatus">
<template slot-scope="scope">
<!-- 检查是否存在身份证号 -->
<span v-if="scope.row.intoStatus">{{ updateStatus(scope.row.intoStatus)
}}</span>
<span v-if="scope.row.intoStatus">{{ updateStatus(scope.row.intoStatus) }}</span>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="150" align="center"
class-name="small-padding fixed-width"
>
<el-table-column label="操作" fixed="right" width="150" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
v-if="scope.row.status == '1'"
@click="handleApprove(scope.row)"
>审批
<el-button size="mini" type="text" v-if="scope.row.status == '1'" @click="handleApprove(scope.row)">
审批
</el-button>
<el-button
size="mini"
type="text"
v-else
@click="handleView(scope.row)"
>查看
</el-button>
<el-button
size="mini"
type="text"
v-hasPermi="['system:audit:query']"
@click="handleAuditRecord(scope.row)"
>审核记录
<el-button size="mini" type="text" v-else @click="handleView(scope.row)">查看</el-button>
<el-button size="mini" type="text" v-hasPermi="['system:audit:query']" @click="handleAuditRecord(scope.row)">
审核记录
</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="personTotal>0"
v-show="personTotal > 0"
:total="personTotal"
:page.sync="personQueryParams.pageNum"
:limit.sync="personQueryParams.pageSize"
@ -152,12 +138,12 @@
/>
<el-dialog title="文件查看" :visible.sync="document" width="80%" top="5vh" append-to-body>
<div style="width: 100%;height:720px">
<div style="width: 100%; height: 720px">
<bns-file-list-tabs :items="fileList" />
</div>
</el-dialog>
<el-dialog title="文件查看" :visible.sync="documentPreview" width="80%" top="5vh" append-to-body>
<div style="width: 100%;height:720px">
<div style="width: 100%; height: 720px">
<bns-kkFile-preview :items="kkFilePreview"></bns-kkFile-preview>
</div>
</el-dialog>
@ -177,11 +163,12 @@ import bnsFileListTabs from '@/components/pro-tabs/bns-file-list-tabs.vue'
import bnsKkFilePreview from '@/components/pro-tabs/bns-kkFile-preview.vue'
export default {
components: {
bnsKkFilePreview, bnsFileListTabs,
bnsKkFilePreview,
bnsFileListTabs,
BnsPersonApprovalDetailsTabs,
BnsPersonApprovalTabs,
bnsConsPersonDetailsTabs,
bnsGenerateWorkCardTabs
bnsGenerateWorkCardTabs,
},
data() {
return {
@ -191,13 +178,13 @@ export default {
name: undefined,
status: '1',
admissionDate: undefined,
departureDate: undefined
departureDate: undefined,
},
statusDict: [],
personList: [],
proOptions: [],//工程下拉选项
consOptions: [],//承包商下拉选项
subOptions: [],//分包商拉选项
proOptions: [], //工程下拉选项
consOptions: [], //承包商下拉选项
subOptions: [], //分包商拉选项
personTotal: 0,
loading: true,
constructionPersonnelOpen: false,
@ -207,16 +194,16 @@ export default {
kkFilePreview: {
filePreviewUrl: '',
fileName: '',
showDownloadButton: false
showDownloadButton: false,
},
auditStatusDict:{
"1" : "待审批",
"2" : "审批中",
"3" : "已通过",
"4" : "已驳回",
"5" : "已撤销"
auditStatusDict: {
1: '待审批',
2: '审批中',
3: '已通过',
4: '已驳回',
5: '已撤销',
},
lookFaceFile:''
lookFaceFile: '',
}
},
created() {
@ -231,7 +218,7 @@ export default {
indexContinuous,
lookFaceFile,
hideSensitiveInfo,
updateStatus(status){
updateStatus(status) {
return this.auditStatusDict[status]
},
/** 文件查看按钮操作 */
@ -241,13 +228,13 @@ export default {
1: '体检文件',
2: '保险文件',
3: '特殊工种文件',
4: '其他文件'
4: '其他文件',
}
selectFile({
classification: 9,
uuid: row.uuid,
informationType: informationType,
fromType: 2
fromType: 2,
}).then(response => {
console.log(response)
if (response.data.length === 0) {
@ -257,7 +244,7 @@ export default {
this.kkFilePreview = {
filePreviewUrl: response.data[0].filePath,
fileName: response.data[0].fileName,
showDownloadButton: false
showDownloadButton: false,
}
this.documentPreview = true
} else {
@ -268,9 +255,9 @@ export default {
})
},
//获取工程下拉选项
getProOption(){
getProOption() {
const params = {
id: ''
id: '',
}
getProOptions(params).then(res => {
this.proOptions = res.data
@ -279,105 +266,116 @@ export default {
getStatus() {
const params = {
dictType: 'sys_approval_state',
dictValue: ''
dictValue: '',
}
dictTableOption(params).then(response => {
this.statusDict = response.data;
});
this.statusDict = response.data
})
},
//获取承包商下拉选项
getConsOption(){
getConsOption() {
const params = {
id: ''
id: '',
}
getConsOptions(params).then(res => {
this.consOptions = res.data
})
},
//获取分包商下拉选项
getSubOption(){
getSubOption() {
const params = {
id: ''
id: '',
}
getSubOptions(params).then(res => {
this.subOptions = res.data
})
},
getList(){
getList() {
const proId = this.$store.state.user.thisIds.proId,
consUuid = this.$store.state.user.thisIds.consUuid,
userType= this.$store.state.user.userType
console.log(proId,consUuid)
userType = this.$store.state.user.userType
console.log(proId, consUuid)
const params = {
proId : proId,
consUuid : consUuid,
proId: proId,
consUuid: consUuid,
type: '出场',
userType:userType,
userType: userType,
enterType: '业主-分包审核',
...this.personQueryParams
...this.personQueryParams,
}
getList(params).then(res => {
this.personList = res.rows
this.total = res.total
this.personTotal = res.total
this.loading = false
})
},
//查询按钮
handleQueryPerson(){
handleQueryPerson() {
this.personQueryParams.pageNum = 1
this.getList()
},
//重置按钮
resetQueryPerson(){
this.loading = true;
this.resetForm("personQueryForm");
this.handleQueryPerson();
resetQueryPerson() {
this.loading = true
this.resetForm('personQueryForm')
this.handleQueryPerson()
},
//审核
handleApprove(row){
this.$router.push("/system/subManagement-personApproval-auth/personApproval/" + encryptCBC(JSON.stringify({
uuid:row.uuid,
taskId:row.taskId,
procInstId:row.procInsId,
contUuid:row.contUuid,
consUuid:row.consUuid,
subUuid:row.subUuid,
showType:2,
isExamine:true,
btnShow:true,
finalCheck: row.finalCheck,
auditType:'出场'
})));
handleApprove(row) {
this.$router.push(
'/system/subManagement-personApproval-auth/personApproval/' +
encryptCBC(
JSON.stringify({
uuid: row.uuid,
taskId: row.taskId,
procInstId: row.procInsId,
contUuid: row.contUuid,
consUuid: row.consUuid,
subUuid: row.subUuid,
showType: 2,
isExamine: true,
btnShow: true,
finalCheck: row.finalCheck,
auditType: '出场',
})
)
)
},
//查看
handleView(row){
this.$router.push("/system/subManagement-personApproval-auth/personApproval/" + encryptCBC(JSON.stringify({
uuid:row.uuid,
taskId:row.taskId,
procInstId:row.procInsId,
contUuid:row.contUuid,
consUuid:row.consUuid,
subUuid:row.subUuid,
showType:1,
isExamine:false,
btnShow:false,
finalCheck: row.finalCheck,
auditType:'出场'
})));
handleView(row) {
this.$router.push(
'/system/subManagement-personApproval-auth/personApproval/' +
encryptCBC(
JSON.stringify({
uuid: row.uuid,
taskId: row.taskId,
procInstId: row.procInsId,
contUuid: row.contUuid,
consUuid: row.consUuid,
subUuid: row.subUuid,
showType: 1,
isExamine: false,
btnShow: false,
finalCheck: row.finalCheck,
auditType: '出场',
})
)
)
},
//审核记录
handleAuditRecord(row){
this.$router.push("/flow/auditRecord/" + encryptCBC(JSON.stringify({
taskId: row.taskId,
checkType:'2'
})));
handleAuditRecord(row) {
this.$router.push(
'/flow/auditRecord/' +
encryptCBC(
JSON.stringify({
taskId: row.taskId,
checkType: '2',
})
)
)
},
}
},
}
</script>
<style scoped lang="scss">
</style>
<style scoped lang="scss"></style>

234
src/views/pro/approval/list/consPersonOutApprovalList.vue
View File

@ -4,8 +4,10 @@
<el-form-item label="施工人员姓名" label-width="120px" prop="name">
<el-input
v-model="personQueryParams.name"
placeholder="请输入施工人员姓名" v-no-whitespace
maxlength="20" show-word-limit
placeholder="请输入施工人员姓名"
v-no-whitespace
maxlength="20"
show-word-limit
clearable
@keyup.enter.native="handleQueryPerson"
/>
@ -22,15 +24,10 @@
</el-form-item>
<el-form-item label="审批状态" prop="status">
<el-select v-model="personQueryParams.status" placeholder="请选择审批状态" clearable>
<el-option
v-for="dict in statusDict"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
<el-option v-for="dict in statusDict" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item style="display: flex; justify-content: flex-end;">
<el-form-item style="display: flex; justify-content: flex-end">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQueryPerson">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQueryPerson">重置</el-button>
</el-form-item>
@ -50,22 +47,22 @@
<el-table-column label="特殊工种种类" width="100" align="center" prop="specialJobType" />
<el-table-column label="体检文件" width="100" align="center">
<template slot-scope="scope">
<el-button size="mini" @click="handleShow(scope.row,1)">查看</el-button>
<el-button size="mini" @click="handleShow(scope.row, 1)">查看</el-button>
</template>
</el-table-column>
<el-table-column label="保险文件" width="100" align="center">
<template slot-scope="scope">
<el-button size="mini" @click="handleShow(scope.row,2)">查看</el-button>
<el-button size="mini" @click="handleShow(scope.row, 2)">查看</el-button>
</template>
</el-table-column>
<el-table-column label="特殊工种文件" width="100" align="center">
<template slot-scope="scope">
<el-button size="mini" @click="handleShow(scope.row,3)">查看</el-button>
<el-button size="mini" @click="handleShow(scope.row, 3)">查看</el-button>
</template>
</el-table-column>
<el-table-column label="其他文件" width="100" align="center">
<template slot-scope="scope">
<el-button size="mini" @click="handleShow(scope.row,4)">查看</el-button>
<el-button size="mini" @click="handleShow(scope.row, 4)">查看</el-button>
</template>
</el-table-column>
<el-table-column label="性别" width="50" align="center" prop="sex" />
@ -91,64 +88,55 @@
<el-table-column label="人脸照片" align="center" prop="faceUrl">
<template slot-scope="scope">
<el-popover placement="right" title="" trigger="hover">
<img :src="`${scope.row.facePath ? lookFaceFile+scope.row.facePath : ''}`" :min-width="300" :height="300" alt="照片" />
<img slot="reference" :src="`${scope.row.facePath ? lookFaceFile+scope.row.facePath : ''}`" style="max-height: 50px; max-width: 50px"
:alt="`${scope.row.facePath ? lookFaceFile+scope.row.facePath : ''}`"
<img
:src="`${scope.row.facePath ? lookFaceFile + scope.row.facePath : ''}`"
:min-width="300"
:height="300"
alt="照片"
/>
<img
slot="reference"
:src="`${scope.row.facePath ? lookFaceFile + scope.row.facePath : ''}`"
style="max-height: 50px; max-width: 50px"
:alt="`${scope.row.facePath ? lookFaceFile + scope.row.facePath : ''}`"
/>
</el-popover>
</template>
</el-table-column>
<el-table-column label="审批状态" align="center" prop="intoStatus" >
<el-table-column label="审批状态" align="center" prop="intoStatus">
<template slot-scope="scope">
<!-- 检查是否存在身份证号 -->
<span v-if="scope.row.intoStatus">{{ updateStatus(scope.row.intoStatus)
}}</span>
<span v-if="scope.row.intoStatus">{{ updateStatus(scope.row.intoStatus) }}</span>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="150" align="center"
class-name="small-padding fixed-width"
>
<el-table-column label="操作" fixed="right" width="150" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
v-if="scope.row.status == '1'"
@click="handleApprove(scope.row)"
>审批
<el-button size="mini" type="text" v-if="scope.row.status == '1'" @click="handleApprove(scope.row)">
审批
</el-button>
<el-button
size="mini"
type="text"
v-else
@click="handleView(scope.row)"
>查看
</el-button>
<el-button
size="mini"
type="text"
v-hasPermi="['system:audit:query']"
@click="handleAuditRecord(scope.row)"
>审核记录
<el-button size="mini" type="text" v-else @click="handleView(scope.row)">查看</el-button>
<el-button size="mini" type="text" v-hasPermi="['system:audit:query']" @click="handleAuditRecord(scope.row)">
审核记录
</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="personTotal>0"
v-show="personTotal > 0"
:total="personTotal"
:page.sync="personQueryParams.pageNum"
:limit.sync="personQueryParams.pageSize"
@pagination="getList"
/>
<el-dialog title="文件查看" :visible.sync="document" width="80%" top="5vh" append-to-body>
<div style="width: 100%;height:720px">
<div style="width: 100%; height: 720px">
<bns-file-list-tabs :items="fileList" />
</div>
</el-dialog>
<el-dialog title="文件查看" :visible.sync="documentPreview" width="80%" top="5vh" append-to-body>
<div style="width: 100%;height:720px">
<div style="width: 100%; height: 720px">
<bns-kkFile-preview :items="kkFilePreview"></bns-kkFile-preview>
</div>
</el-dialog>
@ -158,7 +146,7 @@
import { hideSensitiveInfo, indexContinuous, lookFaceFile } from '@/utils/bonus'
import bnsConsPersonDetailsTabs from '@/components/pro-tabs/bns-cons-person-details-tabs.vue'
import bnsGenerateWorkCardTabs from '@/components/pro-tabs/bns-generate-work-card-tabs.vue'
import {getProOptions, getConsOptions, getList} from '@/api/pro/subManagement/approval/personApproval'
import { getProOptions, getConsOptions, getList } from '@/api/pro/subManagement/approval/personApproval'
import BnsPersonApprovalTabs from '@/components/pro-tabs/bns-person-approval-tabs.vue'
import BnsPersonApprovalDetailsTabs from '@/components/pro-tabs/bns-person-approval-details-tabs.vue'
import { dictTableOption, selectFile } from '@/api/tool/select'
@ -168,11 +156,12 @@ import bnsFileListTabs from '@/components/pro-tabs/bns-file-list-tabs.vue'
import bnsKkFilePreview from '@/components/pro-tabs/bns-kkFile-preview.vue'
export default {
components: {
bnsKkFilePreview, bnsFileListTabs,
bnsKkFilePreview,
bnsFileListTabs,
BnsPersonApprovalDetailsTabs,
BnsPersonApprovalTabs,
bnsConsPersonDetailsTabs,
bnsGenerateWorkCardTabs
bnsGenerateWorkCardTabs,
},
data() {
return {
@ -185,28 +174,28 @@ export default {
consName: undefined,
},
personList: [],
proOptions: [],//工程下拉选项
consOptions: [],//承包商下拉选项
proOptions: [], //工程下拉选项
consOptions: [], //承包商下拉选项
//审核类型下拉选
statusDict: [],
personTotal: 0,
loading: false,
constructionPersonnelOpen: false,
auditStatusDict:{
"1" : "待审批",
"2" : "审批中",
"3" : "已通过",
"4" : "已驳回",
"5" : "已撤销"
auditStatusDict: {
1: '待审批',
2: '审批中',
3: '已通过',
4: '已驳回',
5: '已撤销',
},
lookFaceFile:'',
lookFaceFile: '',
document: false,
documentPreview: false,
fileList: [],
kkFilePreview: {
filePreviewUrl: '',
fileName: '',
showDownloadButton: false
showDownloadButton: false,
},
}
},
@ -221,22 +210,22 @@ export default {
indexContinuous,
lookFaceFile,
hideSensitiveInfo,
updateStatus(status){
updateStatus(status) {
return this.auditStatusDict[status]
},
//获取工程下拉选项
getProOption(){
getProOption() {
const params = {
id: ''
id: '',
}
getProOptions(params).then(res => {
this.proOptions = res.data
})
},
//获取承包商下拉选项
getConsOption(){
getConsOption() {
const params = {
id: ''
id: '',
}
getConsOptions(params).then(res => {
this.proOptions = res.data
@ -246,11 +235,11 @@ export default {
getStatus() {
const params = {
dictType: 'sys_approval_state',
dictValue: ''
dictValue: '',
}
dictTableOption(params).then(response => {
this.statusDict = response.data;
});
this.statusDict = response.data
})
},
/** 文件查看按钮操作 */
handleShow(row, informationType) {
@ -259,13 +248,13 @@ export default {
1: '体检文件',
2: '保险文件',
3: '特殊工种文件',
4: '其他文件'
4: '其他文件',
}
selectFile({
classification: 9,
uuid: row.uuid,
informationType: informationType,
fromType: 2
fromType: 2,
}).then(response => {
console.log(response)
if (response.data.length === 0) {
@ -275,7 +264,7 @@ export default {
this.kkFilePreview = {
filePreviewUrl: response.data[0].filePath,
fileName: response.data[0].fileName,
showDownloadButton: false
showDownloadButton: false,
}
this.documentPreview = true
} else {
@ -286,79 +275,90 @@ export default {
})
},
/** 人员出场查询 */
getList(){
getList() {
const proId = this.$store.state.user.thisIds.proId
const consUuid = this.$store.state.user.thisIds.consUuid
const supUuid = this.$store.state.user.thisIds.supUuid
const userType = this.$store.state.user.userType
const params = {
proId : proId,
consUuid : consUuid,
proId: proId,
consUuid: consUuid,
supUuid: supUuid,
userType:userType,
userType: userType,
type: '出场',
enterType: '承包审核',
...this.personQueryParams
...this.personQueryParams,
}
getList(params).then(res => {
this.personList = res.rows
this.total = res.total
this.personTotal = res.total
this.loading = false
})
},
//查询按钮
handleQueryPerson(){
this.personQueryParams.pageNum = 1;
this.getList();
handleQueryPerson() {
this.personQueryParams.pageNum = 1
this.getList()
},
//重置按钮
resetQueryPerson(){
this.resetForm("personQueryForm");
this.handleQueryPerson();
resetQueryPerson() {
this.resetForm('personQueryForm')
this.handleQueryPerson()
},
//审核
handleApprove(row){
this.$router.push("/system/subManagement-personApproval-auth/personApproval/" + encryptCBC(JSON.stringify({
uuid:row.uuid,
taskId:row.taskId,
procInstId:row.procInsId,
contUuid:row.contUuid,
consUuid:row.consUuid,
showType:2,
isExamine:true,
btnShow:true,
finalCheck: row.finalCheck,
auditType:'出场'
})));
handleApprove(row) {
this.$router.push(
'/system/subManagement-personApproval-auth/personApproval/' +
encryptCBC(
JSON.stringify({
uuid: row.uuid,
taskId: row.taskId,
procInstId: row.procInsId,
contUuid: row.contUuid,
consUuid: row.consUuid,
showType: 2,
isExamine: true,
btnShow: true,
finalCheck: row.finalCheck,
auditType: '出场',
})
)
)
},
//查看
handleView(row){
this.$router.push("/system/subManagement-personApproval-auth/personApproval/" + encryptCBC(JSON.stringify({
uuid:row.uuid,
taskId:row.taskId,
procInstId:row.procInsId,
contUuid:row.contUuid,
consUuid:row.consUuid,
showType:1,
isExamine:false,
btnShow:false,
finalCheck: row.finalCheck,
auditType:'出场'
})));
handleView(row) {
this.$router.push(
'/system/subManagement-personApproval-auth/personApproval/' +
encryptCBC(
JSON.stringify({
uuid: row.uuid,
taskId: row.taskId,
procInstId: row.procInsId,
contUuid: row.contUuid,
consUuid: row.consUuid,
showType: 1,
isExamine: false,
btnShow: false,
finalCheck: row.finalCheck,
auditType: '出场',
})
)
)
},
//审核记录
handleAuditRecord(row){
this.$router.push("/flow/auditRecord/" + encryptCBC(JSON.stringify({
taskId: row.taskId,
checkType:'2'
})));
handleAuditRecord(row) {
this.$router.push(
'/flow/auditRecord/' +
encryptCBC(
JSON.stringify({
taskId: row.taskId,
checkType: '2',
})
)
)
},
}
},
}
</script>
<style scoped lang="scss">
</style>
<style scoped lang="scss"></style>