Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js

@@ -87,7 +87,7 @@ var bootstrap = function ($, learun) {
             $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' });
             $('#IsHasLesson').lrDataItemSelect({ code: 'YesOrNoBit' });
             $('#NationalityNo').lrDataItemSelect({ code: 'National' });
-            $('#PartyFaceNo').lrDataItemSelect({ code: 'BCdPartyFace' });
+            $('#PartyFaceNo').lrDataItemSelect({ code: 'PolityStatus' });
             $('#ProvinceNo').lrDataSourceSelect({
                 code: 'DIC_PROVINCE', value: 'pcode', text: 'pname',
                 select: function (item) {

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

@@ -436,7 +436,7 @@ var bootstrap = function ($, learun) {
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                code: 'BCdPartyFace',
+                                code: 'PolityStatus',
                                 callback: function (_data) {
                                     callback(_data.text);
                                 }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml

@@ -19,10 +19,10 @@
         <div class="lr-form-item-title">考生号<font face="宋体">*</font></div>
         <input id="ksh" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+    @*<div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">通知书号<font face="宋体">*</font></div>
         <input id="NoticeNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
+    </div>*@
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">学号</div>
         <input id="ProvinceCode" type="text" class="form-control" />
@@ -76,8 +76,8 @@
         <div id="Photo"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">联系电话<font face="宋体">*</font></div>
-        <input id="mobile" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <div class="lr-form-item-title">联系电话</div>
+        <input id="mobile" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">E-mail</div>
@@ -100,23 +100,23 @@
         <input id="MatherUnit" type="text" class="form-control" />
     </div>
     <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">监护人姓名<font face="宋体">*</font></div>
-        <input id="Guardian" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <div class="lr-form-item-title">监护人姓名</div>
+        <input id="Guardian" type="text" class="form-control" />
     </div>
     <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">监护人联系方式<font face="宋体">*</font></div>
-        <input id="GuardianPhone" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <div class="lr-form-item-title">监护人联系方式</div>
+        <input id="GuardianPhone" type="text" class="form-control" />
     </div>
     <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">与监护人关系<font face="宋体">*</font></div>
-        <div id="GuardianType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
+        <div class="lr-form-item-title">与监护人关系</div>
+        <div id="GuardianType" type="text" class="form-control"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">实习状态</div>
         <div id="InternshipStatus" type="text" class="form-control"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">是否实习</div>
+        <div class="lr-form-item-title">是否复读</div>
         <div id="IsRestudy" type="text" class="form-control"></div>
     </div>
     @*<div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.js

@@ -108,7 +108,7 @@ var bootstrap = function ($, learun) {
             $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
             $('#NationalityNo').lrDataItemSelect({ code: 'National' });
             $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' });
-            $('#PartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' });
+            $('#PartyFaceNo').lrDataItemSelect({ code: 'PolityStatus' });
             $('#HealthStatusNo').lrDataItemSelect({ code: 'StuHealthType' });
             $('#Photo').lrUploader();
             $('#FamilyOriginNo').lrDataItemSelect({ code: 'BCdFamilyOrigin' });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.cshtml

@@ -19,10 +19,10 @@
         <div class="lr-form-item-title">考生号<font face="宋体">*</font></div>
         <input id="ksh" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+    @*<div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">通知书号<font face="宋体">*</font></div>
         <input id="NoticeNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
-    </div>
+    </div>*@
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">学号</div>
         <input id="ProvinceCode" type="text" class="form-control" />
@@ -76,8 +76,8 @@
         <div id="Photo"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">联系电话<font face="宋体">*</font></div>
-        <input id="mobile" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <div class="lr-form-item-title">联系电话</div>
+        <input id="mobile" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">E-mail</div>
@@ -100,23 +100,23 @@
         <input id="MatherUnit" type="text" class="form-control" />
     </div>
     <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">监护人姓名<font face="宋体">*</font></div>
-        <input id="Guardian" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <div class="lr-form-item-title">监护人姓名</div>
+        <input id="Guardian" type="text" class="form-control" />
     </div>
     <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">监护人联系方式<font face="宋体">*</font></div>
-        <input id="GuardianPhone" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <div class="lr-form-item-title">监护人联系方式</div>
+        <input id="GuardianPhone" type="text" class="form-control" />
     </div>
     <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">与监护人关系<font face="宋体">*</font></div>
-        <div id="GuardianType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
+        <div class="lr-form-item-title">与监护人关系</div>
+        <div id="GuardianType" type="text" class="form-control"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">实习状态</div>
         <div id="InternshipStatus" type="text" class="form-control"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">是否实习</div>
+        <div class="lr-form-item-title">是否复读</div>
         <div id="IsRestudy" type="text" class="form-control"></div>
     </div>
     @*<div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.js

@@ -107,7 +107,7 @@ var bootstrap = function ($, learun) {
             $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
             $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' });
             $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' });
-            $('#PartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' });
+            $('#PartyFaceNo').lrDataItemSelect({ code: 'PolityStatus' });
             $('#HealthStatusNo').lrDataSourceSelect({ code: 'BCdHealthStatus', value: 'healthstatusno', text: 'healthstatus' });
             $('#Photo').lrUploader();
             $('#FamilyOriginNo').lrDataSourceSelect({ code: 'BCdFamilyOrigin', value: 'familyoriginno', text: 'familyorigin' });

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

@@ -324,12 +324,11 @@ var bootstrap = function ($, learun) {
                     {
                         label: "政治面貌", name: "PartyFaceNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BCdPartyFace',
+                            learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                keyId: 'partyfaceno',
+                                code: 'PolityStatus',
                                 callback: function (_data) {
-                                    callback(_data['partyface']);
+                                    callback(_data.text);
                                 }
                             });
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.js

@@ -16,13 +16,13 @@ var bootstrap = function ($, learun) {
         },
         bind: function () {
             $("#GenderNo").lrDataItemSelect({ code: 'usersex' });
-            $("#PartyFaceNo").lrDataItemSelect({ code: 'BCdPartyFace' });
-            $("#FamilyOriginNo").lrDataItemSelect({ code: 'ExamineeCategory' });
+            $('#PartyFaceNo').lrDataItemSelect({ code: 'PolityStatus' });
+            $('#FamilyOriginNo').lrDataItemSelect({ code: 'stuType' });
             $("#NationalityNo").lrDataItemSelect({ code: 'National' });
             $("#TestStuSortNo").lrDataItemSelect({ code: 'ExamineeType' });
             $("#TestStuSubjectNo").lrDataItemSelect({ code: 'SubjectType' });
             $("#HighTestSortNo").lrDataItemSelect({ code: 'GraduateCategory' });
-            $("#MatriculateSort").lrDataItemSelect({ code: 'EnrollStyle' });
+            $("#MatriculateSort").lrDataItemSelect({ code: 'enrollType' });
             $('#ResidenceNo').lrDataItemSelect({ code: 'ResidenceNo' });
             $('#IsPoor').lrDataItemSelect({ code: 'YesOrNoInt' });
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormView.js

@@ -16,7 +16,7 @@ var bootstrap = function ($, learun) {
         },
         bind: function () {
             $("#GenderNo").lrDataItemSelect({ code: 'usersex' });
-            $("#PartyFaceNo").lrDataItemSelect({ code: 'BCdPartyFace' });
+            $("#PartyFaceNo").lrDataItemSelect({ code: 'PolityStatus' });
             $("#FamilyOriginNo").lrDataItemSelect({ code: 'ExamineeCategory' });
             $("#NationalityNo").lrDataItemSelect({ code: 'National' });
             $("#TestStuSortNo").lrDataItemSelect({ code: 'ExamineeType' });

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml

@@ -190,7 +190,7 @@
                                 },
                                 filters: {
                                     sex: function (value) {
-                                        return value ? "男生" : "女生";
+                                        return value ? "男" : "女";
 
                                     },
                                     company: function (value) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.cshtml

@@ -176,7 +176,7 @@
                             },
                             filters: {
                                 sex: function (value) {
-                                    return value ? "男生" : "女生";
+                                    return value ? "男" : "女";
 
                                 },
                                 company: function (value) {
@@ -222,7 +222,7 @@
                                     var result;
                                     top.learun.clientdata.getAsync('dataItem', {
                                         key: value,
-                                        code: 'BCdPartyFace',
+                                        code: 'PolityStatus',
                                         callback: function (_data) {
                                             result = _data.text;
                                         }
@@ -544,7 +544,7 @@
                                     var result;
                                     top.learun.clientdata.getAsync('dataItem', {
                                         key: value,
-                                        code: 'BCdPartyFace',
+                                        code: 'PolityStatus',
                                         callback: function (_data) {
                                             result =_data.text;
                                         }