99afa86e by xiaomiao

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

2 parents 0874a2e9 09e81f08
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-28 15:45:56
* @LastEditTime: 2023-08-22 16:58:24
-->
<template>
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px">
......@@ -23,7 +23,8 @@
</el-col>
</el-row>
<lb-table :column="tableData.columns" @row-dblclick="handleRowClick" ref="table" @selection-change="handleSelectionChange" :data="tableData.data"
<lb-table :column="tableData.columns" @row-dblclick="handleRowClick" ref="table" @selection-change="handleSelectionChange"
:data="tableData.data"
:pagination="false"
:calcHeight="300">
</lb-table>
......@@ -114,15 +115,20 @@
})
},
methods: {
//列表初始化
/**
* @description: 列表初始化
* @author: renchao
*/
loadGrid () {
let that = this
getUnclaimedBdcqz({ bsmSlsq: Vue.prototype.$currentRoute.query.bsmSlsq }).then(res => {
if (res.code === 200) {
this.tableData.data = res.result.list;
this.$nextTick(() => {
this.tableData.data.forEach(item => {
that.$refs.table.toggleRowSelection(item)
})
})
this.ruleForm.fzrmc = res.result.fzrmc
this.ruleForm.fzsj = res.result.fzsj
this.ruleForm.fzsl = res.result.fzsl
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-22 16:15:45
* @LastEditTime: 2023-08-22 16:37:00
-->
<template>
<div class="from-clues loadingtext" v-Loading="loading" element-loading-text="拼命加载中..." style="height:720px;text-align: center;">
......@@ -151,7 +151,7 @@
const maxWidth = 336; // 最大宽度限制
let lines = this.bdcqz.qlqtzk ? this.bdcqz.qlqtzk.split('\n') : [];
lines.forEach((line, index) => {
const y = 463 + (index * 30); // 每行文本的垂直位置
const y = 463 + (index * 45); // 每行文本的垂直位置
let currentLine = '';
let arr = [];
for (let word of line) {
......@@ -169,9 +169,9 @@
context.fillText(line, 129, y + (index * 20)); // 调整行高
})
})
let lines1 = this.bdcqz.fj ? this.bdcqz.fj.split(' ') : [];
let lines1 = this.bdcqz.fj ? this.bdcqz.fj.split('\n') : [];
lines1.forEach((line, index) => {
const y = 100 + (index * 27); // 每行文本的垂直位置
const y = 100 + (index * 30); // 每行文本的垂直位置
let currentLine = '';
let arr = [];
for (let word of line) {
......@@ -186,7 +186,7 @@
}
arr.push(currentLine);
arr.forEach((line, index) => {
context.fillText(line, 580, y + (index * 20)); // 调整行高
context.fillText(line, 580, y + (index * 16)); // 调整行高
})
})
let lines3 = this.bdcqz.syqx ? this.bdcqz.syqx.split(' ') : [];
......@@ -337,7 +337,7 @@
})
// fj
let lines1 = this.bdcqz.fj ? this.bdcqz.fj.split(' ') : [];
let lines1 = this.bdcqz.fj ? this.bdcqz.fj.split('\n') : [];
lines1.forEach((line, index) => {
const y = 590 + (index * 27); // 每行文本的垂直位置
let currentLine = '';
......
......@@ -38,7 +38,22 @@
</el-input>
</template>
</el-table-column>
<el-table-column prop="fwxz" label="房屋性质" min-width="100">
<template slot-scope="scope">
<treeselect
v-model="scope.row.fwxz"
:disabled="!ableOperation"
noOptionsText="暂无数据"
placeholder=""
:show-count="true"
:options="dictData['A19']"
:normalizer="normalizer"
:appendToBody="true"
z-index="9999"
@input="updaterow(scope.row)"
/>
</template>
</el-table-column>
<el-table-column prop="ghyt" label="房屋用途" min-width="100">
<template slot-scope="scope">
<treeselect
......