d502770e by renchao@pashanhoo.com

Merge branch 'dev'

2 parents ef99876e fc552fd6
1 <!-- 1 <!--
2 * @Description: 受理信息 2 * @Description: 受理信息
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-16 09:42:18 4 * @LastEditTime: 2023-08-16 10:14:00
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -93,14 +93,14 @@ ...@@ -93,14 +93,14 @@
93 </el-col> 93 </el-col>
94 <el-col :span="8"> 94 <el-col :span="8">
95 <el-form-item label="土地性质:"> 95 <el-form-item label="土地性质:">
96 <el-select v-model="ruleForm.fdcq2.tdxz"> 96 <treeselect
97 <el-option 97 v-model="ruleForm.fdcq2.tdxz"
98 v-for="item in dictData['A9']" 98 noOptionsText="暂无数据"
99 :key="item.dcode" 99 placeholder=""
100 :label="item.dname" 100 :normalizer="normalizer"
101 :value="item.dcode"> 101 :show-count="true"
102 </el-option> 102 :options="dictData['A9']" />
103 </el-select> 103
104 </el-form-item> 104 </el-form-item>
105 </el-col> 105 </el-col>
106 </el-row> 106 </el-row>
...@@ -159,14 +159,14 @@ ...@@ -159,14 +159,14 @@
159 <el-row :gutter="10" v-if="ruleForm.qlxx"> 159 <el-row :gutter="10" v-if="ruleForm.qlxx">
160 <el-col :span="8"> 160 <el-col :span="8">
161 <el-form-item label="房屋用途:"> 161 <el-form-item label="房屋用途:">
162 <el-select v-model="ruleForm.fdcq2.ghyt"> 162 <treeselect
163 <el-option 163 v-model="ruleForm.fdcq2.ghyt"
164 v-for="item in dictData['A17']" 164 noOptionsText=""
165 :key="item.dcode" 165 placeholder=""
166 :label="item.dname" 166 :normalizer="normalizer"
167 :value="item.dcode"> 167 :show-count="true"
168 </el-option> 168 :options="dictData['A17']" />
169 </el-select> 169
170 </el-form-item> 170 </el-form-item>
171 </el-col> 171 </el-col>
172 <el-col :span="8"> 172 <el-col :span="8">
...@@ -284,7 +284,7 @@ ...@@ -284,7 +284,7 @@
284 </el-col> 284 </el-col>
285 </el-row> 285 </el-row>
286 <el-row :gutter="10"> 286 <el-row :gutter="10">
287 <el-col :span="24"> 287 <el-col :span="24">
288 <el-form-item label="附记:"> 288 <el-form-item label="附记:">
289 <el-input v-model="ruleForm.fdcq2.fj"></el-input> 289 <el-input v-model="ruleForm.fdcq2.fj"></el-input>
290 </el-form-item> 290 </el-form-item>
...@@ -412,6 +412,17 @@ ...@@ -412,6 +412,17 @@
412 data () { 412 data () {
413 return { 413 return {
414 mjdw: "1", 414 mjdw: "1",
415 // 键名转换,方法默认是label和children进行树状渲染
416 normalizer (node) {
417 //方法
418 if (node.children == null || node.children == "null") {
419 delete node.children;
420 }
421 return {
422 id: node.dcode,
423 label: node.dname,
424 };
425 },
415 disabled: true, 426 disabled: true,
416 tdytOption: [], 427 tdytOption: [],
417 czrOptions: [], 428 czrOptions: [],
......
...@@ -82,11 +82,6 @@ ...@@ -82,11 +82,6 @@
82 </el-col> 82 </el-col>
83 </el-row> 83 </el-row>
84 <el-row :gutter="10" v-if="ruleForm.qlxx"> 84 <el-row :gutter="10" v-if="ruleForm.qlxx">
85 <!-- <el-col :span="8">
86 <el-form-item label="房屋用途:">
87 <el-input disabled v-model="ruleForm.qlxx.ytmc"></el-input>
88 </el-form-item>
89 </el-col> -->
90 <el-col :span="8"> 85 <el-col :span="8">
91 <el-form-item label="规划用途名称:"> 86 <el-form-item label="规划用途名称:">
92 <el-input disabled v-model="ruleForm.zdjbxx.ghytmc"></el-input> 87 <el-input disabled v-model="ruleForm.zdjbxx.ghytmc"></el-input>
......