north-glass-erp/northglass-erp/src/views/system/role/RoleList.vue
@@ -55,6 +55,10 @@ buttons: [ ], slots:{ buttons: "role_add" }, zoom: true, custom: true }, @@ -212,6 +216,28 @@ }) } const addRole = () =>{ ElMessageBox.prompt('请输入新角色', '新增角色', { confirmButtonText: '确定', cancelButtonText: '取消', inputPattern:/^.{1,255}$/, inputErrorMessage: '不能为空且长度不能超过255', }) .then(({ value }) => { const role= { role: value } request.post("/role/add",role).then(res=>{ if(res.code==='200' && res.data===true){ ElMessage.success('新增成功') router.push({path:'/main/role/roleList',query:{random:Math.random()}}) }else{ ElMessage.error('新增失败') } }) }) } </script> <template> @@ -222,6 +248,15 @@ ref="xGrid" v-bind="gridOptions" > <template #role_add> <vxe-button @click="addRole" status='primary' style="margin-right: 1rem" >角色新增</vxe-button> </template> <template #filter="{ column, $panel }"> <div> <div v-for="(option, index) in column.filters" :key="index"> north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java
@@ -33,6 +33,7 @@ @ApiOperation("订单保存") @PostMapping("/saveOrder") @SaCheckPermission("createOrder.add") public Result saveOrder(@RequestBody Map<String, Object> orderMap) throws Exception { if(orderService.saveOrder(orderMap)) { return Result.seccess(true); @@ -54,39 +55,46 @@ } @ApiOperation("订单作废") @SaCheckPermission("createOrder.cancel") @PostMapping("/cancelOrder/{id}") public Result cancelOrder(@PathVariable String id) { return Result.seccess(orderService.cancelOrder(id)); } @ApiOperation("根据id获取订单信息") @SaCheckPermission("selectOrder.edit") @PostMapping("/getOrderById/{id}") public Result getOrderById(@PathVariable String id) { return Result.seccess(orderService.getOrderById(id)); } @ApiOperation("查询订单工艺") @SaCheckPermission("updateOrderCraft.search") @PostMapping("/getOrderCraftById/{id}") public Result getOrderCraftById(@PathVariable String id) { return Result.seccess(orderService.getOrderCraftById(id)); } @ApiOperation("审核订单") @SaCheckPermission("createOrder.review") @PostMapping("/reviewOrderById/{id}/{status}") public Result reviewOrderById(@PathVariable String id,@PathVariable Integer status) { return Result.seccess(orderService.reviewOrderById(id,status)); } @ApiOperation("审核工艺") @SaCheckPermission("updateOrderCraft.review") @PostMapping("/reviewProcessById/{id}/{status}") public Result reviewProcessById(@PathVariable String id,@PathVariable Integer status,@RequestBody List<OrderGlassDetail> orderGlassDetails) { return Result.seccess(orderService.reviewProcessById(id,status,orderGlassDetails)); } @ApiOperation("更新订单金额单价") @SaCheckPermission("createOrder.amountReset") @PostMapping("/updateOrderMoney") public Result updateOrderMoney(@RequestBody Map<String,Object> map) { return Result.seccess(orderService.updateOrderMoney(map)); } @SaCheckPermission("orderReport.search") @ApiOperation("查询订单报表") @PostMapping("/getOrderReport/{pageNum}/{pageSize}/{selectDate}") public Result getOrderReport(@PathVariable Integer pageNum, north-glass-erp/src/main/java/com/example/erp/controller/sd/ProductController.java
@@ -1,5 +1,6 @@ package com.example.erp.controller.sd; import cn.dev33.satoken.annotation.SaCheckPermission; import com.example.erp.common.Result; import com.example.erp.entity.sd.Product; import com.example.erp.service.sd.ProductService; @@ -24,27 +25,32 @@ } @ApiOperation("产品查询接口") @SaCheckPermission("selectProduct.search") @PostMapping ("/{pageNum}/{pageSize}/{glassType}") public Result defaultDateProduct(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @PathVariable List<String> glassType, @RequestBody Product product){ return Result.seccess(productService.defaultDateProduct(pageNum,pageSize,glassType,product)); } @ApiOperation("产品保存接口") @SaCheckPermission("selectProduct.add") @PostMapping("/saveProduct") public Result saveProduct(@RequestBody Map<String,Object> product){ return Result.seccess(productService.saveProduct(product)); } @ApiOperation("产品删除接口") @SaCheckPermission("selectProduct.delete") @PostMapping("/deleteProductById/{id}") public Result deleteProductById(@PathVariable Integer id){ return Result.seccess(productService.deleteProductById(id)); } @ApiOperation("产品审核状态修改接口") @SaCheckPermission("selectProduct.review") @PostMapping("/updateProductStateById/{id}/{state}") public Result updateProductStateById(@PathVariable Integer id,@PathVariable Integer state){ return Result.seccess(productService.updateProductStateById(id,state)); } @ApiOperation("根据产品id查询产品接口") @SaCheckPermission("selectProduct.edit") @PostMapping("/selectProductById/{id}") public Result selectProductById(@PathVariable Integer id){ return Result.seccess(productService.selectProductById(id)); north-glass-erp/src/main/java/com/example/erp/controller/userInfo/RoleController.java
@@ -1,11 +1,10 @@ package com.example.erp.controller.userInfo; import com.example.erp.common.Result; import com.example.erp.entity.userInfo.Role; import com.example.erp.service.userInfo.RoleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/role") @@ -20,4 +19,10 @@ public Result findAll(){ return Result.seccess(roleService.findAll()); } @PostMapping("/add") public Result add(@RequestBody Role role){ return Result.seccess(roleService.add(role)); } } north-glass-erp/src/main/java/com/example/erp/service/userInfo/RoleService.java
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.example.erp.entity.userInfo.Role; import com.example.erp.mapper.userInfo.RoleMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -24,4 +23,9 @@ .ne("role","admin") ); } public Boolean add(Role role) { return roleMapper.insert(role) > 0; } } north-glass-erp/src/main/resources/mapper/userInfo/PermissionBasicMapper.xml
@@ -52,8 +52,10 @@ id as value, page as label from permission_basic where id!=1 and state=1 group by menu where state=1 and menu = #{menu} group by id </select>