Merge branch '西昌分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 西昌分支

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/config/config.js

@@ -1,15 +1,15 @@
-var config = {
-    webapi: 'http://localhost:8080/',
-    web: "http://localhost:8082/"//web地址，用于配置logo
-};
+// var config = {
+//     webapi: 'http://localhost:8080/',
+//     web: "http://localhost:8082/"//web地址，用于配置logo
+// };
 // var config = {
 //    webapi: 'http://112.230.201.53:31173/',
 //    web:"http://112.230.201.53/:8081/"//web地址，用于配置logo
 // };
-// var config = {
-//    webapi: 'http://localhost:31173/',
-//    web: "http://localhost:20472/"//web地址，用于配置logo
-// }; 
+var config = {
+   webapi: 'http://localhost:31173/',
+   web: "http://localhost:20472/"//web地址，用于配置logo
+}; 
 
 
 //var config = {

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EpidemicSituationCopy/EpidemicSituationCopy.js

@@ -1,4 +1,4 @@
-/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
  * Copyright (c) 2013-2018 北京泉江科技有限公司 
  * 创建人：超级管理员
  * 日  期：2020-02-03 14:37
@@ -48,7 +48,7 @@
                 code: 'EUserType'
             });
             $page.find('#lr_PersonnelManagementEpidemicSituation_btn').on('tap', function () {
-                learun.nav.go({ path: 'PersonnelManagement/EpidemicSituationCopy/form', title: '新增', type: 'right' });
+                learun.nav.go({ path: 'PersonnelManagement/EpidemicSituationCopy/form', title: '每日疫情打卡', type: 'right' });
             });
         },
         lclass: 'lr-list',

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EpidemicSituationCopy/form/form.html

@@ -1,4 +1,4 @@
-<div class="lr-form-container">
+<div class="lr-form-container">
     <div class="lr-form-row  " data-table="EpidemicSituation">
 
         <label>填报人员</label>
@@ -7,22 +7,22 @@
     <div class="lr-form-row  " data-table="EpidemicSituation">
 
         <label>填报时间</label>
-        <div id="CreateTime"></div>
+        <div id="CreateTime" readonly="readonly"></div>
     </div>
     <div class="lr-form-row  " data-table="EpidemicSituation">
 
         <label>类别</label>
-        <div id="Type"></div>
+        <div id="Type" readonly="readonly"></div>
     </div>
     <div class="lr-form-row  " data-table="EpidemicSituation">
 
         <label>所在部门</label>
-        <div id="Department"></div>
+        <div id="Department" readonly="readonly"></div>
     </div>
     <div class="lr-form-row  " data-table="EpidemicSituation">
 
         <label>所在班级</label>
-        <input id="StudentSource" type="text" />
+        <input id="StudentSource" type="text" readonly="readonly"/>
     </div>
     <div class="lr-form-row  " data-table="EpidemicSituation">
 
@@ -32,18 +32,18 @@
     <div class="lr-form-row  " data-table="EpidemicSituation">
 
         <label>性别</label>
-        <div id="Gender"></div>
+        <div id="Gender" readonly="readonly"></div>
     </div>
     <div class="lr-form-row  " data-table="EpidemicSituation">
 
         <label>家庭住址</label>
-        <input id="HomeAddress" type="text" />
+        <input id="HomeAddress" type="text" readonly="readonly"/>
         <div id="allmap" style="display: none;"></div>
     </div>
     <div class="lr-form-row  " data-table="EpidemicSituation">
 
         <label>联系方式</label>
-        <input id="Mobile" type="text" />
+        <input id="Mobile" type="text" readonly="readonly"/>
     </div>
     <div class="lr-form-row  " data-table="EpidemicSituation">
 
@@ -51,7 +51,7 @@
         <input id="Objective" type="text" />
     </div>
     <div class="lr-form-row  " data-table="EpidemicSituation">
-        <label>*是否外出</label>
+        <label>*外出旅居</label>
         <div id="IsOut"></div>
     </div>
     <div class="lr-form-row" id="PassPlaces"></div>
@@ -61,7 +61,7 @@
     </div>
     <div class="lr-form-row" id="ContactsDetails"></div>
     <div class="lr-form-row  " data-table="EpidemicSituation">
-        <label>*疫区人异常</label>
+        <label>*新冠病例接触</label>
         <div id="HasPeople"></div>
     </div>
     <div class="lr-form-row" id="PeopleDetails"></div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PersonnelManagement/EpidemicSituationCopy/form/form.js

@@ -1,4 +1,4 @@
-/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
  * Copyright (c) 2013-2018 北京泉江科技有限公司 
  * 创建人：超级管理员
  * 日  期：2020-02-03 14:37
