fix bug

张红振
1 parent 3f5d5124
Showing 7 changed files with 40 additions and 23 deletions
src/components/Pagination/index.vue
src/views/community/housekeeper/houseDetail.vue
src/views/community/housekeeper/index.vue
src/views/community/residence/communityDetail.vue
src/views/community/residence/index.vue
src/views/housekeeper/buildinMganager/detail.vue
src/views/housekeeper/buildinMganager/index.vue
@@ -32,7 +32,7 @@ interface Props {
 }
 const props = withDefaults(defineProps<Props>(), {
   total: 0,
-  pageSizes: () => [10, 20, 50, 100],
+  pageSizes:()=> [10, 20, 50, 100],
   pageSize: 10,
   currentPage: 1,
 });
@@ -43,20 +43,32 @@ const emit = defineEmits&lt;{
   (e: "update:pageSize", val);
 }>();
  
-/**
- * 监听当前分页改变
- */
-const updateCurrentPage = (val) => {
-  console.log(val);
-  emit("update:currentPage", val);
-};
-/**
- * 监听个数改变
- */
-const updatePageSize = (val) => {
-  console.log(val);
-  emit("update:pageSize", val);
-};
+const currentPage = computed({
+  get: () => props.currentPage,
+  set: val => {
+    emit("update:currentPage", val);
+  }
+})
+const pageSize = computed({
+  get: () => props.pageSize,
+  set: val => {
+    emit("update:pageSize", val);
+  }
+})
+// /**
+//  * 监听当前分页改变
+//  */
+// const updateCurrentPage = (val) => {
+//   console.log(val);
+//   emit("update:currentPage", val);
+// };
+// /**
+//  * 监听个数改变
+//  */
+// const updatePageSize = (val) => {
+//   console.log(val);
+//   emit("update:pageSize", val);
+// };
  
 /**
  * @method handleSizeChange
@@ -80,13 +92,13 @@ const handleCurrentChange = (val) =&gt; {
   <div class="pagination-container">
     <el-pagination
       v-model:currentPage="currentPage"
-      :page-sizes="pageSizes"
       v-model:pageSize="pageSize"
+      :page-sizes="props.pageSizes"
       layout="total, sizes, prev, pager, next, jumper"
       :total="total"
       background
-      :onUpdate:currentPage="updateCurrentPage"
-      :onUpdate:pageSize="updatePageSize"
+      :onUpdate:currentPage="currentPage"
+      :onUpdate:pageSize="pageSize"
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
     >
@@ -127,6 +127,7 @@ let submitForm = (formEl: InstanceType&lt;typeof ElForm&gt; | undefined) =&gt; {
           emit('success')
         })
         .catch((err) => {
+          loading.value = false;
           console.log(err);
         });
     } else {
@@ -57,7 +57,7 @@ const search = (): void =&gt; {
  */
 const edit = (row: Object) => {
   data.title = "编辑楼宇";
-  data.formObj = row;
+  data.formObj = JSON.parse(JSON.stringify(row))
   data.dialogVisible = true;
 };
 /**
@@ -85,6 +85,8 @@ let submitForm = (formEl: InstanceType&lt;typeof ElForm&gt; | undefined) =&gt; {
       addOrUpdate(props.formObj).then((res) => {
          loading.value = false;
          emit("success");
+      }).catch((err) => {
+         loading.value = false;
       });
     } else {
       instance?.proxy?.$message.error('请完善信息')//调用
@@ -45,7 +45,7 @@ const search = (): void =&gt; {
  */
 const edit = (row: Object) => {
   data.title = "编辑小区";
-  data.formObj = row;
+  data.formObj = JSON.parse(JSON.stringify(row));
   data.dialogVisible = true;
 };
 /**
@@ -91,6 +91,8 @@ let submitForm = (formEl: InstanceType&lt;typeof ElForm&gt; | undefined) =&gt; {
       insertOrUpdate(props.formObj).then((res) => {
         loading.value = false;
         emit("success");
+      }).catch((err) => {
+        loading.value = false;
       });
     } else {
       instance?.proxy?.$message.error("请完善信息"); //调用
@@ -178,7 +180,7 @@ defineExpose({
     <el-form-item label="户籍所在地:" prop="censusRegister">
       <el-input
         v-model="props.formObj.censusRegister"
-        placeholder="请输入车位数"
+        placeholder="请输入户籍所在地"
       ></el-input>
     </el-form-item>
     <el-form-item label="出生日期:" prop="birthdate">
@@ -193,7 +195,7 @@ defineExpose({
     <el-form-item label="民族:" prop="nationality">
       <el-input
         v-model="props.formObj.nationality"
-        placeholder="请输入车位数"
+        placeholder="请输入民族"
       ></el-input>
     </el-form-item>
     <el-row>
@@ -50,7 +50,7 @@ const search = (): void =&gt; {
  */
 const edit = (row: Object) => {
   data.title = "编辑楼管";
-  data.formObj = row;
+  data.formObj = JSON.parse(JSON.stringify(row));
   data.dialogVisible = true;
 };
 /**