From f0d309119ec4539b3d2f4b14f547f54d81ec0d9e Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Wed, 18 Sep 2024 15:01:50 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E5=B7=A5=E7=A8=8B=E7=AE=A1=E7=90=86?= =?UTF-8?q?=20=E5=BC=80=E5=8F=91=E4=BF=AE=E6=94=B9=E5=8D=95=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E8=A1=A8=E3=80=81=E5=AE=9E=E4=BD=93=E7=B1=BB?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E7=A8=8B=E5=91=98=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=9B=20=E5=BC=80=E5=8F=91=E4=BF=AE=E6=94=B9=E5=8D=95?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E4=B8=8B=E6=8B=89=E9=80=89=E6=8B=A9=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E5=91=98=E8=BF=9B=E8=A1=8C=E6=9D=A1=E4=BB=B6=E7=AD=9B=E9=80=89?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=9F=A5=E8=AF=A2=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E5=91=98=E6=96=B9=E6=B3=95=EF=BC=9B=20=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E7=A8=8B=E5=91=98=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=8C=E8=AE=BE=E7=BD=AE=E4=B8=BA=E8=87=AA=E5=8A=A8=E5=A1=AB?= =?UTF-8?q?=E5=85=85=E5=80=BC=EF=BC=8C=E4=B8=8D=E5=8F=AF=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=20=E5=BC=80=E5=8F=91=E4=BF=AE=E6=94=B9=E5=8D=95=E5=90=8E?= =?UTF-8?q?=E7=AB=AFController=E6=96=B0=E5=A2=9E=E6=9F=A5=E6=89=BE?= =?UTF-8?q?=E6=89=80=E6=9C=89=E7=9A=84=E5=B7=A5=E7=A8=8B=E5=91=98=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=20=E5=BC=80=E5=8F=91=E4=BF=AE=E6=94=B9=E5=8D=95?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=EF=BC=8C?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ErpDevelopModifyorderController.java | 9 ++++--- .../erp/ErpDevelopModifyorderMapper.xml | 1 + .../templates/erp/developModifyOrder/add.html | 26 +++++++++++++++++++ .../developModifyOrder.html | 24 ++++++++++++++--- 4 files changed, 53 insertions(+), 7 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpDevelopModifyorderController.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpDevelopModifyorderController.java index c2d5cb7c..7702e83b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpDevelopModifyorderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpDevelopModifyorderController.java @@ -104,11 +104,12 @@ public class ErpDevelopModifyorderController extends BaseController /** * 查找所有的工程员 * */ + @GetMapping ("/getEngineerList") @ResponseBody - @PostMapping("/getEngineerList") - public AjaxResult getEngineerList(String roleKey){ - List engineerList = sysUserService.getSpecificRoleList(roleKey); - return AjaxResult.success(engineerList); + public TableDataInfo getEngineerList(){ + startPage(); + List list = sysUserService.selectRoleToUserList("gcwyRole,gcjlRole,gczgRole,yfzjRole,"); + return getDataTable(list); } /** diff --git a/ruoyi-admin/src/main/resources/mapper/erp/ErpDevelopModifyorderMapper.xml b/ruoyi-admin/src/main/resources/mapper/erp/ErpDevelopModifyorderMapper.xml index bdf808fe..4bf259ce 100644 --- a/ruoyi-admin/src/main/resources/mapper/erp/ErpDevelopModifyorderMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/erp/ErpDevelopModifyorderMapper.xml @@ -54,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and develop_order_code like concat('%', #{developOrderCode}, '%') and material_no like concat('%', #{materialNo}, '%') + and user_name = #{userName} and audit_status = #{auditStatus} and finsh_status = #{finshStatus} and material_name like concat('%', #{materialName}, '%') diff --git a/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/add.html b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/add.html index 2ba6ea6e..946142f7 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/add.html +++ b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/add.html @@ -24,6 +24,12 @@ +
+ +
+ +
+
@@ -699,6 +705,26 @@ }) } + //查询工程员 + // function engineer(){ + // $.ajax({ + // url: ctx + 'erp/material/getEngineerList', + // type: 'get', + // success: function (res) { + // if (res.rows.length > 0) { + // var usertData = res.rows; + // for (let i in usertData) { + // $("select[name='userName']").append( + // ""); + // } + // } else { + // $.modal.msgError(res.msg); + // } + // } + // }); + // } + $("#userName_add").val(loginName); + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html index b28e5359..7f3719a6 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html +++ b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html @@ -31,7 +31,7 @@
  • -
    • @@ -86,11 +86,12 @@ var processMethodDatas = [[${@dict.getType('processMethod')}]]; var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; - + var userName = [[${@permission.getPrincipalProperty('userName')}]]; var loginName = [[${@permission.getPrincipalProperty('loginName')}]]; var prefix = ctx + "erp/developModifyOrder"; $(function() { + engineer(); var options = { url: prefix + "/list", createUrl: prefix + "/add", @@ -291,7 +292,24 @@ $.modal.open("添加领料单",url); } - + //查询工程员 + function engineer(){ + $.ajax({ + url: prefix + '/getEngineerList', + type: 'get', + success: function (res) { + if (res.rows.length > 0) { + var usertData = res.rows; + for (let i in usertData) { + $("select[name='userName']").append( + ""); + } + } else { + $.modal.msgError(res.msg); + } + } + }); + }