From 5757d71a604270d3c871a3756ab14c947a68b847 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E4=BF=9D=E6=A1=A6?= <1103851924@qq.com> Date: Wed, 20 Apr 2022 13:38:54 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E8=B4=A7=E4=BD=8D=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E9=A1=B5=E9=9D=A2=202.=E4=BF=AE=E6=94=B9=E4=BB=93?= =?UTF-8?q?=E5=BA=93id=E9=97=AE=E9=A2=98=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=88=9B=E5=BB=BA=E4=BA=BA=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0=203.=E5=85=A5=E5=BA=93=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/sys/EquipmentController.java | 5 + .../controller/sys/LocationController.java | 57 ++++++ .../controller/sys/StorehouseController.java | 7 +- .../jxc/mapper/SysEquipmentMapper.java | 3 - .../jxc/mapper/SysLocationMapper.java | 8 + .../jxc/model/entity/SysEquipment.java | 4 + .../jxc/model/entity/SysLocation.java | 57 ++++++ .../jxc/model/entity/SysStorehouse.java | 6 +- .../cn/toesbieya/jxc/model/vo/LocationVo.java | 20 +++ .../jxc/model/vo/search/EquipmentSearch.java | 1 + .../jxc/model/vo/search/LocationSearch.java | 18 ++ .../jxc/service/sys/SysEquipmentService.java | 1 + .../jxc/service/sys/SysLocationService.java | 106 +++++++++++ .../jxc/service/sys/SysStorehouseService.java | 6 +- vue/full/src/api/system/location.js | 9 + vue/full/src/api/system/storehouse.js | 5 +- .../inbound/component/ReagentSelector.vue | 117 ++++++++++++ .../admin/purchase/inbound/detailPage.vue | 108 ++++++++++- .../view/admin/purchase/inbound/indexPage.vue | 2 +- .../view/admin/system/equipment/indexPage.vue | 6 +- .../system/location/component/EditDialog.vue | 150 ++++++++++++++++ .../location/component/StorehouseSelector.vue | 43 +++++ .../view/admin/system/location/indexPage.vue | 169 ++++++++++++++++++ .../admin/system/storehouse/indexPage.vue | 4 +- 24 files changed, 895 insertions(+), 17 deletions(-) create mode 100644 java/local/src/main/java/cn/toesbieya/jxc/controller/sys/LocationController.java create mode 100644 java/local/src/main/java/cn/toesbieya/jxc/mapper/SysLocationMapper.java create mode 100644 java/local/src/main/java/cn/toesbieya/jxc/model/entity/SysLocation.java create mode 100644 java/local/src/main/java/cn/toesbieya/jxc/model/vo/LocationVo.java create mode 100644 java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/LocationSearch.java create mode 100644 java/local/src/main/java/cn/toesbieya/jxc/service/sys/SysLocationService.java create mode 100644 vue/full/src/api/system/location.js create mode 100644 vue/full/src/view/admin/purchase/inbound/component/ReagentSelector.vue create mode 100644 vue/full/src/view/admin/system/location/component/EditDialog.vue create mode 100644 vue/full/src/view/admin/system/location/component/StorehouseSelector.vue create mode 100644 vue/full/src/view/admin/system/location/indexPage.vue diff --git a/java/local/src/main/java/cn/toesbieya/jxc/controller/sys/EquipmentController.java b/java/local/src/main/java/cn/toesbieya/jxc/controller/sys/EquipmentController.java index 96eec85..e4780b2 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/controller/sys/EquipmentController.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/controller/sys/EquipmentController.java @@ -1,9 +1,11 @@ package cn.toesbieya.jxc.controller.sys; import cn.toesbieya.jxc.model.entity.SysEquipment; +import cn.toesbieya.jxc.model.vo.UserVo; import cn.toesbieya.jxc.model.vo.search.EquipmentSearch; import cn.toesbieya.jxc.service.sys.SysEquipmentService; import cn.toesbieya.jxc.model.vo.R; +import cn.toesbieya.jxc.util.SessionUtil; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; @@ -24,8 +26,11 @@ public class EquipmentController { public R add(@RequestBody SysEquipment equipment) { String errMsg = validateCreateParam(equipment); if (errMsg != null) return R.fail("添加失败，" + errMsg); + UserVo user = SessionUtil.get(); equipment.setId(null); equipment.setCreateTime(System.currentTimeMillis()); + equipment.setCreatorId(user.getId()); + equipment.setCreatorName(user.getNickName()); return service.add(equipment); } diff --git a/java/local/src/main/java/cn/toesbieya/jxc/controller/sys/LocationController.java b/java/local/src/main/java/cn/toesbieya/jxc/controller/sys/LocationController.java new file mode 100644 index 0000000..d4a46a4 --- /dev/null +++ b/java/local/src/main/java/cn/toesbieya/jxc/controller/sys/LocationController.java @@ -0,0 +1,57 @@ +package cn.toesbieya.jxc.controller.sys; +import cn.toesbieya.jxc.model.entity.SysLocation; +import cn.toesbieya.jxc.model.vo.UserVo; +import cn.toesbieya.jxc.model.vo.search.LocationSearch; +import cn.toesbieya.jxc.service.sys.SysLocationService; +import cn.toesbieya.jxc.model.vo.R; +import cn.toesbieya.jxc.util.SessionUtil; +import org.springframework.util.StringUtils; +import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; + +@RestController +@RequestMapping("system/location") +public class LocationController { + @Resource + private SysLocationService service; + + @PostMapping("search") + public R search(@RequestBody LocationSearch vo) { + return R.success(service.search(vo)); + } + + @PostMapping("add") + public R add(@RequestBody SysLocation location) { + String errMsg = validateCreateParam(location); + if (errMsg != null) return R.fail("添加失败，" + errMsg); + UserVo user = SessionUtil.get(); + location.setId(null); + location.setCreateTime(System.currentTimeMillis()); + location.setCreatorId(user.getId()); + location.setCreatorName(user.getNickName()); + return service.add(location); + } + + @PostMapping("update") + public R update(@RequestBody SysLocation location) { + String errMsg = validateUpdateParam(location); + return errMsg == null ? service.update(location) : R.fail("修改失败，" + errMsg); + } + + @PostMapping("del") + public R del(@RequestBody SysLocation location) { + if (location.getId() == null) return R.fail("删除失败，参数错误"); + return service.del(location); + } + + private String validateCreateParam(SysLocation location) { + if (StringUtils.isEmpty(location.getName())) return "货位名称不能为空"; + return null; + } + + private String validateUpdateParam(SysLocation location) { + if (location.getId() == null) return "参数错误"; + return validateCreateParam(location); + } +} + diff --git a/java/local/src/main/java/cn/toesbieya/jxc/controller/sys/StorehouseController.java b/java/local/src/main/java/cn/toesbieya/jxc/controller/sys/StorehouseController.java index a2b6e74..09fac41 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/controller/sys/StorehouseController.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/controller/sys/StorehouseController.java @@ -17,6 +17,11 @@ public class StorehouseController { @Resource private SysStorehouseService service; + @GetMapping("get") + public R get() { + return R.success(service.get()); + } + @PostMapping("search") public R search(@RequestBody StorehouseSearch vo) { return R.success(service.search(vo)); @@ -30,8 +35,8 @@ public class StorehouseController { //添加创建人、创建时间 UserVo user = SessionUtil.get(); storehouse.setCreatorId(user.getId()); + storehouse.setCreatorName(user.getNickName()); storehouse.setCreateTime(System.currentTimeMillis()); - return service.add(storehouse); } diff --git a/java/local/src/main/java/cn/toesbieya/jxc/mapper/SysEquipmentMapper.java b/java/local/src/main/java/cn/toesbieya/jxc/mapper/SysEquipmentMapper.java index 22de0ea..baaa1a8 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/mapper/SysEquipmentMapper.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/mapper/SysEquipmentMapper.java @@ -1,12 +1,9 @@ package cn.toesbieya.jxc.mapper; import cn.toesbieya.jxc.model.entity.SysEquipment; -import cn.toesbieya.jxc.model.vo.result.RegionValueResult; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import java.util.List; public interface SysEquipmentMapper extends BaseMapper { - List getLimitRegion(); } diff --git a/java/local/src/main/java/cn/toesbieya/jxc/mapper/SysLocationMapper.java b/java/local/src/main/java/cn/toesbieya/jxc/mapper/SysLocationMapper.java new file mode 100644 index 0000000..022b809 --- /dev/null +++ b/java/local/src/main/java/cn/toesbieya/jxc/mapper/SysLocationMapper.java @@ -0,0 +1,8 @@ +package cn.toesbieya.jxc.mapper; +import cn.toesbieya.jxc.model.entity.SysLocation; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + + +public interface SysLocationMapper extends BaseMapper { + +} diff --git a/java/local/src/main/java/cn/toesbieya/jxc/model/entity/SysEquipment.java b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/SysEquipment.java index d164faf..b5ae5df 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/model/entity/SysEquipment.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/SysEquipment.java @@ -51,6 +51,10 @@ public class SysEquipment { * 创建人id */ private Integer creatorId; + /** + * 创建人用户名 + */ + private String creatorName; /** * 创建时间 */ diff --git a/java/local/src/main/java/cn/toesbieya/jxc/model/entity/SysLocation.java b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/SysLocation.java new file mode 100644 index 0000000..b4f8a92 --- /dev/null +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/SysLocation.java @@ -0,0 +1,57 @@ +package cn.toesbieya.jxc.model.entity; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class SysLocation { + /** + * 货位id + */ + private Integer id; + /** + * 货位名称 + */ + private String name; + /** + * 仓位容量 + */ + private int capacity; + /** + * 仓库name + */ + private String storehouseName; + /** + * 仓库id + */ + private Integer storehouseId; + /** + * 状态，0停用，1启用 + */ + private boolean enable = false; + /** + * 创建人id + */ + private Integer creatorId; + /** + * 创建人昵称 + */ + private String creatorName; + /** + * 创建时间 + */ + private Long createTime; + /** + * 修改人id + */ + private Integer updateId; + /** + * 修改时间 + */ + private Long updateTime; +} diff --git a/java/local/src/main/java/cn/toesbieya/jxc/model/entity/SysStorehouse.java b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/SysStorehouse.java index b451ac6..e2739fd 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/model/entity/SysStorehouse.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/entity/SysStorehouse.java @@ -18,7 +18,7 @@ public class SysStorehouse { * 仓库编码 */ @Column - private String id; + private Integer id; /** * 名称 */ @@ -49,6 +49,10 @@ public class SysStorehouse { */ @Column private Integer creatorId; + /** + * 创建人昵称 + */ + private String creatorName; /** * 创建时间 */ diff --git a/java/local/src/main/java/cn/toesbieya/jxc/model/vo/LocationVo.java b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/LocationVo.java new file mode 100644 index 0000000..f1ef360 --- /dev/null +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/LocationVo.java @@ -0,0 +1,20 @@ +package cn.toesbieya.jxc.model.vo; + +import cn.toesbieya.jxc.model.entity.SysLocation; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.ToString; +import org.springframework.beans.BeanUtils; + +@Data +@NoArgsConstructor +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class LocationVo extends SysLocation { + private String regionName; + + public LocationVo(SysLocation parent) { + BeanUtils.copyProperties(parent, this); + } +} diff --git a/java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/EquipmentSearch.java b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/EquipmentSearch.java index 8ec9521..535d9ce 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/EquipmentSearch.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/EquipmentSearch.java @@ -12,6 +12,7 @@ public class EquipmentSearch extends BaseSearch { private String name; private String spec; private String introduction; + private String creatorName; private String supplier; private String manuDate; private String buyDate; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/LocationSearch.java b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/LocationSearch.java new file mode 100644 index 0000000..22321fa --- /dev/null +++ b/java/local/src/main/java/cn/toesbieya/jxc/model/vo/search/LocationSearch.java @@ -0,0 +1,18 @@ +package cn.toesbieya.jxc.model.vo.search; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class LocationSearch extends BaseSearch { + private Integer id; + private String name; + private String storehouseName; + private String creatorName; + private Boolean enable; + private Long startTime; + private Long endTime; +} diff --git a/java/local/src/main/java/cn/toesbieya/jxc/service/sys/SysEquipmentService.java b/java/local/src/main/java/cn/toesbieya/jxc/service/sys/SysEquipmentService.java index acb2153..1844a67 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/service/sys/SysEquipmentService.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/service/sys/SysEquipmentService.java @@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; import org.springframework.stereotype.Service; + import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/service/sys/SysLocationService.java b/java/local/src/main/java/cn/toesbieya/jxc/service/sys/SysLocationService.java new file mode 100644 index 0000000..499404d --- /dev/null +++ b/java/local/src/main/java/cn/toesbieya/jxc/service/sys/SysLocationService.java @@ -0,0 +1,106 @@ +package cn.toesbieya.jxc.service.sys; +import cn.toesbieya.jxc.annoation.UserAction; +import cn.toesbieya.jxc.mapper.SysLocationMapper; +import cn.toesbieya.jxc.model.entity.SysLocation; +import cn.toesbieya.jxc.model.vo.LocationVo; +import cn.toesbieya.jxc.model.vo.R; +import cn.toesbieya.jxc.model.vo.result.PageResult; +import cn.toesbieya.jxc.model.vo.search.LocationSearch; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.github.pagehelper.PageHelper; +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +@Service +public class SysLocationService { + @Resource + private SysLocationMapper LocationMapper; + + public PageResult search(LocationSearch vo){ + Integer id = vo.getId(); + String name = vo.getName(); + String storehouseName = vo.getStorehouseName(); + String creatorName = vo.getCreatorName(); + Boolean enable = vo.getEnable(); + Long startTime = vo.getStartTime(); + Long endTime = vo.getEndTime(); + + Wrapper wrapper = + Wrappers.lambdaQuery(SysLocation.class) + .eq(id != null,SysLocation::getId,id) + .like(!StringUtils.isEmpty(name),SysLocation::getName,name) + .like(!StringUtils.isEmpty(storehouseName),SysLocation::getStorehouseName,storehouseName) + .like(!StringUtils.isEmpty(creatorName),SysLocation::getCreatorName,creatorName) + .eq(enable != null,SysLocation::isEnable,enable) + .ge(startTime != null,SysLocation::getCreateTime,startTime) + .le(endTime != null,SysLocation::getCreateTime,endTime) + .orderByDesc(SysLocation::getCreateTime); + + PageHelper.startPage(vo.getPage(), vo.getPageSize()); + + List Locations = LocationMapper.selectList(wrapper); + + PageResult pageResult = new PageResult<>(Locations); + + int LocationNum = Locations.size(); + + List list = new ArrayList<>(LocationNum); + + Locations.forEach(Location -> { + list.add(new LocationVo(Location)); + }); + + return new PageResult<>(pageResult.getTotal(),list); + } + + @UserAction("'添加货位：'+ #Location.name") + public R add(SysLocation Location){ + if (isNameExist(Location.getName(), null)) { + return R.fail(String.format("添加失败，货位【%s】已存在", Location.getName())); + } + int rows = LocationMapper.insert(Location); + return rows > 0 ? R.success("添加成功") : R.fail("添加失败"); + } + + @UserAction("'修改货位' + #Location.name") + public R update(SysLocation Location){ + Integer id = Location.getId(); + String name = Location.getName(); + + if(isNameExist(name,id)) { + return R.fail(String.format("修改失败，货位【%s】已存在", name)); + } + LocationMapper.update( + null, + Wrappers.lambdaUpdate(SysLocation.class) + .set(SysLocation::getName, name) + .set(SysLocation::isEnable, Location.isEnable()) + .eq(SysLocation::getId, id) + ); + return R.success("修改成功"); + } + + @UserAction("'删除货位：'+ #Location.name") + public R del(SysLocation Location) { + int rows = LocationMapper.delete( + Wrappers.lambdaQuery(SysLocation.class) + .eq(SysLocation::getId, Location.getId()) + .eq(SysLocation::isEnable, false) + ); + return rows > 0 ? R.success("删除成功") : R.fail("删除失败，请刷新重试"); + } + + private boolean isNameExist(String name, Integer id) { + Integer num = LocationMapper.selectCount( + Wrappers.lambdaQuery(SysLocation.class) + .eq(SysLocation::getName, name) + .ne(id != null, SysLocation::getId, id) + ); + + return num != null && num > 0; + } +} diff --git a/java/local/src/main/java/cn/toesbieya/jxc/service/sys/SysStorehouseService.java b/java/local/src/main/java/cn/toesbieya/jxc/service/sys/SysStorehouseService.java index a7cf0d2..cdcc0e9 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/service/sys/SysStorehouseService.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/service/sys/SysStorehouseService.java @@ -76,11 +76,11 @@ public class SysStorehouseService { @UserAction("'修改仓库：'+ #storehouse.name") public R update(SysStorehouse storehouse) { - String id = storehouse.getId(); + Integer id = storehouse.getId(); String name = storehouse.getName(); if (isNameExist(name, id)) { - return R.fail(String.format("修改失败，供应商【%s】已存在", name)); + return R.fail(String.format("修改失败，仓库【%s】已存在", name)); } storehouseMapper.update( @@ -107,7 +107,7 @@ public class SysStorehouseService { return rows > 0 ? R.success("删除成功") : R.fail("删除失败，请刷新重试"); } - private boolean isNameExist(String name, String id) { + private boolean isNameExist(String name, Integer id) { Integer num = storehouseMapper.selectCount( Wrappers.lambdaQuery(SysStorehouse.class) .eq(SysStorehouse::getName, name) diff --git a/vue/full/src/api/system/location.js b/vue/full/src/api/system/location.js new file mode 100644 index 0000000..0af224e --- /dev/null +++ b/vue/full/src/api/system/location.js @@ -0,0 +1,9 @@ +import {PostApi} from "@/api/request" + +export const search = new PostApi(`/system/location/search`) + +export const add = new PostApi(`/system/location/add`) + +export const update = new PostApi(`/system/location/update`) + +export const del = new PostApi(`/system/location/del`) \ No newline at end of file diff --git a/vue/full/src/api/system/storehouse.js b/vue/full/src/api/system/storehouse.js index 19b7bf5..37126a8 100644 --- a/vue/full/src/api/system/storehouse.js +++ b/vue/full/src/api/system/storehouse.js @@ -1,4 +1,5 @@ import {PostApi} from "@/api/request" +import {GetApi} from "@/api/request" export const search = new PostApi(`/system/storehouse/search`) @@ -6,4 +7,6 @@ export const add = new PostApi(`/system/storehouse/add`) export const update = new PostApi(`/system/storehouse/update`) -export const del = new PostApi(`/system/storehouse/del`) \ No newline at end of file +export const del = new PostApi(`/system/storehouse/del`) + +export const get = new GetApi(`/system/storehouse/get`) \ No newline at end of file diff --git a/vue/full/src/view/admin/purchase/inbound/component/ReagentSelector.vue b/vue/full/src/view/admin/purchase/inbound/component/ReagentSelector.vue new file mode 100644 index 0000000..ed69c08 --- /dev/null +++ b/vue/full/src/view/admin/purchase/inbound/component/ReagentSelector.vue @@ -0,0 +1,117 @@ + + + diff --git a/vue/full/src/view/admin/purchase/inbound/detailPage.vue b/vue/full/src/view/admin/purchase/inbound/detailPage.vue index 0829ac7..21f5b52 100644 --- a/vue/full/src/view/admin/purchase/inbound/detailPage.vue +++ b/vue/full/src/view/admin/purchase/inbound/detailPage.vue @@ -23,6 +23,86 @@ + + + + + + + @@ -71,12 +151,15 @@ + + diff --git a/vue/full/src/view/admin/purchase/inbound/indexPage.vue b/vue/full/src/view/admin/purchase/inbound/indexPage.vue index fe714e8..9eadd34 100644 --- a/vue/full/src/view/admin/purchase/inbound/indexPage.vue +++ b/vue/full/src/view/admin/purchase/inbound/indexPage.vue @@ -4,7 +4,7 @@ - + diff --git a/vue/full/src/view/admin/system/equipment/indexPage.vue b/vue/full/src/view/admin/system/equipment/indexPage.vue index fdc9167..2dc6cc5 100644 --- a/vue/full/src/view/admin/system/equipment/indexPage.vue +++ b/vue/full/src/view/admin/system/equipment/indexPage.vue @@ -59,7 +59,7 @@ - + @@ -78,7 +78,6 @@ import tableMixin from '@/mixin/tablePageMixin' import ListPage from '@/view/_common/ListPage' import EditDialog from './EditDialog' -import RegionSelector from "@/component/RegionSelector" import {add, update, del, search} from "@/api/system/equipment" import {isEmpty} from '@/util' import {wic} from "@/util/auth" @@ -89,13 +88,14 @@ export default { mixins: [tableMixin], - components: {ListPage, EditDialog, RegionSelector}, + components: {ListPage, EditDialog}, data() { return { searchForm: { name: '', spec: '', + creator:'', introduction: '', supplier: '', manuDate: '', diff --git a/vue/full/src/view/admin/system/location/component/EditDialog.vue b/vue/full/src/view/admin/system/location/component/EditDialog.vue new file mode 100644 index 0000000..490ba76 --- /dev/null +++ b/vue/full/src/view/admin/system/location/component/EditDialog.vue @@ -0,0 +1,150 @@ + + + diff --git a/vue/full/src/view/admin/system/location/component/StorehouseSelector.vue b/vue/full/src/view/admin/system/location/component/StorehouseSelector.vue new file mode 100644 index 0000000..7d63b0c --- /dev/null +++ b/vue/full/src/view/admin/system/location/component/StorehouseSelector.vue @@ -0,0 +1,43 @@ + + + diff --git a/vue/full/src/view/admin/system/location/indexPage.vue b/vue/full/src/view/admin/system/location/indexPage.vue new file mode 100644 index 0000000..6690e29 --- /dev/null +++ b/vue/full/src/view/admin/system/location/indexPage.vue @@ -0,0 +1,169 @@ + + + diff --git a/vue/full/src/view/admin/system/storehouse/indexPage.vue b/vue/full/src/view/admin/system/storehouse/indexPage.vue index 7ffaede..24cb457 100644 --- a/vue/full/src/view/admin/system/storehouse/indexPage.vue +++ b/vue/full/src/view/admin/system/storehouse/indexPage.vue @@ -44,9 +44,9 @@ - + - +