From 270c55eaa1476ffc930b80e3927660d5d6eae2a6 Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Thu, 20 Oct 2022 10:21:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8A=20?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E9=80=9A=E7=9F=A5=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=9D=A5=E6=BA=90=E6=94=B9=E4=B8=BA=E9=83=A8=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Areas/LR_OAModule/Views/Notice/FormFlow.cshtml |  3 ++-
 .../Areas/LR_OAModule/Views/Notice/FormFlow.js     |  1 +
 .../LR_OAModule/Views/Notice/FormFlowView.cshtml   |  5 +++--
 .../Areas/LR_OAModule/Views/Notice/FormFlowView.js |  1 +
 .../Areas/LR_OAModule/Views/Notice/IndexFlow.js    | 14 +++++++++++++-
 5 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.cshtml
index b9fd499af..e9a3da405 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.cshtml	
@@ -23,7 +23,8 @@
     </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_SourceName" type="text" isvalid="yes" checkexpession="NotNull" class="form-control" />
+        @*<input id="F_SourceName" type="text" isvalid="yes" checkexpession="NotNull" class="form-control" />*@
+        <div id="F_SourceName" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="OANews">
         <div class="lr-form-item-title">来源地址</div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.js
index 157c9d654..2cd5c1ec5 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlow.js	
@@ -42,6 +42,7 @@ var bootstrap = function ($, learun) {
                     }
                 }
             });
+            $('#F_SourceName').lrDepartmentSelect();
             $('#F_NewsImage').lrUploader({ extensions:'gif,jpeg,jpg,png,bmp'});
             $('#F_IsSendFX').lrDataItemSelect({ code: 'YesOrNoBit' });
             $('#F_SendDeptId').lrDepartmentSelect({ type: 'treemultiple' });
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.cshtml
index a7961a014..cd196c351 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.cshtml	
@@ -22,8 +22,9 @@
         <input id="F_ReleaseTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy/MM/dd HH:mm' })" isvalid="yes" readonly="readonly" checkexpession="NotNull" value="@Learun.Util.Time.GetToday("yyyy/MM/dd HH:mm")" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="OANews">
-        <div class="lr-form-item-title">信息来源</div>
-        <input id="F_SourceName" readonly="readonly" type="text" class="form-control" />
+        <div class="lr-form-item-title">信息来源<font face="宋体">*</font></div>
+        @*<input id="F_SourceName" type="text" isvalid="yes" checkexpession="NotNull" class="form-control" />*@
+        <div id="F_SourceName" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="OANews">
         <div class="lr-form-item-title">来源地址</div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.js
index d4260d011..8f56b24e4 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/FormFlowView.js	
@@ -41,6 +41,7 @@ var bootstrap = function ($, learun) {
                     }
                 }
             });
+            $('#F_SourceName').lrDepartmentSelect();
             $('#F_NewsImage').lrUploader();
             $('#F_IsSendFX').lrDataItemSelect({ code: 'YesOrNoBit' });
             $('#F_SendDeptId').lrDepartmentSelect({ type: 'treemultiple' });
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexFlow.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexFlow.js
index aadb445bc..9bc0618e2 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexFlow.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OAModule/Views/Notice/IndexFlow.js	
@@ -172,7 +172,19 @@ var bootstrap = function ($, learun) {
                             return learun.formatDate(cellvalue, 'yyyy-MM-dd hh:mm');
                         }
                     },
-                    { label: '信息来源', name: 'F_SourceName', index: 'F_SourceName', width: 100, align: 'center' },
+                    {
+                        label: '信息来源', name: 'F_SourceName', index: 'F_SourceName', width: 100, align: 'center',
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
+                                key: value,
+                                keyId: 'id',
+                                callback: function (_data) {
+                                    callback(_data['name'] || value);
+                                }
+                            });
+                        }
+                    },
                     { label: '阅读次数', name: 'F_PV', index: 'F_PV', width: 80, align: 'center' },
                     {
                         label: "审核状态", name: "F_Status", width: 100, align: "left",