提交代码
This commit is contained in:
parent
f12e9e70bb
commit
04bdc800b1
|
@ -107,10 +107,14 @@
|
|||
<el-table-column prop="planDoneTime" label="计划完成时间" width="160"></el-table-column>
|
||||
<el-table-column prop="state" label="状态" width="100">
|
||||
<template #default="scope">
|
||||
<el-text v-if="scope.row.state == 0" type="info" class="nomarlText">未整改</el-text>
|
||||
<el-text v-if="scope.row.state == 1" type="info" class="nomarlText">待审核</el-text>
|
||||
<el-text v-if="scope.row.state == 2" type="success" class="successText">已整改</el-text>
|
||||
<el-text v-if="scope.row.state == 9" type="danger" class="dangerText">驳回</el-text>
|
||||
<el-text v-if="scope.row.correctionFlag == 0" type="info" class="nomarlText">-</el-text>
|
||||
<template v-else>
|
||||
<el-text v-if="scope.row.state == 0" type="info" class="nomarlText">未整改</el-text>
|
||||
<el-text v-if="scope.row.state == 1" type="info" class="nomarlText">待审核</el-text>
|
||||
<el-text v-if="scope.row.state == 2" type="success"
|
||||
class="successText">已整改</el-text>
|
||||
<el-text v-if="scope.row.state == 9" type="danger" class="dangerText">驳回</el-text>
|
||||
</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
|
|
@ -35,6 +35,7 @@
|
|||
class="infoinfoText">一般偏差</el-text>
|
||||
<el-text v-if="detailForm.level == 3" type="danger"
|
||||
class="dangerText">主要偏差</el-text>
|
||||
<el-text v-if="detailForm.level == 4" type="danger" class="yxText">优秀项</el-text>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="5">
|
||||
|
@ -49,11 +50,18 @@
|
|||
</el-col>
|
||||
<el-col :span="4">
|
||||
<el-form-item label="状态:" prop="employeeNumber">
|
||||
<el-text v-if="detailForm.state == 0" type="info" class="infoinfoText">未整改</el-text>
|
||||
<el-text v-if="detailForm.state == 1" type="info" class="infoinfoText">待审核</el-text>
|
||||
<el-text v-if="detailForm.state == 2" type="success"
|
||||
class="successText">已整改</el-text>
|
||||
<el-text v-if="detailForm.state == 9" type="danger" class="dangerText">驳回</el-text>
|
||||
<el-text v-if="detailForm.correctionFlag == 0" type="info"
|
||||
class="nomarlText">-</el-text>
|
||||
<template v-else>
|
||||
<el-text v-if="detailForm.state == 0" type="info"
|
||||
class="infoinfoText">未整改</el-text>
|
||||
<el-text v-if="detailForm.state == 1" type="info"
|
||||
class="infoinfoText">待审核</el-text>
|
||||
<el-text v-if="detailForm.state == 2" type="success"
|
||||
class="successText">已整改</el-text>
|
||||
<el-text v-if="detailForm.state == 9" type="danger"
|
||||
class="dangerText">驳回</el-text>
|
||||
</template>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="5">
|
||||
|
@ -365,6 +373,13 @@ const handleSubmit = () => {
|
|||
color: #E13434;
|
||||
}
|
||||
|
||||
.yxText {
|
||||
font-family: Microsoft YaHei;
|
||||
font-weight: 400;
|
||||
font-size: 18px;
|
||||
color: #767C81;
|
||||
}
|
||||
|
||||
.applyFormContainer {
|
||||
padding-top: 20px;
|
||||
overflow: hidden;
|
||||
|
|
|
@ -35,6 +35,7 @@
|
|||
class="infoinfoText">一般偏差</el-text>
|
||||
<el-text v-if="detailForm.level == 3" type="danger"
|
||||
class="dangerText">主要偏差</el-text>
|
||||
<el-text v-if="detailForm.level == 4" type="danger" class="yxText">优秀项</el-text>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="5">
|
||||
|
@ -49,11 +50,18 @@
|
|||
</el-col>
|
||||
<el-col :span="4">
|
||||
<el-form-item label="状态:" prop="employeeNumber">
|
||||
<el-text v-if="detailForm.state == 0" type="info" class="infoinfoText">未整改</el-text>
|
||||
<el-text v-if="detailForm.state == 1" type="info" class="infoinfoText">待审核</el-text>
|
||||
<el-text v-if="detailForm.state == 2" type="success"
|
||||
class="successText">已整改</el-text>
|
||||
<el-text v-if="detailForm.state == 9" type="danger" class="dangerText">驳回</el-text>
|
||||
<el-text v-if="detailForm.correctionFlag == 0" type="info"
|
||||
class="nomarlText">-</el-text>
|
||||
<template v-else>
|
||||
<el-text v-if="detailForm.state == 0" type="info"
|
||||
class="infoinfoText">未整改</el-text>
|
||||
<el-text v-if="detailForm.state == 1" type="info"
|
||||
class="infoinfoText">待审核</el-text>
|
||||
<el-text v-if="detailForm.state == 2" type="success"
|
||||
class="successText">已整改</el-text>
|
||||
<el-text v-if="detailForm.state == 9" type="danger"
|
||||
class="dangerText">驳回</el-text>
|
||||
</template>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="5">
|
||||
|
@ -306,6 +314,13 @@ const isImageFile = (suffix) => {
|
|||
color: #DD9200;
|
||||
}
|
||||
|
||||
.yxText {
|
||||
font-family: Microsoft YaHei;
|
||||
font-weight: 400;
|
||||
font-size: 18px;
|
||||
color: #767C81;
|
||||
}
|
||||
|
||||
.successText {
|
||||
font-family: Microsoft YaHei;
|
||||
font-weight: 400;
|
||||
|
|
|
@ -37,36 +37,39 @@
|
|||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="year" label="年度" width="80" />
|
||||
<el-table-column prop="dependencyName" label="属地" width="180" />
|
||||
<el-table-column prop="deptName" label="部门" width="150" />
|
||||
<el-table-column prop="remark" label="问题描述" min-width="350" />
|
||||
<el-table-column prop="level" label="等级" width="120">
|
||||
<el-table-column prop="dependencyName" label="属地" width="180" show-overflow-tooltip/>
|
||||
<el-table-column prop="deptName" label="部门" width="150" show-overflow-tooltip/>
|
||||
<el-table-column prop="remark" label="问题描述" show-overflow-tooltip />
|
||||
<el-table-column prop="level" label="等级" width="100">
|
||||
<template #default="scope">
|
||||
<el-text v-if="scope.row.level == 1" type="success" class="successText">建议项</el-text>
|
||||
<el-text v-if="scope.row.level == 2" type="info" class="infoinfoText">一般偏差</el-text>
|
||||
<el-text v-if="scope.row.level == 3" type="danger" class="dangerText">主要偏差</el-text>
|
||||
<el-text v-if="scope.row.level == 4" type="danger" class="yxText">优秀项</el-text>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="planDoneTime" label="计划完成时间" width="150">
|
||||
<el-table-column prop="planDoneTime" label="计划完成时间" width="140">
|
||||
<template #default="scope">
|
||||
<span v-if="scope.row.planDoneTime"> {{ scope.row.planDoneTime }}</span>
|
||||
<span v-else>-</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="status" label="状态" width="120">
|
||||
<el-table-column prop="status" label="状态" width="100">
|
||||
<template #default="scope">
|
||||
<el-text v-if="scope.row.state == 0" type="info" class="nomarlText">未整改</el-text>
|
||||
<el-text v-if="scope.row.state == 1" type="info" class="nomarlText">待审核</el-text>
|
||||
<el-text v-if="scope.row.state == 2" type="success" class="successText">已整改</el-text>
|
||||
<el-text v-if="scope.row.state == 9" type="danger" class="dangerText">驳回</el-text>
|
||||
<el-text v-if="scope.row.correctionFlag == 0" type="info" class="nomarlText">-</el-text>
|
||||
<template v-else>
|
||||
<el-text v-if="scope.row.state == 0" type="info" class="nomarlText">未整改</el-text>
|
||||
<el-text v-if="scope.row.state == 1" type="info" class="nomarlText">待审核</el-text>
|
||||
<el-text v-if="scope.row.state == 2" type="success" class="successText">已整改</el-text>
|
||||
<el-text v-if="scope.row.state == 9" type="danger" class="dangerText">驳回</el-text>
|
||||
</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" fixed="right" width="100">
|
||||
<el-table-column label="操作" align="center" width="100">
|
||||
<template #default="scope">
|
||||
<el-button type="primary" v-if="scope.row.state == 1" text class="replayTextBtn"
|
||||
v-hasPermi="['examinerApproval:approval']"
|
||||
@click="handleApproval(scope.row)">审批</el-button>
|
||||
|
||||
v-hasPermi="['examinerApproval:approval']" @click="handleApproval(scope.row)">审批</el-button>
|
||||
|
||||
<el-button type="primary" v-else text class="replayTextBtn"
|
||||
v-hasPermi="['examinerApproval:viewDetail']" @click="handleView(scope.row)">查看</el-button>
|
||||
</template>
|
||||
|
@ -252,6 +255,13 @@ const handleApproval = (record) => {
|
|||
color: #E13434;
|
||||
}
|
||||
|
||||
.yxText {
|
||||
font-family: Microsoft YaHei;
|
||||
font-weight: 400;
|
||||
font-size: 18px;
|
||||
color: #767C81;
|
||||
}
|
||||
|
||||
.replayTextBtn {
|
||||
padding: 0 !important;
|
||||
color: #0090ff !important;
|
||||
|
|
|
@ -35,6 +35,7 @@
|
|||
class="infoinfoText">一般偏差</el-text>
|
||||
<el-text v-if="detailForm.level == 3" type="danger"
|
||||
class="dangerText">主要偏差</el-text>
|
||||
<el-text v-if="detailForm.level == 4" type="danger" class="yxText">优秀项</el-text>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="5">
|
||||
|
@ -49,11 +50,18 @@
|
|||
</el-col>
|
||||
<el-col :span="4">
|
||||
<el-form-item label="状态:" prop="employeeNumber">
|
||||
<el-text v-if="detailForm.state == 0" type="info" class="infoinfoText">未整改</el-text>
|
||||
<el-text v-if="detailForm.state == 1" type="info" class="infoinfoText">待审核</el-text>
|
||||
<el-text v-if="detailForm.state == 2" type="success"
|
||||
class="successText">已整改</el-text>
|
||||
<el-text v-if="detailForm.state == 9" type="danger" class="dangerText">驳回</el-text>
|
||||
<el-text v-if="detailForm.correctionFlag == 0" type="info"
|
||||
class="nomarlText">-</el-text>
|
||||
<template v-else>
|
||||
<el-text v-if="detailForm.state == 0" type="info"
|
||||
class="infoinfoText">未整改</el-text>
|
||||
<el-text v-if="detailForm.state == 1" type="info"
|
||||
class="infoinfoText">待审核</el-text>
|
||||
<el-text v-if="detailForm.state == 2" type="success"
|
||||
class="successText">已整改</el-text>
|
||||
<el-text v-if="detailForm.state == 9" type="danger"
|
||||
class="dangerText">驳回</el-text>
|
||||
</template>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="5">
|
||||
|
@ -308,6 +316,12 @@ const isImageFile = (suffix) => {
|
|||
color: #DD9200;
|
||||
}
|
||||
|
||||
.yxText {
|
||||
font-family: Microsoft YaHei;
|
||||
font-weight: 400;
|
||||
font-size: 18px;
|
||||
color: #767C81;
|
||||
}
|
||||
.successText {
|
||||
font-family: Microsoft YaHei;
|
||||
font-weight: 400;
|
||||
|
|
|
@ -35,6 +35,7 @@
|
|||
class="infoinfoText">一般偏差</el-text>
|
||||
<el-text v-if="detailForm.level == 3" type="danger"
|
||||
class="dangerText">主要偏差</el-text>
|
||||
<el-text v-if="detailForm.level == 4" type="danger" class="yxText">优秀项</el-text>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="5">
|
||||
|
@ -49,11 +50,18 @@
|
|||
</el-col>
|
||||
<el-col :span="4">
|
||||
<el-form-item label="状态:" prop="employeeNumber">
|
||||
<el-text v-if="detailForm.state == 0" type="info" class="infoinfoText">未整改</el-text>
|
||||
<el-text v-if="detailForm.state == 1" type="info" class="infoinfoText">待审核</el-text>
|
||||
<el-text v-if="detailForm.state == 2" type="success"
|
||||
class="successText">已整改</el-text>
|
||||
<el-text v-if="detailForm.state == 9" type="danger" class="dangerText">驳回</el-text>
|
||||
<el-text v-if="detailForm.correctionFlag == 0" type="info"
|
||||
class="nomarlText">-</el-text>
|
||||
<template v-else>
|
||||
<el-text v-if="detailForm.state == 0" type="info"
|
||||
class="infoinfoText">未整改</el-text>
|
||||
<el-text v-if="detailForm.state == 1" type="info"
|
||||
class="infoinfoText">待审核</el-text>
|
||||
<el-text v-if="detailForm.state == 2" type="success"
|
||||
class="successText">已整改</el-text>
|
||||
<el-text v-if="detailForm.state == 9" type="danger"
|
||||
class="dangerText">驳回</el-text>
|
||||
</template>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="5">
|
||||
|
@ -377,6 +385,12 @@ const handleSubmit = () => {
|
|||
font-size: 18px;
|
||||
color: #DD9200;
|
||||
}
|
||||
.yxText {
|
||||
font-family: Microsoft YaHei;
|
||||
font-weight: 400;
|
||||
font-size: 18px;
|
||||
color: #767C81;
|
||||
}
|
||||
|
||||
.successText {
|
||||
font-family: Microsoft YaHei;
|
||||
|
|
|
@ -37,10 +37,10 @@
|
|||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="year" label="年度" width="80" />
|
||||
<el-table-column prop="dependencyName" label="属地" width="180" />
|
||||
<el-table-column prop="deptName" label="部门" width="150" />
|
||||
<el-table-column prop="remark" label="问题描述" min-width="350" />
|
||||
<el-table-column prop="level" label="等级" width="120">
|
||||
<el-table-column prop="dependencyName" label="属地" width="180" show-overflow-tooltip/>
|
||||
<el-table-column prop="deptName" label="部门" width="150" show-overflow-tooltip/>
|
||||
<el-table-column prop="remark" label="问题描述" show-overflow-tooltip/>
|
||||
<el-table-column prop="level" label="等级" width="100">
|
||||
<template #default="scope">
|
||||
<el-text v-if="scope.row.level == 1" type="success" class="successText">建议项</el-text>
|
||||
<el-text v-if="scope.row.level == 2" type="info" class="infoinfoText">一般偏差</el-text>
|
||||
|
@ -48,27 +48,30 @@
|
|||
<el-text v-if="scope.row.level == 4" type="danger" class="yxText">优秀项</el-text>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="correctionFlag" label="是否整改" align="center" width="120">
|
||||
<el-table-column prop="correctionFlag" label="是否整改" align="center" width="100">
|
||||
<template #default="scope">
|
||||
<el-text v-if="scope.row.correctionFlag == 1" type="danger" class="dangerText">是</el-text>
|
||||
<el-text v-if="scope.row.correctionFlag == 0" type="danger" class="successText">否</el-text>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="planDoneTime" label="计划完成时间" width="150">
|
||||
<el-table-column prop="planDoneTime" label="计划完成时间" width="140">
|
||||
<template #default="scope">
|
||||
<span v-if="scope.row.planDoneTime"> {{ scope.row.planDoneTime }}</span>
|
||||
<span v-else>-</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="status" label="状态" width="120">
|
||||
<el-table-column prop="status" label="状态" width="80">
|
||||
<template #default="scope">
|
||||
<el-text v-if="scope.row.state == 0" type="info" class="nomarlText">未整改</el-text>
|
||||
<el-text v-if="scope.row.state == 1" type="info" class="nomarlText">待审核</el-text>
|
||||
<el-text v-if="scope.row.state == 2" type="success" class="successText">已整改</el-text>
|
||||
<el-text v-if="scope.row.state == 9" type="danger" class="dangerText">驳回</el-text>
|
||||
<el-text v-if="scope.row.correctionFlag == 0" type="info" class="nomarlText">-</el-text>
|
||||
<template v-else>
|
||||
<el-text v-if="scope.row.state == 0" type="info" class="nomarlText">未整改</el-text>
|
||||
<el-text v-if="scope.row.state == 1" type="info" class="nomarlText">待审核</el-text>
|
||||
<el-text v-if="scope.row.state == 2" type="success" class="successText">已整改</el-text>
|
||||
<el-text v-if="scope.row.state == 9" type="danger" class="dangerText">驳回</el-text>
|
||||
</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" fixed="right" width="100">
|
||||
<el-table-column label="操作" align="center" width="100">
|
||||
<template #default="scope">
|
||||
<el-button type="primary"
|
||||
v-if="(scope.row.state == 0 || scope.row.state == 9) && scope.row.correctionFlag == 1" text
|
||||
|
|
|
@ -41,31 +41,31 @@
|
|||
{{ scope.$index + 1 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="year" label="年度" width="100" />
|
||||
<el-table-column prop="dependencyName" label="属地" min-width="230" />
|
||||
<el-table-column prop="deptName" label="部门" min-width="150" />
|
||||
<el-table-column prop="workNo" label="ESC工号" min-width="130" />
|
||||
<el-table-column prop="escUserName" label="ESC" min-width="100" />
|
||||
<el-table-column prop="reviewState" label="状态" width="120">
|
||||
<el-table-column prop="year" label="年度" width="80" />
|
||||
<el-table-column prop="dependencyName" label="属地" show-overflow-tooltip/>
|
||||
<el-table-column prop="deptName" label="部门" show-overflow-tooltip/>
|
||||
<el-table-column prop="workNo" label="ESC工号" width="100" show-overflow-tooltip/>
|
||||
<el-table-column prop="escUserName" label="ESC" width="100" show-overflow-tooltip/>
|
||||
<el-table-column prop="reviewState" label="状态" width="100">
|
||||
<template #default="scope">
|
||||
<el-text v-if="scope.row.reviewState == 1" type="success" class="successText">整改完成</el-text>
|
||||
<el-text v-else type="danger" class="dangerText">待整改</el-text>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="openItemCount" label="开口项数量" min-width="130" />
|
||||
<el-table-column prop="reviewDate" label="审查时间" min-width="130">
|
||||
<el-table-column prop="openItemCount" label="开口项数量" width="120" />
|
||||
<el-table-column prop="reviewDate" label="审查时间" width="130">
|
||||
<template #default="scope">
|
||||
<span v-if="scope.row.reviewDate"> {{ scope.row.reviewDate }}</span>
|
||||
<span v-else>-</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="nextReviewDate" label="下次审查时间" min-width="150">
|
||||
<el-table-column prop="nextReviewDate" label="下次审查时间" width="140">
|
||||
<template #default="scope">
|
||||
<span v-if="scope.row.nextReviewDate"> {{ scope.row.nextReviewDate }}</span>
|
||||
<span v-else>-</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" fixed="right" width="130">
|
||||
<el-table-column label="操作" width="120">
|
||||
<template #default="scope">
|
||||
<el-button type="primary" text class="replayTextBtn"
|
||||
v-hasPermi="['examinerTasks:edit']" @click="handleEdit(scope.row)">编辑</el-button>
|
||||
|
|
|
@ -125,8 +125,7 @@
|
|||
<el-text v-if="scope.row.correctionFlag == 0 && !scope.row.editFlag" type="danger"
|
||||
class="successText">否</el-text>
|
||||
<el-select v-show="scope.row.editFlag" v-model="scope.row.correctionFlag"
|
||||
placeholder="请选择" clearable style="width: 86px"
|
||||
@change="handleChangeCorrectionFlag($event, scope.row)">
|
||||
placeholder="请选择" clearable style="width: 86px">
|
||||
<el-option v-for="item in correctionFlagList" :key="item.value" :label="item.label"
|
||||
:value="item.value" />
|
||||
</el-select>
|
||||
|
@ -145,10 +144,14 @@
|
|||
</el-table-column>
|
||||
<el-table-column prop="state" label="状态" width="100">
|
||||
<template #default="scope">
|
||||
<el-text v-if="scope.row.state == 0" type="info" class="nomarlText">未整改</el-text>
|
||||
<el-text v-if="scope.row.state == 1" type="info" class="nomarlText">待审核</el-text>
|
||||
<el-text v-if="scope.row.state == 2" type="success" class="successText">已整改</el-text>
|
||||
<el-text v-if="scope.row.state == 9" type="danger" class="dangerText">驳回</el-text>
|
||||
<el-text v-if="scope.row.correctionFlag == 0" type="info" class="nomarlText">-</el-text>
|
||||
<template v-else>
|
||||
<el-text v-if="scope.row.state == 0" type="info" class="nomarlText">未整改</el-text>
|
||||
<el-text v-if="scope.row.state == 1" type="info" class="nomarlText">待审核</el-text>
|
||||
<el-text v-if="scope.row.state == 2" type="success"
|
||||
class="successText">已整改</el-text>
|
||||
<el-text v-if="scope.row.state == 9" type="danger" class="dangerText">驳回</el-text>
|
||||
</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
|
||||
|
@ -356,11 +359,11 @@ const handleAddProblem = () => {
|
|||
safetyReviewId: ruleForm.id ? ruleForm.safetyReviewId : null,
|
||||
remark: null,
|
||||
level: null,
|
||||
correctionFlag: null, // 是否需要整改 0 否 1 是
|
||||
correctionFlag: 0, // 是否需要整改 0 否 1 是
|
||||
chargeUserId: escUserId.value,
|
||||
chargeUserName: escUserName.value,
|
||||
planDoneTime: null,
|
||||
state: null,
|
||||
state: 0,
|
||||
editFlag: true
|
||||
}
|
||||
showTableData.value.push(itemProblem)
|
||||
|
@ -396,12 +399,7 @@ const handleCancelClick = (row, rowIndex) => {
|
|||
// 计算开口项数量
|
||||
handleCountOpenItemCount()
|
||||
}
|
||||
// 是否整改切换
|
||||
const handleChangeCorrectionFlag = (val, row) => {
|
||||
console.log('sad', val, row)
|
||||
if (val == 1) row.state = 0
|
||||
else row.state = null
|
||||
}
|
||||
|
||||
// 问题等级过滤
|
||||
const handleChangeLeve = (index, _level) => {
|
||||
activeIndex.value = index
|
||||
|
|
Loading…
Reference in New Issue
Block a user