From 2752b0f226f08dc9f4d13c46dd40796e9353828c Mon Sep 17 00:00:00 2001
From: zhichao lei <442149704@qq.com>
Date: Mon, 19 Oct 2020 16:39:45 +0800
Subject: [PATCH] =?UTF-8?q?=E2=80=A2=20=E8=A1=A8=E5=8D=95=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E4=B8=AD=E5=A2=9E=E5=8A=A0=E5=AF=B9=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=9A=20=201.=20=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=EF=BC=8C=E9=83=A8=E9=97=A8=20=EF=BC=8C=E8=A7=92=E8=89=B2=20?=
 =?UTF-8?q?=E7=AD=89=20=E6=9D=A1=E4=BB=B6=E7=9A=84=E5=A4=9A=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E6=9F=A5=E8=AF=A2=E8=AE=BE=E7=BD=AE=20=E2=80=A2=20?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=A2=9E=E5=8A=A0=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=EF=BC=9A=20=E5=85=AC=E6=96=87=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EmpInfo/{form/form.css => EmpInfo.css}    |   0
 .../EmpInfo/{form/form.html => EmpInfo.html}  |   0
 .../EmpInfo/{form/form.js => EmpInfo.js}      |   4 +-
 .../JournalSend/JournalSend.js                |   4 +-
 .../JournalSend/form/form.js                  |   8 +-
 .../Sys_ReceiveFile/Sys_ReceiveFile.js        |   4 +-
 .../Sys_ReceiveFile/form/form.js              |   6 +-
 .../Views/FormRelation/PreviewIndex.js        |   1 +
 .../Views/FormRelation/QueryFieldForm.js      |   3 +-
 .../plugin/custmerform/lr-formcomponts.js     |  25 ++
 .../XmlConfig/database.config                 |   8 +-
 .../Modules/EmpInfoApi.cs                     |  18 +-
 .../Modules/Sys_ReceiveFileApi.cs             |   6 +-
 .../Sys_ReceiveFile/Sys_ReceiveFileService.cs |   6 +-
 .../learun-mpui/learun-ui-ali/textarea.vue    |  39 ++-
 .../LearunApp-2.2.0/pages.json                |  13 +-
 .../EmpInfo/list.vue                          | 251 ++++++++++++++
 .../JournalSend/list.vue                      |   6 +-
 .../JournalSend/single.vue                    |   6 +-
 .../Sys_ReceiveFile/list.vue                  | 326 ++++++++++++++++++
 .../Sys_ReceiveFile/single.vue                | 199 +++++++++++
 .../LearunApp-2.2.0/pages/login.vue           |   1 +
 22 files changed, 884 insertions(+), 50 deletions(-)
 rename Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EmpInfo/{form/form.css => EmpInfo.css} (100%)
 rename Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EmpInfo/{form/form.html => EmpInfo.html} (100%)
 rename Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EmpInfo/{form/form.js => EmpInfo.js} (96%)
 create mode 100644 Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/EmpInfo/list.vue
 create mode 100644 Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Sys_ReceiveFile/list.vue
 create mode 100644 Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Sys_ReceiveFile/single.vue

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EmpInfo/form/form.css b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EmpInfo/EmpInfo.css
similarity index 100%
rename from Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EmpInfo/form/form.css
rename to Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EmpInfo/EmpInfo.css
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EmpInfo/form/form.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EmpInfo/EmpInfo.html
similarity index 100%
rename from Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EmpInfo/form/form.html
rename to Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EmpInfo/EmpInfo.html
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EmpInfo/form/form.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EmpInfo/EmpInfo.js
similarity index 96%
rename from Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EmpInfo/form/form.js
rename to Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EmpInfo/EmpInfo.js
index 83f13366d..b6285d9f2 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EmpInfo/form/form.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/EmpInfo/EmpInfo.js	
@@ -94,7 +94,7 @@
                 _postData.keyValue = keyValue;
                 _postData.strEntity = JSON.stringify($page.find('.lr-form-container').lrformGet());
                 learun.layer.loading(true, '正在提交数据');
