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

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

@@ -172,6 +172,22 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                 fualityReportMainIBLL.EditProjectByFId(keyValue);
 
             }
+            #region 处理填报日期
+
+            if (entity.FillingCycle == "1")
+            {
+                entity.FillingTime = "";
+            }
+            else if (entity.FillingCycle == "2")
+            {
+                entity.FillingTime = entity.FillingTime2;
+            }
+            else if (entity.FillingCycle == "3")
+            {
+                entity.FillingTime = entity.FillingTime1;
+            } 
+            #endregion
+
             fillinFromIBLL.SaveEntity(keyValue, entity);
             return Success("保存成功！");
         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/FillinFrom/Index.js

@@ -67,7 +67,7 @@ var bootstrap = function ($, learun) {
                 if (learun.checkrow(keyValue)) {
                     var State = $('#gridtable').jfGridValue('State');
                     if (State !== 0) {
-                        learun.alert.warning("当前项目已提交不能修改！");
+                        learun.alert.warning("当前项不能修改！");
                         return;
                     }
                     learun.layerConfirm('是否确认修改该项,修改成后会影响数据！', function (res) {
@@ -195,15 +195,34 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "填报时间", name: "FillingTime", width: 80, align: "center",
+                        label: "填报时间", name: "FillingTime", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
-                                key: value,
-                                code: 'CycleTime',
-                                callback: function (_data) {
-                                    callback(_data.text);
+                            if (value.indexOf(',') != -1) {
+                                var content = '';
+                                var timearr = value.split(',');
+                                for (var i = 0; i < timearr.length; i++) {
+                                    learun.clientdata.getAsync('dataItem',
+                                        {
+                                            key: timearr[i],
+                                            code: 'CycleTime',
+                                            callback: function (_data) {
+                                                content += _data.text + ',';
+
+                                            }
+                                        });
                                 }
-                            });
+                                content = content.substring(0, content.length - 1);
+                                callback(content);
+                            } else {
+                                learun.clientdata.getAsync('dataItem',
+                                    {
+                                        key: value,
+                                        code: 'CycleTime',
+                                        callback: function (_data) {
+                                            callback(_data.text);
+                                        }
+                                    });
+                            }
                         }
                     },
                     {

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-form.js

@@ -548,7 +548,8 @@
             // 是否允许搜索
             allowSearch: true,
             // 访问数据接口地址
-            url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree',
+            //url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree',
+            url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTreeNoCheck',
             // 访问数据接口参数
             param: { companyId: '', parentId: '0' },
         }
@@ -561,7 +562,9 @@
         }
         if (typeof (op.select) == 'function')
             dfop.select = op.select;
-
+        if (dfop.type == "treemultiple") {
+            dfop.url = top.$.rootUrl + '/LR_OrganizationModule/Department/GetTree';
+        }
         return $(this).lrselect(dfop);;
     };
 
@@ -696,7 +699,7 @@
         $this.attr('type', 'lr-' + dfop.type);
         var thisId = $this.attr('id');
 
-        if (op.data!=null) {
+        if (op.data != null) {
             $.each(op.data, function (id, item) {
                 var $point = $('<label><input name="' + thisId + '" value="' + item.value + '"' + ' type="' + dfop.type + '">' + item.text + '</label>');
                 $this.append($point);

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/FillinFrom/FillinFromEntity.cs

@@ -109,6 +109,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         }
         #endregion
         #region 扩展字段
+        /// <summary>
+        /// 填报时间
+        /// </summary>
+        [NotMapped]
+        public string FillingTime1 { get; set; }
+        /// <summary>
+        /// 填报时间
+        /// </summary>
+        [NotMapped]
+        public string FillingTime2 { get; set; }
         #endregion
     }
 }