药品入库追溯码去重以及界面优化

src/main/resources/static/js/yk/drug_storage.js

@@ -381,6 +381,12 @@ $(function () {
         drugBarStat();
     });
 
+    // 追溯码去重
+    $("#checkBarRe").click(function () {
+        drugBarRepeat()
+        drugBarStat();
+    });
+
 });
 
 /**
@@ -836,7 +842,7 @@ function initBar() {
                 XMLHttpRequest.setRequestHeader("Authorization", 'Bearer ' + localStorage.getItem("token"));
             }
         },
-        height: screen.height * 0.3,
+        height: screen.height * 0.2,
         toolbar: [true, "top"],
         styleUI: 'Bootstrap',
         viewrecords: true,
@@ -1155,4 +1161,23 @@ function removeLastComma(str, char) {
         str = str.substring(0, str.length - 1);
     }
     return str;
+}
+
+function drugBarRepeat(){
+    let barStr = $("#drugTracCodgStr").val()
+    console.log(barStr)
+    if(!isEmpty(barStr)) {
+        let barInfo = barStr.replaceAll('\n', ',').split(',')
+        if (barInfo.length > 0) {
+            let barData = new Set(barInfo)
+            let barList = [...barData]
+            let data = ''
+            for(let i in barList){
+                if(!isEmpty(barList[i])) {
+                    data += (barList[i] + '\n')
+                }
+            }
+            $("#drugTracCodgStr").val(data)
+        }
+    }
 }

src/main/resources/templates/yk/drug_storage.html

@@ -333,7 +333,7 @@
 <!--调药品弹窗结尾-->
 
 <!--药品追溯码信息弹窗开始-->
-<div class="modal fade bs-example-modal-lg" tabindex="-1" role="dialog" aria-hidden="true" id="barFormModal">
+<div class="modal fade bs-example-modal-lg" data-backdrop="static" data-keyboard="false" tabindex="-1" role="dialog" aria-hidden="true" id="barFormModal">
     <div class="modal-dialog modal-lg">
         <div class="modal-content" style="width: 1350px;margin-left: -240px; margin-top: 50px;">
             <div class="modal-header">
@@ -461,7 +461,7 @@
 <!--药品追溯码信息弹窗结尾-->
 
 <!--药品追溯码集合弹窗开始-->
-<div class="modal fade bs-example-modal-lg" tabindex="-1" role="dialog" aria-hidden="true" id="barListModal">
+<div class="modal fade bs-example-modal-lg" data-backdrop="static" data-keyboard="false" tabindex="-1" role="dialog" aria-hidden="true" id="barListModal">
     <div class="modal-dialog modal-lg">
         <div class="modal-content" style="width: 1350px;margin-left: -240px; margin-top: 50px;">
             <div class="modal-header">
@@ -508,12 +508,12 @@
                                 <label class="control-label col-md-1 col-sm-1 col-xs-12" for="drugTracCodgStr">追溯码集合:
                                 </label>
                                 <div class="col-sm-4">
-                                    <textarea id="drugTracCodgStr" name="drugTracCodgStr" class="form-control optional" rows="36"></textarea>
+                                    <textarea id="drugTracCodgStr" name="drugTracCodgStr" class="form-control optional" rows="30"></textarea>
                                 </div>
                                 <label class="control-label col-md-2 col-sm-2 col-xs-12" for="drugTracCodgAt">检验信息:
                                 </label>
                                 <div class="col-sm-4">
-                                    <textarea id="drugTracCodgAt" name="drugTracCodgAt" class="form-control optional" rows="36"></textarea>
+                                    <textarea id="drugTracCodgAt" name="drugTracCodgAt" class="form-control optional" rows="30"></textarea>
                                 </div>
                             </div>
                         </form>
@@ -522,6 +522,7 @@
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-primary" id="checkBarList">追溯码检查</button>
+                <button type="button" class="btn btn-primary" id="checkBarRe">追溯码去重</button>
                 <button type="button" class="btn btn-primary" id="saveBarList">确定</button>
                 <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
             </div>