Merge branch '娄底高职分支' of 123.57.209.16:bjquanjiang/DigitalScholl into 娄底高职分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.cshtml

@@ -36,6 +36,14 @@
                     </div>
                 </div>
             </div>
+            <style>
+                .lr-layout-tool .lr-layout-tool-left .lr-layout-tool-item > * {
+                    zoom: 0.8
+                }
+                .lr-layout-tool .lr-layout-tool-right>*{
+                    zoom:0.8
+                }
+            </style>
             <div class="lr-layout-body" id="gridtable"></div>
         </div>
     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.cshtml

@@ -29,13 +29,22 @@
                         <a id="lr_cancelPay" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;取消线上缴费</a>
                         @*<a id="lr_loan" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;填写贷款回执码</a>*@
                         @*<a id="lr_checkLoan" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;审核助学贷款</a>
-        <a id="lr_uncheckLoan" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;去审核助学贷款</a>*@
+            <a id="lr_uncheckLoan" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;去审核助学贷款</a>*@
                         <a id="lr_checkLoan" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;已办理贷款</a>
                         <a id="lr_uncheckLoan" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;正在办理贷款</a>
                         <a id="lr_onsitePay" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;现场缴费</a>
                         <a id="lr_otherPay" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;其他费用缴费</a>
                         <a id="lr_cancelOtherPay" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;取消其他费用缴费</a>
                     </div>
+                    <style>
+                        .lr-layout-tool .lr-layout-tool-left .lr-layout-tool-item > * {
+                            zoom: 0.9
+                        }
+
+                        .lr-layout-tool .lr-layout-tool-right > * {
+                            zoom: 0.9
+                        }
+                    </style>
                 </div>
             </div>
             <div class="lr-layout-body" id="gridtable"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel/Index.js

@@ -193,7 +193,7 @@ var bootstrap = function ($, learun) {
                     { label: "出差原因", name: "Reason", width: 100, align: "left" },
                     { label: "开始时间", name: "Starttime", width: 100, align: "left" },
                     { label: "结束时间", name: "Endtime", width: 100, align: "left" },
-                    { label: "申报时间", name: "Createtime", width: 100, align: "left" },
+                    { label: "申报时间", name: "CreateTime", width: 100, align: "left" },
                     { label: "提交时间", name: "SubmitTime", width: 130, align: "left" },
                     {
                         label: "状态", name: "Status", width: 100, align: "left",