From bb0c7d3c6cecdfd04f3a191b59a1b9a8853d69e2 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Mon, 15 Jun 2020 16:12:47 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html |   77 ++++++++++++++++++++++++++++++++++----
 1 files changed, 69 insertions(+), 8 deletions(-)

diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html
index 54a0da8..5cc539d 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html
@@ -8,9 +8,22 @@
     </div>
     <div class="layui-card-body">
         <div class="layui-form toolbar">&emsp;
-            <input id="product-search-value" class="layui-input search-input" type="text" placeholder="按产品名" />&emsp;
-            <input id="hospital-search-value" class="layui-input search-input" type="text" placeholder="按医院名" />&emsp;
-            <button id="product-btn-search" class="layui-btn icon-btn"><i class="layui-icon">&#xe615;</i>搜索</button>
+            <div  class="layui-col-sm10">
+                <div class="layui-col-sm4">
+                    <input type="text" class="layui-input search-input" id="startTime" placeholder="yyyy-MM-dd"> 至 <input type="text"
+                    class="layui-input search-input" id="endTime" placeholder="yyyy-MM-dd"> &emsp;
+                </div>
+                <div class="layui-col-sm2">
+                    <input id="product-search-value" class="layui-input search-input" type="text" placeholder="按产品名" />&emsp;
+                </div>
+                <div class="layui-col-sm2">
+                    <input id="hospital-search-value" class="layui-input search-input" type="text" placeholder="按医院名" style="width: 100%;" />
+                    <input type="hidden" id="hospitalId" value="">
+                </div>
+                <div class="layui-col-sm2">
+                    &emsp;<button id="product-btn-search" class="layui-btn icon-btn"><i class="layui-icon">&#xe615;</i>搜索</button>
+                </div>
+            </div>
         </div>
         <table class="layui-table" id="product-table" lay-filter="product-table"></table>
     </div>
@@ -26,18 +39,28 @@
 </script>
 
 <script>
-    layui.use(['table', 'util', 'admin', 'config', 'form'], function () {
+    layui.use(['table', 'util', 'admin', 'config', 'form', 'laydate', 'autocomplete'], function () {
         let table = layui.table;
         let util = layui.util;
         let admin = layui.admin;
         let form = layui.form;
         let config = layui.config;
+        var autocomplete = layui.autocomplete;
+        var laydate = layui.laydate;
+
+        //执行一个laydate实例
+        laydate.render({
+            elem: '#startTime' //指定元素
+        });
+        laydate.render({
+            elem: '#endTime' //指定元素
+        });
 
         // 渲染表格
         var renderTable = function () {
             table.render({
                 elem: '#product-table',
-                url: config.base_server + 'api-opration/productorderdetail/all',
+                url: config.base_server + 'api-opration/productorderrecord/all',
                 method: 'GET',
                 headers: { 'Authorization': 'Bearer ' + config.getToken().access_token },
                 page: true,
@@ -84,7 +107,7 @@
                 layer.confirm('确定要删除吗？', function (i) {
                     layer.close(i);
                     layer.load(2);
-                    admin.req('api-opration/productorderdetail/' + obj.data.id, {}, function (data) {
+                    admin.req('api-opration/productorderrecord/' + obj.data.id, {}, function (data) {
                         layer.closeAll('loading');
                         layer.msg(data.msg, { icon: 1, time: 500 }, function () {
                             renderTable();
@@ -97,9 +120,47 @@
 
         // 搜索按钮点击事件
         $('#product-btn-search').click(function () {
+            var startTime = $('#startTime').val();
+            var endTime = $('#endTime').val();
+            if (startTime != null && endTime != null) {
+                var flag = compareDate(startTime, endTime);
+                if (!flag) {
+                    layer.msg('结束时间不得小于开始时间');
+                    return;
+                }
+            }
             var proName = $('#product-search-value').val();
-            var hospitalName = $('#hospital-search-value').val();
-            table.reload('product-table', { where: { proName: proName,hospitalName: hospitalName } });
+                var hospitalId = $('#hospitalId').val();
+            table.reload('product-table', { where: { proName: proName,hospitalId: hospitalId,departmentId:'1252408277275664385',startTime: startTime, endTime: endTime } });
+        });
+       
+        //比较日期大小
+        function compareDate(logintime, logouttime) {
+            var arys1 = new Array();
+            var arys2 = new Array();
+            if (logintime != null && logouttime != null) {
+                arys1 = logintime.split('-');
+                var logindate = new Date(arys1[0], parseInt(arys1[1] - 1), arys1[2]);
+                arys2 = logouttime.split('-');
+                var logoutdate = new Date(arys2[0], parseInt(arys2[1] - 1), arys2[2]);
+                if (logindate > logoutdate) {
+                    return false;
+                } else {
+                    return true;
+                }
+            }
+        }
+
+        //自动完成-医院名称
+        autocomplete.render({
+            elem: $('#hospital-search-value'),
+            keywordsName: 'hospitalName',//查询关键字名称
+            url: config.base_server + 'api-user/syshospital/findByName',
+            template_val: '{{d.hospitalName}}',//选择后文本框显示的数据字段
+            template_txt: "<div class='layui-table-cell'>{{d.hospitalName}}</div>",//下拉列表模板
+            onselect: function (resp) {
+                $("#hospitalId").val(resp.id);
+            }
         });
     });
 </script>
\ No newline at end of file

--
Gitblit v1.8.0