From 9af76f574d3efa0519ef7e248ab1feb1c60e095f Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Thu, 22 Sep 2022 10:10:20 +0800
Subject: [PATCH] 1

---
 .../Views/HiringRegistration/Form.cshtml       |  3 ++-
 .../Views/HiringRegistration/Form.js           |  2 +-
 .../Views/HiringRegistration/Index.js          | 18 +++++++++---------
 .../Views/WorkStaff/Form.cshtml                |  2 +-
 .../Views/WorkStaff/Index.cshtml               |  2 +-
 .../Views/WorkStaff/Index.js                   |  2 +-
 6 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/HiringRegistration/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/HiringRegistration/Form.cshtml
index 5823e8e53..8b013741c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/HiringRegistration/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/HiringRegistration/Form.cshtml	
@@ -25,7 +25,8 @@
     </div>
     <div class="col-xs-4 lr-form-item" data-table="HiringRegistration">
         <div class="lr-form-item-title">性别<font face="宋体">*</font></div>
-        <div id="Gender" isvalid="yes" checkexpession="NotNull"></div>
+        <input id="Gender" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        @*<div id="Gender" isvalid="yes" checkexpession="NotNull"></div>*@
     </div>
     <div class="col-xs-4 lr-form-item" data-table="HiringRegistration">
         <div class="lr-form-item-title">民族<font face="宋体">*</font></div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/HiringRegistration/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/HiringRegistration/Form.js
index dcd918412..9050eedce 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/HiringRegistration/Form.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/HiringRegistration/Form.js	
@@ -15,7 +15,7 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            $('#Gender').lrDataItemSelect({ code: 'YesOrNoBit' });
+            //$('#Gender').lrDataItemSelect({ code: 'YesOrNoBit' });
             $('#Head').lrUploader();
         },
         initData: function () {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/HiringRegistration/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/HiringRegistration/Index.js
index 95c085b26..7ec782af9 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/HiringRegistration/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/HiringRegistration/Index.js	
@@ -78,15 +78,15 @@ var bootstrap = function ($, learun) {
                     { label: "姓名", name: "Name", width: 100, align: "left" },
                     {
                         label: "性别", name: "Gender", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
-                                key: value,
-                                code: 'usersexbit',
-                                callback: function (_data) {
-                                    callback(_data.text);
-                                }
-                            });
-                        }
+                        //formatterAsync: function (callback, value, row, op, $cell) {
+                        //    learun.clientdata.getAsync('dataItem', {
+                        //        key: value,
+                        //        code: 'usersexbit',
+                        //        callback: function (_data) {
+                        //            callback(_data.text);
+                        //        }
+                        //    });
+                        //}
                     },
                     { label: "民族", name: "NationalityNo", width: 100, align: "left" },
                     { label: "政治面貌", name: "Political", width: 100, align: "left" },
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WorkStaff/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WorkStaff/Form.cshtml
index eef3c346a..e3ffbaf76 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WorkStaff/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WorkStaff/Form.cshtml	
@@ -4,7 +4,7 @@
 }
 <div class="lr-form-wrap" id="form">
     <div class="col-xs-4 lr-form-item" data-table="WorkStaff">
-        <div class="lr-form-item-title">名称</div>
+        <div class="lr-form-item-title">姓名</div>
         <input id="Name" type="text" class="form-control" />
     </div>
     <div class="col-xs-4 lr-form-item" data-table="WorkStaff">
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WorkStaff/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WorkStaff/Index.cshtml
index f89c45314..ff9f49721 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WorkStaff/Index.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WorkStaff/Index.cshtml	
@@ -11,7 +11,7 @@
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">名称</div>
+                                    <div class="lr-form-item-title">姓名</div>
                                     <input id="Name" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WorkStaff/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WorkStaff/Index.js
index 4547f3306..170f7077a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WorkStaff/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WorkStaff/Index.js	
@@ -72,7 +72,7 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/WorkStaff/GetPageList',
                 headData: [
-                    { label: "名称", name: "Name", width: 100, align: "left"},
+                    { label: "姓名", name: "Name", width: 100, align: "left"},
                     { label: "性别", name: "Gender", width: 100, align: "left"},
                     { label: "民族", name: "Nationality", width: 100, align: "left"},
                     {