From 1058ad5105f968ccdc009940d7ff13fe3100685f Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 26 Dec 2025 16:27:30 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20assetlogin=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=A0=91=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/asm/assetlogin_form.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/asm/assetlogin_form.vue b/src/views/asm/assetlogin_form.vue
index bd8f0766..3131940f 100644
--- a/src/views/asm/assetlogin_form.vue
+++ b/src/views/asm/assetlogin_form.vue
@@ -9,6 +9,8 @@
                    <xtSelect
                         v-model="formData.keep_dept"
                         :apiObj = "$API.system.dept.list"
+                        :params = "{with_children: 'yes', parent__isnull: true}"
+                        :hidePagination="true"
                         v-model:label="formData.keep_dept_name"
                         :edit="localMode == 'add'"
                    >

From e5d1a340cf7550948d55e36d220e5c386625bce6 Mon Sep 17 00:00:00 2001
From: TianyangZhang <zty18395607196@163.com>
Date: Fri, 26 Dec 2025 16:28:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E4=BA=BA=E5=91=98=E4=BA=A4?=
 =?UTF-8?q?=E6=8E=A5=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/hrm/empjoin_form.vue | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/views/hrm/empjoin_form.vue b/src/views/hrm/empjoin_form.vue
index a571a4c2..286984f7 100644
--- a/src/views/hrm/empjoin_form.vue
+++ b/src/views/hrm/empjoin_form.vue
@@ -29,7 +29,11 @@
                     :hideDelete="hideDelete"
                     placeholder="暂无数据"
                     >
-                    <el-table-column prop="name" label="姓名" min-width="150">
+                    <el-table-column prop="name" min-width="150">
+                        <template #header>
+                            <span style="color: red">*</span>
+                            <span>姓名</span>
+                        </template>
                         <template #default="scope">
                             <el-input
                                 v-model="scope.row.name"
@@ -37,7 +41,11 @@
                             ></el-input>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="gender" label="性别" min-width="150">
+                    <el-table-column prop="gender" min-width="150">
+                        <template #header>
+                            <span style="color: red">*</span>
+                            <span>性别</span>
+                        </template>
                         <template #default="scope">
                             <el-select v-model="scope.row.gender" placeholder="请选择">
                                 <el-option label="男" :value="1"></el-option>
@@ -45,7 +53,11 @@
                             </el-select>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="IDcard" label="身份证号" min-width="150">
+                    <el-table-column prop="IDcard" min-width="150">
+                        <template #header>
+                            <span style="color: red">*</span>
+                            <span>身份证号</span>
+                        </template>
                         <template #default="scope">
                             <el-input
                                 v-model="scope.row.IDcard"
@@ -53,7 +65,11 @@
                             ></el-input>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="phone" label="手机号" min-width="150">
+                    <el-table-column prop="phone" min-width="150">
+                        <template #header>
+                            <span style="color: red">*</span>
+                            <span>手机号</span>
+                        </template>
                         <template #default="scope">
                         <el-input
                             v-model="scope.row.phone"
@@ -69,7 +85,11 @@
                         ></el-input>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="post" label="岗位" min-width="150" v-if="['交接部门负责人','结束'].includes(formData.ticket_?.state_?.name)">
+                    <el-table-column prop="post" min-width="150" v-if="['交接部门负责人','结束'].includes(formData.ticket_?.state_?.name)">
+                        <template #header>
+                            <span style="color: red">*</span>
+                            <span>岗位</span>
+                        </template>
                         <template #default="scope">
                             <xtSelect
                                 :apiObj="apiObjPost"