教科研成果优化

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

@@ -3,69 +3,69 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
-    <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>
-        <div id="ResearchType" isvalid="yes" checkexpession="NotNull" ></div>
+        <div id="ResearchType" 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>
-        <div id="ProductPerson" isvalid="yes" checkexpession="NotNull" ></div>
+        <input id="ProductPerson" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
     </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="PublicationName" type="text" class="form-control"  />
+        <input id="PublicationName" 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="ISSN" type="text" class="form-control"  />
+        <input id="ISSN" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="ResearchResult">
         <div class="lr-form-item-title">排位</div>
         <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>
+        <div class="lr-form-item-title">所属项目<font face="宋体">*</font></div>
         <div id="ActivityItem" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="ResearchResult" >
+    <div class="col-xs-12 lr-form-item" data-table="ResearchResult">
         <div class="lr-form-item-title">成果名称</div>
-        <textarea id="OutcomeName" class="form-control" style="height:100px;"  ></textarea>
+        <textarea id="OutcomeName" class="form-control" style="height:100px;"></textarea>
     </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>
-        <div id="Rank"  ></div>
+        <div id="Rank"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="ResearchResult">
         <div class="lr-form-item-title">等级</div>
         <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>
-        <input id="CompetentUnit" type="text"style="width: 85%; float: right;" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <div class="lr-form-item-title" style="width: 30%;">发证单位(主管单位)<font face="宋体">*</font></div>
+        <input id="CompetentUnit" type="text" style="width: 85%; float: right;" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </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>
-        <div id="Year" isvalid="yes" checkexpession="NotNull" ></div>
+        <div id="Year" 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>
-        <div id="Month" isvalid="yes" checkexpession="NotNull" ></div>
+        <div id="Month" 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">成果编号</div>
-        <input id="ResultNo" type="text" class="form-control"  />
+        <input id="ResultNo" 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="Points" type="text" class="form-control"  />
+        <input id="Points" type="text" class="form-control" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="ResearchResult" >
+    <div class="col-xs-12 lr-form-item" data-table="ResearchResult">
         <div class="lr-form-item-title">备注</div>
-        <textarea id="Remark" class="form-control" style="height:100px;"  ></textarea>
+        <textarea id="Remark" class="form-control" style="height:100px;"></textarea>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="ResearchResult" >
+    <div class="col-xs-12 lr-form-item" data-table="ResearchResult">
         <div class="lr-form-item-title">附件</div>
-        <div id="Url"  ></div>
+        <div id="Url"></div>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/PersonnelManagement/Views/ResearchResult/Form.js")

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

@@ -16,7 +16,9 @@ var bootstrap = function ($, learun) {
         },
         bind: function () {
             $('#ResearchType').lrDataItemSelect({ code: 'SRAchievementType' });
-            $('#ProductPerson').lrDataSourceSelect({ code: 'TeacherInfo',value: 'f_userid',text: 'f_realname' });
+            //$('#ProductPerson').lrDataSourceSelect({ code: 'TeacherInfo', value: 'f_userid', text: 'f_realname' });
+            $('#ProductPerson')[0].lrvalue = learun.clientdata.get(['userinfo']).userId;
+            $('#ProductPerson').val(learun.clientdata.get(['userinfo']).realName);
             $('#Rank').lrDataItemSelect({ code: 'Level' });
             $('#Year').lrselect({
                 allowSearch: true,

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

@@ -9,7 +9,7 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="ResearchResult">
         <div class="lr-form-item-title">成果人</div>
-        <div id="ProductPerson" isvalid="yes" checkexpession="NotNull" readonly></div>
+        <input id="ProductPerson" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="ResearchResult">
         <div class="lr-form-item-title">刊物名称</div>
@@ -24,7 +24,7 @@
         <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>
+        <div class="lr-form-item-title">所属项目</div>
         <div id="ActivityItem" isvalid="yes" checkexpession="NotNull" readonly></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="ResearchResult">
@@ -40,7 +40,7 @@
         <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>
+        <div class="lr-form-item-title" style="width: 30%;">发证单位(主管单位)</div>
         <input id="CompetentUnit" type="text" style="width: 85%; float: right;" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="ResearchResult">

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

@@ -16,7 +16,8 @@ var bootstrap = function ($, learun) {
         },
         bind: function () {
             $('#ResearchType').lrDataItemSelect({ code: 'SRAchievementType' });
-            $('#ProductPerson').lrDataSourceSelect({ code: 'TeacherInfo', value: 'f_userid', text: 'f_realname' });
+            $('#ProductPerson')[0].lrvalue = learun.clientdata.get(['userinfo']).userId;
+            $('#ProductPerson').val(learun.clientdata.get(['userinfo']).realName);
             $('#Rank').lrDataItemSelect({ code: 'Level' });
             $('#Year').lrselect({
                 allowSearch: true,

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

@@ -9,7 +9,7 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="ResearchResult">
         <div class="lr-form-item-title">成果人<font face="宋体">*</font></div>
-        <div id="ProductPerson" isvalid="yes" checkexpession="NotNull" readonly></div>
+        <input id="ProductPerson" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="ResearchResult">
         <div class="lr-form-item-title">刊物名称</div>
@@ -24,7 +24,7 @@
         <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>
+        <div class="lr-form-item-title">所属项目<font face="宋体">*</font></div>
         <div id="ActivityItem" isvalid="yes" checkexpession="NotNull" readonly></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="ResearchResult">
@@ -40,7 +40,7 @@
         <input id="LV" type="text" class="form-control" readonly />
     </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>
+        <div class="lr-form-item-title" style="width: 30%;">发证单位(主管单位)<font face="宋体">*</font></div>
         <input id="CompetentUnit" type="text" style="width: 85%; float: right;" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="ResearchResult">

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

@@ -16,7 +16,8 @@ var bootstrap = function ($, learun) {
         },
         bind: function () {
             $('#ResearchType').lrDataItemSelect({ code: 'SRAchievementType' });
-            $('#ProductPerson').lrDataSourceSelect({ code: 'TeacherInfo',value: 'f_userid',text: 'f_realname' });
+            $('#ProductPerson')[0].lrvalue = learun.clientdata.get(['userinfo']).userId;
+            $('#ProductPerson').val(learun.clientdata.get(['userinfo']).realName);
             $('#Rank').lrDataItemSelect({ code: 'Level' });
             $('#Year').lrselect({
                 allowSearch: true,

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

@@ -19,7 +19,7 @@
                                     <div id="ProductPerson"></div>
                                 </div>
                                 <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">活动项目</div>
+                                    <div class="lr-form-item-title">所属项目</div>
                                     <div id="ActivityItem"></div>
                                 </div>
                                 <div class="col-xs-6 lr-form-item">

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

@@ -202,7 +202,7 @@ var bootstrap = function ($, learun) {
                     },
 
                     {
-                        label: "活动项目", name: "ActivityItem", width: 100, align: "left",
+                        label: "所属项目", name: "ActivityItem", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
@@ -238,7 +238,7 @@ var bootstrap = function ($, learun) {
                             });
                         }
                         },
-                    { label: "领证单位(主管单位)", name: "CompetentUnit", width: 100, align: "left" },
+                    { label: "发证单位(主管单位)", name: "CompetentUnit", width: 100, align: "left" },
                     {
                         label: "年度", name: "Year", width: 50, align: "left",
                     },