From 17600f41d7c3f6c28cc5393dbb4d3d7e82eccad6 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 25 八月 2022 09:54:47 +0800
Subject: [PATCH] conflict
---
src/views/specialWorkSystem/workFlow/approveRule/components/approveRuleDialog.vue | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/views/specialWorkSystem/workFlow/approveRule/components/approveRuleDialog.vue b/src/views/specialWorkSystem/workFlow/approveRule/components/approveRuleDialog.vue
index 8ab712b..1bdb4e0 100644
--- a/src/views/specialWorkSystem/workFlow/approveRule/components/approveRuleDialog.vue
+++ b/src/views/specialWorkSystem/workFlow/approveRule/components/approveRuleDialog.vue
@@ -263,9 +263,9 @@
if (data.approveRuleForm.workType === 1) {
data.approveRuleForm.workLevel = null;
data.workLevelList = [
+ { id: 3, name: '特级动火作业' },
{ id: 1, name: '一级动火作业' },
- { id: 2, name: '二级动火作业' },
- { id: 3, name: '三级动火作业' }
+ { id: 2, name: '二级动火作业' }
];
} else if (data.approveRuleForm.workType === 3) {
data.approveRuleForm.workLevel = null;
@@ -277,10 +277,10 @@
} else if (data.approveRuleForm.workType === 6) {
data.approveRuleForm.workLevel = null;
data.workLevelList = [
+ { id: 7, name: '特级高处作业' },
{ id: 4, name: '一级高处作业' },
{ id: 5, name: '二级高处作业' },
{ id: 6, name: '三级高处作业' },
- { id: 7, name: '四级高处作业' }
];
} else if (data.approveRuleForm.workType === 8) {
data.approveRuleForm.workLevel = null;
@@ -297,9 +297,9 @@
const setValue = (workType: number) => {
if (workType === 1) {
data.workLevelList = [
+ { id: 3, name: '特级动火作业' },
{ id: 1, name: '一级动火作业' },
{ id: 2, name: '二级动火作业' },
- { id: 3, name: '三级动火作业' }
];
} else if (workType === 3) {
data.workLevelList = [
@@ -309,10 +309,10 @@
];
} else if (workType === 6) {
data.workLevelList = [
+ { id: 7, name: '四级高处作业' },
{ id: 4, name: '一级高处作业' },
{ id: 5, name: '二级高处作业' },
- { id: 6, name: '三级高处作业' },
- { id: 7, name: '四级高处作业' }
+ { id: 6, name: '三级高处作业' }
];
} else if (workType === 8) {
data.workLevelList = [
--
Gitblit v1.9.2