diff --git a/fuintAdmin/src/api/convenienceStore/ljgoods.js b/fuintAdmin/src/api/convenienceStore/ljgoods.js index 63fea631f..35aab95a0 100644 --- a/fuintAdmin/src/api/convenienceStore/ljgoods.js +++ b/fuintAdmin/src/api/convenienceStore/ljgoods.js @@ -1,6 +1,6 @@ import request from '@/utils/request' -// 查询供应商列表 +// 查询商品列表 export function listLJGoods(query) { return request({ url: '/business/convenience/goods/list', @@ -9,7 +9,7 @@ export function listLJGoods(query) { }) } -// 查询供应商详细 +// 查询商品详细 export function getLJGoods(id) { return request({ url: '/business/convenience/goods/' + id, @@ -17,7 +17,7 @@ export function getLJGoods(id) { }) } -// 新增供应商 +// 新增商品 export function addLJGoods(data) { return request({ url: '/business/convenience/goods', @@ -26,7 +26,7 @@ export function addLJGoods(data) { }) } -// 修改供应商 +// 修改商品 export function updateLJGoods(data) { return request({ url: '/business/convenience/goods', @@ -35,7 +35,7 @@ export function updateLJGoods(data) { }) } -// 删除供应商 +// 删除商品 export function delLJGoods(id) { return request({ url: '/business/convenience/goods/' + id, diff --git a/fuintAdmin/src/views/convenienceStore/goodsFile.vue b/fuintAdmin/src/views/convenienceStore/goodsFile.vue new file mode 100644 index 000000000..31cf1b6a8 --- /dev/null +++ b/fuintAdmin/src/views/convenienceStore/goodsFile.vue @@ -0,0 +1,466 @@ + + + + + diff --git a/fuintAdmin/src/views/convenienceStore/index.vue b/fuintAdmin/src/views/convenienceStore/index.vue index 169ce287c..0f749a00e 100644 --- a/fuintAdmin/src/views/convenienceStore/index.vue +++ b/fuintAdmin/src/views/convenienceStore/index.vue @@ -3,8 +3,8 @@ - - + + @@ -42,7 +42,7 @@ @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange"> - + @@ -125,13 +125,13 @@ - - + + @@ -215,7 +215,7 @@ export default { //编辑表单 editForm:{ pid:'', - categoryName:'', + name:'', status:'qy', sorted:0, }, @@ -223,7 +223,7 @@ export default { goodsOptions:[], //查询表单 goodsQueryForm: { - categoryName: '', + name: '', status: '', pid:"", pageNum:'1', @@ -236,14 +236,14 @@ export default { //对话框表单 form:{ pid:'', - categoryName:'', + name:'', status:'qy', sorted:0, }, tableData: [{ id: '', pid:'', - categoryName: '', + name: '', sorted: '', status:'', createdTime:'', @@ -253,13 +253,13 @@ export default { queryParams: { pageNum: 1, pageSize: 5, - categoryName:'', + name:'', status: '', }, aa:[], //校验规则 rules: { - categoryName: [ + name: [ { required: true, message: '请输入分类名称', trigger: 'blur' }, ], }, @@ -276,7 +276,7 @@ export default { reset() { this.form = { pid:'', - categoryName:'', + name:'', status:'qy', sorted:0, } @@ -325,7 +325,7 @@ export default { //新增商品类别 insertGoods(){ this.resetForm('form') - this.form.categoryName = '' + this.form.name = '' this.form.pid = '' this.form.status = 'qy' this.form.sorted = 0 @@ -394,7 +394,7 @@ export default { // 取消提交 cancelSubmit(){ this.$refs.form.resetFields();//清空 - this.form.categoryName = '' + this.form.name = '' this.form.pid = '' this.form.status = '' this.form.sorted = 0 @@ -411,7 +411,7 @@ export default { }, // 取消查询 resetForm(){ - this.goodsQueryForm.categoryName = '' + this.goodsQueryForm.name = '' this.goodsQueryForm.status = '' this.getList() }, @@ -453,7 +453,7 @@ export default { }, // 删除按钮操作 handleDelete(row) { - const name = row.categoryName + const name = row.name this.$modal.confirm('确定删除"' + name + '"的分类信息?').then(function() { // return deleteMember(row.id); return deleteBYId(row.id); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/entity/CvsGoods.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/entity/CvsGoods.java index 83f89073c..3c696365f 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/entity/CvsGoods.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/entity/CvsGoods.java @@ -40,7 +40,7 @@ public class CvsGoods extends BaseEntity implements Serializable { //商品分类 @ApiModelProperty("商品分类") - private String categoryName; + private String name; //商品排序 @ApiModelProperty("商品排序") diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/CvsGoodsMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/CvsGoodsMapper.xml index a2fa7fe3c..7b57603bb 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/CvsGoodsMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/CvsGoodsMapper.xml @@ -3,7 +3,7 @@ - select id,pid,category_name,code,sorted, status, create_time, create_by, update_time, update_by from cvs_goods + select id,pid,name,code,sorted, status, create_time, create_by, update_time, update_by from cvs_goods @@ -17,8 +17,8 @@ and pid = #{pid} - - and category_name = #{categoryName} + + and name = #{name} and sorted = #{sorted} @@ -33,7 +33,7 @@ DISTINCT pTable.id, pTable.pid, - pTable.category_name, + pTable.name, pTable.`code`, pTable.sorted, pTable.`STATUS`, @@ -50,9 +50,9 @@ and pTable.status = #{goods.status} - - and pTable.category_name like concat('%',#{goods.categoryName},'%') - or cTable.category_name like concat('%',#{goods.categoryName},'%') + + and pTable.name like concat('%',#{goods.name},'%') + or cTable.name like concat('%',#{goods.name},'%') group by pTable.id @@ -61,8 +61,8 @@ - - + + @@ -76,7 +76,7 @@ SELECT id, pid, - category_name, + name, `CODE`, sorted, `STATUS`, @@ -90,8 +90,8 @@ and pid = #{pid} - - and category_name like CONCAT('%',#{categoryName},'%') + + and name like CONCAT('%',#{name},'%') and status = #{status} @@ -104,8 +104,8 @@ store_id = #{goods.storeId} and pid = 0 - - and category_name like concat('%', #{goods.categoryName}, '%') + + and name like concat('%', #{goods.name}, '%') and status = #{goods.status} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/CvsGoodsServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/CvsGoodsServiceImpl.java index b7fe7955e..6e4abab09 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/CvsGoodsServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/CvsGoodsServiceImpl.java @@ -66,7 +66,7 @@ public class CvsGoodsServiceImpl extends ServiceImpl im List CvsGoodsVoList = resList.stream().map(goods -> { CvsGoodsVo cvsGoodsVo = new CvsGoodsVo(); cvsGoodsVo.setId(goods.getId()); - cvsGoodsVo.setCategoryName(goods.getCategoryName()); + cvsGoodsVo.setName(goods.getName()); cvsGoodsVo.setPid(goods.getPid()); cvsGoodsVo.setStatus(goods.getStatus()); cvsGoodsVo.setCode(goods.getCode()); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/vo/CvsGoodsVo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/vo/CvsGoodsVo.java index cd2a47566..de5684a28 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/vo/CvsGoodsVo.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/vo/CvsGoodsVo.java @@ -30,7 +30,7 @@ public class CvsGoodsVo extends BaseEntity { private String code; //商品分类 - private String categoryName; + private String name; //商品排序 private Integer sorted;