Browse Source

fix:1、部门、操作区展示不全,调整展示宽度(完成)

2、禁闭时间支持筛选符合条件的数据(完成)
    3、文化程度修改为下拉框:高中、大专、本科、研究生及以上(完成)
    4、编辑功能:姓名回显不正确 (完成)
main
pengwei 6 months ago
parent
commit
19108c634c
  1. 45
      src/views/work/Confinement.vue

45
src/views/work/Confinement.vue

@ -36,6 +36,14 @@ let list = ref([])
const formData = ref({})
//
let users = ref()
//
let educations=ref([
{value:'高中',label:'高中'},
{value:'大专',label:'大专'},
{value:'本科',label:'本科'},
{value:'研究生及以上',label:'研究生及以上'},
])
//
const rules = ref({
name: [
@ -142,7 +150,6 @@ let NursingOrgList = ref([])
//
const handleExport = () => {
console.log("数据导出")
window.open(`${BASE_PATH}/confinement/export?` + new URLSearchParams(query.value).toString())
}
/**
@ -166,8 +173,6 @@ const getList = async () => {
const getNursingOrgList =async ()=>{
const res = await getNursingOrgFun()
NursingOrgList.value = res;
console.log('NursingOrgList',NursingOrgList.value)
this.$nextTick()
}
//
@ -185,6 +190,7 @@ const handleDetail = (row) => {
formData.value.gender = gender
formData.value.age = age
formData.value.birthTime = birthTime
detailShow.value=true
}
/**
@ -204,6 +210,9 @@ const handleUpDate = (row) => {
formData.value.gender = gender
formData.value.age = age
formData.value.birthTime = birthTime
getPoliceListFun(formData.value.name)
isEdit.value = true;
editShow.value = true;
}
@ -355,6 +364,7 @@ onMounted(() => {
<el-table
:data="list"
ref="tableRef"
style="width: 100%"
>
<el-table-column type="selection" width="55"/>
<el-table-column
@ -369,7 +379,7 @@ onMounted(() => {
></el-table-column>
<el-table-column
label="部门"
width="120"
width="180"
>
<template #default="{row}">
<div class="flex gap-4">
@ -423,7 +433,7 @@ onMounted(() => {
</div>
</template>
</el-table-column>
<el-table-column label="操作" width="160" fixed="right">
<el-table-column label="操作" fixed="right" width="180">
<template #default="{ row }">
<div class="flex v-center">
<el-button
@ -562,7 +572,13 @@ onMounted(() => {
<el-row>
<el-col :span="12">
<el-form-item label="文化程度" prop="education">
<el-input v-model="formData.education"></el-input>
<el-select v-model="formData.education">
<el-option
v-for="(item,key) in educations"
:value="item.value"
:label="item.label"
:key="key"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
@ -704,26 +720,29 @@ onMounted(() => {
<el-row>
<el-col :span="12">
<el-form-item label="出生日期" prop="birthTime">
{{ formData.birthTime }}
{{ calculateAge(formData.birthTime) || '/' }}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="入党(团)时间" prop="joinPartyTime">
{{formData.joinPartyTime}}
{{ calculateAge(formData.joinPartyTime) || '/' }}
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="参加工作时间" prop="joinWorkTime">
{{formData.joinWorkTime}}
{{ calculateAge(formData.joinWorkTime) || '/' }}
</el-form-item>
</el-col>
<el-col :span="12" label="参加公安工作时间" prop="joinPoliceTime">
<el-form-item label="参加公安工作时间" prop="joinPoliceTime">
{{formData.joinPoliceTime}}
{{ calculateAge(formData.joinPoliceTime) || '/' }}
</el-form-item>
</el-col>
@ -779,12 +798,14 @@ onMounted(() => {
<el-row>
<el-col :span="12">
<el-form-item label="开始日期" prop="startTime">
{{formData.startTime}}
{{ calculateAge(formData.startTime) || '/' }}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="结束日期" prop="endTime">
{{formData.endTime}}
{{ calculateAge(formData.endTime) || '/' }}
</el-form-item>
</el-col>
</el-row>

Loading…
Cancel
Save