Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
74b5cb33 by tianhaohao@pashanhoo.com
Options

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

2 parents 41561225 b4f32752
Inline Side-by-side
Showing 12 changed files with 254 additions and 160 deletions
...@@ -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,29 +11,46 @@ ...@@ -10,29 +11,46 @@
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,
34 }, 46 },
35 computed: { 47 computed: {
48 ...mapGetters(["sidebar", "avatar", "name", "userInfo"]),
49 baseUrl() {
50 return window._config.baseUrl;
51 },
52 <<<<<<< HEAD
53 computed: {
36 ...mapGetters(['sidebar', 'avatar', 'name','userInfo']), 54 ...mapGetters(['sidebar', 'avatar', 'name','userInfo']),
37 baseUrl () { 55 baseUrl () {
38 return window._config.baseUrl; 56 return window._config.baseUrl;
...@@ -42,45 +60,57 @@ ...@@ -42,45 +60,57 @@
42 return { 60 return {
43 logo: require('../../image/logo.png'), 61 logo: require('../../image/logo.png'),
44 noticeList: [] 62 noticeList: []
45 } 63 =======
46 }, 64 },
47 created () { 65 data() {
48 this.queryNoticeList() 66 return {
67 logo: require("../../image/bdclogo.png"),
68 noticeList: [],
69 };
70 },
71 created() {
72 this.queryNoticeList();
49 }, 73 },
50 mounted () { 74 mounted() {
51 let that = this 75 let that = this;
52 window.addEventListener('message', function (messageEvent) { 76 window.addEventListener("message", function (messageEvent) {
53 if (messageEvent.data.update) { 77 if (messageEvent.data.update) {
54 that.queryNoticeList() 78 that.queryNoticeList();
79 >>>>>>> b4f3275250be77c94de397972ae05502fc7b7f3c
55 } 80 }
56 }) 81 });
57 }, 82 },
58 destroyed () { 83 destroyed() {
59 window.removeEventListener('message') 84 window.removeEventListener("message");
60 }, 85 },
61 methods: { 86 methods: {
62 /** 87 /**
63 * @description: queryNoticeList 88 * @description: queryNoticeList
64 * @author: renchao 89 * @author: renchao
65 */ 90 */
66 queryNoticeList () { 91 queryNoticeList() {
67 getHomeNoticeList().then(res => { 92 getHomeNoticeList().then((res) => {
68 if (res.result) { 93 if (res.result) {
69 this.noticeList = res.result.noticeList 94 this.noticeList = res.result.noticeList;
70 } 95 }
71 }) 96 });
72 }, 97 },
73 /** 98 /**
74 * @description: logout 99 * @description: logout
75 * @author: renchao 100 * @author: renchao
76 */ 101 */
77 logout () { 102 logout() {
78 axios.post(window._config.services.management + "/management/logout").then(() => { 103 axios
79 setToken(undefined) 104 .post(window._config.services.management + "/management/logout")
80 sessionStorage.removeItem('token') 105 .then(() => {
81 localStorage.setItem('dj-location', window.location.href) 106 setToken(undefined);
82 window.location.href = window._config.casBaseURL + '/logout?service=' + encodeURIComponent(window.location.href); 107 sessionStorage.removeItem("token");
83 }) 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 });
84 }, 114 },
85 115
86 /** 116 /**
...@@ -88,37 +118,37 @@ ...@@ -88,37 +118,37 @@
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 }
108 }
109 } 136 }
137 },
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;
114 } 144 }
115 145
116 .NoticeBar { 146 .NoticeBar {
117 position: absolute; 147 position: absolute;
118 bottom: 0; 148 bottom: 0;
119 } 149 }
120 150
121 .el-dropdown-menu { 151 .el-dropdown-menu {
122 padding: 0 !important; 152 padding: 0 !important;
123 border: 1px solid #ebeef5; 153 border: 1px solid #ebeef5;
124 box-shadow: 0 2px 10px 0 rgba(0, 0, 0, 0.12); 154 box-shadow: 0 2px 10px 0 rgba(0, 0, 0, 0.12);
...@@ -151,9 +181,9 @@ ...@@ -151,9 +181,9 @@
151 background: #f6f7f9; 181 background: #f6f7f9;
152 color: #4a4a4a; 182 color: #4a4a4a;
153 } 183 }
154 } 184 }
155 185
156 .navbar { 186 .navbar {
157 height: $headerHeight; 187 height: $headerHeight;
158 overflow: hidden; 188 overflow: hidden;
159 position: relative; 189 position: relative;
...@@ -165,8 +195,22 @@ ...@@ -165,8 +195,22 @@
165 padding: 0 20px; 195 padding: 0 20px;
166 justify-content: space-between; 196 justify-content: space-between;
167 197
198 .logo {
199 // margin-top: -20px;
168 .header-logo { 200 .header-logo {
169 width: 300px; 201 width: 40px;
202 float: left;
203 vertical-align: middle;
204 }
205 h4 {
206 float: left;
207 vertical-align: middle;
208 line-height: 40px;
209 font-size: 22px;
210 color: #fff;
211 text-indent: 6px;
212 letter-spacing: 2px;
213 }
170 } 214 }
171 215
172 .backdrop { 216 .backdrop {
...@@ -264,7 +308,15 @@ ...@@ -264,7 +308,15 @@
264 height: 40px; 308 height: 40px;
265 align-items: center; 309 align-items: center;
266 color: #ffffff; 310 color: #ffffff;
267 311 p {
312 font-size: 14px;
313 height: 40px;
314 span {
315 display: block;
316 line-height: 20px;
317 text-align: right;
318 }
319 }
268 .user-avatar { 320 .user-avatar {
269 cursor: pointer; 321 cursor: pointer;
270 width: 35px; 322 width: 35px;
...@@ -281,5 +333,5 @@ ...@@ -281,5 +333,5 @@
281 } 333 }
282 } 334 }
283 } 335 }
284 } 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) {
165 if(text){
166 text += ',' +strategies[key];
167 }else{
168 text += strategies[key]; 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>
...@@ -24,31 +24,30 @@ ...@@ -24,31 +24,30 @@
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 }, 52 },
54 name: "", 53 name: "",
...@@ -66,11 +65,42 @@ export default { ...@@ -66,11 +65,42 @@ export default {
66 type: Boolean, 65 type: Boolean,
67 default: true, 66 default: true,
68 }, 67 },
69 onlyShow:{ 68 onlyShow: {
70 type: Boolean, 69 type: Boolean,
71 default: true, 70 default: true,
72 }, 71 },
73 showSave:{ 72 showSave: {
73 type: Boolean,
74 default: false,
75 },
76 scyclx: {
77 type: Number,
78 default: 0,
79 },
80 sqywInfo: {
81 type: Object,
82 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: {
74 type: Boolean, 104 type: Boolean,
75 default: false, 105 default: false,
76 }, 106 },
...@@ -84,7 +114,7 @@ export default { ...@@ -84,7 +114,7 @@ export default {
84 }, 114 },
85 isJump: { type: Boolean, default: false }, 115 isJump: { type: Boolean, default: false },
86 }, 116 },
87 data() { 117 data () {
88 return { 118 return {
89 lpbData: { 119 lpbData: {
90 ljzs: [], 120 ljzs: [],
...@@ -101,37 +131,24 @@ export default { ...@@ -101,37 +131,24 @@ export default {
101 lpbChLeft: 100, 131 lpbChLeft: 100,
102 lpbChTop: 100, 132 lpbChTop: 100,
103 // 改变户选中状态 133 // 改变户选中状态
104 changeChoosedObj:{ 134 changeChoosedObj: {
105 bsms:[], 135 bsms: [],
106 color:'' 136 color: ''
107 }, 137 },
108 // 选中户bsm合集 138 // 选中户bsm合集
109 bsmList:[], 139 bsmList: [],
110 loading: false, 140 loading: false,
111 }; 141 };
112 }, 142 },
113 mounted() { 143 mounted () {
114 this.scyclx ? this.getLpb(this.zrzbsm,this.scyclx):this.getLpb(this.zrzbsm); 144 this.scyclx ? this.getLpb(this.zrzbsm, this.scyclx) : this.getLpb(this.zrzbsm);
115 window.lpbContent = this; 145 window.lpbContent = this;
116 }, 146 },
117 methods: {
118 /**
119 * @description: 获取当前楼盘表选中户信息
120 * @param {Array} bsmList
121 * @author: renchao
122 */
123 getBsmList(bsmList,compFlag){
124 // 根据本次传入的组件标识删除之前对应组件标识存入hbsmList的数据
125 this.bsmList = this.bsmList.filter((i) => i.flag != compFlag)
126 // 合并本次数据
127 this.bsmList = this.bsmList.concat([...new Map(bsmList.map(item => [item.bdcdyh, item])).values()]);
128 // })
129 },
130 /** 147 /**
131 * @description: 保存当前楼盘表 148 * @description: 保存当前楼盘表
132 * @author: renchao 149 * @author: renchao
133 */ 150 */
134 saveLpb(){ 151 saveLpb () {
135 if (this.bsmList.length == 0) { 152 if (this.bsmList.length == 0) {
136 this.$message.error("请至少选择一条数据"); 153 this.$message.error("请至少选择一条数据");
137 return; 154 return;
...@@ -159,9 +176,13 @@ export default { ...@@ -159,9 +176,13 @@ export default {
159 this.$popupCacel(); 176 this.$popupCacel();
160 } else { 177 } else {
161 if (res.result && res.result.length > 0) { 178 if (res.result && res.result.length > 0) {
162 this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{result: res.result} }) 179 this.$popup("申请错误明细", "components/ywdialog", { width: '36%', formData: { result: res.result } })
180 } else {
181 if (res.result && res.result.length > 0) {
182 this.$popup("申请错误明细", "components/ywdialog", { width: '36%', formData: { result: res.result } })
163 } else { 183 } else {
164 this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{message: res.message} }) 184 this.$popup("申请错误明细", "components/ywdialog", { width: '36%', formData: { message: res.message } })
185 }
165 } 186 }
166 } 187 }
167 }).catch(() => { 188 }).catch(() => {
...@@ -179,7 +200,7 @@ export default { ...@@ -179,7 +200,7 @@ export default {
179 * @param {*} color 200 * @param {*} color
180 * @author: renchao 201 * @author: renchao
181 */ 202 */
182 changeChoosed(bsms, color){ 203 changeChoosed (bsms, color) {
183 this.changeChoosedObj.bsms = bsms; 204 this.changeChoosedObj.bsms = bsms;
184 this.changeChoosedObj.color = color; 205 this.changeChoosedObj.color = color;
185 }, 206 },
...@@ -187,7 +208,7 @@ export default { ...@@ -187,7 +208,7 @@ export default {
187 * @description: clearChangeChoosedObj 208 * @description: clearChangeChoosedObj
188 * @author: renchao 209 * @author: renchao
189 */ 210 */
190 clearChangeChoosedObj(){ 211 clearChangeChoosedObj () {
191 this.changeChoosedObj.bsms = []; 212 this.changeChoosedObj.bsms = [];
192 }, 213 },
193 //全选户 214 //全选户
...@@ -196,7 +217,7 @@ export default { ...@@ -196,7 +217,7 @@ export default {
196 * @param {*} val 217 * @param {*} val
197 * @author: renchao 218 * @author: renchao
198 */ 219 */
199 zdySelectAll(val) { 220 zdySelectAll (val) {
200 this.selectAllObj.selectAll = val; 221 this.selectAllObj.selectAll = val;
201 }, 222 },
202 //获取楼盘表数据 223 //获取楼盘表数据
...@@ -207,17 +228,25 @@ export default { ...@@ -207,17 +228,25 @@ export default {
207 * @param {*} actual 228 * @param {*} actual
208 * @author: renchao 229 * @author: renchao
209 */ 230 */
210 getLpb(zrzbsm, scyclx, actual) { 231 getLpb (zrzbsm, scyclx, actual) {
232 if (!zrzbsm) {
233 this.$message({
234 message: "暂无楼盘表",
235 type: "warning",
236 });
237 } else {
211 getLpb(zrzbsm, scyclx).then((res) => { 238 getLpb(zrzbsm, scyclx).then((res) => {
212 if (res.code == 200) { 239 if (res.code == 200) {
213 if(scyclx){ 240 if (scyclx) {
214 if(res.result.syclx == "1") { 241 if (res.result.syclx == "1") {
215 res.result.lpb.ljzs = res.result.lpb.ljzs.sort(this.compare("place")); 242 res.result.lpb.ljzs = res.result.lpb.ljzs.sort(this.compare("place"));
216 this.lpbData = res.result.lpb == null ? this.lpbData : res.result.lpb; 243 this.lpbData = res.result.lpb == null ? this.lpbData : res.result.lpb;
217 } 244 }
218 }else{ 245 } else {
219 res.result.lpb.ljzs = res.result.lpb.ljzs.sort(this.compare("place")); 246 this.$message({
220 this.lpbData = res.result.lpb == null ? this.lpbData : res.result.lpb; 247 message: res.message,
248 type: "warning",
249 });
221 } 250 }
222 } else { 251 } else {
223 this.$message({ 252 this.$message({
...@@ -226,6 +255,8 @@ export default { ...@@ -226,6 +255,8 @@ export default {
226 }); 255 });
227 } 256 }
228 }); 257 });
258 }
259
229 }, 260 },
230 //户右键点击事件 261 //户右键点击事件
231 /** 262 /**
...@@ -235,7 +266,7 @@ export default { ...@@ -235,7 +266,7 @@ export default {
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;
...@@ -245,7 +276,7 @@ export default { ...@@ -245,7 +276,7 @@ export default {
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 //右键菜单点击
...@@ -253,7 +284,7 @@ export default { ...@@ -253,7 +284,7 @@ export default {
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 /**
...@@ -261,7 +292,7 @@ export default { ...@@ -261,7 +292,7 @@ export default {
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];
...@@ -297,9 +328,9 @@ export default { ...@@ -297,9 +328,9 @@ export default {
297 this.close() 328 this.close()
298 } else { 329 } else {
299 if (res.result && res.result.length > 0) { 330 if (res.result && res.result.length > 0) {
300 this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{result: res.result} }) 331 this.$popup("申请错误明细", "components/ywdialog", { width: '36%', formData: { result: res.result } })
301 } else { 332 } else {
302 this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{message: res.message} }) 333 this.$popup("申请错误明细", "components/ywdialog", { width: '36%', formData: { message: res.message } })
303 } 334 }
304 } 335 }
305 }).catch(() => { 336 }).catch(() => {
...@@ -311,19 +342,19 @@ export default { ...@@ -311,19 +342,19 @@ export default {
311 * @param {*} val 342 * @param {*} val
312 * @author: renchao 343 * @author: renchao
313 */ 344 */
314 close(){ 345 close () {
315 ywPopupCacel() 346 ywPopupCacel()
316 }, 347 },
317 }, 348 },
318 computed:{ 349 computed: {
319 lpbContentHeight(){ 350 lpbContentHeight () {
320 return this.onlyShow ? 32 : 76 351 return this.onlyShow ? 32 : 76
321 // return 76 352 // return 76
322 } 353 }
323 }, 354 },
324 watch: { 355 watch: {
325 //户右键菜单显示时，监听到鼠标点击时关闭户右键菜单 356 //户右键菜单显示时，监听到鼠标点击时关闭户右键菜单
326 lpbChVisible(value) { 357 lpbChVisible (value) {
327 if (value) { 358 if (value) {
328 document.body.addEventListener("click", this.closeMenu); 359 document.body.addEventListener("click", this.closeMenu);
329 } else { 360 } else {
...@@ -331,10 +362,10 @@ export default { ...@@ -331,10 +362,10 @@ export default {
331 } 362 }
332 } 363 }
333 }, 364 },
334 }; 365 };
335 </script> 366 </script>
336 <style scoped lang="scss"> 367 <style scoped lang="scss">
337 .lpbContent-wrap { 368 .lpbContent-wrap {
338 width: 100%; 369 width: 100%;
339 height: 100%; 370 height: 100%;
340 overflow: hidden; 371 overflow: hidden;
...@@ -359,7 +390,7 @@ export default { ...@@ -359,7 +390,7 @@ export default {
359 border: 0; 390 border: 0;
360 border-top: 1px solid #e6e6e6; 391 border-top: 1px solid #e6e6e6;
361 } 392 }
362 .save-btn{ 393 .save-btn {
363 display: block; 394 display: block;
364 margin: 5px auto; 395 margin: 5px auto;
365 } 396 }
...@@ -406,5 +437,5 @@ export default { ...@@ -406,5 +437,5 @@ export default {
406 background: #ffffff; 437 background: #ffffff;
407 } 438 }
408 } 439 }
409 } 440 }
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,17 +30,17 @@ ...@@ -30,17 +30,17 @@
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>
...@@ -48,12 +48,12 @@ ...@@ -48,12 +48,12 @@
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 @upDateQlrxxList="upDateQlrxxList"
384 :disabled="!viewEdit"
385 :tableData="ruleForm.qlrList" 383 :tableData="ruleForm.qlrList"
384 @upDateQlrxxList="upDateQlrxxList"
385 :disabled="viewEdit"
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]
...@@ -288,7 +289,7 @@ export default { ...@@ -288,7 +289,7 @@ export default {
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 // 补充材料接收凭证
...@@ -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]
...@@ -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]
...@@ -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]
...@@ -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) {
196 }
197 });
198 console.log("zrzbsm",item,item.zrzbsm);
199 this.$popupDialog('楼盘表', 'lpb/index', {
194 bsm: item.zrzbsm, 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 }
......