bug#416,#417,#380,#422,共性需求,服务找人,公共服务中批量删除按钮布局

src/views/main-content.vue

@@ -28,7 +28,7 @@
           :key="item.name"
           :name="item.name"
           :label="item.title"
-          :closable=" item.name !== 'home'"
+          :closable="item.name !== 'home'"
           :class="{ 'is-iframe': tabIsIframe(item.iframeURL) }"
         >
           <template v-if="tabIsIframe(item.iframeURL)">
@@ -183,6 +183,8 @@ export default {
       tab = this.$store.state.contentTabs.filter(
         (item) => item.name === tab.name
       )[0];
+
+      this.$store.state.LevelTowMenuActiveName = tab.menuId || "";
       if (tab) {
         this.$router.push({
           name: tab.name,

src/views/main-sidebar.vue

@@ -126,7 +126,6 @@ export default {
   },
   methods: {
     toIndexPage() {
-      // this.$store.state.LevelOneMenuActiveName = "";
       this.$router.push({ name: "home" });
       // this.$router.replace("/index");
     },
@@ -143,10 +142,12 @@ export default {
           this.$router.push({ name: route.name });
         }
       }
-      this.$store.state.LevelOneMenuActiveName = menuId;
-      this.$store.state.sidebarActiveSubMenuList =
         this.$store.state.sidebarMenuList[idx].children || [];
-      this.$store.state.LevelTowMenuActiveName = "";
+        const { sidebarMenuList } = this.$store.state;
+        const firstChild = sidebarMenuList[idx].children[0];
+        const id = firstChild.children.length === 0 ? firstChild.id : firstChild.children[0].id;
+        this.$store.state.LevelTowMenuActiveName = id;
+
     },
   },
 };

src/views/modules/base/huji/immigration/index.vue

@@ -423,13 +423,13 @@
 
 				<div>
 					<el-pagination
+					:current-page="pageNo"
+					:page-sizes="[10, 20, 50, 100]"
+					:page-size="pageSize"
+					:total="total"
+					layout="total, sizes, prev, pager, next"
 					@size-change="handleSizeChange"
 					@current-change="handleCurrentChange"
-						:current-page.sync="pageNo"
-						:page-sizes="[20, 50, 100, 200]"
-						:page-size="parseInt(pageSize)"
-						layout="sizes, prev, pager, next, total"
-						:total="total"
 				>
 				</el-pagination>
 				</div>

src/views/modules/communityService/fuwuzhaoren/index.vue

@@ -164,6 +164,9 @@
                       size="small"
                       class="diy-button--white el-button--default"
                       >导出</el-button>
+              <el-button   type="primary" @click="onDeleteBatch" size="small">
+                批量删除
+            </el-button>
         </div>
 
         <el-table :data="tableData"
@@ -284,9 +287,7 @@
         </el-table>
 
         <div>
-            <el-button @click="onDeleteBatch" size="small" style="margin-top: 15px;">
+          
-                批量删除
-            </el-button>
           <el-pagination @size-change="handleSizeChange"
                          @current-change="handleCurrentChange"
                          :current-page.sync="pageNo"
@@ -416,7 +417,7 @@ export default {
       tableLoading: false,
       user: {},
       agencyId: '',
-      searchH:170,
+      searchH:0,
       tableData: [],
 
       statusArray: [
@@ -493,8 +494,8 @@ export default {
   computed: {
     maxTableHeight () {
       const h =
-      this.clientHeight - this.searchH - 275 + this.iframeHeight;
+      this.clientHeight - this.searchH - 450 + this.iframeHeight;
-      const _h = this.clientHeight - 275 - this.searchH;
+      const _h = this.clientHeight - 450 - this.searchH;
       return this.$store.state.inIframe ? h : _h;
     },
     ...mapGetters(["clientHeight", "iframeHeight"]),

src/views/modules/communityService/gxxq/index.vue

@@ -138,6 +138,9 @@
         >
           导出</el-button
         >
+        <el-button @click="deleteBatch" type="primary" size="small">
+          批量删除
+        </el-button>
       </div>
       <el-table
         ref="gxxq_table"
@@ -211,11 +214,8 @@
         </el-table-column>
       </el-table>
 
-      <div class="div-flex">
+      <div>
         <div class="m-page">
-          <el-button @click="deleteBatch" size="small" style="margin-top: 15px;">
-                批量删除
-        </el-button>
           <el-pagination
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
@@ -296,10 +296,11 @@ export default {
         return time.getTime() > nowData;
       }
     };
-      let startDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+    let startDisabledDate = (time) => {
-        let nowData = Date.now()
+      //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
-        return time.getTime() > nowData 
+      let nowData = Date.now();
-      }
+      return time.getTime() > nowData;
+    };
     return {
       // 公共服务分类
       serviceTypesLevel1: [],
@@ -327,10 +328,10 @@ export default {
         },
       ],
       endPickerOptions: {
-          disabledDate: endDisabledDate
+        disabledDate: endDisabledDate,
       },
       startPickerOptions: {
-          disabledDate: startDisabledDate
+        disabledDate: startDisabledDate,
       },
       selection: [],
       selAllFlag: false,
@@ -366,14 +367,14 @@ export default {
     },
     addFormCancle() {
       this.formShow = false;
-      this.formEditShow = false
+      this.formEditShow = false;
     },
-    handelSelection(row){
+    handelSelection(row) {
-        this.selection = row
+      this.selection = row;
     },
     addFormOk() {
       this.formShow = false;
-      this.formEditShow = false
+      this.formEditShow = false;
       this.getCommonDemandList();
     },
     selectAll(selection) {
@@ -402,12 +403,12 @@ export default {
     handleEdit(row) {
       this.gxxqId = row.id;
       this.commonServiceTypeName = row.commonServiceTypeName;
-      this.serviceTypesLevel1 = this.serviceTypesLevel1
+      this.serviceTypesLevel1 = this.serviceTypesLevel1;
       this.formEditShow = true;
     },
     async handleChu() {
       const url = "/governance/commonDemand/export";
-      const {pageSize, pageNo, formData} = this;
+      const { pageSize, pageNo, formData } = this;
       axios({
         url: window.SITE_CONFIG["apiURL"] + url,
         method: "post",
@@ -423,7 +424,7 @@ export default {
             res.headers["content-disposition"].split(";")[1].split("=")[1]
           );
           console.log("filename", fileName);
-            let blob = new Blob([res.data], {type: "application/vnd.ms-excel"});
+          let blob = new Blob([res.data], { type: "application/vnd.ms-excel" });
           var url = window.URL.createObjectURL(blob);
           var aLink = document.createElement("a");
           aLink.style.display = "none";

src/views/modules/plugins/change/changedeath.vue

@@ -218,7 +218,7 @@
         :page-sizes="[10, 20, 50, 100]"
         :page-size="pageSize"
         :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
+        layout="total, sizes, prev, pager, next"
         @size-change="pageSizeChangeHandle"
         @current-change="pageCurrentChangeHandle"
       >

src/views/modules/plugins/change/changerelocation.vue

@@ -333,7 +333,7 @@
         :page-sizes="[10, 20, 50, 100]"
         :page-size="pageSize"
         :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
+        layout="total, sizes, prev, pager, next"
         @size-change="pageSizeChangeHandle"
         @current-change="pageCurrentChangeHandle"
       >