完成访客搭建，完善之前审核界面

src/views/system/cars/addCars.vue

@@ -7,48 +7,86 @@
         <el-form class="formBody" label-position="left" ref="formRef" :model="form" :rules="rules" label-width="130px">
           <el-row>
             <el-col :span="11">
-              <el-form-item label="车牌号" prop="houseId">
-                <el-input v-model.trim="form.rentalName" placeholder="请输入车牌号" />
+              <el-form-item label="车辆区域" prop="areaId">
+                <el-select @change="changeArealist" v-model="form.areaId" placeholder="请选择车辆区域">
+                  <el-option v-for="item in carArealist" :key="item.id" :label="`${item.areaName}(${item.areaCode})`" :value="item.id" />
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="2"></el-col>
             <el-col :span="11">
-              <el-form-item label="车辆品牌" prop="rentalName">
-                <el-input v-model.trim="form.rentalName" placeholder="请输入车辆品牌" />
+              <el-form-item label="车位号" prop="parkingId">
+                <el-select v-model="form.parkingId" placeholder="请选择车位号">
+                  <el-option v-for="item in parkinglist" :key="item.id" :label="item.parkingCode" :value="item.id" />
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
 
           <el-row>
             <el-col :span="11">
-              <el-form-item label="车辆型号" prop="remark">
-                <el-input v-model.trim="form.supInfo" placeholder="请输入补充车辆型号" />
+              <el-form-item label="车牌号" prop="carNum">
+                <el-input v-model.trim="form.carNum" placeholder="请输入车牌号" />
               </el-form-item>
             </el-col>
             <el-col :span="2"></el-col>
             <el-col :span="11">
-              <el-form-item label="车声颜色" prop="phone">
-                <el-input v-model.trim="form.phone" placeholder="请输入车声颜色" />
+              <el-form-item label="车辆品牌" prop="carBrand">
+                <el-input v-model.trim="form.carBrand" placeholder="请输入车辆品牌" />
               </el-form-item>
             </el-col>
           </el-row>
+
           <el-row>
-            <el-col :span="24">
-              <el-form-item label="车辆照片" prop="email"> </el-form-item>
+            <el-col :span="11">
+              <el-form-item label="车辆型号" prop="carModel">
+                <el-input v-model.trim="form.carModel" placeholder="请输入补充车辆型号" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="2"></el-col>
+            <el-col :span="11">
+              <el-form-item label="车身颜色" prop="carColor">
+                <el-input v-model.trim="form.carColor" placeholder="请输入车身颜色" />
+              </el-form-item>
             </el-col>
           </el-row>
+
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="车辆照片">
+                <el-upload
+                  class="avatar-uploader"
+                  ref="uploadRef"
+                  accept=".png, .jpg"
+                  :action="uploadUrl"
+                  name="file"
+                  :headers="headerToken()"
+                  :show-file-list="false"
+                  :on-success="handleAvatarSuccess"
+                  :before-upload="beforeAvatarUpload"
+                >
+                  <img v-if="form.carImageUrl" :src="form.carImageUrl" class="avatar" />
+                  <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
+                  <template #tip>
+                    <span>支持jpg, png等格式文件上传，文件大小不超过10MB，可上传多张 </span>
+                  </template>
+                </el-upload>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
           <el-row>
             <el-col :span="24">
               <el-form-item label="持有人">
                 <!-- 公共组件 持有人 -->
-                <Holder @change="handleChange"></Holder>
+                <Holder :userid="String(form.residentId)" @change="handleChange"></Holder>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item label="备注" prop="email">
-                <el-input type="textarea" :rows="5" v-model.trim="form.email" placeholder="请输入" />
+              <el-form-item label="备注" prop="remark">
+                <el-input type="textarea" :rows="5" v-model.trim="form.remark" placeholder="请输入" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -66,45 +104,130 @@
 import { ref } from 'vue';
 import Holder from '@/components/Holder/index.vue';
 import PageHeader from '@/components/Pageheader/index.vue';
