From 19108c634c0adc0708773bc3ba00c5a027e050a1 Mon Sep 17 00:00:00 2001
From: pengwei <pengwei6411@163.com>
Date: Mon, 26 May 2025 10:28:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:1=E3=80=81=E9=83=A8=E9=97=A8=E3=80=81?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=8C=BA=E5=B1=95=E7=A4=BA=E4=B8=8D=E5=85=A8?=
 =?UTF-8?q?=EF=BC=8C=E8=B0=83=E6=95=B4=E5=B1=95=E7=A4=BA=E5=AE=BD=E5=BA=A6?=
 =?UTF-8?q?(=E5=AE=8C=E6=88=90)=20=20=20=20=202=E3=80=81=E7=A6=81=E9=97=AD?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=94=AF=E6=8C=81=E7=AD=9B=E9=80=89=E7=AC=A6?=
 =?UTF-8?q?=E5=90=88=E6=9D=A1=E4=BB=B6=E7=9A=84=E6=95=B0=E6=8D=AE=EF=BC=88?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=EF=BC=89=20=20=20=20=203=E3=80=81=E6=96=87?=
 =?UTF-8?q?=E5=8C=96=E7=A8=8B=E5=BA=A6=E4=BF=AE=E6=94=B9=E4=B8=BA=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E6=A1=86=EF=BC=9A=E9=AB=98=E4=B8=AD=E3=80=81=E5=A4=A7?=
 =?UTF-8?q?=E4=B8=93=E3=80=81=E6=9C=AC=E7=A7=91=E3=80=81=E7=A0=94=E7=A9=B6?=
 =?UTF-8?q?=E7=94=9F=E5=8F=8A=E4=BB=A5=E4=B8=8A(=E5=AE=8C=E6=88=90)=20=20?=
 =?UTF-8?q?=20=20=204=E3=80=81=E7=BC=96=E8=BE=91=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=EF=BC=9A=E5=A7=93=E5=90=8D=E5=9B=9E=E6=98=BE=E4=B8=8D=E6=AD=A3?=
 =?UTF-8?q?=E7=A1=AE=20(=E5=AE=8C=E6=88=90)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/work/Confinement.vue | 45 +++++++++++++++++++++++++---------
 1 file changed, 33 insertions(+), 12 deletions(-)

diff --git a/src/views/work/Confinement.vue b/src/views/work/Confinement.vue
index 8f26589..2fd05c7 100644
--- a/src/views/work/Confinement.vue
+++ b/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>