From 02fb8cddb6c0ec60b6ba6d08beb673214d9b6959 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 25 九月 2023 17:26:21 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

---
 cloud-server-management/src/main/webapp/static/modular/system/tStudent/tStudent.js |   62 +++++++++++++++++++++++-------
 1 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tStudent/tStudent.js b/cloud-server-management/src/main/webapp/static/modular/system/tStudent/tStudent.js
index c25024a..bd1eca8 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tStudent/tStudent.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tStudent/tStudent.js
@@ -14,21 +14,53 @@
 TStudent.initColumn = function () {
     return [
         {field: 'selectItem', radio: true},
-            {title: '主键', field: 'id', visible: true, align: 'center', valign: 'middle'},
-            {title: '用户id', field: 'appUserId', visible: true, align: 'center', valign: 'middle'},
-            {title: '学员姓名', field: 'name', visible: true, align: 'center', valign: 'middle'},
-            {title: '学员电话', field: 'phone', visible: true, align: 'center', valign: 'middle'},
-            {title: '生日', field: 'birthday', visible: true, align: 'center', valign: 'middle'},
-            {title: '性别(1=男,2=女)', field: 'sex', visible: true, align: 'center', valign: 'middle'},
-            {title: '身高', field: 'height', visible: true, align: 'center', valign: 'middle'},
-            {title: '体重', field: 'weight', visible: true, align: 'center', valign: 'middle'},
-            {title: 'bmi健康值', field: 'bmi', visible: true, align: 'center', valign: 'middle'},
-            {title: '身份证号', field: 'idCard', visible: true, align: 'center', valign: 'middle'},
-            {title: '体侧表', field: 'lateralSurface', visible: true, align: 'center', valign: 'middle'},
-            {title: '状态(1=正常,2=冻结,3=删除)', field: 'state', visible: true, align: 'center', valign: 'middle'},
-            {title: '添加时间', field: 'insertTime', visible: true, align: 'center', valign: 'middle'},
-            {title: '是否默认 1默认 2不是默认', field: 'isDefault', visible: true, align: 'center', valign: 'middle'},
-            {title: '学员头像', field: 'headImg', visible: true, align: 'center', valign: 'middle'}
+            {title: '主键', field: 'id', visible: false, align: 'center', valign: 'middle'},
+            {title: '所属用户', field: 'userName', visible: true, align: 'center', valign: 'middle'},
+            {title: '姓名', field: 'name', visible: true, align: 'center', valign: 'middle'},
+            {title: '联系电话电话', field: 'phone', visible: true, align: 'center', valign: 'middle'},
+        { title: '生日', field: 'birthday', visible: true, align: 'center', valign: 'middle', formatter: function(value) {
+                return new Date(value).toLocaleDateString();
+            }},
+        {
+            title: '性别',
+            field: 'sex',
+            visible: true,
+            align: 'center',
+            valign: 'middle',
+            formatter: function(value) {
+                if (value === 1) {
+                    return '男';
+                } else if (value === 2) {
+                    return '女';
+                } else {
+                    return '';
+                }
+            }
+        },
+            {title: '身高(cm)', field: 'height', visible: true, align: 'center', valign: 'middle'},
+            {title: '体重(kg)', field: 'weight', visible: true, align: 'center', valign: 'middle'},
+            {title: 'bmi健康值', field: 'bmi', visible: false, align: 'center', valign: 'middle'},
+            {title: '身份证号', field: 'idCard', visible: false, align: 'center', valign: 'middle'},
+            {title: '体侧表', field: 'lateralSurface', visible: false, align: 'center', valign: 'middle'},
+        {
+            title: '状态',
+            field: 'state',
+            visible: true,
+            align: 'center',
+            valign: 'middle',
+            formatter: function(value) {
+                if (value === 1) {
+                    return '正常';
+                } else if (value === 2) {
+                    return '冻结';
+                } else {
+                    return '';
+                }
+            }
+        },
+            {title: '添加时间', field: 'insertTime', visible: false, align: 'center', valign: 'middle'},
+            {title: '是否默认 1默认 2不是默认', field: 'isDefault', visible: false, align: 'center', valign: 'middle'},
+            {title: '学员头像', field: 'headImg', visible: false, align: 'center', valign: 'middle'}
     ];
 };
 

--
Gitblit v1.7.1