Merge branch '金隅分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 金隅分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.js

@@ -41,9 +41,9 @@ var bootstrap = function ($, learun) {
             $('#SendType').lrDataItemSelect({ code: 'FileSendType' });
             if (isDesktop != "1") {
                 if (selectedRow.ReadFlag == true) {//已读
-                    $('#Url').lrUploader();
+                    $('#Url').lrUploader({ isView:false});
                 } else {//未读
-                    $('#Url').lrUploader({ RFileId: selectedRow.RFileId });
+                    $('#Url').lrUploader({ RFileId: selectedRow.RFileId, isView:false });
                 }
             } else {
                 $('#Url').lrUploader({ RFileId: keyValue, isView:false });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Permission/Views/DepartmentReleasePermissions/Form.js

@@ -16,8 +16,7 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            console.log(departmentId);
-            $('#UserID').lrselect({ url: top.$.rootUrl + '/LR_OrganizationModule/User/GetListByDepartmentId?departmentId=' + departmentId, value: 'F_UserId', text: 'F_RealName' });
+            $('#UserID').lrUserSelect(0);
             $('#Permission').lrDataItemSelect({ code: 'NoticeCategory', type: 'multiple' });
         },
         initData: function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config

@@ -94,8 +94,8 @@
   <add key="vs:EnableBrowserLink" value="false"/>
   <!--获取高职版跳转地址url -->
   <!--<add key="DigitalschoolMisLoginurl" value="http://192.168.2.126:9000/LoginHandler.ashx"/>-->
-  <!--<add key="DigitalschoolMisLoginurl" value="http://192.168.100.225:9000/LoginHandler.ashx"/>-->
-  <add key="DigitalschoolMisLoginurl" value="http://123.57.209.16:9000/LoginHandler.ashx"/>
+  <add key="DigitalschoolMisLoginurl" value="http://192.168.100.225:9000/LoginHandler.ashx"/>
+  <!--<add key="DigitalschoolMisLoginurl" value="http://123.57.209.16:9000/LoginHandler.ashx"/>-->
   <!--<add key="DigitalschoolMisLoginurl" value="http://112.45.152.8:8082/LoginHandler.ashx"/>-->
   <!-- ================== 默认密码 ================== -->
   <add key="defaultpwd" value="123456" />