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

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;

src/views/system/cars/index.vue

@@ -1,15 +1,18 @@
 <template>
   <div class="p-2">
-    <Pageheader title="添加房屋租赁"></Pageheader>
+    <Pageheader title="车辆管理"></Pageheader>
     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="持有人" prop="residentId">
-              <el-input v-model="queryParams.residentId" placeholder="请输入持有人id(住户表id)" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
             <el-form-item label="车牌号" prop="carNum">
-              <el-input v-model="queryParams.carNum" placeholder="请输入车牌号" clearable @keyup.enter="handleQuery" />
+              <el-input v-model.trim="queryParams.carNum" placeholder="请输入车牌号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="车辆品牌" prop="carBrand">
+              <el-input v-model.trim="queryParams.carBrand" placeholder="请输入车辆品牌" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="车身颜色" prop="carColor">
+              <el-input v-model.trim="queryParams.carColor" placeholder="请输入车身颜色" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -38,12 +41,14 @@
 
       <el-table v-loading="loading" border :data="carList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="车牌号" align="center" prop="id" v-if="true" />
-        <el-table-column label="车辆品牌" align="center" prop="areaId" />
-        <el-table-column label="车辆型号" align="center" prop="parkingId" />
-        <el-table-column label="车身颜色" align="center" prop="residentId" />
-        <el-table-column label="持有人" align="center" prop="carNum" />
-        <el-table-column label="备注" align="center" prop="carBrand" />
+        <el-table-column label="车牌号" align="center" prop="carNum" />
+        <el-table-column label="车辆品牌" align="center" prop="carBrand" />
+        <el-table-column label="车辆型号" align="center" prop="carModel" />
+        <el-table-column label="车身颜色" align="center" prop="carColor" />
+        <el-table-column label="持有人" align="center" prop="residentId">
+          <template #default="scope"> {{ getResidentName(scope.row.residentId) }} </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark" />
         <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
@@ -58,58 +63,6 @@
 
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
-    <!-- 添加或修改车辆管理对话框 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="carFormRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="区域id" prop="areaId">
-          <el-input v-model="form.areaId" placeholder="请输入区域id" />
-        </el-form-item>
-        <el-form-item label="车位id" prop="parkingId">
-          <el-input v-model="form.parkingId" placeholder="请输入车位id" />
-        </el-form-item>
-        <el-form-item label="持有人id(住户表id)" prop="residentId">
-          <el-input v-model="form.residentId" placeholder="请输入持有人id(住户表id)" />
-        </el-form-item>
-        <el-form-item label="车牌号" prop="carNum">
-          <el-input v-model="form.carNum" placeholder="请输入车牌号" />
-        </el-form-item>
-        <el-form-item label="车辆品牌" prop="carBrand">
-          <el-input v-model="form.carBrand" placeholder="请输入车辆品牌" />
-        </el-form-item>
-        <el-form-item label="车辆型号" prop="carModel">
-          <el-input v-model="form.carModel" placeholder="请输入车辆型号" />
-        </el-form-item>
-        <el-form-item label="车身颜色" prop="carColor">
-          <el-input v-model="form.carColor" placeholder="请输入车身颜色" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
-        <el-form-item label="车辆图片url" prop="carImageUrl">
-          <el-input v-model="form.carImageUrl" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="创建者" prop="createBy">
-          <el-input v-model="form.createBy" placeholder="请输入创建者" />
-        </el-form-item>
-        <el-form-item label="创建时间" prop="createTime">
-          <el-date-picker clearable v-model="form.createTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择创建时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="修改者" prop="updateBy">
-          <el-input v-model="form.updateBy" placeholder="请输入修改者" />
-        </el-form-item>
-        <el-form-item label="修改时间" prop="updateTime">
-          <el-date-picker clearable v-model="form.updateTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择修改时间">
-          </el-date-picker>
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
   </div>
 </template>
 
@@ -117,6 +70,7 @@
 import Pageheader from '@/components/Pageheader/index.vue';
 import { listCar, getCar, delCar, addCar, updateCar } from '@/api/system/cars/index';
 import { CarVO, CarQuery, CarForm } from '@/api/system/cars/type';
+import { listResident } from '@/api/system/resident';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
@@ -134,11 +88,6 @@ const total = ref(0);
 const queryFormRef = ref<ElFormInstance>();
 const carFormRef = ref<ElFormInstance>();
 
-const dialog = reactive<DialogOption>({
-  visible: false,
-  title: ''
-});
-
 const initFormData: CarForm = {
   id: undefined,
   areaId: undefined,
@@ -177,27 +126,24 @@ const data = reactive<PageData<CarForm, CarQuery>>({
 
 const { queryParams, form, rules } = toRefs(data);
 
+/** 持有人 */
+const ResidentList = ref([]);
+const getResidentName = (id: string | number) => {
+  const find = ResidentList.value.find((item) => item.id === id);
+  return find.name;
+};
+
 /** 查询车辆管理列表 */
 const getList = async () => {
   loading.value = true;
   const res = await listCar(queryParams.value);
+  const res1 = await listResident();
+  ResidentList.value = res1.rows;
   carList.value = res.rows;
   total.value = res.total;
   loading.value = false;
 };
 
-/** 取消按钮 */
-const cancel = () => {
-  reset();
-  dialog.visible = false;
-};
-
-/** 表单重置 */
-const reset = () => {
-  form.value = { ...initFormData };
-  carFormRef.value?.resetFields();
-};
-
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.value.pageNum = 1;
@@ -234,23 +180,6 @@ const handleUpdate = async (row?: CarVO) => {
   });
 };
 
-/** 提交按钮 */
-const submitForm = () => {
-  carFormRef.value?.validate(async (valid: boolean) => {
-    if (valid) {
-      buttonLoading.value = true;
-      if (form.value.id) {
-        await updateCar(form.value).finally(() => (buttonLoading.value = false));
-      } else {
-        await addCar(form.value).finally(() => (buttonLoading.value = false));
-      }
-      proxy?.$modal.msgSuccess('操作成功');
-      dialog.visible = false;
-      await getList();
-    }
-  });
-};
-
 /** 删除按钮操作 */
 const handleDelete = async (row?: CarVO) => {
   const _ids = row?.id || ids.value;
@@ -260,17 +189,6 @@ const handleDelete = async (row?: CarVO) => {
   await getList();
 };
 
-/** 导出按钮操作 */
-const handleExport = () => {
-  proxy?.download(
-    'car/car/export',
-    {
-      ...queryParams.value
-    },
-    `car_${new Date().getTime()}.xlsx`
-  );
-};
-
 onMounted(() => {
   getList();
 });