-                learun.httppost(config.webapi + 'learun/EducationalAdministration/EmpRegister/save', _postData, (data) => {
+                learun.httppost(config.webapi + 'learun/adms/EducationalAdministration/EmpRegister/save', _postData, (data) => {
                     learun.layer.loading(false);
                     if (data) {// 表单数据保存成功 
                         if (keyValue) {
@@ -122,7 +122,7 @@
                 $header.find('.lr-form-header-btnlist').show();
                 // 获取表单数据 
                 learun.layer.loading(true, '获取表单数据');
-                learun.httpget(config.webapi + 'learun/EducationalAdministration/EmpRegister/form', keyValue, (data) => {
+                learun.httpget(config.webapi + 'learun/adms/EducationalAdministration/EmpRegister/form', keyValue, (data) => {
                     if (data) {
                         for (var id in data) {
                             if (data[id].length) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/JournalSend/JournalSend.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/JournalSend/JournalSend.js
index 3ab9b7b6a..0b7a5d1f8 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/JournalSend/JournalSend.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/JournalSend/JournalSend.js	
@@ -71,7 +71,7 @@
             _postParam.queryJson = JSON.stringify({ userId: baseUser.baseinfo.userId });
 
             console.log(baseUser);
-            learun.httpget(config.webapi + 'learun/EducationalAdministration/Journal/pagelist', _postParam, (data) => {
+            learun.httpget(config.webapi + 'learun/adms/EducationalAdministration/Journal/pagelist', _postParam, (data) => {
 
                 $page.find('.lr-badge').text('0');
                 if (data) {
@@ -109,7 +109,7 @@
             learun.layer.confirm('确定要删除该笔数据吗？', function (_index) {
                 if (_index === '1') {
                     learun.layer.loading(true, '正在删除该笔数据');
-                    learun.httppost(config.webapi + 'learun/EducationalAdministration/Journal/delete', item.JournalSendId, (data) => {
+                    learun.httppost(config.webapi + 'learun/adms/EducationalAdministration/Journal/delete', item.JournalSendId, (data) => {
                         if (data) {// 删除数据成功 
                             page.grid.reload();
                         }
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/JournalSend/form/form.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/JournalSend/form/form.js
index 252d24d82..c44b53032 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/JournalSend/form/form.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/JournalSend/form/form.js	
@@ -61,7 +61,7 @@
                                 learun.layer.confirm('确定要删除该笔数据吗？', function (_index) {
                                     if (_index === '1') {
                                         learun.layer.loading(true, '正在删除该笔数据');
-                                        learun.httppost(config.webapi + 'learun/EducationalAdministration/Journal/delete', keyValue, (data) => {
+                                        learun.httppost(config.webapi + 'learun/adms/EducationalAdministration/Journal/delete', keyValue, (data) => {
                                             learun.layer.loading(false);
                                             if (data) {// 删除数据成功 
                                                 learun.nav.closeCurrent();
@@ -88,7 +88,7 @@
                 _postData.keyValue = keyValue;
                 _postData.strEntity = JSON.stringify($page.find('.lr-form-container').lrformGet());
                 learun.layer.loading(true, '正在提交数据');
-                learun.httppost(config.webapi + 'learun/EducationalAdministration/Journal/save', _postData, (data) => {
+                learun.httppost(config.webapi + 'learun/adms/EducationalAdministration/Journal/save', _postData, (data) => {
                     learun.layer.loading(false);
                     if (data) {// 表单数据保存成功 
                         if (keyValue) {
@@ -119,7 +119,7 @@
                 _postData.keyValue = keyValue;
                 _postData.strEntity = JSON.stringify($page.find('.lr-form-container').lrformGet());
                 learun.layer.loading(true, '正在提交数据');
-                learun.httppost(config.webapi + 'learun/EducationalAdministration/Journal/saveDraft', _postData, (data) => {
+                learun.httppost(config.webapi + 'learun/adms/EducationalAdministration/Journal/saveDraft', _postData, (data) => {
                     learun.layer.loading(false);
                     if (data) {// 表单数据保存成功 
                         if (keyValue) {
@@ -146,7 +146,7 @@
                 $header.find('.lr-form-header-btnlist').show();
                 // 获取表单数据 
                 learun.layer.loading(true, '获取表单数据');
-                learun.httpget(config.webapi + 'learun/EducationalAdministration/Journal/form', keyValue, (data) => {
+                learun.httpget(config.webapi + 'learun/adms/EducationalAdministration/Journal/form', keyValue, (data) => {
                     if (data) {
                         for (var id in data) {
                             if (data[id].length) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFile.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFile.js
index e0b7e9362..934eb09d7 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFile.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFile.js	
@@ -76,7 +76,7 @@
             if (param.begin && param.end) {
                 _postParam.queryJson = JSON.stringify({ StartTime: param.begin, EndTime: param.end, ReceiverId: logininfo.baseinfo.userId });
             }
-            learun.httpget(config.webapi + 'learun/EducationalAdministration/Sys_ReceiveFile/pagelist', _postParam, (data) => {
+            learun.httpget(config.webapi + 'learun/adms/EducationalAdministration/Sys_ReceiveFile/pagelist', _postParam, (data) => {
                 $page.find('.lr-badge').text('0');
                 if (data) {
                     $page.find('.lr-badge').text(data.records);
@@ -117,7 +117,7 @@
             learun.layer.confirm('确定要删除该笔数据吗？', function (_index) {
                 if (_index === '1') {
                     learun.layer.loading(true, '正在删除该笔数据');
-                    learun.httppost(config.webapi + 'learun/EducationalAdministration/Sys_ReceiveFile/delete', item.RFileId, (data) => {
+                    learun.httppost(config.webapi + 'learun/adms/EducationalAdministration/Sys_ReceiveFile/delete', item.RFileId, (data) => {
                         if (data) {// 删除数据成功 
                             page.grid.reload();
                         }
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_ReceiveFile/form/form.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_ReceiveFile/form/form.js
index 640d5ff90..0fe47fb43 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_ReceiveFile/form/form.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/Sys_ReceiveFile/form/form.js	
@@ -61,7 +61,7 @@
                                 learun.layer.confirm('确定要删除该笔数据吗？', function (_index) {
                                     if (_index === '1') {
                                         learun.layer.loading(true, '正在删除该笔数据');
-                                        learun.httppost(config.webapi + 'learun/EducationalAdministration/Sys_ReceiveFile/delete', keyValue, (data) => {
+                                        learun.httppost(config.webapi + 'learun/adms/EducationalAdministration/Sys_ReceiveFile/delete', keyValue, (data) => {
                                             learun.layer.loading(false);
                                             if (data) {// 删除数据成功 
                                                 learun.nav.closeCurrent();
@@ -88,7 +88,7 @@
                 _postData.keyValue = keyValue;
                 _postData.strEntity = JSON.stringify($page.find('.lr-form-container').lrformGet());
                 learun.layer.loading(true, '正在提交数据');
-                learun.httppost(config.webapi + 'learun/EducationalAdministration/Sys_ReceiveFile/save', _postData, (data) => {
+                learun.httppost(config.webapi + 'learun/adms/EducationalAdministration/Sys_ReceiveFile/save', _postData, (data) => {
                     learun.layer.loading(false);
                     if (data) {// 表单数据保存成功 
                         if (keyValue) {
@@ -115,7 +115,7 @@
                 $header.find('.lr-form-header-btnlist').show();
                 // 获取表单数据 
                 learun.layer.loading(true, '获取表单数据');
-                learun.httpget(config.webapi + 'learun/EducationalAdministration/Sys_ReceiveFile/form', keyValue, (data) => {
+                learun.httpget(config.webapi + 'learun/adms/EducationalAdministration/Sys_ReceiveFile/form', keyValue, (data) => {
                     if (data) {
                         for (var id in data) {
                             if (data[id].length) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/PreviewIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/PreviewIndex.js
index cd7d7920e..a2836aa2e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/PreviewIndex.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/PreviewIndex.js	
@@ -107,6 +107,7 @@ var bootstrap = function ($, learun) {
                             var $title = $(' <div class="lr-form-item-title">' + item.fieldName + '</div>');
                             $row.append($title);
                             $content.append($row);
+
                             $.lrFormComponents[item.compont.type].renderQuery(item.compont, $row)[0].compont = item.compont;
                         }
                     });
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/QueryFieldForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/QueryFieldForm.js
index b2337308d..48d223b52 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/QueryFieldForm.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/QueryFieldForm.js	
@@ -25,7 +25,8 @@ var bootstrap = function ($, learun) {
         bind: function () {
             var formFields2 = [];
             $.each(formFields, function (id, item) {
-                if (item.type != 'label' && item.type != 'datetime' && item.type != 'upload' && item.type != 'currentInfo') {
+                console.log(item);
+                if (item.type != 'label' && item.type != 'datetime' && item.type != 'upload' ) {
                     formFields2.push(item);
                 }
             });
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/custmerform/lr-formcomponts.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/custmerform/lr-formcomponts.js
index 3d86c2660..f7b8c23f7 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/custmerform/lr-formcomponts.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/custmerform/lr-formcomponts.js	
@@ -1208,6 +1208,31 @@
                     $row.hide();
                 }
 
+                $row.append($compont);
+                return $compont;
+            },
+            renderQuery: function (compont, $row) {
+                var $compont = $('<div id="' + compont.id + '"></div>');
+                $row.append($compont);
+
+                switch (compont.dataType) {
+                    case 'company':
+                        $compont.lrCompanySelect({ type: 'multiple' })
+                        break;
+                    case 'department':
+                        $compont.lrDepartmentSelect();
+                        break;
+                    case 'user':
+                        $compont.lrUserSelect({ type: '1' })
+                        break;
+                    case 'role':
+                        $compont.lrPostSelect({ type: 'treemultiple' });
+                        break;
+                }
+                if (compont.isHide == '1') {
+                    $row.hide();
+                }
+
                 $row.append($compont);
                 return $compont;
             }
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config
index 489b3b61f..5d293d24b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config	
@@ -16,17 +16,17 @@
   <!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />-->
-  <add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+  <!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
-  <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+  <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />-->
 
   <!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_20200403test;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_20200403test;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />-->
   <!--金隅-->
-  <!--<add name="BaseDb" connectionString="Server=192.168.100.225;Initial Catalog=adms7ultimate2;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
+  <add name="BaseDb" connectionString="Server=192.168.100.225;Initial Catalog=adms7ultimate2;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=192.168.100.225;Initial Catalog=CollegeMIS;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
-  <add name="hangfireString" connectionString="Server=192.168.100.225;Initial Catalog=Hangfire;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />-->
+  <add name="hangfireString" connectionString="Server=192.168.100.225;Initial Catalog=Hangfire;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
   <!--126西昌测试-->
   <!--<add name="BaseDb" connectionString="Server=192.168.2.126;Initial Catalog=adms7ultimate2_西昌;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=192.168.2.126;Initial Catalog=CollegeMIS_西昌;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EmpInfoApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EmpInfoApi.cs
index 7e2f52a0f..9ea62af54 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EmpInfoApi.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/EmpInfoApi.cs	
@@ -27,11 +27,12 @@ namespace Learun.Application.WebApi
         /// 注册接口 
         /// <summary> 
         public EmpInfoApi()
-            : base("/Learun/EducationalAdministration/EmpRegister")
+            : base("/Learun/adms/EducationalAdministration/EmpRegister")
         {
             Get["/pagelist"] = GetPageList;
             Get["/list"] = GetList;
             Get["/form"] = GetForm;
+            Get["/formForNo"] = GetFormForNo;
             Post["/delete"] = DeleteForm;
             Post["/save"] = SaveForm;
             Post["/savePhoto"] = GetSavePhoto;
@@ -98,6 +99,21 @@ namespace Learun.Application.WebApi
             };
             return Success(jsonData);
         }
+        /// <summary> 
+        /// 获取表单数据 
+        /// <summary> 
+        /// <param name="_"></param> 
+        /// <returns></returns> 
+        public Response GetFormForNo(dynamic _)
+        {
+            string keyValue = this.GetReqData();
+            var EmpInfoData = empInfoIBLL.GetEmpInfoEntityByEmpNo(keyValue);
+            var jsonData = new
+            {
+                EmpInfo = EmpInfoData,
+            };
+            return Success(jsonData);
+        }
         #endregion
 
         #region  提交数据 
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Sys_ReceiveFileApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Sys_ReceiveFileApi.cs
index 58468af90..81017ca77 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Sys_ReceiveFileApi.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Sys_ReceiveFileApi.cs	
@@ -21,7 +21,7 @@ namespace Learun.Application.WebApi
                 /// 注册接口 
                 /// <summary> 
         public Sys_ReceiveFileApi()
-: base("/Learun/EducationalAdministration/Sys_ReceiveFile")
+: base("/Learun/adms/EducationalAdministration/Sys_ReceiveFile")
         {
             Get["/pagelist"] = GetPageList;
             Get["/list"] = GetList;
@@ -71,8 +71,8 @@ namespace Learun.Application.WebApi
             var Sys_ReceiveFileData = sys_ReceiveFileIBLL.GetSys_ReceiveFileEntity(keyValue);
             if (Sys_ReceiveFileData != null)
             {
-                var result = annexesFileIBLL.GetEntityByFolderId(Sys_ReceiveFileData.Url).F_FilePath;
-                if (result.IndexOf("Resource") > 0)
+                var result = annexesFileIBLL.GetEntityByFolderId(Sys_ReceiveFileData.Url)?.F_FilePath;
+                if (result?.IndexOf("Resource") > 0)
                 {
                     result = "/" + result.Substring(result.IndexOf("Resource"));
                 }
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileService.cs
index 94ff24eab..168a30fbe 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveFile/Sys_ReceiveFileService.cs	
@@ -182,7 +182,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         {
             try
             {
-                return this.BaseRepository().FindEntity<Sys_ReceiveFileEntity>(keyValue);
+                var entity = this.BaseRepository().FindEntity<Sys_ReceiveFileEntity>(keyValue);
+                //获取表单详情意味着查阅了
+                entity.SendStatus = true;
+                this.BaseRepository().Update(entity);
+                return entity;
             }
             catch (Exception ex)
             {
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-mpui/learun-ui-ali/textarea.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-mpui/learun-ui-ali/textarea.vue
index 3c8a54c47..df008ed71 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-mpui/learun-ui-ali/textarea.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-mpui/learun-ui-ali/textarea.vue	
@@ -1,13 +1,13 @@
 <template>
   <view v-if="!simpleMode" :class="className" :style="style">
-    <view class="cu-form-group" style="border-bottom: none; padding-bottom: 0;">
+    <view class="cu-form-group" style="border-bottom: none; padding-bottom: 0">
       <view class="title">
-        <text v-if="required" style="color: red; font-size: 1.2em;">*</text>
-        {{ title || '' }}
+        <text v-if="required" style="color: red; font-size: 1.2em">*</text>
+        {{ title || "" }}
       </view>
     </view>
 
-    <view class="cu-form-group" style="position: relative;border-top: none">
+    <view class="cu-form-group" style="position: relative; border-top: none">
       <textarea
         @input="textareaInput"
         :maxlength="maxlength"
@@ -22,7 +22,13 @@
     </view>
   </view>
 
-  <view v-else :class="className" :style="style" class="cu-form-group" style="position: relative;">
+  <view
+    v-else
+    :class="className"
+    :style="style"
+    class="cu-form-group"
+    style="position: relative"
+  >
     <textarea
       @input="textareaInput"
       :maxlength="maxlength"
@@ -40,7 +46,7 @@
 
 <script>
 export default {
-  name: 'l-textarea',
+  name: "l-textarea",
 
   props: {
     maxlength: { default: -1 },
@@ -53,28 +59,27 @@ export default {
     simpleMode: {},
     required: {},
     title: {},
-    disabled: {}
+    disabled: {},
   },
 
   methods: {
     textareaInput(e) {
-      this.$emit('change', e.detail.value)
-      this.$emit('input', e.detail.value)
-    }
+      this.$emit("change", e.detail.value);
+      this.$emit("input", e.detail.value);
+    },
   },
 
   computed: {
     displayPlaceHolder() {
       if (this.readonly) {
-        return ''
+        return "";
       }
 
       if (this.placeholder) {
-        return this.placeholder
+        return this.placeholder;
       }
-
-      return !this.simpleMode && this.title ? `请输入${this.title}` : '请输入…'
-    }
-  }
-}
+      return !this.simpleMode && this.title ? `请输入${this.title}` : "请输入…";
+    },
+  },
+};
 </script>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json
index 6d2835f34..df9437c1d 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json	
@@ -148,11 +148,16 @@
 	//个人信息
     { "path": "pages/EducationalAdministration/StuInfoBasic/list", "style": { "navigationBarTitleText": "个人信息" } },
 	//学生消费记录
-    { "path": "pages/EducationalAdministration/StuConsumption/list", "style": { "navigationBarTitleText": "个人信息" } },
-    { "path": "pages/EducationalAdministration/StuConsumption/single", "style": { "navigationBarTitleText": "个人信息" } },
+    { "path": "pages/EducationalAdministration/StuConsumption/list", "style": { "navigationBarTitleText": "消费记录" } },
+    { "path": "pages/EducationalAdministration/StuConsumption/single", "style": { "navigationBarTitleText": "消费详情" } },
 	//工作日志
-    { "path": "pages/EducationalAdministration/JournalSend/list", "style": { "navigationBarTitleText": "个人信息" } },
-    { "path": "pages/EducationalAdministration/JournalSend/single", "style": { "navigationBarTitleText": "个人信息" } }
+    { "path": "pages/EducationalAdministration/JournalSend/list", "style": { "navigationBarTitleText": "工作日志" } },
+    { "path": "pages/EducationalAdministration/JournalSend/single", "style": { "navigationBarTitleText": "日志详情" } },
+	//公文查看
+    { "path": "pages/EducationalAdministration/Sys_ReceiveFile/list", "style": { "navigationBarTitleText": "公文查看" } },
+    { "path": "pages/EducationalAdministration/Sys_ReceiveFile/single", "style": { "navigationBarTitleText": "公文详情" } },
+    //教师个人信息
+    { "path": "pages/EducationalAdministration/EmpInfo/list", "style": { "navigationBarTitleText": "个人信息" } }
 	
   ],
 
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/EmpInfo/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/EmpInfo/list.vue
new file mode 100644
index 000000000..e1f87fd3d
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/EmpInfo/list.vue	
@@ -0,0 +1,251 @@
+<template>
+    <view class="page">
+        <view v-if="ready">
+            <l-date-picker
+        @input="setValue('EmpInfo.Birthday', $event)"
+        :value="getValue('EmpInfo.Birthday')"
+        :disabled="!edit"
+        title="出生日期"
+      />
+            <l-select
+        @input="setValue('EmpInfo.PartyFaceNo', $event)"
+        :value="getValue('EmpInfo.PartyFaceNo')"
+        :disabled="!edit"
+        :range="dataSource.EmpInfo.PartyFaceNo"
+        title="政治面貌"
+      />
+            <l-select
+        @input="setValue('EmpInfo.NationalityNo', $event)"
+        :value="getValue('EmpInfo.NationalityNo')"
+        :disabled="!edit"
+        :range="dataSource.EmpInfo.NationalityNo"
+        title="民族"
+      />
+            <l-upload-file
+        @input="setValue('EmpInfo.Photo', $event)"
+        :value="getValue('EmpInfo.Photo')"
+        :readonly="!edit"
+        :number="9"
+        title="附件上传"
+      />
+            <l-input
+        @input="setValue('EmpInfo.mobile', $event)"
+        :value="getValue('EmpInfo.mobile')"
+        :disabled="!edit"
+        title="电话"
+        required
+      />
+            <l-input
+        @input="setValue('EmpInfo.EMail', $event)"
+        :value="getValue('EmpInfo.EMail')"
+        :disabled="!edit"
+        title="邮箱"
+        required
+      />
+          </view
+    >
+           <view
+      v-if="ready"
+      class="bg-white margin-tb padding"
+      style="padding-top: 0; overflow: hidden"
+    >
+            <l-button
+        v-if="edit"
+        @click="action('save')"
+        size="lg"
+        color="green"
+        class="block margin-top"
+        block
+      >
+                提交保存       </l-button
+      >
+            <l-button
+        v-if="!edit && mode !== 'create'"
+        @click="action('edit')"
+        size="lg"
+        line="orange"
+        class="block margin-top"
+        block
+      >
+                编辑本页       </l-button
+      >
+            <l-button
+        v-if="edit && mode !== 'create'"
+        @click="action('reset')"
+        size="lg"
+        line="red"
+        class="block margin-top"
+        block
+      >
+                取消编辑       </l-button
+      >
+            <l-button
+        v-if="!edit && mode !== 'create'"
+        @click="action('delete')"
+        size="lg"
+        line="red"
+        class="block margin-top"
+        block
+      >
+                删除       </l-button
+      >
+          </view
+    >
+      </view
+  >
+</template> 
+  
+  
+<script>
+/*
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 上海力软信息技术有限公司
+ * 创建人：超级管理员
+ * 日  期：2020-10-19 11:55
+ * 描  述：个人信息
+ */
+/**
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录：
+ * { "path": "pages/EducationalAdministration/EmpRegister/single", "style": { "navigationBarTitleText": "表单详情页" } }
+ *
+ * （navigationBarTitleText 字段为本页面的标题文本，可以修改）
+ * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件）
+ */
+import get from "lodash/get";
+import set from "lodash/set";
+import moment from "moment";
+import customPageMixins from "@/common/custompage.js";
+export default {
+  mixins: [customPageMixins],
+  data() {
+    return {
+      // 页面相关参数
+      id: null,
+      mode: null,
+      edit: null,
+      ready: false, // 表单数据
+      current: {},
+      origin: {}, // 表单项数据结构
+      scheme: {
+        EmpInfo: {
+          Birthday: { type: "datetime", title: "出生日期", dateformat: "0" },
+          PartyFaceNo: { type: "select", title: "政治面貌", dataSource: "0" },
+          NationalityNo: { type: "select", title: "民族", dataSource: "0" },
+          Photo: { type: "upload", title: "附件上传" },
+          mobile: { type: "text", title: "电话", verify: "MobileOrNull" },
+          EMail: { type: "text", title: "邮箱", verify: "EmailOrNull" },
+        },
+      }, // 数据源
+      dataSource: {
+        EmpInfo: {
+          PartyFaceNo: [],
+          NationalityNo: [],
+        },
+      },
+    };
+  },
+  async onLoad({ type, id }) {
+    let userInfo = this.GET_GLOBAL("loginUser");
+    if(userInfo.Description=="学生"){
+        this.TOAST('请使用教师账号登录!');
+        return;
+    }
+    await this.init("edit", userInfo.account);
+  },
+  methods: {
+    // 页面初始化
+    async init(type, id) {
+      this.LOADING("加载数据中...");
+      this.id = id;
+      this.mode = type;
+      this.edit = ["create", "edit"].includes(this.mode); // 拉取表单数据，同时拉取所有来自数据源的选单数据
+      await Promise.all([() => {}]);
+      await this.fetchForm();
+      this.ready = true;
+      this.HIDE_LOADING();
+    }, // 加载表单数据
+    async fetchForm() {
+      if (this.mode === "create") {
+        this.origin = await this.getDefaultForm();
+      } else {
+        const result = await this.HTTP_GET(
+          "/EducationalAdministration/EmpRegister/form",
+          this.id
+        );
+        this.origin = await this.formatFormData(result);
+      }
+      this.current = this.COPY(this.origin);
+    }, // 点击 「编辑」、「重置」、「保存」、「删除」 按钮
+    async action(type) {
+      switch (type) {
+        case "edit":
+          this.edit = true;
+          break;
+        case "reset":
+          this.current = this.COPY(this.origin);
+          this.edit = false;
+          break;
+        case "save":
+          const verifyResult = this.verifyForm();
+          if (verifyResult.length > 0) {
+            this.CONFIRM("表单验证失败", verifyResult.join("\n"));
+            return;
+          }
+          if (
+            !(await this.CONFIRM(
+              "提交确认",
+              "确定要提交本页表单内容吗？",
+              true
+            ))
+          ) {
+            return;
+          }
+          this.LOADING("正在提交...");
+          const postData = await this.getPostData(this.id);
+          this.HTTP_POST(
+            "/EducationalAdministration/EmpRegister/save",
+            postData,
+            "表单提交保存失败"
+          ).then((success) => {
+            this.HIDE_LOADING();
+            if (!success) {
+              return;
+            }
+            this.EMIT("EducationalAdministrationEmpInfo-list-change");
+            this.NAV_BACK();
+            this.TOAST("提交保存成功");
+          });
+          break;
+        case "delete":
+          if (!(await this.CONFIRM("删除项目", "确定要删除本项吗？", true))) {
+            return;
+          }
+          this.LOADING("提交删除中...");
+          this.HTTP_POST(
+            "/EducationalAdministration/EmpRegister/delete",
+            this.id,
+            "删除失败"
+          ).then((success) => {
+            this.HIDE_LOADING();
+            if (!success) {
+              return;
+            }
+            this.EMIT("EducationalAdministrationEmpInfo-list-change");
+            this.NAV_BACK();
+            this.this.TOAST("删除成功", "success");
+          });
+          break;
+        default:
+          break;
+      }
+    }, // 获取表单值
+    getValue(path) {
+      return get(this.current, path);
+    }, // 设置表单值
+    setValue(path, val) {
+      set(this.current, path, val);
+    },
+  },
+};
+</script> 
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/JournalSend/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/JournalSend/list.vue
index 54e5c4f8c..4ac6a73d3 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/JournalSend/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/JournalSend/list.vue	
@@ -73,7 +73,7 @@
 /** 
  * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
  * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
- * { "path": "pages/EducationalAdministration/JournalSend/list", "style": { "navigationBarTitleText": "表单列表页" } } 
+ * { "path": "pages/EducationalAdministration/Journal/list", "style": { "navigationBarTitleText": "表单列表页" } } 
  *  
  * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
  * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
@@ -148,7 +148,7 @@ export default {
       if (this.page > this.total) { return } 
   
       const result = await this.HTTP_GET( 
-        '/EducationalAdministration/JournalSend/pagelist', 
+        '/EducationalAdministration/Journal/pagelist', 
         { 
           // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) 
           // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 
@@ -222,7 +222,7 @@ export default {
             return
           } 
   
-          this.HTTP_POST('/EducationalAdministration/JournalSend/delete', id, '删除失败').then(success => { 
+          this.HTTP_POST('/EducationalAdministration/Journal/delete', id, '删除失败').then(success => { 
             if(!success) { return } 
             this.TOAST('删除成功', 'success') 
             this.refreshList() 
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/JournalSend/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/JournalSend/single.vue
index 81d4ac446..d0a989e55 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/JournalSend/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/JournalSend/single.vue	
@@ -136,7 +136,7 @@ export default {
       if (this.mode === 'create') { 
         this.origin = await this.getDefaultForm() 
       } else { 
-        const result = await this.HTTP_GET('/EducationalAdministration/JournalSend/form', this.id) 
+        const result = await this.HTTP_GET('/EducationalAdministration/Journal/form', this.id) 
         this.origin = await this.formatFormData(result) 
       } 
       this.current = this.COPY(this.origin) 
@@ -168,7 +168,7 @@ export default {
           this.LOADING('正在提交...') 
           const postData = await this.getPostData(this.id) 
   
-          this.HTTP_POST('/EducationalAdministration/JournalSend/save', postData, '表单提交保存失败').then(success => { 
+          this.HTTP_POST('/EducationalAdministration/Journal/save', postData, '表单提交保存失败').then(success => { 
             this.HIDE_LOADING() 
             if (!success) { 
               return
@@ -186,7 +186,7 @@ export default {
           } 
   
           this.LOADING('提交删除中...') 
-          this.HTTP_POST('/EducationalAdministration/JournalSend/delete', this.id, '删除失败').then(success => { 
+          this.HTTP_POST('/EducationalAdministration/Journal/delete', this.id, '删除失败').then(success => { 
             this.HIDE_LOADING() 
             if (!success) { 
               return
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Sys_ReceiveFile/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Sys_ReceiveFile/list.vue
new file mode 100644
index 000000000..957160d2c
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Sys_ReceiveFile/list.vue	
@@ -0,0 +1,326 @@
+<template> 
+  <view class="page"> 
+    <!-- 主列表页 --> 
+    <view :class="sideOpen ? 'show' : ''" class="mainpage" style="padding-top: 80rpx;"> 
+      <!-- 顶部条目/分页信息栏 --> 
+      <l-customlist-banner @buttonClick="sideOpen = true">{{ tips }}</l-customlist-banner> 
+  
+      <!-- 滚动列表，跨端支持上拉/下拉 --> 
+      <l-scroll-list v-if="ready" @pullDown="pullDown" @toBottom="fetchList()" ref="list"> 
+        <l-customlist :tips="loadState" showTips> 
+          <!-- 单条记录 --> 
+          <view class="customlist-item" v-for="item of list" :key="item.RFileId"> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">发送人：</text> 
+              {{ displayListItem(item, 'Sender') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">主题：</text> 
+              {{ displayListItem(item, 'Title') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">发送时间：</text> 
+              {{ displayListItem(item, 'SendTime') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">接收对象：</text> 
+              {{ displayListItem(item, 'SendType') }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">状态：</text> 
+              {{ showStatus(item) }} 
+            </view> 
+  
+            <view class="customlist-item-field"> 
+              <text class="customlist-item-field-title">查阅时间：</text> 
+              {{ displayListItem(item, 'ReadTime') }} 
+            </view> 
+  
+  
+            <l-customlist-action showEdit @edit="action('edit', item.RFileId)" showDelete @delete="action('delete', item.RFileId)" @view="action('view', item.RFileId)" /> 
+          </view> 
+        </l-customlist> 
+      </l-scroll-list> 
+    </view> 
+  
+    <!-- 关闭侧边抽屉按钮 --> 
+    <view @click="sideOpen = false" :class="sideOpen ? 'show' : ''" class="sideclose"> 
+      <l-icon type="pullright" color="blue" /> 
+    </view> 
+  
+    <!-- 侧边栏，用于设置查询条件 --> 
+    <scroll-view :class="sideOpen ? 'show' : ''" class="sidepage" scroll-y> 
+      <view v-if="ready" class="padding"> 
+  
+        <l-customlist-sidepage-datefilter 
+          v-model="dateRange"
+          @change="searchChange"
+          title="按时间日期查询: "
+          ref="datefilter"
+          class="margin-bottom"
+        /> 
+  
+        <l-input 
+          v-model="queryData.Sender"
+          @change="searchChange"
+          title ="发送人"
+          placeholder="按发送人查询"
+        /> 
+        <l-input 
+          v-model="queryData.Title"
+          @change="searchChange"
+          title ="主题"
+          placeholder="按主题查询"
+        /> 
+  
+        <!-- 重置查询条件按钮 --> 
+        <view class="padding-tb"> 
+          <l-button @click="reset" line="orange" class="block" block>重置查询条件</l-button> 
+        </view> 
+      </view> 
+    </scroll-view> 
+  
+    <l-customlist-add v-if="!sideOpen" @click="action('add')" /> 
+  
+  </view> 
+</template> 
+  
+  
+<script> 
+/* 
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
+ * Copyright (c) 2013-2020 上海力软信息技术有限公司 
+ * 创建人：超级管理员 
+ * 日  期：2020-10-19 09:24 
+ * 描  述：公文查看 
+ */
+  
+/** 
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
+ * { "path": "pages/EducationalAdministration/Sys_ReceiveFile/list", "style": { "navigationBarTitleText": "表单列表页" } } 
+ *  
+ * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
+ * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
+ */
+import moment from 'moment'
+import get from 'lodash/get'
+import set from 'lodash/set'
+import pickBy from 'lodash/pickBy'
+import mapValues from 'lodash/mapValues'
+  
+export default { 
+  data() { 
+    return { 
+      // 数据项的数据类型、结构 
+      scheme: { 
+        Sender: { type: 'text' }, 
+        Title: { type: 'text' }, 
+        SendTime: { type: 'datetime', dateformat: '0' }, 
+        SendType: { type: 'select', itemCode: 'FileSendType', dataSource: '0' }, 
+        ReadFlag: { type: 'select', dataSource: '0' }, 
+        ReadTime: { type: 'datetime', dateformat: '0' }, 
+      }, 
+  
+      // 查询条件 
+      searchData: {}, 
+      defaultQueryData: {}, 
+      queryData: { 
+        Sender: '', 
+        Title: '', 
+      }, 
+  
+      // 数据源 
+      dataSource: { 
+        SendType: Object.values(this.GET_GLOBAL('dataDictionary').FileSendType).map(t => ({ value: t.value, text: t.text })), 
+        ReadFlag: [], 
+      }, 
+  
+      // 时间查询参数 
+      dateRange: null, 
+  
+      // 页面相关参数 
+      ready: false, 
+      tips: '加载中...', 
+      loadState: '向下翻以加载更多', 
+      sideOpen: false, 
+  
+      // 列表与分页信息 
+      page: 1, 
+      total: 2, 
+      list: [] 
+    } 
+  }, 
+  
+  async onLoad() { 
+    await this.init() 
+  }, 
+  onUnload() { 
+    this.OFF('EducationalAdministrationSys_ReceiveFile-list-change') 
+  }, 
+  
+  methods: { 
+    // 页面初始化 
+    async init() { 
+      this.ON('EducationalAdministrationSys_ReceiveFile-list-change', this.refreshList) 
+  
+      // 拉取加载列表和数据源 
+      await Promise.all([ 
+  
+  
+        () => {} 
+      ]) 
+      await this.fetchList() 
+      // 初始化查询条件 
+      this.defaultQueryData = this.COPY(this.queryData) 
+      this.ready = true
+    }, 
+  
+    // 拉取列表 
+    async fetchList() { 
+      if (this.page > this.total) { return } 
+this.searchData.ReceiverId=this.GET_GLOBAL('loginUser').userId;
+      const result = await this.HTTP_GET( 
+        '/EducationalAdministration/Sys_ReceiveFile/pagelist', 
+        { 
+          // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) 
+          // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 
+          pagination: { rows: 10, page: this.page, sidx: 'RFileId', sord: 'DESC' }, 
+          queryJson: JSON.stringify(this.searchData) 
+        }, 
+        '加载数据时出错'
+      ) 
+  
+      if (!result) { return } 
+  
+      this.total = result.total 
+      this.page = result.page + 1 
+      this.list = this.list.concat(result.rows) 
+  
+      this.tips = `已加载 ${Math.min(result.page, result.total)} / ${result.total} 页，共 ${result.records} 项` 
+      this.loadState = result.page >= result.total ? '已加载所有项目' : '向下翻以加载更多'
+    }, 
+  
+    // 刷新清空列表 
+    async refreshList() { 
+      this.page = 1 
+      this.total = 2 
+      this.list = [] 
+  
+      await this.fetchList() 
+    }, 
+  
+    // 列表下拉 
+    pullDown() { 
+      this.refreshList().then(() => { 
+        this.$refs.list.stopPullDown() 
+      }) 
+    }, 
+  
+    // 设置搜索条件 
+    async searchChange() { 
+      const result = {} 
+  
+      // 时间查询相关参数 
+      if (this.dateRange) { 
+        result.StartTime = this.dateRange.start 
+        result.EndTime = this.dateRange.end 
+      } 
+  
+      // 将其他查询项添加到查询 JSON 中 
+      const queryObj = pickBy(this.queryData, t => (Array.isArray(t) ? t.length > 0 : t)) 
+      Object.assign(result, mapValues(queryObj, t => (Array.isArray(t) ? t.join(',') : t))) 
+  
+      this.searchData = result 
+      await this.refreshList() 
+    }, 
+  
+    // 点击「清空查询条件」按钮 
+    reset() { 
+      this.$refs.datefilter.changeDateRange('all') 
+      this.queryData = this.COPY(this.defaultQueryData) 
+      this.searchChange() 
+    }, 
+  
+    // 点击「编辑」、「查看」、「添加」、「删除」按钮 
+    async action(type, id = '') { 
+      switch (type) { 
+        case 'view': 
+          this.NAV_TO(`./single?type=view&id=${id}`) 
+          return
+  
+        case 'add': 
+          this.NAV_TO('./single?type=create') 
+          return
+  
+        case 'edit': 
+          this.NAV_TO(`./single?type=edit&id=${id}`) 
+          return
+  
+        case 'delete': 
+          if (!(await this.CONFIRM('删除项目', '确定要删除该项吗？', true))) { 
+            return
+          } 
+  
+          this.HTTP_POST('/EducationalAdministration/Sys_ReceiveFile/delete', id, '删除失败').then(success => { 
+            if(!success) { return } 
+            this.TOAST('删除成功', 'success') 
+            this.refreshList() 
+          }) 
+          return
+  
+        default: 
+          return
+      } 
+    }, 
+  
+    // 显示列表中的标题项 
+    displayListItem(item, field) { 
+      const fieldItem = this.scheme[field] 
+      const value = item[field] 
+  
+      switch (fieldItem.type) { 
+        case 'currentInfo': 
+        case 'organize': 
+          return fieldItem.dataType === 'time' ? value : get(this.GET_GLOBAL(fieldItem.dataType), `${value}.name`, '') 
+  
+        case 'radio': 
+        case 'select': 
+          const selectItem = this.dataSource[field].find(t => t.value === String(value)) 
+          return get(selectItem, 'text', '') 
+  
+        case 'checkbox': 
+          if (!value || value.split(',').length <= 0) { return '' } 
+          const checkboxItems = value.split(',') 
+          return this.dataSource[field].filter(t => checkboxItems.includes(t.value)).map(t => t.text).join('，') 
+  
+        case 'datetime': 
+          if (!value) { return '' } 
+          return moment(value).format(Number(fieldItem.dateformat) === 0 ? 'YYYY年 M月 D日' : 'YYYY-MM-DD HH:mm') 
+  
+        default: return value === null || value === undefined ? '' : value 
+      } 
+    },
+showStatus(item){
+    console.log(item);
+    if(item.SendStatus==true){
+        return "已查阅";
+    }else{
+        return "未查阅"
+    }
+}
+  
+  } 
+} 
+</script> 
+  
+  
+<style lang="less" scoped> 
+@import '~@/common/css/sidepage.less'; 
+@import '~@/common/css/customlist.less'; 
+</style> 
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Sys_ReceiveFile/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Sys_ReceiveFile/single.vue
new file mode 100644
index 000000000..5a2d04044
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Sys_ReceiveFile/single.vue	
@@ -0,0 +1,199 @@
+<template>
+    <view class="page">
+        <view v-if="ready">
+            <l-input
+        @input="setValue('Sys_ReceiveFile.Sender', $event)"
+        :value="getValue('Sys_ReceiveFile.Sender')"
+        :disabled="!edit"
+        title="发送人"
+      />
+            <l-input
+        @input="setValue('Sys_ReceiveFile.Title', $event)"
+        :value="getValue('Sys_ReceiveFile.Title')"
+        :disabled="!edit"
+        title="主题"
+      />
+            <l-date-picker
+        @input="setValue('Sys_ReceiveFile.SendTime', $event)"
+        :value="getValue('Sys_ReceiveFile.SendTime')"
+        :disabled="!edit"
+        title="发送时间"
+      />
+            <l-select
+        @input="setValue('Sys_ReceiveFile.SendType', $event)"
+        :value="getValue('Sys_ReceiveFile.SendType')"
+        :disabled="!edit"
+        :range="dataSource.Sys_ReceiveFile.SendType"
+        title="接收对象"
+      />
+            <l-textarea
+        @input="setValue('Sys_ReceiveFile.Contents', $event)"
+        :value="getValue('Sys_ReceiveFile.Contents')"
+        :disabled="!edit"
+        readonly="readonly"
+        :range="dataSource.Sys_ReceiveFile.Contents"
+        title="内容"
+      />
+          </view
+    >
+      </view
+  >
+</template> 
+  
+  
+<script>
+/*
+ * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 上海力软信息技术有限公司
+ * 创建人：超级管理员
+ * 日  期：2020-10-19 09:24
+ * 描  述：公文查看
+ */
+/**
+ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用
+ * 请在移动端 /pages.json 中的 pages 字段中添加一条记录：
+ * { "path": "pages/EducationalAdministration/Sys_ReceiveFile/single", "style": { "navigationBarTitleText": "表单详情页" } }
+ *
+ * （navigationBarTitleText 字段为本页面的标题文本，可以修改）
+ * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件）
+ */
+import get from "lodash/get";
+import set from "lodash/set";
+import moment from "moment";
+import customPageMixins from "@/common/custompage.js";
+export default {
+  mixins: [customPageMixins],
+  data() {
+    return {
+      // 页面相关参数
+      id: null,
+      mode: null,
+      edit: null,
+      ready: false, // 表单数据
+      current: {},
+      origin: {}, // 表单项数据结构
+      scheme: {
+        Sys_ReceiveFile: {
+          Sender: { type: "text", title: "发送人" },
+          Title: { type: "text", title: "主题" },
+          SendTime: { type: "datetime", title: "发送时间", dateformat: "0" },
+          SendType: {
+            type: "select",
+            title: "接收对象",
+            itemCode: "FileSendType",
+            dataSource: "0",
+          },
+          Contents: { type: "textarea", title: "内容" },
+          ReadFlag: { type: "select", title: "状态", dataSource: "0" },
+          ReadTime: { type: "datetime", title: "查阅时间", dateformat: "0" },
+        },
+      }, // 数据源
+      dataSource: {
+        Sys_ReceiveFile: {
+          SendType: Object.values(
+            this.GET_GLOBAL("dataDictionary").FileSendType
+          ).map((t) => ({ value: t.value, text: t.text })),
+          ReadFlag: [],
+        },
+      },
+    };
+  },
+  async onLoad({ type, id }) {
+    await this.init(type, id);
+  },
+  methods: {
+    // 页面初始化
+    async init(type, id) {
+      this.LOADING("加载数据中...");
+      this.id = id;
+      this.mode = type;
+      this.edit = ["create", "edit"].includes(this.mode); // 拉取表单数据，同时拉取所有来自数据源的选单数据
+      await Promise.all([() => {}]);
+      await this.fetchForm();
+      this.ready = true;
+      this.HIDE_LOADING();
+    }, // 加载表单数据
+    async fetchForm() {
+      if (this.mode === "create") {
+        this.origin = await this.getDefaultForm();
+      } else {
+        const result = await this.HTTP_GET(
+          "/EducationalAdministration/Sys_ReceiveFile/form",
+          this.id
+        );
+        this.origin = await this.formatFormData(result);
+      }
+      this.current = this.COPY(this.origin);
+    }, // 点击 「编辑」、「重置」、「保存」、「删除」 按钮
+    async action(type) {
+      switch (type) {
+        case "edit":
+          this.edit = true;
+          break;
+        case "reset":
+          this.current = this.COPY(this.origin);
+          this.edit = false;
+          break;
+        case "save":
+          const verifyResult = this.verifyForm();
+          if (verifyResult.length > 0) {
+            this.CONFIRM("表单验证失败", verifyResult.join("\n"));
+            return;
+          }
+          if (
+            !(await this.CONFIRM(
+              "提交确认",
+              "确定要提交本页表单内容吗？",
+              true
+            ))
+          ) {
+            return;
+          }
+          this.LOADING("正在提交...");
+          const postData = await this.getPostData(this.id);
+          this.HTTP_POST(
+            "/EducationalAdministration/Sys_ReceiveFile/save",
+            postData,
+            "表单提交保存失败"
+          ).then((success) => {
+            this.HIDE_LOADING();
+            if (!success) {
+              return;
+            }
+            this.EMIT("EducationalAdministrationSys_ReceiveFile-list-change");
+            this.NAV_BACK();
+            this.TOAST("提交保存成功");
+          });
+          break;
+        case "delete":
+          if (!(await this.CONFIRM("删除项目", "确定要删除本项吗？", true))) {
+            return;
+          }
+          this.LOADING("提交删除中...");
+          this.HTTP_POST(
+            "/EducationalAdministration/Sys_ReceiveFile/delete",
+            this.id,
+            "删除失败"
+          ).then((success) => {
+            this.HIDE_LOADING();
+            if (!success) {
+              return;
+            }
+            this.EMIT("EducationalAdministrationSys_ReceiveFile-list-change");
+            this.NAV_BACK();
+            this.this.TOAST("删除成功", "success");
+          });
+          break;
+        default:
+          break;
+      }
+    }, // 获取表单值
+    getValue(path) {
+      return get(this.current, path);
+    }, // 设置表单值
+    setValue(path, val) {
+      set(this.current, path, val);
+    },
+  },
+};
+</script> 
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/login.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/login.vue
index 9996e26e2..0f4a0e6c3 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/login.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/login.vue	
@@ -151,6 +151,7 @@ export default {
       }
 
       if (!loginResult) {
+        this.TOAST(loginResult);
         return
       }