Skip to content

S
smart_gov_platform
Commit 1347829d authored by 赵啸非's avatar 赵啸非
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents c5c11c16 2f8de085
Hide whitespace changes
Inline Side-by-side
Showing with 220 additions and 93 deletions
base-manager-ui/admin/src/pages/basicset/business/components/businessTabs1.vue
View file @ 1347829d
......@@ -23,7 +23,16 @@
:loading="leftLoading"
size="middle"
:scroll="{ y: 540 }"
:pagination="false"
:pagination="{
showTotal: (total) => `共 ${total} 条`,
current: leftCurrent,
total: leftTotal,
showSizeChanger: true,
showQuickJumper: true,
pageSizeOptions: pageSizeOptions,
onChange: changeLeft,
onShowSizeChange: showSizeChange,
}"
:columns="leftColumns"
:expandIconColumnIndex="2"
:data-source="businessData"
......@@ -57,7 +66,7 @@
</a-table>
</div>
<!-- 分页 -->
<div class="pagination" v-if="leftTotal">
<!-- <div class="pagination" v-if="leftTotal">
<a-pagination
v-model="leftCurrent"
:show-total="(total) => `共 ${total} 条`"
......@@ -69,7 +78,7 @@
:pageSizeOptions="pageSizeOptions"
@showSizeChange="showSizeChange"
/>
</div>
</div> -->
</div>
<!-- 右 -->
<div class="right">
......@@ -104,7 +113,16 @@
bordered
:scroll="{ y: 540 }"
:loading="rightLoading"
:pagination="false"
:pagination="{
showTotal: (total) => `共 ${total} 条`,
current: rightCurrent,
total: rightTotal,
showSizeChanger: true,
showQuickJumper: true,
pageSizeOptions: pageSizeOptions,
onChange: changeRight,
onShowSizeChange: showSizeChangeRight,
}"
size="middle"
:expandIconColumnIndex="2"
:row-selection="{
......@@ -141,9 +159,10 @@
</a-table>
</div>
<!-- 分页 -->
<div class="pagination" v-if="rightTotal">
<!-- <div class="pagination" v-if="rightTotal">
<a-pagination
v-model="rightCurrent"
size="small"
:show-total="(total) => `共 ${total} 条`"
:total="rightTotal"
@change="changeRight"
......@@ -153,7 +172,7 @@
:pageSizeOptions="pageSizeOptions"
@showSizeChange="showSizeChangeRight"
/>
</div>
</div> -->
</div>
<!-- 新增对话框 -->
<addprofession
......
base-manager-ui/admin/src/pages/basicset/business/components/businessTabs2.vue
View file @ 1347829d
......@@ -50,7 +50,16 @@
bordered
size="middle"
:loading="leftLoading"
:pagination="false"
:pagination="{
showTotal: (total) => `共 ${total} 条`,
current: leftCurrent,
total: leftTotal,
showSizeChanger: true,
showQuickJumper: true,
pageSizeOptions: pageSizeOptions,
onChange: changeLeft,
onShowSizeChange: showSizeChange,
}"
:scroll="{ y: 530 }"
:columns="leftColumns"
:data-source="matterSiteData"
......@@ -63,8 +72,8 @@
</span>
</template>
<!-- 部门 -->
<template slot="deptCode" slot-scope="text">
{{ text.deptCode ? text.deptCode : "--" }}
<template slot="deptName" slot-scope="text">
{{ text.deptName ? text.deptName : "--" }}
</template>
<!-- 到现场次数 -->
<template slot="num" slot-scope="text">
......@@ -89,7 +98,7 @@
</a-table>
</div>
<!-- 分页 -->
<div class="pagination" v-if="leftTotal">
<!-- <div class="pagination" v-if="leftTotal">
<a-pagination
v-model="leftCurrent"
:show-total="(total) => `共 ${total} 条`"
......@@ -101,7 +110,7 @@
:pageSizeOptions="pageSizeOptions"
@showSizeChange="showSizeChange"
/>
</div>
</div> -->
</div>
<!-- 右 -->
<div class="right">
......@@ -132,7 +141,16 @@
bordered
:scroll="{ y: 530 }"
:loading="rightLoading"
:pagination="false"
:pagination="{
showTotal: (total) => `共 ${total} 条`,
current: rightCurrent,
total: rightTotal,
showSizeChanger: true,
showQuickJumper: true,
pageSizeOptions: pageSizeOptions,
onChange: changeRight,
onShowSizeChange: showSizeChangeRight,
}"
size="middle"
:row-selection="{
selectedRowKeys: selectedRowKeys,
......@@ -148,8 +166,8 @@
</span>
</template>
<!-- 部门 -->
<template slot="deptCode" slot-scope="text">
{{ text.deptCode ? text.deptCode : "--" }}
<template slot="deptName" slot-scope="text">
{{ text.deptName ? text.deptName : "--" }}
</template>
<template slot="action" slot-scope="text">
<a href="javascript:;" class="jion" @click="handleIn(text.id)"
......@@ -166,7 +184,7 @@
</a-table>
</div>
<!-- 分页 -->
<div class="pagination" v-if="rightTotal">
<!-- <div class="pagination" v-if="rightTotal">
<a-pagination
v-model="rightCurrent"
:show-total="(total) => `共 ${total} 条`"
......@@ -178,7 +196,7 @@
:pageSizeOptions="pageSizeOptions"
@showSizeChange="showSizeChangeRight"
/>
</div>
</div> -->
</div>
</div>
</template>
......@@ -200,10 +218,10 @@ const leftColumns = [
scopedSlots: { customRender: "index" },
},
{
title: "部门编号",
title: "部门",
width: "20%",
scopedSlots: {
customRender: "deptCode",
customRender: "deptName",
},
},
{
......@@ -235,10 +253,10 @@ const rightColumns = [
scopedSlots: { customRender: "num" },
},
{
title: "部门编号",
title: "部门",
width: "20%",
scopedSlots: {
customRender: "deptCode",
customRender: "deptName",
},
},
{
......@@ -316,6 +334,7 @@ export default {
}
this.leftTotal = pageInfo.totalResult;
this.matterSiteData = data;
console.log(data);
this.leftLoading = false;
},
// 获取事项列表
......
base-manager-ui/admin/src/pages/basicset/business/components/businessTabs3.vue
View file @ 1347829d
......@@ -24,7 +24,16 @@
bordered
size="middle"
:loading="Leftloading"
:pagination="false"
:pagination="{
showTotal: (total) => `共 ${total} 条`,
current: leftCurrent,
total: leftTotal,
showSizeChanger: true,
showQuickJumper: true,
pageSizeOptions: pageSizeOptions,
onChange: changeLeft,
onShowSizeChange: showSizeChange,
}"
:scroll="{ y: 530 }"
:columns="leftColumns"
:data-source="businessMatterData"
......@@ -50,7 +59,7 @@
</a-table>
</div>
<!-- 分页 -->
<div class="pagination" v-if="leftTotal">
<!-- <div class="pagination" v-if="leftTotal">
<a-pagination
v-model="leftCurrent"
:show-total="(total) => `共 ${total} 条`"
......@@ -62,7 +71,7 @@
:pageSizeOptions="pageSizeOptions"
@showSizeChange="showSizeChange"
/>
</div>
</div> -->
</div>
<!-- 右 -->
<div class="right">
......@@ -87,7 +96,15 @@
<!-- 表格 -->
<a-table
bordered
:pagination="false"
:pagination="{
current: rightCurrent,
total: rightTotal,
showSizeChanger: true,
showQuickJumper: true,
pageSizeOptions: pageSizeOptions,
onChange: changeRight,
onShowSizeChange: showSizeChangeRight,
}"
:scroll="{ y: 530 }"
:loading="rightloading"
size="middle"
......@@ -105,8 +122,8 @@
</span>
</template>
<!-- 部门 -->
<template slot="deptCode" slot-scope="text">
{{ text.deptCode ? text.deptCode : "--" }}
<template slot="deptName" slot-scope="text">
{{ text.deptName ? text.deptName : "--" }}
</template>
<template slot="action" slot-scope="text">
<a href="javascript:;" class="jion" @click="handleIn(text)">关联</a>
......@@ -114,7 +131,7 @@
</a-table>
</div>
<!-- 分页 -->
<div class="pagination" v-if="rightTotal">
<!-- <div class="pagination" v-if="rightTotal">
<a-pagination
v-model="rightCurrent"
:show-total="(total) => `共 ${total} 条`"
......@@ -126,7 +143,7 @@
:pageSizeOptions="pageSizeOptions"
@showSizeChange="showSizeChangeRight"
/>
</div>
</div> -->
</div>
<!-- 关联 -->
<a-modal
......@@ -281,10 +298,10 @@ const rightColumns = [
scopedSlots: { customRender: "num" },
},
{
title: "部门编号",
title: "部门",
width: "20%",
scopedSlots: {
customRender: "deptCode",
customRender: "deptName",
},
},
{
......
base-manager-ui/admin/src/pages/basicset/deploy/deploy.vue
View file @ 1347829d
......@@ -37,7 +37,16 @@
bordered
:scroll="{ y: 550 }"
:columns="columns"
:pagination="false"
:pagination="{
showTotal: (total) => `共 ${total} 条`,
current: current,
total: total,
showSizeChanger: true,
showQuickJumper: true,
pageSizeOptions: pageSizeOptions,
onChange: handleChange,
onShowSizeChange: showSizeChange,
}"
:data-source="modelList"
:rowKey="(record) => record.id"
>
......@@ -89,7 +98,7 @@
</a-table>
</div>
<!-- 分页 -->
<div class="pagination" v-if="total">
<!-- <div class="pagination" v-if="total">
<a-pagination
v-model="current"
:show-total="(total) => `共 ${total} 条`"
......@@ -101,7 +110,7 @@
:pageSizeOptions="pageSizeOptions"
@showSizeChange="showSizeChange"
/>
</div>
</div> -->
</a-card>
<!-- 新增模块 -->
<a-modal v-model="visible" :title="title" @cancel="handleClose">
......
base-manager-ui/admin/src/pages/basicset/dept/components/addWindowMatter.vue
View file @ 1347829d
......@@ -43,7 +43,17 @@
:loading="isLoading"
:scroll="{ y: 500 }"
size="middle"
:pagination="false"
:pagination="{
showTotal: (total) => `共 ${total} 条`,
current: current,
total: total,
size: 'middle',
showSizeChanger: true,
showQuickJumper: true,
pageSizeOptions: pageSizeOptions,
onChange: handleChange,
onShowSizeChange: showSizeChange,
}"
:columns="leftColumns"
:data-source="tableData"
:rowKey="(record) => record.id"
......@@ -77,7 +87,7 @@
</a-table>
</div>
<!-- 分页 -->
<div class="pagination" v-if="total">
<!-- <div class="pagination" v-if="total">
<a-pagination
v-model="Current"
:show-total="(total) => `共 ${total} 条`"
......@@ -89,7 +99,7 @@
:pageSizeOptions="pageSizeOptions"
@showSizeChange="showSizeChange"
/>
</div>
</div> -->
</a-card>
<!-- 新增窗口事项 -->
<a-modal v-model="visible" :title="modalTile" @cancel="handleClose">
......
base-manager-ui/admin/src/pages/basicset/dept/components/adddepartment.vue
View file @ 1347829d
......@@ -186,13 +186,10 @@ export default {
});
let { code, msg } = res.data;
if (code === 1) {
this.$parent.getDeptListData();
this.$refs.formData.resetFields();
this.Visible = false;
this.$message.success(msg);
this.$bus.$emit("addDept");
} else {
this.$message.error(msg);
this.$emit("addDept");
}
}
});
......
base-manager-ui/admin/src/pages/basicset/dept/components/addwindow.vue
View file @ 1347829d
......@@ -32,7 +32,12 @@
v-model="form.deptId"
@change="handleChange"
>
<a-select-option v-for="v in deptList" :key="v.id" :value="v.id">
<a-select-option
:data-deptNum="v.deptNumber"
v-for="v in deptList"
:key="v.id"
:value="v.id"
>
{{ v.name }}
</a-select-option>
</a-select>
......@@ -155,7 +160,7 @@
</template>
<script>
import { addWindow, getDeptList } from "@/services/dept";
import { addWindow } from "@/services/dept";
import YSwitch from "@/components/yswitch/YSwitch.vue";
import { changeWindowNumber } from "@/utils/validate";
export default {
......@@ -166,7 +171,6 @@ export default {
return {
labelCol: { span: 6 },
wrapperCol: { span: 14 },
deptList: [], // 站点部门列表
siteInfo: {
siteName: "",
siteId: "",
......@@ -174,6 +178,7 @@ export default {
form: {
deptId: undefined, // 部门id
deptName: undefined, // 部门名称
deptNumber: "", // 部门编号
name: "", // 窗口名称
englishName: "", // 英语窗口名称
region: "", // 区域
......@@ -219,6 +224,13 @@ export default {
WindowTitle: {
type: String,
},
deptList: {
type: Array,
required: true,
default: () => {
return [];
},
},
},
computed: {
Visible: {
......@@ -231,10 +243,10 @@ export default {
},
},
created() {
this.$bus.$off("addDept");
this.$bus.$on("addDept", () => {
this.getSiteDeptList();
});
// this.$bus.$off("addDept");
// this.$bus.$on("addDept", () => {
// this.getSiteDeptList();
// });
},
methods: {
// 获取站点名称和id
......@@ -242,19 +254,13 @@ export default {
this.siteInfo.siteName = info.label;
this.siteInfo.siteId = info.id;
},
// 获取站点部门
async getSiteDeptList(val = {}) {
let res = await getDeptList({ siteId: this.siteInfo.siteId, ...val });
let { code, data } = res.data;
if (code === 1) {
this.deptList = data.data;
}
},
// 部门下拉选项
handleChange(val, event) {
let { text } = event.componentOptions.children[0];
let deptNumber = event.data.attrs["data-deptNum"];
this.form.deptName = text;
this.form.deptNumber = deptNumber;
},
// 新增
onAdd() {
......
base-manager-ui/admin/src/pages/basicset/dept/department.vue
View file @ 1347829d
......@@ -19,17 +19,10 @@
placeholder="请输入部门名称"
allowClear
@search="onSearch"
v-model="deptSearchVal"
class="department_search"
/>
</div>
<!-- 部门管理弹窗 -->
<div>
<adddepartment
:formVisible.sync="formVisible"
:title="title"
ref="adddepartment"
></adddepartment>
</div>
</div>
<!-- 部门管理 -->
......@@ -91,14 +84,6 @@
style="width: 250px"
@search="onSearchRight"
/>
<div>
<!-- 新增窗口弹窗 -->
<addwindow
:visibleAdd.sync="visibleAdd"
ref="addwindow"
:WindowTitle="WindowTitle"
></addwindow>
</div>
</div>
<div class="department_right_tab">
<div class="table-content">
......@@ -108,7 +93,16 @@
:loading="loading"
:columns="columns"
:data-source="windowData"
:pagination="false"
:pagination="{
showTotal: (total) => `共 ${total} 条`,
current: page,
total: total,
showSizeChanger: true,
showQuickJumper: true,
pageSizeOptions: pageSizeOptions,
onChange: onPage,
onShowSizeChange: showSizeChange,
}"
class="department_right_table"
:rowKey="(record) => record.id"
>
......@@ -160,7 +154,7 @@
</a-table>
</div>
<!-- 翻页 -->
<div class="pagination" v-if="total">
<!-- <div class="pagination" v-if="total">
<a-pagination
v-model="page"
:show-total="(total) => `共 ${total} 条`"
......@@ -172,7 +166,7 @@
:pageSizeOptions="pageSizeOptions"
@showSizeChange="showSizeChange"
/>
</div>
</div> -->
</div>
<div>
<!-- 关联业务 -->
......@@ -225,11 +219,25 @@
</a-modal>
</div>
</div>
<!-- 部门管理弹窗 -->
<adddepartment
:formVisible.sync="formVisible"
:title="title"
@addDept="getDeptListData"
ref="adddepartment"
></adddepartment>
<!-- 新增窗口事项弹窗 -->
<addWindowMatter
ref="addWindowMatter"
:isShow.sync="isShow"
></addWindowMatter>
<!-- 新增窗口弹窗 -->
<addwindow
:visibleAdd.sync="visibleAdd"
ref="addwindow"
:deptList="department"
:WindowTitle="WindowTitle"
></addwindow>
</div>
</template>
......@@ -330,6 +338,7 @@ export default {
siteId: "", // 站点id
business: [], // 站点业务数据
windowSearch: "", // 窗口搜索
deptSearchVal: "", // 部门搜索
// isRelevancy: false,
formData: {
// 关联表单
......@@ -366,6 +375,13 @@ export default {
}
},
},
watch: {
deptSearchVal(newVal) {
if (newVal === "") {
this.getDeptListData();
}
},
},
methods: {
handleClick(val) {
this.siteId = val.id;
......@@ -377,7 +393,6 @@ export default {
}
if (this.$refs.addwindow) {
this.$refs.addwindow.getSiteInfo(val);
this.$refs.addwindow.getSiteDeptList({ siteId: val.id });
}
},
clickArea() {
......@@ -453,9 +468,6 @@ export default {
let { code, msg } = res.data;
if (code === 1) {
this.getDeptListData(this.siteId);
if (this.$refs.addwindow) {
this.$refs.addwindow.getSiteDeptList({ siteId: this.siteId });
}
this.$message.success(msg);
} else {
this.$message.error(msg);
......@@ -521,6 +533,7 @@ export default {
},
// 右边搜索
onSearchRight() {
this.page = 1;
this.getWindowListData();
},
// 窗口业务
......@@ -562,6 +575,7 @@ export default {
// 新增窗口事项
addWindowMatter(data) {
this.isShow = true;
console.log(data);
let obj = {
windowId: data.id,
windowName: data.name,
......
base-manager-ui/admin/src/pages/basicset/holiday/festival.vue
View file @ 1347829d
......@@ -30,7 +30,16 @@
:columns="columns"
:loading="loading"
:data-source="list"
:pagination="false"
:pagination="{
showTotal: (total) => `共 ${total} 条`,
current: page,
total: total,
showSizeChanger: true,
showQuickJumper: true,
pageSizeOptions: pageSizeOptions,
onChange: changePagination,
onShowSizeChange: showSizeChange,
}"
:scroll="{ y: 600 }"
:rowKey="(record) => record.id"
>
......@@ -75,8 +84,7 @@
</template>
</a-table>
</div>
<div class="pagination" v-if="total">
<!-- 分页 -->
<!-- <div class="pagination" v-if="total">
<a-pagination
v-model="page"
:show-total="(total) => `共 ${total} 条`"
......@@ -88,7 +96,7 @@
:pageSizeOptions="pageSizeOptions"
@showSizeChange="showSizeChange"
/>
</div>
</div> -->
</div>
</div>
<!-- 弹窗 -->
......
base-manager-ui/admin/src/pages/basicset/jump/jump.vue
View file @ 1347829d
......@@ -17,8 +17,9 @@ export default {
// 获取token
getToken() {
let token = this.$route.query.token;
let userInfo = JSON.parse(this.$route.query.userInfo);
if (token) {
let userInfo = this.$route.query.userInfo;
if (token && userInfo) {
userInfo = JSON.parse(userInfo);
local.setLocal("token", token);
local.setLocal("baseUserInfo", userInfo);
this.$router.push("basicset/website");
......
base-manager-ui/admin/src/pages/basicset/surface/AddSurfaceTemplate.vue
View file @ 1347829d
......@@ -36,7 +36,16 @@
size="middle"
:scroll="{ y: 550 }"
:loading="leftLoading"
:pagination="false"
:pagination="{
showTotal: (total) => `共 ${total} 条`,
current: leftCurrent,
total: leftTotal,
showSizeChanger: true,
showQuickJumper: true,
pageSizeOptions: pageSizeOptions,
onChange: changeLeft,
onShowSizeChange: showSizeChange,
}"
:columns="leftColumns"
:data-source="skinTemplate"
:rowKey="(record) => record.id"
......@@ -76,7 +85,7 @@
</a-table>
</div>
<!-- 翻页 -->
<div class="pagination" v-if="leftTotal">
<!-- <div class="pagination" v-if="leftTotal">
<a-pagination
v-model="leftCurrent"
:show-total="(total) => `共 ${total} 条`"
......@@ -88,7 +97,7 @@
:pageSizeOptions="pageSizeOptions"
@showSizeChange="showSizeChange"
/>
</div>
</div> -->
</a-card>
</div>
<!-- 右 -->
......@@ -125,7 +134,16 @@
<a-table
bordered
:scroll="{ y: 550 }"
:pagination="false"
:pagination="{
showTotal: (total) => `共 ${total} 条`,
current: rightCurrent,
total: rightTotal,
showSizeChanger: true,
showQuickJumper: true,
pageSizeOptions: pageSizeOptions,
onChange: changeRight,
onShowSizeChange: showSizeChangeRight,
}"
:loading="rightLoading"
size="middle"
:rowKey="(record) => record.id"
......@@ -181,7 +199,7 @@
</a-table>
</div>
<!-- 分页 -->
<div class="pagination" v-if="rightTotal">
<!-- <div class="pagination" v-if="rightTotal">
<a-pagination
v-model="rightCurrent"
:show-total="(total) => `共 ${total} 条`"
......@@ -193,7 +211,7 @@
:pageSizeOptions="pageSizeOptions"
@showSizeChange="showSizeChangeRight"
/>
</div>
</div> -->
</a-card>
</div>
</div>
......
base-manager-ui/admin/src/pages/basicset/workman/personnel.vue
View file @ 1347829d
......@@ -73,7 +73,16 @@
<div class="table-content">
<!-- 表格 -->
<a-table
:pagination="false"
:pagination="{
showTotal: (total) => `共 ${total} 条`,
current: page,
total: total,
showSizeChanger: true,
showQuickJumper: true,
pageSizeOptions: pageSizeOptions,
onChange: handlePagination,
onShowSizeChange: showSizeChange,
}"
:scroll="{ y: 450 }"
:loading="loading"
:columns="columns"
......@@ -141,7 +150,7 @@
</a-table>
</div>
<!-- 分页 -->
<div class="pagination" v-if="total">
<!-- <div class="pagination" v-if="total">
<a-pagination
v-model="page"
:show-total="(total) => `共 ${total} 条`"
......@@ -153,7 +162,7 @@
:pageSizeOptions="pageSizeOptions"
@showSizeChange="showSizeChange"
/>
</div>
</div> -->
</div>
<!-- 新增工作人员 -->
<addpersonnel
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment