Browse Source

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

feature
mk 2 years ago
parent
commit
90af45b4fe
  1. 8
      src/views/main-content.vue
  2. 9
      src/views/main-sidebar.vue
  3. 18
      src/views/modules/base/huji/immigration/index.vue
  4. 1548
      src/views/modules/communityService/commonDemand/index.vue
  5. 13
      src/views/modules/communityService/fuwuzhaoren/index.vue
  6. 111
      src/views/modules/communityService/gxxq/index.vue
  7. 2
      src/views/modules/plugins/change/changedeath.vue
  8. 2
      src/views/modules/plugins/change/changerelocation.vue

8
src/views/main-content.vue

@ -22,13 +22,13 @@
@tab-click="tabSelectedHandle"
@tab-remove="tabRemoveHandle"
>
<!-- item.name !== 'indexWork', -->
<!-- item.name !== 'indexWork', -->
<el-tab-pane
v-for="item in $store.state.contentTabs"
: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)">
@ -71,7 +71,7 @@
@close="handleClose(item, index)"
/>
</template>
<el-dialog
:title="dialogTitle"
:visible.sync="dialogFormVisible"
@ -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,

9
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;
},
},
};

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

@ -423,15 +423,15 @@
<div>
<el-pagination
@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>
: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"
>
</el-pagination>
</div>
</div>
</div>

1548
src/views/modules/communityService/commonDemand/index.vue

File diff suppressed because it is too large

13
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;
const _h = this.clientHeight - 275 - this.searchH;
this.clientHeight - this.searchH - 450 + this.iframeHeight;
const _h = this.clientHeight - 450 - this.searchH;
return this.$store.state.inIframe ? h : _h;
},
...mapGetters(["clientHeight", "iframeHeight"]),

111
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) => {//datareturn
let nowData = Date.now()
return time.getTime() > nowData
}
let startDisabledDate = (time) => {
//datareturn
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

2
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"
>

2
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"
>

Loading…
Cancel
Save