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

bug修复

This commit is contained in:
BianLzhaoMin 2025-06-10 15:36:08 +08:00
parent a9824f1331
commit b3ff9c11ca
7 changed files with 527 additions and 382 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/components/pro-tabs/bns-timeline-tabs.vue
View File

@ -7,7 +7,7 @@
v-if="!items"
style="position: absolute; top: 30%; left: 43%"
/>
<div style="height: 90%" v-else-if="btnShow">
<div style="height: 90%" v-if="btnShow">
<el-timeline :reverse="reverse">
<el-timeline-item
v-for="(item, index) in auditRecordList"
@ -53,11 +53,21 @@
</div>
</div>
<el-table v-else :data="auditRecordList">
<el-table
v-if="(auditType.includes('审批') || auditType.includes('审核记录')) && !btnShow"
:data="auditRecordList"
>
<el-table-column align="center" label="审批部门" prop="section" />
<el-table-column align="center" label="审批人" prop="name" />
<el-table-column align="center" label="审批时间" prop="time" />
<el-table-column align="center" label="审批状态" prop="status" />
<el-table-column align="center" label="审批状态" prop="status">
<template slot-scope="{ row }">
<span v-if="enterStatus && enterStatus.includes('撤回')">撤回</span>
<span v-else>
{{ row.status }}
</span>
</template>
</el-table-column>
<el-table-column align="center" label="审批意见">
<template slot-scope="{ row }">
{{ row.reason.replaceAll(/@@/g, ' ') || '--' }}
@ -209,6 +219,12 @@ export default {
type: String,
default: () => '',
},
// 状态
enterStatus: {
type: String,
default: () => '',
},
},
computed: {
store() {
@ -242,8 +258,18 @@ export default {
return (item, index) => {
if (item.auditStatus == 1 || item.auditStatus == 3) return '√'
if (item.auditStatus == 2) return 'X'
if (item.auditStatus == null || this.endAuditingIndex > -1) return ''
if (item.auditStatus == 4 && this.endAuditingIndex < 0) return '?'
if (
item.auditStatus == null ||
(this.endAuditingIndex > -1 && this.enterStatus && this.enterStatus.includes('撤回'))
)
return ''
if (
item.auditStatus == 4 &&
this.endAuditingIndex < 0 &&
this.enterStatus &&
!this.enterStatus.includes('撤回')
)
return '?'
}
},
},

2
src/views/IndexPage/index_other.vue
View File

@ -391,6 +391,7 @@ export default {
JSON.stringify({
type: 'edit',
taskId: row.taskId,
enterStatus: row.enterStatus,
})
)
)
@ -533,6 +534,7 @@ export default {
JSON.stringify({
taskId: row.taskId,
taskType: '存在',
enterStatus: row.enterStatus,
})
)
)

2
src/views/flow/auditRecord.vue
View File

@ -12,7 +12,9 @@
:show-type="1"
:show-position="2"
:items="approvalItems"
:auditReason="[]"
audit-type="审核记录"
:enterStatus="paramsData.enterStatus"
:audit-record-type="paramsData.auditRecordType ? '全部' : '部分'"
v-else
></bns-timeline-tabs>

160
src/views/hiddenDangerManagement/hazardRectificationManagement/components/hazardApprove.vue
View File

