9f1ac4ad by xiaomiao

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

2 parents ca08a4ad 5a2c6599
...@@ -206,7 +206,7 @@ ...@@ -206,7 +206,7 @@
206 } else { 206 } else {
207 this.column = _.cloneDeep(dataList); 207 this.column = _.cloneDeep(dataList);
208 this.column.splice(2, 0, { 208 this.column.splice(2, 0, {
209 prop: "fs", 209 prop: "qlbl",
210 label: "份数", 210 label: "份数",
211 }); 211 });
212 } 212 }
......
...@@ -206,7 +206,7 @@ ...@@ -206,7 +206,7 @@
206 } else { 206 } else {
207 this.column = _.cloneDeep(dataList); 207 this.column = _.cloneDeep(dataList);
208 this.column.splice(2, 0, { 208 this.column.splice(2, 0, {
209 prop: "fs", 209 prop: "qlbl",
210 label: "份数", 210 label: "份数",
211 }); 211 });
212 } 212 }
......
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
114 this.column = _.cloneDeep(dataList) 114 this.column = _.cloneDeep(dataList)
115 this.column.splice( 115 this.column.splice(
116 2, 0, { 116 2, 0, {
117 prop: "fs", 117 prop: "qlbl",
118 label: "份数" 118 label: "份数"
119 }) 119 })
120 } 120 }
......
...@@ -42,8 +42,8 @@ ...@@ -42,8 +42,8 @@
42 </el-form-item> 42 </el-form-item>
43 </el-col> 43 </el-col>
44 <el-col :span="8"> 44 <el-col :span="8">
45 <el-form-item label="份数" prop="fs"> 45 <el-form-item label="份数" prop="qlbl">
46 <el-input v-model="ruleForm.fs" :disabled="!showButton" maxlength="8" oninput="value=value.replace(/[^\d]/g,'')"></el-input> 46 <el-input v-model="ruleForm.qlbl" :disabled="!showButton" maxlength="8" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
47 </el-form-item> 47 </el-form-item>
48 </el-col> 48 </el-col>
49 49
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-18 13:51:27 4 * @LastEditTime: 2023-08-21 10:35:58
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;">
...@@ -146,10 +146,10 @@ ...@@ -146,10 +146,10 @@
146 context.fillText(this.bdcqz.mj ? this.bdcqz.mj : '', 129, 386); 146 context.fillText(this.bdcqz.mj ? this.bdcqz.mj : '', 129, 386);
147 // context.fillText(this.bdcqz.syqx ? this.bdcqz.syqx : '', 129, 429); 147 // context.fillText(this.bdcqz.syqx ? this.bdcqz.syqx : '', 129, 429);
148 // qlqtzk 148 // qlqtzk
149 const maxWidth = 330; // 最大宽度限制 149 const maxWidth = 336; // 最大宽度限制
150 let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : []; 150 let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : [];
151 lines.forEach((line, index) => { 151 lines.forEach((line, index) => {
152 const y = 473 + (index * 30); // 每行文本的垂直位置 152 const y = 463 + (index * 30); // 每行文本的垂直位置
153 let currentLine = ''; 153 let currentLine = '';
154 let arr = []; 154 let arr = [];
155 for (let word of line) { 155 for (let word of line) {
......
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
104 this.column = _.cloneDeep(dataList) 104 this.column = _.cloneDeep(dataList)
105 this.column.splice( 105 this.column.splice(
106 2, 0, { 106 2, 0, {
107 prop: "fs", 107 prop: "qlbl",
108 label: "份数" 108 label: "份数"
109 }) 109 })
110 } 110 }
......
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
150 this.column = _.cloneDeep(dataList) 150 this.column = _.cloneDeep(dataList)
151 this.column.splice( 151 this.column.splice(
152 2, 0, { 152 2, 0, {
153 prop: "fs", 153 prop: "qlbl",
154 label: "份数" 154 label: "份数"
155 }) 155 })
156 } 156 }
......
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
121 this.column = _.cloneDeep(dataList) 121 this.column = _.cloneDeep(dataList)
122 this.column.splice( 122 this.column.splice(
123 2, 0, { 123 2, 0, {
124 prop: "fs", 124 prop: "qlbl",
125 label: "份数" 125 label: "份数"
126 }) 126 })
127 } 127 }
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-04 09:47:56 4 * @LastEditTime: 2023-08-22 09:24:28
5 */ 5 */
6 import filter from '@/utils/filter.js' 6 import filter from '@/utils/filter.js'
7 let vm = null 7 let vm = null
...@@ -39,17 +39,6 @@ class data extends filter { ...@@ -39,17 +39,6 @@ class data extends filter {
39 <div> 39 <div>
40 <a style='color:#3498db;' v-show={scope.row.djblzt == 1}>{this.yWstatus(scope.row)}</a> 40 <a style='color:#3498db;' v-show={scope.row.djblzt == 1}>{this.yWstatus(scope.row)}</a>
41 <span v-show={scope.row.djblzt != 1}>{this.yWstatus(scope.row)}</span> 41 <span v-show={scope.row.djblzt != 1}>{this.yWstatus(scope.row)}</span>
42 {/* <a style='color:#3498db;' v-show={scope.row.djblzt == 1} >正在办理</a>
43 <span v-show={scope.row.zjgcdyzt == 1}>,在建工程抵押</span>
44 <span v-show={scope.row.ycfzt == 1}>,已预查封</span>
45 <span v-show={scope.row.ycfzt == 1}>,已预查封</span>
46 <span v-show={scope.row.cfzt == 1}>,已查封</span>
47 <span v-show={scope.row.diyizt == 1}>,已地役</span>
48 <span v-show={scope.row.yyzt == 1}>,异议中</span>
49 <span v-show={scope.row.xzzt == 1}>,已限制</span>
50 <span v-show={scope.row.ygmmzt == 1}>,已预告买卖</span>
51 <span v-show={scope.row.ygdyzt == 1}>,已预告抵押</span>
52 <span v-show={scope.row.dyzt == 1}>,已抵押</span> */}
53 </div> 42 </div>
54 ) 43 )
55 } 44 }
...@@ -67,7 +56,8 @@ class data extends filter { ...@@ -67,7 +56,8 @@ class data extends filter {
67 { 56 {
68 prop: "bdcqzh", 57 prop: "bdcqzh",
69 label: "不动产权证号", 58 label: "不动产权证号",
70 minWidth: '150' 59 width: '150',
60 showOverflowTooltip: true
71 }, 61 },
72 { 62 {
73 prop: "gyqk", 63 prop: "gyqk",
...@@ -76,6 +66,8 @@ class data extends filter { ...@@ -76,6 +66,8 @@ class data extends filter {
76 { 66 {
77 prop: "qlrmc", 67 prop: "qlrmc",
78 label: "权利人", 68 label: "权利人",
69 width: '120',
70 showOverflowTooltip: true
79 }, 71 },
80 { 72 {
81 prop: "qlrzjhm", 73 prop: "qlrzjhm",
......