diff --git a/src/view/user/form.html b/src/view/user/form.html index 4336c01..e48e2a0 100644 --- a/src/view/user/form.html +++ b/src/view/user/form.html @@ -9,7 +9,7 @@ 性别 - {if (0==$vo.gender)} + {if (isset($vo.gender) && 0==$vo.gender)} {else} @@ -17,7 +17,7 @@ 男 - {if (1==$vo.gender)} + {if (isset($vo.gender) && 1==$vo.gender)} {else} @@ -41,6 +41,10 @@ 邮箱 + + 每月薪水 + + diff --git a/src/view/user/index.html b/src/view/user/index.html index 30c0949..f9af86e 100644 --- a/src/view/user/index.html +++ b/src/view/user/index.html @@ -54,6 +54,9 @@ } }, { field: 'phone', title: '手机号' }, { field: 'email', title: '邮箱' }, + { field: 'salary', title: '每月薪水', align: 'right', templet: function (d) { + return d.salary ? '¥' + parseFloat(d.salary).toFixed(2) : '-'; + } }, { field: '', title: '部门负责人', templet: function (d) { if (d.dept) { if (d.dept.headman_id === d.id) { diff --git a/stc/database/20250621000000_install_staff_db.php b/stc/database/20250621000000_install_staff_db.php index f2b381b..8edd9d8 100644 --- a/stc/database/20250621000000_install_staff_db.php +++ b/stc/database/20250621000000_install_staff_db.php @@ -51,6 +51,7 @@ class InstallStaffDb extends Migrator ['pid', 'integer', ['limit' => 11, 'default' => 0, 'null' => false, 'comment' => '上级部门ID']], ['headman_id', 'integer', ['default' => NULL, 'null' => true, 'comment' => '领导人ID']], ['sort', 'integer', ['limit' => 9, 'default' => 100, 'null' => false, 'comment' => '排序权重']], + ['salary', 'decimal', ['precision' => 10, 'scale' => 2, 'null' => true, 'comment' => '每月薪水']], ['status', 'integer', ['limit' => 11, 'default' => 1, 'null' => false, 'comment' => '状态(0禁用,1启用)']], ['is_deleted', 'integer', ['limit' => 11, 'default' => 0, 'null' => false, 'comment' => '删除(1删除,0未删)']], ['create_at', 'timestamp', ['default' => 'CURRENT_TIMESTAMP', 'null' => true, 'comment' => '创建时间']], @@ -77,6 +78,7 @@ class InstallStaffDb extends Migrator ['gender', 'tinyinteger', ['limit' => 4, 'default' => 0, 'null' => true, 'comment' => '性别(0男,1女)']], ['phone', 'string', ['limit' => 255, 'default' => NULL, 'null' => false, 'comment' => '手机号']], ['email', 'string', ['limit' => 255, 'default' => NULL, 'null' => true, 'comment' => '电子邮箱']], + ['salary', 'decimal', ['precision' => 10, 'scale' => 2, 'default' => 0.00, 'null' => true, 'comment' => '每月薪水']], ['dept_id', 'integer', ['limit' => 11, 'default' => 0, 'null' => true, 'comment' => '所属部门']], ['status', 'integer', ['default' => '1', 'null' => false, 'comment' => '状态(0禁用,1启用)']], ['is_deleted', 'integer', ['default' => '0', 'null' => false, 'comment' => '删除(1删除,0未删)']],