@@ -11,6 +11,7 @@
     var page = {
         isScroll: true,
         init: function ($page, param) {
+			learun.layer.loading(true, '正在加载...');
             keyValue = param.keyValue;
             // 添加头部按钮列表
             var _html = '\
@@ -363,6 +364,7 @@
                 $page.find('#Department').parent().show();
                 $page.find('#StudentSource').parent().hide();
             }
+			learun.layer.loading(false);
         }, destroy: function (pageinfo) {
             $header = null;
             keyValue = '';

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/EpidemicSituationCopyController.cs

@@ -38,6 +38,12 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
             return View();
         }
 
+        [HttpGet]
+        public ActionResult IndexAll()
+        {
+            return View();
+        }
+
         /// <summary>
         /// 统计
         /// <summary>
@@ -57,6 +63,12 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
             return View();
         }
 
+        [HttpGet]
+        public ActionResult FormView()
+        {
+            return View();
+        }
+
         /// <summary>
         /// 外出原因统计
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/FormView.cshtml

@@ -0,0 +1,72 @@
+@{
+    ViewBag.Title = "疫情记录";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap">
+    <div class="col-xs-6 lr-form-item" data-table="EpidemicSituation">
+        <div class="lr-form-item-title">填报人员</div>
+        <div id="Creater" readonly="readonly" class="form-control"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="EpidemicSituation">
+        <div class="lr-form-item-title">填报时间</div>
+        <input id="CreateTime" readonly="readonly" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#CreateTime').trigger('change'); } })" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="EpidemicSituation">
+        <div class="lr-form-item-title">类别</div>
+        <div id="Type" class="form-control" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="EpidemicSituation" id="Departmentdiv">
+        <div class="lr-form-item-title">所在部门</div>
+        <div id="Department" class="form-control" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="EpidemicSituation" id="StudentSourcediv">
+        <div class="lr-form-item-title">系专业班级</div>
+        <input id="StudentSource" class="form-control" type="text"  readonly="readonly"/>
+    </div>
+
+    <div class="col-xs-6 lr-form-item" data-table="EpidemicSituation">
+        <div class="lr-form-item-title">健康状况</div>
+        <div id="HealthSituation" class="form-control" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="EpidemicSituation">
+        <div class="lr-form-item-title">性别</div>
+        <div id="Gender" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="EpidemicSituation">
+        <div class="lr-form-item-title">家庭住址</div>
+        <input id="HomeAddress" type="text" class="form-control"  readonly="readonly"/>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="EpidemicSituation">
+        <div class="lr-form-item-title">联系方式</div>
+        <input id="Mobile" type="text" class="form-control"  readonly="readonly"/>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="EpidemicSituation">
+        <div class="lr-form-item-title">当前地址</div>
+        <input id="Objective" type="text" class="form-control"  readonly="readonly"/>
+    </div>
+
+
+    <div class="col-xs-6 lr-form-item" data-table="EpidemicSituation">
+        <div class="lr-form-item-title">是否外出</div>
+        <div id="IsOut" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item lr-form-item-grid">
+        <div id="PassPlaces" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="EpidemicSituation">
+        <div class="lr-form-item-title">家人异常</div>
+        <div id="HasFamily" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item lr-form-item-grid">
+        <div id="ContactsDetails"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="EpidemicSituation">
+        <div class="lr-form-item-title">疫区人异常</div>
+        <div id="HasPeople" readonly="readonly"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item lr-form-item-grid">
+        <div id="PeopleDetails"></div>
+    </div>
+
+</div>
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/EpidemicSituationCopy/FormView.js") 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/FormView.js

@@ -0,0 +1,587 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2020-02-03 14:37
+ * 描  述：疫情记录
+ */
+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 () {
+            $('#Creater').lrDataSourceSelect({ code: 'BaseUser', value: 'f_userid', text: 'f_realname' });
+            $('#Department').lrDataSourceSelect({ code: 'classdata', value: 'id', text: 'name' });
+            $('#UnitName').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
+            $('#Type').lrDataItemSelect({
+                code: 'EUserType', select: function (item) {
+                    if (item) {
+                        if (item.id == "5") {
+                            $("#Departmentdiv").hide();
+                            $("#StudentSourcediv").show();
+                        } else {
+                            $("#StudentSourcediv").hide();
+                            $("#Departmentdiv").show();
+                        }
+                    } else {
+                        $("#PeopleDetails").parent().hide();
+                    }
+                }
+            });
+            $('#RelationShip').lrDataItemSelect({ code: 'ERelationship' });
+            $('#OutReason').lrDataItemSelect({ code: 'OutReason' });
+            $('#HealthSituation').lrDataItemSelect({ code: 'EpiHealth' });
+            $('#IsOut').lrDataItemSelect({
+                code: 'YesOrNoInt',
+                select: function (item) {
+                    if (item) {
+                        if (item.text == "是") {
+                            $("#PassPlaces").parent().show();
+                        } else {
+                            $("#PassPlaces").parent().hide();
+                        }
+                    } else {
+                        $("#PassPlaces").parent().hide();
+                    }
+                }
+            });
+            $('#HasFamily').lrDataItemSelect({
+                code: 'YesOrNoInt',
+                select: function (item) {
+                    if (item) {
+                        if (item.text == "是") {
+                            $("#ContactsDetails").parent().show();
+                        } else {
+                            $("#ContactsDetails").parent().hide();
+                        }
+                    } else {
+                        $("#ContactsDetails").parent().hide();
+                    }
+                }
+            });
+            $('#HasPeople').lrDataItemSelect({
+                code: 'YesOrNoInt',
+                select: function (item) {
+                    if (item) {
+                        if (item.text == "是") {
+                            $("#PeopleDetails").parent().show();
+                        } else {
+                            $("#PeopleDetails").parent().hide();
+                        }
+                    } else {
+                        $("#PeopleDetails").parent().hide();
+                    }
+                }
+            });
+            $('#Gender').lrDataItemSelect({ code: 'usersex' });
+
+            $('#Provice').lrDataSourceSelect({
+                code: 'DIC_PROVINCE', value: 'pcode', text: 'pname',
+                select: function (item) {
+                    if (!!item) {
+                        $('#OutArea').lrselectRefresh({
+                            url: "/DIC_CITY/GetListByProvinceCode",
+                            param: { ProvinceCode: item.pcode },
+                            value: 'CCODE',
+                            text: 'CNAME'
+                        });
+                        $('#City').lrselectRefresh({
+                            url: "",
+                            data: []
+                        });
+                    }
+                }
+            });
+            $('#OutArea').lrselect({
+                select: function (item) {
+                    if (!!item) {
+                        $('#City').lrselectRefresh({
+                            url: top.$.rootUrl + "/DIC_AREA/GetAreasListByCityCode",
+                            param: { cityCode: item.CCODE },
+                            value: 'ACODE',
+                            text: 'ANAME'
+                        });
+                    }
+                }
+            });
+            $('#City').lrselect();
+            $('#Vehicle').lrDataItemSelect({ code: 'Vehicle' });
+            $('#PassPlaces').jfGrid({
+                headData: [
+
+                    {
+                        label: '类别', name: 'PassType', width: 100, align: 'left'
+                        , edit: {
+                            type: 'select',
+                            init: function (row, $edit) {
+                            },
+                            datatype: 'dataItem',
+                            code: 'EpiPassType'
+                        }
+                    },
+                    {
+                        label: '省', name: 'Province', width: 100, align: 'left'
+                        , edit: {
+                            type: 'select',
+                            init: function (row, $edit) {
+                            },
+                            datatype: 'dataSource',
+                            code: 'DIC_PROVINCE',
+                            op: {
+                                value: 'pcode',
+                                text: 'pname',
+                                title: 'pname'
+                            }
+                        }
+                    }, {
+                        label: '市', name: 'City', width: 100, align: 'left',
+                        formatter: function (value, row, op, $cell) {
+                            var province = row.Province;
+                            var res;
+                            learun.httpSync('GET', '/DIC_CITY/GetListByProvinceCode', { ProvinceCode: province }, function (data) {
+                                $.each(data, function (_index, _item) {
+                                    if (value == _item.CCODE) {
+
+                                        res = _item.CNAME;
+                                    }
+                                });
+                            });
+                            return res;
+                        },
+                        edit: {
+                            type: 'select',
+                            init: function (row, $self) {
+                                var province = row.Province;
+                                learun.httpAsync('GET', '/DIC_CITY/GetListByProvinceCode', { ProvinceCode: province }, function (data) {
+                                    var res = [];
+                                    $.each(data, function (_index, _item) {
+                                        res.push(_item);
+                                    });
+                                    $self.lrselectRefresh({
+                                        data: res,
+                                    });
+                                });
+                            },
+                            op: {
+                                value: 'CCODE',
+                                text: 'CNAME',
+                                title: 'CNAME',
+
+                            }
+                        }
+                    },
+                    {
+                        label: '区域', name: 'Area', width: 100, align: 'left',
+                        formatter: function (value, row, op, $cell) {
+                            var cityCode = row.City;
+                            var res;
+                            learun.httpSync('GET', top.$.rootUrl + "/DIC_AREA/GetAreasListByCityCode", { cityCode: cityCode }, function (data) {
+                                $.each(data, function (_index, _item) {
+                                    if (value == _item.ACODE) {
+
+                                        res = _item.ANAME;
+                                    }
+                                });
+                            });
+                            return res;
+                        },
+                        edit: {
+                            type: 'select',
+                            init: function (row, $edit) {
+                                var cityCode = row.City;
+                                learun.httpAsync('GET', top.$.rootUrl + "/DIC_AREA/GetAreasListByCityCode", { cityCode: cityCode }, function (data) {
+                                    var res = [];
+                                    $.each(data, function (_index, _item) {
+                                        res.push(_item);
+                                    });
+                                    $edit.lrselectRefresh({
+                                        data: res,
+                                    });
+                                });
+                            },
+                            op: {
+                                value: 'ACODE',
+                                text: 'ANAME',
+                                title: 'ANAME'
+                            }
+                        }
+                    },
+                    {
+                        label: '详细地址', name: 'Address', width: 100, align: 'left'
+                        , edit: {
+                            type: 'input',
+
+                        }
+                    },
+                    {
+                        label: '时间', name: 'Time', width: 100, align: 'left', edit: { type: 'datatime' }
+                    },
+                    {
+                        label: '交通工具', name: 'Vehicle', width: 100, align: 'left', edit: {
+                            type: 'select',
+                            init: function (row, $edit) {
+                            },
+                            datatype: 'dataItem',
+                            code: 'Vehicle'
+                        }
+                    },
+                    {
+                        label: '班次号', name: 'VehicleNo', width: 100, align: 'left'
+                        , edit: {
+                            type: 'input',
+
+                        }
+                    }],
+
+                isMultiselect: true,
+                isEdit: true,
+                height: 200
+            });
+
+            $('#ContactsDetails').jfGrid({
+                headData: [
+                    {
+                        label: '名字', name: 'Name', width: 100, align: 'left',
+                        edit: { type: 'input' }
+                    },
+                    {
+                        label: '性别', name: 'Gender', width: 100, align: 'left'
+                        , edit: {
+                            type: 'select',
+                            init: function (row, $edit) {
+                            },
+                            datatype: 'dataItem',
+                            code: 'usersex'
+                        }
+                    },
+                    {
+                        label: '联系方式', name: 'Mobile', width: 100, align: 'left', edit: { type: 'input' }
+                    },
+                    {
+                        label: '隔离方式', name: 'QTType', width: 100, align: 'left'
+                        , edit: {
+                            type: 'select',
+                            init: function (data, $edit) {
+
+                            },
+                            datatype: 'dataItem',
+                            code: 'QuarantineType'
+                        }
+                    },
+                    {
+                        label: '省', name: 'Province', width: 100, align: 'left'
+                        , edit: {
+                            type: 'select',
+                            init: function (row, $edit) {
+                            },
+                            datatype: 'dataSource',
+                            code: 'DIC_PROVINCE',
+                            op: {
+                                value: 'pcode',
+                                text: 'pname',
+                                title: 'pname'
+                            }
+                        }
+                    }, {
+                        label: '市', name: 'City', width: 100, align: 'left',
+                        formatter: function (value, row, op, $cell) {
+                            var province = row.Province;
+                            var res;
+                            learun.httpSync('GET', '/DIC_CITY/GetListByProvinceCode', { ProvinceCode: province }, function (data) {
+                                $.each(data, function (_index, _item) {
+                                    if (value == _item.CCODE) {
+
+                                        res = _item.CNAME;
+                                    }
+                                });
+                            });
+                            return res;
+                        },
+                        edit: {
+                            type: 'select',
+                            init: function (row, $self) {
+                                var province = row.Province;
+                                learun.httpAsync('GET', '/DIC_CITY/GetListByProvinceCode', { ProvinceCode: province }, function (data) {
+                                    var res = [];
+                                    $.each(data, function (_index, _item) {
+                                        res.push(_item);
+                                    });
+                                    $self.lrselectRefresh({
+                                        data: res,
+                                    });
+                                });
+                            },
+                            op: {
+                                value: 'CCODE',
+                                text: 'CNAME',
+                                title: 'CNAME',
+
+                            }
+                        }
+                    },
+                    {
+                        label: '区域', name: 'Area', width: 100, align: 'left',
+                        formatter: function (value, row, op, $cell) {
+                            var cityCode = row.City;
+                            var res;
+                            learun.httpSync('GET', top.$.rootUrl + "/DIC_AREA/GetAreasListByCityCode", { cityCode: cityCode }, function (data) {
+                                $.each(data, function (_index, _item) {
+                                    if (value == _item.ACODE) {
+
+                                        res = _item.ANAME;
+                                    }
+                                });
+                            });
+                            return res;
+                        },
+                        edit: {
+                            type: 'select',
+                            init: function (row, $edit) {
+                                var cityCode = row.City;
+                                learun.httpAsync('GET', top.$.rootUrl + "/DIC_AREA/GetAreasListByCityCode", { cityCode: cityCode }, function (data) {
+                                    var res = [];
+                                    $.each(data, function (_index, _item) {
+                                        res.push(_item);
+                                    });
+                                    $edit.lrselectRefresh({
+                                        data: res,
+                                    });
+                                });
+                            },
+                            op: {
+                                value: 'ACODE',
+                                text: 'ANAME',
+                                title: 'ANAME'
+                            }
+                        }
+                    },
+                    {
+                        label: '隔离地点', name: 'QTAddress', width: 100, align: 'left', edit: { type: 'input' }
+                    },
+                    {
+                        label: '隔离时间', name: 'QTTime', width: 100, align: 'left'
+                        , edit: {
+                            type: 'datatime',
+                            dateformat: '1'
+                        }
+                    },
+                    {
+                        label: '接触隔离时间', name: 'QTContactTime', width: 100, align: 'left'
+                        , edit: {
+                            type: 'datatime',
+                            dateformat: '1'
+                        }
+                    },
+                    {
+                        label: '健康状况', name: 'Fever', width: 100, align: 'left'
+                        , edit: {
+                            type: 'select',
+                            init: function (data, $edit) {
+
+                            },
+                            datatype: 'dataItem',
+                            code: 'EpiHealth'
+                        }
+                    },
+                ],
+
+                isMultiselect: true,
+                isEdit: true,
+                height: 200
+            });
+
+
+            $('#PeopleDetails').jfGrid({
+                headData: [
+                    {
+                        label: '名字', name: 'Name', width: 100, align: 'left',
+                        edit: { type: 'input' }
+                    },
+                    {
+                        label: '性别', name: 'Gender', width: 100, align: 'left'
+                        , edit: {
+                            type: 'select',
+                            init: function (row, $edit) {
+                            },
+                            datatype: 'dataItem',
+                            code: 'usersex'
+                        }
+                    },
+                    {
+                        label: '联系方式', name: 'Mobile', width: 100, align: 'left', edit: { type: 'input' }
+                    },
+                    {
+                        label: '隔离方式', name: 'QTType', width: 100, align: 'left'
+                        , edit: {
+                            type: 'select',
+                            init: function (data, $edit) {
+
+                            },
+                            datatype: 'dataItem',
+                            code: 'QuarantineType'
+                        }
+                    },
+                    {
+                        label: '省', name: 'Province', width: 100, align: 'left'
+                        , edit: {
+                            type: 'select',
+                            init: function (row, $edit) {
+                            },
+                            datatype: 'dataSource',
+                            code: 'DIC_PROVINCE',
+                            op: {
+                                value: 'pcode',
+                                text: 'pname',
+                                title: 'pname'
+                            }
+                        }
+                    }, {
+                        label: '市', name: 'City', width: 100, align: 'left',
+                        formatter: function (value, row, op, $cell) {
+                            var province = row.Province;
+                            var res;
+                            learun.httpSync('GET', '/DIC_CITY/GetListByProvinceCode', { ProvinceCode: province }, function (data) {
+                                $.each(data, function (_index, _item) {
+                                    if (value == _item.CCODE) {
+
+                                        res = _item.CNAME;
+                                    }
+                                });
+                            });
+                            return res;
+                        },
+                        edit: {
+                            type: 'select',
+                            init: function (row, $self) {
+                                var province = row.Province;
+                                learun.httpAsync('GET', '/DIC_CITY/GetListByProvinceCode', { ProvinceCode: province }, function (data) {
+                                    var res = [];
+                                    $.each(data, function (_index, _item) {
+                                        res.push(_item);
+                                    });
+                                    $self.lrselectRefresh({
+                                        data: res,
+                                    });
+                                });
+                            },
+                            op: {
+                                value: 'CCODE',
+                                text: 'CNAME',
+                                title: 'CNAME',
+
+                            }
+                        }
+                    },
+                    {
+                        label: '区域', name: 'Area', width: 100, align: 'left',
+                        formatter: function (value, row, op, $cell) {
+                            var cityCode = row.City;
+                            var res;
+                            learun.httpSync('GET', top.$.rootUrl + "/DIC_AREA/GetAreasListByCityCode", { cityCode: cityCode }, function (data) {
+                                $.each(data, function (_index, _item) {
+                                    if (value == _item.ACODE) {
+
+                                        res = _item.ANAME;
+                                    }
+                                });
+                            });
+                            return res;
+                        },
+                        edit: {
+                            type: 'select',
+                            init: function (row, $edit) {
+                                var cityCode = row.City;
+                                learun.httpAsync('GET', top.$.rootUrl + "/DIC_AREA/GetAreasListByCityCode", { cityCode: cityCode }, function (data) {
+                                    var res = [];
+                                    $.each(data, function (_index, _item) {
+                                        res.push(_item);
+                                    });
+                                    $edit.lrselectRefresh({
+                                        data: res,
+                                    });
+                                });
+                            },
+                            op: {
+                                value: 'ACODE',
+                                text: 'ANAME',
+                                title: 'ANAME'
+                            }
+                        }
+                    },
+                    {
+                        label: '隔离地点', name: 'QTAddress', width: 100, align: 'left', edit: { type: 'input' }
+                    },
+                    {
+                        label: '隔离时间', name: 'QTTime', width: 100, align: 'left'
+                        , edit: {
+                            type: 'datatime',
+                            dateformat: '1'
+                        }
+                    },
+                    {
+                        label: '接触隔离时间', name: 'QTContactTime', width: 100, align: 'left'
+                        , edit: {
+                            type: 'datatime',
+                            dateformat: '1'
+                        }
+                    },
+                    {
+                        label: '健康状况', name: 'Fever', width: 100, align: 'left'
+                        , edit: {
+                            type: 'select',
+                            init: function (data, $edit) {
+
+                            },
+                            datatype: 'dataItem',
+                            code: 'EpiHealth'
+                        }
+                    },
+                ],
+
+                isMultiselect: true,
+                isEdit: true,
+                height: 200
+            });
+            
+
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/EpidemicSituationCopy/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]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {};
+        postData.strEntity = JSON.stringify($('[data-table="EpidemicSituation"]').lrGetFormData());
+        postData.strcontactsDetailsList = JSON.stringify($('#ContactsDetails').jfGridGet('rowdatas'));
+        postData.passPlaceDetailsList = JSON.stringify($('#PassPlaces').jfGridGet('rowdatas'));
+        postData.strpeopleDetailsList = JSON.stringify($('#PeopleDetails').jfGridGet('rowdatas'));
+
+        $.lrSaveForm(top.$.rootUrl + '/PersonnelManagement/EpidemicSituationCopy/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调 
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/Index.cshtml

@@ -12,10 +12,10 @@
                     <div class=" btn-group btn-group-sm">
                         <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">
+                    <div class=" btn-group btn-group-sm">
                         <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/PersonnelManagement/Views/EpidemicSituationCopy/Index.js

@@ -51,6 +51,19 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+            $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'FormView',
+                        title: '查看',
+                        url: top.$.rootUrl + '/PersonnelManagement/EpidemicSituationCopy/FormView?keyValue=' + keyValue,
+                        width: 1000,
+                        height: 650,
+                        btn: null
+                    });
+                }
+            });
 
             // 删除
             $('#lr_delete').on('click', function () {
@@ -104,7 +117,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "所在部门", name: "Department", width: 100, align: "left",
+                        label: "所在部门/班级", name: "Department", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             console.log(row);
                             if (row.StudentSource) {
@@ -203,7 +216,6 @@ var bootstrap = function ($, learun) {
         search: function (param) {
             param = param || {};
             var loginInfo = top.learun.clientdata.get(['userinfo']);
-            console.log('人员id' + createrID);
             if (createrID) {
                 param.Creater = createrID;
             } else {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/IndexAll.cshtml

@@ -0,0 +1,42 @@
+@{
+    ViewBag.Title = "疫情记录";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout "  >
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">填表人员</div>
+                                    <input id="Creater"  type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">类别</div>
+                                    <div id="Type"></div>
+                                </div>
+                                @*<div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">系|专业|班级</div>
+                                    <input id="StudentSource" type="text" class="form-control" />
+                                </div>*@
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_view" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;查看</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/EpidemicSituationCopy/IndexAll.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/IndexAll.js

@@ -0,0 +1,201 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2020-02-03 14:37
+ * 描  述：疫情记录
+ */
+var refreshGirdData;
+var createrID = request('createrID');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            $('#Type').lrDataItemSelect({ code: 'EUserType' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            
+            $('#lr_view').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('ID');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'FormView',
+                        title: '查看',
+                        url: top.$.rootUrl + '/PersonnelManagement/EpidemicSituationCopy/FormView?keyValue=' + keyValue,
+                        width: 1000,
+                        height: 650,
+                        btn: null
+                });
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/PersonnelManagement/EpidemicSituation/GetPageList',
+                headData: [
+                    {
+                        label: "填表人员", name: "Creater", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+
+                        }
+                    },
+                    {
+                        label: "填报日期", name: "CreateTime", width: 100, align: "left",
+                        formatter: function (value, row) {
+                            return dateFormat("YYYY-mm-dd", new Date(value));
+                        }
+                    },
+                    {
+                        label: "类别", name: "Type", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'EUserType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "所在部门/班级", name: "Department", width: 200, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            if (row.StudentSource) {
+                                callback(row.StudentSource);
+                            } else {
+                                learun.clientdata.getAsync('custmerData', {
+                                    url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
+                                    key: value,
+                                    keyId: 'id',
+                                    callback: function (_data) {
+                                        callback(_data['name']);
+                                    }
+                                });
+                            }
+                        }
+                    },
+                    {
+                        label: "性别", name: "Gender", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'usersex',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "家庭住址", name: "HomeAddress", width: 100, align: "left" },
+                    {
+                        label: "健康状况", name: "HealthSituation", width: 100, align: "left",
+                        //formatterAsync: function (callback, value, row, op, $cell) {
+                        //    learun.clientdata.getAsync('dataItem', {
+                        //        key: value,
+                        //        code: 'EpiHealth',
+                        //        callback: function (_data) {
+                        //            callback(_data.text);
+                        //        }
+                        //    });
+                        //}
+                        formatter: function (cellvalue, row) {
+                            if (cellvalue == 0) {
+                                return '<span class=\"label label-success\">健康</span>';
+                            } else if (cellvalue == 1) {
+                                return '<span class=\"label label-danger\">异常</span>';
+                            }
+                        }
+                    },
+                    {
+                        label: "是否外出", name: "IsOut", width: 100, align: "left",
+                        //formatterAsync: function (callback, value, row, op, $cell) {
+                        //    learun.clientdata.getAsync('dataItem', {
+                        //        key: value,
+                        //        code: 'YesOrNoInt',
+                        //        callback: function (_data) {
+                        //            callback(_data.text);
+                        //        }
+                        //    });
+                        //}
+                        formatter: function (cellvalue, row) {
+                            if (cellvalue === 0) {
+                                return '<span class=\"label label-success\">否</span>';
+                            } else if (cellvalue === 1) {
+                                return '<span class=\"label label-danger\">是</span>';
+                            }
+                        }
+                    },
+                    {
+                        label: "家人异常", name: "HasFamily", width: 100, align: "left",
+                        formatter: function (cellvalue, row) {
+                            if (cellvalue === 0) {
+                                return '<span class=\"label label-success\">否</span>';
+                            } else if (cellvalue === 1) {
+                                return '<span class=\"label label-danger\">是</span>';
+                            }
+                        }
+                    },
+                    {
+                        label: "疫区人异常", name: "HasPeople", width: 100, align: "left",
+                        formatter: function (cellvalue, row) {
+                            if (cellvalue === 0) {
+                                return '<span class=\"label label-success\">否</span>';
+                            } else if (cellvalue === 1) {
+                                return '<span class=\"label label-danger\">是</span>';
+                            }
+                        }
+                    },
+                    { label: "联系方式", name: "Mobile", width: 100, align: "left" },
+                    { label: "当前地址", name: "Objective", width: 100, align: "left" }
+                ],
+                mainId: 'ID',
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        page.search();
+    };
+    page.init();
+}
+function dateFormat(fmt, date) {
+    let ret;
+    const opt = {
+        "Y+": date.getFullYear().toString(),        // 年
+        "m+": (date.getMonth() + 1).toString(),     // 月
+        "d+": date.getDate().toString(),            // 日
+        "H+": date.getHours().toString(),           // 时
+        "M+": date.getMinutes().toString(),         // 分
+        "S+": date.getSeconds().toString()          // 秒
+        // 有其他格式化字符需求可以继续添加，必须转化成字符串
+    };
+    for (let k in opt) {
+        ret = new RegExp("(" + k + ")").exec(fmt);
+        if (ret) {
+            fmt = fmt.replace(ret[1], (ret[1].length == 1) ? (opt[k]) : (opt[k].padStart(ret[1].length, "0")))
+        };
+    };
+    return fmt;
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/IndexReport.cshtml

@@ -12,7 +12,7 @@
                             <div class="lr-query-formcontent">
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">填表人员</div>
-                                    <div id="Creater"></div>
+                                    <input id="Creater"  type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">类别</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/EpidemicSituationCopy/IndexReport.js

@@ -20,7 +20,6 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 220, 400);
             $('#Type').lrDataItemSelect({ code: 'EUserType' });
-            $('#Creater').lrDataSourceSelect({ code: 'BaseUser', value: 'f_userid', text: 'f_realname' }); 
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -35,6 +34,7 @@ var bootstrap = function ($, learun) {
                         url: top.$.rootUrl + '/PersonnelManagement/EpidemicSituationCopy/Index?createrID=' + createrID,
                         width: '80%',
                         height: '80%',
+                        btn: null
                     });
                 }
             });
