From f789b998cceaf5d60be5bdaf75d9fb37b1f087a6 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Sat, 15 Aug 2020 09:09:29 +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/dataNeed.html |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html
index 2095325..b243578 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html
@@ -85,7 +85,7 @@
         <div class="layui-form-item">
             <label class="layui-form-label">需求标签</label>
             <div class="layui-input-block">
-                <input name="needTags" placeholder="请输入回调地址" type="text" class="layui-input" maxlength="20"/>
+                <textarea name="needTags" placeholder="请输入回调地址" class="layui-input" style="height:200px;overflow:auto" maxlength="20"> </textarea>
             </div>
         </div>
         <div class="layui-form-item model-form-footer">
@@ -142,14 +142,14 @@
             page: true,
             cols: [[
                 { type: 'numbers' },
-                { field: 'doctorName', width: 100, title: '医生姓名' },
-                { field: 'doctorTel', width: 150, title: '联系电话' },
-                { field: 'hospitalName', width: 300, title: '所在医院' },
-                { field: 'needBegintime', width: 240, title: '时间段', templet: "<div>{{layui.util.toDateString(d.needBegintime, 'yyyy-MM-dd')}}至{{layui.util.toDateString(d.needEndtime, 'yyyy-MM-dd')}}</div>" },
-                { field: 'needType', width: 100, title: '数据类型', templet: function (d) { if (d.needType == 1) { return '筛查' } else { return '就诊' } } },// 0就诊数据 1筛查
-                { field: 'needTags', width: 100, align: 'center', toolbar: '#app-table-bar', title: '需求标签' },
-                { field: 'enabled', width: 200, toolbar: '#app-table-bar1', title: '处理状态', },
-                { field: 'downTime', width: 250, title: '下载时间', templet: "<div>{{layui.util.toDateString(d.downTime, 'yyyy-MM-dd HH:mm')}}</div>" }
+                { field: 'doctorName',align:'center', width: 100, title: '医生姓名' },
+                { field: 'doctorTel',align:'center', width: 150, title: '联系电话' },
+                { field: 'hospitalName',align:'center', width: 300, title: '所在医院' },
+                { field: 'needBegintime',align:'center', width: 240, title: '时间段', templet: "<div>{{layui.util.toDateString(d.needBegintime, 'yyyy-MM-dd')}} &nbsp;&nbsp;至 &nbsp;&nbsp;{{layui.util.toDateString(d.needEndtime, 'yyyy-MM-dd')}}</div>" },
+                { field: 'needType',align:'center', width: 100, title: '数据类型', templet: function (d) { if (d.needType == 1) { return '筛查' } else { return '就诊' } } },// 0就诊数据 1筛查
+                { field: 'needTags',align:'center', width: 100, align: 'center', toolbar: '#app-table-bar', title: '需求标签' },
+                { field: 'enabled',align:'center', width: 200, toolbar: '#app-table-bar1', title: '处理状态', },
+                { field: 'downTime',align:'center', width: 250, title: '下载时间', templet: "<div>{{layui.util.toDateString(d.downTime, 'yyyy-MM-dd HH:mm')}}</div>" }
             ]],done:function(res){
                 permissionsInput(res,config);
             }
@@ -298,11 +298,11 @@
                     $('#app-form').attr('method', 'POST');
                     if (data) {
                         if (data.needBegintime) {
-                            var needBegintime = layui.util.toDateString(data.needBegintime, 'yyyy年MM月dd日 HH:mm:ss');
+                            var needBegintime = layui.util.toDateString(data.needBegintime, 'yyyy年MM月dd日');
                             data.needBegintime = needBegintime
                         }
                         if (data.needEndtime) {
-                            var needEndtime = layui.util.toDateString(data.needEndtime, 'yyyy年MM月dd日 HH:mm:ss');
+                            var needEndtime = layui.util.toDateString(data.needEndtime, 'yyyy年MM月dd日');
                             data.needEndtime = needEndtime
                         }
                         $("input[name='clientId']").attr('disabled', true);
@@ -310,6 +310,7 @@
                         $("input[name='webServerRedirectUri']").attr('disabled', true);
                         $("input[name='webServerRedirectUri']").attr('class', "layui-input layui-disabled");
                         form.val('app-form', data);
+                        $('#app-form').find('input,textarea').prop('readonly', true);
                         $('#app-form').attr('method', 'POST');
                     }
                 }

--
Gitblit v1.8.0