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/basicApprove/index.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/specialWorkSystem/workFlow/approveBasic/index.vue b/src/views/specialWorkSystem/flow/basicApprove/index.vue
similarity index 98%
rename from src/views/specialWorkSystem/workFlow/approveBasic/index.vue
rename to src/views/specialWorkSystem/flow/basicApprove/index.vue
index 9f2ec17..021a4d1 100644
--- a/src/views/specialWorkSystem/workFlow/approveBasic/index.vue
+++ b/src/views/specialWorkSystem/flow/basicApprove/index.vue
@@ -61,7 +61,7 @@
<el-table-column prop="gmtCreate" label="创建时间" show-overflow-tooltip></el-table-column>
<el-table-column prop="modifiedUname" label="最后修改人" show-overflow-tooltip></el-table-column>
<el-table-column prop="gmtModified" label="最后修改时间" show-overflow-tooltip></el-table-column>
- <el-table-column property="status" label="状态" width="60" />
+<!-- <el-table-column property="status" label="状态" width="60" />-->
<el-table-column fixed="right" label="操作" align="center" width="300">
<template #default="scope">
<el-button link type="primary" size="small" :icon="View" @click="openApproveBasicDialog('查看', scope.row)">查看</el-button>
@@ -85,7 +85,7 @@
import { ElTable, ElMessage, ElMessageBox } from 'element-plus';
import { approveBasicApi } from '/@/api/specialWorkSystem/approveBasic';
import { departmentApi } from '/@/api/systemManage/department';
-import approveBasicDialog from '/@/views/specialWorkSystem/workFlow/approveBasic/components/approveBasicDialog.vue';
+import approveBasicDialog from '/@/views/specialWorkSystem/flow/basicApprove/components/approveBasicDialog.vue';
let global: any = {
homeChartOne: null,
homeChartTwo: null,
--
Gitblit v1.9.2