Skip to content

K
klck
Commit d1cc0c23 authored by lenovo's avatar lenovo
Browse files
Options

一级分类/二级分类缺陷修复，新增一级分类模块，运行前先运行sql文件夹里的suppliesmenu.sql

parent 98ff0923
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 503 additions and 38 deletions
ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesController.java
View file @ d1cc0c23
......@@ -53,10 +53,24 @@ public class ActSuppliesController extends BaseController
public TableDataInfo list(ActSupplies actSupplies)
{
startPage();
List<ActSupplies> list = actSuppliesService.selectActSuppliesList(actSupplies);
List<ActSupplies> list = actSuppliesService.selectActSuppliesList(actSupplies);;
return getDataTable(list);
}
/**
* 查询物料总分类管理列表
*/
@PreAuthorize("@ss.hasPermi('Actsupplies:Actsupplies:listOne')")
@GetMapping("/listOne")
public TableDataInfo listOne(ActSupplies actSupplies)
{
startPage();
List<ActSupplies> list = actSuppliesService.selectActSuppliesListOne(actSupplies);;
return getDataTable(list);
}
/**
* 导出物料总分类管理列表
*/
......
ruoyi-supplies/src/main/java/com/ruoyi/system/mapper/ActSuppliesMapper.java
View file @ d1cc0c23
......@@ -78,4 +78,5 @@ public interface ActSuppliesMapper
*/
public int countBySuppliesName(String suppliesName);
List<ActSupplies> selectActSuppliesListOne(ActSupplies actSupplies);
}
ruoyi-supplies/src/main/java/com/ruoyi/system/service/IActSuppliesService.java
View file @ d1cc0c23
......@@ -89,5 +89,5 @@ public interface IActSuppliesService
List<Integer> findId(Long id);
List<ActSupplies> selectActSuppliesListOne(ActSupplies actSupplies);
}
ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesServiceImpl.java
View file @ d1cc0c23
......@@ -160,6 +160,12 @@ public class ActSuppliesServiceImpl implements IActSuppliesService
return actSuppliesMapper.findId(id);
}
@Override
public List<ActSupplies> selectActSuppliesListOne(ActSupplies actSupplies) {
return actSuppliesMapper.selectActSuppliesListOne(actSupplies);
}
private void updateStatusById(Long id, Integer status){
String[] statusText={"禁用","启用"};
......
ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesDetailsMapper.xml
View file @ d1cc0c23
......@@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="ActSupplies" id="ActSuppliesResult">
<result property="id" column="id" />
<result property="pid" column="pid" />
<result property="fname" column="fname"/>
<result property="suppliesName" column="supplies_name" />
<result property="orderNum" column="order_num" />
<result property="status" column="status" />
......@@ -46,7 +47,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql>
<select id="saveSid" parameterType="com.ruoyi.system.domain.ActSupplies" resultMap="ActSuppliesResult">
select id,pid,supplies_name from act_supplies where status = 0;
-- select id,pid,supplies_name from act_supplies where status = 0;
select a.id,a.pid,b.supplies_name fname,a.supplies_name,a.status from act_supplies a LEFT JOIN act_supplies b on a.pid =b.id where a.status = 0
</select>
<select id="selectActSuppliesDetailsList" parameterType="ActSuppliesDetails" resultMap="OneActSuppliesDetailsResult">
......
ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesMapper.xml
View file @ d1cc0c23
......@@ -26,8 +26,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select count(*) from act_supplies where supplies_name=#{suppliesName}
</select>
<select id="selectActSuppliesList" parameterType="ActSupplies" resultMap="ActSuppliesResult">
select a.id,a.pid,b.supplies_name fname,a.supplies_name,a.status from act_supplies a left join act_supplies b on a.pid =b.id
select a.id,a.pid,b.supplies_name fname,a.supplies_name,a.status from act_supplies a , act_supplies b
<where>
and a.pid =b.id
<if test="id != null "> and a.id = #{id}</if>
<if test="pid != null">and a.pid = #{pid}</if>
<if test="fname != null "> and b.supplies_name like concat('%', #{fname}, '%')</if>
......@@ -36,6 +37,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</select>
<select id="selectActSuppliesListOne" parameterType="ActSupplies" resultMap="ActSuppliesResult">
<include refid="selectActSuppliesVo"/>
<where>
and pid = 0
<if test="id != null "> and id = #{id}</if>
<if test="suppliesName != null and suppliesName != ''"> and supplies_name like concat('%', #{suppliesName}, '%')</if>
<if test="status != null "> and status = #{status}</if>
</where>
</select>
<select id="selectActSuppliesById" parameterType="Long" resultMap="ActSuppliesResult">
<include refid="selectActSuppliesVo"/>
where id = #{id}
......@@ -43,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="options" parameterType="ActSupplies" resultMap="ActSuppliesResult">
<include refid="selectActSuppliesVo"/>
where pid = 0
where pid = 0 and status = 0
</select>
<insert id="insertActSupplies" parameterType="ActSupplies" useGeneratedKeys="true" keyProperty="id">
......
ruoyi-ui/src/api/Actsupplies/Actsupplies.js
View file @ d1cc0c23
import request from '@/utils/request'
// 查询物料关系管理列表
// 查询二级分类列表
export function listSupplies(query) {
return request({
url: '/Actsupplies/Actsupplies/list',
......@@ -9,6 +9,15 @@ export function listSupplies(query) {
})
}
// 查询一级分类列表
export function listSuppliesOne(query) {
return request({
url: '/Actsupplies/Actsupplies/listOne',
method: 'get',
params: query
})
}
// 查询物料关系管理详细
export function getSupplies(id) {
return request({
......
ruoyi-ui/src/views/system/ActSuppliesDetails/ActSuppliesDetails/index.vue
View file @ d1cc0c23
......@@ -7,7 +7,7 @@
<el-option
v-for="option in options2"
:key="option.suppliesName"
:label="option.suppliesName"
:label="option.fname==null ? option.id+'-'+option.suppliesName : option.fname+'-'+option.suppliesName"
:value="option.id"
></el-option>
......@@ -92,13 +92,10 @@
<el-table v-loading="loading" :data="ActSuppliesDetailsList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" width="80" align="center" label="序号" :index="indexMethod" />
<el-table-column label="所属分类" align="center">
<el-table-column label="上级分类" align="center">
<template slot-scope="scope">
<div>
<template v-if="scope.row.fname === null">
其他
</template>
<template v-else>
<template>
{{ scope.row.fname }}
</template>
</div>
......@@ -156,13 +153,12 @@
<el-option
v-for="option in options2"
:key="option.suppliesName"
:label="option.suppliesName"
:label="option.fname==null ? option.id+'-'+option.suppliesName : option.fname+'-'+option.suppliesName"
:value="option.id"
></el-option>
<el-option label="其他" value="0"></el-option>
</el-select>
</el-form-item>
<el-form-item label="小类物料名称" prop="detailsName">
<el-form-item label="物料名称" prop="detailsName">
<el-input v-model="form.detailsName" placeholder="请输入物料名称" />
</el-form-item>
<el-form-item label="所属系统" prop="sysclassify">
......@@ -351,7 +347,7 @@ export default {
this.fetchOptions();
this.reset();
this.open = true;
this.title = "添加物料";
this.title = "新增物料";
},
/** 修改按钮操作 */
handleUpdate(row) {
......
ruoyi-ui/src/views/system/Actsupplies/Actsupplies/index.vue
View file @ d1cc0c23
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="大类名称" prop="pid">
<el-select v-model="queryParams.pid" filterable clearable placeholder="请输入上级分类" >
<el-form-item label="一级分类名称" prop="pid" label-width="100px">
<el-select v-model="queryParams.pid" filterable clearable placeholder="请输入一级分类分类名称">
<el-option
v-for="option in options"
:key="option.suppliesName"
:label="option.suppliesName"
:value="option.id"
></el-option>
<el-option label="无" value="0"></el-option>
</el-select>
</el-form-item>
<el-form-item label="物料名称" prop="suppliesName">
......@@ -42,7 +41,7 @@
size="mini"
@click="handleAdd"
v-hasPermi="['supplies:supplies:add']"
>新增</el-button>
>新增二级分类</el-button>
</el-col>
<el-col :span="1.5">
<el-button
......@@ -83,19 +82,16 @@
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="ID" align="center" prop="id" />-->
<el-table-column type="index" width="80" align="center" label="序号" :index="indexMethod" />
<el-table-column label="大类名称" align="center">
<el-table-column label="一级分类名称" align="center">
<template slot-scope="scope">
<div>
<template v-if="scope.row.fname === null">
无
</template>
<template v-else>
<template>
{{ scope.row.fname }}
</template>
</div>
</template>
</el-table-column>
<el-table-column label="物料名称" align="center" prop="suppliesName" />
<el-table-column label="二级分类名称" align="center" prop="suppliesName" />
<el-table-column label="状态" align="center">
<template slot-scope="scope">
<div>
......@@ -139,19 +135,18 @@
<!-- 添加或修改物料总分类管理对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="所属大类" prop="pid">
<el-select v-model="form.pid" filterable placeholder="请输入所属大类" >
<el-form-item label="所属一级分类" prop="pid">
<el-select v-model="form.pid" filterable placeholder="请输入所属一级分类" >
<el-option
v-for="option in options"
:key="option.suppliesName"
:label="option.suppliesName"
:value="option.id"
></el-option>
<el-option label="无" :value="0"></el-option>
</el-select>
</el-form-item>
<el-form-item label="物料名称" prop="suppliesName">
<el-input v-model="form.suppliesName" placeholder="请输入物料名称" />
<el-input v-model="form.suppliesName" placeholder="请输入二级分类名称" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="form.status" placeholder="请选择状态">
......@@ -165,6 +160,7 @@
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
......@@ -201,8 +197,10 @@ export default {
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
opentwo: false,
// 查询参数
queryParams: {
id: null,
......@@ -282,7 +280,6 @@ export default {
/** 查询上级关联关系*/
fetchOptions() {
getPid().then(response => {
console.log(response.rows)
this.options = response.rows;
});
},
......@@ -300,6 +297,7 @@ export default {
// 取消按钮
cancel() {
this.open = false;
this.opentwo = false;
this.reset();
},
// 表单重置
......@@ -322,9 +320,6 @@ export default {
handleQuery() {
this.queryParams.pageNum = 1;
if ('最高级'.indexOf(this.queryParams.fname) !== -1){
this.queryParams.pid = 0;
}
this.getList();
},
......@@ -341,10 +336,9 @@ export default {
},
/** 新增按钮操作 */
handleAdd() {
this.fetchOptions();
this.reset();
this.open = true;
this.title = "添加物料总分类管理";
this.title = "新增二级分类";
},
/** 修改按钮操作 */
handleUpdate(row) {
......@@ -364,13 +358,15 @@ export default {
updateSupplies(this.form).then(response => {
this.msgSuccess("修改成功");
this.open = false;
this.getList();
this.opentwo = false;
this.getList();
});
} else {
addSupplies(this.form).then(response => {
this.msgSuccess("新增成功");
this.open = false;
this.getList();
this.opentwo = false;
this.getList();
});
}
}
......
ruoyi-ui/src/views/system/Actsupplies/Actsupplies/indexone.vue 0 → 100644
View file @ d1cc0c23
This diff is collapsed.
sql/suppliesMenu.sql 0 → 100644
View file @ d1cc0c23
-- 菜单 SQL
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
values('一级分类', '1169', '1', 'supplies', 'system/supplies/index', 1, 0, 'C', '0', '0', 'system:supplies:list', '#', 'admin', sysdate(), '', null, '一级分类菜单');
-- 按钮父菜单ID
SELECT @parentId := LAST_INSERT_ID();
-- 按钮 SQL
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
values('一级分类查询', @parentId, '1', '#', '', 1, 0, 'F', '0', '0', 'system:supplies:query', '#', 'admin', sysdate(), '', null, '');
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
values('一级分类新增', @parentId, '2', '#', '', 1, 0, 'F', '0', '0', 'system:supplies:add', '#', 'admin', sysdate(), '', null, '');
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
values('一级分类修改', @parentId, '3', '#', '', 1, 0, 'F', '0', '0', 'system:supplies:edit', '#', 'admin', sysdate(), '', null, '');
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
values('一级分类删除', @parentId, '4', '#', '', 1, 0, 'F', '0', '0', 'system:supplies:remove', '#', 'admin', sysdate(), '', null, '');
insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
values('一级分类导出', @parentId, '5', '#', '', 1, 0, 'F', '0', '0', 'system:supplies:export', '#', 'admin', sysdate(), '', null, '');
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment