From 7f6c25141b80258af2434f7d8c751806ba3a9106 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Mon, 7 Apr 2025 15:07:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=BC=96=E8=BE=91=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E6=9C=89=E7=BC=96=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar/index.vue  | 2 +-
 src/views/system/components/AddUser.vue | 6 ++++++
 src/views/system/user.vue               | 8 ++++++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/layout/components/Navbar/index.vue b/src/layout/components/Navbar/index.vue
index 5da3745..9de932c 100644
--- a/src/layout/components/Navbar/index.vue
+++ b/src/layout/components/Navbar/index.vue
@@ -52,7 +52,7 @@
                 </svg>
               </div>
             </template>
-            <theme-picker class="tool-item" />
+            <!-- <theme-picker class="tool-item" /> -->
             <!--            <el-badge :is-dot="device === 'mobile'" :max="99" :value="12" class="tool-item">-->
             <!--              <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="icon"><path stroke="none" d="M0 0h24v24H0z" fill="none" /><path d="M10 5a2 2 0 1 1 4 0a7 7 0 0 1 4 6v3a4 4 0 0 0 2 3h-16a4 4 0 0 0 2 -3v-3a7 7 0 0 1 4 -6" /><path d="M9 17v1a3 3 0 0 0 6 0v-1" /></svg>-->
             <!--            </el-badge>-->
diff --git a/src/views/system/components/AddUser.vue b/src/views/system/components/AddUser.vue
index 850fc30..5560f4b 100644
--- a/src/views/system/components/AddUser.vue
+++ b/src/views/system/components/AddUser.vue
@@ -40,6 +40,11 @@
         <el-form-item label="职位" prop="position">
           <el-input v-model="form.position" clearable />
         </el-form-item>
+        <el-form-item label="是否有编制" prop="is_formal">
+          <el-select v-model="form.is_formal" clearable>
+            <el-option v-for="item in [{id:1,name:'是'},{id:0,name:'否'}]" :key="item.id" :value="item.id" :label="item.name" />
+          </el-select>
+        </el-form-item>
         <el-upload
                 class="avatar-uploader"
                 list-type="picture-card"
@@ -96,6 +101,7 @@ export default {
         name: '',
         username: '',
         password: '',
+        is_formal:1,
         attendance_closed: 0,
         mobile: '',
         start_work_date: '',
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 32edfc6..f045a7e 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -35,7 +35,10 @@
           </template>
         </vxe-column>
         <vxe-column field="position" width="140" title="职位" align="center"
-          :edit-render="{ name: 'input', attrs: { type: 'text'} }" />
+          :edit-render="{ name: 'input', attrs: { type: 'text'} }" />
+        <vxe-column field="is_formal" width="130" align="center" title="是否有编制"
+          :edit-render="{ name: 'select', options: [{ value: 1, label: '是' },{ value: 0, label: '否' }] }" />
+
         <vxe-column field="attendance_closed" width="130" align="center" title="是否关闭打卡"
           :edit-render="{ name: 'select', options: [{ value: 1, label: '是' },{ value: 0, label: '否' }] }" />
         <vxe-column field="mobile" width="140" align="center" title="手机号"
@@ -184,7 +187,8 @@
           department_id: '',
           start_work_date: '',
           year_holiday: '',
-          position: '',
+          position: '',
+          is_formal:1,
           mobile: '',
           sortnumber: 0
         },