Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web
Showing
14 changed files
with
196 additions
and
25 deletions
... | @@ -64,3 +64,12 @@ export function saveGZBatchData(data) { | ... | @@ -64,3 +64,12 @@ export function saveGZBatchData(data) { |
64 | data | 64 | data |
65 | }) | 65 | }) |
66 | } | 66 | } |
67 | // 更正/变更登记提交 | ||
68 | export function saveBHZData(data) { | ||
69 | return request({ | ||
70 | url: SERVER.SERVERAPI+"/rest/ywbl/fdcq2lr/saveBHZData", | ||
71 | method: 'post', | ||
72 | data | ||
73 | }) | ||
74 | } | ||
75 | ... | ... |
1 | import request from '@/utils/request' | 1 | import request from '@/utils/request' |
2 | import SERVER from './config' | 2 | import SERVER from './config' |
3 | // export function getMenuInfo () { | ||
4 | // return request({ | ||
5 | // url: SERVER.SERVERAPI + '/rest/user/getUserMenus', | ||
6 | // method: 'get', | ||
7 | // }) | ||
8 | // } | ||
3 | export function getMenuInfo () { | 9 | export function getMenuInfo () { |
4 | return request({ | 10 | return request({ |
5 | url: SERVER.SERVERAPI + '/rest/user/getUserMenus', | 11 | url: SERVER.SERVERCAI + '/rest/user/getUserAuthorizationMenus', |
6 | method: 'get', | 12 | method: 'get', |
7 | }) | 13 | }) |
8 | } | 14 | } |
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
1 | <template> | 1 | <template> |
2 | <div v-if="!item.hidden"> | 2 | <div v-if="!item.hidden"> |
3 | <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)"> | 3 | <template |
4 | v-if="hasOneShowingChild(item.children, item) && (!onlyOneChild.children || onlyOneChild.noShowingChildren)"> | ||
4 | <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path)"> | 5 | <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path)"> |
5 | <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}"> | 6 | <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{ 'submenu-title-noDropdown': !isNest }"> |
6 | <item :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="onlyOneChild.meta.title" | 7 | <item :icon="onlyOneChild.meta.icon || (item.meta && item.meta.icon)" :title="onlyOneChild.meta.title" |
7 | class="menu-icon" /> | 8 | class="menu-icon" /> |
8 | </el-menu-item> | 9 | </el-menu-item> |
9 | </app-link> | 10 | </app-link> | ... | ... |
1 | <template> | 1 | <template> |
2 | <div> | 2 | <div> |
3 | <el-scrollbar wrap-class="scrollbar-wrapper"> | 3 | <el-scrollbar wrap-class="scrollbar-wrapper"> |
4 | <el-menu :default-active="activeMenu" :background-color="variables.menuBg" :text-color="variables.menuText" | 4 | <el-menu router :default-active="activeMenu" :background-color="variables.menuBg" :text-color="variables.menuText" |
5 | :unique-opened="true" :active-text-color="variables.menuActiveText" :collapse-transition="false" | 5 | :unique-opened="true" @open="handleOpen" :active-text-color="variables.menuActiveText" |
6 | mode="vertical"> | 6 | :collapse-transition="false" mode="vertical"> |
7 | <!-- 权限菜单 --> | 7 | <!-- 权限菜单 --> |
8 | <sidebar-item v-for="route in permission_routes" :key="route.path" :item="route" :base-path="route.path" /> | 8 | <sidebar-item v-for="route in permission_routes" :key="route.path" :item="route" :base-path="route.path" /> |
9 | <!-- 菜单全部展示 --> | 9 | <!-- 菜单全部展示 --> |
... | @@ -26,7 +26,6 @@ export default { | ... | @@ -26,7 +26,6 @@ export default { |
26 | activeMenu () { | 26 | activeMenu () { |
27 | const route = this.$route | 27 | const route = this.$route |
28 | const { meta, path } = route | 28 | const { meta, path } = route |
29 | // if set path, the sidebar will highlight the path you set | ||
30 | if (meta.activeMenu) { | 29 | if (meta.activeMenu) { |
31 | return meta.activeMenu | 30 | return meta.activeMenu |
32 | } | 31 | } |
... | @@ -39,5 +38,15 @@ export default { | ... | @@ -39,5 +38,15 @@ export default { |
39 | return asyncRoutes | 38 | return asyncRoutes |
40 | }, | 39 | }, |
41 | }, | 40 | }, |
41 | methods: { | ||
42 | handleOpen (key, keyPath) { | ||
43 | let that = this | ||
44 | this.permission_routes.forEach(element => { | ||
45 | if (element.path == key) { | ||
46 | that.$router.push({ path: element.redirect }) | ||
47 | } | ||
48 | }) | ||
49 | } | ||
50 | }, | ||
42 | } | 51 | } |
43 | </script> | 52 | </script> | ... | ... |
... | @@ -21,6 +21,7 @@ router.beforeEach(async (to, from, next) => { | ... | @@ -21,6 +21,7 @@ router.beforeEach(async (to, from, next) => { |
21 | } else { | 21 | } else { |
22 | const { result: getMenuData } = await getMenuInfo() | 22 | const { result: getMenuData } = await getMenuInfo() |
23 | const accessRoutes = await store.dispatch('permission/generateRoutes', getMenuData) | 23 | const accessRoutes = await store.dispatch('permission/generateRoutes', getMenuData) |
24 | console.log(accessRoutes); | ||
24 | router.addRoutes(accessRoutes) | 25 | router.addRoutes(accessRoutes) |
25 | next({ ...to, replace: true }) | 26 | next({ ...to, replace: true }) |
26 | } | 27 | } | ... | ... |
... | @@ -40,9 +40,13 @@ export const constantRoutes = [ | ... | @@ -40,9 +40,13 @@ export const constantRoutes = [ |
40 | name: 'workFrameView', | 40 | name: 'workFrameView', |
41 | hidden: true, | 41 | hidden: true, |
42 | meta: { title: '发起申请' } | 42 | meta: { title: '发起申请' } |
43 | } | 43 | }, |
44 | { | ||
45 | path: '*', | ||
46 | component: () => import('@/views/error-page/404'), | ||
47 | hidden: true | ||
48 | }, | ||
44 | ] | 49 | ] |
45 | |||
46 | /** | 50 | /** |
47 | * asyncRoutes | 51 | * asyncRoutes |
48 | * the routes that need to be dynamically loaded based on user roles | 52 | * the routes that need to be dynamically loaded based on user roles |
... | @@ -68,8 +72,7 @@ export const asyncRoutes = [ | ... | @@ -68,8 +72,7 @@ export const asyncRoutes = [ |
68 | parentId: null, | 72 | parentId: null, |
69 | component: Layout, | 73 | component: Layout, |
70 | meta: { title: '业务办理', icon: 'ywbl' }, | 74 | meta: { title: '业务办理', icon: 'ywbl' }, |
71 | redirect: '/ywbl/ywsq/ywsq', | 75 | redirect: '/ywbl/ywsq', |
72 | alwaysShow: true, | ||
73 | name: 'ywbl', | 76 | name: 'ywbl', |
74 | children: [ | 77 | children: [ |
75 | { | 78 | { | ... | ... |
... | @@ -3,16 +3,24 @@ export default function filterAsyncRouter (routers) { | ... | @@ -3,16 +3,24 @@ export default function filterAsyncRouter (routers) { |
3 | routers.forEach(item => { | 3 | routers.forEach(item => { |
4 | if (!item.children) { | 4 | if (!item.children) { |
5 | delete item.children | 5 | delete item.children |
6 | delete item.redirect | ||
7 | } | 6 | } |
7 | item.path = JSON.parse(item.metadata).path | ||
8 | if (!item.parentId) { | 8 | if (!item.parentId) { |
9 | item.component = Layout | 9 | item.component = Layout |
10 | } else { | 10 | } else { |
11 | item.component = loadView(item.uri) | 11 | item.component = loadView(item.uri) |
12 | } | 12 | } |
13 | item.meta.icon = item.icon | 13 | item.meta = { |
14 | title: item.name, | ||
15 | icon: item.icon | ||
16 | } | ||
14 | if (item.children) { | 17 | if (item.children) { |
15 | item.children = filterAsyncRouter(item.children) | 18 | item.children = filterAsyncRouter(item.children) |
19 | if (item.path !== '/') { | ||
20 | item.redirect = item.path + '/' + item.children[0].path | ||
21 | } else { | ||
22 | item.redirect = '/' + item.children[0].path | ||
23 | } | ||
16 | } | 24 | } |
17 | }) | 25 | }) |
18 | return routers | 26 | return routers | ... | ... |
... | @@ -23,6 +23,9 @@ export function getForm(tabName, djywbm) { | ... | @@ -23,6 +23,9 @@ export function getForm(tabName, djywbm) { |
23 | case "fwsyqslxx400": | 23 | case "fwsyqslxx400": |
24 | form = require("@/views/ywbl/fdcq2/slxx400.vue"); | 24 | form = require("@/views/ywbl/fdcq2/slxx400.vue"); |
25 | break; | 25 | break; |
26 | case "fwsyqslxx900": | ||
27 | form = require("@/views/ywbl/fdcq2/slxx900.vue"); | ||
28 | break; | ||
26 | case "tdslxxCfdj": | 29 | case "tdslxxCfdj": |
27 | form = require("@/views/ywbl/cfdj/tdslxx.vue"); | 30 | form = require("@/views/ywbl/cfdj/tdslxx.vue"); |
28 | break; | 31 | break; | ... | ... |
... | @@ -258,7 +258,7 @@ export default { | ... | @@ -258,7 +258,7 @@ export default { |
258 | this.$popup({ | 258 | this.$popup({ |
259 | titleStyle: "left", | 259 | titleStyle: "left", |
260 | title: "登记簿详情", // 弹窗标题 | 260 | title: "登记簿详情", // 弹窗标题 |
261 | editItem: "ywbl/fdcq2/slxx900", // 弹窗内容 | 261 | editItem: "ywbl/fdcq2/slxxCompareDetai", // 弹窗内容 |
262 | formData: { | 262 | formData: { |
263 | bsmSlsq: this.propsParam.bsmSldy, | 263 | bsmSlsq: this.propsParam.bsmSldy, |
264 | qllx: this.propsParam.qllx | 264 | qllx: this.propsParam.qllx | ... | ... |
... | @@ -261,7 +261,7 @@ export default { | ... | @@ -261,7 +261,7 @@ export default { |
261 | this.$popup({ | 261 | this.$popup({ |
262 | titleStyle: "left", | 262 | titleStyle: "left", |
263 | title: "登记簿详情", // 弹窗标题 | 263 | title: "登记簿详情", // 弹窗标题 |
264 | editItem: "ywbl/fdcq2/slxx900", // 弹窗内容 | 264 | editItem: "ywbl/fdcq2/slxxCompareDetai;", // 弹窗内容 |
265 | formData: { | 265 | formData: { |
266 | bsmSlsq: this.propsParam.bsmSldy, | 266 | bsmSlsq: this.propsParam.bsmSldy, |
267 | qllx: this.propsParam.qllx | 267 | qllx: this.propsParam.qllx | ... | ... |
This diff is collapsed.
Click to expand it.
src/views/ywbl/fdcq2/slxxCompareDetai.vue
0 → 100644
1 | <template> | ||
2 | <div class="djxxTable" :style="{'max-height': this.timeLineHeight + 'px' }" | ||
3 | style="overflow-y:scroll;"> | ||
4 | <div class="tableBox" > | ||
5 | <div class="title"> | ||
6 | <span v-if="this.propsParam.formData.qllx=='A04' || this.propsParam.formData.qllx=='A06' || this.propsParam.formData.qllx=='A08'">{{ title }}</span> | ||
7 | <span v-if="this.propsParam.formData.qllx=='A03' || this.propsParam.formData.qllx=='A05' || this.propsParam.formData.qllx=='A07'">{{ ydTitile }}</span> | ||
8 | </div> | ||
9 | <div class="xxTableBox"> | ||
10 | <table class="xxTable"> | ||
11 | <tr> | ||
12 | <td></td> | ||
13 | <td>变更前</td> | ||
14 | <td>变更后</td> | ||
15 | </tr> | ||
16 | <tr v-if="this.propsParam.formData.qllx=='A04' || this.propsParam.formData.qllx=='A06' || this.propsParam.formData.qllx=='A08'" v-for="(item, colindex) in columns" :key="colindex"> | ||
17 | <td> | ||
18 | {{ item.label }} | ||
19 | </td> | ||
20 | <td | ||
21 | v-for="(row, index) in tableData" | ||
22 | :key="index" | ||
23 | :class="[ | ||
24 | row.qszt == '2' ? 'lishi' : '', | ||
25 | row.qszt == '0' ? 'linshi' : '', | ||
26 | item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '', | ||
27 | ]" | ||
28 | > | ||
29 | <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'"> | ||
30 | 正在办理 | ||
31 | </div> | ||
32 | <span v-if="item.prop == 'qszt'"> | ||
33 | {{ getQsztName(row[item.prop]) }} | ||
34 | </span> | ||
35 | |||
36 | <span v-else> {{ row[item.prop] }}</span> | ||
37 | </td> | ||
38 | </tr> | ||
39 | <tr v-if="this.propsParam.formData.qllx=='A03' || this.propsParam.formData.qllx=='A05' || this.propsParam.formData.qllx=='A07'" v-for="(item, colindex) in tdColumns" :key="colindex"> | ||
40 | <td> | ||
41 | {{ item.label }} | ||
42 | </td> | ||
43 | <td | ||
44 | v-for="(row, index) in tableData" | ||
45 | :key="index" | ||
46 | :class="[ | ||
47 | row.qszt == '2' ? 'lishi' : '', | ||
48 | row.qszt == '0' ? 'linshi' : '', | ||
49 | item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '', | ||
50 | ]" | ||
51 | > | ||
52 | <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'"> | ||
53 | 正在办理 | ||
54 | </div> | ||
55 | <span v-if="item.prop == 'qszt'"> | ||
56 | {{ getQsztName(row[item.prop]) }} | ||
57 | </span> | ||
58 | |||
59 | <span v-else> {{ row[item.prop] }}</span> | ||
60 | </td> | ||
61 | </tr> | ||
62 | </table> | ||
63 | </div> | ||
64 | </div> | ||
65 | </div> | ||
66 | </template> | ||
67 | |||
68 | <script> | ||
69 | import {getFdcqLSInfo} from "@/api/registerBook.js"; | ||
70 | import { datas } from "@/views/registerBook/qlxxFormData.js"; | ||
71 | export default { | ||
72 | data() { | ||
73 | return { | ||
74 | title: "房地产权登记信息(独幢、层、套、间房屋)", | ||
75 | ydTitile: "土地使用权登记信息", | ||
76 | qsztList: datas.columns().qsztList, | ||
77 | checkList: datas.columns().checkList, | ||
78 | //传递参数 | ||
79 | propsParam: this.$attrs, | ||
80 | //列表数据 | ||
81 | tableData: [], | ||
82 | //空列值个数 | ||
83 | emptycolNum: 1, | ||
84 | //列名称对象 | ||
85 | columns: datas.columns().FDCQ2, | ||
86 | tdColumns: datas.columns().JSYDSYQ | ||
87 | |||
88 | }; | ||
89 | }, | ||
90 | created() { | ||
91 | this.loadData(); | ||
92 | }, | ||
93 | mounted() { | ||
94 | this.timeLineHeight = document.documentElement.clientHeight - 210; | ||
95 | window.onresize = () => { | ||
96 | this.timeLineHeight = document.documentElement.clientHeight - 210; | ||
97 | }; | ||
98 | }, | ||
99 | methods: { | ||
100 | loadData() { | ||
101 | getFdcqLSInfo(this.propsParam.formData).then((res) => { | ||
102 | if (res.code === 200) { | ||
103 | this.tableData = res.result; | ||
104 | if (this.tableData.length < datas.columns().emptycolNum) { | ||
105 | this.emptycolNum = | ||
106 | datas.columns().emptycolNum - this.tableData.length; | ||
107 | } else { | ||
108 | this.emptycolNum = 0; | ||
109 | } | ||
110 | } | ||
111 | }); | ||
112 | }, | ||
113 | checkChange() { | ||
114 | if (this.checkList.length === 0) { | ||
115 | this.tableData = []; | ||
116 | this.emptycolNum = datas.columns().emptycolNum; | ||
117 | } else { | ||
118 | this.loadData(); | ||
119 | } | ||
120 | }, | ||
121 | getQsztName(code) { | ||
122 | let name = ""; | ||
123 | for (let item of this.qsztList) { | ||
124 | if (item.value == code) { | ||
125 | name = item.label; | ||
126 | break; | ||
127 | } | ||
128 | } | ||
129 | return name; | ||
130 | }, | ||
131 | }, | ||
132 | }; | ||
133 | </script> | ||
134 | |||
135 | <style lang="scss" scoped> | ||
136 | @import "~@/views/registerBook/qlxxCommon.scss"; | ||
137 | </style> |
... | @@ -45,14 +45,7 @@ module.exports = { | ... | @@ -45,14 +45,7 @@ module.exports = { |
45 | '^/api': '' | 45 | '^/api': '' |
46 | } | 46 | } |
47 | } | 47 | } |
48 | // '': { | 48 | } |
49 | // target: process.env.VUE_APP_API_BASE_URL, | ||
50 | // changeOrigin: true, | ||
51 | // pathRewrite: { | ||
52 | // '^': '' | ||
53 | // } | ||
54 | // } | ||
55 | }, | ||
56 | }, | 49 | }, |
57 | css: { | 50 | css: { |
58 | extract: false, // 是否使用css分离插件 ExtractTextPlugin | 51 | extract: false, // 是否使用css分离插件 ExtractTextPlugin | ... | ... |
-
Please register or sign in to post a comment