Merge branch 'dev'

2 parents 8280283e 7629dad2
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-21 10:35:58 4 * @LastEditTime: 2023-08-22 16:19:59
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;"> 7 <div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
...@@ -12,8 +12,10 @@ ...@@ -12,8 +12,10 @@
12 </el-tab-pane> 12 </el-tab-pane>
13 </el-tabs> 13 </el-tabs>
14 <el-empty description="暂无数据" v-if="headTabBdcqz.length == 0 && noData"></el-empty> 14 <el-empty description="暂无数据" v-if="headTabBdcqz.length == 0 && noData"></el-empty>
15 <canvas ref="zs" width="1024" v-show="headTabBdcqz[0]&&headTabBdcqz[0].bdcqzlx==1" height="739"></canvas> 15 <div style="width:1180px;">
16 <canvas ref="zm" width="1169" v-show="headTabBdcqz[0]&&headTabBdcqz[0].bdcqzlx!=1" height="828"></canvas> 16 <canvas ref="zs" width="1000" v-show="headTabBdcqz[0]&&headTabBdcqz[0].bdcqzlx==1" height="700"></canvas>
17 <canvas ref="zm" width="1180" v-show="headTabBdcqz[0]&&headTabBdcqz[0].bdcqzlx!=1" height="780"></canvas>
18 </div>
17 </div> 19 </div>
18 </template> 20 </template>
19 21
...@@ -255,7 +257,6 @@ ...@@ -255,7 +257,6 @@
255 } 257 }
256 image.src = this.imgSrc 258 image.src = this.imgSrc
257 }, 259 },
258 // 不动产证明
259 /** 260 /**
260 * @description: 不动产证明 261 * @description: 不动产证明
261 * @author: renchao 262 * @author: renchao
...@@ -334,13 +335,33 @@ ...@@ -334,13 +335,33 @@
334 this.bdcdyh = this.bdcqz.bdcdyh.slice(0, 6) + ' ' + this.bdcqz.bdcdyh.slice(6, 12) + ' ' + 335 this.bdcdyh = this.bdcqz.bdcdyh.slice(0, 6) + ' ' + this.bdcqz.bdcdyh.slice(6, 12) + ' ' +
335 this.bdcqz.bdcdyh.slice(12, 19) + ' ' + this.bdcqz.bdcdyh.slice(19, this.bdcqz.bdcdyh.length) 336 this.bdcqz.bdcdyh.slice(12, 19) + ' ' + this.bdcqz.bdcdyh.slice(19, this.bdcqz.bdcdyh.length)
336 context.fillText(this.bdcdyh ? this.bdcdyh : '', 775, 373); 337 context.fillText(this.bdcdyh ? this.bdcdyh : '', 775, 373);
337
338
339 // qlqtzk 338 // qlqtzk
340 const maxWidth = 280; // 最大宽度限制 339 const maxWidth = 295; // 最大宽度限制
341 let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : []; 340 let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : [];
342 lines.forEach((line, index) => { 341 if (lines[0]) {
343 const y = 415 + (index * 37); // 每行文本的垂直位置 342 lines[0].split(' ').forEach((line, index) => {
343 const y = 415 + (index * 60); // 每行文本的垂直位置
344 let currentLine = '';
345 let arr = [];
346 for (let word of line) {
347 const testLine = currentLine + word;
348 const lineWidth = context.measureText(testLine).width;
349 if (lineWidth <= maxWidth) {
350 currentLine = testLine;
351 } else {
352 arr.push(currentLine);
353 currentLine = word;
354 }
355 }
356 arr.push(currentLine);
357 arr.forEach((line, index) => {
358 context.fillText(line, 775, y + (index * 23)); // 调整行高
359 });
360 });
361 }
362
363 lines.slice(1).forEach((line, index) => {
364 const y = ((parseInt(lines[0].length) / 19) * 22) + 415 + (index * 30); // 每行文本的垂直位置
344 let currentLine = ''; 365 let currentLine = '';
345 let arr = []; 366 let arr = [];
346 for (let word of line) { 367 for (let word of line) {
...@@ -355,12 +376,32 @@ ...@@ -355,12 +376,32 @@
355 } 376 }
356 arr.push(currentLine); 377 arr.push(currentLine);
357 arr.forEach((line, index) => { 378 arr.forEach((line, index) => {
358 context.fillText(line, 775, y + (index * 20)); // 调整行高 379 context.fillText(line, 775, y + (index * 16)); // 调整行高
359 }); 380 })
360 }); 381 })
382
361 // fj 383 // fj
362 context.fillText(this.bdcqz.fj ? this.bdcqz.fj : '', 775, 600); 384 let lines1 = this.bdcqz.fj ? this.bdcqz.fj.split(' ') : [];
363 }; 385 lines1.forEach((line, index) => {
386 const y = 590 + (index * 27); // 每行文本的垂直位置
387 let currentLine = '';
388 let arr = [];
389 for (let word of line) {
390 const testLine = currentLine + word;
391 const lineWidth = context.measureText(testLine).width;
392 if (lineWidth <= maxWidth) {
393 currentLine = testLine;
394 } else {
395 arr.push(currentLine);
396 currentLine = word;
397 }
398 }
399 arr.push(currentLine);
400 arr.forEach((line, index) => {
401 context.fillText(line, 775, y + (index * 20)); // 调整行高
402 })
403 })
404 }
364 405
365 image.src = this.bdczmSrc; 406 image.src = this.bdczmSrc;
366 } 407 }
......
1 <!-- 1 <!--
2 * @Description: 受理信息 2 * @Description: 受理信息
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-17 13:34:51 4 * @LastEditTime: 2023-08-22 14:25:14
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -185,14 +185,13 @@ ...@@ -185,14 +185,13 @@
185 </el-col> 185 </el-col>
186 <el-col :span="8"> 186 <el-col :span="8">
187 <el-form-item label="竣工时间:"> 187 <el-form-item label="竣工时间:">
188 <!-- <el-input v-model="ruleForm.fdcq2.jgsj"></el-input> -->
189 <el-date-picker 188 <el-date-picker
190 v-model="ruleForm.fdcq2.jgsj" 189 v-model="ruleForm.fdcq2.jgsj"
191 class="width100" 190 class="width100"
192 type="date" 191 type="date"
193 placeholder="选择日期" 192 placeholder="选择日期"
194 value-format="yyyy-MM-dd" 193 value-format="yyyy-MM-dd"
195 :disabled="!viewEdit || ableEdit || isJfOperation"></el-date-picker> 194 :disabled="!viewEdit"></el-date-picker>
196 </el-form-item> 195 </el-form-item>
197 </el-col> 196 </el-col>
198 </el-row> 197 </el-row>
...@@ -464,10 +463,8 @@ ...@@ -464,10 +463,8 @@
464 * @author: renchao 463 * @author: renchao
465 */ 464 */
466 upDateTdytxxList (val) { 465 upDateTdytxxList (val) {
467 this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val)); 466 this.ruleForm.tdytqxList = _.cloneDeep(val)
468 this.key++;
469 }, 467 },
470
471 /** 468 /**
472 * @description: 更新权利人信息 469 * @description: 更新权利人信息
473 * @param {*} val 470 * @param {*} val
......
...@@ -311,15 +311,12 @@ ...@@ -311,15 +311,12 @@
311 } 311 }
312 }, 312 },
313 handleLpbClick (item) { 313 handleLpbClick (item) {
314 this.$popup('楼盘表', 'lpb/index', { 314 console.log("item",item);
315 this.$popup('楼盘表', 'lpb/index', {
315 width: '85%', 316 width: '85%',
316 formData: { 317 formData: {
317 bsm: item.bsm, 318 bsm: item.bsm,
318 zrzbsm: item.bsm, 319
319 zdbsm: item.zdbsm,
320 bsmSqyw: this.bsmSqyw,
321 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
322 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
323 } 320 }
324 }) 321 })
325 }, 322 },
......
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
242 * @param {*} row 242 * @param {*} row
243 * @author: renchao 243 * @author: renchao
244 */ 244 */
245 openBook (row) { 245 openDialog (row) {
246 var param = { 246 var param = {
247 bdcdyid: row.bdcdyid, 247 bdcdyid: row.bdcdyid,
248 qllx: row.qllx, 248 qllx: row.qllx,
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-22 09:24:28 4 * @LastEditTime: 2023-08-22 09:28:16
5 */ 5 */
6 import filter from '@/utils/filter.js' 6 import filter from '@/utils/filter.js'
7 let vm = null 7 let vm = null
...@@ -97,16 +97,13 @@ class data extends filter { ...@@ -97,16 +97,13 @@ class data extends filter {
97 render: (h, scope) => { 97 render: (h, scope) => {
98 return ( 98 return (
99 <div> 99 <div>
100 <el-button type="text" onClick={() => { vm.handleLpbClick(scope.row) }}>楼盘表1</el-button>
101 <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button> 100 <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button>
102 </div> 101 </div>
103 ) 102 )
104 } 103 }
105 }, 104 }
106 ] 105 ]
107 } 106 }
108
109
110 } 107 }
111 let datas = new data() 108 let datas = new data()
112 export { 109 export {
......
...@@ -192,9 +192,16 @@ ...@@ -192,9 +192,16 @@
192 * @author: renchao 192 * @author: renchao
193 */ 193 */
194 handleLpbClick (item) { 194 handleLpbClick (item) {
195 this.$popupDialog('楼盘表', 'lpb/index', { 195 console.log("item",item);
196 bsm: '' 196 this.$popup('楼盘表', 'lpb/index', {
197 }, '85%') 197 width: '85%',
198 formData: {
199 bsm: item.zrzbsm,
200 zrzbsm: item.zrzbsm,
201 zdbsm: item.zrzbsm,
202
203 }
204 })
198 } 205 }
199 } 206 }
200 } 207 }
......
...@@ -89,11 +89,20 @@ ...@@ -89,11 +89,20 @@
89 } 89 }
90 }) 90 })
91 }, 91 },
92 /** 92 openDialog(){
93 * @description: moreQueryClick 93 this.$popup('楼盘表', 'lpb/index', {
94 * @author: renchao 94 width: '85%',
95 */ 95 formData: {
96 moreQueryClick () { } 96 bsm: item.bsm,
97 zrzbsm: item.bsm,
98 zdbsm: item.zdbsm,
99 bsmSqyw: this.bsmSqyw,
100 // onlyShow: true,
101 djqxbm: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodecode : "",
102 djqxmc: this.sqywInfo.nodetype == "djqx" ? this.sqywInfo.nodename : "",
103 }
104 })
105 }
97 } 106 }
98 } 107 }
99 </script> 108 </script>
......