From f0596fb2bf8fd0ecd8332b176549dad290a6a78d Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Sat, 15 Aug 2020 19:52:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/contract.html |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 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 e1487df..f7b5520 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
@@ -10,7 +10,7 @@
         <div class="layui-form toolbar">
             <div class="layui-form-item">
                 <div class="layui-inline" style="margin-bottom: -25px;">&emsp;
-            <input id="hospital-search-value" class="layui-input  search-input" type="text" placeholder="按医院名..." autocomplete="off" width="400px" /></div>&emsp;
+            <input id="hospital-search-value" class="layui-input  search-input" type="text" placeholder="按医院名" autocomplete="off" width="400px" /></div>&emsp;
             <button id="contract-btn-search" class="layui-btn icon-btn permissions" permissions="contract-list" style="margin-bottom: -25px;"><i class="layui-icon">&#xe615;</i>搜索</button>
         </div>
         <table class="layui-table" id="contract-table" lay-filter="contract-table"></table>
@@ -64,7 +64,7 @@
                 headers: { 'Authorization': 'Bearer ' + config.getToken().access_token },
                 page: true,
                 cols: [[
-                    { field: 'hospitalName', width: 300, title: '医院名称' },
+                    { field: 'hospitalName', width: 263, title: '医院名称' },
                     { field: 'departmentName', width: 100, title: '科室名称' },
                     { field: 'contractNo', width: 150, title: '合同编号' },
                     { field: 'contractTitle', width: 260, title: '合同名' },
@@ -83,10 +83,10 @@
                     { 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: '操作' }
+                    { align: 'center', width: 200, toolbar: '#contract-table-bar', title: '操作' }
                 ]],
-                done:function(){
-                    permissionsInput();
+                done:function(res){
+                    permissionsInput(res,config);
                 }
             });
         }
@@ -99,7 +99,7 @@
                     layer.load(2);
                     admin.req('api-opration/contract/' + obj.data.id, {}, function (data) {
                         layer.closeAll('loading');
-                        layer.msg(data.msg, { icon: 1, time: 500 }, function () {
+                        layer.msg(data.msg, { icon: 1, time: 2000 }, function () {
                             renderTable();
                         });
                         obj.del();
@@ -132,7 +132,7 @@
             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 },

--
Gitblit v1.8.0