From 2c4975a416c218196afc909a1b5df931a9b9b9b3 Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Thu, 1 Jul 2021 09:30:02 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A1=AB=E6=8A=A5=E6=97=B6=E9=97=B4=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LR_Desktop/Views/QualityReport/Index.js   | 30 +++++++++++++++----
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Index.js
index a61959e68..c5e53fbf5 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/QualityReport/Index.js	
@@ -83,13 +83,31 @@ var bootstrap = function ($, learun) {
                     {
                         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);
+                                        }
+                                    });
+                            }
                         }
                     },
                     {

From a99b9b3da6871842f7ac9318c1d5525de37bbc6b Mon Sep 17 00:00:00 2001
From: liangkun <liangkun7173@hotmail.com>
Date: Thu, 1 Jul 2021 09:48:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A0=91=E5=A4=9A=E9=80=89=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/LR_Content/script/lr-form.js                   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-form.js
index 7cfffdd8b..992c57d25 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-form.js	
+++ b/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);