diff --git a/src/views/safetyReview/dashboard/detailForm.vue b/src/views/safetyReview/dashboard/detailForm.vue
index 30b0ecb..cfecfea 100644
--- a/src/views/safetyReview/dashboard/detailForm.vue
+++ b/src/views/safetyReview/dashboard/detailForm.vue
@@ -107,10 +107,14 @@
- 未整改
- 待审核
- 已整改
- 驳回
+ -
+
+ 未整改
+ 待审核
+ 已整改
+ 驳回
+
diff --git a/src/views/safetyReview/examinerApproval/approvalForm.vue b/src/views/safetyReview/examinerApproval/approvalForm.vue
index c1b0584..c21c38a 100644
--- a/src/views/safetyReview/examinerApproval/approvalForm.vue
+++ b/src/views/safetyReview/examinerApproval/approvalForm.vue
@@ -35,6 +35,7 @@
class="infoinfoText">一般偏差
主要偏差
+ 优秀项
@@ -49,11 +50,18 @@
- 未整改
- 待审核
- 已整改
- 驳回
+ -
+
+ 未整改
+ 待审核
+ 已整改
+ 驳回
+
@@ -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;
diff --git a/src/views/safetyReview/examinerApproval/detailForm.vue b/src/views/safetyReview/examinerApproval/detailForm.vue
index ac64487..0d2ba1e 100644
--- a/src/views/safetyReview/examinerApproval/detailForm.vue
+++ b/src/views/safetyReview/examinerApproval/detailForm.vue
@@ -35,6 +35,7 @@
class="infoinfoText">一般偏差
主要偏差
+ 优秀项
@@ -49,11 +50,18 @@
- 未整改
- 待审核
- 已整改
- 驳回
+ -
+
+ 未整改
+ 待审核
+ 已整改
+ 驳回
+
@@ -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;
diff --git a/src/views/safetyReview/examinerApproval/index.vue b/src/views/safetyReview/examinerApproval/index.vue
index 83aebc4..6589238 100644
--- a/src/views/safetyReview/examinerApproval/index.vue
+++ b/src/views/safetyReview/examinerApproval/index.vue
@@ -37,36 +37,39 @@
-
-
-
-
+
+
+
+
建议项
一般偏差
主要偏差
+ 优秀项
-
+
{{ scope.row.planDoneTime }}
-
-
+
- 未整改
- 待审核
- 已整改
- 驳回
+ -
+
+ 未整改
+ 待审核
+ 已整改
+ 驳回
+
-
+
审批
-
+ v-hasPermi="['examinerApproval:approval']" @click="handleApproval(scope.row)">审批
+
查看
@@ -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;
diff --git a/src/views/safetyReview/examinerEscTask/detailForm.vue b/src/views/safetyReview/examinerEscTask/detailForm.vue
index 231f5dd..548fbe3 100644
--- a/src/views/safetyReview/examinerEscTask/detailForm.vue
+++ b/src/views/safetyReview/examinerEscTask/detailForm.vue
@@ -35,6 +35,7 @@
class="infoinfoText">一般偏差
主要偏差
+ 优秀项
@@ -49,11 +50,18 @@
- 未整改
- 待审核
- 已整改
- 驳回
+ -
+
+ 未整改
+ 待审核
+ 已整改
+ 驳回
+
@@ -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;
diff --git a/src/views/safetyReview/examinerEscTask/escTaskForm.vue b/src/views/safetyReview/examinerEscTask/escTaskForm.vue
index 96c12a6..4357a76 100644
--- a/src/views/safetyReview/examinerEscTask/escTaskForm.vue
+++ b/src/views/safetyReview/examinerEscTask/escTaskForm.vue
@@ -35,6 +35,7 @@
class="infoinfoText">一般偏差
主要偏差
+ 优秀项
@@ -49,11 +50,18 @@
- 未整改
- 待审核
- 已整改
- 驳回
+ -
+
+ 未整改
+ 待审核
+ 已整改
+ 驳回
+
@@ -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;
diff --git a/src/views/safetyReview/examinerEscTask/index.vue b/src/views/safetyReview/examinerEscTask/index.vue
index a25714c..1da517c 100644
--- a/src/views/safetyReview/examinerEscTask/index.vue
+++ b/src/views/safetyReview/examinerEscTask/index.vue
@@ -37,10 +37,10 @@
-
-
-
-
+
+
+
+
建议项
一般偏差
@@ -48,27 +48,30 @@
优秀项
-
+
是
否
-
+
{{ scope.row.planDoneTime }}
-
-
+
- 未整改
- 待审核
- 已整改
- 驳回
+ -
+
+ 未整改
+ 待审核
+ 已整改
+ 驳回
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
整改完成
待整改
-
-
+
+
{{ scope.row.reviewDate }}
-
-
+
{{ scope.row.nextReviewDate }}
-
-
+
编辑
diff --git a/src/views/safetyReview/examinerTasks/taskForm.vue b/src/views/safetyReview/examinerTasks/taskForm.vue
index b1fd95e..500b72a 100644
--- a/src/views/safetyReview/examinerTasks/taskForm.vue
+++ b/src/views/safetyReview/examinerTasks/taskForm.vue
@@ -125,8 +125,7 @@
否
+ placeholder="请选择" clearable style="width: 86px">
@@ -145,10 +144,14 @@
- 未整改
- 待审核
- 已整改
- 驳回
+ -
+
+ 未整改
+ 待审核
+ 已整改
+ 驳回
+
@@ -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