From e6a149ea753350d3bebbd76ce40315a8b6016b4e Mon Sep 17 00:00:00 2001
From: bingbing <zhaobingliang@aliyun.com>
Date: Thu, 23 Jul 2020 13:04: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/contract.html | 77 +++++++++++++++++++++-----------------
1 files changed, 42 insertions(+), 35 deletions(-)
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/contract.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/contract.html
index b30cde1..1f48a49 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/contract.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/contract.html
@@ -7,17 +7,21 @@
</span>
</div>
<div class="layui-card-body">
- <div class="layui-form toolbar"> 
- <input id="hospital-search-value" class="layui-input search-input" type="text" placeholder="输入医院名" /> 
- <button id="contract-btn-search" class="layui-btn icon-btn"><i class="layui-icon"></i>搜索</button>
+ <div class="layui-form toolbar">
+ <div class="layui-form-item">
+ <div class="layui-inline" style="margin-bottom: -25px;"> 
+ <input id="hospital-search-value" class="layui-input search-input" type="text" placeholder="按医院名..." autocomplete="off" width="400px" /></div> 
+ <button id="contract-btn-search" class="layui-btn icon-btn permissions" permissions="contract-list" style="margin-bottom: -25px;"><i class="layui-icon"></i>搜索</button>
</div>
<table class="layui-table" id="contract-table" lay-filter="contract-table"></table>
+ </div></div>
</div>
</div>
+<input id="hospitalId" type="hidden" />
<!-- 表格操作列 -->
<script type="text/html" id="contract-table-bar">
- <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">查看产品</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs permissions" permissions="contract-del" lay-event="del">删除</a>
+ <a class="layui-btn layui-btn-primary layui-btn-xs permissions" permissions="productorderdetail-save" lay-event="detail">查看产品</a>
</script>
<!-- 表格状态列 -->
<script type="text/html" id="contract-tpl-state">
@@ -29,13 +33,27 @@
<table class="layui-table" id="contract-table-detail" lay-filter="contract-table-detail"></table>
</script>
<script>
- layui.use(['table', 'util', 'admin', 'config', 'form'], function () {
+ layui.use(['table', 'util', 'admin', 'config', 'form', 'autocomplete'], function () {
let table = layui.table;
let util = layui.util;
let admin = layui.admin;
let form = layui.form;
let laydate = layui.laydate;
let config = layui.config;
+ var autocomplete = layui.autocomplete;
+ var $ = layui.jquery;
+
+ //自动完成-医院名称
+ autocomplete.render({
+ elem: $('#hospital-search-value')[0],
+ 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);
+ }
+ });
// 渲染表格
var renderTable = function () {
@@ -49,7 +67,7 @@
{ field: 'hospitalName', width: 300, title: '医院名称' },
{ field: 'departmentName', width: 100, title: '科室名称' },
{ field: 'contractNo', width: 150, title: '合同编号' },
- { field: 'contractTitle', width: 150, title: '合同名' },
+ { field: 'contractTitle', width: 260, title: '合同名' },
{ field: 'contractBeginTime', width: 150, title: '合同生效时间',templet:function(d)
{
return new Date(d.contractBeginTime).dateFormat("yyyy/MM/dd");
@@ -59,34 +77,20 @@
return new Date(d.contractEndTime).dateFormat("yyyy/MM/dd");
} },
{ field: 'contractTime', width: 180, title: '合同签订时间',templet:function(d){
- return new Date(d.contractTime).dateFormat("yyyy/MM/dd hh:mm:ss");
+ return new Date(d.contractTime).dateFormat("yyyy/MM/dd");
} },
- { field: 'enabled', width: 120, templet: '#contract-tpl-state', sort: true, title: '状态' },
- { field: 'createTime', width: 160, sort: true, title: '创建时间' },
+ // { field: 'enabled', width: 120, templet: '#contract-tpl-state', sort: true, title: '状态' },
+ { field: 'createTime', width: 160, title: '创建时间' , templet: function (d) {
+ return new Date(d.createTime).dateFormat("yyyy-MM-dd hh:mm");
+ }},
{ align: 'center', width: 150, toolbar: '#contract-table-bar', title: '操作' }
- ]]
+ ]],
+ done:function(res){
+ permissionsInput(res,config);
+ }
});
}
renderTable();
-
- // 修改状态
- form.on('switch(contract-tpl-state)', function (obj) {
- layer.load(2);
- admin.req('api-opration/contract/updateEnabled', {
- id: obj.elem.value,
- enabled: obj.elem.checked ? true : false
- }, function (data) {
- layer.closeAll('loading');
- if (data.code == 0) {
- layer.msg(data.msg, { icon: 1, time: 500 });
- } else {
- layer.msg(data.msg, { icon: 2, time: 500 });
- $(obj.elem).prop('checked', !obj.elem.checked);
- form.render('checkbox');
- }
- }, 'GET');
- });
-
// 工具条点击事件
table.on('tool(contract-table)', function (obj) {
if (obj.event === 'del') { // 删除
@@ -96,7 +100,6 @@
admin.req('api-opration/contract/' + obj.data.id, {}, function (data) {
layer.closeAll('loading');
layer.msg(data.msg, { icon: 1, time: 500 }, function () {
-
renderTable();
});
obj.del();
@@ -112,7 +115,11 @@
// 搜索按钮点击事件
$('#contract-btn-search').click(function () {
var hospitalName = $('#hospital-search-value').val();
- table.reload('contract-table', { where: { hospitalName: hospitalName} });
+ if(strUtil.isEmpty(hospitalName))
+ {
+ $("#hospitalId").val("");
+ }
+ table.reload('contract-table', { where: { hospitalId: $("#hospitalId").val()} });
});
var showModel=function(orderId){
@@ -125,12 +132,12 @@
success:function(){
table.render({
elem: '#contract-table-detail',
- url: config.base_server + 'api-opration/productorderdetail',
+ url: config.base_server + 'api-opration/productorderrecord',
method: 'GET',
where:{'orderId':orderId},
headers: { 'Authorization': 'Bearer ' + config.getToken().access_token },
page: true,
- limit:5,
+ limit:10,
limits:[5,10],
cols: [[
{ field: 'proName', width: 300, title: '产品名称' },
@@ -148,7 +155,7 @@
return new Date(d.proBegintime).dateFormat("yyyy/MM/dd");
} },
{ field: 'proEndtime', width: 180, title: '结束时间',templet:function(d){
- return new Date(d.proEndtime).dateFormat("yyyy/MM/dd hh:mm:ss");
+ return new Date(d.proEndtime).dateFormat("yyyy/MM/dd");
} },
{ field: 'createTime', width: 160, sort: true, title: '创建时间' }
]]
--
Gitblit v1.8.0