From 902a537974ce0374d68d9e717febab7157a69286 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 13 十月 2022 09:43:54 +0800
Subject: [PATCH] 冲突
---
src/views/specialWorkSystem/flow/ruleofApp/index.vue | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/views/specialWorkSystem/workFlow/approveRule/index.vue b/src/views/specialWorkSystem/flow/ruleofApp/index.vue
similarity index 99%
rename from src/views/specialWorkSystem/workFlow/approveRule/index.vue
rename to src/views/specialWorkSystem/flow/ruleofApp/index.vue
index f78529f..09bb87a 100644
--- a/src/views/specialWorkSystem/workFlow/approveRule/index.vue
+++ b/src/views/specialWorkSystem/flow/ruleofApp/index.vue
@@ -79,7 +79,7 @@
import { toRefs, reactive, ref, onMounted } from 'vue';
import { Edit, View, Plus, Delete, Refresh, Search, Download } from '@element-plus/icons-vue';
import { ElTable, ElMessage, ElMessageBox } from 'element-plus';
-import approveRuleDialog from '/@/views/specialWorkSystem/workFlow/approveRule/components/approveRuleDialog.vue';
+import approveRuleDialog from '/@/views/specialWorkSystem/flow/ruleofApp/components/approveRuleDialog.vue';
import { departmentApi } from '/@/api/systemManage/department';
import { approveRuleApi } from '/@/api/specialWorkSystem/approveRule/index';
import { userApi } from '/@/api/systemManage/user';
--
Gitblit v1.9.2