Merge branch 'dev'

杨泽宇
2 parents 37bf5f50 9c46d9fd
Showing 6 changed files with 66 additions and 22 deletions
src/views/community/housekeeper/changeAdmin.vue
src/views/community/housekeeper/index.vue
src/views/community/residence/communityDetail.vue
src/views/event/handwork/edit.vue
src/views/housekeeper/buildinMganager/index.vue
src/views/notify/index.vue
@@ -51,8 +51,8 @@ const search = (): void =&gt; {
   data.loading = true;
   getTableList(searchData)
     .then((res) => {
-      data.tableList = res.data.data;
-      data.total = res.data.data.length;
+      data.tableList = res.data.data.list;
+      data.total = res.data.data.total;
       data.loading = false;
     })
     .catch((err) => {
@@ -114,7 +114,7 @@ watchEffect(() =&gt; {
 <template>
   <div>
     <!-- 搜索 -->
-    <el-form :inline="true" :model="searchData" v-loading="data.loading">
+    <el-form :inline="true" :model="searchData" >
       <el-form-item>
         <el-input
           style="width: 280px"
@@ -141,6 +141,7 @@ watchEffect(() =&gt; {
       :data="data.tableList"
       @selection-change="handleSelectionChange"
       ref="multipleTableRef"
+      v-loading="data.loading"
     >
       <el-table-column type="selection" width="55"/>
       <el-table-column label="姓名" prop="name"></el-table-column>
@@ -6,7 +6,8 @@ import HouseDetail from &quot;./houseDetail.vue&quot;;
 import ChangeAdmin from "./changeAdmin.vue";
 import Pagination from "@/components/Pagination/index.vue";
 import { useRoute } from "vue-router";
-import type { ElForm } from 'element-plus'
+import type { ElForm } from "element-plus";
+import File from "@/components/FileUpload/index.vue";
 let instance: ComponentInternalInstance | null = getCurrentInstance(); //获取app实例
 const houseDetailRef = ref<InstanceType<typeof ElForm>>();
@@ -59,7 +60,7 @@ const search = (): void =&gt; {
 const edit = (row: Object) => {
   data.title = "编辑楼宇";
   data.formObj = JSON.parse(JSON.stringify(row));
-  console.log( typeof data.formObj.grossArea);
+  console.log(typeof data.formObj.grossArea);
   data.formObj.neighborhoodId = JSON.parse(JSON.stringify(row)).neighborhoodId;
   data.dialogVisible = true;
 };
@@ -93,7 +94,7 @@ const changeData: void = () =&gt; {
  * 弹框关闭
  */
 const dialogClose: void = () => {
-  console.log(111)
+  console.log(111);
   data.title = "新增楼宇";
   data.formObj = {};
   houseDetailRef.value.resetForm();
@@ -121,6 +122,12 @@ const changeClose = () =&gt; {
   changeObj.originalId = null;
 };
 /**
+ * 下载模板
+ */
+const down = () => {
+  window.open(`${import.meta.env.VITE_BASE_URL}building.xlsx`);
+};
+/**
  * 监听路由参数变换
  */
 watchEffect(() => {
@@ -157,6 +164,14 @@ watchEffect(() =&gt; {
           <el-button type="primary" @click="data.dialogVisible = true"
             >新增</el-button
           >
+          <el-button type="success" @click="down()">下载模板</el-button>
+        </el-form-item>
+        <el-form-item>
+          <File
+            url="building/importExcel"
+            method="put"
+            @success="search"
+          ></File>
         </el-form-item>
       </el-row>
     </el-form>
@@ -196,10 +211,18 @@ watchEffect(() =&gt; {
           >
             <el-button type="text" size="mini" class="btn">房屋管理</el-button>
           </router-link>
-          <el-button type="text" size="mini" @click="edit(scope.row)" class="btn"
+          <el-button
+            type="text"
+            size="mini"
+            @click="edit(scope.row)"
+            class="btn"
             >编辑</el-button
           >
-          <el-button type="text" size="mini" @click="remove(scope.row.id)" class="btn"
+          <el-button
+            type="text"
+            size="mini"
+            @click="remove(scope.row.id)"
+            class="btn"
             >删除</el-button
           >
         </template>
@@ -247,7 +270,7 @@ watchEffect(() =&gt; {
 </template>
 <style scoped>
-.btn{
-  margin-left:8px
+.btn {
+  margin-left: 8px;
 }
 </style>
@@ -58,7 +58,7 @@ const rules = reactive({
   ],
   storeroomCount: [
     {
-      required: true,
+      required: false,
       message: "请输入储藏室数",
       trigger: "blur",
     },
@@ -66,7 +66,7 @@ const rules = reactive({
   ],
   truckSpaceCount: [
     {
-      required: true,
+      required: false,
       message: "请输入车位数",
       trigger: "blur",
     },
@@ -80,6 +80,19 @@ const checkPrice = (rules, value, callback) =&gt; {
   }
 };
 /**
+ * 图集校验
+ * @param {object} rules 验证规则
+ * @param {string} value 待验证数值
+ * @callback checkPic~checkCallback
+ */
+const checkPic = (rules, value, callback) => {
+  if(form.publicityPic.length) {
+    callback()
+  } else {
+    callback(new Error('请上传宣传图片'))
+  }
+}
+/**
  * 表单验证规则
  */
 const rules = reactive({
@@ -90,6 +103,21 @@ const rules = reactive({
       trigger: "change",
     },
   ],
+  publicityPic: [
+    {
+      required: true,
+      message: "请上传宣传图片",
+      trigger: "change",
+      validator: checkPic
+    },
+  ],
+  neighborhoodId: [
+    {
+      required: true,
+      message: "请选择小区",
+      trigger: "change",
+    },
+  ],
   name: [
     {
       required: true,
@@ -413,14 +441,6 @@ onMounted(() =&gt; {
           />
         </el-form-item>
         <el-form-item label="流程介绍" prop="processDesc" style="width: 100%">
-          <!-- <el-input
-            v-model.trim="form.data.processDesc"
-            placeholder="请填写流程介绍"
-            maxlength="1500"
-            show-word-limit
-            :rows="5"
-            type="textarea"
-          /> -->
           <Tinymce v-model="form.data.processDesc"></Tinymce>
         </el-form-item>
         <el-form-item label="宣传图片" prop="publicityPic" style="width: 100%">
@@ -36,7 +36,7 @@ const search = (): void =&gt; {
   data.loading = true;
   getTableList(searchData)
     .then((res) => {
-      data.tableList = res.data.data;
+      data.tableList = res.data.data.list;
       data.total = res.data.data.total;
       data.loading = false;
     })
@@ -143,7 +143,7 @@ onMounted(() =&gt; {
         <el-form-item>
           <el-button type="primary" @click="getList">查询</el-button>
           <el-button type="primary">
-            <router-link to="/notify/edit">添加公告</router-link>
+            <router-link to="/notify/edit">新增公告</router-link>
           </el-button>
           <el-button
             type="danger"