Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicController.cs

@@ -497,9 +497,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [HttpPost]
         [AjaxOnly]
 
-        public ActionResult IsFileTransfer(string keyValue, string status)
+        public ActionResult IsFileTransfer(string keyValue, string status,string fort)
         {
-            stuInfoBasicIBLL.IsFileTransfer(keyValue, status);
+            stuInfoBasicIBLL.IsFileTransfer(keyValue, status, fort);
             return Success("操作成功");
         }
         /// <summary>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Graduate.js

@@ -39,7 +39,7 @@ var bootstrap = function ($, learun) {
             });
             $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
             $('#FinishSchoolMark').lrselect({
-                data: [{ text: "已毕业", value: "2" },{ text: "准许毕业", value: "1" }, { text: "待准许", value: "0" }],
+                data: [{ text: "已毕业", value: "2" }, { text: "准许毕业", value: "1" }, { text: "待准许", value: "0" }],
                 text: "text",
                 value: "value"
             })
@@ -47,12 +47,12 @@ var bootstrap = function ($, learun) {
             $('#lr_refresh').on('click', function () {
                 location.reload();
             });
-            
+
             //归档
             $('#lr_store').on('click', function () {
                 learun.layerConfirm('1.毕业生归档必须在6-8月份进行； <br>  2.归档后的学生信息如：操行、奖惩、成绩、毕业证书等只有通过毕业生信息管理才能查询或打印；<br> 3.毕业学生的账户将自动取消；<br> 4.学生所占的床位也将自动退掉；<br> 5.学生所在的班级置为已毕业班级；<br> 6.归档操作后不可撤消，请谨慎操作！', function (res) {
                     if (res) {
-                        learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/StuStore', { }, function () {
+                        learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/StuStore', {}, function () {
                             refreshGirdData();
                         });
                     }
@@ -176,11 +176,19 @@ var bootstrap = function ($, learun) {
                     },
                     { label: "毕业证领取时间", name: "DiplomaReceiveDate", width: 130, align: "left" },
                     {
-                        label: "档案与组织关系转出状态", name: "FileTransferStatus", width: 150, align: "left", formatter: function (cellvalue) {
+                        label: "档案转出状态", name: "FileTransferStatus", width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == "1" ? "已转出" : "未转出"
+                        }
+                    },
+                    { label: "档案转出时间", name: "FileTransferDate", width: 130, align: "left" },
+                    {
+                        label: "组织关系转出状态", name: "TissueStatus", width: 110, align: "left",
+                        formatter: function (cellvalue) {
                             return cellvalue == "1" ? "已转出" : "未转出"
                         }
                     },
-                    { label: "档案与组织关系转出时间", name: "FileTransferDate", width: 150, align: "left" },
+                    { label: "组织关系转出时间", name: "TissueDate", width: 130, align: "left" }
                 ],
                 mainId: 'StuId',
                 isPage: true,

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFileTransfer.cshtml

@@ -49,8 +49,10 @@
                         <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_filetransfer" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;档案与组织关系转出</a>
-                        <a id="lr_cancelfiletransfer" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;取消档案与组织关系转出</a>
+                        <a id="lr_filetransfer" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;档案关系转出</a>
+                        <a id="lr_cancelfiletransfer" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;取消档案关系转出</a>
+                        <a id="lr_Tissue" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;组织关系转出</a>
+                        <a id="lr_cancelTissue" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;取消组织关系转出</a>
                     </div>
                 </div>
             </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFileTransfer.js

@@ -47,7 +47,7 @@ var bootstrap = function ($, learun) {
             $('#lr_refresh').on('click', function () {
                 location.reload();
             });
-            //档案与组织关系转出
+            //档案关系转出
             $('#lr_filetransfer').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('StuId');
                 var FileTransferStatus = $('#gridtable').jfGridValue('FileTransferStatus');
@@ -55,16 +55,16 @@ var bootstrap = function ($, learun) {
                     if (FileTransferStatus.indexOf('1') != -1) {
                         return learun.alert.warning("选中项包括已转出数据！");
                     }
-                    learun.layerConfirm('是否确认转出档案与组织关系！', function (res) {
+                    learun.layerConfirm('是否确认转出档案关系！', function (res) {
                         if (res) {
-                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsFileTransfer', { keyValue: keyValue, status: '1' }, function () {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsFileTransfer', { keyValue: keyValue, status: '1', fort: '0' }, function () {
                                 refreshGirdData();
                             });
                         }
                     });
                 }
             })
-            //取消档案与组织关系转出
+            //取消档案关系转出
             $('#lr_cancelfiletransfer').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('StuId');
                 var FileTransferStatus = $('#gridtable').jfGridValue('FileTransferStatus');
@@ -74,9 +74,45 @@ var bootstrap = function ($, learun) {
                             return learun.alert.warning("选中项包括未转出数据！");
                         }
                     }
-                    learun.layerConfirm('是否确认取消转出档案与组织关系！', function (res) {
+                    learun.layerConfirm('是否确认取消转出档案关系！', function (res) {
                         if (res) {
-                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsFileTransfer', { keyValue: keyValue, status: '0' }, function () {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsFileTransfer', { keyValue: keyValue, status: '0', fort: '0' }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            })
+            //组织关系转出
+            $('#lr_Tissue').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('StuId');
+                var FileTransferStatus = $('#gridtable').jfGridValue('TissueStatus');
+                if (learun.checkrow(keyValue)) {
+                    if (FileTransferStatus.indexOf('1') != -1) {
+                        return learun.alert.warning("选中项包括已转出数据！");
+                    }
+                    learun.layerConfirm('是否确认转出组织关系！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsFileTransfer', { keyValue: keyValue, status: '1', fort: '1' }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            })
+            //取消组织关系转出
+            $('#lr_cancelTissue').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('StuId');
+                var FileTransferStatus = $('#gridtable').jfGridValue('TissueStatus');
+                if (learun.checkrow(keyValue)) {
+                    for (var i = 0; i < FileTransferStatus.split(',').length; i++) {
+                        if (FileTransferStatus.split(',')[i] != 1) {
+                            return learun.alert.warning("选中项包括未转出数据！");
+                        }
+                    }
+                    learun.layerConfirm('是否确认取消转出组织关系！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsFileTransfer', { keyValue: keyValue, status: '0', fort: '1' }, function () {
                                 refreshGirdData();
                             });
                         }
@@ -165,11 +201,19 @@ var bootstrap = function ($, learun) {
                     },
                     { label: "毕业时间", name: "FinishSchoolDate", width: 130, align: "left" },
                     {
-                        label: "档案与组织关系转出状态", name: "FileTransferStatus", width: 150, align: "left", formatter: function (cellvalue) {
+                        label: "档案转出状态", name: "FileTransferStatus", width: 100, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == "1" ? "已转出" : "未转出"
+                        }
+                    },
+                    { label: "档案转出时间", name: "FileTransferDate", width: 130, align: "left" },
+                    {
+                        label: "组织关系转出状态", name: "TissueStatus", width: 110, align: "left",
+                        formatter: function (cellvalue) {
                             return cellvalue == "1" ? "已转出" : "未转出"
                         }
                     },
-                    { label: "档案与组织关系转出时间", name: "FileTransferDate", width: 100, align: "left" },
+                    { label: "组织关系转出时间", name: "TissueDate", width: 130, align: "left" },
                 ],
                 mainId: 'StuId',
                 isPage: true,

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.cshtml

@@ -19,7 +19,7 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="OANews">
         <div class="lr-form-item-title">发布时间<font face="宋体">*</font></div>
-        <input id="F_ReleaseTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy/MM/dd HH:mm' })" isvalid="yes" checkexpession="NotNull" value="@Learun.Util.Time.GetToday("yyyy/MM/dd HH:mm")" />
+        <input id="F_ReleaseTime" type="text" class="form-control lr-input-wdatepicker" isvalid="yes" checkexpession="NotNull" data-dateFmt="yyyy-MM-dd HH:mm:ss" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',onpicked: function () { $('#F_ReleaseTime').trigger('change'); } })" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="OANews">
         <div class="lr-form-item-title">信息来源<font face="宋体">*</font></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Views/DatabaseLink/Form.js

@@ -16,7 +16,10 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            $('#F_DbType').lrDataItemSelect({ code: 'DbVersion' });
+            $('#F_DbType').lrselect({
+                value: 'F_ItemValue',
+                text: 'F_ItemName',
+                url: top.$.rootUrl + '/LR_SystemModule/DataItem/GetDetailList?itemCode=DbVersion' });
 
             $('#lr_test').on('click', function () {
                 var dbType = $('#F_DbType').lrselectGet();

Learun.Framework.Ultimate V7/Learun.Application.Web/Content/ueditor/ueditor.all.js

@@ -19831,7 +19831,13 @@ UE.plugins['video'] = function (){
             utils.each(domUtils.getElementsByTagName(table,'td'),function(td){
                 td.style.borderWidth = '1px';
                 td.style.borderStyle = 'solid';
-            })
+            });
+            //增加下面一段  
+            utils.each(domUtils.getElementsByTagName(table, 'th'), function (th) {
+                th.style.borderWidth = domUtils.getComputedStyle(th, "border-width");
+                th.style.borderStyle = 'solid';
+                th.style.borderColor = 'windowtext';
+            });
         }
     };
     function resetTdWidth(table, editor) {
@@ -19990,9 +19996,9 @@ UE.plugins['table'] = function () {
                 'table.noBorderTable td,table.noBorderTable th,table.noBorderTable caption{border:1px dashed #ddd !important}' +
                 //插入的表格的默认样式
                 'table{margin-bottom:10px;border-collapse:collapse;display:table;}' +
-                'td,th{padding: 5px 10px;border: 1px solid #DDD;}' +
+                'td,th{padding: 5px 10px;border: 1px dashed #DDD;}' +
                 'caption{border:1px dashed #DDD;border-bottom:0;padding:3px;text-align:center;}' +
-                'th{border-top:1px solid #BBB;background-color:#F7F7F7;}' +
+                'th{border-top:1px dashed #BBB;background-color:#F7F7F7;}' +
                 'table tr.firstRow th{border-top-width:2px;}' +
                 '.ue-table-interlace-color-single{ background-color: #fcfcfc; } .ue-table-interlace-color-double{ background-color: #f7faff; }' +
                 'td p{margin:0;padding:0;}', me.document);
@@ -20240,7 +20246,7 @@ UE.plugins['table'] = function () {
                 } else {
                     utils.each(tables, function (table) {
                         removeStyleSize(table, true);
-                        domUtils.removeAttributes(table, ['style', 'border']);
+                        domUtils.removeAttributes(table, ['style']);
                         utils.each(domUtils.getElementsByTagName(table, "td"), function (td) {
                             if (isEmptyBlock(td)) {
                                 domUtils.fillNode(me.document, td);

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Shared/_Form.cshtml

@@ -35,7 +35,8 @@
     @*<script src="~/Content/datepicker/WdatePicker.js"></script>*@
     <script src="~/Content/ueditor/ueditor.config.js"></script>
     <script src="~/Content/jquery/plugin/jqprint/jQuery.print.js"></script>
-    <script src="~/Content/ueditor/ueditor.all.min.js"></script>
+    @*<script src="~/Content/ueditor/ueditor.all.min.js"></script>*@
+    <script src="~/Content/ueditor/ueditor.all.js"></script>
     <script src="~/Content/ueditor/lang/zh-cn/zh-cn.js"></script>
 
     <!--[if lt IE 9]>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicBLL.cs

@@ -91,11 +91,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// 根据专业顺序生成毕业证号
         /// <summary>
         /// <returns></returns>
-        public void CreateGraduateNoByMajor(string CityCode,string SchoolCode,string MajorList)
+        public void CreateGraduateNoByMajor(string CityCode, string SchoolCode, string MajorList)
         {
             try
             {
-                 stuInfoBasicService.CreateGraduateNoByMajor(CityCode,SchoolCode,MajorList);
+                stuInfoBasicService.CreateGraduateNoByMajor(CityCode, SchoolCode, MajorList);
             }
             catch (Exception ex)
             {
@@ -247,8 +247,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
-     
-      
+
+
 
         #endregion
 
@@ -398,11 +398,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="keyValue">主键</param>
         /// <summary>
         /// <returns></returns>
-        public void GetCard(string keyValue,string status)
+        public void GetCard(string keyValue, string status)
         {
             try
             {
-                stuInfoBasicService.GetCard(keyValue,status);
+                stuInfoBasicService.GetCard(keyValue, status);
             }
             catch (Exception ex)
             {
@@ -536,11 +536,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="keyValue">主键</param>
         /// <summary>
         /// <returns></returns>
-        public void IsFileTransfer(string keyValue, string status)
+        public void IsFileTransfer(string keyValue, string status, string fort)
         {
             try
             {
-                stuInfoBasicService.IsFileTransfer(keyValue, status);
+                stuInfoBasicService.IsFileTransfer(keyValue, status, fort);
             }
             catch (Exception ex)
             {
@@ -602,11 +602,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <summary>
         /// 准许毕业
         /// </summary>
-        public void AllowGraduate(string stuNo,string status)
+        public void AllowGraduate(string stuNo, string status)
         {
             try
             {
-                stuInfoBasicService.AllowGraduate(stuNo,status);
+                stuInfoBasicService.AllowGraduate(stuNo, status);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs

@@ -873,17 +873,29 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("DIPLOMARECEIVEDATE")]
         public DateTime? DiplomaReceiveDate { get; set; }
         /// <summary> 
-        /// 档案与组织关系转出状态 
+        /// 档案关系转出状态 
         /// </summary> 
         /// <returns></returns> 
         [Column("FILETRANSFERSTATUS")]
         public string FileTransferStatus { get; set; }
         /// <summary> 
-        /// 档案与组织关系转出状态时间 
+        /// 档案关系转出状态时间 
         /// </summary> 
         /// <returns></returns> 
         [Column("FILETRANSFERDATE")]
         public DateTime? FileTransferDate { get; set; }
+        /// <summary> 
+        /// 组织关系转出状态 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("TISSUESTATUS")]
+        public string TissueStatus { get; set; }
+        /// <summary> 
+        /// 组织关系转出状态时间 
+        /// </summary> 
+        /// <returns></returns> 
+        [Column("TISSUEDATE")]
+        public DateTime? TissueDate { get; set; }
         #endregion
 
         #region  扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicIBLL.cs

@@ -90,7 +90,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// 档案与组织关系转出
         /// </summary>
         /// <param name="keyValue"></param>
-        void IsFileTransfer(string keyValue, string status);
+        void IsFileTransfer(string keyValue, string status,string fort);
         void StuStore();
 
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs

@@ -569,7 +569,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             this.BaseRepository().Insert(annexEntity);
                         }
                     }
-                    
+
                 }
             }
             catch (Exception ex)
@@ -948,7 +948,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="keyValue">主键</param>
         /// <summary>
         /// <returns></returns>
-        public void IsFileTransfer(string keyValue, string status)
+        public void IsFileTransfer(string keyValue, string status, string fort)
         {
             var db = this.BaseRepository("CollegeMIS").BeginTrans();
             try
@@ -959,12 +959,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     var keyValueArr = keyValue.Split(',');
                     foreach (var item in keyValueArr)
                     {
-                        var sql = $"UPDATE StuInfoBasic SET FileTransferStatus='{status}',FileTransferDate='{now}' WHERE StuId='{item}'";
-                        db.ExecuteBySql(sql);
+                        if (fort == "0")
+                        {
+                            //档案
+                            var sql = $"UPDATE StuInfoBasic SET FileTransferStatus='{status}',FileTransferDate='{now}' WHERE StuId='{item}'";
+                            db.ExecuteBySql(sql);
 
-                        //判断离校手续是否全办完 且 毕业状态为准许毕业，若同时满足则修改毕业状态为已毕业和毕业时间；
-                        var sql2 = $"update StuInfoBasic set FinishSchoolMark='2',FinishSchoolDate='{now}' where StuId='{item}' and FinishSchoolMark='1' and ReturnBooksStatus='1' and EmployAgreeStatus='1' and FeeSettleStatus='1' and CheckOutStatus='1' and CardDeregistrateStatus='1' and DiplomaReceiveStatus='1' ";
-                        db.ExecuteBySql(sql2);
+                            //判断离校手续是否全办完 且 毕业状态为准许毕业，若同时满足则修改毕业状态为已毕业和毕业时间；
+                            var sql2 = $"update StuInfoBasic set FinishSchoolMark='2',FinishSchoolDate='{now}' where StuId='{item}' and FinishSchoolMark='1' and ReturnBooksStatus='1' and EmployAgreeStatus='1' and FeeSettleStatus='1' and CheckOutStatus='1' and CardDeregistrateStatus='1' and DiplomaReceiveStatus='1' and TissueStatus='1'";
+                            db.ExecuteBySql(sql2);
+                        }
+                        else
+                        {
+                            //组织
+                            var sql1 = $"UPDATE StuInfoBasic SET TissueStatus='{status}',TissueDate='{now}' WHERE StuId='{item}'";
+                            db.ExecuteBySql(sql1);
+
+                            //判断离校手续是否全办完 且 毕业状态为准许毕业，若同时满足则修改毕业状态为已毕业和毕业时间；
+                            var sql2 = $"update StuInfoBasic set FinishSchoolMark='2',FinishSchoolDate='{now}' where StuId='{item}' and FinishSchoolMark='1' and ReturnBooksStatus='1' and EmployAgreeStatus='1' and FeeSettleStatus='1' and CheckOutStatus='1' and CardDeregistrateStatus='1' and DiplomaReceiveStatus='1'  and FileTransferStatus= '1'";
+                            db.ExecuteBySql(sql2);
+                        }
+
+                        ////判断离校手续是否全办完 且 毕业状态为准许毕业，若同时满足则修改毕业状态为已毕业和毕业时间；
+                        //var sql2 = $"update StuInfoBasic set FinishSchoolMark='2',FinishSchoolDate='{now}' where StuId='{item}' and FinishSchoolMark='1' and ReturnBooksStatus='1' and EmployAgreeStatus='1' and FeeSettleStatus='1' and CheckOutStatus='1' and CardDeregistrateStatus='1' and DiplomaReceiveStatus='1' ";
+                        //db.ExecuteBySql(sql2);
                     }
                 }
                 else
@@ -973,8 +991,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     var keyValueArr = keyValue.Split(',');
                     foreach (var item in keyValueArr)
                     {
-                        var sql = $"UPDATE StuInfoBasic SET FileTransferStatus='{status}',FileTransferDate=null WHERE StuId='{item}'";
-                        db.ExecuteBySql(sql);
+                        if (fort == "0")
+                        {
+                            var sql = $"UPDATE StuInfoBasic SET FileTransferStatus='{status}',FileTransferDate=null WHERE StuId='{item}'";
+                            db.ExecuteBySql(sql);
+                        }
+                        else
+                        {
+                            var sql1 = $"UPDATE StuInfoBasic SET TissueStatus='{status}',TissueDate=null WHERE StuId='{item}'";
+                            db.ExecuteBySql(sql1);
+                        }
 
                         //判断毕业状态是否为已毕业，若是，则毕业状态修改为准许毕业，毕业时间为空；
                         var sql2 = $"UPDATE StuInfoBasic SET FinishSchoolMark='1',FinishSchoolDate=null WHERE StuId='{item}' and FinishSchoolMark='2' ";
@@ -1140,8 +1166,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                                 FieldName = columnName,
                                 UpdateBy = loginUser.userId,
                                 UpdateTime = DateTime.Now,
-                                StuChangeType="09",
-                                StuChangeRemark="点击学籍信息管理-修改按钮进行操作"
+                                StuChangeType = "09",
+                                StuChangeRemark = "点击学籍信息管理-修改按钮进行操作"
                             };
                             changeEntity.Create();
                             list.Add(changeEntity);

Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/customform.js

@@ -241,6 +241,7 @@ export default {
 
 						const fileType = fileInfo.F_FileType
 						const fileSize = fileInfo.F_FileSize
+						const fileName = fileInfo.F_FileName
 
 						const path = this.API + '/learun/adms/annexes/wxdown?' + this.URL_QUERY(wxfile.F_Id, true)
 						fileList.push({
@@ -248,7 +249,8 @@ export default {
 							type: fileType,
 							uid:wxfile.F_Id,
 							folderId:wxfile.F_FolderId,
-							size: fileSize
+							size: fileSize,
+							name:fileName
 						})
 					}
 					return fileList

Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/custompage.js

@@ -191,22 +191,38 @@ export default {
           return val ? moment(val).format('YYYY-MM-DD HH:mm') : ''
 
         case 'upload':
-          const uploadUid = []
-          for (const entity of val) {
-            if (entity.uid) {
-              uploadUid.push(entity.uid)
-              continue
-            } else {
-
-              const fileId = await this.HTTP_UPLOAD(entity)
-              if (fileId) {
-                uploadUid.push(fileId)
-              }
-            }
-
-          }
-
-          return uploadUid.join(',')
+          // const uploadUid = []
+          // for (const entity of val) {
+          //   if (entity.uid) {
+          //     uploadUid.push(entity.uid)
+          //     continue
+          //   } else {
+
+          //     const fileId = await this.HTTP_UPLOAD(entity)
+          //     if (fileId) {
+          //       uploadUid.push(fileId)
+          //     }
+          //   }
+
+          // }
+
+          // return uploadUid.join(',')
+		  
+		  var uploadUid = '';
+		  
+		  for (const item of val) {
+		  	if (item.uid) {
+		  		uploadUid = item.uid
+		  		continue
+		  	}
+		  
+		  	const fileId = await this.HTTP_UPLOAD(item.path || item, undefined, guid || '')
+		  	if (fileId) {
+		  		uploadUid = fileId;
+		  	}
+		  }
+		  
+		  return uploadUid;
 
         default:
           return val || ''
@@ -245,21 +261,49 @@ export default {
     async convertToFormValue(scheme, val, dataSource) {
       switch (scheme.type) {
         case 'upload':
-          if (!val) { return [] }
-          const uidList = val.split(',')
-          const fileList = []
-
-          for (const uid of uidList || []) {
-            const fileInfo = await this.FETCH_FILEINFO(uid)
-            if (!fileInfo) { continue }
-
-            const fileType = fileInfo.F_FileType
-            const fileSize = fileInfo.F_FileSize
-
-            const path = this.API + '/learun/adms/annexes/wxdown?' + this.URL_QUERY(uid, true)
-            fileList.push({ path, type: fileType, uid, size: fileSize })
-          }
-          return fileList
+   //        if (!val) { return [] }
+   //        const uidList = val.split(',')
+   //        const fileList = []
+
+   //        for (const uid of uidList || []) {
+   //          const fileInfo = await this.FETCH_FILEINFO(uid)
+   //          if (!fileInfo) { continue }
+
+   //          const fileType = fileInfo.F_FileType
+   //          const fileSize = fileInfo.F_FileSize
+			// const fileName = fileInfo.F_FileName
+
+   //          const path = this.API + '/learun/adms/annexes/wxdown?' + this.URL_QUERY(uid, true)
+   //          fileList.push({ path, type: fileType, uid, size: fileSize, name:fileName })
+   //        }
+   //        return fileList
+		   if (!val) {
+			return []
+		   }
+		   const uidList = val;
+		   const fileList = []
+		   const wxlist = await this.FETCH_FILEList(uidList);
+		   for (const wxfile of wxlist) {
+			const fileInfo = await this.FETCH_FILEINFO(wxfile.F_Id)
+			if (!fileInfo) {
+				continue
+			}
+		   
+			const fileType = fileInfo.F_FileType
+			const fileSize = fileInfo.F_FileSize
+			const fileName = fileInfo.F_FileName
+		   
+			const path = this.API + '/learun/adms/annexes/wxdown?' + this.URL_QUERY(wxfile.F_Id, true)
+			fileList.push({
+				path,
+				type: fileType,
+				uid:wxfile.F_Id,
+				folderId:wxfile.F_FolderId,
+				size: fileSize,
+				name:fileName
+			})
+		   }
+		   return fileList
 
         case 'radio':
         case 'select':

Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js

@@ -237,7 +237,7 @@ export default {
 		
 			return await this.HTTP_GET('learun/adms/annexes/wxlist', folderId)
 		},
-		// 根据文件夹id获取图片列表
+		// 根据文件夹id获取图片列表用于上传组件
 		async getFileListById(folderId){
 			if(!folderId){
 				return []
@@ -251,6 +251,7 @@ export default {
 			
 				const fileType = fileInfo.F_FileType
 				const fileSize = fileInfo.F_FileSize
+				const fileName = fileInfo.F_FileName
 			
 				const path = this.API + '/learun/adms/annexes/wxdown?' + this.URL_QUERY(wxfile.F_Id, true)
 				fileList.push({
@@ -258,7 +259,8 @@ export default {
 					type: fileType,
 					uid:wxfile.F_Id,
 					folderId:wxfile.F_FolderId,
-					size: fileSize
+					size: fileSize,
+					name:fileName
 				})
 			}
 			return fileList

Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/learun-app/upload-file.vue

@@ -9,7 +9,8 @@
 
     <view class="cu-form-group" style="border-top: none;">
       <view class="grid col-4 grid-square flex-sub">
-        <view v-for="(file, index) in value" :key="index" class="bg-img">
+        <view v-for="(file, index) in value" :key="index" class="bg-img" style="position: relative;">
+          <view v-if="file.noUpdated" class="mask"></view>
           <image
             v-if="isImgFile(file.type)"
             @click="fileClick(index)"
@@ -20,11 +21,14 @@
           <view v-else-if="isDocFile(file.type)" @click="fileClick(index)" class="file-icon solids">
             <l-icon type="text" />
           </view>
-          <view v-else class="file-icon solids"><l-icon type="text" /></view>
+          <view v-else class="file-icon solids" @click="fileClick(index)"><l-icon type="text" /></view>
 
           <view v-if="!readonly" @click.stop="delFile(index)" class="cu-tag bg-red" style="height: 24px; width: 24px;">
             <l-icon type="close" color="white" style="width: 18px; height: 24px; font-size: 24px;" />
           </view>
+		  <view class="fileName">
+			  <text>{{file.name}}</text>
+		  </view>
         </view>
 
         <view v-if="!readonly && value.length < Number(number)" @click="chooseFile" class="solids">
@@ -54,8 +58,7 @@ export default {
 
     isImgFile(type) {
       const typeString = (type || '').toLowerCase()
-      //return ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'webp', 'image'].includes(typeString)
-      return true;
+      return ['jpg','image/jpg','jpeg','image/jpeg', 'png', 'image/png','gif', 'image/gif','bmp', 'image/bmp','webp', 'image/webp','image'].includes(typeString)
     },
 
     isDocFile(type) {
@@ -63,7 +66,10 @@ export default {
       return ['doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'pdf'].includes(typeString)
     },
 
-    delFile(index) {
+    async delFile(index) {
+	  if (!(await this.CONFIRM('删除文件', '确定要删除该文件吗？', true))) {
+		return
+	  }
       const newList = JSON.parse(JSON.stringify(this.value))
       newList.splice(index, 1)
       this.$emit('input', newList)
@@ -107,9 +113,10 @@ export default {
 	    count: Number(this.number),
 	    sizeType: ['original', 'compressed'],
 	    sourceType: ['album', 'camera'],
-	    success: ({ tempFilePaths }) => {
+	    success: ({ tempFilePaths,tempFiles }) => {
 	      const newList = JSON.parse(JSON.stringify(this.value || [])).concat(
-	        tempFilePaths//.map(t => ({ path: t, type: this.getFileExt(t) }))
+	        // tempFilePaths//.map(t => ({ path: t, type: this.getFileExt(t) }))
+			tempFilePaths.map((t,i) => ({ path: t, type: tempFiles[i].type, size:tempFiles[i].size, name:tempFiles[i].name, noUpdated:true} ))
 	      )
 	      this.$emit('input', newList)
 	      this.$emit('change', newList)
@@ -120,47 +127,52 @@ export default {
     },
 
     async fileClick(index) {
-	  if(typeof this.value[index] == "string"){
-		  uni.previewImage({ urls: this.value.filter(item=>typeof this.value[index] == "string"), current: this.value[index] })
-		  return
-	  }
+	  // if(typeof this.value[index] == "string"){
+		 //  uni.previewImage({ urls: this.value.filter(item=>typeof this.value[index] == "string"), current: this.value[index] })
+		 //  return
+	  // }
       const { path, type, uid, size = 0 } = this.value[index]
-      if (this.isImgFile(type)) {
-        uni.previewImage({ urls: [path], current: path })
-      } else if (this.isDocFile(type)) {
-        // #ifndef H5 || MP-DINGTALK
-        if (size >= 50 * 1024 * 1024) {
-          this.TOAST('小程序端无法下载超过50MB的文件，此文件大小为${size}KB，超过限制')
-          return
-        }
-        // #endif
-
-        // #ifndef MP-DINGTALK
-        const tempFilePath = await this.HTTP_DOWNLOAD(uid)
-        uni.openDocument({ filePath: tempFilePath, fileType: type })
-        // #endif
-
-        // #ifdef MP-DINGTALK
-        this.TOAST('钉钉小程序只支持查看图片文件')
-        // #endif
-      } else {
-        // #ifndef MP-DINGTALK
-        this.TOAST('小程序端只支持打开图片和文档(word、pdf等)文件')
-        // #endif
-
-        // #ifdef MP-DINGTALK
-        this.TOAST('钉钉小程序只支持查看图片文件')
-        // #endif
-
-        // #ifdef APP-VUE
-        const tempFilePath = await this.HTTP_DOWNLOAD(uid)
-        uni.openDocument({ filePath: tempFilePath, fileType: type })
-        // #endif
-
-        // #ifdef H5
-        await this.HTTP_DOWNLOAD(uid)
-        // #endif
-      }
+	  if (this.isImgFile(type)) {
+	    uni.previewImage({ urls: [path], current: path })
+	  }else{
+		uni.openDocument({ filePath: path, fileType: type })
+	  }
+      // if (this.isImgFile(type)) {
+      //   uni.previewImage({ urls: [path], current: path })
+      // } else if (this.isDocFile(type)) {
+      //   // #ifndef H5 || MP-DINGTALK
+      //   if (size >= 50 * 1024 * 1024) {
+      //     this.TOAST('小程序端无法下载超过50MB的文件，此文件大小为${size}KB，超过限制')
+      //     return
+      //   }
+      //   // #endif
+
+      //   // #ifndef MP-DINGTALK
+      //   const tempFilePath = await this.HTTP_DOWNLOAD(uid)
+      //   uni.openDocument({ filePath: tempFilePath, fileType: type })
+      //   // #endif
+
+      //   // #ifdef MP-DINGTALK
+      //   this.TOAST('钉钉小程序只支持查看图片文件')
+      //   // #endif
+      // } else {
+      //   // #ifndef MP-DINGTALK
+      //   this.TOAST('小程序端只支持打开图片和文档(word、pdf等)文件')
+      //   // #endif
+
+      //   // #ifdef MP-DINGTALK
+      //   this.TOAST('钉钉小程序只支持查看图片文件')
+      //   // #endif
+
+      //   // #ifdef APP-VUE
+      //   const tempFilePath = await this.HTTP_DOWNLOAD(uid)
+      //   uni.openDocument({ filePath: tempFilePath, fileType: type })
+      //   // #endif
+
+      //   // #ifdef H5
+      //   await this.HTTP_DOWNLOAD(uid)
+      //   // #endif
+      // }
     }
   }
 }
@@ -171,4 +183,29 @@ export default {
   line-height: 100%;
   position: static;
 }
+.fileName{
+	padding: 2px 2px;
+	margin-bottom: 2px;
+	text-align: center;
+	position: absolute;
+	bottom: 0px;
+	width: 100%;
+	background: rgba(0,0,0,0.2);
+	color: #fff;
+	font-size: 12px;
+	
+	text-overflow: ellipsis;
+	overflow: hidden;
+	white-space: nowrap;
+}
+.mask{
+	position: absolute;
+	top: 0;left: 0;
+	width: 100%;
+	height: 100%;
+	// background: rgba(255,252,153,0.2);
+	background: rgba(0,0,0,0.7);
+	z-index: 100;
+	pointer-events: none;
+}
 </style>

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/LR_OAModule/noticeExamine.vue

@@ -13,7 +13,7 @@
 	  <l-input v-model="formData.F_SendPostId" title="接受岗位" disabled></l-input>
 	  <l-select v-model="formData.F_IsSendFX" :range="[{value:true,text:'是'},{value:false,text:'否'}]" title="下发飞星" disabled></l-select>
 	  <l-upload-file
-	    :value="[API + '/learun/adms/annexes/wxdown?' + URL_QUERY(formData.F_NewsImage, true)]"
+	    :value="fileList"
 	    :readonly="true"
 	    title="标题图片"
 	  />
@@ -21,10 +21,8 @@
 	    <!-- @input="setValue('MeetingManagement.Files', $event)" -->
 	  <l-input title="公告内容" disabled style="border-bottom: none;"></l-input>
 	  <view class="padding text-lg" style="background-color: #fff;">
-		  <u-parse v-if="ready" :imageProp="{ domain: apiRoot }" :content="content"></u-parse>
-		  <view v-if="ready" v-html="''">
-		  	
-		  </view>
+		  <!-- <u-parse v-if="ready" :imageProp="{ domain: apiRoot }" :content="content"></u-parse> -->
+		  <iframe v-if="ready" style="width: 100%;height: 50vh;" :src="CONFIG('webHost')+'/Utility/ListContentView?keyValue='+formData.F_NewsId" frameborder="0"></iframe>
 	  </view>
 	  <l-workflow-action
 	    @audit="audit"
@@ -63,7 +61,8 @@ export default {
       content: '',
 	  
       time: '',
-      date: ''
+      date: '',
+	  fileList:[],
     }
   },
 
@@ -96,9 +95,13 @@ export default {
     },
 	// 获取表单数据
 	getFormData(ProgressId){
-		return this.HTTP_GET("learun/news/shList",{ProgressId},"加载数据时出错").then(res=>{
+		return this.HTTP_GET("learun/news/shList",{ProgressId},"加载数据时出错").then(async res=>{
 			if(res){
 				this.formData = res
+				let fileList = await this.getFileListById(res.F_NewsImage)
+				if(fileList&&fileList.length){
+					this.fileList = [fileList[0]]
+				}
 				this.content = res.F_NewsContent
 				this.ready = true
 			}

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

@@ -50,7 +50,7 @@
 		  style="position: relative;"
         >
           <l-icon :type="item.icon" color="white" class="text-sl" />
-		  <view v-if="item.F_Name == '我的审批'"  class="CornerMarker">
+		  <view v-if="item.F_Name == '我的审批'&&CornerMarker"  class="CornerMarker">
 		  	{{CornerMarker}}
 		  </view>
         </view>

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/nworkflow/workflow.js

@@ -265,15 +265,15 @@ export default {
 					// 不是表格的情况
 					const path = item.__valuePath__
 					const val = get(formValue, path)
-
+					var guid = undefined
 					if (item.type == 'upload') {
 						// 先生成一个guid
-						var guid = this.newguid();
+						guid = this.newguid();
 						// 取出当前列对应的labelId
 						var labeId = item.id
 						// 从缓存取出当前审批流程所有的guid
 						var guids = JSON.parse(uni.getStorageSync('guids'))
-						if (guids&&JSON.stringify(guids)!=='{}') {
+						if (guids&&JSON.stringify(guids)!=='{}'&&guids[labeId]) {
 							guid = guids[labeId]
 						}
 					}