ac1fb5f6 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents debbf14c 8b476825
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <!-- 2 <!--
3 * @Description: 3 * @Description:
4 * @Autor: renchao 4 * @Autor: renchao
5 * @LastEditTime: 2023-10-25 11:28:05 5 * @LastEditTime: 2023-11-14 16:17:11
6 --> 6 -->
7 <template> 7 <template>
8 <!-- 受理信息 --> 8 <!-- 受理信息 -->
...@@ -73,14 +73,29 @@ ...@@ -73,14 +73,29 @@
73 </el-col> 73 </el-col>
74 <el-col :span="8"> 74 <el-col :span="8">
75 <el-form-item label="权利性质:"> 75 <el-form-item label="权利性质:">
76 <el-input disabled v-model="ruleForm.zdjbxx.qlxzmc"></el-input> 76 <treeselect
77 :disabled="!viewEdit"
78 v-model="ruleForm.zdjbxx.qlxz"
79 noOptionsText="暂无数据"
80 placeholder=""
81 :normalizer="normalizer"
82 :default-expand-level="1"
83 :show-count="true"
84 :options="dictData['A9']" />
77 </el-form-item> 85 </el-form-item>
78 </el-col> 86 </el-col>
79 </el-row> 87 </el-row>
80 <el-row :gutter="10"> 88 <el-row :gutter="10">
81 <el-col :span="8"> 89 <el-col :span="8">
82 <el-form-item label="权利设定方式:"> 90 <el-form-item label="权利设定方式:">
83 <el-input disabled v-model="ruleForm.zdjbxx.qlsdfsmc"></el-input> 91 <el-select v-model="ruleForm.zdjbxx.qlsdfs" :disabled="!viewEdit">
92 <el-option
93 v-for="item in dictData['A10']"
94 :key="item.dcode"
95 :label="item.dname"
96 :value="item.dcode">
97 </el-option>
98 </el-select>
84 </el-form-item> 99 </el-form-item>
85 </el-col> 100 </el-col>
86 101
...@@ -113,7 +128,7 @@ ...@@ -113,7 +128,7 @@
113 <el-row :gutter="10"> 128 <el-row :gutter="10">
114 <el-col :span="8"> 129 <el-col :span="8">
115 <el-form-item label="土地等级:"> 130 <el-form-item label="土地等级:">
116 <el-select placeholder="" v-model="ruleForm.zdjbxx.dj" disabled> 131 <el-select placeholder="" v-model="ruleForm.zdjbxx.dj" :disabled="!viewEdit">
117 <el-option 132 <el-option
118 v-for="item in dictData['A50']" 133 v-for="item in dictData['A50']"
119 :key="item.dcode" 134 :key="item.dcode"
...@@ -127,7 +142,7 @@ ...@@ -127,7 +142,7 @@
127 <el-col :span="8"> 142 <el-col :span="8">
128 <el-form-item label="图幅号:"> 143 <el-form-item label="图幅号:">
129 <el-input 144 <el-input
130 disabled 145 :disabled="!viewEdit"
131 v-model="ruleForm.zdjbxx.tfh"></el-input> 146 v-model="ruleForm.zdjbxx.tfh"></el-input>
132 </el-form-item> 147 </el-form-item>
133 </el-col> 148 </el-col>
...@@ -135,7 +150,7 @@ ...@@ -135,7 +150,7 @@
135 <el-form-item label="地籍号:"> 150 <el-form-item label="地籍号:">
136 <el-input 151 <el-input
137 v-model="ruleForm.zdjbxx.djh" 152 v-model="ruleForm.zdjbxx.djh"
138 disabled></el-input> 153 :disabled="!viewEdit"></el-input>
139 </el-form-item> 154 </el-form-item>
140 </el-col> 155 </el-col>
141 156
...@@ -145,7 +160,7 @@ ...@@ -145,7 +160,7 @@
145 <el-form-item label="地块代码:"> 160 <el-form-item label="地块代码:">
146 <el-input 161 <el-input
147 v-model="ruleForm.zdjbxx.dkdm" 162 v-model="ruleForm.zdjbxx.dkdm"
148 disabled></el-input> 163 :disabled="!viewEdit"></el-input>
149 </el-form-item> 164 </el-form-item>
150 </el-col> 165 </el-col>
151 <el-col :span="16"> 166 <el-col :span="16">
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-11-14 15:36:05 4 * @LastEditTime: 2023-11-14 16:03:46
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -69,6 +69,7 @@ ...@@ -69,6 +69,7 @@
69 </el-table-column> 69 </el-table-column>
70 <el-table-column 70 <el-table-column
71 property="qllxmc" 71 property="qllxmc"
72 width="130"
72 label="权利类型"> 73 label="权利类型">
73 </el-table-column> 74 </el-table-column>
74 <el-table-column 75 <el-table-column
...@@ -91,14 +92,17 @@ ...@@ -91,14 +92,17 @@
91 </el-table-column> 92 </el-table-column>
92 <el-table-column 93 <el-table-column
93 property="qlrzjhm" 94 property="qlrzjhm"
95 width="120"
94 label="证件号"> 96 label="证件号">
95 </el-table-column> 97 </el-table-column>
96 <el-table-column 98 <el-table-column
97 property="qlxzmc" 99 property="qlxzmc"
100 width="100"
98 label="权利性质"> 101 label="权利性质">
99 </el-table-column> 102 </el-table-column>
100 <el-table-column 103 <el-table-column
101 property="qlytmc" 104 property="qlytmc"
105 width="120"
102 label="用途"> 106 label="用途">
103 </el-table-column> 107 </el-table-column>
104 <el-table-column 108 <el-table-column
...@@ -107,10 +111,12 @@ ...@@ -107,10 +111,12 @@
107 </el-table-column> 111 </el-table-column>
108 <el-table-column 112 <el-table-column
109 property="zl" 113 property="zl"
114 width="200"
110 label="坐落"> 115 label="坐落">
111 </el-table-column> 116 </el-table-column>
112 <el-table-column 117 <el-table-column
113 label="操作" 118 label="操作"
119 fixed="right"
114 width="80"> 120 width="80">
115 <template slot-scope="scope"> 121 <template slot-scope="scope">
116 <el-button type="text" icon="el-icon-edit-outline" @click="openBook(scope.row)">登记薄</el-button> 122 <el-button type="text" icon="el-icon-edit-outline" @click="openBook(scope.row)">登记薄</el-button>
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-11-14 14:16:21 4 * @LastEditTime: 2023-11-14 16:04:10
5 */ 5 */
6 import filter from '@/utils/filter.js' 6 import filter from '@/utils/filter.js'
7 let vm = null 7 let vm = null
...@@ -47,7 +47,7 @@ class data extends filter { ...@@ -47,7 +47,7 @@ class data extends filter {
47 { 47 {
48 prop: "qllxmc", 48 prop: "qllxmc",
49 label: "权利类型", 49 label: "权利类型",
50 minWidth: '130' 50 minWidth: 130
51 }, 51 },
52 { 52 {
53 prop: "bdcdyh", 53 prop: "bdcdyh",
...@@ -82,7 +82,7 @@ class data extends filter { ...@@ -82,7 +82,7 @@ class data extends filter {
82 }, 82 },
83 { 83 {
84 label: "证件号", 84 label: "证件号",
85 witdth: '100', 85 witdth: 120,
86 render: (h, scope) => { 86 render: (h, scope) => {
87 return ( 87 return (
88 <el-tooltip effect="dark" content={scope.row.qlrzjhm} placement="top" popper-class="tooltip-width "> 88 <el-tooltip effect="dark" content={scope.row.qlrzjhm} placement="top" popper-class="tooltip-width ">
...@@ -94,10 +94,11 @@ class data extends filter { ...@@ -94,10 +94,11 @@ class data extends filter {
94 { 94 {
95 prop: "qlxzmc", 95 prop: "qlxzmc",
96 label: "权利性质", 96 label: "权利性质",
97 width: 100,
97 }, 98 },
98 { 99 {
99 label: "用途", 100 label: "用途",
100 width: '120', 101 width: 120,
101 render: (h, scope) => { 102 render: (h, scope) => {
102 return ( 103 return (
103 <el-tooltip effect="dark" content={scope.row.qlytmc} placement="top" popper-class="tooltip-width "> 104 <el-tooltip effect="dark" content={scope.row.qlytmc} placement="top" popper-class="tooltip-width ">
...@@ -112,7 +113,7 @@ class data extends filter { ...@@ -112,7 +113,7 @@ class data extends filter {
112 }, 113 },
113 { 114 {
114 label: "坐落", 115 label: "坐落",
115 minWidth: '150', 116 minWidth: 200,
116 render: (h, scope) => { 117 render: (h, scope) => {
117 return ( 118 return (
118 <el-tooltip effect="dark" content={scope.row.zl} placement="top" popper-class="tooltip-width "> 119 <el-tooltip effect="dark" content={scope.row.zl} placement="top" popper-class="tooltip-width ">
......