14451bd9 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents cb1faf8e 4d3ae4e2
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-10-23 17:17:34 4 * @LastEditTime: 2023-10-24 17:35:49
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -105,7 +105,14 @@ ...@@ -105,7 +105,14 @@
105 </el-col> 105 </el-col>
106 <el-col :span="8"> 106 <el-col :span="8">
107 <el-form-item label="权利设定方式:"> 107 <el-form-item label="权利设定方式:">
108 <el-input maxlength="25" :disabled="!viewEdit" v-model="ruleForm.zdjbxx.qlsdfsmc"></el-input> 108 <el-select v-model="ruleForm.zdjbxx.qlsdfs" :disabled="!viewEdit">
109 <el-option
110 v-for="item in dictData['A10']"
111 :key="item.dcode"
112 :label="item.dname"
113 :value="item.dcode">
114 </el-option>
115 </el-select>
109 </el-form-item> 116 </el-form-item>
110 </el-col> 117 </el-col>
111 <el-col :span="8"> 118 <el-col :span="8">
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <!-- 2 <!--
3 * @Description: 3 * @Description:
4 * @Autor: renchao 4 * @Autor: renchao
5 * @LastEditTime: 2023-10-24 17:29:28 5 * @LastEditTime: 2023-10-25 08:33:49
6 --> 6 -->
7 <template> 7 <template>
8 <!-- 受理信息 --> 8 <!-- 受理信息 -->
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
86 <el-col :span="8"> 86 <el-col :span="8">
87 <el-form-item label="土地用途:"> 87 <el-form-item label="土地用途:">
88 <treeselect 88 <treeselect
89 v-model="ruleForm.qlxx.ytmc" 89 v-model="ruleForm.zdjbxx.yt"
90 noOptionsText="暂无数据" 90 noOptionsText="暂无数据"
91 :default-expand-level="1" 91 :default-expand-level="1"
92 :disabled="!viewEdit" 92 :disabled="!viewEdit"
......