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 |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 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 0c99e3b..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
@@ -18,6 +18,7 @@
                 </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>
@@ -59,7 +60,7 @@
         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,
@@ -106,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();
@@ -129,8 +130,8 @@
                 }
             }
             var proName = $('#product-search-value').val();
-            var hospitalName = $('#hospital-search-value').val();
-            table.reload('product-table', { where: { proName: proName,hospitalName: hospitalName,startTime: startTime, endTime: endTime } });
+                var hospitalId = $('#hospitalId').val();
+            table.reload('product-table', { where: { proName: proName,hospitalId: hospitalId,departmentId:'1252408277275664385',startTime: startTime, endTime: endTime } });
         });
        
         //比较日期大小
@@ -157,6 +158,9 @@
             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