fix bug

张红振
1 parent 861809b7
Showing 7 changed files with 26 additions and 29 deletions
src/style/element.scss
src/views/community/housekeeper/houseDetail.vue
src/views/community/housekeeper/index.vue
src/views/community/houses/detail.vue
src/views/community/houses/index.vue
src/views/community/residence/communityDetail.vue
src/views/community/residence/index.vue
@@ -10,5 +10,5 @@
   width: 100%;
 }
 .el-form--inline .el-form-item {
-  margin-right: 0;
+  // margin-right: 0;
 }
 \ No newline at end of file
 <script setup lang="ts">
-import { reactive, ref, watch, onMounted } from "vue";
+import { reactive, ref, onMounted, getCurrentInstance } from "vue";
 import type { ElForm } from "element-plus";
-import { ElMessage } from "element-plus";
 import { addOrUpdate } from "@/api/community/housekeeper.ts";
 import { getTableList } from "@/api/community/residence.ts";
+
 const ruleFormRef = ref<InstanceType<typeof ElForm>>();
+let instance: ComponentInternalInstance | null = getCurrentInstance(); //获取app实例
 // 声明props
 const props = defineProps({
   formObj: {
@@ -30,7 +31,7 @@ let data = reactive({
  * 获取下拉数据
  */
 const getSelectList: void = () => {
-  getTableList({ pageNum: 1, pageSize: 1000,type:0 })
+  getTableList({ pageNum: 1, pageSize: 1000, type: 0 })
     .then((res) => {
       data.options = res.data.data.list;
     })
@@ -39,8 +40,8 @@ const getSelectList: void = () =&gt; {
     });
 };
 onMounted(() => {
-  getSelectList()
-})
+  getSelectList();
+});
 // 表单验证
 const rules = reactive({
   neighborhoodId: [
@@ -114,10 +115,8 @@ let submitForm = (formEl: InstanceType&lt;typeof ElForm&gt; | undefined) =&gt; {
         emit("success");
       });
     } else {
-      ElMessage({
-        message: "请完善信息",
-        type: "error",
-      });
+      instance?.proxy?.$message.error("请完善信息"); //调用
+
       loading.value = false;
       return false;
     }
 <script setup lang="ts">
-import { reactive, onMounted, ref } from "vue";
-import { getTableList, deleteBuilding } from "@/api/community/housekeeper.ts";
+import { reactive, onMounted } from "vue";
+import { getTableList, deleteBuilding,getCurrentInstance } from "@/api/community/housekeeper.ts";
 import { parseTime } from "@/utils/tool.ts";
 import HouseDetail from "./houseDetail.vue";
 import Pagination from "@/components/Pagination/index.vue";
-import { ElMessage } from "element-plus";
+
+let instance: ComponentInternalInstance | null = getCurrentInstance();//获取app实例
 // 数据筛选
 const searchData = reactive({
   neighborhoodId: null,
@@ -55,7 +56,7 @@ const edit = (row: Object) =&gt; {
  */
 const remove = (buildingId: number) => {
   deleteBuilding({ buildingId: buildingId }).then((res) => {
-    ElMessage.success("操作成功");
+    instance?.proxy?.$message.success('操作成功')//调用
     search();
   });
 };
 <script setup lang="ts">
-import { reactive, ref, onMounted } from "vue";
+import { reactive, onMounted } from "vue";
 import { getHouse } from "@/api/community/houses.ts";
 // 声明props
@@ -9,7 +9,6 @@ const props = defineProps({
     default: {},
   },
 });
-console.log(props.formObj);
 </script>
 <template>
 <script setup lang="ts">
-import { reactive, onMounted, ref } from "vue";
+import { reactive, onMounted,getCurrentInstance } from "vue";
 import { getTableList, deleteHouse,getHouse } from "@/api/community/houses.ts";
 import { parseTime } from "@/utils/tool.ts";
 import Detail from "./detail.vue";
 import Pagination from "@/components/Pagination/index.vue";
-import { ElMessage } from "element-plus";
+
+let instance: ComponentInternalInstance | null = getCurrentInstance();//获取app实例
 // 数据筛选
 const searchData = reactive({
   buildingId: 1,
@@ -57,7 +58,7 @@ const check = (houseId: number) =&gt; {
  */
 const remove = (houseId: number) => {
   deleteHouse({ houseId: houseId }).then((res) => {
-    ElMessage.success("操作成功");
+    instance?.proxy?.$message.success('操作成功')//调用
     search();
   });
 };
 <script setup lang="ts">
-import { reactive, ref, watch, onMounted } from "vue";
+import { reactive, ref, onMounted,getCurrentInstance } from "vue";
 import type { ElForm } from "element-plus";
 import { ElMessage } from "element-plus";
 import { addOrUpdate } from "@/api/community/residence.ts";
 const ruleFormRef = ref<InstanceType<typeof ElForm>>();
+let instance: ComponentInternalInstance | null = getCurrentInstance();//获取app实例
 // 声明props
 const props = defineProps({
   formObj: {
@@ -83,14 +84,10 @@ let submitForm = (formEl: InstanceType&lt;typeof ElForm&gt; | undefined) =&gt; {
     if (valid) {
       console.log("111")
       addOrUpdate(props.formObj).then((res) => {
-        console.log(res);
         emit("success");
       });
     } else {
-      ElMessage({
-        message: "请完善信息",
-        type: "error",
-      });
+      instance?.proxy?.$message.error('请完善信息')//调用
       loading.value = false;
       return false;
     }
 <script setup lang="ts">
-import { reactive, onMounted, ref } from "vue";
+import { reactive, onMounted,getCurrentInstance } from "vue";
 import { getTableList, deleteNeighborhood } from "@/api/community/residence.ts";
 import CommunityDetail from "./communityDetail.vue";
 import Pagination from "@/components/Pagination/index.vue";
-import { ElMessage } from "element-plus";
+
+let instance: ComponentInternalInstance | null = getCurrentInstance();//获取app实例
 // 数据筛选
 const searchData = reactive({
   propertyId: 1,
@@ -46,7 +47,6 @@ const search = (): void =&gt; {
 const edit = (row: Object) => {
   data.formObj = row;
   data.dialogVisible = true;
-  console.log(data.formObj);
 };
 /**
  * 删除
@@ -54,7 +54,7 @@ const edit = (row: Object) =&gt; {
  */
 const remove = (neighborhoodId: number) => {
   deleteNeighborhood({ neighborhoodId: neighborhoodId }).then((res) => {
-    ElMessage.success("操作成功");
+    instance?.proxy?.$message.success('操作成功')//调用
     search();
   });
 };