From 26f19e31f0809ef1fbde18fa55de23b1305b1626 Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Wed, 27 Mar 2024 08:49:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/szxc/carinfo/index.vue | 14 ++++---
 ruoyi-ui/src/views/szxc/jminfo/index.vue  | 46 ++++++++++++-----------
 2 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/ruoyi-ui/src/views/szxc/carinfo/index.vue b/ruoyi-ui/src/views/szxc/carinfo/index.vue
index 78bcb3b..ff81f5a 100644
--- a/ruoyi-ui/src/views/szxc/carinfo/index.vue
+++ b/ruoyi-ui/src/views/szxc/carinfo/index.vue
@@ -100,8 +100,8 @@
 
     <el-table v-loading="loading" :data="carinfoList" @selection-change="handleSelectionChange" border>
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键id" align="center" prop="id" />
-      <el-table-column label="车主id" align="center" prop="ownerId" />
+<!--      <el-table-column label="主键id" align="center" prop="id" />-->
+<!--      <el-table-column label="车主id" align="center" prop="ownerId" />-->
       <el-table-column label="车主姓名" align="center" prop="ownerName" />
       <el-table-column label="联系方式" align="center" prop="phone" />
       <el-table-column label="车牌号" align="center" prop="carNo" />
@@ -112,10 +112,12 @@
       </el-table-column>
       <el-table-column label="颜色" align="center" prop="colour" />
       <el-table-column label="品牌" align="center" prop="carBand" />
-      <el-table-column label="车辆照片" align="center" prop="carPicture" />
-      <el-table-column label="部门id" align="center" prop="deptId" />
+      <el-table-column label="车辆照片" align="center" prop="carPicture" >
+        <template slot-scope="scope">
+          <image-preview :src="scope.row.carPicture" :width="50" :height="50"/>
+        </template>
+      </el-table-column>
       <el-table-column label="所属网格" align="center" prop="deptName" />
-      <el-table-column label="创建者ID" align="center" prop="userId" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -193,7 +195,7 @@
           <el-input v-model="form.carBand" placeholder="请输入品牌" />
         </el-form-item>
         <el-form-item label="车辆照片" prop="carPicture">
-          <el-input v-model="form.carPicture" placeholder="请输入车辆照片" />
+          <image-upload v-model="form.carPicture"/>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
diff --git a/ruoyi-ui/src/views/szxc/jminfo/index.vue b/ruoyi-ui/src/views/szxc/jminfo/index.vue
index eaf43ca..d1144b4 100644
--- a/ruoyi-ui/src/views/szxc/jminfo/index.vue
+++ b/ruoyi-ui/src/views/szxc/jminfo/index.vue
@@ -301,27 +301,31 @@
 
     <el-table v-loading="loading" :data="jminfoList" @selection-change="handleSelectionChange" border>
       <el-table-column type="selection" width="45" align="center" fixed/>
-      <el-table-column label="居民ID" align="center" prop="id" fixed/>
-      <el-table-column label="人员基本信息" align="center">
-        <el-table-column label="姓名" align="center" prop="name" min-width="100"/>
-        <el-table-column label="曾用名" align="center" prop="oldName" min-width="100"/>
-        <el-table-column label="国籍" align="center" prop="nationality" min-width="100">
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.szxc_gj" :value="scope.row.nationality"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="身份证号" align="center" prop="cardId" min-width="180"/>
-        <el-table-column label="出生日期" align="center" prop="bornDate" min-width="100">
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.bornDate, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="性别" align="center" prop="sex">
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="籍贯" align="center" prop="jg" min-width="180" show-overflow-tooltip/>
+<!--      <el-table-column label="居民ID" align="center" prop="id" fixed/>-->
+      <el-table-column label="身份证号" align="center" prop="cardId" min-width="180" fixed/>
+      <el-table-column label="姓名" align="center" prop="name" min-width="100" fixed/>
+      <el-table-column label="曾用名" align="center" prop="oldName" min-width="100"/>
+      <el-table-column label="国籍" align="center" prop="nationality" min-width="100">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.szxc_gj" :value="scope.row.nationality"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="出生日期" align="center" prop="bornDate" min-width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.bornDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="性别" align="center" prop="sex">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="籍贯" align="center" prop="jg" min-width="180" show-overflow-tooltip/>
+      <el-table-column label="核查状态" align="center" prop="hcStatus" >
+        <template slot-scope="scope">
+          <span v-if="scope.row.hcStatus==='0'">待审核</span>
+          <span v-if="scope.row.hcStatus==='1'">已审核</span>
+        </template>
       </el-table-column>
       <el-table-column label="户信息" align="center">
         <el-table-column label="户号" align="center" prop="acountNo" min-width="120"/>