考勤打卡调整

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Controllers/ADR_RecordController.cs

@@ -42,6 +42,12 @@ namespace Learun.Application.Web.Areas.LogisticsManagement.Controllers
             return View();
         }
 
+        [HttpGet]
+        public ActionResult FormView()
+        {
+            return View();
+        }
+
         [HttpGet]
         public ActionResult AttendanceReportByWeek()
         {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Form.cshtml

@@ -21,12 +21,26 @@
     </div>
     <div class="col-xs-12 lr-form-item" data-table="ADR_Record">
         <div class="lr-form-item-title">打卡状态</div>
-        <div id="ClockStatus" >
+        <div id="ClockStatus">
+        </div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ADR_Record">
+        <div class="lr-form-item-title">是否外勤</div>
+        <div id="AIsOut">
         </div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="ADR_Record">
         <div class="lr-form-item-title">打卡地点</div>
         <input id="ClockPlace" type="text" class="form-control" />
     </div>
+    <div class="col-xs-12 lr-form-item" data-table="ADR_Record">
+        <div class="lr-form-item-title">照片</div>
+        <div id="ADPhoto">
+        </div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ADR_Record">
+        <div class="lr-form-item-title">备注</div>
+        <input id="ARemark" type="text" class="form-control" />
+    </div>
 </div>
 @Html.AppendJsFile("/Areas/LogisticsManagement/Views/ADR_Record/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Form.js

@@ -23,6 +23,8 @@ var bootstrap = function ($, learun) {
             });
             $('#ADType').lrDataItemSelect({ code: 'ADType' });
             $('#ClockStatus').lrDataItemSelect({ code: 'ADStatus' });
+            $('#AIsOut').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#ADPhoto').lrUploader();
             $('#UserNo').lrDataSourceSelect({ code: 'BaseUser', value: 'f_account', text: 'f_realname' });
         },
         initData: function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/FormView.cshtml

@@ -0,0 +1,46 @@
+@{
+    ViewBag.Title = "考勤记录";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap">
+    <div class="col-xs-12 lr-form-item" data-table="ADR_Record">
+        <div class="lr-form-item-title">员工名字</div>
+        <div id="UserNo" type="text" class="form-control" disabled="disabled"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ADR_Record">
+        <div class="lr-form-item-title">考勤类型</div>
+        <div id="ADType" disabled="disabled"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ADR_Record">
+        <div class="lr-form-item-title">考勤时间</div>
+        <input id="ADTime" type="text" disabled="disabled" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',onpicked: function () { $('#ADTime').trigger('change'); } })" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ADR_Record">
+        <div class="lr-form-item-title">打卡时间</div>
+        <input id="ClockTime" type="text" disabled="disabled" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',onpicked: function () { $('#ClockTime').trigger('change'); } })" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ADR_Record">
+        <div class="lr-form-item-title">打卡状态</div>
+        <div id="ClockStatus" disabled="disabled">
+        </div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ADR_Record">
+        <div class="lr-form-item-title">是否外勤</div>
+        <div id="AIsOut" disabled="disabled">
+        </div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ADR_Record">
+        <div class="lr-form-item-title">打卡地点</div>
+        <input id="ClockPlace" type="text" class="form-control" disabled="disabled" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ADR_Record">
+        <div class="lr-form-item-title">照片</div>
+        <div id="ADPhoto" disabled="disabled">
+        </div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="ADR_Record">
+        <div class="lr-form-item-title">备注</div>
+        <input id="ARemark" type="text" class="form-control" disabled="disabled" />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/LogisticsManagement/Views/ADR_Record/FormView.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/FormView.js

@@ -0,0 +1,48 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2020-08-28 18:09
+ * 描  述：考勤记录
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#Department').lrselect({
+                type: 'tree',
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree',
+                param: {} 
+            });
+            $('#ADType').lrDataItemSelect({ code: 'ADType' });
+            $('#ClockStatus').lrDataItemSelect({ code: 'ADStatus' });
+            $('#AIsOut').lrDataItemSelect({ code: 'YesOrNoBit' });
+            $('#ADPhoto').lrUploader({ isUpload: false});
+            $('#UserNo').lrDataSourceSelect({ code: 'BaseUser', value: 'f_account', text: 'f_realname' });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/LogisticsManagement/ADR_Record/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                        $("#ADTime").val(data[id].ADTime);
+                        $("#ClockTime").val(data[id].ClockTime);
+                    }
+                });
+            }
+        }
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/ADR_Record/Index.cshtml

@@ -42,8 +42,9 @@
                         <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
-                        <a id="lr_add"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;补卡</a>
-                        <a id="lr_edit"  class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;补卡</a>
+                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_view" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;查看</a>
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
                     </div>
                 </div>

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

