From 148c341f5ac3041f90a55728929c46850513d417 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 15 十月 2024 18:40:47 +0800
Subject: [PATCH] 最新版本
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PositionCloudController.java | 16 ++++++++--------
admin/src/views/business/relativeMember.vue | 9 +++++----
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/admin/src/views/business/relativeMember.vue b/admin/src/views/business/relativeMember.vue
index 9e0e35e..f5a6676 100644
--- a/admin/src/views/business/relativeMember.vue
+++ b/admin/src/views/business/relativeMember.vue
@@ -100,11 +100,12 @@
<el-table-column prop="companyName" label="鎵�灞為儴闂�" min-width="100px"></el-table-column>
<el-table-column prop="postionName" label="宀椾綅" min-width="100px"></el-table-column>
<el-table-column prop="isDangyuan" label="鏄惁鍏氬憳" min-width="100px">
- <el-table-column prop="jobDate" label="鍏ヨ亴鏃ユ湡" min-width="100px">
- <span v-if="row.status == 0" style="color: green">鏄�</span>
- <span v-else >鍚�</span>
+ <template slot-scope="{row}">
+ <span v-if="row.statusisDangyuan == 0" style="color: green">鏄�</span>
+ <span v-else >鍚�</span>
+ </template>
</el-table-column>
- <el-table-column prop="jobDate" label="鍏ヨ亴鏃ユ湡" min-width="100px">
+ <el-table-column prop="jobDate" label="鍏ヨ亴鏃ユ湡" min-width="100px"> </el-table-column>
<!-- <el-table-column prop="status" label="鐘舵��" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.status == 0" style="color: green">姝ｅ父</span>
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PositionCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PositionCloudController.java
index 9e5dcce..b0a1e9c 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PositionCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PositionCloudController.java
@@ -34,7 +34,7 @@
@PreventRepeat
@ApiOperation("鏂板缓")
@PostMapping("/create")
- @CloudRequiredPermission("business:visitreason:create")
+ @CloudRequiredPermission("business:position:create")
public ApiResponse create(@RequestBody Position position,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
position.setLoginUserInfo(this.getLoginUser(token));
return ApiResponse.success(positionService.create(position));
@@ -42,7 +42,7 @@
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
- @CloudRequiredPermission("business:visitreason:delete")
+ @CloudRequiredPermission("business:position:delete")
public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
positionService.deleteById(id,this.getLoginUser(token));
return ApiResponse.success(null);
@@ -50,7 +50,7 @@
@ApiOperation("鎵归噺鍒犻櫎")
@GetMapping("/delete/batch")
- @CloudRequiredPermission("business:visitreason:delete")
+ @CloudRequiredPermission("business:position:delete")
public ApiResponse deleteByIdInBatch(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
String [] idArray = ids.split(",");
List<Integer> idList = new ArrayList<>();
@@ -63,7 +63,7 @@
@ApiOperation("鏍规嵁ID淇敼")
@PostMapping("/updateById")
- @CloudRequiredPermission("business:visitreason:update")
+ @CloudRequiredPermission("business:position:update")
public ApiResponse updateById(@RequestBody Position position,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
position.setLoginUserInfo(this.getLoginUser(token));
positionService.updateById(position);
@@ -72,27 +72,27 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
- @CloudRequiredPermission("business:visitreason:query")
+ @CloudRequiredPermission("business:position:query")
public ApiResponse<PageData<Position>> findPage (@RequestBody PageWrap<Position> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(positionService.findPage(pageWrap));
}
@ApiOperation("鏌ヨ鍏ㄩ儴")
@PostMapping("/list")
- @CloudRequiredPermission("business:visitreason:query")
+ @CloudRequiredPermission("business:position:query")
public ApiResponse<List<Position>> findList (@RequestBody Position pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(positionService.findList(pageWrap));
}
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
- @CloudRequiredPermission("business:visitreason:exportExcel")
+ @CloudRequiredPermission("business:position:exportExcel")
public void exportExcel (@RequestBody PageWrap<Position> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
ExcelExporter.build(Position.class).export(positionService.findPage(pageWrap).getRecords(), "璁垮浜嬬敱淇℃伅琛�", response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
- @CloudRequiredPermission("business:visitreason:query")
+ @CloudRequiredPermission("business:position:query")
public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(positionService.findById(id));
}
--
Gitblit v1.9.3