Merge branch 'dev'
Showing
9 changed files
with
21 additions
and
21 deletions
| ... | @@ -271,7 +271,6 @@ | ... | @@ -271,7 +271,6 @@ |
| 271 | }, | 271 | }, |
| 272 | created () { | 272 | created () { |
| 273 | window.addEventListener("resize", this.getHeight); | 273 | window.addEventListener("resize", this.getHeight); |
| 274 | console.log(this.formData); | ||
| 275 | this.getHeight(); | 274 | this.getHeight(); |
| 276 | }, | 275 | }, |
| 277 | mounted () { | 276 | mounted () { | ... | ... |
| ... | @@ -180,7 +180,7 @@ | ... | @@ -180,7 +180,7 @@ |
| 180 | display: flex; | 180 | display: flex; |
| 181 | align-items: center; | 181 | align-items: center; |
| 182 | justify-content: center; | 182 | justify-content: center; |
| 183 | min-width: 280px; | 183 | min-width: 360px; |
| 184 | z-index: 1; | 184 | z-index: 1; |
| 185 | } | 185 | } |
| 186 | td:first-child{ | 186 | td:first-child{ | ... | ... |
| ... | @@ -94,12 +94,12 @@ | ... | @@ -94,12 +94,12 @@ |
| 94 | </el-col> | 94 | </el-col> |
| 95 | <el-col :span="8"> | 95 | <el-col :span="8"> |
| 96 | <el-form-item label="面积:"> | 96 | <el-form-item label="面积:"> |
| 97 | <el-input disabled v-model="ruleForm.ztQlxx.mjmc"></el-input> | 97 | <el-input disabled v-model="ruleForm.ztQlxx.qlmjmc"></el-input> |
| 98 | </el-form-item> | 98 | </el-form-item> |
| 99 | </el-col> | 99 | </el-col> |
| 100 | <el-col :span="8"> | 100 | <el-col :span="8"> |
| 101 | <el-form-item label="用途:"> | 101 | <el-form-item label="用途:"> |
| 102 | <el-input disabled v-model="ruleForm.ztQlxx.ytmc"></el-input> | 102 | <el-input disabled v-model="ruleForm.ztQlxx.qlytmc"></el-input> |
| 103 | </el-form-item> | 103 | </el-form-item> |
| 104 | </el-col> | 104 | </el-col> |
| 105 | </el-row> | 105 | </el-row> |
| ... | @@ -110,10 +110,9 @@ | ... | @@ -110,10 +110,9 @@ |
| 110 | </div> | 110 | </div> |
| 111 | 111 | ||
| 112 | <el-row :gutter="10"> | 112 | <el-row :gutter="10"> |
| 113 | <el-col :span="8" v-if="ruleForm.sldy.djlx != '100'"> | 113 | <el-col :span="8" > |
| 114 | <el-form-item label="原不动产登记证明号:"> | 114 | <el-form-item label="原不动产权证号:"> |
| 115 | <el-input v-if="ruleForm.sldy.djlx == '400'" disabled v-model="ruleForm.qlxx.bdcqzh"></el-input> | 115 | <el-input disabled v-model="ruleForm.sldy.ybdcqzsh"></el-input> |
| 116 | <el-input v-else disabled v-model="ruleForm.ssQlxx.bdcqzh"></el-input> | ||
| 117 | </el-form-item> | 116 | </el-form-item> |
| 118 | </el-col> | 117 | </el-col> |
| 119 | <el-col :span="7"> | 118 | <el-col :span="7"> | ... | ... |
| ... | @@ -311,11 +311,11 @@ | ... | @@ -311,11 +311,11 @@ |
| 311 | } | 311 | } |
| 312 | }, | 312 | }, |
| 313 | handleLpbClick (item) { | 313 | handleLpbClick (item) { |
| 314 | console.log("item",item); | ||
| 315 | this.$popup('楼盘表', 'lpb/index', { | 314 | this.$popup('楼盘表', 'lpb/index', { |
| 316 | width: '85%', | 315 | width: '85%', |
| 317 | formData: { | 316 | formData: { |
| 318 | bsm: item.bsm, | 317 | bsm: item.bsm, |
| 318 | bsmSqyw:this.sqywInfo.bsmSqyw | ||
| 319 | 319 | ||
| 320 | } | 320 | } |
| 321 | }) | 321 | }) | ... | ... |
| 1 | <!-- | 1 | <!-- |
| 2 | * @Description: | 2 | * @Description: |
| 3 | * @Autor: renchao | 3 | * @Autor: renchao |
| 4 | * @LastEditTime: 2023-08-02 10:03:23 | 4 | * @LastEditTime: 2023-08-24 11:02:25 |
| 5 | --> | 5 | --> |
| 6 | <template> | 6 | <template> |
| 7 | <!-- 主体权利信息查询 --> | 7 | <!-- 主体权利信息查询 --> |
| 8 | <div class="from-clues"> | 8 | <div class="from-clues"> |
| 9 | <!-- 表单部分 --> | 9 | <!-- 表单部分 --> |
| 10 | <div class="from-clues-header"> | 10 | <div class="from-clues-header"> |
| 11 | <el-form :model="queryForm" ref="queryForm"> | 11 | <el-form :model="queryForm" ref="queryForm" label-width="105px"> |
| 12 | <el-row> | 12 | <el-row> |
| 13 | <el-col :span="6"> | 13 | <el-col :span="7"> |
| 14 | <el-form-item label="不动产权证号"> | 14 | <el-form-item label="不动产权证号"> |
| 15 | <el-input placeholder="请输入不动产权证号" v-model="queryForm.bdcqzh" clearable class="width200px"> | 15 | <el-input placeholder="请输入不动产权证号" v-model="queryForm.bdcqzh" clearable class="width100"> |
| 16 | </el-input> | 16 | </el-input> |
| 17 | </el-form-item> | 17 | </el-form-item> |
| 18 | </el-col> | 18 | </el-col> |
| 19 | <el-col :span="6"> | 19 | <el-col :span="7"> |
| 20 | <el-form-item label="不动产单元号"> | 20 | <el-form-item label="不动产单元号"> |
| 21 | <el-input placeholder="请输入不动产单元号" maxlength="28" v-model="queryForm.bdcdyh" clearable class="width200px"> | 21 | <el-input placeholder="请输入不动产单元号" maxlength="28" v-model="queryForm.bdcdyh" clearable class="width100"> |
| 22 | </el-input> | 22 | </el-input> |
| 23 | </el-form-item> | 23 | </el-form-item> |
| 24 | </el-col> | 24 | </el-col> |
| 25 | <el-col :span="8"> | 25 | <el-col :span="6"> |
| 26 | <el-form-item label="坐落"> | 26 | <el-form-item label="坐落" label-width="60px"> |
| 27 | <el-input placeholder="请输入坐落" v-model.trim="queryForm.zl" clearable class="width100"> | 27 | <el-input placeholder="请输入坐落" v-model.trim="queryForm.zl" clearable class="width100"> |
| 28 | </el-input> | 28 | </el-input> |
| 29 | </el-form-item> | 29 | </el-form-item> | ... | ... |
| ... | @@ -89,7 +89,6 @@ | ... | @@ -89,7 +89,6 @@ |
| 89 | */ | 89 | */ |
| 90 | queryClick () { | 90 | queryClick () { |
| 91 | this.$startLoading(); | 91 | this.$startLoading(); |
| 92 | console.log("this.sqywInfo.zrzbsm",this.sqywInfo); | ||
| 93 | this.queryForm.zrzbsm = this.sqywInfo.bsm; | 92 | this.queryForm.zrzbsm = this.sqywInfo.bsm; |
| 94 | // this.queryForm.zrzbsm = this.sqywInfo.zrzbsm; | 93 | // this.queryForm.zrzbsm = this.sqywInfo.zrzbsm; |
| 95 | selectHQjdc({ ...this.queryForm, ...this.pageData }).then((res) => { | 94 | selectHQjdc({ ...this.queryForm, ...this.pageData }).then((res) => { | ... | ... |
| ... | @@ -159,7 +159,6 @@ | ... | @@ -159,7 +159,6 @@ |
| 159 | if (this.selectType == 'together') { | 159 | if (this.selectType == 'together') { |
| 160 | getTogetherBiz().then(res => { | 160 | getTogetherBiz().then(res => { |
| 161 | if (res) { | 161 | if (res) { |
| 162 | console.log("res", res); | ||
| 163 | this.djqxList = res.result; | 162 | this.djqxList = res.result; |
| 164 | } | 163 | } |
| 165 | }) | 164 | }) | ... | ... |
| 1 | /* | 1 | /* |
| 2 | * @Description: | 2 | * @Description: |
| 3 | * @Autor: renchao | 3 | * @Autor: renchao |
| 4 | * @LastEditTime: 2023-08-22 09:28:16 | 4 | * @LastEditTime: 2023-08-24 11:00: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 |
| ... | @@ -80,6 +80,8 @@ class data extends filter { | ... | @@ -80,6 +80,8 @@ class data extends filter { |
| 80 | { | 80 | { |
| 81 | prop: "qlytmc", | 81 | prop: "qlytmc", |
| 82 | label: "用途", | 82 | label: "用途", |
| 83 | width: '120', | ||
| 84 | showOverflowTooltip: true | ||
| 83 | }, | 85 | }, |
| 84 | { | 86 | { |
| 85 | prop: "qlmjmc", | 87 | prop: "qlmjmc", |
| ... | @@ -88,7 +90,8 @@ class data extends filter { | ... | @@ -88,7 +90,8 @@ class data extends filter { |
| 88 | { | 90 | { |
| 89 | prop: "zl", | 91 | prop: "zl", |
| 90 | label: "坐落", | 92 | label: "坐落", |
| 91 | minWidth: '130' | 93 | width: '130', |
| 94 | showOverflowTooltip: true | ||
| 92 | }, | 95 | }, |
| 93 | { | 96 | { |
| 94 | label: '操作', | 97 | label: '操作', | ... | ... |
| ... | @@ -37,6 +37,7 @@ | ... | @@ -37,6 +37,7 @@ |
| 37 | * @param {*} view | 37 | * @param {*} view |
| 38 | * @author: renchao | 38 | * @author: renchao |
| 39 | */ | 39 | */ |
| 40 | |||
| 40 | loadView (view) { | 41 | loadView (view) { |
| 41 | return (r) => | 42 | return (r) => |
| 42 | require.ensure([], () => r(require(`./components/${view}.vue`))); | 43 | require.ensure([], () => r(require(`./components/${view}.vue`))); | ... | ... |
-
Please register or sign in to post a comment