新增数据，开始安全巡检模块

src/views/system/resident/ResidentMain.vue

@@ -28,9 +28,7 @@
                     </div>
                     <div class="userinfo_item">
                       <div class="title_item">住户类型：</div>
-                      <span v-if="userInfo.type === 0"> 业主 </span>
-                      <span v-else-if="userInfo.type === 1"> 亲戚 </span>
-                      <span v-else> 租户 </span>
+                      <DictTag :options="com_resident_relationship" :value="userInfo.type"></DictTag>
                     </div>
                     <div class="userinfo_item">
                       <div class="title_item">住户来源：</div>
@@ -71,7 +69,7 @@
                     <div class="userinfo_item img">
                       <div class="title_item">身份证背面：</div>
                       <div class="userinfo_itme_img">
-                        <el-image class="w-full h-full" fit="fill" :src="userInfo.cardImageFront"></el-image>
+                        <el-image class="w-full h-full" fit="fill" :src="`/${userInfo.cardImageFront}`"></el-image>
                       </div>
                     </div>
                   </el-col>
@@ -149,6 +147,7 @@ import { ResidentVO } from '@/api/system/resident/type';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { com_review } = toRefs<any>(proxy?.useDict('com_review'));
 const { com_sub_status } = toRefs<any>(proxy?.useDict('com_sub_status'));
+const { com_resident_relationship } = toRefs<any>(proxy?.useDict('com_resident_relationship'));
 const { com_certification_status } = toRefs<any>(proxy?.useDict('com_certification_status'));
 
 const userInfo = ref<ResidentVO>({
@@ -183,13 +182,18 @@ const reviewInfo = ref({
 const active = ref(0);
 const userid = ref(null);
 const route = useRoute();
+
 if (route.query.id) {
   userid.value = route.query.id;
+  // 获取住户信息
   getResident(userid.value).then((res) => {
     userInfo.value = res.data;
+    // 获取 审核流程
     getresidentReviewlistAPI(userid.value).then((res) => {
+      console.log(res);
       if (res.rows[0]) {
         reviewInfo.value = res.rows[0];
+        console.log(reviewInfo.value);
         handleActivestaus(reviewInfo.value);
       }
     });
@@ -228,11 +232,9 @@ const activeStop = computed(() => {
     case 0:
       break;
     case 1:
-      status = 1;
-      break;
     case 2:
     case 3:
-      status = 2;
+      status = 1;
       break;
     case 4:
     case 5:
@@ -249,9 +251,13 @@ const activeStop = computed(() => {
 function updatePass(val: '0' | '1' | '2') {
   reviewInfo.value = {
     ...reviewInfo.value,
+    // 审核时间
     'propertyTime': new Date().toLocaleString().replaceAll('/', '-'),
-    'propertyStatus': val
+    // 审核状态
+    'propertyStatus': val,
+    'residentId': userid.value
   };
+  console.log(reviewInfo.value);
   update();
 }
 

src/views/system/resident/addResident.vue

@@ -234,8 +234,7 @@ const submitForm = () => {
       //   return ElMessage.error('请上传身份证背面照片');
       // }
       const obj = {
-        ...form.value,
-        villageId: Number(localStorage.getItem('villageid'))
+        ...form.value
       };
       if (userid.value) {
         updateResident(obj).then(() => {

src/views/system/resident/index.vue

@@ -15,15 +15,6 @@
                 <el-option v-for="item in com_review" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
-            <!-- <el-form-item label="提交日期" prop="date">
-              <el-date-picker
-                v-model="queryParams.date"
-                type="date"
-                placeholder="开始日期~结束日期"
-                :disabled-date="disabledDate"
-                :shortcuts="shortcuts"
-              />
-            </el-form-item> -->
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -78,7 +69,7 @@
             <el-table-column label="操作" align="center" min-width="120" fixed="right" class-name="small-padding fixed-width">
               <template #default="scope">
                 <el-button
-                  v-if="scope.row.status === '0'"
+                  v-if="scope.row.status !== '1'"
                   link
                   type="primary"
                   icon="Edit"
@@ -114,7 +105,32 @@ import { getHousePathById } from '@/utils/house';
 import { useHouseStore } from '@/store/modules/house';
 
 const houseStore = useHouseStore();
-const { currentVilageInfo } = storeToRefs(houseStore);
+const currentVilageInfo = ref({
+  'villageId': null,
+  'villageName': '',
+  'villageCode': '',
+  'city': '',
+  'address': '',
+  'completDate': '',
+  'houseUse': 0,
+  'villageArea': null,
+  'parkingSpaceCount': null,
+  'villageImageUrl': '',
+  'status': '0',
+  'remark': '',
+  'manageName': '',
+  'managePhone': '',
+  'manageQq': '',
+  'manageVx': '',
+  'manageEmail': ''
+});
+
+function init() {
+  houseStore.getviliageinfo(localStorage.getItem('villageid')).then((res) => {
+    currentVilageInfo.value = res;
+  });
+}
+init();
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { com_resident_relationship } = toRefs<any>(proxy?.useDict('com_resident_relationship'));
@@ -153,7 +169,6 @@ const data = reactive<PageData<ResidentForm, ResidentQuery>>({
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    villageId: Number(localStorage.getItem('villageid')),
     date: '',
     type: null,
     status: null,