首页 发现 帮助
注册 登录
qzyReal
/
pco
1
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

导入车辆权限控制

qzyReal 3 年之前
父节点
ebf4d17928
当前提交
c0f6d95eb3
共有 5 个文件被更改，包括 60 次插入 和 49 次删除
分列视图 显示文件统计
  1. 34 33
      sp-admin/sa-frame/menu-list.js
  2. 16 11
      sp-admin/sa-view/tb-business-car/tb-business-car-list.html
  3. 1 1
      sp-server/app.pid
  4. 4 0
      sp-server/src/main/java/com/pj/project/tb_car/TbCar.java
  5. 5 4
      sp-server/src/main/java/com/pj/project/tb_car/TbCarController.java

+ 34 - 33
sp-admin/sa-frame/menu-list.js
查看文件 

@@ -115,39 +115,7 @@ var menuList = [{
 
 			},
 
 		]
 
 	},
 
-	{
 
-		id: 'tb-car',
 
-		name: '车辆管理',
 
-		parent: true,
 
-		icon: 'el-icon-s-custom',
 
-		childList: [{
 
-			id: 'tb-car-list',
 
-			name: '车辆列表',
 
-			icon: 'el-icon-s-custom',
 
-			url: 'sa-view/tb-car/tb-car-list.html',
 
-			childList: [{
 
-					id: 'tb-car-add',
 
-					name: '添加车辆',
 
-					isShow: false
 
-				},
 
-				{
 
-					id: 'tb-car-edit',
 
-					name: '编辑车辆',
 
-					isShow: false
 
-				},
 
-				{
 
-					id: 'tb-car-del',
 
-					name: '删除车辆',
 
-					isShow: false
 
-				},
 
-				{
 
-					id: 'tb-car-import',
 
-					name: '批量导入',
 
-					isShow: false
 
-				},
 
-			]
 
-		}]
 
-	},
 
+	
 	{
 
 		id: 'tb-costomer-maintain',
 
 		name: '信息维护',
 
@@ -252,6 +220,39 @@ var menuList = [{
 
 		}, ]
 
 	},
 
 	{
 
+		id: 'tb-car',
 
+		name: '车辆管理',
 
+		parent: true,
 
+		icon: 'el-icon-s-platform',
 
+		childList: [{
 
+			id: 'tb-car-list',
 
+			name: '车辆列表',
 
+			icon: 'el-icon-s-platform',
 
+			url: 'sa-view/tb-car/tb-car-list.html',
 
+			childList: [{
 
+					id: 'tb-car-add',
 
+					name: '添加车辆',
 
+					isShow: false
 
+				},
 
+				{
 
+					id: 'tb-car-edit',
 
+					name: '编辑车辆',
 
+					isShow: false
 
+				},
 
+				{
 
+					id: 'tb-car-del',
 
+					name: '删除车辆',
 
+					isShow: false
 
+				},
 
+				{
 
+					id: 'tb-car-import',
 
+					name: '批量导入',
 
+					isShow: false
 
+				},
 
+			]
 
+		}]
 
+	},
 
