74b5cb33 by tianhaohao@pashanhoo.com

Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

2 parents 41561225 b4f32752
...@@ -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,28 +11,45 @@ ...@@ -10,28 +11,45 @@
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>
14 <div> {{ userInfo.departmentName }}</div> 15 <span style="padding-right: 10px">{{
15 <div> {{ userInfo.name }}</div> 16 userInfo.departmentName
17 }}</span>
18 <span style="padding-right: 10px">{{ userInfo.name }}</span>
19 </p>
16 <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" />
17 </div> 21 </div>
18 <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 />
19 </div> 27 </div>
20 </div> 28 </div>
21 <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 />
22 </div> 34 </div>
23 </template> 35 </template>
24 <script> 36 <script>
25 import axios from 'axios' 37 import axios from "axios";
26 import Cookies from 'js-cookie' 38 import Cookies from "js-cookie";
27 import { mapGetters } from 'vuex' 39 import { mapGetters } from "vuex";
28 import NoticeBar from '@/components/NoticeBar/index' 40 import NoticeBar from "@/components/NoticeBar/index";
29 import { getHomeNoticeList } from "@/api/home" 41 import { getHomeNoticeList } from "@/api/home";
30 import { setToken } from "@/utils/util"; 42 import { setToken } from "@/utils/util";
31 export default { 43 export default {
32 components: { 44 components: {
33 NoticeBar 45 NoticeBar,
46 },
47 computed: {
48 ...mapGetters(["sidebar", "avatar", "name", "userInfo"]),
49 baseUrl() {
50 return window._config.baseUrl;
34 }, 51 },
52 <<<<<<< HEAD
35 computed: { 53 computed: {
36 ...mapGetters(['sidebar', 'avatar', 'name','userInfo']), 54 ...mapGetters(['sidebar', 'avatar', 'name','userInfo']),
37 baseUrl () { 55 baseUrl () {
...@@ -42,244 +60,278 @@ ...@@ -42,244 +60,278 @@
42 return { 60 return {
43 logo: require('../../image/logo.png'), 61 logo: require('../../image/logo.png'),
44 noticeList: [] 62 noticeList: []
63 =======
64 },
65 data() {
66 return {
67 logo: require("../../image/bdclogo.png"),
68 noticeList: [],
69 };
70 },
71 created() {
72 this.queryNoticeList();
73 },
74 mounted() {
75 let that = this;
76 window.addEventListener("message", function (messageEvent) {
77 if (messageEvent.data.update) {
78 that.queryNoticeList();
79 >>>>>>> b4f3275250be77c94de397972ae05502fc7b7f3c
45 } 80 }
46 }, 81 });
47 created () { 82 },
48 this.queryNoticeList() 83 destroyed() {
49 }, 84 window.removeEventListener("message");
50 mounted () { 85 },
51 let that = this 86 methods: {
52 window.addEventListener('message', function (messageEvent) { 87 /**
53 if (messageEvent.data.update) { 88 * @description: queryNoticeList
54 that.queryNoticeList() 89 * @author: renchao
90 */
91 queryNoticeList() {
92 getHomeNoticeList().then((res) => {
93 if (res.result) {
94 this.noticeList = res.result.noticeList;
55 } 95 }
56 }) 96 });
57 }, 97 },
58 destroyed () { 98 /**
59 window.removeEventListener('message') 99 * @description: logout
100 * @author: renchao
101 */
102 logout() {
103 axios
104 .post(window._config.services.management + "/management/logout")
105 .then(() => {
106 setToken(undefined);
107 sessionStorage.removeItem("token");
108 localStorage.setItem("dj-location", window.location.href);
109 window.location.href =
110 window._config.casBaseURL +
111 "/logout?service=" +
112 encodeURIComponent(window.location.href);
113 });
60 }, 114 },
61 methods: {
62 /**
63 * @description: queryNoticeList
64 * @author: renchao
65 */
66 queryNoticeList () {
67 getHomeNoticeList().then(res => {
68 if (res.result) {
69 this.noticeList = res.result.noticeList
70 }
71 })
72 },
73 /**
74 * @description: logout
75 * @author: renchao
76 */
77 logout () {
78 axios.post(window._config.services.management + "/management/logout").then(() => {
79 setToken(undefined)
80 sessionStorage.removeItem('token')
81 localStorage.setItem('dj-location', window.location.href)
82 window.location.href = window._config.casBaseURL + '/logout?service=' + encodeURIComponent(window.location.href);
83 })
84 },
85 115
86 /** 116 /**
87 * @description: themeChange 117 * @description: themeChange
88 * @param {*} val 118 * @param {*} val
89 * @author: renchao 119 * @author: renchao
90 */ 120 */
91 themeChange (val) { 121 themeChange(val) {
92 this.$store.dispatch('app/updateTheme', val) 122 this.$store.dispatch("app/updateTheme", val);
93 }, 123 },
94 searchMessageCenter () { 124 searchMessageCenter() {
95 this.$router.push({ name: 'messagecenter' }) 125 this.$router.push({ name: "messagecenter" });
96 }, 126 },
97 /** 127 /**
98 * @description: handleCommand 128 * @description: handleCommand
99 * @param {*} command 129 * @param {*} command
100 * @author: renchao 130 * @author: renchao
101 */ 131 */
102 handleCommand (command) { 132 handleCommand(command) {
103 if (command == 'a') { 133 if (command == "a") {
104 //个人中心 134 //个人中心
105 this.$router.push({ name: 'personal' }) 135 this.$router.push({ name: "personal" });
106 }
107 } 136 }
108 } 137 },
109 } 138 },
139 };
110 </script> 140 </script>
111 <style lang="scss" scoped> 141 <style lang="scss" scoped>
112 .navbar-con { 142 .navbar-con {
113 position: relative; 143 position: relative;
144 }
145
146 .NoticeBar {
147 position: absolute;
148 bottom: 0;
149 }
150
151 .el-dropdown-menu {
152 padding: 0 !important;
153 border: 1px solid #ebeef5;
154 box-shadow: 0 2px 10px 0 rgba(0, 0, 0, 0.12);
155 border-radius: 4px 0 0 4px 4px;
156
157 .el-dropdown-menu__item {
158 text-align: center;
159 margin-top: 0 !important;
160 font-size: 14px;
161 font-family: PingFangSC-Regular, PingFang SC;
162 font-weight: 400;
163 color: #4a4a4a;
164 width: 140px;
165 height: 36px;
166 line-height: 36px;
114 } 167 }
115 168
116 .NoticeBar { 169 .el-dropdown-menu__item:nth-child(6) {
117 position: absolute; 170 border-top: 1px solid #ebeef5;
118 bottom: 0;
119 } 171 }
120 172
121 .el-dropdown-menu { 173 .popper__arrow {
122 padding: 0 !important; 174 top: -11px !important;
123 border: 1px solid #ebeef5; 175 left: 110px !important;
124 box-shadow: 0 2px 10px 0 rgba(0, 0, 0, 0.12); 176 transform: rotate(0deg) scale(2);
125 border-radius: 4px 0 0 4px 4px; 177 }
126 178
127 .el-dropdown-menu__item { 179 .el-dropdown-menu__item:not(.is-disabled):hover,
128 text-align: center; 180 .el-dropdown-menu__item:focus {
129 margin-top: 0 !important; 181 background: #f6f7f9;
130 font-size: 14px; 182 color: #4a4a4a;
131 font-family: PingFangSC-Regular, PingFang SC; 183 }
132 font-weight: 400; 184 }
133 color: #4a4a4a;
134 width: 140px;
135 height: 36px;
136 line-height: 36px;
137 }
138 185
139 .el-dropdown-menu__item:nth-child(6) { 186 .navbar {
140 border-top: 1px solid #ebeef5; 187 height: $headerHeight;
141 } 188 overflow: hidden;
189 position: relative;
190 background: #fff;
191 // background: linear-gradient(270deg, #148CEE 0%, #1870E3 100%); //默认颜色
192 box-shadow: 0 1px 0px rgba(0, 21, 41, 0.08);
193 display: flex;
194 align-items: center;
195 padding: 0 20px;
196 justify-content: space-between;
142 197
143 .popper__arrow { 198 .logo {
144 top: -11px !important; 199 // margin-top: -20px;
145 left: 110px !important; 200 .header-logo {
146 transform: rotate(0deg) scale(2); 201 width: 40px;
202 float: left;
203 vertical-align: middle;
147 } 204 }
148 205 h4 {
149 .el-dropdown-menu__item:not(.is-disabled):hover, 206 float: left;
150 .el-dropdown-menu__item:focus { 207 vertical-align: middle;
151 background: #f6f7f9; 208 line-height: 40px;
152 color: #4a4a4a; 209 font-size: 22px;
210 color: #fff;
211 text-indent: 6px;
212 letter-spacing: 2px;
153 } 213 }
154 } 214 }
155 215
156 .navbar { 216 .backdrop {
217 flex: 1;
218 width: 60%;
219 background: url("../../image/backdrop.png");
220 background-size: 100% 100%;
157 height: $headerHeight; 221 height: $headerHeight;
158 overflow: hidden; 222 }
159 position: relative;
160 background: #fff;
161 // background: linear-gradient(270deg, #148CEE 0%, #1870E3 100%); //默认颜色
162 box-shadow: 0 1px 0px rgba(0, 21, 41, 0.08);
163 display: flex;
164 align-items: center;
165 padding: 0 20px;
166 justify-content: space-between;
167 223
168 .header-logo { 224 .hamburger-container {
169 width: 300px; 225 line-height: 43px;
170 } 226 height: 100%;
227 float: left;
228 cursor: pointer;
229 transition: background 0.3s;
230 -webkit-tap-highlight-color: transparent;
171 231
172 .backdrop { 232 &:hover {
173 flex: 1; 233 background: rgba(0, 0, 0, 0.025);
174 width: 60%;
175 background: url("../../image/backdrop.png");
176 background-size: 100% 100%;
177 height: $headerHeight;
178 } 234 }
235 }
179 236
180 .hamburger-container { 237 .breadcrumb-container {
181 line-height: 43px; 238 float: left;
182 height: 100%; 239 }
183 float: left; 240
241 .right-menu {
242 float: right;
243 height: 100%;
244 line-height: 50px;
245 display: flex;
246 align-items: center;
247
248 .function {
249 margin: 0 15px;
184 cursor: pointer; 250 cursor: pointer;
185 transition: background 0.3s; 251 }
186 -webkit-tap-highlight-color: transparent;
187 252
188 &:hover { 253 .shutdown {
189 background: rgba(0, 0, 0, 0.025); 254 font-size: 20px;
190 } 255 margin-left: 15px;
256 cursor: pointer;
191 } 257 }
192 258
193 .breadcrumb-container { 259 .organization-item {
194 float: left; 260 margin-right: 40px;
261 margin-top: -40px !important;
195 } 262 }
196 263
197 .right-menu { 264 .item {
198 float: right; 265 margin-right: 40px;
199 height: 100%; 266 margin-top: -20px;
200 line-height: 50px; 267 line-height: 18.4px;
201 display: flex; 268 cursor: pointer;
202 align-items: center; 269 position: relative;
203 270
204 .function { 271 .item-box {
205 margin: 0 15px; 272 position: absolute;
273 top: -5px;
274 left: 3px;
275 width: 100%;
276 min-width: 25px;
277 height: 25px;
206 cursor: pointer; 278 cursor: pointer;
279 z-index: 100;
207 } 280 }
281 }
208 282
209 .shutdown { 283 &:focus {
210 font-size: 20px; 284 outline: none;
211 margin-left: 15px; 285 }
212 cursor: pointer;
213 }
214 286
215 .organization-item { 287 .right-menu-item {
216 margin-right: 40px; 288 display: inline-block;
217 margin-top: -40px !important; 289 font-size: 18px;
218 } 290 color: #fff;
291 vertical-align: text-bottom;
219 292
220 .item { 293 &.hover-effect {
221 margin-right: 40px;
222 margin-top: -20px;
223 line-height: 18.4px;
224 cursor: pointer; 294 cursor: pointer;
225 position: relative; 295 transition: background 0.3s;
226 296 display: flex;
227 .item-box { 297 align-items: center;
228 position: absolute;
229 top: -5px;
230 left: 3px;
231 width: 100%;
232 min-width: 25px;
233 height: 25px;
234 cursor: pointer;
235 z-index: 100;
236 }
237 }
238
239 &:focus {
240 outline: none;
241 }
242
243 .right-menu-item {
244 display: inline-block;
245 font-size: 18px;
246 color: #fff;
247 vertical-align: text-bottom;
248
249 &.hover-effect {
250 cursor: pointer;
251 transition: background 0.3s;
252 display: flex;
253 align-items: center;
254 298
255 &:hover { 299 &:hover {
256 background: rgba(0, 0, 0, 0.025); 300 background: rgba(0, 0, 0, 0.025);
257 }
258 } 301 }
259 } 302 }
303 }
260 304
261 .avatar-wrapper { 305 .avatar-wrapper {
262 position: relative; 306 position: relative;
263 display: flex; 307 display: flex;
308 height: 40px;
309 align-items: center;
310 color: #ffffff;
311 p {
312 font-size: 14px;
264 height: 40px; 313 height: 40px;
265 align-items: center; 314 span {
266 color: #ffffff; 315 display: block;
267 316 line-height: 20px;
268 .user-avatar { 317 text-align: right;
269 cursor: pointer;
270 width: 35px;
271 height: 35px;
272 border-radius: 50%;
273 } 318 }
319 }
320 .user-avatar {
321 cursor: pointer;
322 width: 35px;
323 height: 35px;
324 border-radius: 50%;
325 }
274 326
275 .el-icon-caret-bottom { 327 .el-icon-caret-bottom {
276 cursor: pointer; 328 cursor: pointer;
277 position: absolute; 329 position: absolute;
278 right: -15px; 330 right: -15px;
279 top: 17px; 331 top: 17px;
280 font-size: 12px; 332 font-size: 12px;
281 }
282 } 333 }
283 } 334 }
284 } 335 }
336 }
285 </style> 337 </style>
......
...@@ -159,13 +159,15 @@ export default class filter { ...@@ -159,13 +159,15 @@ export default class filter {
159 }; 159 };
160 160
161 for (let key in row) { 161 for (let key in row) {
162 console.log("row[key]11",row[key],key);
163 console.log("www",strategies[key],key);
164 if (row[key] === 1 && strategies[key]) { 162 if (row[key] === 1 && strategies[key]) {
165 console.log("row[key]22",row[key]);
166 keys++; 163 keys++;
167 if (keys == 1) { 164 if (keys == 1) {
168 text += strategies[key]; 165 if(text){
166 text += ',' +strategies[key];
167 }else{
168 text += strategies[key];
169 }
170
169 } else { 171 } else {
170 text += ',' + strategies[key]; 172 text += ',' + strategies[key];
171 } 173 }
......
...@@ -4,12 +4,12 @@ ...@@ -4,12 +4,12 @@
4 <!-- 纵向倒序排列 逻辑幢位于独立幢单元和独立层户的上方 --> 4 <!-- 纵向倒序排列 逻辑幢位于独立幢单元和独立层户的上方 -->
5 <div class="ch-zdy-wrap"> 5 <div class="ch-zdy-wrap">
6 <!-- 幢单元 --> 6 <!-- 幢单元 -->
7 <zdy-cpn v-if="lpbData.zdys.length" :zdys="lpbData.zdys" :onlyShow="onlyShow"/> 7 <zdy-cpn v-if="lpbData.zdys.length" :zdys="lpbData.zdys" :onlyShow="onlyShow" />
8 <!-- 独立层户 --> 8 <!-- 独立层户 -->
9 <ch-cpn v-if="lpbData.cs.length" :ch="lpbData.cs" :onlyShow="onlyShow"/> 9 <ch-cpn v-if="lpbData.cs.length" :ch="lpbData.cs" :onlyShow="onlyShow" />
10 </div> 10 </div>
11 <!-- 逻辑幢 --> 11 <!-- 逻辑幢 -->
12 <ljzs-cpn v-if="lpbData.ljzs.length" :ljzs="lpbData.ljzs" :onlyShow="onlyShow"/> 12 <ljzs-cpn v-if="lpbData.ljzs.length" :ljzs="lpbData.ljzs" :onlyShow="onlyShow" />
13 </div> 13 </div>
14 <!-- 自然幢名称 --> 14 <!-- 自然幢名称 -->
15 <p class="lpb-xmmc" v-if="onlyShow" style="border-bottom: 1px solid #e6e6e6">{{ lpbData.xmmc }}</p> 15 <p class="lpb-xmmc" v-if="onlyShow" style="border-bottom: 1px solid #e6e6e6">{{ lpbData.xmmc }}</p>
...@@ -23,388 +23,419 @@ ...@@ -23,388 +23,419 @@
23 <!-- 右键菜单 --> 23 <!-- 右键菜单 -->
24 <ul 24 <ul
25 v-show="lpbChVisible" 25 v-show="lpbChVisible"
26 :style="{ left: lpbChLeft + 'px', top: lpbChTop + 'px' }" 26 :style="{ left: lpbChLeft + 'px', top: lpbChTop + 'px' }"
27 class="contextmenu" 27 class="contextmenu">
28 >
29 <li @click="menuClick">菜单一</li> 28 <li @click="menuClick">菜单一</li>
30 <li @click="menuClick">菜单二</li> 29 <li @click="menuClick">菜单二</li>
31 </ul> 30 </ul>
32 </div> 31 </div>
33 </template> 32 </template>
34 <script> 33 <script>
35 import { getLpb } from "@/api/lpcx.js"; 34 import { getLpb } from "@/api/lpcx.js";
36 import chCpn from "./ch.vue"; 35 import chCpn from "./ch.vue";
37 import zdyCpn from "./zdys.vue"; 36 import zdyCpn from "./zdys.vue";
38 import ljzsCpn from "./ljzs.vue"; 37 import ljzsCpn from "./ljzs.vue";
39 import { startBusinessFlow, choiceBdcdy,againAddSldy } from "@/api/workFlow.js"; 38 import { startBusinessFlow, choiceBdcdy, againAddSldy } from "@/api/workFlow.js";
40 import jump from "../../ywbl/ywsq/components/mixin/jump"; 39 import jump from "../../ywbl/ywsq/components/mixin/jump";
41 import store from '@/store/index.js' 40 import store from '@/store/index.js'
42 import { ywPopupCacel } from "@/utils/popup.js"; 41 import { ywPopupCacel } from "@/utils/popup.js";
43 export default { 42 export default {
44 mixins: [jump], 43 mixins: [jump],
45 provide() { 44 provide () {
46 return { 45 return {
47 openMenu: this.openMenu, 46 openMenu: this.openMenu,
48 selectAll: this.selectAllObj, 47 selectAll: this.selectAllObj,
49 changeChoosedObj:this.changeChoosedObj, 48 changeChoosedObj: this.changeChoosedObj,
50 clearChangeChoosedObj:this.clearChangeChoosedObj, 49 clearChangeChoosedObj: this.clearChangeChoosedObj,
51 getBsmList:this.getBsmList 50 getBsmList: this.getBsmList
52 }; 51 };
53 },
54 name: "",
55 components: { chCpn, zdyCpn, ljzsCpn },
56 props: {
57 zrzbsm: {
58 type: String,
59 default: "",
60 },
61 lpbParent: {
62 type: String,
63 default: "isLpb",
64 },
65 isHb: {
66 type: Boolean,
67 default: true,
68 },
69 onlyShow:{
70 type: Boolean,
71 default: true,
72 },
73 showSave:{
74 type: Boolean,
75 default: false,
76 },
77 scyclx: {
78 type: Number,
79 default: 0,
80 },
81 sqywInfo: {
82 type: Object,
83 default: () => { }
84 }, 52 },
85 isJump: { type: Boolean, default: false }, 53 name: "",
86 }, 54 components: { chCpn, zdyCpn, ljzsCpn },
87 data() { 55 props: {
88 return { 56 zrzbsm: {
89 lpbData: { 57 type: String,
90 ljzs: [], 58 default: "",
91 cs: [],
92 zdys: [],
93 }, 59 },
94 //户全选标识 由于依赖注入的绑定并不是可响应的,所以传入可监听的对象以获取其属性的响应 60 lpbParent: {
95 selectAllObj: { 61 type: String,
96 selectAll: false, 62 default: "isLpb",
97 }, 63 },
98 //层户右键菜单显隐 64 isHb: {
99 lpbChVisible: false, 65 type: Boolean,
100 //右键菜单定位位置 66 default: true,
101 lpbChLeft: 100,
102 lpbChTop: 100,
103 // 改变户选中状态
104 changeChoosedObj:{
105 bsms:[],
106 color:''
107 }, 67 },
108 // 选中户bsm合集 68 onlyShow: {
109 bsmList:[], 69 type: Boolean,
110 loading: false, 70 default: true,
111 }; 71 },
112 }, 72 showSave: {
113 mounted() { 73 type: Boolean,
114 this.scyclx ? this.getLpb(this.zrzbsm,this.scyclx):this.getLpb(this.zrzbsm); 74 default: false,
115 window.lpbContent = this; 75 },
116 }, 76 scyclx: {
117 methods: { 77 type: Number,
118 /** 78 default: 0,
119 * @description: 获取当前楼盘表选中户信息 79 },
120 * @param {Array} bsmList 80 sqywInfo: {
121 * @author: renchao 81 type: Object,
122 */ 82 default: () => { }
123 getBsmList(bsmList,compFlag){ 83 },
124 // 根据本次传入的组件标识删除之前对应组件标识存入hbsmList的数据 84 name: "",
125 this.bsmList = this.bsmList.filter((i) => i.flag != compFlag) 85 components: { chCpn, zdyCpn, ljzsCpn },
126 // 合并本次数据 86 props: {
127 this.bsmList = this.bsmList.concat([...new Map(bsmList.map(item => [item.bdcdyh, item])).values()]); 87 zrzbsm: {
128 // }) 88 type: String,
129 }, 89 default: "",
130 /** 90 },
131 * @description: 保存当前楼盘表 91 lpbParent: {
132 * @author: renchao 92 type: String,
133 */ 93 default: "isLpb",
134 saveLpb(){ 94 },
135 if (this.bsmList.length == 0) { 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 },
107 scyclx: {
108 type: Number,
109 default: 0,
110 },
111 sqywInfo: {
112 type: Object,
113 default: () => { }
114 },
115 isJump: { type: Boolean, default: false },
116 },
117 data () {
118 return {
119 lpbData: {
120 ljzs: [],
121 cs: [],
122 zdys: [],
123 },
124 //户全选标识 由于依赖注入的绑定并不是可响应的,所以传入可监听的对象以获取其属性的响应
125 selectAllObj: {
126 selectAll: false,
127 },
128 //层户右键菜单显隐
129 lpbChVisible: false,
130 //右键菜单定位位置
131 lpbChLeft: 100,
132 lpbChTop: 100,
133 // 改变户选中状态
134 changeChoosedObj: {
135 bsms: [],
136 color: ''
137 },
138 // 选中户bsm合集
139 bsmList: [],
140 loading: false,
141 };
142 },
143 mounted () {
144 this.scyclx ? this.getLpb(this.zrzbsm, this.scyclx) : this.getLpb(this.zrzbsm);
145 window.lpbContent = this;
146 },
147 /**
148 * @description: 保存当前楼盘表
149 * @author: renchao
150 */
151 saveLpb () {
152 if (this.bsmList.length == 0) {
136 this.$message.error("请至少选择一条数据"); 153 this.$message.error("请至少选择一条数据");
137 return; 154 return;
138 } 155 }
139 this.loading = true; 156 this.loading = true;
140 againAddSldy({ 157 againAddSldy({
141 bsmSqyw: this.sqywInfo.bsmSqyw, 158 bsmSqyw: this.sqywInfo.bsmSqyw,
142 bsmSlsq: this.sqywInfo.bsmSlsq, 159 bsmSlsq: this.sqywInfo.bsmSlsq,
143 bdcdysz: this.bsmList, 160 bdcdysz: this.bsmList,
144 sjlx: "houses" 161 sjlx: "houses"
145 }).then((res) => { 162 }).then((res) => {
146 this.loading = false 163 this.loading = false
147 if (res.code == 200) { 164 if (res.code == 200) {
148 this.$message({ 165 this.$message({
149 showClose: true, 166 showClose: true,
150 message: '添加成功', 167 message: '添加成功',
151 type: 'success' 168 type: 'success'
152 }) 169 })
153 if (!this.isJump) { 170 if (!this.isJump) {
154 this.jump(res.result, this.sqywInfo.djywbm) 171 this.jump(res.result, this.sqywInfo.djywbm)
155 } else { 172 } else {
156 store.dispatch('user/refreshPage', true); 173 store.dispatch('user/refreshPage', true);
157 } 174 }
158 //this.close(); 175 //this.close();
159 this.$popupCacel(); 176 this.$popupCacel();
160 } else {
161 if (res.result && res.result.length > 0) {
162 this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{result: res.result} })
163 } else { 177 } else {
164 this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{message: res.message} }) 178 if (res.result && res.result.length > 0) {
165 } 179 this.$popup("申请错误明细", "components/ywdialog", { width: '36%', formData: { result: res.result } })
166 } 180 } else {
167 }).catch(() => { 181 if (res.result && res.result.length > 0) {
168 this.loading = false 182 this.$popup("申请错误明细", "components/ywdialog", { width: '36%', formData: { result: res.result } })
169 }) 183 } else {
170 // todo 调用保存接口 传入参数待定 184 this.$popup("申请错误明细", "components/ywdialog", { width: '36%', formData: { message: res.message } })
171 //console.log(this.bsmList,'this.bsmList'); 185 }
172 // 保存成功后关闭弹框
173 //this.$popupCacel()
174 },
175 // 改变户选中状态
176 /**
177 * @description: 改变户选中状态
178 * @param {*} bsms
179 * @param {*} color
180 * @author: renchao
181 */
182 changeChoosed(bsms, color){
183 this.changeChoosedObj.bsms = bsms;
184 this.changeChoosedObj.color = color;
185 },
186 /**
187 * @description: clearChangeChoosedObj
188 * @author: renchao
189 */
190 clearChangeChoosedObj(){
191 this.changeChoosedObj.bsms = [];
192 },
193 //全选户
194 /**
195 * @description: 全选户
196 * @param {*} val
197 * @author: renchao
198 */
199 zdySelectAll(val) {
200 this.selectAllObj.selectAll = val;
201 },
202 //获取楼盘表数据
203 /**
204 * @description: 获取楼盘表数据
205 * @param {*} zrzbsm
206 * @param {*} scyclx
207 * @param {*} actual
208 * @author: renchao
209 */
210 getLpb(zrzbsm, scyclx, actual) {
211 getLpb(zrzbsm, scyclx).then((res) => {
212 if (res.code == 200) {
213 if(scyclx){
214 if(res.result.syclx == "1") {
215 res.result.lpb.ljzs = res.result.lpb.ljzs.sort(this.compare("place"));
216 this.lpbData = res.result.lpb == null ? this.lpbData : res.result.lpb;
217 } 186 }
218 }else{
219 res.result.lpb.ljzs = res.result.lpb.ljzs.sort(this.compare("place"));
220 this.lpbData = res.result.lpb == null ? this.lpbData : res.result.lpb;
221 } 187 }
222 } else { 188 }).catch(() => {
189 this.loading = false
190 })
191 // todo 调用保存接口 传入参数待定
192 //console.log(this.bsmList,'this.bsmList');
193 // 保存成功后关闭弹框
194 //this.$popupCacel()
195 },
196 // 改变户选中状态
197 /**
198 * @description: 改变户选中状态
199 * @param {*} bsms
200 * @param {*} color
201 * @author: renchao
202 */
203 changeChoosed (bsms, color) {
204 this.changeChoosedObj.bsms = bsms;
205 this.changeChoosedObj.color = color;
206 },
207 /**
208 * @description: clearChangeChoosedObj
209 * @author: renchao
210 */
211 clearChangeChoosedObj () {
212 this.changeChoosedObj.bsms = [];
213 },
214 //全选户
215 /**
216 * @description: 全选户
217 * @param {*} val
218 * @author: renchao
219 */
220 zdySelectAll (val) {
221 this.selectAllObj.selectAll = val;
222 },
223 //获取楼盘表数据
224 /**
225 * @description: 获取楼盘表数据
226 * @param {*} zrzbsm
227 * @param {*} scyclx
228 * @param {*} actual
229 * @author: renchao
230 */
231 getLpb (zrzbsm, scyclx, actual) {
232 if (!zrzbsm) {
223 this.$message({ 233 this.$message({
224 message: res.message, 234 message: "暂无楼盘表",
225 type: "warning", 235 type: "warning",
226 }); 236 });
237 } else {
238 getLpb(zrzbsm, scyclx).then((res) => {
239 if (res.code == 200) {
240 if (scyclx) {
241 if (res.result.syclx == "1") {
242 res.result.lpb.ljzs = res.result.lpb.ljzs.sort(this.compare("place"));
243 this.lpbData = res.result.lpb == null ? this.lpbData : res.result.lpb;
244 }
245 } else {
246 this.$message({
247 message: res.message,
248 type: "warning",
249 });
250 }
251 } else {
252 this.$message({
253 message: res.message,
254 type: "warning",
255 });
256 }
257 });
227 } 258 }
228 }); 259
229 }, 260 },
230 //户右键点击事件 261 //户右键点击事件
231 /** 262 /**
232 * @description: 户右键点击事件 263 * @description: 户右键点击事件
233 * @param {*} e 264 * @param {*} e
234 * @param {*} item 265 * @param {*} item
235 * @param {*} type 266 * @param {*} type
236 * @author: renchao 267 * @author: renchao
237 */ 268 */
238 openMenu(e, item, type) { 269 openMenu (e, item, type) {
239 this.lpbChLeft = e.pageX - 96; 270 this.lpbChLeft = e.pageX - 96;
240 this.lpbChTop = e.pageY - 23; 271 this.lpbChTop = e.pageY - 23;
241 // this.lpbChVisible = true; 272 // this.lpbChVisible = true;
242 }, 273 },
243 //关闭户右键菜单 274 //关闭户右键菜单
244 /** 275 /**
245 * @description: 关闭户右键菜单 276 * @description: 关闭户右键菜单
246 * @author: renchao 277 * @author: renchao
247 */ 278 */
248 closeMenu() { 279 closeMenu () {
249 this.lpbChVisible = false; 280 this.lpbChVisible = false;
250 }, 281 },
251 //右键菜单点击 282 //右键菜单点击
252 /** 283 /**
253 * @description: 右键菜单点击 284 * @description: 右键菜单点击
254 * @author: renchao 285 * @author: renchao
255 */ 286 */
256 menuClick() { 287 menuClick () {
257 this.closeMenu(); 288 this.closeMenu();
258 }, 289 },
259 /** 290 /**
260 * @description: compare 291 * @description: compare
261 * @param {*} property 292 * @param {*} property
262 * @author: renchao 293 * @author: renchao
263 */ 294 */
264 compare(property) { 295 compare (property) {
265 return function (a, b) { 296 return function (a, b) {
266 var value1 = a[property]; 297 var value1 = a[property];
267 var value2 = b[property]; 298 var value2 = b[property];
268 return value1 - value2; 299 return value1 - value2;
269 }; 300 };
270 }, 301 },
271 /** 302 /**
272 * @description: submitForm 303 * @description: submitForm
273 * @author: renchao 304 * @author: renchao
274 */ 305 */
275 submitForm () { 306 submitForm () {
276 if (this.bsmList.length == 0) { 307 if (this.bsmList.length == 0) {
277 this.$message.error("请至少选择一条数据"); 308 this.$message.error("请至少选择一条数据");
278 return; 309 return;
279 } 310 }
280 this.loading = true; 311 this.loading = true;
281 startBusinessFlow({ 312 startBusinessFlow({
282 bsmSqyw: this.sqywInfo.bsmSqyw, 313 bsmSqyw: this.sqywInfo.bsmSqyw,
283 bdcdysz: this.bsmList, 314 bdcdysz: this.bsmList,
284 }).then((res) => { 315 }).then((res) => {
285 this.loading = false 316 this.loading = false
286 if (res.code == 200) { 317 if (res.code == 200) {
287 this.$message({ 318 this.$message({
288 showClose: true, 319 showClose: true,
289 message: '发起申请成功', 320 message: '发起申请成功',
290 type: 'success' 321 type: 'success'
291 }) 322 })
292 if (!this.isJump) { 323 if (!this.isJump) {
293 this.jump(res.result, this.sqywInfo.djywbm) 324 this.jump(res.result, this.sqywInfo.djywbm)
294 } else { 325 } else {
295 store.dispatch('user/refreshPage', true); 326 store.dispatch('user/refreshPage', true);
296 } 327 }
297 this.close() 328 this.close()
298 } else {
299 if (res.result && res.result.length > 0) {
300 this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{result: res.result} })
301 } else { 329 } else {
302 this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{message: res.message} }) 330 if (res.result && res.result.length > 0) {
331 this.$popup("申请错误明细", "components/ywdialog", { width: '36%', formData: { result: res.result } })
332 } else {
333 this.$popup("申请错误明细", "components/ywdialog", { width: '36%', formData: { message: res.message } })
334 }
303 } 335 }
304 } 336 }).catch(() => {
305 }).catch(() => { 337 this.loading = false
306 this.loading = false 338 })
307 }) 339 },
340 /**
341 * @description: close
342 * @param {*} val
343 * @author: renchao
344 */
345 close () {
346 ywPopupCacel()
347 },
308 }, 348 },
309 /** 349 computed: {
310 * @description: close 350 lpbContentHeight () {
311 * @param {*} val 351 return this.onlyShow ? 32 : 76
312 * @author: renchao 352 // return 76
313 */ 353 }
314 close(){
315 ywPopupCacel()
316 }, 354 },
317 }, 355 watch: {
318 computed:{ 356 //户右键菜单显示时,监听到鼠标点击时关闭户右键菜单
319 lpbContentHeight(){ 357 lpbChVisible (value) {
320 return this.onlyShow ? 32 : 76 358 if (value) {
321 // return 76 359 document.body.addEventListener("click", this.closeMenu);
322 } 360 } else {
323 }, 361 document.body.removeEventListener("click", this.closeMenu);
324 watch: { 362 }
325 //户右键菜单显示时,监听到鼠标点击时关闭户右键菜单
326 lpbChVisible(value) {
327 if (value) {
328 document.body.addEventListener("click", this.closeMenu);
329 } else {
330 document.body.removeEventListener("click", this.closeMenu);
331 } 363 }
332 } 364 },
333 }, 365 };
334 };
335 </script> 366 </script>
336 <style scoped lang="scss"> 367 <style scoped lang="scss">
337 .lpbContent-wrap { 368 .lpbContent-wrap {
338 width: 100%;
339 height: 100%;
340 overflow: hidden;
341 .lpbContent {
342 width: 100%; 369 width: 100%;
343 position: relative; 370 height: 100%;
344 overflow: scroll; 371 overflow: hidden;
345 -webkit-user-select: none; 372 .lpbContent {
346 -moz-user-select: none; 373 width: 100%;
347 -ms-user-select: none; 374 position: relative;
348 user-select: none; 375 overflow: scroll;
349 display: flex; 376 -webkit-user-select: none;
350 flex-direction: column-reverse; 377 -moz-user-select: none;
351 box-sizing: border-box; 378 -ms-user-select: none;
352 padding-top: 20px; 379 user-select: none;
353 .ch-zdy-wrap {
354 display: flex; 380 display: flex;
355 flex-direction: row; 381 flex-direction: column-reverse;
382 box-sizing: border-box;
383 padding-top: 20px;
384 .ch-zdy-wrap {
385 display: flex;
386 flex-direction: row;
387 }
356 } 388 }
357 } 389 .lpb-xmmc {
358 .lpb-xmmc { 390 border: 0;
359 border: 0; 391 border-top: 1px solid #e6e6e6;
360 border-top: 1px solid #e6e6e6; 392 }
361 } 393 .save-btn {
362 .save-btn{ 394 display: block;
363 display: block; 395 margin: 5px auto;
364 margin: 5px auto; 396 }
365 } 397 // 自定义右键菜单样式
366 // 自定义右键菜单样式 398 .contextmenu {
367 .contextmenu {
368 margin: 0;
369 background: #fff;
370 width: 92px;
371 z-index: 3000;
372 position: fixed;
373 list-style-type: none;
374 padding: 5px 0;
375 border-radius: 4px;
376 font-size: 12px;
377 font-weight: 400;
378 color: #333;
379 box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, 0.3);
380 li {
381 margin: 0; 399 margin: 0;
382 padding: 7px 16px; 400 background: #fff;
383 cursor: pointer; 401 width: 92px;
384 position: relative; 402 z-index: 3000;
385 .childUl { 403 position: fixed;
386 display: none; 404 list-style-type: none;
387 position: absolute; 405 padding: 5px 0;
388 left: 92px !important; 406 border-radius: 4px;
389 top: 0 !important; 407 font-size: 12px;
390 li { 408 font-weight: 400;
391 width: 76px; 409 color: #333;
410 box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, 0.3);
411 li {
412 margin: 0;
413 padding: 7px 16px;
414 cursor: pointer;
415 position: relative;
416 .childUl {
417 display: none;
418 position: absolute;
419 left: 92px !important;
420 top: 0 !important;
421 li {
422 width: 76px;
423 }
392 } 424 }
393 } 425 }
394 } 426 li:hover {
395 li:hover { 427 background: #eee;
396 background: #eee; 428 > .childUl {
397 > .childUl { 429 display: block;
398 display: block; 430 }
431 }
432 .noEdit {
433 color: #e6e6e6;
434 cursor: not-allowed;
435 }
436 .noEdit:hover {
437 background: #ffffff;
399 } 438 }
400 }
401 .noEdit {
402 color: #e6e6e6;
403 cursor: not-allowed;
404 }
405 .noEdit:hover {
406 background: #ffffff;
407 } 439 }
408 } 440 }
409 }
410 </style> 441 </style>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-12-19 09:40:39 4 * @LastEditTime: 2024-03-05 16:03:50
5 --> 5 -->
6 <template> 6 <template>
7 <el-form ref="ruleForm" :model="ruleForm" label-width="100px" :rules="rules"> 7 <el-form ref="ruleForm" :model="ruleForm" label-width="100px" :rules="rules">
...@@ -169,11 +169,11 @@ ...@@ -169,11 +169,11 @@
169 that.loadStatus = '1'; 169 that.loadStatus = '1';
170 let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM')); 170 let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM'));
171 if (['zsdy', 'zmdy', 'zsdy1'].includes(that.ruleForm.tmpno)) { 171 if (['zsdy', 'zmdy', 'zsdy1'].includes(that.ruleForm.tmpno)) {
172 // LODOP.SET_PRINT_PAGESIZE(2, 0, 0, "B4 (JIS) 旋转"); // 设置纸张大小为 B4 172 LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "B4 (JIS) 旋转"); // 设置纸张大小为 B4
173 LODOP.SET_PRINT_MODE("RESELECT_ORIENT", true); // 手动设置方向
174 } else { 173 } else {
175 LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "A4"); // 设置纸张大小为 A4 174 LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "A4"); // 设置纸张大小为 A4
176 } 175 }
176 LODOP.SET_PRINT_MODE("RESELECT_ORIENT", true); // 手动设置方向
177 LODOP.ADD_PRINT_DATA("ProgramData", this.ruleForm.tmpcontent); //装载模板 177 LODOP.ADD_PRINT_DATA("ProgramData", this.ruleForm.tmpcontent); //装载模板
178 //窗口关闭后,回调函数中保存的设计代码 178 //窗口关闭后,回调函数中保存的设计代码
179 if (LODOP.CVERSION) 179 if (LODOP.CVERSION)
......
...@@ -30,30 +30,30 @@ ...@@ -30,30 +30,30 @@
30 <el-row> 30 <el-row>
31 <el-col :span="3"> 31 <el-col :span="3">
32 <el-form-item label="身份证读卡器"> 32 <el-form-item label="身份证读卡器">
33 <el-button type="text" icon="el-icon-tickets" @click="readClick">读取</el-button> 33 <el-button type="text" icon="el-icon-tickets" :disabled="show" @click="readClick">读取</el-button>
34 </el-form-item> 34 </el-form-item>
35 </el-col> 35 </el-col>
36 <el-col :span="5"> 36 <el-col :span="5">
37 <el-form-item label="领证人" prop="lzrxm" label-width="70px"> 37 <el-form-item label="领证人" prop="lzrxm" label-width="70px">
38 <el-input v-model="ruleForm.lzrxm"></el-input> 38 <el-input :disabled="show" v-model="ruleForm.lzrxm"></el-input>
39 </el-form-item> 39 </el-form-item>
40 </el-col> 40 </el-col>
41 <el-col :span="5"> 41 <el-col :span="5">
42 <el-form-item label="证件类型" prop="lzrzjlb" label-width="80px"> 42 <el-form-item label="证件类型" prop="lzrzjlb" label-width="80px">
43 <el-select v-model="ruleForm.lzrzjlb" filterable clearable placeholder="请选择"> 43 <el-select :disabled="show" v-model="ruleForm.lzrzjlb" filterable clearable placeholder="请选择">
44 <el-option v-for="item in lzrzjlbData" :key="item.dcode" :label="item.dname" :value="item.dcode"> 44 <el-option v-for="item in lzrzjlbData" :key="item.dcode" :label="item.dname" :value="item.dcode">
45 </el-option> 45 </el-option>
46 </el-select> 46 </el-select>
47 </el-form-item> 47 </el-form-item>
48 </el-col> 48 </el-col>
49 <el-col :span="5"> 49 <el-col :span="5">
50 <el-form-item label="证件号" prop="lzrzjh" label-width="70px"> 50 <el-form-item label="证件号" prop="lzrzjh" label-width="70px">
51 <el-input v-model="ruleForm.lzrzjh"></el-input> 51 <el-input :disabled="show" v-model="ruleForm.lzrzjh"></el-input>
52 </el-form-item> 52 </el-form-item>
53 </el-col> 53 </el-col>
54 <el-col :span="5"> 54 <el-col :span="5">
55 <el-form-item label="领证人电话" prop="lzrdh"> 55 <el-form-item label="领证人电话" prop="lzrdh">
56 <el-input v-model="ruleForm.lzrdh"></el-input> 56 <el-input :disabled="show" v-model="ruleForm.lzrdh"></el-input>
57 </el-form-item> 57 </el-form-item>
58 </el-col> 58 </el-col>
59 </el-row> 59 </el-row>
...@@ -133,7 +133,8 @@ ...@@ -133,7 +133,8 @@
133 total: 0, 133 total: 0,
134 columns: datas.columns().lzgrid, 134 columns: datas.columns().lzgrid,
135 data: [] 135 data: []
136 } 136 },
137 show:true
137 } 138 }
138 }, 139 },
139 mounted () { 140 mounted () {
...@@ -202,6 +203,7 @@ ...@@ -202,6 +203,7 @@
202 getUnclaimedBdcqz({ bsmSlsq: Vue.prototype.$currentRoute.query.bsmSlsq }).then(res => { 203 getUnclaimedBdcqz({ bsmSlsq: Vue.prototype.$currentRoute.query.bsmSlsq }).then(res => {
203 if (res.code === 200) { 204 if (res.code === 200) {
204 this.tableData.data = res.result.list; 205 this.tableData.data = res.result.list;
206 this.show=!res.result.list.length>0;
205 this.$nextTick(() => { 207 this.$nextTick(() => {
206 this.tableData.data.forEach(item => { 208 this.tableData.data.forEach(item => {
207 that.$refs.table.toggleRowSelection(item) 209 that.$refs.table.toggleRowSelection(item)
......
...@@ -380,9 +380,9 @@ ...@@ -380,9 +380,9 @@
380 </el-col> 380 </el-col>
381 </el-row> 381 </el-row>
382 <qlrCommonTable 382 <qlrCommonTable
383 :tableData="ruleForm.qlrList"
383 @upDateQlrxxList="upDateQlrxxList" 384 @upDateQlrxxList="upDateQlrxxList"
384 :disabled="!viewEdit" 385 :disabled="viewEdit"
385 :tableData="ruleForm.qlrList"
386 :gyfs="ruleForm.sldy.gyfs" /> 386 :gyfs="ruleForm.sldy.gyfs" />
387 <div class="slxx_title title-block"> 387 <div class="slxx_title title-block">
388 登记原因 388 登记原因
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2024-02-06 13:26:37 4 * @LastEditTime: 2024-03-05 16:43:23
5 --> 5 -->
6 <template> 6 <template>
7 <div> 7 <div>
...@@ -635,7 +635,7 @@ ...@@ -635,7 +635,7 @@
635 // 保存当前字体设置 635 // 保存当前字体设置
636 const originalFont = context.font; 636 const originalFont = context.font;
637 // 设置新的字体大小 637 // 设置新的字体大小
638 context.font = '16px 楷体'; // 替换为你想要的字体和大小 638 context.font = '15px 楷体'; // 替换为你想要的字体和大小
639 // 绘制 bdcdyh 639 // 绘制 bdcdyh
640 context.fillText(this.bdcdyh ? this.bdcdyh : '', 775, 373); 640 context.fillText(this.bdcdyh ? this.bdcdyh : '', 775, 373);
641 // 恢复原始字体设置 641 // 恢复原始字体设置
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2024-02-23 16:27:17 4 * @LastEditTime: 2024-03-07 09:13:26
5 */ 5 */
6 import Vue from 'vue' 6 import Vue from 'vue'
7 import { getPrintTemplateByCode, getPrintAcceptance,getPrintReceiveSupplementalMaterials,getPrintRejectForms,getPrintSendBackMaterials,getPrintRiviseForms} from "@/api/print"; 7 import { getPrintTemplateByCode, getPrintAcceptance, getPrintReceiveSupplementalMaterials, getPrintRejectForms, getPrintSendBackMaterials, getPrintRiviseForms } from "@/api/print";
8 import { uploadUndo } from "@/api/clxx"; 8 import { uploadUndo } from "@/api/clxx";
9 import { getLodop } from "@/utils/LodopFuncs"; 9 import { getLodop } from "@/utils/LodopFuncs";
10 import { getNewDate } from '@/utils/util' 10 import { getNewDate } from '@/utils/util'
...@@ -151,7 +151,8 @@ export default { ...@@ -151,7 +151,8 @@ export default {
151 unitData: window.unitData, 151 unitData: window.unitData,
152 bsmSlsq: this.bsmSlsq, 152 bsmSlsq: this.bsmSlsq,
153 showSave: true, 153 showSave: true,
154 djlx: window.djlx 154 djlx: window.djlx,
155 isworkFrame: true
155 }, '85%', true, false) 156 }, '85%', true, false)
156 } else { 157 } else {
157 this.$message.error(res.message) 158 this.$message.error(res.message)
...@@ -259,8 +260,8 @@ export default { ...@@ -259,8 +260,8 @@ export default {
259 }) 260 })
260 } 261 }
261 infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0] 262 infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0]
262 infoRes.result.nowyue = this.newDate.slice(5,7) 263 infoRes.result.nowyue = this.newDate.slice(5, 7)
263 infoRes.result.nowri = this.newDate.slice(8,10) 264 infoRes.result.nowri = this.newDate.slice(8, 10)
264 let date = infoRes.result.sqrq 265 let date = infoRes.result.sqrq
265 infoRes.result.sqnian = date.split(' ')[0].split('-')[0] 266 infoRes.result.sqnian = date.split(' ')[0].split('-')[0]
266 infoRes.result.sqyue = date.split(' ')[0].split('-')[1] 267 infoRes.result.sqyue = date.split(' ')[0].split('-')[1]
...@@ -285,13 +286,13 @@ export default { ...@@ -285,13 +286,13 @@ export default {
285 } 286 }
286 }) 287 })
287 break; 288 break;
288 // 补充材料通知书 289 // 补充材料通知书
289 case "bccltzs": 290 case "bccltzs":
290 this.$popupDialog("补充材料通知书", "workflow/top/bccltzs/index", 291 this.$popupDialog("补充材料通知书", "workflow/top/bccltzs/index",
291 { bsmSlsq: this.$route.query.bsmSlsq, bsmSldy: this.currentSelectProps.bsmSldy,type:"bccltzs" }, 292 { bsmSlsq: this.$route.query.bsmSlsq, bsmSldy: this.currentSelectProps.bsmSldy, type: "bccltzs" },
292 '70%', true) 293 '70%', true)
293 break; 294 break;
294 // 补充材料接收凭证 295 // 补充材料接收凭证
295 case "bccljspz": 296 case "bccljspz":
296 getPrintTemplateByCode({ tmpno: 'bdcdjbccljspz' }).then(res => { 297 getPrintTemplateByCode({ tmpno: 'bdcdjbccljspz' }).then(res => {
297 if (res.code === 200) { 298 if (res.code === 200) {
...@@ -302,12 +303,12 @@ export default { ...@@ -302,12 +303,12 @@ export default {
302 let key = index + 1 303 let key = index + 1
303 this.$set(infoRes.result, "file" + key, it.sjmc) 304 this.$set(infoRes.result, "file" + key, it.sjmc)
304 this.$set(infoRes.result, "file" + key + 'ys', it.ys) 305 this.$set(infoRes.result, "file" + key + 'ys', it.ys)
305 this.$set(infoRes.result, "file" + key + 'lx', it.sjlx==1?"原件":"复印件") 306 this.$set(infoRes.result, "file" + key + 'lx', it.sjlx == 1 ? "原件" : "复印件")
306 }) 307 })
307 } 308 }
308 infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0] 309 infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0]
309 infoRes.result.nowyue = this.newDate.slice(5,7) 310 infoRes.result.nowyue = this.newDate.slice(5, 7)
310 infoRes.result.nowri = this.newDate.slice(8,10) 311 infoRes.result.nowri = this.newDate.slice(8, 10)
311 let date = infoRes.result.sqrq 312 let date = infoRes.result.sqrq
312 infoRes.result.sqnian = date.split(' ')[0].split('-')[0] 313 infoRes.result.sqnian = date.split(' ')[0].split('-')[0]
313 infoRes.result.sqyue = date.split(' ')[0].split('-')[1] 314 infoRes.result.sqyue = date.split(' ')[0].split('-')[1]
...@@ -333,7 +334,7 @@ export default { ...@@ -333,7 +334,7 @@ export default {
333 }) 334 })
334 break; 335 break;
335 336
336 // 不予登记告知书 337 // 不予登记告知书
337 case "bydjgzs": 338 case "bydjgzs":
338 getPrintTemplateByCode({ tmpno: 'bydjgzs' }).then(res => { 339 getPrintTemplateByCode({ tmpno: 'bydjgzs' }).then(res => {
339 if (res.code === 200) { 340 if (res.code === 200) {
...@@ -347,8 +348,8 @@ export default { ...@@ -347,8 +348,8 @@ export default {
347 }) 348 })
348 } 349 }
349 infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0] 350 infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0]
350 infoRes.result.nowyue = this.newDate.slice(5,7) 351 infoRes.result.nowyue = this.newDate.slice(5, 7)
351 infoRes.result.nowri = this.newDate.slice(8,10) 352 infoRes.result.nowri = this.newDate.slice(8, 10)
352 let date = infoRes.result.sqrq 353 let date = infoRes.result.sqrq
353 infoRes.result.sqnian = date.split(' ')[0].split('-')[0] 354 infoRes.result.sqnian = date.split(' ')[0].split('-')[0]
354 infoRes.result.sqyue = date.split(' ')[0].split('-')[1] 355 infoRes.result.sqyue = date.split(' ')[0].split('-')[1]
...@@ -373,7 +374,7 @@ export default { ...@@ -373,7 +374,7 @@ export default {
373 } 374 }
374 }) 375 })
375 break; 376 break;
376 // 申请材料退回通知书 377 // 申请材料退回通知书
377 case "sqclthtzs": 378 case "sqclthtzs":
378 getPrintTemplateByCode({ tmpno: 'bdcdjsqclthtzs' }).then(res => { 379 getPrintTemplateByCode({ tmpno: 'bdcdjsqclthtzs' }).then(res => {
379 if (res.code === 200) { 380 if (res.code === 200) {
...@@ -387,8 +388,8 @@ export default { ...@@ -387,8 +388,8 @@ export default {
387 }) 388 })
388 } 389 }
389 infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0] 390 infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0]
390 infoRes.result.nowyue = this.newDate.slice(5,7) 391 infoRes.result.nowyue = this.newDate.slice(5, 7)
391 infoRes.result.nowri = this.newDate.slice(8,10) 392 infoRes.result.nowri = this.newDate.slice(8, 10)
392 let date = infoRes.result.sqrq 393 let date = infoRes.result.sqrq
393 infoRes.result.sqnian = date.split(' ')[0].split('-')[0] 394 infoRes.result.sqnian = date.split(' ')[0].split('-')[0]
394 infoRes.result.sqyue = date.split(' ')[0].split('-')[1] 395 infoRes.result.sqyue = date.split(' ')[0].split('-')[1]
...@@ -413,7 +414,7 @@ export default { ...@@ -413,7 +414,7 @@ export default {
413 } 414 }
414 }) 415 })
415 break; 416 break;
416 // 不动产更正登记通知书 417 // 不动产更正登记通知书
417 case "gzdjtzs": 418 case "gzdjtzs":
418 getPrintTemplateByCode({ tmpno: 'bdcgzdjtzs' }).then(res => { 419 getPrintTemplateByCode({ tmpno: 'bdcgzdjtzs' }).then(res => {
419 if (res.code === 200) { 420 if (res.code === 200) {
...@@ -428,8 +429,8 @@ export default { ...@@ -428,8 +429,8 @@ export default {
428 }) 429 })
429 } 430 }
430 infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0] 431 infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0]
431 infoRes.result.nowyue = this.newDate.slice(5,7) 432 infoRes.result.nowyue = this.newDate.slice(5, 7)
432 infoRes.result.nowri = this.newDate.slice(8,10) 433 infoRes.result.nowri = this.newDate.slice(8, 10)
433 let date = infoRes.result.sqrq 434 let date = infoRes.result.sqrq
434 infoRes.result.sqnian = date.split(' ')[0].split('-')[0] 435 infoRes.result.sqnian = date.split(' ')[0].split('-')[0]
435 infoRes.result.sqyue = date.split(' ')[0].split('-')[1] 436 infoRes.result.sqyue = date.split(' ')[0].split('-')[1]
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2024-02-06 13:23:44 4 * @LastEditTime: 2024-03-05 16:42:30
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="text-align: center;"> 7 <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="text-align: center;">
...@@ -558,7 +558,7 @@ ...@@ -558,7 +558,7 @@
558 // 保存当前字体设置 558 // 保存当前字体设置
559 const originalFont = context.font; 559 const originalFont = context.font;
560 // 设置新的字体大小 560 // 设置新的字体大小
561 context.font = '16px 楷体'; // 替换为你想要的字体和大小 561 context.font = '15px 楷体'; // 替换为你想要的字体和大小
562 // 绘制 bdcdyh 562 // 绘制 bdcdyh
563 context.fillText(this.bdcdyh ? this.bdcdyh : '', 775, 373); 563 context.fillText(this.bdcdyh ? this.bdcdyh : '', 775, 373);
564 // 恢复原始字体设置 564 // 恢复原始字体设置
......
...@@ -207,6 +207,7 @@ ...@@ -207,6 +207,7 @@
207 queryClick () { 207 queryClick () {
208 this.$startLoading(); 208 this.$startLoading();
209 this.queryForm.sqywbm = this.sqywInfo.djywbm; 209 this.queryForm.sqywbm = this.sqywInfo.djywbm;
210 this.queryForm.bhqkbsm = ""
210 selectJsydQlxxSplitMergeBefore({ ...this.queryForm, ...this.pageData }).then((res) => { 211 selectJsydQlxxSplitMergeBefore({ ...this.queryForm, ...this.pageData }).then((res) => {
211 this.$endLoading(); 212 this.$endLoading();
212 if (res.code === 200) { 213 if (res.code === 200) {
......
...@@ -98,6 +98,7 @@ ...@@ -98,6 +98,7 @@
98 import table from "@/utils/mixin/table"; 98 import table from "@/utils/mixin/table";
99 import { datas, sendThis } from "./djbcxdata"; 99 import { datas, sendThis } from "./djbcxdata";
100 import { getDjbBysearch } from "@/api/search.js"; 100 import { getDjbBysearch } from "@/api/search.js";
101 import { getZrzListByBsmSlsq } from "@/api/workflow/zjgcdyFlow.js";
101 102
102 export default { 103 export default {
103 name: "djbcx", 104 name: "djbcx",
...@@ -137,7 +138,8 @@ ...@@ -137,7 +138,8 @@
137 }, 138 },
138 qllxs: [], 139 qllxs: [],
139 isDialog: false, 140 isDialog: false,
140 djbxxData: {} 141 djbxxData: {},
142 zrzbsm:""
141 } 143 }
142 }, 144 },
143 computed: { 145 computed: {
...@@ -188,15 +190,18 @@ ...@@ -188,15 +190,18 @@
188 * @author: renchao 190 * @author: renchao
189 */ 191 */
190 handleLpbClick (item) { 192 handleLpbClick (item) {
191 this.$popup('楼盘表', 'lpb/index', { 193 let params = {zdbsm:item.bsmZd};
192 width: '85%', 194 getZrzListByBsmSlsq(params).then((res) => {
193 formData: { 195 if (res.code === 200) {
194 bsm: item.zrzbsm, 196 }
197 });
198 console.log("zrzbsm",item,item.zrzbsm);
199 this.$popupDialog('楼盘表', 'lpb/index', {
200 bsm: item.zrzbsm,
195 zrzbsm: item.zrzbsm, 201 zrzbsm: item.zrzbsm,
196 zdbsm: item.zrzbsm, 202 zdbsm: item.zrzbsm,
197 onlyShow: true 203 onlyShow: true
198 } 204 }, '90%', true)
199 })
200 } 205 }
201 } 206 }
202 } 207 }
......