Merge branch 'dev'

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-24 16:53:30
+ * @LastEditTime: 2023-10-24 17:15:25
 -->
 <template>
   <div class="clmlmx-box">
@@ -19,7 +19,7 @@
   import Sortable from 'sortablejs'
   import store from '@/store/index.js'
   import { ywPopupCacel } from "@/utils/popup.js";
-  import { InitClml, updateClml } from "@/api/clxx.js";
+  import { updateClml } from "@/api/clxx.js";
   export default {
     props: {
       formData: {
@@ -202,31 +202,6 @@
         })
       },
       /**
-       * @description: 材料目录明细初始化
-       * @author: renchao
-       */
-      clmlInitList () {
-        return new Promise(resolve => {
-          this.unitData = this.$parent.unitData;
-          var formdata = new FormData();
-          formdata.append("bsmSlsq", Vue.prototype.$currentRoute.query.bsmSlsq);
-          formdata.append("bsmSldy", this.formData.bsmRepair);
-          formdata.append("clfl", 3);
-          InitClml(formdata).then((res) => {
-            if (res.code == 200) {
-              resolve(res.code)
-              if (res.result && res.result.length > 0) {
-                this.tableData = res.result;
-              } else {
-                this.tableData = []
-              }
-            } else {
-              this.$message.error(res.message)
-            }
-          })
-        })
-      },
-      /**
        * @description: 材料目录删除
        * @param {*} index
        * @param {*} row

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-24 16:55:26
+ * @LastEditTime: 2023-10-24 17:17:46
 -->
 <template>
   <div class="clxx">
@@ -297,14 +297,12 @@
       },
       //查看明细
       async viewDetail () {
-        let res = await this.clmlInitList();
-        if (res == 200) {
-          store.dispatch("user/reWorkFresh", false);
-          ywPopupDialog("申请材料目录", "djbworkflow/components/clxx/dialog/clxxDetailDialog", {
-            data: this.tableData,
-            ableOperation: this.$parent.ableOperation
-          }, "60%", true, false)
-        }
+        await this.clmlInitList();
+        store.dispatch("user/reWorkFresh", false);
+        ywPopupDialog("申请材料目录", "djbworkflow/components/clxx/dialog/clxxDetailDialog", {
+          data: this.tableData,
+          ableOperation: this.$parent.ableOperation
+        }, "60%", true, false)
       },
       //设置tableData
       setTableData (tableData) {

@@ -305,23 +305,21 @@
       },
       //查看明细
       async viewDetail () {
-        let res = await this.clmlInitList();
-        if (res == 200) {
-          this.$store.dispatch("user/reWorkFresh", false);
-          this.$popupDialog(
-            "申请材料目录",
-            "workflow/components/dialog/clxxDetailDialog",
-            {
-              data: this.tableData,
-              bsmSldy: this.$parent.currentSelectProps.bsmSldy,
-              unitData: this.$parent.unitData,
-              ableOperation: this.$parent.ableOperation,
-              bsmRepair: this.$parent.bsmRepair
-            },
-            "60%",
-            true
-          )
-        }
+        await this.clmlInitList();
+        this.$store.dispatch("user/reWorkFresh", false);
+        this.$popupDialog(
+          "申请材料目录",
+          "workflow/components/dialog/clxxDetailDialog",
+          {
+            data: this.tableData,
+            bsmSldy: this.$parent.currentSelectProps.bsmSldy,
+            unitData: this.$parent.unitData,
+            ableOperation: this.$parent.ableOperation,
+            bsmRepair: this.$parent.bsmRepair
+          },
+          "60%",
+          true
+        )
       },
       //设置tableData
       setTableData (tableData) {

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-24 16:08:59
+ * @LastEditTime: 2023-10-24 17:16:18
 -->
 <template>
   <div class="clmlmx-box">
@@ -18,7 +18,7 @@
   import Vue from 'vue'
   import Sortable from 'sortablejs'
   import store from '@/store/index.js'
-  import { InitClml, updateClml } from "@/api/clxx.js";
+  import { updateClml } from "@/api/clxx.js";
   export default {
     props: {
       formData: {
@@ -197,30 +197,6 @@
         })
       },
       /**
-       * @description: 材料目录明细初始化
-       * @author: renchao
-       */
-      clmlInitList () {
-        return new Promise(resolve => {
-          this.unitData = this.$parent.unitData;
-          var formdata = new FormData();
-          formdata.append("bsmSlsq", Vue.prototype.$currentRoute.query.bsmSlsq);
-          formdata.append("bsmSldy", this.formData.unitData[0]?.bsmSldy);
-          InitClml(formdata).then((res) => {
-            if (res.code == 200) {
-              resolve(res.code)
-              if (res.result && res.result.length > 0) {
-                this.tableData = res.result;
-              } else {
-                this.tableData = []
-              }
-            } else {
-              this.$message.error(res.message)
-            }
-          })
-        })
-      },
-      /**
        * @description: 材料目录删除
        * @param {*} index
        * @param {*} row

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-24 16:13:19
+ * @LastEditTime: 2023-10-24 17:18:02
 -->
 <template>
   <div class="clxx">
@@ -288,14 +288,12 @@
       },
       //查看明细
       async viewDetail () {
-        let res = await this.clmlInitList();
-        if (res == 200) {
-          store.dispatch("user/reWorkFresh", false);
-          ywPopupDialog("申请材料目录", "xxba/components/clxx/dialog/clxxDetailDialog", {
-            data: this.tableData,
-            bsmCompany: this.formData.bsmCompany
-          }, "60%", true, false)
-        }
+        await this.clmlInitList();
+        store.dispatch("user/reWorkFresh", false);
+        ywPopupDialog("申请材料目录", "xxba/components/clxx/dialog/clxxDetailDialog", {
+          data: this.tableData,
+          bsmCompany: this.formData.bsmCompany
+        }, "60%", true, false)
       },
       //设置tableData
       setTableData (tableData) {

@@ -2,7 +2,7 @@
 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-10 14:24:08
+ * @LastEditTime: 2023-10-24 17:29:28
 -->
 <template>
   <!-- 受理信息 -->
@@ -85,7 +85,15 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="土地用途：">
-              <el-input :disabled="!viewEdit" v-model="ruleForm.qlxx.ytmc"></el-input>
+              <treeselect
+                v-model="ruleForm.qlxx.ytmc"
+                noOptionsText="暂无数据"
+                :default-expand-level="1"
+                :disabled="!viewEdit"
+                placeholder=""
+                :normalizer="normalizer"
+                :show-count="true"
+                :options="dictData['tdyt']" />
             </el-form-item>
           </el-col>
           <el-col :span="8">