通知公告优化

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexFlow.js

@@ -46,7 +46,7 @@ var bootstrap = function ($, learun) {
             }, 220, 400);
             $('#F_CreateUserId').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' });
             $('#F_SourceName').lrDepartmentSelect();
-            $('#F_CategoryId').lrDataItemSelect({ code: 'NoticeCategory' }); 
+            $('#F_CategoryId').lrDataItemSelect({ code: 'NoticeCategory' });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -83,15 +83,15 @@ var bootstrap = function ($, learun) {
                         return false;
                     }
                     var SendFlag = $('#gridtable').jfGridValue('F_Status');
-                    if (SendFlag == "1" || SendFlag == "2") {
-                        var IsSend = $('#gridtable').jfGridValue('IsSend');
-                        console.log(IsSend, "IsSend")
-                        if (IsSend != "0") {
-                            learun.alert.warning("当前项目已提交不能编辑！");
-                            return;
-                        }
-
+                    //if (SendFlag == "1" || SendFlag == "2") {
+                    //var IsSend = $('#gridtable').jfGridValue('IsSend');
+                    //console.log(IsSend, "IsSend")
+                    if (SendFlag != "0") {
+                        learun.alert.warning("当前项目已提交不能编辑！");
+                        return;
                     }
+
+                    //}
                     learun.layerForm({
                         id: 'formedit',
                         title: '编辑公告',
@@ -137,9 +137,8 @@ var bootstrap = function ($, learun) {
             $('#lr_delete').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('F_NewsId');
                 var status = $('#gridtable').jfGridValue('F_Status');
-                console.log(status);
-                if (status.indexOf("1") > 0 || status.indexOf("2") > 0) {
-                    learun.alert.warning("只能删除草稿！");
+                if (status != "0") {
+                    learun.alert.warning("当前项目已提交不能删除！");
                     return;
                 } else {
 

Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js

@@ -22,11 +22,11 @@ export default {
   // ],
   "apiHost": [
     // "http://cyzjzx.gnway.cc:31218/"//测试地址接口
-	// "http://219.139.155.38:8687/"//正式地址接口
-	 "http://192.168.10.58:8012/"
+	"http://219.139.155.38:8687/"//正式地址接口
+	 // "http://192.168.10.58:8012/"
   ],
   "webHost":"http://cyzjzx.gnway.cc:30549/",//测试地址
-  // "webHost":"http://wxd3f.cyzjzx.com/",//正式地址
+  "webHost":"http://wxd3f.cyzjzx.com/",//正式地址
   // "webHost":"http://192.168.10.175:8087/",
   // 开发环境下自动填充登录账号密码，与接口地址一一对应，只在开发环境下显示
   "devAccount": [