diff --git a/ant-design-vue-jeecg/src/views/ordergoods/OrderGoodsList.vue b/ant-design-vue-jeecg/src/views/ordergoods/OrderGoodsList.vue index 2677c4df..2dade959 100644 --- a/ant-design-vue-jeecg/src/views/ordergoods/OrderGoodsList.vue +++ b/ant-design-vue-jeecg/src/views/ordergoods/OrderGoodsList.vue @@ -112,7 +112,15 @@ 下载 - + + + 详情 @@ -279,6 +287,21 @@ align:"center", dataIndex: 'payTotalPrice' }, + { + title: '订单商品模块', + align: "center", + scopedSlots: {customRender: 'mk'} + }, + { + title: '订单商品面料', + align: "center", + scopedSlots: {customRender: 'ml'} + }, + { + title: '订单商品辅料', + align: "center", + scopedSlots: {customRender: 'fl'} + }, { title: '操作', dataIndex: 'action', @@ -289,7 +312,7 @@ } ], url: { - list: "/ordergoods/orderGoods/list", + list: "/ordergoods/orderGoods/list?orderid="+this.$route.query.orderid+"&ischild="+this.$route.query.ischild, delete: "/ordergoods/orderGoods/delete", deleteBatch: "/ordergoods/orderGoods/deleteBatch", exportXlsUrl: "/ordergoods/orderGoods/exportXls", @@ -309,6 +332,36 @@ }, }, methods: { + goodsModule(record) + { + this.$router.push({ + path: '/ordergoodsmodule/OrderGoodsModuleList', + query: { // 路由携带参数 + 'ordergoodsid': record.id, + 'goodsname':record.goodsName, + } + }); + }, + goodsModule2(record) + { + this.$router.push({ + path: '/ordergoodsfabric/OrderGoodsFabricList', + query: { // 路由携带参数 + 'ordergoodsid': record.id, + 'goodsname':record.goodsName, + } + }); + }, + goodsModule3(record) + { + this.$router.push({ + path: '/ordergoodsaccessories/OrderGoodsAccessoriesList', + query: { // 路由携带参数 + 'ordergoodsid': record.id, + 'goodsname':record.goodsName, + } + }); + }, initDictConfig(){ }, getSuperFieldList(){ diff --git a/ant-design-vue-jeecg/src/views/ordergoodsaccessories/OrderGoodsAccessoriesList.vue b/ant-design-vue-jeecg/src/views/ordergoodsaccessories/OrderGoodsAccessoriesList.vue index 90646e4a..632e2380 100644 --- a/ant-design-vue-jeecg/src/views/ordergoodsaccessories/OrderGoodsAccessoriesList.vue +++ b/ant-design-vue-jeecg/src/views/ordergoodsaccessories/OrderGoodsAccessoriesList.vue @@ -1,34 +1,19 @@ - 编辑 - - - - 更多 - - - 详情 - - - - 删除 - - - - + 详情 @@ -174,12 +138,12 @@ } ], url: { - list: "/ordergoodsaccessories/orderGoodsAccessories/list", + list: "/ordergoodsaccessories/orderGoodsAccessories/list?ordergoodsid="+this.$route.query.ordergoodsid, delete: "/ordergoodsaccessories/orderGoodsAccessories/delete", deleteBatch: "/ordergoodsaccessories/orderGoodsAccessories/deleteBatch", exportXlsUrl: "/ordergoodsaccessories/orderGoodsAccessories/exportXls", importExcelUrl: "ordergoodsaccessories/orderGoodsAccessories/importExcel", - + }, dictOptions:{}, superFieldList:[], @@ -187,6 +151,7 @@ }, created() { this.getSuperFieldList(); + this.biaoTi = this.$route.query.goodsname+"订单商品辅料管理"; }, computed: { importExcelUrl: function(){ diff --git a/ant-design-vue-jeecg/src/views/ordergoodsfabric/OrderGoodsFabricList.vue b/ant-design-vue-jeecg/src/views/ordergoodsfabric/OrderGoodsFabricList.vue index 3defa2a9..4a8be7ea 100644 --- a/ant-design-vue-jeecg/src/views/ordergoodsfabric/OrderGoodsFabricList.vue +++ b/ant-design-vue-jeecg/src/views/ordergoodsfabric/OrderGoodsFabricList.vue @@ -1,34 +1,19 @@ - 编辑 - - - - 更多 - - - 详情 - - - - 删除 - - - - + 详情 @@ -174,12 +138,12 @@ } ], url: { - list: "/ordergoodsfabric/orderGoodsFabric/list", + list: "/ordergoodsfabric/orderGoodsFabric/list?ordergoodsid="+this.$route.query.ordergoodsid, delete: "/ordergoodsfabric/orderGoodsFabric/delete", deleteBatch: "/ordergoodsfabric/orderGoodsFabric/deleteBatch", exportXlsUrl: "/ordergoodsfabric/orderGoodsFabric/exportXls", importExcelUrl: "ordergoodsfabric/orderGoodsFabric/importExcel", - + }, dictOptions:{}, superFieldList:[], @@ -187,6 +151,7 @@ }, created() { this.getSuperFieldList(); + this.biaoTi = this.$route.query.goodsname+"订单商品面料管理"; }, computed: { importExcelUrl: function(){ diff --git a/ant-design-vue-jeecg/src/views/ordergoodsmodule/OrderGoodsModuleList.vue b/ant-design-vue-jeecg/src/views/ordergoodsmodule/OrderGoodsModuleList.vue index 082ef795..0c40654e 100644 --- a/ant-design-vue-jeecg/src/views/ordergoodsmodule/OrderGoodsModuleList.vue +++ b/ant-design-vue-jeecg/src/views/ordergoodsmodule/OrderGoodsModuleList.vue @@ -1,44 +1,24 @@ - 编辑 - - - - 更多 - - - 详情 - - - - 删除 - - - - + 详情 @@ -148,6 +107,7 @@ return { description: '订单商品模块表管理页面', // 表头 + biaoTi: '', columns: [ { title: '#', @@ -189,7 +149,7 @@ } ], url: { - list: "/ordergoodsmodule/orderGoodsModule/list", + list: "/ordergoodsmodule/orderGoodsModule/list?ordergoodsid="+this.$route.query.ordergoodsid, delete: "/ordergoodsmodule/orderGoodsModule/delete", deleteBatch: "/ordergoodsmodule/orderGoodsModule/deleteBatch", exportXlsUrl: "/ordergoodsmodule/orderGoodsModule/exportXls", @@ -202,6 +162,7 @@ }, created() { this.getSuperFieldList(); + this.biaoTi = this.$route.query.goodsname+"订单商品模块管理"; }, computed: { importExcelUrl: function(){ diff --git a/ant-design-vue-jeecg/src/views/zyorders/ZyOrdersList.vue b/ant-design-vue-jeecg/src/views/zyorders/ZyOrdersList.vue index 355cc426..5bcc5c1d 100644 --- a/ant-design-vue-jeecg/src/views/zyorders/ZyOrdersList.vue +++ b/ant-design-vue-jeecg/src/views/zyorders/ZyOrdersList.vue @@ -141,6 +141,8 @@ 生产 + 商品 + 详情 @@ -188,6 +190,14 @@ return parseInt(index)+1; } }, + { + title:'下单时间', + align:"center", + dataIndex: 'orderTime', + customRender:function (text) { + return !text?"":(text.length>10?text.substr(0,10):text) + } + }, { title:'是否子单', align:"center", @@ -198,14 +208,6 @@ align:"center", dataIndex: 'orderId_dictText' }, - { - title:'下单时间', - align:"center", - dataIndex: 'orderTime', - customRender:function (text) { - return !text?"":(text.length>10?text.substr(0,10):text) - } - }, { title:'订单编号', align:"center", @@ -424,6 +426,15 @@ } }, + shangpin(record){ + this.$router.push({ + path: '/ordergoods/OrderGoodsList', + query: { // 路由携带参数 + 'orderid': record.id, + 'ischild':record.ischild, + } + }); + }, getPcaText(code){ return this.pcaData.getText(code); }, diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoods/controller/OrderGoodsController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoods/controller/OrderGoodsController.java index 1a241bd3..1317f815 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoods/controller/OrderGoodsController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoods/controller/OrderGoodsController.java @@ -20,6 +20,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; +import org.jeecg.modules.demo.zyorders.entity.ZyOrders; +import org.jeecg.modules.demo.zyorders.service.IZyOrdersService; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -49,6 +51,8 @@ import org.jeecg.common.aspect.annotation.AutoLog; public class OrderGoodsController extends JeecgController { @Autowired private IOrderGoodsService orderGoodsService; + @Autowired + private IZyOrdersService zyOrdersService; /** * 分页列表查询 @@ -65,11 +69,34 @@ public class OrderGoodsController extends JeecgController queryPageList(OrderGoods orderGoods, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(orderGoods, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = orderGoodsService.page(page, queryWrapper); - return Result.OK(pageList); + HttpServletRequest req,@RequestParam(name="orderid",required=true)String orderid,@RequestParam(name="ischild",required=true)String ischild) { + if(orderid.equals("undefined")&&ischild.equals("undefined")){ + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(orderGoods, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = orderGoodsService.page(page, queryWrapper); + return Result.OK(pageList); + }else if(ischild.equals("0")){ + ZyOrders zyOrders = new ZyOrders(); + QueryWrapper queryWrapper1 = QueryGenerator.initQueryWrapper(zyOrders, req.getParameterMap()); + queryWrapper1.eq("order_id",orderid); + List list = zyOrdersService.list(queryWrapper1); + String ids = ""; + for (int i = 0 ; i < list.size() ; i++){ + ids = ids + list.get(i).getId()+","; + } + QueryWrapper queryWrapper2 = QueryGenerator.initQueryWrapper(orderGoods, req.getParameterMap()); + queryWrapper2.in("orders_id",ids.substring(0,ids.length()-1).split(",")); + Page page = new Page(pageNo, pageSize); + IPage pageList = orderGoodsService.page(page, queryWrapper2); + return Result.OK(pageList); + }else { + QueryWrapper queryWrapper3 = QueryGenerator.initQueryWrapper(orderGoods, req.getParameterMap()); + queryWrapper3.eq("orders_id",orderid); + Page page = new Page(pageNo, pageSize); + IPage pageList = orderGoodsService.page(page, queryWrapper3); + return Result.OK(pageList); + } + } /** diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsaccessories/controller/OrderGoodsAccessoriesController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsaccessories/controller/OrderGoodsAccessoriesController.java index 9ee06198..b0cacb91 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsaccessories/controller/OrderGoodsAccessoriesController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsaccessories/controller/OrderGoodsAccessoriesController.java @@ -65,8 +65,9 @@ public class OrderGoodsAccessoriesController extends JeecgController queryPageList(OrderGoodsAccessories orderGoodsAccessories, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { + HttpServletRequest req,String ordergoodsid) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(orderGoodsAccessories, req.getParameterMap()); + queryWrapper.eq("order_goods_id",ordergoodsid); Page page = new Page(pageNo, pageSize); IPage pageList = orderGoodsAccessoriesService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsfabric/controller/OrderGoodsFabricController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsfabric/controller/OrderGoodsFabricController.java index c3f1f71e..7eeda25f 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsfabric/controller/OrderGoodsFabricController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsfabric/controller/OrderGoodsFabricController.java @@ -65,8 +65,9 @@ public class OrderGoodsFabricController extends JeecgController queryPageList(OrderGoodsFabric orderGoodsFabric, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { + HttpServletRequest req,String ordergoodsid) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(orderGoodsFabric, req.getParameterMap()); + queryWrapper.eq("order_goods_id",ordergoodsid); Page page = new Page(pageNo, pageSize); IPage pageList = orderGoodsFabricService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsmodule/controller/OrderGoodsModuleController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsmodule/controller/OrderGoodsModuleController.java index caf05345..f8c834e7 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsmodule/controller/OrderGoodsModuleController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/ordergoodsmodule/controller/OrderGoodsModuleController.java @@ -65,8 +65,9 @@ public class OrderGoodsModuleController extends JeecgController queryPageList(OrderGoodsModule orderGoodsModule, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { + HttpServletRequest req,String ordergoodsid) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(orderGoodsModule, req.getParameterMap()); + queryWrapper.eq("order_goods_id",ordergoodsid); Page page = new Page(pageNo, pageSize); IPage pageList = orderGoodsModuleService.page(page, queryWrapper); return Result.OK(pageList);