8/4 更新 输入限制，修复收银台

src/views/system/resident/addResident.vue

@@ -14,11 +14,10 @@
             <el-col :span="2"></el-col>
             <el-col :span="11">
               <el-form-item label="住户姓名" prop="name">
-                <el-input maxlength="15" show-word-limit v-model.trim="form.name" placeholder="请输入住户姓名" />
+                <el-input maxlength="10" show-word-limit v-model.trim="form.name" placeholder="请输入住户姓名" />
               </el-form-item>
             </el-col>
           </el-row>
-
           <el-row>
             <el-col :span="11">
               <el-form-item label="住户性别" prop="gender">
@@ -51,7 +50,13 @@
               </el-form-item>
             </el-col>
           </el-row>
-
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="年龄" prop="age" v-if="form.idCardType !== '0'">
+                <el-input maxlength="3" v-model.number.trim="form.age" placeholder="年龄" />
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-row>
             <el-col :span="11">
               <el-form-item label="与业主的关系" prop="ownerRelationship">
@@ -152,12 +157,32 @@ const form = ref<ResidentForm>({
   cardImageFront: '',
   idCardType: '0', // 证件类型
   cardImageBack: '',
-  remark: '' //备注╬╬╬.╬╬╬╬╬
+  age: 0, //年龄
+  remark: '' //备注╬╬▓╬▐╬╬
 });
 const userHousePath = ref<CascaderValue>([]);
 const rules = ref({
   houseId: [{ required: true, message: '请选择房屋', trigger: 'blur' }],
-  name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
+  name: [
+    { required: true, message: '请输入名称', trigger: 'blur' },
+    {
+      validator: (_: any, val: string | number, callback: (arg0?: Error) => void) => {
+        if (val === '' || val === null || val === undefined) {
+          return callback(new Error('请输入名称'));
+        }
+        return validator(val, 'ChineseName') ? callback() : callback(new Error('请输入中文名称，1-10位字符'));
+      }
+    }
+  ],
+  age: [
+    { required: true, message: '请输入年龄', trigger: 'blur' },
+    {
+      validator: (_: any, value: string | number, callback: (arg0?: Error) => void) => {
+        return validator(value, 'age') ? callback() : callback(new Error('请输入正确的年龄'));
+      },
+      trigger: 'blur'
+    }
+  ],
   gender: [{ required: true, message: '请选择性别', trigger: 'blur' }],
   cardImageFront: [{ required: true, message: '请上传身份证照片', trigger: 'blur' }],
   cardImageBack: [{ required: true, message: '请上传身份证照片', trigger: 'blur' }],
@@ -266,7 +291,7 @@ const handleBeforeUpload = (uploadFile: UploadRawFile) => {
   }
   return true;
 };
-// !== 提交 =============================================================================
+// !==╬╬&╬╬╬ ╬ 提交 =============================================================================
 
 // 提交
 const submitForm = () => {

src/views/system/resident/index.vue

@@ -4,7 +4,7 @@
     <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" label-width="120" label-position="left" :model="queryParams" @submit.prevent="handleQuery" :inline="true">
+          <el-form ref="queryFormRef" label-width="100" label-position="left" :model="queryParams" @submit.prevent="handleQuery" :inline="true">
             <el-form-item label="与主业主关系" prop="ownerRelationship">
               <el-select v-model="queryParams.ownerRelationship" placeholder="请选择与主业主关系" style="width: 240px">
                 <el-option v-for="item in com_resident_relationship" :key="item.value" :label="item.label" :value="item.value" />
@@ -15,6 +15,12 @@
                 <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="name">
+              <el-input v-model.trim="queryParams.name" maxlength="10" placeholder="请输入住户姓名" />
+            </el-form-item>
+            <el-form-item label="房间号" prop="houseName">
+              <el-input v-model.trim="queryParams.houseName" maxlength="10" placeholder="请输入房间号" />
+            </el-form-item>
             <el-form-item>
               <el-button type="primary" @click="handleQuery">搜索</el-button>
               <el-button @click="resetQuery">重置</el-button>
@@ -170,10 +176,11 @@ const data = reactive<PageData<ResidentForm, ResidentQuery>>({
     date: '',
     ownerRelationship: null,
     status: null,
-
     houseId: null,
     buildingId: null,
-    unitNoId: null
+    unitNoId: null,
+    houseName: null,
+    name: null
   }
 });
 
@@ -199,7 +206,9 @@ const handleNodeClick = (data: Tree, node) => {
     ...{
       houseId: null,
       buildingId: null,
-      unitNoId: null
+      unitNoId: null,
+      houseName: null,
+      name: null
     },
     ...obj2
   };