ac1fb5f6 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents debbf14c 8b476825
......@@ -2,7 +2,7 @@
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-10-25 11:28:05
* @LastEditTime: 2023-11-14 16:17:11
-->
<template>
<!-- 受理信息 -->
......@@ -73,14 +73,29 @@
</el-col>
<el-col :span="8">
<el-form-item label="权利性质:">
<el-input disabled v-model="ruleForm.zdjbxx.qlxzmc"></el-input>
<treeselect
:disabled="!viewEdit"
v-model="ruleForm.zdjbxx.qlxz"
noOptionsText="暂无数据"
placeholder=""
:normalizer="normalizer"
:default-expand-level="1"
:show-count="true"
:options="dictData['A9']" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="权利设定方式:">
<el-input disabled v-model="ruleForm.zdjbxx.qlsdfsmc"></el-input>
<el-select v-model="ruleForm.zdjbxx.qlsdfs" :disabled="!viewEdit">
<el-option
v-for="item in dictData['A10']"
:key="item.dcode"
:label="item.dname"
:value="item.dcode">
</el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -113,7 +128,7 @@
<el-row :gutter="10">
<el-col :span="8">
<el-form-item label="土地等级:">
<el-select placeholder="" v-model="ruleForm.zdjbxx.dj" disabled>
<el-select placeholder="" v-model="ruleForm.zdjbxx.dj" :disabled="!viewEdit">
<el-option
v-for="item in dictData['A50']"
:key="item.dcode"
......@@ -127,7 +142,7 @@
<el-col :span="8">
<el-form-item label="图幅号:">
<el-input
disabled
:disabled="!viewEdit"
v-model="ruleForm.zdjbxx.tfh"></el-input>
</el-form-item>
</el-col>
......@@ -135,7 +150,7 @@
<el-form-item label="地籍号:">
<el-input
v-model="ruleForm.zdjbxx.djh"
disabled></el-input>
:disabled="!viewEdit"></el-input>
</el-form-item>
</el-col>
......@@ -145,7 +160,7 @@
<el-form-item label="地块代码:">
<el-input
v-model="ruleForm.zdjbxx.dkdm"
disabled></el-input>
:disabled="!viewEdit"></el-input>
</el-form-item>
</el-col>
<el-col :span="16">
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-11-14 15:36:05
* @LastEditTime: 2023-11-14 16:03:46
-->
<template>
<div class="from-clues">
......@@ -69,6 +69,7 @@
</el-table-column>
<el-table-column
property="qllxmc"
width="130"
label="权利类型">
</el-table-column>
<el-table-column
......@@ -91,14 +92,17 @@
</el-table-column>
<el-table-column
property="qlrzjhm"
width="120"
label="证件号">
</el-table-column>
<el-table-column
property="qlxzmc"
width="100"
label="权利性质">
</el-table-column>
<el-table-column
property="qlytmc"
width="120"
label="用途">
</el-table-column>
<el-table-column
......@@ -107,10 +111,12 @@
</el-table-column>
<el-table-column
property="zl"
width="200"
label="坐落">
</el-table-column>
<el-table-column
label="操作"
fixed="right"
width="80">
<template slot-scope="scope">
<el-button type="text" icon="el-icon-edit-outline" @click="openBook(scope.row)">登记薄</el-button>
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-11-14 14:16:21
* @LastEditTime: 2023-11-14 16:04:10
*/
import filter from '@/utils/filter.js'
let vm = null
......@@ -47,7 +47,7 @@ class data extends filter {
{
prop: "qllxmc",
label: "权利类型",
minWidth: '130'
minWidth: 130
},
{
prop: "bdcdyh",
......@@ -82,7 +82,7 @@ class data extends filter {
},
{
label: "证件号",
witdth: '100',
witdth: 120,
render: (h, scope) => {
return (
<el-tooltip effect="dark" content={scope.row.qlrzjhm} placement="top" popper-class="tooltip-width ">
......@@ -94,10 +94,11 @@ class data extends filter {
{
prop: "qlxzmc",
label: "权利性质",
width: 100,
},
{
label: "用途",
width: '120',
width: 120,
render: (h, scope) => {
return (
<el-tooltip effect="dark" content={scope.row.qlytmc} placement="top" popper-class="tooltip-width ">
......@@ -112,7 +113,7 @@ class data extends filter {
},
{
label: "坐落",
minWidth: '150',
minWidth: 200,
render: (h, scope) => {
return (
<el-tooltip effect="dark" content={scope.row.zl} placement="top" popper-class="tooltip-width ">
......