@ -2,7 +2,7 @@
<div class="app-container">
<div class="top-btn" v-if="row.isRectify || row.isDelay">
<el-button type="primary" size="small" @click="handleSubmit" v-preventReClick="5000">提交</el-button>
<el-button type="primary" size="small" @click="">打印</el-button>
<el-button type="primary" size="small" @click="onHandlePrint">打印</el-button>
</div>
<div class="top-btn" v-if="row.isAcceptance">
<el-button type="primary" plain size="small" @click="handleAcceptance(1)">验收通过</el-button>
@ -17,6 +17,7 @@
<el-tabs v-model="active">
<!-- 隐患整改单 -->
<el-tab-pane label="隐患整改单" name="1" v-if="!row.isRecord">
<div id="printQrCode" ref="printContent">
<!-- 基础信息 -->
<el-card class="box-card">
<div slot="header" class="card-header">
@ -26,12 +27,22 @@
<el-row :gutter="10">
<el-col :span="6">
<el-form-item label="隐患问题编号" prop="pitfallCode">
<el-input v-model="baseInfoForm.pitfallCode" placeholder="请输入隐患问题编号" class="cont-width" v-no-whitespace />
<el-input
v-model="baseInfoForm.pitfallCode"
placeholder="请输入隐患问题编号"
class="cont-width"
v-no-whitespace
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="检查记录编号" prop="recordCode">
<el-input v-model="baseInfoForm.recordCode" placeholder="请输入检查记录编号" class="cont-width" v-no-whitespace />
<el-input
v-model="baseInfoForm.recordCode"
placeholder="请输入检查记录编号"
class="cont-width"
v-no-whitespace
/>
</el-form-item>
</el-col>
<el-col :span="6">
@ -39,32 +50,49 @@
<el-input
v-model="baseInfoForm.inspectLevelName"
placeholder="请输入对应检查级别"
class="cont-width" v-no-whitespace
class="cont-width"
v-no-whitespace
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="排查类型" prop="checkTypeName">
<el-input v-model="baseInfoForm.checkTypeName" placeholder="请输入排查类型" class="cont-width" v-no-whitespace />
<el-input
v-model="baseInfoForm.checkTypeName"
placeholder="请输入排查类型"
class="cont-width"
v-no-whitespace
/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="6">
<el-form-item label="创建人" prop="createUserName">
<el-input v-model="baseInfoForm.createUserName" placeholder="请输入创建人" class="cont-width" v-no-whitespace />
<el-input
v-model="baseInfoForm.createUserName"
placeholder="请输入创建人"
class="cont-width"
v-no-whitespace
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="创建时间">
<el-input v-model="baseInfoForm.createTime" placeholder="请输入创建时间" class="cont-width" v-no-whitespace />
<el-input
v-model="baseInfoForm.createTime"
placeholder="请输入创建时间"
class="cont-width"
v-no-whitespace
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="整改接收时间" prop="rectificationReceiveTime">
<el-input
v-model="baseInfoForm.rectificationReceiveTime"
placeholder="请输入整改接收时间" v-no-whitespace
placeholder="请输入整改接收时间"
v-no-whitespace
class="cont-width"
/>
</el-form-item>
@ -73,7 +101,8 @@
<el-form-item label="整改反馈时间" prop="rectificationFeedbackTime">
<el-input
v-model="baseInfoForm.rectificationFeedbackTime"
placeholder="请输入整改反馈时间" v-no-whitespace
placeholder="请输入整改反馈时间"
v-no-whitespace
class="cont-width"
/>
</el-form-item>
@ -82,7 +111,12 @@
<el-row :gutter="10">
<el-col :span="6">
<el-form-item label="整改状态" prop="checkStatus">
<el-input v-model="baseInfoForm.checkStatus" placeholder="请输入整改状态" class="cont-width" v-no-whitespace />
<el-input
v-model="baseInfoForm.checkStatus"
placeholder="请输入整改状态"
class="cont-width"
v-no-whitespace
/>
</el-form-item>
</el-col>
</el-row>
@ -98,7 +132,12 @@
<el-row :gutter="10">
<el-col :span="6">
<el-form-item label="检查人" prop="checkUserName">
<el-input v-model="inspectForm.checkUserName" placeholder="请输入检查人" class="cont-width" v-no-whitespace />
<el-input
v-model="inspectForm.checkUserName"
placeholder="请输入检查人"
class="cont-width"
v-no-whitespace
/>
</el-form-item>
</el-col>
<el-col :span="6">
@ -115,19 +154,34 @@
</el-col>
<el-col :span="6">
<el-form-item label="隐患工程" prop="hazardProOptions">
<el-input v-model="inspectForm.proName" placeholder="请输入隐患工程" class="cont-width" v-no-whitespace />
<el-input
v-model="inspectForm.proName"
placeholder="请输入隐患工程"
class="cont-width"
v-no-whitespace
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="整改责任承包商" prop="subName">
<el-input v-model="inspectForm.subName" placeholder="请输入整改责任承包商" class="cont-width" v-no-whitespace />
<el-input
v-model="inspectForm.subName"
placeholder="请输入整改责任承包商"
class="cont-width"
v-no-whitespace
/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="6">
<el-form-item label="隐患问题类别" prop="pitfallTypeName">
<el-input v-model="inspectForm.pitfallTypeName" placeholder="请输入隐患问题类别" class="cont-width" v-no-whitespace />
<el-input
v-model="inspectForm.pitfallTypeName"
placeholder="请输入隐患问题类别"
class="cont-width"
v-no-whitespace
/>
</el-form-item>
</el-col>
@ -135,7 +189,8 @@
<el-form-item label="隐患问题级别" prop="pitfallLevelName">
<el-input
v-model="inspectForm.pitfallLevelName"
placeholder="请输入隐患问题级别" v-no-whitespace
placeholder="请输入隐患问题级别"
v-no-whitespace
class="cont-width"
/>
</el-form-item>
@ -154,7 +209,12 @@
</el-col>
<el-col :span="6">
<el-form-item label="承包商责任人" prop="subPersonName">
<el-input v-model="inspectForm.subPersonName" placeholder="请输入承包商责任人" class="cont-width" v-no-whitespace />
<el-input
v-model="inspectForm.subPersonName"
placeholder="请输入承包商责任人"
class="cont-width"
v-no-whitespace
/>
</el-form-item>
</el-col>
<el-col :span="24">
@ -178,7 +238,8 @@
type="textarea"
v-model="inspectForm.pitfallDescription"
placeholder="请输入隐患问题描述"
clearable v-no-whitespace
clearable
v-no-whitespace
:autosize="{ minRows: 4, maxRows: 6 }"
maxlength="2000"
show-word-limit
@ -192,7 +253,8 @@
type="textarea"
v-model="inspectForm.suggestion"
placeholder="请输入整改措施建议"
clearable v-no-whitespace
clearable
v-no-whitespace
:autosize="{ minRows: 4, maxRows: 6 }"
maxlength="2000"
show-word-limit
@ -208,7 +270,13 @@
<div slot="header" class="card-header">
<span>整改方填写</span>
</div>
<el-form :model="rectificationForm" ref="rectificationForm" label-width="120px" size="small" :rules="rules1">
<el-form
:model="rectificationForm"
ref="rectificationForm"
label-width="120px"
size="small"
:rules="rules1"
>
<el-form-item label="责任人" prop="dutyUserId">
<el-select
v-model="rectificationForm.dutyUserId"
@ -231,7 +299,8 @@
type="textarea"
v-model="rectificationForm.generateReason"
placeholder="请输入产生原因描述"
clearable v-no-whitespace
clearable
v-no-whitespace
:autosize="{ minRows: 4, maxRows: 6 }"
maxlength="2000"
show-word-limit
@ -244,7 +313,8 @@
type="textarea"
v-model="rectificationForm.correctionStatus"
placeholder="请输入整改情况"
clearable v-no-whitespace
clearable
v-no-whitespace
:autosize="{ minRows: 4, maxRows: 6 }"
maxlength="2000"
show-word-limit
@ -310,14 +380,21 @@
<el-input
v-model="acceptForm.deptName"
placeholder="请输入整改验收部门"
class="cont-width" v-no-whitespace
class="cont-width"
v-no-whitespace
disabled
/>
</el-form-item>
</el-col>
<el-col :span="7" :offset="0">
<el-form-item label="整改验收人" prop="userName">
<el-input v-model="acceptForm.userName" placeholder="请输入整改验收人" class="cont-width" disabled v-no-whitespace />
<el-input
v-model="acceptForm.userName"
placeholder="请输入整改验收人"
class="cont-width"
disabled
v-no-whitespace
/>
</el-form-item>
</el-col>
<el-col :span="7" :offset="0">
@ -326,7 +403,8 @@
v-model="acceptForm.isProcess"
placeholder="请输入是否进行流程审批"
class="cont-width"
disabled v-no-whitespace
disabled
v-no-whitespace
/>
</el-form-item>
</el-col>
@ -341,7 +419,8 @@
clearable
:autosize="{ minRows: 4, maxRows: 6 }"
maxlength="2000"
show-word-limit v-no-whitespace
show-word-limit
v-no-whitespace
:disabled="!row.isAcceptance"
/>
</el-form-item>
@ -354,7 +433,8 @@
clearable
:autosize="{ minRows: 4, maxRows: 6 }"
maxlength="2000"
show-word-limit v-no-whitespace
show-word-limit
v-no-whitespace
:disabled="!row.isAcceptance"
/>
</el-form-item>
@ -390,7 +470,8 @@
type="textarea"
v-model="delayInfoForm.delayReason"
placeholder="请输入延期原因"
clearable v-no-whitespace
clearable
v-no-whitespace
:autosize="{ minRows: 4, maxRows: 6 }"
maxlength="1000"
show-word-limit
@ -398,6 +479,7 @@
</el-form-item>
</el-form>
</el-card>
</div>
</el-tab-pane>
<!-- 审批信息 -->
<el-tab-pane label="审批信息" name="2" v-if="row.isApprove || row.isRecord || row.isDetail">
@ -978,6 +1060,30 @@ export default {
}
})
},
onHandlePrint() {
// 直接使用浏览器打印指定的dom
window.print('#printQrCode')
// const printWindow = window.open('', '_blank')
// printWindow.document.write(`
// <html>
// <head>
// <title>打印</title>
// </head>
// <body>
// ${this.$refs.printContent.innerHTML}
// </body>
// </html>
// `)
// printWindow.document.close()
// printWindow.focus()
// // 延迟执行打印，确保内容加载完成
// setTimeout(() => {
// printWindow.print()
// printWindow.close()
// }, 300)
},
},
}
</script>

