发药窗口：编辑时药房下拉框禁止修改，调整表格列显示顺序，修改表格数据按药房排序，修改窗口重复提示

用户管理、药房库字典、发药窗口字典：增加回车键触发搜索按钮点击事件

src/main/java/cn/hnthyy/thmz/controller/mz/MzDrugWinController.java

@@ -112,7 +112,7 @@ public class MzDrugWinController {
             MzDrugWin mzDrugWin = mzDrugWinService.queryMzDrugWinByGroupNoAndWinNo(mzDrugWinVo.getGroupNo(), mzDrugWinVo.getWinNo());
             if (mzDrugWin != null && mzDrugWinVo.getIsEdit() != 1) {
                 resultMap.put("code", -1);
-                resultMap.put("message", "该药房编码已存在，请勿重复添加（找到该药房，修改即可）");
+                resultMap.put("message", "该发药窗口已存在，请勿重复添加（找到该窗口，修改即可）");
                 return resultMap;
             }
             mzDrugWinService.saveMzDrugWin(mzDrugWinVo);

src/main/java/cn/hnthyy/thmz/mapper/his/mz/MzDrugWinMapper.java

@@ -65,7 +65,7 @@ public interface MzDrugWinMapper {
      */
     @Select({"<script>",
             "SELECT top ${pageSize} win_no,win_name,win_cate,group_no,patient_num" +
-                    " FROM (SELECT ROW_NUMBER() OVER (ORDER BY mz_drug_win.win_no desc) " +
+                    " FROM (SELECT ROW_NUMBER() OVER (ORDER BY mz_drug_win.group_no desc) " +
                     "AS RowNumber,* from mz_drug_win where 1=1 " +
                     "<when test='mzDrugWin.winNo!=null'>" +
                     " and win_no =#{mzDrugWin.winNo}" +

src/main/resources/static/js/mz/drug_win.js

@@ -1,9 +1,19 @@
 //@ sourceURL=user_manage.js
 $(function () {
+    $("input").each(function (){
+        this.onkeydown = function (e) { // 监听键盘事件
+            let theEvent = window.event || e;
+            let code = theEvent.keyCode || theEvent.which;
+            if (code == 13) {//回车事件
+                $("#btn_search").click(); //触发搜索按钮点击事件
+            }
+        }
+    });
     //新增按钮点击事件
     $("#btn_add").click(function (t) {
         $("#editModal").modal();
         $("#classTitle").text("新增");
+        $("#groupNo").removeAttr("disabled");
         clearInput();
     });
     //角色保存按钮点击事件
@@ -92,7 +102,6 @@ function saveDrugWin() {
  */
 function clearInput() {
     $("#winNo").attr("readonly", false);
-    $("#groupNo").attr("readonly", false);
     $("#winNo").val(null);
     $("#groupNo").val(null);
     $("#winName").val(null);
@@ -164,20 +173,20 @@ function getAllDrugWin() {
                 }
             },
             {
-                field: 'winNo',
-                title: '窗口编号',
+                field: 'groupName',
+                title: '药房名称',
                 align: "center",
                 valign: 'middle'
             },
             {
-                field: 'winName',
-                title: '窗口名称',
+                field: 'winNo',
+                title: '窗口编号',
                 align: "center",
                 valign: 'middle'
             },
             {
-                field: 'groupName',
-                title: '药房名称',
+                field: 'winName',
+                title: '窗口名称',
                 align: "center",
                 valign: 'middle'
             }, {
@@ -246,10 +255,10 @@ function queryParams(params) {
 function updateDrugWin(row) {
     clearInput();
     $("#winNo").attr("readonly", true);
-    $("#groupNo").attr("readonly", true);
     $("#classTitle").text("修改");
     $("#winNo").val(row.winNo);
     $("#groupNo").val(row.groupNo);
+    $("#groupNo").attr("disabled","disabled");
     $("#winName").val(row.winName);
     $("#winCate").val(row.winCate);
     $("#winCate").selectpicker('refresh');

src/main/resources/static/js/mz/group_name.js

@@ -1,5 +1,14 @@
 //@ sourceURL=user_manage.js
 $(function () {
+    $("input").each(function (){
+        this.onkeydown = function (e) { // 监听键盘事件
+            let theEvent = window.event || e;
+            let code = theEvent.keyCode || theEvent.which;
+            if (code == 13) {//回车事件
+                $("#btn_search").click(); //触发搜索按钮点击事件
+            }
+        }
+    });
     //新增按钮点击事件
     $("#btn_add").click(function (t) {
         $("#editModal").modal();

src/main/resources/static/js/user_manage.js

@@ -1,5 +1,14 @@
 //@ sourceURL=user_manage.js
 $(function () {
+    $("input").each(function () {
+        this.onkeydown = function (e) { // 监听键盘事件
+            let theEvent = window.event || e;
+            let code = theEvent.keyCode || theEvent.which;
+            if (code == 13) {//回车事件
+                $("#btn_search").click(); //触发搜索按钮点击事件
+            }
+        }
+    });
     //新增按钮点击事件
     $("#btn_add").click(function (t) {
         $("#editModal").modal();
@@ -251,8 +260,8 @@ function queryParams(params) {
     var temp = {
         pageSize: params.limit,
         offset: params.offset,
-        userCode: $("#userCodeSearch").val()==""?null:$("#userCodeSearch").val(),
-        userName: $("#userNameSearch").val()==""?null:$("#userNameSearch").val()
+        userCode: $("#userCodeSearch").val() == "" ? null : $("#userCodeSearch").val(),
+        userName: $("#userNameSearch").val() == "" ? null : $("#userNameSearch").val()
     };
     return temp;
 };
@@ -272,6 +281,7 @@ function editUser(row) {
     $("#roleName").selectpicker('refresh');
     $("#editModal").modal();
 }
+
 /**
  * 重置查询表单
  */

src/main/resources/templates/mz/drug_win.html

@@ -11,9 +11,9 @@
             <div class="panel-body">
                 <form id="formSearch" class="form-horizontal" autocomplete="off">
                     <div class="item form-group ">
-                        <label class="control-label col-md-1 col-sm-1 col-xs-12" for="groupNoSearch">药房编号
+                        <label class="control-label col-md-1 col-sm-1 col-xs-12" for="groupNoSearch" hidden>药房编号
                         </label>
-                        <div class="col-md-2 col-sm-2 col-xs-12">
+                        <div class="col-md-2 col-sm-2 col-xs-12" hidden>
                             <input id="groupNoSearch" class="form-control optional" type="text">
                         </div>
                         <label class="control-label col-md-1 col-sm-1 col-xs-12" for="winNoSearch">窗口编号