Merge remote-tracking branch 'origin/master'

src/api/cw/common/EnterpriseSearchService.js

@@ -1,5 +1,5 @@
 import request from '@/utils/httpRequest';
-import { FINANCE_PATH as prefix } from "../../AppPath";
+import { BUSINESS_PATH as prefix } from "../../AppPath";
 
 export default class EnterpriseSearchService {
   enterpriseSearchByName (name) {

src/views/jy/daily/UserList.vue

@@ -116,9 +116,6 @@
 						<vxe-toolbar
 							ref="userToolbar"
 							:refresh="{ query: refreshList }"
-							import
-							export
-							print
 							resizable
 							custom
 						>

src/views/jy/driveMaintain/DriveMaintain.vue

@@ -25,7 +25,7 @@
 				</el-date-picker>
 			</el-form-item>
 			<el-form-item>
-				<el-button type="default" @click="showHide" :icon="showHideIcon">{{showHideName}}</el-button>
+				<!--<el-button type="default" @click="showHide" :icon="showHideIcon">{{showHideName}}</el-button>-->
 				<el-button type="primary" @click="refreshList()" icon="el-icon-search">查询</el-button>
 				<el-button @click="resetSearch()" icon="el-icon-refresh-right">重置</el-button>
 			</el-form-item>
@@ -83,6 +83,7 @@
 					</vxe-column>
 					<vxe-column min-width="160" align="center" title="维护开始时间" field="startTime"></vxe-column>
 					<vxe-column min-width="160" align="center" title="维护结束时间" field="endTime"></vxe-column>
+					<vxe-column min-width="160" align="center" title="申请人" field="createName"></vxe-column>
 					<vxe-column min-width="160" align="center" title="申请时间" field="createTime"></vxe-column>
 					<vxe-column  min-width="150px" align="center" title="申请状态" field="status" fixed="right">
 						<template #default="scope">