3
src/views/pro/apply/consEnterApply.vue
View File

@ -959,6 +959,7 @@
final-check="0"
:show-type="1"
:items="approvalItems"
:enterStatus="paramsData.enterStatus"
/>
</el-tab-pane>
</el-tabs>
@ -1189,7 +1190,7 @@ export default {
status: undefined,
startDate: undefined,
endDate: undefined,
fileIsActive:undefined,
fileIsActive: undefined,
},
equipQueryParams: {
pageNum: 1,

1
src/views/pro/apply/supervisorEnterApply.vue
View File

@ -470,6 +470,7 @@
final-check="0"
:show-type="1"
:items="approvalItems"
:enterStatus="paramsData.enterStatus"
/>
</el-tab-pane>
</el-tabs>

9
src/views/pro/supervisor/supervisedAdmission/supervisorApproval.vue
View File

@ -59,9 +59,16 @@
<el-table-column label="人脸照片" align="center" prop="faceUrl">
<template slot-scope="scope">
<el-popover placement="right" title="" trigger="hover">
<img :src="`${lookFaceFile + scope.row.faceUrl}`" :min-width="300" :height="300" alt="照片" />
<img
v-if="scope.row.faceUrl"
:src="`${lookFaceFile + scope.row.faceUrl}`"
:min-width="300"
:height="300"
alt="照片"
/>
<img
slot="reference"
v-if="scope.row.faceUrl"
:src="`${lookFaceFile + scope.row.faceUrl}`"
style="max-height: 50px; max-width: 50px"
:alt="`${lookFaceFile + scope.row.faceUrl}`"