From 7ea2a2cfe922c9b2d5c09c737d10a7f1ab5b50d1 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Mon, 01 Mar 2021 14:14:35 +0800
Subject: [PATCH] Merge branch 'dev1.1' into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/partnerDockingInfo.html | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/partnerDockingInfo.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/partnerDockingInfo.html
index a6d43a9..35d66c0 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/partnerDockingInfo.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/partnerDockingInfo.html
@@ -96,7 +96,7 @@
<div class="layui-form-item">
<label class="layui-form-label" style="width:100px" >服务器机器码</label>
<div class="layui-input-block" style="width:250px;">
- <input name="serverMachineCode" lay-verify="required" required type="text" class="layui-input" maxlength="100" style="width: 200px;"/>
+ <input name="serverMachineCode" type="text" class="layui-input" maxlength="100" style="width: 200px;"/>
</div>
</div>
<div class="layui-form-item">
@@ -162,17 +162,13 @@
},
{ field: 'dockingVersion', align: 'center', width: '5%', title: '对接版本' },
{ field: 'dockingStatus', align: 'center', width: '7%', templet: '#partnerDockingInfo-status', title: '状态' },
- { field: 'serverMachineCode', align: 'center', width: '10%', title: '设备电脑机器码' },
+ { field: 'serverMachineCode', align: 'center', width: '10%', title: '服务器机器码' },
{ field: 'accessKey', align: 'center', width: '10%', title: 'AccessKey' },
{ field: 'operationName', align: 'center', width: '7%', title: '对接操作人' },
{ field: 'operationTime', align: 'center', width: '7%', title: '对接日期', templet: "<div>{{layui.util.toDateString(d.operationTime, 'yyyy/MM/dd')}}</div>" },
{ field: 'Id', align: 'center', toolbar: '#partnerDockingInfo-table-bar', title: '操作', width: '15%', fixed: 'right' }
]]
- // , done: function () {
- // // $("[data-field='partnerId']").css('display','none');
- // // $("[data-field='hospitalId']").css('display','none');
- // $("[data-field='departmentId']").css('display','none');
- // }
+
});
// 工具条点击事件
--
Gitblit v1.8.0