教科研成果

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ResearchResult/Form.cshtml

@@ -19,13 +19,13 @@
         <div class="lr-form-item-title">刊号</div>
         <input id="ISSN" type="text" class="form-control"  />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="ResearchResult" >
+    <div class="col-xs-6 lr-form-item" data-table="ResearchResult">
         <div class="lr-form-item-title">排位</div>
-        <input id="Ranked" type="text" class="form-control"  />
+        <div id="Ranked" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="ResearchResult" >
+    <div class="col-xs-6 lr-form-item" data-table="ResearchResult">
         <div class="lr-form-item-title">活动项目<font face="宋体">*</font></div>
-        <input id="ActivityItem" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <div id="ActivityItem" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="ResearchResult" >
         <div class="lr-form-item-title">成果名称</div>
@@ -35,9 +35,9 @@
         <div class="lr-form-item-title">级别</div>
         <div id="Rank"  ></div>
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="ResearchResult" >
+    <div class="col-xs-6 lr-form-item" data-table="ResearchResult">
         <div class="lr-form-item-title">等级</div>
-        <input id="LV" type="text" class="form-control"  />
+        <div id="LV" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="ResearchResult">
         <div class="lr-form-item-title" style="width: 30%;">领证单位(主管单位)<font face="宋体">*</font></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ResearchResult/Form.js

@@ -25,6 +25,9 @@ var bootstrap = function ($, learun) {
                 text: 'text'
             });
             $('#Month').lrDataItemSelect({ code: 'MPMonth' });
+            $('#LV').lrDataItemSelect({ code: 'LV' });
+            $('#ActivityItem').lrDataItemSelect({ code: 'ActivityItem' });
+            $('#Ranked').lrDataItemSelect({ code: 'Ranked' });
             $('#Url').lrUploader();
         },
         initData: function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ResearchResult/FormCheck.cshtml

@@ -21,11 +21,11 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="ResearchResult">
         <div class="lr-form-item-title">排位</div>
-        <input id="Ranked" type="text" class="form-control" readonly />
+        <div id="Ranked" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="ResearchResult">
         <div class="lr-form-item-title">活动项目</div>
-        <input id="ActivityItem" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
+        <div id="ActivityItem" isvalid="yes" checkexpession="NotNull" readonly></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="ResearchResult">
         <div class="lr-form-item-title">成果名称</div>
@@ -37,7 +37,7 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="ResearchResult">
         <div class="lr-form-item-title">等级</div>
-        <input id="LV" type="text" class="form-control" readonly />
+        <div id="LV" isvalid="yes" checkexpession="NotNull" readonly></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="ResearchResult">
         <div class="lr-form-item-title" style="width: 30%;">领证单位(主管单位)</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ResearchResult/FormCheck.js

@@ -26,6 +26,9 @@ var bootstrap = function ($, learun) {
             });
             $('#Month').lrDataItemSelect({ code: 'MPMonth' });
             $('#Url').lrUploader({ isUpload: false });
+            $('#LV').lrDataItemSelect({ code: 'LV' });
+            $('#ActivityItem').lrDataItemSelect({ code: 'ActivityItem' });
+            $('#Ranked').lrDataItemSelect({ code: 'Ranked' });
             $('#StatusMark').lrselect({
                 data: [{ text: "同意", value: "2" }, { text: "驳回", value: "0" }],
                 text: "text",

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ResearchResult/FormView.cshtml

@@ -21,11 +21,11 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="ResearchResult">
         <div class="lr-form-item-title">排位</div>
-        <input id="Ranked" type="text" class="form-control" readonly />
+        <div id="Ranked" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="ResearchResult">
         <div class="lr-form-item-title">活动项目<font face="宋体">*</font></div>
-        <input id="ActivityItem" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
+        <div id="ActivityItem" isvalid="yes" checkexpession="NotNull" readonly></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="ResearchResult">
         <div class="lr-form-item-title">成果名称</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ResearchResult/FormView.js

@@ -25,6 +25,9 @@ var bootstrap = function ($, learun) {
                 text: 'text'
             });
             $('#Month').lrDataItemSelect({ code: 'MPMonth' });
+            $('#LV').lrDataItemSelect({ code: 'LV' });
+            $('#ActivityItem').lrDataItemSelect({ code: 'ActivityItem' });
+            $('#Ranked').lrDataItemSelect({ code: 'Ranked' });
             $('#Url').lrUploader({ isUpload: false});
         },
         initData: function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ResearchResult/Index.cshtml

@@ -20,7 +20,7 @@
                                 </div>
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">活动项目</div>
-                                    <input id="ActivityItem" type="text" class="form-control" />
+                                    <div id="ActivityItem"></div>
                                 </div>
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">级别</div>
@@ -28,7 +28,7 @@
                                 </div>
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">等级</div>
-                                    <input id="LV" type="text" class="form-control" />
+                                    <div id="LV"></div>
                                 </div>
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">年度</div>
@@ -47,6 +47,7 @@
                         <a id="lr_edit"  class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
                         <a id="lr_print"   class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
+                        <a id="lr_view" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;查看</a>
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
                         <a id="lr_submit"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 提交</a>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ResearchResult/Index.js

@@ -25,6 +25,8 @@ var bootstrap = function ($, learun) {
                 value: 'value',
                 text: 'text'
             });
+            $('#LV').lrDataItemSelect({ code: 'LV' });
+            $('#ActivityItem').lrDataItemSelect({ code: 'ActivityItem' });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -186,8 +188,31 @@ var bootstrap = function ($, learun) {
                     },
                     { label: "刊物名称", name: "PublicationName", width: 100, align: "left" },
                     { label: "刊号", name: "ISSN", width: 100, align: "left" },
-                    { label: "排位", name: "Ranked", width: 100, align: "left" },
-                    { label: "活动项目", name: "ActivityItem", width: 100, align: "left" },
+                    {
+                        label: "排位", name: "Ranked", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'Ranked',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+
+                    {
+                        label: "活动项目", name: "ActivityItem", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'ActivityItem',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
                     { label: "成果名称", name: "OutcomeName", width: 100, align: "left" },
                     {
                         label: "级别", name: "Rank", width: 100, align: "left",
@@ -201,7 +226,18 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "等级", name: "LV", width: 100, align: "left" },
+                    {
+                        label: "等级", name: "LV", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'LV',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                        },
                     { label: "领证单位(主管单位)", name: "CompetentUnit", width: 100, align: "left" },
                     {
                         label: "年度", name: "Year", width: 50, align: "left",

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ResearchResult/ResearchResultService.cs

@@ -49,8 +49,8 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 }
                 if (!queryParam["ActivityItem"].IsEmpty())
                 {
-                    dp.Add("ActivityItem", "%" + queryParam["ActivityItem"].ToString() + "%", DbType.String);
-                    strSql.Append(" AND t.ActivityItem Like @ActivityItem ");
+                    dp.Add("ActivityItem", queryParam["ActivityItem"].ToString(), DbType.String);
+                    strSql.Append(" AND t.ActivityItem = @ActivityItem ");
                 }
                 if (!queryParam["Rank"].IsEmpty())
                 {
@@ -59,8 +59,8 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 }
                 if (!queryParam["LV"].IsEmpty())
                 {
-                    dp.Add("LV", "%" + queryParam["LV"].ToString() + "%", DbType.String);
-                    strSql.Append(" AND t.LV Like @LV ");
+                    dp.Add("LV", queryParam["LV"].ToString(), DbType.String);
+                    strSql.Append(" AND t.LV = @LV ");
                 }
                 if (!queryParam["Year"].IsEmpty())
                 {