From f8c92ee0e5a07fddabfc9e98029be0c8fda32d73 Mon Sep 17 00:00:00 2001
From: dyy <807692433@qq.com>
Date: Sat, 12 Oct 2024 11:01:52 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=AD=A6?=
 =?UTF-8?q?=E7=B1=8D=EF=BC=9A=E5=8A=A0=E5=AD=A6=E7=94=9F=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=92=8C=E5=AD=A6=E7=B1=8D=E7=8A=B6=E6=80=81=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/StuInfoBasic/Index.js               | 22 +++++++++++++++++++
 .../StuInfoBasic/StuInfoBasicEntity.cs        |  4 ++++
 2 files changed, 26 insertions(+)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js
index 4dc1ba613..bcfa3f6ff 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js	
@@ -360,6 +360,28 @@ var bootstrap = function ($, learun) {
                     { label: "联系电话", name: "mobile", width: 100, align: "left" },
                     { label: "户口所在地", name: "FatherUnit", width: 100, align: "left" },
                     { label: "档案所在地", name: "MatherUnit", width: 100, align: "left" },
+                    {
+                        label: "学生状态", name: "STU_STATE_CODE", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'StuStateCode',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "学籍状态", name: "STU_ROLL_CODE", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'StuRollCode',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
                     {
                         label: "异动状态", name: "AbmormityMoveMark", width: 80, align: "center",
                         formatter: function (cellvalue) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs
index 38a748a29..991f8a40e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs	
@@ -723,6 +723,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary> 
         [Column("BANKLOCATION")]
         public string BankLocation { get; set; }
+        [NotMapped]
+        public string STU_STATE_CODE { get; set; }
+        [NotMapped]
+        public string STU_ROLL_CODE { get; set; }
         #endregion
 
         #region  扩展操作