Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

@@ -1336,7 +1336,7 @@ class data extends filter {
           label: "森林类别",
         },
         {
-          prop: "zylz",
+          prop: "zysz",
           label: "主要树种",
         },
         {

 <!--
  * @Description: 房屋多幢受理信息
  * @Autor: ssq
- * @LastEditTime: 2023-08-30 15:53:18
+ * @LastEditTime: 2023-09-01 09:22:02
 -->
 <template>
   <div class="slxx">
@@ -12,7 +12,7 @@
       ref="ruleForm"
       :label-position="flag ? 'top' : ''"
       :inline="flag"
-      label-width="140px">
+      label-width="190px">
       <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
         <div class="slxx_title title-block">
           申请业务信息
@@ -168,7 +168,31 @@
               <el-input v-model="ruleForm.lq.xdm"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="16">
+          <el-col :span="8">
+            <el-form-item label="林地使用(承包)起始时间：">
+              <el-input v-model="ruleForm.lq.ldsyqssj"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="林地使用(承包)结束时间：">
+              <el-input v-model="ruleForm.lq.ldsyjssj"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10">
+          <!-- <el-col :span="8">
+            <el-form-item label="土地用途：">
+              <el-input v-model="ruleForm.lq.xdm"></el-input>
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="8">
+            <el-form-item label="林地使用 (承包)期限：">
+              <el-input v-model="ruleForm.lq.ldsyqx"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10">
+          <el-col :span="24">
             <el-form-item label="附记：">
               <el-input
                 v-model="ruleForm.lq.fj"
@@ -178,14 +202,14 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <div class="slxx_title title-block">
+        <!-- <div class="slxx_title title-block">
           土地用途
           <div class="triangle"></div>
         </div>
         <tdytTable
           :ableOperation="viewEdit"
           :tableData="ruleForm.tdytqxList"
-          @upDateTdytxxList="upDateTdytxxList" />
+          @upDateTdytxxList="upDateTdytxxList" /> -->
         <div class="slxx_title title-block">
           权利人信息
           <div class="triangle"></div>
@@ -238,7 +262,7 @@
           :disabled="viewEdit"
           :gyfs="ruleForm.sldy.gyfs" />
 
-        <div v-if="ruleForm.ywrList && ruleForm.slsq.djlx == '200'">
+        <div v-if="ruleForm.ywrList && ruleForm.sldy.djlx == '200'">
           <div class="slxx_title title-block">
             义务人信息
             <div class="triangle"></div>

 <!--
  * @Description: 房屋多幢受理信息
  * @Autor: ssq
- * @LastEditTime: 2023-08-30 14:57:59
+ * @LastEditTime: 2023-09-01 09:52:40
 -->
 <template>
   <div class="slxx">
@@ -11,7 +11,7 @@
       ref="ruleForm"
       :label-position="flag ? 'top' : ''"
       :inline="flag"
-      label-width="140px">
+      label-width="190px">
       <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
         <div class="slxx_title title-block">
           申请业务信息
@@ -167,7 +167,31 @@
               <el-input v-model="ruleForm.lq.xdm"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="16">
+          <el-col :span="8">
+            <el-form-item label="林地使用(承包)起始时间：">
+              <el-input v-model="ruleForm.lq.ldsyqssj"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="林地使用(承包)结束时间：">
+              <el-input v-model="ruleForm.lq.ldsyjssj"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10">
+          <!-- <el-col :span="8">
+            <el-form-item label="土地用途：">
+              <el-input v-model="ruleForm.lq.xdm"></el-input>
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="8">
+            <el-form-item label="林地使用 (承包)期限：">
+              <el-input v-model="ruleForm.lq.ldsyqx"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10">
+          <el-col :span="24">
             <el-form-item label="附记：">
               <el-input
                 v-model="ruleForm.lq.fj"
@@ -177,14 +201,14 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <div class="slxx_title title-block">
+        <!-- <div class="slxx_title title-block">
           土地用途
           <div class="triangle"></div>
-        </div>
-        <tdytTable
+        </div> -->
+        <!-- <tdytTable
           :ableOperation="viewEdit"
           :tableData="ruleForm.tdytqxList"
-          @upDateTdytxxList="upDateTdytxxList" />
+          @upDateTdytxxList="upDateTdytxxList" /> -->
         <div class="slxx_title title-block">
           权利人信息
           <div class="triangle"></div>
@@ -237,7 +261,7 @@
           :disabled="viewEdit"
           :gyfs="ruleForm.sldy.gyfs" />
 
-        <div v-if="ruleForm.ywrList && ruleForm.slsq.djlx == '200'">
+        <div v-if="ruleForm.ywrList && ruleForm.sldy.djlx == '200'">
           <div class="slxx_title title-block">
             义务人信息
             <div class="triangle"></div>