+	{
 
 		id: 'tb-business-item',
 
 		name: '作业管理',
 
 		icon: 'el-icon-edit-outline',

+ 16 - 11
sp-admin/sa-view/tb-business-car/tb-business-car-list.html
查看文件 

@@ -18,11 +18,22 @@
 
 	<body>
 
 		<div class="vue-box" style="display: none;" :style="'display: block;'">
 
 			<div class="c-panel">
 
-				<div class="fast-btn">
 
-					<el-button size="mini" type="info" @click="sa.f5()">刷新</el-button>
 
+				<div class="c-title">检索参数</div>
 
+				<el-form ref="form" :model='p' @submit.native.prevent>
 
+					<sa-item type="text" name="车牌号" v-model="p.carNo"></sa-item>
 
+					<div class="c-item">
 
+						<label class="c-label">支付状态：</label>
 
+						<el-select v-model="p.pay" placeholder="请选择">
 
+							<el-option label="-全部-" value=""> </el-option>
 
+							<el-option label="未支付" value="0"> </el-option>
 
+							<el-option label="已支付" value="1"> </el-option>
 
+						</el-select>
 
+					</div>
 
+					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 
+					<el-button size="mini" type="info" @click="sa.f5()">重置</el-button>
 
 					<el-button size="mini" type="primary"  @click="add()">
 
 						新增</el-button>
 
-				</div>
 
+				</el-form>
 
 				<!-- ------------- 数据列表 ------------- -->
 
 				<el-table class="data-table" ref="data-table" :data="dataList">
 
 					<sa-td name="车牌号" prop="carNo" width=120></sa-td>
 
@@ -46,12 +57,11 @@
 
 							<label v-else>未计算</label>
 
 						</template>
 
 					</el-table-column>
 
-
 
 					<el-table-column label="操作" width="200px">
 
 						<template slot-scope="s">
 
 							<el-button class="c-btn" type="success" icon="el-icon-view" @click="get(s.row)">查看
 
 							</el-button>
 
-							<el-button v-if="/*s.row.pay==0&&*/sa.isAuth('tb-business-edit')" class="c-btn" type="primary" icon="el-icon-edit" @click="update(s.row)">修改
 
+							<el-button v-if="sa.isAuth('tb-business-edit')" class="c-btn" type="primary" icon="el-icon-edit" @click="update(s.row)">修改
 
 							</el-button>
 
 						</template>
 
 					</el-table-column>
 
@@ -73,12 +83,7 @@
 
 						id: '', //  
 						businessId: sa.p('id', ''), //  
 						carNo: '', //  
-						preInTime: '', //  
-						preOutTime: '', //  
-						realInTime: '', //  
-						realOutTime: '', //  
-						money: '', //  
-						driverPhone: '', //  
+						pay:'',  
 						pageNo: 1, // 当前页 
 						pageSize: 10, // 页大小 
 						sortType: 0 // 排序方式

+ 1 - 1
sp-server/app.pid
查看文件 

@@ -1 +1 @@
 
-17132
 
+16728

+ 4 - 0
sp-server/src/main/java/com/pj/project/tb_car/TbCar.java
查看文件 

@@ -35,6 +35,10 @@ public class TbCar extends Model<TbCar> implements Serializable {
 
      * 此模块对应的表名
 
      */
 
     public static final String TABLE_NAME = "tb_car";
 
+    public static final String ADD = "tb-car-add";
 
+    public static final String EDIT = "tb-car-edit";
 
+    public static final String DEL = "tb-car-del";
 
+    public static final String IMPORT = "tb-car-import";
 
     /**
 
      * 此模块对应的权限码
 
      */

+ 5 - 4
sp-server/src/main/java/com/pj/project/tb_car/TbCarController.java
查看文件 

@@ -29,7 +29,7 @@ public class TbCarController {
 
 
 	/** 增 */  
 	@RequestMapping("add")
 
-	@SaCheckPermission(TbCar.PERMISSION_CODE)
 
+	@SaCheckPermission(TbCar.ADD)
 
 	@Transactional(rollbackFor = Exception.class)
 
 	public AjaxJson add(TbCar t){
 
 		tbCarService.add(t);
 
@@ -38,7 +38,7 @@ public class TbCarController {
 
 
 	/** 删 */  
 	@RequestMapping("delete")
 
-	@SaCheckPermission(TbCar.PERMISSION_CODE)
 
+	@SaCheckPermission(TbCar.DEL)
 
 	public AjaxJson delete(Long id){
 
 		 tbCarService.delete(id);
 
 		return AjaxJson.getSuccess();
 
@@ -46,7 +46,7 @@ public class TbCarController {
 
 	
 	/** 删 - 根据id列表 */  
 	@RequestMapping("deleteByIds")
 
-	@SaCheckPermission(TbCar.PERMISSION_CODE)
 
+	@SaCheckPermission(TbCar.DEL)
 
 	public AjaxJson deleteByIds(){
 
 		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class);
 
 		int line = SP.publicMapper.deleteByIds(TbCar.TABLE_NAME, ids);
 
@@ -55,7 +55,7 @@ public class TbCarController {
 
 	
 	/** 改 */  
 	@RequestMapping("update")
 
-	@SaCheckPermission(TbCar.PERMISSION_CODE)
 
+	@SaCheckPermission(TbCar.EDIT)
 
 	public AjaxJson update(TbCar t){
 
 		tbCarService.update(t);
 
 		return AjaxJson.getSuccess();
 
@@ -78,6 +78,7 @@ public class TbCarController {
 
 
 	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */
 
 	@RequestMapping("importExcel")
 
+	@SaCheckPermission(TbCar.IMPORT)
 
 	public AjaxJson importExcel(MultipartFile file)throws Exception {
 
 		tbCarService.importExcel(file);
 
 		return AjaxJson.getSuccess();