Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
99afa86e by xiaomiao
Options

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

2 parents 0874a2e9 09e81f08
Inline Side-by-side
Showing 3 changed files with 31 additions and 10 deletions
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-28 15:45:56 4 * @LastEditTime: 2023-08-22 16:58:24
5 --> 5 -->
6 <template> 6 <template>
7 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px"> 7 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px">
...@@ -23,7 +23,8 @@ ...@@ -23,7 +23,8 @@
23 </el-col> 23 </el-col>
24 </el-row> 24 </el-row>
25 25
26 <lb-table :column="tableData.columns" @row-dblclick="handleRowClick" ref="table" @selection-change="handleSelectionChange" :data="tableData.data" 26 <lb-table :column="tableData.columns" @row-dblclick="handleRowClick" ref="table" @selection-change="handleSelectionChange"
27 :data="tableData.data"
27 :pagination="false" 28 :pagination="false"
28 :calcHeight="300"> 29 :calcHeight="300">
29 </lb-table> 30 </lb-table>
...@@ -114,15 +115,20 @@ ...@@ -114,15 +115,20 @@
114 }) 115 })
115 }, 116 },
116 methods: { 117 methods: {
117 //列表初始化
118 /** 118 /**
119 * @description: 列表初始化 119 * @description: 列表初始化
120 * @author: renchao 120 * @author: renchao
121 */ 121 */
122 loadGrid () { 122 loadGrid () {
123 let that = this
123 getUnclaimedBdcqz({ bsmSlsq: Vue.prototype.$currentRoute.query.bsmSlsq }).then(res => { 124 getUnclaimedBdcqz({ bsmSlsq: Vue.prototype.$currentRoute.query.bsmSlsq }).then(res => {
124 if (res.code === 200) { 125 if (res.code === 200) {
125 this.tableData.data = res.result.list; 126 this.tableData.data = res.result.list;
127 this.$nextTick(() => {
128 this.tableData.data.forEach(item => {
129 that.$refs.table.toggleRowSelection(item)
130 })
131 })
126 this.ruleForm.fzrmc = res.result.fzrmc 132 this.ruleForm.fzrmc = res.result.fzrmc
127 this.ruleForm.fzsj = res.result.fzsj 133 this.ruleForm.fzsj = res.result.fzsj
128 this.ruleForm.fzsl = res.result.fzsl 134 this.ruleForm.fzsl = res.result.fzsl
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-22 16:15:45 4 * @LastEditTime: 2023-08-22 16:37:00
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;">
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
151 const maxWidth = 336; // 最大宽度限制 151 const maxWidth = 336; // 最大宽度限制
152 let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : []; 152 let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : [];
153 lines.forEach((line, index) => { 153 lines.forEach((line, index) => {
154 const y = 463 + (index * 30); // 每行文本的垂直位置 154 const y = 463 + (index * 45); // 每行文本的垂直位置
155 let currentLine = ''; 155 let currentLine = '';
156 let arr = []; 156 let arr = [];
157 for (let word of line) { 157 for (let word of line) {
...@@ -169,9 +169,9 @@ ...@@ -169,9 +169,9 @@
169 context.fillText(line, 129, y + (index * 20)); // 调整行高 169 context.fillText(line, 129, y + (index * 20)); // 调整行高
170 }) 170 })
171 }) 171 })
172 let lines1 = this.bdcqz.fj ? this.bdcqz.fj.split(' ') : []; 172 let lines1 = this.bdcqz.fj ? this.bdcqz.fj.split('\n') : [];
173 lines1.forEach((line, index) => { 173 lines1.forEach((line, index) => {
174 const y = 100 + (index * 27); // 每行文本的垂直位置 174 const y = 100 + (index * 30); // 每行文本的垂直位置
175 let currentLine = ''; 175 let currentLine = '';
176 let arr = []; 176 let arr = [];
177 for (let word of line) { 177 for (let word of line) {
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
186 } 186 }
187 arr.push(currentLine); 187 arr.push(currentLine);
188 arr.forEach((line, index) => { 188 arr.forEach((line, index) => {
189 context.fillText(line, 580, y + (index * 20)); // 调整行高 189 context.fillText(line, 580, y + (index * 16)); // 调整行高
190 }) 190 })
191 }) 191 })
192 let lines3 = this.bdcqz.syqx ? this.bdcqz.syqx.split(' ') : []; 192 let lines3 = this.bdcqz.syqx ? this.bdcqz.syqx.split(' ') : [];
...@@ -337,7 +337,7 @@ ...@@ -337,7 +337,7 @@
337 }) 337 })
338 338
339 // fj 339 // fj
340 let lines1 = this.bdcqz.fj ? this.bdcqz.fj.split(' ') : []; 340 let lines1 = this.bdcqz.fj ? this.bdcqz.fj.split('\n') : [];
341 lines1.forEach((line, index) => { 341 lines1.forEach((line, index) => {
342 const y = 590 + (index * 27); // 每行文本的垂直位置 342 const y = 590 + (index * 27); // 每行文本的垂直位置
343 let currentLine = ''; 343 let currentLine = '';
......
...@@ -38,7 +38,22 @@ ...@@ -38,7 +38,22 @@
38 </el-input> 38 </el-input>
39 </template> 39 </template>
40 </el-table-column> 40 </el-table-column>
41 41 <el-table-column prop="fwxz" label="房屋性质" min-width="100">
42 <template slot-scope="scope">
43 <treeselect
44 v-model="scope.row.fwxz"
45 :disabled="!ableOperation"
46 noOptionsText="暂无数据"
47 placeholder=""
48 :show-count="true"
49 :options="dictData['A19']"
50 :normalizer="normalizer"
51 :appendToBody="true"
52 z-index="9999"
53 @input="updaterow(scope.row)"
54 />
55 </template>
56 </el-table-column>
42 <el-table-column prop="ghyt" label="房屋用途" min-width="100"> 57 <el-table-column prop="ghyt" label="房屋用途" min-width="100">
43 <template slot-scope="scope"> 58 <template slot-scope="scope">
44 <treeselect 59 <treeselect
......