Merge branch 'dev'
Showing
8 changed files
with
297 additions
and
180 deletions
... | @@ -111,6 +111,18 @@ export function selectZdjbxx (data) { | ... | @@ -111,6 +111,18 @@ export function selectZdjbxx (data) { |
111 | }) | 111 | }) |
112 | } | 112 | } |
113 | 113 | ||
114 | /** | ||
115 | * @description: 业务办理-选择单元-查询宗地基本信息 | ||
116 | * @param {*} data | ||
117 | * @author: renchao | ||
118 | */ | ||
119 | export function selectHQjdc (data) { | ||
120 | return request({ | ||
121 | url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectHQjdc', | ||
122 | method: 'post', | ||
123 | data | ||
124 | }) | ||
125 | } | ||
114 | /* | 126 | /* |
115 | 业务办理-选择单元-查询宗地基本信息 | 127 | 业务办理-选择单元-查询宗地基本信息 |
116 | */ | 128 | */ | ... | ... |
src/image/bdclogo.png
0 → 100644

20.9 KB
... | @@ -2,7 +2,8 @@ | ... | @@ -2,7 +2,8 @@ |
2 | <div class="navbar-con"> | 2 | <div class="navbar-con"> |
3 | <div class="navbar" v-theme.background="mTheme"> | 3 | <div class="navbar" v-theme.background="mTheme"> |
4 | <div class="logo"> | 4 | <div class="logo"> |
5 | <img v-if="logo" :src="logo" class="header-logo"> | 5 | <img v-if="logo" :src="logo" class="header-logo" /> |
6 | <h4>{{ userInfo.districtName }}不动产登记平台</h4> | ||
6 | </div> | 7 | </div> |
7 | <!-- <div class="backdrop"> | 8 | <!-- <div class="backdrop"> |
8 | <theme style="float: right;height: 26px;width: 26px;margin-top: 26px;" @change="themeChange" /> | 9 | <theme style="float: right;height: 26px;width: 26px;margin-top: 26px;" @change="themeChange" /> |
... | @@ -10,75 +11,93 @@ | ... | @@ -10,75 +11,93 @@ |
10 | <div class="right-menu"> | 11 | <div class="right-menu"> |
11 | <!-- <svg-icon class="function" icon-class='function' /> --> | 12 | <!-- <svg-icon class="function" icon-class='function' /> --> |
12 | <div class="avatar-wrapper"> | 13 | <div class="avatar-wrapper"> |
13 | <span style="padding-right:10px">{{ name }}</span> | 14 | <p> |
15 | <span style="padding-right: 10px">{{ | ||
16 | userInfo.departmentName | ||
17 | }}</span> | ||
18 | <span style="padding-right: 10px">{{ userInfo.name }}</span> | ||
19 | </p> | ||
14 | <img :src="avatar + '?imageView2/1/w/80/h/80'" class="user-avatar" /> | 20 | <img :src="avatar + '?imageView2/1/w/80/h/80'" class="user-avatar" /> |
15 | </div> | 21 | </div> |
16 | <svg-icon class="shutdown" @click.native="logout" icon-class='shutdown' /> | 22 | <svg-icon |
23 | class="shutdown" | ||
24 | @click.native="logout" | ||
25 | icon-class="shutdown" | ||
26 | /> | ||
17 | </div> | 27 | </div> |
18 | </div> | 28 | </div> |
19 | <NoticeBar class="NoticeBar" :noticeList="noticeList" v-if="noticeList.length > 0" /> | 29 | <NoticeBar |
30 | class="NoticeBar" | ||
31 | :noticeList="noticeList" | ||
32 | v-if="noticeList.length > 0" | ||
33 | /> | ||
20 | </div> | 34 | </div> |
21 | </template> | 35 | </template> |
22 | <script> | 36 | <script> |
23 | import axios from 'axios' | 37 | import axios from "axios"; |
24 | import Cookies from 'js-cookie' | 38 | import Cookies from "js-cookie"; |
25 | import { mapGetters } from 'vuex' | 39 | import { mapGetters } from "vuex"; |
26 | import NoticeBar from '@/components/NoticeBar/index' | 40 | import NoticeBar from "@/components/NoticeBar/index"; |
27 | import { getHomeNoticeList } from "@/api/home" | 41 | import { getHomeNoticeList } from "@/api/home"; |
28 | import { setToken } from "@/utils/util"; | 42 | import { setToken } from "@/utils/util"; |
29 | export default { | 43 | export default { |
30 | components: { | 44 | components: { |
31 | NoticeBar | 45 | NoticeBar, |
32 | }, | 46 | }, |
33 | computed: { | 47 | computed: { |
34 | ...mapGetters(['sidebar', 'avatar', 'name']), | 48 | ...mapGetters(["sidebar", "avatar", "name", "userInfo"]), |
35 | baseUrl () { | 49 | baseUrl() { |
36 | return window._config.baseUrl; | 50 | return window._config.baseUrl; |
37 | }, | 51 | }, |
38 | }, | 52 | }, |
39 | data () { | 53 | data() { |
40 | return { | 54 | return { |
41 | logo: require('../../image/logo.png'), | 55 | logo: require("../../image/bdclogo.png"), |
42 | noticeList: [] | 56 | noticeList: [], |
43 | } | 57 | }; |
44 | }, | 58 | }, |
45 | created () { | 59 | created() { |
46 | this.queryNoticeList() | 60 | this.queryNoticeList(); |
47 | }, | 61 | }, |
48 | mounted () { | 62 | mounted() { |
49 | let that = this | 63 | let that = this; |
50 | window.addEventListener('message', function (messageEvent) { | 64 | window.addEventListener("message", function (messageEvent) { |
51 | if (messageEvent.data.update) { | 65 | if (messageEvent.data.update) { |
52 | that.queryNoticeList() | 66 | that.queryNoticeList(); |
53 | } | 67 | } |
54 | }) | 68 | }); |
55 | }, | 69 | }, |
56 | destroyed () { | 70 | destroyed() { |
57 | window.removeEventListener('message') | 71 | window.removeEventListener("message"); |
58 | }, | 72 | }, |
59 | methods: { | 73 | methods: { |
60 | /** | 74 | /** |
61 | * @description: queryNoticeList | 75 | * @description: queryNoticeList |
62 | * @author: renchao | 76 | * @author: renchao |
63 | */ | 77 | */ |
64 | queryNoticeList () { | 78 | queryNoticeList() { |
65 | getHomeNoticeList().then(res => { | 79 | getHomeNoticeList().then((res) => { |
66 | if (res.result) { | 80 | if (res.result) { |
67 | this.noticeList = res.result.noticeList | 81 | this.noticeList = res.result.noticeList; |
68 | } | 82 | } |
69 | }) | 83 | }); |
70 | }, | 84 | }, |
71 | /** | 85 | /** |
72 | * @description: logout | 86 | * @description: logout |
73 | * @author: renchao | 87 | * @author: renchao |
74 | */ | 88 | */ |
75 | logout () { | 89 | logout() { |
76 | axios.post(window._config.services.management + "/management/logout").then(() => { | 90 | axios |
77 | setToken(undefined) | 91 | .post(window._config.services.management + "/management/logout") |
78 | sessionStorage.removeItem('token') | 92 | .then(() => { |
79 | localStorage.setItem('dj-location', window.location.href) | 93 | setToken(undefined); |
80 | window.location.href = window._config.casBaseURL + '/logout?service=' + encodeURIComponent(window.location.href); | 94 | sessionStorage.removeItem("token"); |
81 | }) | 95 | localStorage.setItem("dj-location", window.location.href); |
96 | window.location.href = | ||
97 | window._config.casBaseURL + | ||
98 | "/logout?service=" + | ||
99 | encodeURIComponent(window.location.href); | ||
100 | }); | ||
82 | }, | 101 | }, |
83 | 102 | ||
84 | /** | 103 | /** |
... | @@ -86,37 +105,37 @@ | ... | @@ -86,37 +105,37 @@ |
86 | * @param {*} val | 105 | * @param {*} val |
87 | * @author: renchao | 106 | * @author: renchao |
88 | */ | 107 | */ |
89 | themeChange (val) { | 108 | themeChange(val) { |
90 | this.$store.dispatch('app/updateTheme', val) | 109 | this.$store.dispatch("app/updateTheme", val); |
91 | }, | 110 | }, |
92 | searchMessageCenter () { | 111 | searchMessageCenter() { |
93 | this.$router.push({ name: 'messagecenter' }) | 112 | this.$router.push({ name: "messagecenter" }); |
94 | }, | 113 | }, |
95 | /** | 114 | /** |
96 | * @description: handleCommand | 115 | * @description: handleCommand |
97 | * @param {*} command | 116 | * @param {*} command |
98 | * @author: renchao | 117 | * @author: renchao |
99 | */ | 118 | */ |
100 | handleCommand (command) { | 119 | handleCommand(command) { |
101 | if (command == 'a') { | 120 | if (command == "a") { |
102 | //个人中心 | 121 | //个人中心 |
103 | this.$router.push({ name: 'personal' }) | 122 | this.$router.push({ name: "personal" }); |
104 | } | ||
105 | } | ||
106 | } | ||
107 | } | 123 | } |
124 | }, | ||
125 | }, | ||
126 | }; | ||
108 | </script> | 127 | </script> |
109 | <style lang="scss" scoped> | 128 | <style lang="scss" scoped> |
110 | .navbar-con { | 129 | .navbar-con { |
111 | position: relative; | 130 | position: relative; |
112 | } | 131 | } |
113 | 132 | ||
114 | .NoticeBar { | 133 | .NoticeBar { |
115 | position: absolute; | 134 | position: absolute; |
116 | bottom: 0; | 135 | bottom: 0; |
117 | } | 136 | } |
118 | 137 | ||
119 | .el-dropdown-menu { | 138 | .el-dropdown-menu { |
120 | padding: 0 !important; | 139 | padding: 0 !important; |
121 | border: 1px solid #ebeef5; | 140 | border: 1px solid #ebeef5; |
122 | box-shadow: 0 2px 10px 0 rgba(0, 0, 0, 0.12); | 141 | box-shadow: 0 2px 10px 0 rgba(0, 0, 0, 0.12); |
... | @@ -149,9 +168,9 @@ | ... | @@ -149,9 +168,9 @@ |
149 | background: #f6f7f9; | 168 | background: #f6f7f9; |
150 | color: #4a4a4a; | 169 | color: #4a4a4a; |
151 | } | 170 | } |
152 | } | 171 | } |
153 | 172 | ||
154 | .navbar { | 173 | .navbar { |
155 | height: $headerHeight; | 174 | height: $headerHeight; |
156 | overflow: hidden; | 175 | overflow: hidden; |
157 | position: relative; | 176 | position: relative; |
... | @@ -163,8 +182,22 @@ | ... | @@ -163,8 +182,22 @@ |
163 | padding: 0 20px; | 182 | padding: 0 20px; |
164 | justify-content: space-between; | 183 | justify-content: space-between; |
165 | 184 | ||
185 | .logo { | ||
186 | // margin-top: -20px; | ||
166 | .header-logo { | 187 | .header-logo { |
167 | width: 300px; | 188 | width: 40px; |
189 | float: left; | ||
190 | vertical-align: middle; | ||
191 | } | ||
192 | h4 { | ||
193 | float: left; | ||
194 | vertical-align: middle; | ||
195 | line-height: 40px; | ||
196 | font-size: 22px; | ||
197 | color: #fff; | ||
198 | text-indent: 6px; | ||
199 | letter-spacing: 2px; | ||
200 | } | ||
168 | } | 201 | } |
169 | 202 | ||
170 | .backdrop { | 203 | .backdrop { |
... | @@ -262,7 +295,15 @@ | ... | @@ -262,7 +295,15 @@ |
262 | height: 40px; | 295 | height: 40px; |
263 | align-items: center; | 296 | align-items: center; |
264 | color: #ffffff; | 297 | color: #ffffff; |
265 | 298 | p { | |
299 | font-size: 14px; | ||
300 | height: 40px; | ||
301 | span { | ||
302 | display: block; | ||
303 | line-height: 20px; | ||
304 | text-align: right; | ||
305 | } | ||
306 | } | ||
266 | .user-avatar { | 307 | .user-avatar { |
267 | cursor: pointer; | 308 | cursor: pointer; |
268 | width: 35px; | 309 | width: 35px; |
... | @@ -279,5 +320,5 @@ | ... | @@ -279,5 +320,5 @@ |
279 | } | 320 | } |
280 | } | 321 | } |
281 | } | 322 | } |
282 | } | 323 | } |
283 | </style> | 324 | </style> | ... | ... |
1 | <template> | 1 | <template> |
2 | <div class="lpbContent-wrap" ref="lpbContentWrap"> | 2 | <div class="lpbContent-wrap" ref="lpbContentWrap"> |
3 | <div class="lpbContent" ref="lpbContent" :style="{ 'height': 'calc(100% - '+ lpbContentHeight +'px)'}"> | 3 | <div |
4 | class="lpbContent" | ||
5 | ref="lpbContent" | ||
6 | :style="{ height: 'calc(100% - ' + lpbContentHeight + 'px)' }" | ||
7 | > | ||
4 | <!-- 纵向倒序排列 逻辑幢位于独立幢单元和独立层户的上方 --> | 8 | <!-- 纵向倒序排列 逻辑幢位于独立幢单元和独立层户的上方 --> |
5 | <div class="ch-zdy-wrap"> | 9 | <div class="ch-zdy-wrap"> |
6 | <!-- 幢单元 --> | 10 | <!-- 幢单元 --> |
7 | <zdy-cpn v-if="lpbData.zdys.length" :zdys="lpbData.zdys" :onlyShow="onlyShow" /> | 11 | <zdy-cpn |
12 | v-if="lpbData.zdys.length" | ||
13 | :zdys="lpbData.zdys" | ||
14 | :onlyShow="onlyShow" | ||
15 | /> | ||
8 | <!-- 独立层户 --> | 16 | <!-- 独立层户 --> |
9 | <ch-cpn v-if="lpbData.cs.length" :ch="lpbData.cs" :onlyShow="onlyShow" /> | 17 | <ch-cpn |
18 | v-if="lpbData.cs.length" | ||
19 | :ch="lpbData.cs" | ||
20 | :onlyShow="onlyShow" | ||
21 | /> | ||
10 | </div> | 22 | </div> |
11 | <!-- 逻辑幢 --> | 23 | <!-- 逻辑幢 --> |
12 | <ljzs-cpn v-if="lpbData.ljzs.length" :ljzs="lpbData.ljzs" :onlyShow="onlyShow" /> | 24 | <ljzs-cpn |
25 | v-if="lpbData.ljzs.length" | ||
26 | :ljzs="lpbData.ljzs" | ||
27 | :onlyShow="onlyShow" | ||
28 | /> | ||
13 | </div> | 29 | </div> |
14 | <!-- 自然幢名称 --> | 30 | <!-- 自然幢名称 --> |
15 | <p class="lpb-xmmc" v-if="onlyShow" style="border-bottom: 1px solid #e6e6e6">{{ lpbData.xmmc }}</p> | 31 | <p |
16 | <p class="lpb-xmmc" v-else :style="{ 'border-bottom':'1px solid #e6e6e6'}"> | 32 | class="lpb-xmmc" |
33 | v-if="onlyShow" | ||
34 | style="border-bottom: 1px solid #e6e6e6" | ||
35 | > | ||
36 | {{ lpbData.xmmc }} | ||
37 | </p> | ||
38 | <p | ||
39 | class="lpb-xmmc" | ||
40 | v-else | ||
41 | :style="{ 'border-bottom': '1px solid #e6e6e6' }" | ||
42 | > | ||
17 | <el-checkbox @change="zdySelectAll($event)">{{ | 43 | <el-checkbox @change="zdySelectAll($event)">{{ |
18 | lpbData.xmmc | 44 | lpbData.xmmc |
19 | }}</el-checkbox> | 45 | }}</el-checkbox> |
20 | </p> | 46 | </p> |
21 | <el-button type="primary" class="save-btn" v-if="!onlyShow && showSave" @click="saveLpb">选择确认</el-button> | 47 | <el-button |
22 | <el-button type="primary" class="save-btn" v-if="!onlyShow && !showSave" @click="submitForm" :loading="loading">发起申请</el-button> | 48 | type="primary" |
49 | class="save-btn" | ||
50 | v-if="!onlyShow && showSave" | ||
51 | @click="saveLpb" | ||
52 | >选择确认</el-button | ||
53 | > | ||
54 | <el-button | ||
55 | type="primary" | ||
56 | class="save-btn" | ||
57 | v-if="!onlyShow && !showSave" | ||
58 | @click="submitForm" | ||
59 | :loading="loading" | ||
60 | >发起申请</el-button | ||
61 | > | ||
23 | <!-- 右键菜单 --> | 62 | <!-- 右键菜单 --> |
24 | <ul | 63 | <ul |
25 | v-show="lpbChVisible" | 64 | v-show="lpbChVisible" |
26 | :style="{ left: lpbChLeft + 'px', top: lpbChTop + 'px' }" | 65 | :style="{ left: lpbChLeft + 'px', top: lpbChTop + 'px' }" |
27 | class="contextmenu"> | 66 | class="contextmenu" |
67 | > | ||
28 | <li @click="menuClick">菜单一</li> | 68 | <li @click="menuClick">菜单一</li> |
29 | <li @click="menuClick">菜单二</li> | 69 | <li @click="menuClick">菜单二</li> |
30 | </ul> | 70 | </ul> |
31 | </div> | 71 | </div> |
32 | </template> | 72 | </template> |
33 | <script> | 73 | <script> |
34 | import { getLpb } from "@/api/lpcx.js"; | 74 | import { getLpb } from "@/api/lpcx.js"; |
35 | import chCpn from "./ch.vue"; | 75 | import chCpn from "./ch.vue"; |
36 | import zdyCpn from "./zdys.vue"; | 76 | import zdyCpn from "./zdys.vue"; |
37 | import ljzsCpn from "./ljzs.vue"; | 77 | import ljzsCpn from "./ljzs.vue"; |
38 | import { startBusinessFlow, choiceBdcdy, againAddSldy } from "@/api/workFlow.js"; | 78 | import { |
39 | import jump from "../../ywbl/ywsq/components/mixin/jump"; | 79 | startBusinessFlow, |
40 | import store from '@/store/index.js' | 80 | choiceBdcdy, |
41 | import { ywPopupCacel } from "@/utils/popup.js"; | 81 | againAddSldy, |
42 | export default { | 82 | } from "@/api/workFlow.js"; |
83 | import jump from "../../ywbl/ywsq/components/mixin/jump"; | ||
84 | import store from "@/store/index.js"; | ||
85 | import { ywPopupCacel } from "@/utils/popup.js"; | ||
86 | export default { | ||
43 | mixins: [jump], | 87 | mixins: [jump], |
44 | provide () { | 88 | provide() { |
45 | return { | 89 | return { |
46 | openMenu: this.openMenu, | 90 | openMenu: this.openMenu, |
47 | selectAll: this.selectAllObj, | 91 | selectAll: this.selectAllObj, |
48 | changeChoosedObj: this.changeChoosedObj, | 92 | changeChoosedObj: this.changeChoosedObj, |
49 | clearChangeChoosedObj: this.clearChangeChoosedObj, | 93 | clearChangeChoosedObj: this.clearChangeChoosedObj, |
50 | getBsmList: this.getBsmList | 94 | getBsmList: this.getBsmList, |
51 | }; | 95 | }; |
52 | }, | 96 | }, |
53 | name: "", | 97 | name: "", |
... | @@ -79,42 +123,10 @@ | ... | @@ -79,42 +123,10 @@ |
79 | }, | 123 | }, |
80 | sqywInfo: { | 124 | sqywInfo: { |
81 | type: Object, | 125 | type: Object, |
82 | default: () => { } | 126 | default: () => {}, |
83 | }, | ||
84 | name: "", | ||
85 | components: { chCpn, zdyCpn, ljzsCpn }, | ||
86 | props: { | ||
87 | zrzbsm: { | ||
88 | type: String, | ||
89 | default: "", | ||
90 | }, | ||
91 | lpbParent: { | ||
92 | type: String, | ||
93 | default: "isLpb", | ||
94 | }, | ||
95 | isHb: { | ||
96 | type: Boolean, | ||
97 | default: true, | ||
98 | }, | ||
99 | onlyShow: { | ||
100 | type: Boolean, | ||
101 | default: true, | ||
102 | }, | ||
103 | showSave: { | ||
104 | type: Boolean, | ||
105 | default: false, | ||
106 | }, | 127 | }, |
107 | scyclx: { | ||
108 | type: Number, | ||
109 | default: 0, | ||
110 | }, | 128 | }, |
111 | sqywInfo: { | 129 | data() { |
112 | type: Object, | ||
113 | default: () => { } | ||
114 | }, | ||
115 | isJump: { type: Boolean, default: false }, | ||
116 | }, | ||
117 | data () { | ||
118 | return { | 130 | return { |
119 | lpbData: { | 131 | lpbData: { |
120 | ljzs: [], | 132 | ljzs: [], |
... | @@ -133,61 +145,89 @@ | ... | @@ -133,61 +145,89 @@ |
133 | // 改变户选中状态 | 145 | // 改变户选中状态 |
134 | changeChoosedObj: { | 146 | changeChoosedObj: { |
135 | bsms: [], | 147 | bsms: [], |
136 | color: '' | 148 | color: "", |
137 | }, | 149 | }, |
138 | // 选中户bsm合集 | 150 | // 选中户bsm合集 |
139 | bsmList: [], | 151 | bsmList: [], |
140 | loading: false, | 152 | loading: false, |
141 | }; | 153 | }; |
142 | }, | 154 | }, |
143 | mounted () { | 155 | mounted() { |
144 | this.scyclx ? this.getLpb(this.zrzbsm, this.scyclx) : this.getLpb(this.zrzbsm); | 156 | this.scyclx |
157 | ? this.getLpb(this.zrzbsm, this.scyclx) | ||
158 | : this.getLpb(this.zrzbsm); | ||
145 | window.lpbContent = this; | 159 | window.lpbContent = this; |
146 | }, | 160 | }, |
161 | methods: { | ||
162 | /** | ||
163 | * @description: 获取当前楼盘表选中户信息 | ||
164 | * @param {Array} bsmList | ||
165 | * @author: renchao | ||
166 | */ | ||
167 | getBsmList(bsmList, compFlag) { | ||
168 | // 根据本次传入的组件标识删除之前对应组件标识存入hbsmList的数据 | ||
169 | this.bsmList = this.bsmList.filter((i) => i.flag != compFlag); | ||
170 | // 合并本次数据 | ||
171 | this.bsmList = this.bsmList.concat([ | ||
172 | ...new Map(bsmList.map((item) => [item.bdcdyh, item])).values(), | ||
173 | ]); | ||
174 | // }) | ||
175 | }, | ||
147 | /** | 176 | /** |
148 | * @description: 保存当前楼盘表 | 177 | * @description: 保存当前楼盘表 |
149 | * @author: renchao | 178 | * @author: renchao |
150 | */ | 179 | */ |
151 | saveLpb () { | 180 | saveLpb() { |
152 | if (this.bsmList.length == 0) { | 181 | if (this.bsmList.length == 0) { |
153 | this.$message.error("请至少选择一条数据"); | 182 | this.$message.error("请至少选择一条数据"); |
154 | return; | 183 | return; |
155 | } | 184 | } |
156 | this.loading = true; | 185 | this.loading = true; |
186 | store.dispatch("user/reMenuRefresh", false); | ||
157 | againAddSldy({ | 187 | againAddSldy({ |
158 | bsmSqyw: this.sqywInfo.bsmSqyw, | 188 | bsmSqyw: this.sqywInfo.bsmSqyw, |
159 | bsmSlsq: this.sqywInfo.bsmSlsq, | 189 | bsmSlsq: this.sqywInfo.bsmSlsq, |
160 | bdcdysz: this.bsmList, | 190 | bdcdysz: this.bsmList, |
161 | sjlx: "houses" | 191 | sjlx: "houses", |
162 | }).then((res) => { | 192 | }) |
163 | this.loading = false | 193 | .then((res) => { |
194 | this.loading = false; | ||
164 | if (res.code == 200) { | 195 | if (res.code == 200) { |
165 | this.$message({ | 196 | this.$message({ |
166 | showClose: true, | 197 | showClose: true, |
167 | message: '添加成功', | 198 | message: "添加成功", |
168 | type: 'success' | 199 | type: "success", |
169 | }) | 200 | }); |
170 | if (!this.isJump) { | 201 | if (!this.isJump) { |
171 | this.jump(res.result, this.sqywInfo.djywbm) | 202 | this.jump(res.result, this.sqywInfo.djywbm); |
172 | } else { | ||
173 | store.dispatch('user/refreshPage', true); | ||
174 | } | 203 | } |
204 | store.dispatch("user/refreshPage", true); | ||
175 | //this.close(); | 205 | //this.close(); |
176 | this.$popupCacel(); | 206 | this.$popupCacel(); |
177 | } else { | 207 | } else { |
178 | if (res.result && res.result.length > 0) { | 208 | if (res.result && res.result.length > 0) { |
179 | this.$popup("申请错误明细", "components/ywdialog", { width: '36%', formData: { result: res.result } }) | 209 | this.$popup("申请错误明细", "components/ywdialog", { |
210 | width: "36%", | ||
211 | formData: { result: res.result }, | ||
212 | }); | ||
180 | } else { | 213 | } else { |
181 | if (res.result && res.result.length > 0) { | 214 | if (res.result && res.result.length > 0) { |
182 | this.$popup("申请错误明细", "components/ywdialog", { width: '36%', formData: { result: res.result } }) | 215 | this.$popup("申请错误明细", "components/ywdialog", { |
216 | width: "36%", | ||
217 | formData: { result: res.result }, | ||
218 | }); | ||
183 | } else { | 219 | } else { |
184 | this.$popup("申请错误明细", "components/ywdialog", { width: '36%', formData: { message: res.message } }) | 220 | this.$popup("申请错误明细", "components/ywdialog", { |
221 | width: "36%", | ||
222 | formData: { message: res.message }, | ||
223 | }); | ||
185 | } | 224 | } |
186 | } | 225 | } |
187 | } | 226 | } |
188 | }).catch(() => { | ||
189 | this.loading = false | ||
190 | }) | 227 | }) |
228 | .catch(() => { | ||
229 | this.loading = false; | ||
230 | }); | ||
191 | // todo 调用保存接口 传入参数待定 | 231 | // todo 调用保存接口 传入参数待定 |
192 | //console.log(this.bsmList,'this.bsmList'); | 232 | //console.log(this.bsmList,'this.bsmList'); |
193 | // 保存成功后关闭弹框 | 233 | // 保存成功后关闭弹框 |
... | @@ -200,7 +240,7 @@ | ... | @@ -200,7 +240,7 @@ |
200 | * @param {*} color | 240 | * @param {*} color |
201 | * @author: renchao | 241 | * @author: renchao |
202 | */ | 242 | */ |
203 | changeChoosed (bsms, color) { | 243 | changeChoosed(bsms, color) { |
204 | this.changeChoosedObj.bsms = bsms; | 244 | this.changeChoosedObj.bsms = bsms; |
205 | this.changeChoosedObj.color = color; | 245 | this.changeChoosedObj.color = color; |
206 | }, | 246 | }, |
... | @@ -208,7 +248,7 @@ | ... | @@ -208,7 +248,7 @@ |
208 | * @description: clearChangeChoosedObj | 248 | * @description: clearChangeChoosedObj |
209 | * @author: renchao | 249 | * @author: renchao |
210 | */ | 250 | */ |
211 | clearChangeChoosedObj () { | 251 | clearChangeChoosedObj() { |
212 | this.changeChoosedObj.bsms = []; | 252 | this.changeChoosedObj.bsms = []; |
213 | }, | 253 | }, |
214 | //全选户 | 254 | //全选户 |
... | @@ -217,7 +257,7 @@ | ... | @@ -217,7 +257,7 @@ |
217 | * @param {*} val | 257 | * @param {*} val |
218 | * @author: renchao | 258 | * @author: renchao |
219 | */ | 259 | */ |
220 | zdySelectAll (val) { | 260 | zdySelectAll(val) { |
221 | this.selectAllObj.selectAll = val; | 261 | this.selectAllObj.selectAll = val; |
222 | }, | 262 | }, |
223 | //获取楼盘表数据 | 263 | //获取楼盘表数据 |
... | @@ -228,7 +268,7 @@ | ... | @@ -228,7 +268,7 @@ |
228 | * @param {*} actual | 268 | * @param {*} actual |
229 | * @author: renchao | 269 | * @author: renchao |
230 | */ | 270 | */ |
231 | getLpb (zrzbsm, scyclx, actual) { | 271 | getLpb(zrzbsm, scyclx, actual) { |
232 | if (!zrzbsm) { | 272 | if (!zrzbsm) { |
233 | this.$message({ | 273 | this.$message({ |
234 | message: "暂无楼盘表", | 274 | message: "暂无楼盘表", |
... | @@ -239,8 +279,11 @@ | ... | @@ -239,8 +279,11 @@ |
239 | if (res.code == 200) { | 279 | if (res.code == 200) { |
240 | if (scyclx) { | 280 | if (scyclx) { |
241 | if (res.result.syclx == "1") { | 281 | if (res.result.syclx == "1") { |
242 | res.result.lpb.ljzs = res.result.lpb.ljzs.sort(this.compare("place")); | 282 | res.result.lpb.ljzs = res.result.lpb.ljzs.sort( |
243 | this.lpbData = res.result.lpb == null ? this.lpbData : res.result.lpb; | 283 | this.compare("place") |
284 | ); | ||
285 | this.lpbData = | ||
286 | res.result.lpb == null ? this.lpbData : res.result.lpb; | ||
244 | } | 287 | } |
245 | } else { | 288 | } else { |
246 | this.$message({ | 289 | this.$message({ |
... | @@ -256,7 +299,6 @@ | ... | @@ -256,7 +299,6 @@ |
256 | } | 299 | } |
257 | }); | 300 | }); |
258 | } | 301 | } |
259 | |||
260 | }, | 302 | }, |
261 | //户右键点击事件 | 303 | //户右键点击事件 |
262 | /** | 304 | /** |
... | @@ -266,7 +308,7 @@ | ... | @@ -266,7 +308,7 @@ |
266 | * @param {*} type | 308 | * @param {*} type |
267 | * @author: renchao | 309 | * @author: renchao |
268 | */ | 310 | */ |
269 | openMenu (e, item, type) { | 311 | openMenu(e, item, type) { |
270 | this.lpbChLeft = e.pageX - 96; | 312 | this.lpbChLeft = e.pageX - 96; |
271 | this.lpbChTop = e.pageY - 23; | 313 | this.lpbChTop = e.pageY - 23; |
272 | // this.lpbChVisible = true; | 314 | // this.lpbChVisible = true; |
... | @@ -276,7 +318,7 @@ | ... | @@ -276,7 +318,7 @@ |
276 | * @description: 关闭户右键菜单 | 318 | * @description: 关闭户右键菜单 |
277 | * @author: renchao | 319 | * @author: renchao |
278 | */ | 320 | */ |
279 | closeMenu () { | 321 | closeMenu() { |
280 | this.lpbChVisible = false; | 322 | this.lpbChVisible = false; |
281 | }, | 323 | }, |
282 | //右键菜单点击 | 324 | //右键菜单点击 |
... | @@ -284,7 +326,7 @@ | ... | @@ -284,7 +326,7 @@ |
284 | * @description: 右键菜单点击 | 326 | * @description: 右键菜单点击 |
285 | * @author: renchao | 327 | * @author: renchao |
286 | */ | 328 | */ |
287 | menuClick () { | 329 | menuClick() { |
288 | this.closeMenu(); | 330 | this.closeMenu(); |
289 | }, | 331 | }, |
290 | /** | 332 | /** |
... | @@ -292,7 +334,7 @@ | ... | @@ -292,7 +334,7 @@ |
292 | * @param {*} property | 334 | * @param {*} property |
293 | * @author: renchao | 335 | * @author: renchao |
294 | */ | 336 | */ |
295 | compare (property) { | 337 | compare(property) { |
296 | return function (a, b) { | 338 | return function (a, b) { |
297 | var value1 = a[property]; | 339 | var value1 = a[property]; |
298 | var value2 = b[property]; | 340 | var value2 = b[property]; |
... | @@ -303,7 +345,7 @@ | ... | @@ -303,7 +345,7 @@ |
303 | * @description: submitForm | 345 | * @description: submitForm |
304 | * @author: renchao | 346 | * @author: renchao |
305 | */ | 347 | */ |
306 | submitForm () { | 348 | submitForm() { |
307 | if (this.bsmList.length == 0) { | 349 | if (this.bsmList.length == 0) { |
308 | this.$message.error("请至少选择一条数据"); | 350 | this.$message.error("请至少选择一条数据"); |
309 | return; | 351 | return; |
... | @@ -312,60 +354,68 @@ | ... | @@ -312,60 +354,68 @@ |
312 | startBusinessFlow({ | 354 | startBusinessFlow({ |
313 | bsmSqyw: this.sqywInfo.bsmSqyw, | 355 | bsmSqyw: this.sqywInfo.bsmSqyw, |
314 | bdcdysz: this.bsmList, | 356 | bdcdysz: this.bsmList, |
315 | }).then((res) => { | 357 | }) |
316 | this.loading = false | 358 | .then((res) => { |
359 | this.loading = false; | ||
317 | if (res.code == 200) { | 360 | if (res.code == 200) { |
318 | this.$message({ | 361 | this.$message({ |
319 | showClose: true, | 362 | showClose: true, |
320 | message: '发起申请成功', | 363 | message: "发起申请成功", |
321 | type: 'success' | 364 | type: "success", |
322 | }) | 365 | }); |
323 | if (!this.isJump) { | 366 | if (!this.isJump) { |
324 | this.jump(res.result, this.sqywInfo.djywbm) | 367 | this.jump(res.result, this.sqywInfo.djywbm); |
325 | } else { | 368 | } else { |
326 | store.dispatch('user/refreshPage', true); | 369 | store.dispatch("user/refreshPage", true); |
327 | } | 370 | } |
328 | this.close() | 371 | this.close(); |
329 | } else { | 372 | } else { |
330 | if (res.result && res.result.length > 0) { | 373 | if (res.result && res.result.length > 0) { |
331 | this.$popup("申请错误明细", "components/ywdialog", { width: '36%', formData: { result: res.result } }) | 374 | this.$popup("申请错误明细", "components/ywdialog", { |
375 | width: "36%", | ||
376 | formData: { result: res.result }, | ||
377 | }); | ||
332 | } else { | 378 | } else { |
333 | this.$popup("申请错误明细", "components/ywdialog", { width: '36%', formData: { message: res.message } }) | 379 | this.$popup("申请错误明细", "components/ywdialog", { |
380 | width: "36%", | ||
381 | formData: { message: res.message }, | ||
382 | }); | ||
334 | } | 383 | } |
335 | } | 384 | } |
336 | }).catch(() => { | ||
337 | this.loading = false | ||
338 | }) | 385 | }) |
386 | .catch(() => { | ||
387 | this.loading = false; | ||
388 | }); | ||
339 | }, | 389 | }, |
340 | /** | 390 | /** |
341 | * @description: close | 391 | * @description: close |
342 | * @param {*} val | 392 | * @param {*} val |
343 | * @author: renchao | 393 | * @author: renchao |
344 | */ | 394 | */ |
345 | close () { | 395 | close() { |
346 | ywPopupCacel() | 396 | ywPopupCacel(); |
347 | }, | 397 | }, |
348 | }, | 398 | }, |
349 | computed: { | 399 | computed: { |
350 | lpbContentHeight () { | 400 | lpbContentHeight() { |
351 | return this.onlyShow ? 32 : 76 | 401 | return this.onlyShow ? 32 : 76; |
352 | // return 76 | 402 | // return 76 |
353 | } | 403 | }, |
354 | }, | 404 | }, |
355 | watch: { | 405 | watch: { |
356 | //户右键菜单显示时,监听到鼠标点击时关闭户右键菜单 | 406 | //户右键菜单显示时,监听到鼠标点击时关闭户右键菜单 |
357 | lpbChVisible (value) { | 407 | lpbChVisible(value) { |
358 | if (value) { | 408 | if (value) { |
359 | document.body.addEventListener("click", this.closeMenu); | 409 | document.body.addEventListener("click", this.closeMenu); |
360 | } else { | 410 | } else { |
361 | document.body.removeEventListener("click", this.closeMenu); | 411 | document.body.removeEventListener("click", this.closeMenu); |
362 | } | 412 | } |
363 | } | ||
364 | }, | 413 | }, |
365 | }; | 414 | }, |
415 | }; | ||
366 | </script> | 416 | </script> |
367 | <style scoped lang="scss"> | 417 | <style scoped lang="scss"> |
368 | .lpbContent-wrap { | 418 | .lpbContent-wrap { |
369 | width: 100%; | 419 | width: 100%; |
370 | height: 100%; | 420 | height: 100%; |
371 | overflow: hidden; | 421 | overflow: hidden; |
... | @@ -437,5 +487,5 @@ | ... | @@ -437,5 +487,5 @@ |
437 | background: #ffffff; | 487 | background: #ffffff; |
438 | } | 488 | } |
439 | } | 489 | } |
440 | } | 490 | } |
441 | </style> | 491 | </style> | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2024-02-02 16:52:02 | 4 | * @LastEditTime: 2024-03-07 09:52:35 |
5 | --> | 5 | --> |
6 | <!-- 批量删除弹框 --> | 6 | <!-- 批量删除弹框 --> |
7 | <template> | 7 | <template> |
... | @@ -65,7 +65,6 @@ | ... | @@ -65,7 +65,6 @@ |
65 | } | 65 | } |
66 | }, | 66 | }, |
67 | methods: { | 67 | methods: { |
68 | // 批量删除确定按钮 | ||
69 | /** | 68 | /** |
70 | * @description: 批量删除确定按钮 | 69 | * @description: 批量删除确定按钮 |
71 | * @author: renchao | 70 | * @author: renchao |
... | @@ -74,6 +73,7 @@ | ... | @@ -74,6 +73,7 @@ |
74 | var formdata = new FormData(); | 73 | var formdata = new FormData(); |
75 | formdata.append("bsmSldyList", this.selectBdcdy); | 74 | formdata.append("bsmSldyList", this.selectBdcdy); |
76 | formdata.append("bsmSlsq", this.formData.bsmSlsq); | 75 | formdata.append("bsmSlsq", this.formData.bsmSlsq); |
76 | store.dispatch('user/refreshPage', false); | ||
77 | deleteSlbdcdy(formdata).then(res => { | 77 | deleteSlbdcdy(formdata).then(res => { |
78 | if (res.code == 200) { | 78 | if (res.code == 200) { |
79 | this.$popupCacel(); | 79 | this.$popupCacel(); | ... | ... |
1 | <!-- | 1 | <!-- |
2 | * @Description: workFrame左侧菜单列表-普通 | 2 | * @Description: workFrame左侧菜单列表-普通 |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2024-02-01 16:57:55 | 4 | * @LastEditTime: 2024-03-07 09:54:56 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }"> | 7 | <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }"> |
... | @@ -84,7 +84,7 @@ | ... | @@ -84,7 +84,7 @@ |
84 | isRefresh: { | 84 | isRefresh: { |
85 | handler (newVal, oldVal) { | 85 | handler (newVal, oldVal) { |
86 | if (newVal) { | 86 | if (newVal) { |
87 | this.loadBdcdylist(true) | 87 | this.loadBdcdylist() |
88 | } | 88 | } |
89 | }, | 89 | }, |
90 | immediate: true | 90 | immediate: true | ... | ... |
... | @@ -384,6 +384,19 @@ | ... | @@ -384,6 +384,19 @@ |
384 | @upDateQlrxxList="upDateQlrxxList" | 384 | @upDateQlrxxList="upDateQlrxxList" |
385 | :disabled="viewEdit" | 385 | :disabled="viewEdit" |
386 | :gyfs="ruleForm.sldy.gyfs" /> | 386 | :gyfs="ruleForm.sldy.gyfs" /> |
387 | |||
388 | <div v-if="ruleForm.ywrList && ruleForm.ywrList.length > 0 && ruleForm.qlxx.djlx==200"> | ||
389 | <div class="slxx_title title-block"> | ||
390 | 义务人信息 | ||
391 | <div class="triangle"></div> | ||
392 | </div> | ||
393 | <ywrCommonTable | ||
394 | v-if="ruleForm.ywrList" | ||
395 | :disabled="viewEdit" | ||
396 | :tableData="ruleForm.ywrList" | ||
397 | :key="key" | ||
398 | @upDateQlrxxList="upDateYwrxxList" /> | ||
399 | </div> | ||
387 | <div class="slxx_title title-block"> | 400 | <div class="slxx_title title-block"> |
388 | 登记原因 | 401 | 登记原因 |
389 | <div class="triangle"></div> | 402 | <div class="triangle"></div> |
... | @@ -414,6 +427,7 @@ | ... | @@ -414,6 +427,7 @@ |
414 | <script> | 427 | <script> |
415 | import ywmix from "@/views/ywbl/mixin/index"; | 428 | import ywmix from "@/views/ywbl/mixin/index"; |
416 | import qlrCommonTable from "@/views/workflow/components/qlrCommonTable"; | 429 | import qlrCommonTable from "@/views/workflow/components/qlrCommonTable"; |
430 | import ywrCommonTable from "@/views/workflow/components/ywrCommonTable"; | ||
417 | import tdytTable from "@/views/workflow/components/tdytTable"; | 431 | import tdytTable from "@/views/workflow/components/tdytTable"; |
418 | import { Init, saveData } from "@/api/workflow/fwsyqFlow.js"; | 432 | import { Init, saveData } from "@/api/workflow/fwsyqFlow.js"; |
419 | import { mapGetters } from "vuex"; | 433 | import { mapGetters } from "vuex"; |
... | @@ -460,7 +474,7 @@ | ... | @@ -460,7 +474,7 @@ |
460 | this.isSave = false | 474 | this.isSave = false |
461 | }) | 475 | }) |
462 | }, | 476 | }, |
463 | components: { qlrCommonTable, tdytTable }, | 477 | components: { qlrCommonTable, tdytTable, ywrCommonTable}, |
464 | computed: { | 478 | computed: { |
465 | ...mapGetters(["dictData", "flag"]), | 479 | ...mapGetters(["dictData", "flag"]), |
466 | }, | 480 | }, | ... | ... |
... | @@ -71,7 +71,7 @@ | ... | @@ -71,7 +71,7 @@ |
71 | import { ywPopupDialog } from "@/utils/popup.js"; | 71 | import { ywPopupDialog } from "@/utils/popup.js"; |
72 | import { datas, sendThis } from "../javascript/selectH.js"; | 72 | import { datas, sendThis } from "../javascript/selectH.js"; |
73 | import { defaultParameters } from "../javascript/publicDefaultPar.js"; | 73 | import { defaultParameters } from "../javascript/publicDefaultPar.js"; |
74 | // import { selectHQjdc } from "@/api/ywsq.js"; | 74 | import { selectHQjdc } from "@/api/ywsq.js"; |
75 | import { startBusinessFlow, againAddSldy } from "@/api/workFlow.js"; | 75 | import { startBusinessFlow, againAddSldy } from "@/api/workFlow.js"; |
76 | export default { | 76 | export default { |
77 | mixins: [ywsqTable, jump], | 77 | mixins: [ywsqTable, jump], |
... | @@ -123,16 +123,16 @@ | ... | @@ -123,16 +123,16 @@ |
123 | * @author: renchao | 123 | * @author: renchao |
124 | */ | 124 | */ |
125 | queryClick () { | 125 | queryClick () { |
126 | // this.$startLoading(); | 126 | this.$startLoading(); |
127 | // this.queryForm.sqywbm = this.sqywInfo.djywbm; | 127 | this.queryForm.sqywbm = this.sqywInfo.djywbm; |
128 | // selectHQjdc({ ...this.queryForm, ...this.pageData }).then((res) => { | 128 | selectHQjdc({ ...this.queryForm, ...this.pageData }).then((res) => { |
129 | // this.$endLoading(); | 129 | this.$endLoading(); |
130 | // if (res.code === 200) { | 130 | if (res.code === 200) { |
131 | // let { total, records } = res.result; | 131 | let { total, records } = res.result; |
132 | // this.tableData.total = total; | 132 | this.tableData.total = total; |
133 | // this.tableData.data = records; | 133 | this.tableData.data = records; |
134 | // } | 134 | } |
135 | // }); | 135 | }); |
136 | }, | 136 | }, |
137 | /** | 137 | /** |
138 | * @description: submitForm | 138 | * @description: submitForm | ... | ... |
-
Please register or sign in to post a comment