Merge branch 'dev'

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-23 17:17:34
+ * @LastEditTime: 2023-10-24 17:35:49
 -->
 <template>
   <!-- 受理信息 -->
@@ -105,7 +105,14 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="权利设定方式：">
-              <el-input maxlength="25" :disabled="!viewEdit" 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>
           <el-col :span="8">

@@ -2,7 +2,7 @@
 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-24 17:29:28
+ * @LastEditTime: 2023-10-25 08:33:49
 -->
 <template>
   <!-- 受理信息 -->
@@ -86,7 +86,7 @@
           <el-col :span="8">
             <el-form-item label="土地用途：">
               <treeselect
-                v-model="ruleForm.qlxx.ytmc"
+                v-model="ruleForm.zdjbxx.yt"
                 noOptionsText="暂无数据"
                 :default-expand-level="1"
                 :disabled="!viewEdit"