@@ -72,9 +72,8 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "所在部门", name: "Department", width: 100, align: "left",
+                        label: "所在部门/班级", name: "Department", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            console.log(row);
                             if (row.StudentSource) {
                                 callback(row.StudentSource);
                             } else {

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

@@ -1367,6 +1367,8 @@
     <Content Include="Areas\PersonnelManagement\Views\ContractManagement\FormRemove.js" />
     <Content Include="Areas\PersonnelManagement\Views\ContractManagement\FormTerminate.js" />
     <Content Include="Areas\PersonnelManagement\Views\ContractManagement\FormRenew.js" />
+    <Content Include="Areas\PersonnelManagement\Views\EpidemicSituationCopy\FormView.js" />
+    <Content Include="Areas\PersonnelManagement\Views\EpidemicSituationCopy\IndexAll.js" />
     <Content Include="Areas\PersonnelManagement\Views\Sal_UserSalary\ImportForm.css" />
     <Content Include="Areas\PersonnelManagement\Views\Sal_UserSalary\ImportForm.js" />
     <Content Include="Areas\PersonnelManagement\Views\StuSaverecord\IndexForStudent.js" />
@@ -6968,6 +6970,8 @@
     <Content Include="Areas\LR_Desktop\Views\MessageRind\UnreadIndex.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_DefaultPwdConfig\Form.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_DefaultPwdConfig\Index.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\EpidemicSituationCopy\FormView.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\EpidemicSituationCopy\IndexAll.cshtml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />
     <None Include="Properties\PublishProfiles\FolderProfile1.pubxml" />

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/EpidemicSituationCopyApi.cs

@@ -144,7 +144,7 @@ namespace Learun.Application.WebApi
                 var userId = entity.Creater;
                 if (epidemicSituationIBLL.HasTodayValue(userId))
                 {
-                    return Success("不能重复提交");
+                    return Fail("不能重复提交");
                 }
             }
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/EpidemicSituation/EpidemicSituationService.cs

