8/6 校验问题

src/views/system/Sdb/ChargeItem/add.vue

@@ -80,6 +80,7 @@ import { ref } from 'vue';
 import PageHeader from '@/components/Pageheader/index.vue';
 import { getChargeItem, updateChargeItem, addChargeItem } from '@/api/system/SdbChargeItem';
 import { listChargeType } from '@/api/system/ChargeType';
+import { validator } from '@/utils/Reg';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { com_charge_item_unit } = toRefs<any>(proxy?.useDict('com_charge_item_unit'));
@@ -105,7 +106,17 @@ const form = ref({
   'formula': ''
 });
 const rules = ref({
-  itemName: [{ required: true, message: '请输入 项目名称', trigger: 'blur' }],
+  itemName: [
+    { required: true, message: '请输入 项目名称', trigger: 'blur' },
+    {
+      validator: (_: any, value: string | number, callback: (arg0?: Error) => any) => {
+        if (value === '' || value === undefined) {
+          return callback(new Error('请输入项目名称'));
+        }
+        return !validator(value, 'fullFilterReg') ? callback() : callback(new Error('请输入正确的项目名称'));
+      }
+    }
+  ],
   typeId: [{ required: true, message: '请选择 收费类型', trigger: 'blur' }],
   billingType: [{ required: true, message: '请输入 计费方式', trigger: 'blur' }],
   fixedPrice: [

src/views/system/Sdb/ChargeItem/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" :model="queryParams" :inline="true" @submit.prevent="handleQuery">
+          <el-form ref="queryFormRef" :rules="rules" :model="queryParams" :inline="true" @submit.prevent="handleQuery">
             <el-form-item label="项目名称" prop="itemName">
               <el-input maxlength="20" v-model="queryParams.itemName" placeholder="请输入项目名称" clearable @keyup.enter.prevent="handleQuery" />
             </el-form-item>
@@ -99,6 +99,7 @@ import DictTag from '@/components/DictTag/index.vue';
 import { listChargeItem, delChargeItem, updateChargeItem } from '@/api/system/SdbChargeItem';
 import { ChargeItemVO, ChargeItemQuery, ChargeItemForm } from '@/api/system/SdbChargeItem/type';
 import { checkPermi } from '@/utils/permission';
+import { validator } from '@/utils/Reg';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { com_charge_item_method } = toRefs<any>(proxy?.useDict('com_charge_item_method'));
@@ -128,10 +129,21 @@ const data = reactive<PageData<ChargeItemForm, ChargeItemQuery>>({
     pageSize: 10,
     itemName: undefined
   },
-  rules: {}
+  rules: {
+    itemName: [
+      {
+        validator: (_: any, value: string | number, callback: (arg0?: Error) => any) => {
+          if (value === '' || value === undefined) {
+            return callback();
+          }
+          return !validator(value, 'fullFilterReg') ? callback() : callback(new Error('请输入正确的项目名称'));
+        }
+      }
+    ]
+  }
 });
 
-const { queryParams } = toRefs(data);
+const { queryParams, rules } = toRefs(data);
 
 /** 查询收费项目管理列表 */
 const getList = async () => {

src/views/system/Sdb/PayRecord/index.vue

@@ -48,14 +48,11 @@
             <span>{{ parseTime(scope.row.recordMonth, '{y}-{m}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="开始日期" align="center" prop="startTime" width="180">
+        <el-table-column label="起止日期" width="250" align="center">
           <template #default="scope">
-            <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="结束日期" align="center" prop="endTime" width="180">
-          <template #default="scope">
-            <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
+            <span>{{ parseTime(scope.row.startTime, '{y}/{m}/{d}') }}</span>
+            <span> - </span>
+            <span>{{ parseTime(scope.row.endTime, '{y}/{m}/{d}') }}</span>
           </template>
         </el-table-column>
         <el-table-column label="创建时间" align="center" prop="recordMonth" width="180">

src/views/system/Sdb/SdbCashier/index.vue

@@ -105,7 +105,6 @@
     </div>
     <el-card class="flex-1" shadow="never">
       <el-table
-        :default-sort="{ prop: 'residentName', order: 'descending' }"
         v-loading="loading"
         border
         :data="tableData"
@@ -157,7 +156,7 @@
         <el-table-column label="优惠金额" width="100" align="center" prop="singleDiscountAmount" />
         <el-table-column label="实缴金额" width="100" align="center" prop="actualAccount" />
         <el-table-column label="缴费人" width="120" align="center" prop="residentName" />
-        <el-table-column label="缴费时间" width="200" sortable align="center" prop="payTime" />
+        <el-table-column label="缴费时间" width="200"  align="center" prop="payTime" />
         <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
         <el-table-column label="操作" width="110" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
@@ -557,6 +556,7 @@ function handleChargeItem(id: string) {
 // 选择楼栋
 function handleChangeBuilding(val: string): void {
   queryParams.value.unitNoId = undefined;
+  queryParams.value.houseId = undefined;
   unitList.value = [];
   getHouselistAPI(val).then((res) => {
     unitList.value = res.data.units;