From 6deaf5ebfb80a470f5b29c6577c45b511d1fb32f Mon Sep 17 00:00:00 2001 From: wangcl Date: Thu, 23 Dec 2021 14:31:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=A2=E5=8D=95=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E6=A0=91=EF=BC=8C=E8=AE=A2=E5=8D=95=E6=8C=89=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../busi/controller/BusiOrderController.java | 57 +++++++++++++++++-- .../resources/mapper/busi/BusiOrderMapper.xml | 1 + .../resources/templates/busi/order/order.html | 7 +++ .../resources/templates/busi/order/tree.html | 55 ++++++++++++++++++ .../templates/busi/productRequire/add.html | 29 ++++++++-- .../templates/busi/productRequire/edit.html | 2 +- .../busi/productRequire/productRequire.html | 19 ++++++- 7 files changed, 158 insertions(+), 12 deletions(-) create mode 100644 ruoyi-admin/src/main/resources/templates/busi/order/tree.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiOrderController.java index 10de71e3e..1a48b2ec1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiOrderController.java @@ -1,15 +1,15 @@ package com.ruoyi.busi.controller; +import java.util.ArrayList; import java.util.List; + +import com.ruoyi.common.core.domain.Ztree; +import com.ruoyi.common.utils.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.busi.domain.BusiOrder; @@ -123,4 +123,51 @@ public class BusiOrderController extends BaseController { return toAjax(busiOrderService.deleteBusiOrderByIds(ids)); } + + + /** + * 选择订单树 + * @param mmap + * @return + */ + @GetMapping(value = {"/selectOrder","/selectOrder/{status}"}) + public String selectCompany(ModelMap mmap, @PathVariable(value = "status", required = false) String status) { + BusiOrder temp = new BusiOrder(); + temp.setId("0"); + temp.setOrderName("根节点"); + mmap.put("order", temp); + mmap.put("orderStatus", StringUtils.isNotEmpty(status) ? status : ""); + return prefix + "/tree"; + } + + /** + * 加载客户订单选择树 + */ + @GetMapping("/treeData") + @ResponseBody + public List treeData(@RequestParam(name = "status",required = false) String status) { + BusiOrder busiOrder = new BusiOrder(); + busiOrder.setStatus(status); //查询状态 + List list = busiOrderService.selectBusiOrderList(busiOrder); + return initZtree(list); + } + + /** + * 初始化树列表 + * @param list + * @return + */ + public List initZtree(List list) { + List ztrees = new ArrayList(); + for (BusiOrder temp : list) { + Ztree ztree = new Ztree(); + ztree.setId(Long.valueOf(temp.getId())); + ztree.setpId(0l); + String name = String.format("%s(%s:%s)", temp.getOrderName(), temp.getCompanyName(), temp.getIdentificationCode()); + ztree.setName(name); + ztree.setTitle(name); + ztrees.add(ztree); + } + return ztrees; + } } diff --git a/ruoyi-admin/src/main/resources/mapper/busi/BusiOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/busi/BusiOrderMapper.xml index 3785926c6..ec30c8902 100644 --- a/ruoyi-admin/src/main/resources/mapper/busi/BusiOrderMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/busi/BusiOrderMapper.xml @@ -49,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and A.order_name like concat('%', #{orderName}, '%') and A.identification_code like concat('%', #{identificationCode}, '%') and A.classify = #{classify} + and A.status = #{status} diff --git a/ruoyi-admin/src/main/resources/templates/busi/order/order.html b/ruoyi-admin/src/main/resources/templates/busi/order/order.html index 7348b7c02..5037a0103 100644 --- a/ruoyi-admin/src/main/resources/templates/busi/order/order.html +++ b/ruoyi-admin/src/main/resources/templates/busi/order/order.html @@ -30,6 +30,13 @@ +
  • + + +
  •  搜索  重置 diff --git a/ruoyi-admin/src/main/resources/templates/busi/order/tree.html b/ruoyi-admin/src/main/resources/templates/busi/order/tree.html new file mode 100644 index 000000000..756f7b3cd --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/busi/order/tree.html @@ -0,0 +1,55 @@ + + + + + + + + + + +
    +
    + + +
    + +
    + 展开 / + 折叠 +
    +
    +
    + + + + + diff --git a/ruoyi-admin/src/main/resources/templates/busi/productRequire/add.html b/ruoyi-admin/src/main/resources/templates/busi/productRequire/add.html index 8d9bcf0fd..4b155410d 100644 --- a/ruoyi-admin/src/main/resources/templates/busi/productRequire/add.html +++ b/ruoyi-admin/src/main/resources/templates/busi/productRequire/add.html @@ -9,15 +9,16 @@

    产品需求信息

    - +
    - + +
    - +
    - +
    @@ -40,7 +41,7 @@
    - +
    @@ -77,6 +78,7 @@ $("input[name='endDate']").datetimepicker({ format: "yyyy-mm-dd", minView: "month", + startDate: new Date(), autoclose: true }); @@ -155,6 +157,23 @@ } }); } + + /*订单选择*/ + function selectOrder(status) { + var options = { + title: '选择订单', + width: "380", + height: "400", + url: ctx + "busi/order/selectOrder/" + status, + callBack: function(index, layero){ + var body = $.modal.getChildFrame(index); + $("#treeId").val(body.find('#treeId').val()); + $("#treeName").val(body.find('#treeName').val()); + $.modal.close(index); + } + }; + $.modal.openOptions(options); + } \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/busi/productRequire/edit.html b/ruoyi-admin/src/main/resources/templates/busi/productRequire/edit.html index 70301eca5..1038e3a66 100644 --- a/ruoyi-admin/src/main/resources/templates/busi/productRequire/edit.html +++ b/ruoyi-admin/src/main/resources/templates/busi/productRequire/edit.html @@ -10,7 +10,7 @@

    产品需求信息

    - +
    diff --git a/ruoyi-admin/src/main/resources/templates/busi/productRequire/productRequire.html b/ruoyi-admin/src/main/resources/templates/busi/productRequire/productRequire.html index 4573bcfd9..a151e2b24 100644 --- a/ruoyi-admin/src/main/resources/templates/busi/productRequire/productRequire.html +++ b/ruoyi-admin/src/main/resources/templates/busi/productRequire/productRequire.html @@ -12,7 +12,8 @@
    • - + +
    • @@ -119,6 +120,22 @@ }; $.table.init(options); }); + /*客户公司选择*/ + function selectOrder() { + var options = { + title: '选择订单', + width: "380", + height: "400", + url: ctx + "busi/order/selectOrder/" , + callBack: function(index, layero){ + var body = $.modal.getChildFrame(index); + $("#treeId").val(body.find('#treeId').val()); + $("#treeName").val(body.find('#treeName').val()); + $.modal.close(index); + } + }; + $.modal.openOptions(options); + } \ No newline at end of file