@@ -47,7 +47,7 @@ var bootstrap = function ($, learun) {
             }, 250, 400);
             $('#Department').lrDepartmentSelect();
             $('#ADR_Device').lrDataSourceSelect({ code: 'ADR_Device', value: 'dname', text: 'dname' });
-            $('#ADStatus').lrDataItemSelect({ code: 'ADStatus'});
+            $('#ADStatus').lrDataItemSelect({ code: 'ADStatus' });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -81,6 +81,19 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+            $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '查看',
+                        url: top.$.rootUrl + '/LogisticsManagement/ADR_Record/FormView?keyValue=' + keyValue,
+                        width: 600,
+                        height: 400,
+                        btn: null
+                });
+                }
+            });
             // 删除
             $('#lr_delete').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
@@ -97,7 +110,7 @@ var bootstrap = function ($, learun) {
         },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/LogisticsManagement/ADR_Record/GetPageList',
                 headData: [
                     {
@@ -157,7 +170,12 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "打卡地点", name: "ClockPlace", width: 100, align: "left" },
+                    {
+                        label: "是否外勤", name: "AIsOut", width: 100, align: "left", formatter: function (value) {
+                            return value == true ? "是" : "否";
+                        }
+                    },
+                    { label: "打卡地点", name: "ClockPlace", width: 200, align: "left" },
                     { label: "考勤数据上传时间", name: "ADTime", width: 150, align: "left" }
                 ],
                 mainId: 'ID',

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -1460,6 +1460,7 @@
     <Content Include="Areas\LogisticsManagement\Views\Acc_Punishment\IndexStatistics.js" />
     <Content Include="Areas\LogisticsManagement\Views\Acc_Reward\IndexStatistics.js" />
     <Content Include="Areas\LogisticsManagement\Views\ADR_Record\AttendanceReportByWeek.js" />
+    <Content Include="Areas\LogisticsManagement\Views\ADR_Record\FormView.js" />
     <Content Include="Areas\LogisticsManagement\Views\ADR_Record\StatisticDetailIndex.js" />
     <Content Include="Areas\LogisticsManagement\Views\ADR_Record\StatisticIndex.js" />
     <Content Include="Areas\LogisticsManagement\Views\APAppointmentPsychologist\Form.js" />
@@ -8273,6 +8274,7 @@
     <Content Include="Areas\LogisticsManagement\Views\RepairReportStudent\EvaluateFormView.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\ADR_Restriction\FormDay.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuInfoBasic\IndexCenter.cshtml" />
+    <Content Include="Areas\LogisticsManagement\Views\ADR_Record\FormView.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ADR_Record/ADR_RecordService.cs

@@ -45,7 +45,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                                        t.ADYear,
                                        t.ADMonth,
                                        t.ADDay,
-                                       t.ADPhoto
+                                       t.ADPhoto,t.AIsOut,t.ARemark
                              ");
                 strSql.Append($"  FROM ADR_Record t left JOIN {baseDataName}.dbo.LR_Base_User emp ON t.UserNo=emp.F_Account");
                 strSql.Append("  WHERE 1=1 ");

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionService.cs

@@ -429,7 +429,10 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                             firstoffworkentity.ADTime = datetimenow;
                             firstoffworkentity.ClockTime = devicetime;
                             firstoffworkentity.ClockStatus = ClockStatus;
-
+                            firstoffworkentity.ARemark = ARemark;
+                            firstoffworkentity.ClockPlace = ClockPlace;
+                            firstoffworkentity.ADPhoto = ADPhoto;
+                            firstoffworkentity.AIsOut = AIsOut;
                             this.BaseRepository("CollegeMIS").ExecuteBySql("update ADR_Record set ADTime='" + firstoffworkentity.ADTime + "',ClockTime='" + firstoffworkentity.ClockTime + "',ClockStatus='" + firstoffworkentity.ClockStatus + "',ADPhoto='" + firstoffworkentity.ADPhoto + "' where ID='" + firstoffworkentity.ID + "'");
                             return true;
                         }

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/login.vue

@@ -33,9 +33,9 @@
       </l-input>
       <l-button @click="login(null)" size="lg" color="blue" class="margin-top-sm block" block>登 录</l-button>
 	  <l-button @click="signUp('/pages/wxLogin')" size="lg" color="blue" class="margin-top-sm block" block>微信登录</l-button>
-	  <view class="otherLogin">
+	<!--  <view class="otherLogin">
 		<navigator url="/pages/weixinLogin" class="textBtn">新生首次登录</text></navigator>
-	  </view>
+	  </view> -->
 	  
       <!-- <l-button v-if="enableSignUp" @click="signUp('/pages/signup')" size="lg" line="blue" class="margin-top-sm block" block>
         教师注册