zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web

This commit is contained in:
shijing 2025-12-29 10:29:40 +08:00
parent f2cc34cb4c 432172d2a1
commit 6a1c313bc1
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/asm/assetlogin_form.vue
View File

@ -9,6 +9,8 @@
<xtSelect <xtSelect
v-model="formData.keep_dept" v-model="formData.keep_dept"
:apiObj = "$API.system.dept.list" :apiObj = "$API.system.dept.list"
:params = "{with_children: 'yes', parent__isnull: true}"
:hidePagination="true"
v-model:label="formData.keep_dept_name" v-model:label="formData.keep_dept_name"
:edit="localMode == 'add'" :edit="localMode == 'add'"
> >

30
src/views/hrm/empjoin_form.vue
View File

@ -29,7 +29,11 @@
:hideDelete="hideDelete" :hideDelete="hideDelete"
placeholder="暂无数据" 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"> <template #default="scope">
<el-input <el-input
v-model="scope.row.name" v-model="scope.row.name"
@ -37,7 +41,11 @@
></el-input> ></el-input>
</template> </template>
</el-table-column> </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"> <template #default="scope">
<el-select v-model="scope.row.gender" placeholder="请选择"> <el-select v-model="scope.row.gender" placeholder="请选择">
<el-option label="男" :value="1"></el-option> <el-option label="男" :value="1"></el-option>
@ -45,7 +53,11 @@
</el-select> </el-select>
</template> </template>
</el-table-column> </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"> <template #default="scope">
<el-input <el-input
v-model="scope.row.IDcard" v-model="scope.row.IDcard"
@ -53,7 +65,11 @@
></el-input> ></el-input>
</template> </template>
</el-table-column> </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"> <template #default="scope">
<el-input <el-input
v-model="scope.row.phone" v-model="scope.row.phone"
@ -69,7 +85,11 @@
></el-input> ></el-input>
</template> </template>
</el-table-column> </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"> <template #default="scope">
<xtSelect <xtSelect
:apiObj="apiObjPost" :apiObj="apiObjPost"