From 171f5567cecda191f6b32e6c303c2bea9cd266f0 Mon Sep 17 00:00:00 2001
From: 克 刘 <4345453@qq.com>
Date: Tue, 01 Sep 2020 19:47:37 +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 |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 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 f7b5520..804ebe2 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
@@ -21,7 +21,7 @@
 <!-- 表格操作列 -->
 <script type="text/html" id="contract-table-bar">
     <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>
+    <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">
@@ -64,26 +64,27 @@
                 headers: { 'Authorization': 'Bearer ' + config.getToken().access_token },
                 page: true,
                 cols: [[
-                    { field: 'hospitalName', width: 263, title: '医院名称' },
-                    { field: 'departmentName', width: 100, title: '科室名称' },
+                    { field: 'hospitalName', width: 300, title: '医院名称' },
+                    { field: 'departmentName', width: 200, title: '科室名称' },
                     { field: 'contractNo', width: 150, title: '合同编号' },
-                    { field: 'contractTitle', width: 260, title: '合同名' },
-                    { field: 'contractBeginTime', width: 150, title: '合同生效时间',templet:function(d)
+                    { field: 'contractTitle', width: 200, title: '合同名' },
+                    { field: 'contractBeginTime', width: 120, title: '合同生效时间',templet:function(d)
                     {
                         return new Date(d.contractBeginTime).dateFormat("yyyy/MM/dd");
                     }
                     },
-                    { field: 'contractEndTime', width: 150, title: '合同到期时间',templet:function(d){
+                    { field: 'contractEndTime', width: 120, title: '合同到期时间',templet:function(d){
                         return new Date(d.contractEndTime).dateFormat("yyyy/MM/dd");
                     } },
-                    { field: 'contractTime', width: 180, title: '合同签订时间',templet:function(d){
+                    { field: 'contractTime', width: 120, title: '合同签订时间',templet:function(d){
                         return new Date(d.contractTime).dateFormat("yyyy/MM/dd");
                     } },
                     // { 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: 200, toolbar: '#contract-table-bar', title: '操作' }
+                    { align: 'center', width: 150, toolbar: '#contract-table-bar', title: '操作',
+                            fixed: 'right'}
                 ]],
                 done:function(res){
                     permissionsInput(res,config);
@@ -94,7 +95,7 @@
         // 工具条点击事件
         table.on('tool(contract-table)', function (obj) {
             if (obj.event === 'del') { // 删除
-                layer.confirm('确定要删除吗?', function (i) {
+                layer.confirm('确定要删除合同及关联套餐吗?', function (i) {
                     layer.close(i);
                     layer.load(2);
                     admin.req('api-opration/contract/' + obj.data.id, {}, function (data) {

--
Gitblit v1.8.0