@@ -6,6 +6,8 @@ using System.Collections.Generic;
 using System.Data;
 using System.Linq;
 using System.Text;
+using Learun.Application.Organization;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
 
 namespace Learun.Application.TwoDevelopment.PersonnelManagement
 {
@@ -62,15 +64,15 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 t.StudentSource,
                 t.Contacts
                 ");
-                strSql.Append("  FROM EpidemicSituation t ");
+                strSql.Append("  FROM EpidemicSituation t left join "+ BaseRepository().getDbConnection().Database+ ".dbo.LR_Base_User b on t.Creater=b.F_UserId left join stuinfobasic c on b.F_EnCode=c.stuno ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数
                 var dp = new DynamicParameters(new { });
                 if (!queryParam["Creater"].IsEmpty())
                 {
-                    dp.Add("Creater", queryParam["Creater"].ToString(), DbType.String);
-                    strSql.Append(" AND t.Creater = @Creater ");
+                    dp.Add("Creater", "%"+queryParam["Creater"].ToString()+"%", DbType.String);
+                    strSql.Append(" AND c.StuName like @Creater ");
                 }
                 if (!queryParam["Type"].IsEmpty())
                 {
@@ -145,14 +147,14 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 }
 
 
-
                 var expression = LinqExtensions.True<EpidemicSituationEntity>();
                 var queryParam = queryJson.ToJObject();
                 // 填表人员
                 if (!queryParam["Creater"].IsEmpty())
                 {
                     string Creater = queryParam["Creater"].ToString();
-                    expression = expression.And(t => t.Creater.Equals(Creater));
+                    var studentlist = BaseRepository().FindList<UserEntity>(m=>m.F_RealName.Contains(Creater));
+                    expression = expression.And(t => studentlist.Any(m=>m.F_UserId== t.Creater));
                 }
                 // 类别
                 if (!queryParam["Type"].IsEmpty())