diff --git a/src/views/main-content.vue b/src/views/main-content.vue index ae837feac..61dc9ac17 100644 --- a/src/views/main-content.vue +++ b/src/views/main-content.vue @@ -22,13 +22,13 @@ @tab-click="tabSelectedHandle" @tab-remove="tabRemoveHandle" > - + - + item.name === tab.name )[0]; + + this.$store.state.LevelTowMenuActiveName = tab.menuId || ""; if (tab) { this.$router.push({ name: tab.name, diff --git a/src/views/main-sidebar.vue b/src/views/main-sidebar.vue index a12bd92bb..e7afaf8d6 100644 --- a/src/views/main-sidebar.vue +++ b/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; + }, }, }; diff --git a/src/views/modules/base/huji/immigration/index.vue b/src/views/modules/base/huji/immigration/index.vue index e305aa65a..c649ae9a0 100644 --- a/src/views/modules/base/huji/immigration/index.vue +++ b/src/views/modules/base/huji/immigration/index.vue @@ -423,15 +423,15 @@
- + :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" + > +
diff --git a/src/views/modules/communityService/commonDemand/index.vue b/src/views/modules/communityService/commonDemand/index.vue index 42348fc1b..b34b0a56d 100644 --- a/src/views/modules/communityService/commonDemand/index.vue +++ b/src/views/modules/communityService/commonDemand/index.vue @@ -1,223 +1,270 @@ + + + +
+ +
- - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + props: { + serviceCategoryKey: { + type: String, + required: "true", + }, + }, +}; + +@import "@/assets/scss/buttonstyle.scss"; +@import "@/assets/scss/modules/management/list-main.scss"; +@import "@/assets/scss/modules/shequzhili/event-info.scss"; + diff --git a/src/views/modules/communityService/fuwuzhaoren/index.vue b/src/views/modules/communityService/fuwuzhaoren/index.vue index cf83246e0..2c09be7df 100644 --- a/src/views/modules/communityService/fuwuzhaoren/index.vue +++ b/src/views/modules/communityService/fuwuzhaoren/index.vue @@ -164,6 +164,9 @@ size="small" class="diy-button--white el-button--default" >导出 + + 批量删除 +
- - 批量删除 - + 导出 + + 批量删除 +
-
+
- - 批量删除 - nowData; } }; - let startDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键 - let nowData = Date.now() - return time.getTime() > nowData - } + let startDisabledDate = (time) => { + //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键 + let nowData = Date.now(); + return time.getTime() > nowData; + }; return { // 公共服务分类 serviceTypesLevel1: [], @@ -327,11 +328,11 @@ export default { }, ], endPickerOptions: { - disabledDate: endDisabledDate - }, - startPickerOptions: { - disabledDate: startDisabledDate - }, + disabledDate: endDisabledDate, + }, + startPickerOptions: { + disabledDate: startDisabledDate, + }, selection: [], selAllFlag: false, tableData: [], @@ -366,14 +367,14 @@ export default { }, addFormCancle() { this.formShow = false; - this.formEditShow = false + this.formEditShow = false; }, - handelSelection(row){ - this.selection = row + handelSelection(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", @@ -418,26 +419,26 @@ export default { }, responseType: "blob", }) - .then((res) => { - let fileName = window.decodeURI( - res.headers["content-disposition"].split(";")[1].split("=")[1] - ); - console.log("filename", fileName); - 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"; - aLink.href = url; - aLink.setAttribute("download", fileName); - document.body.appendChild(aLink); - aLink.click(); - document.body.removeChild(aLink); //下载完成移除元素 - window.URL.revokeObjectURL(url); //释放掉blob对象 - }) - .catch((err) => { - console.log("获取导出情失败", err); - return this.$message.error("网络错误"); - }); + .then((res) => { + let fileName = window.decodeURI( + res.headers["content-disposition"].split(";")[1].split("=")[1] + ); + console.log("filename", fileName); + 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"; + aLink.href = url; + aLink.setAttribute("download", fileName); + document.body.appendChild(aLink); + aLink.click(); + document.body.removeChild(aLink); //下载完成移除元素 + window.URL.revokeObjectURL(url); //释放掉blob对象 + }) + .catch((err) => { + console.log("获取导出情失败", err); + return this.$message.error("网络错误"); + }); }, handleSizeChange(val) { console.log(`每页 ${val} 条`); @@ -502,23 +503,23 @@ export default { }); }, deleteBatch() { - if (this.selection.length > 0) { - this.$confirm("删除之后无法恢复，确认删除？", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - }) - .then(() => { - this.deleteresiBatch(); - }) - .catch((err) => { - if (err == "cancel") { - } - }); - } else { - this.$message.warning("请先选择要删除的需求"); + if (this.selection.length > 0) { + this.$confirm("删除之后无法恢复，确认删除？", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.deleteresiBatch(); + }) + .catch((err) => { + if (err == "cancel") { } - }, + }); + } else { + this.$message.warning("请先选择要删除的需求"); + } + }, // 获取服务组织 async getDictOptions() { this.$http diff --git a/src/views/modules/plugins/change/changedeath.vue b/src/views/modules/plugins/change/changedeath.vue index b579016b8..da02e7473 100644 --- a/src/views/modules/plugins/change/changedeath.vue +++ b/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" > diff --git a/src/views/modules/plugins/change/changerelocation.vue b/src/views/modules/plugins/change/changerelocation.vue index a15e6a885..f62cc9df5 100644 --- a/src/views/modules/plugins/change/changerelocation.vue +++ b/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" >