+import { listArea } from '@/api/system/carArea';
+import { listParking } from '@/api/system/parking';
+import { UploadFiles, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus';
+import { addCar, getCar, updateCar, uploadCar } from '@/api/system/cars';
+import { useUserStore } from '@/store/modules/user';
+import { validator } from '@/utils/Reg';
+
+const uploadUrl = import.meta.env.VITE_APP_BASE_API + '/car/uploadImage';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const router = useRouter();
 const route = useRoute();
-
 const formRef = ref();
 const form = ref({
   id: null,
-  houseId: null,
-  rentalName: '', // 租户姓名
-  rent: null, // 租金
-  houseFace: '', // 房屋朝向
-  rentalType: 0, //  整租合租
-  phone: null, //手机号
-  houseArea: null, // 房屋面积
-  floorNo: null, //楼层号
-  inTime: '', //入住时间
-  facilities: '', //房屋设施
-  houseImageUrl: '', //房屋图片
-  supInfo: '', //补充租房信息
-  vx: '', //微信
-  houseUse: 0, //房屋用途
-  rentalStatus: 0, //租赁状态
-  email: '' //邮箱
+  areaId: null, // 区域id
+  residentId: null, // 车位id
+  parkingId: null, // 持有人id
+  carNum: '', //车牌号
+  carBrand: '', //车辆品牌
+  carModel: '', //车辆型号
+  carColor: '', //车身颜色
+  remark: '', //备注
+  carImageUrl: '' //车辆图片url
 });
+
 const rules = ref({
-  houseId: [{ required: true, message: '请选择房屋', trigger: 'blur' }],
-  rentalName: [{ required: true, message: '请输入名称', trigger: 'blur' }]
+  areaId: [{ required: true, message: '请选择区域', trigger: 'blur' }],
+  residentId: [{ required: true, message: '请选择', trigger: 'blur' }],
+  carNum: [
+    { required: true, message: '请输入车牌号', trigger: 'blur' },
+    {
+      validator: (_, value) => validator(value, 'PlateNumber'),
+      message: '请请输入车牌号',
+      trigger: 'blur'
+    }
+  ],
+  carBrand: [{ required: true, message: '请输入车辆品牌', trigger: 'blur' }]
 });
-const userid = ref(null);
+function headerToken() {
+  const useStore = useUserStore();
+  return {
+    Authorization: 'Bearer ' + useStore.token
+  };
+}
+const userid = ref('');
+const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile: UploadRawFile) => {
+  const type = rawFile.type.split('/').pop();
+  if (['png', 'jpg'].includes(type)) {
+    if (rawFile.size / 1024 / 1024 <= 10) {
+      return true;
+    } else {
+      ElMessage.warning('图片大小超过10M,请重新上传');
+      return false;
+    }
+  } else {
+    ElMessage.warning('图片格式不是 png/jpg 格式, 请重新上传');
+    return false;
+  }
+};
+
+const handleAvatarSuccess: UploadProps['onSuccess'] = (response: any, uploadFile: UploadFile, uploadFiles: UploadFiles) => {
+  form.value.carImageUrl = response.data.url;
+};
+
+// 车辆区域
+const carArealist = ref([]);
+// 根据车辆区域 动态选择 车位
+const parkinglist = ref([]);
+function init() {
+  listArea().then((res) => {
+    console.log(res);
+    carArealist.value = res.rows;
+  });
+}
+init();
+
+if (route.query.id) {
+  userid.value = route.query.id as string;
+  form.value.id = userid.value;
+  getCar(userid.value).then((res) => {
+    form.value = {
+      ...form.value,
+      ...res.data
+    };
+  });
+}
+
+function changeArealist(val: string) {
+  console.log(val, typeof val);
+  listParking({
+    areaId: val,
+    pageSize: 9999999,
+    pageNum: 1
+  }).then((res) => {
+    console.log(res);
+    parkinglist.value = res.rows;
+  });
+}
 
 // !== 提交 =============================================================================
 // 提交
 const submitForm = () => {
   formRef.value?.validate(async (valid: boolean) => {
     if (valid) {
+      console.log(form.value);
+      if (userid.value.trim() !== '') {
+        console.log('edit');
+        updateCar(form.value).then((res) => {
+          ElMessage.success('编辑成功');
+          cancelForm();
+        });
+      } else {
+        console.log('add');
+        addCar(form.value).then((res) => {
+          console.log(res);
+          ElMessage.success('添加成功');
+          cancelForm();
+        });
+      }
     }
   });
 };
+
 // 推出
 const cancelForm = () => {
   router.push({
@@ -115,9 +238,37 @@ const cancelForm = () => {
 // 选择住户
 function handleChange(pop) {
   console.log(pop);
+  form.value.residentId = pop;
 }
 </script>
+<style scoped>
+.avatar-uploader .avatar {
+  width: 178px;
+  height: 178px;
+  display: block;
+}
+.avatar-uploader:deep(.el-upload) {
+  border: 1px dashed #ccc;
+  margin-right: 20px;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
 
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  text-align: center;
+}
+</style>
 <style scoped lang="scss">
 .AddBuildingBox {
   padding: 15px;