fix bug

张红振
1 parent aa317845
Showing 9 changed files with 34 additions and 16 deletions
src/views/community/housekeeper/houseDetail.vue
src/views/community/housekeeper/index.vue
src/views/community/residence/communityDetail.vue
src/views/housekeeper/buildinMganager/detail.vue
src/views/housekeeper/buildinMganager/index.vue
src/views/maintain/detail.vue
src/views/maintain/index.vue
src/views/serviceman/detail.vue
src/views/serviceman/index.vue
@@ -84,7 +84,7 @@ const rules = reactive({
     {
       required: true,
       message: "请输入建筑面积",
-      trigger: "change",
+      trigger: "blur",
     },
     {
       type: "number",
@@ -92,6 +92,7 @@ const rules = reactive({
       max: 1000,
       transform: (value) => Number(value),
     },
+    { whitespace: true, message: "请输入正确的建筑面积", trigger: "blur" },
   ],
   houseCount: [
     {
@@ -8,7 +8,7 @@ import Pagination from &quot;@/components/Pagination/index.vue&quot;;
 import { useRoute } from "vue-router";
 let instance: ComponentInternalInstance | null = getCurrentInstance(); //获取app实例
-const houseDetailRef = ref(null);
+const houseDetailRef = ref<FormInstance>();
 let route = useRoute(); // 路由
 // 数据筛选
@@ -30,6 +30,7 @@ const rules = reactive({
       message: "请输入小区名",
       trigger: "blur",
     },
+    { whitespace: true, message: "请输入正确的信息", trigger: "blur" },
   ],
   locality: [
     {
@@ -37,6 +38,7 @@ const rules = reactive({
       message: "请输入所在地区",
       trigger: "blur",
     },
+    { whitespace: true, message: "请输入正确的信息", trigger: "blur" },
   ],
   address: [
     {
@@ -44,6 +46,7 @@ const rules = reactive({
       message: "请输入地址",
       trigger: "blur",
     },
+    { whitespace: true, message: "请输入正确的信息", trigger: "blur" },
   ],
   buildingCount: [
     {
@@ -51,7 +54,7 @@ const rules = reactive({
       message: "请输入楼座数",
       trigger: "blur",
     },
-    { type: "number", message: "请输入数字,最大值不能超过5000",max:5000 }
+    { type: "number", message: "请输入数字,最大值不能超过5000", max: 5000 },
   ],
   storeroomCount: [
     {
@@ -59,7 +62,7 @@ const rules = reactive({
       message: "请输入储藏室数",
       trigger: "blur",
     },
-    { type: "number", message: "请输入数字,最大值不能超过5000",max:5000 }
+    { type: "number", message: "请输入数字,最大值不能超过5000", max: 5000 },
   ],
   truckSpaceCount: [
     {
@@ -67,7 +70,7 @@ const rules = reactive({
       message: "请输入车位数",
       trigger: "blur",
     },
-    { type: "number", message: "请输入数字,最大值不能超过5000",max:5000 }
+    { type: "number", message: "请输入数字,最大值不能超过5000", max: 5000 },
   ],
 });
@@ -69,6 +69,7 @@ const rules = reactive({
       message: "请输入姓名",
       trigger: "blur",
     },
+    { whitespace: true, message: "请输入正确的姓名", trigger: "blur" },
   ],
   mobile: [
     {
@@ -104,6 +105,7 @@ const rules = reactive({
       message: "请输入户籍所在地",
       trigger: "blur",
     },
+    { whitespace: true, message: "请输入正确信息", trigger: "blur" },
   ],
   birthdate: [
     {
@@ -118,6 +120,7 @@ const rules = reactive({
       message: "请输入民族",
       trigger: "blur",
     },
+    { whitespace: true, message: "请输入正确信息", trigger: "blur" },
   ],
 });
@@ -132,7 +135,7 @@ const emit = defineEmits&lt;{
  */
 let submitForm = (formEl: InstanceType<typeof ElForm> | undefined) => {
   loading.value = true;
-  console.log(!formEl)
+  console.log(!formEl);
   if (!formEl) return;
   formEl.validate((valid) => {
     if (valid) {
@@ -145,7 +148,7 @@ let submitForm = (formEl: InstanceType&lt;typeof ElForm&gt; | undefined) =&gt; {
           loading.value = false;
         });
     } else {
-      console.log(111)
+      console.log(111);
       instance?.proxy?.$message.error("请完善信息"); //调用
       loading.value = false;
       return false;
@@ -6,7 +6,7 @@ import Pagination from &quot;@/components/Pagination/index.vue&quot;;
 let instance: ComponentInternalInstance | null = getCurrentInstance(); //获取app实例
-const detailRef = ref(null);
+const detailRef = ref<FormInstance>()
 // 数据筛选
 const searchData = reactive({
   type: "",
 <script setup lang="ts">
-import { reactive, ref, onMounted, getCurrentInstance } from "vue";
+import { reactive, ref, onMounted, getCurrentInstance,defineExpose } from "vue";
 import type { ElForm } from "element-plus";
 import { insertOrUpdate } from "@/api/notify/maintain.ts";
@@ -26,6 +26,7 @@ const rules = reactive({
       message: "请输入项目名称",
       trigger: "blur",
     },
+    { whitespace: true, message: "请输入正确的项目名称", trigger: "blur" },
   ],
   status: [
     {
@@ -35,7 +36,12 @@ const rules = reactive({
     },
   ],
 });
-
+/**
+ * 重置
+ */
+let resetForm = () => {
+  ruleFormRef.value.resetFields();
+};
 const emit = defineEmits<{
   (e: "cancel"): void;
   (e: "success"): void;
@@ -66,6 +72,9 @@ let submitForm = (formEl: InstanceType&lt;typeof ElForm&gt; | undefined) =&gt; {
   });
 };
+defineExpose({
+  resetForm,
+});
 /**
  * 取消提交
  */
 <script setup lang="ts">
-import { reactive, onMounted, getCurrentInstance } from "vue";
+import { reactive, onMounted, getCurrentInstance,ref } from "vue";
 import { getTableList, deleteMaintainById } from "@/api/notify/maintain.ts";
 import { parseTime } from "@/utils/tool.ts";
 import Detail from "./detail.vue";
@@ -8,7 +8,7 @@ import Pagination from &quot;@/components/Pagination/index.vue&quot;;
 import { useLoginStore } from "@/pinia/login";
 let instance: ComponentInternalInstance | null = getCurrentInstance(); //获取app实例
-
+const detailRef = ref<FormInstance>()
 // 数据筛选
 const searchData = reactive({
   name: null,
@@ -88,6 +88,8 @@ const changeData: void = () =&gt; {
 const dialogClose: void = () => {
   data.title = "新增项目";
   data.formObj = {};
+    detailRef.value.resetForm();
+
 };
 onMounted(() => {
   search();
@@ -172,6 +174,7 @@ onMounted(() =&gt; {
       @close="dialogClose"
     >
       <Detail
+       ref="detailRef"
         @cancel="data.dialogVisible = false"
         @success="changeData"
         :formObj="data.formObj"
@@ -63,9 +63,10 @@ const rules = reactive({
   name: [
     {
       required: true,
-      message: "请输入小区名",
+      message: "请输入姓名",
       trigger: "blur",
     },
+    { whitespace: true, message: "请输入正确信息", trigger: "blur" },
   ],
   age: [
     {
@@ -6,7 +6,7 @@ import { parseTime } from &quot;@/utils/tool.ts&quot;;
 import Pagination from "@/components/Pagination/index.vue";
 let instance: ComponentInternalInstance | null = getCurrentInstance(); //获取app实例
-const detailRef = ref<InstanceType<typeof ElForm>>();
+const detailRef = ref<FormInstance>();
 // 数据筛选
 const searchData = reactive({
   name: null,
@@ -107,8 +107,6 @@ onMounted(() =&gt; {
       >
       <el-row>
         <el-form-item>
-          <!-- <el-button type="primary">导入</el-button>
-          <el-button type="primary">导出</el-button> -->
           <el-button type="primary" @click="data.dialogVisible = true"
             >新增</el-button
           >