Merge branch 'dev'

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2024-01-23 15:13:01
+ * @LastEditTime: 2024-01-23 15:36:15
 -->
 <template>
   <!-- 受理信息 -->
@@ -14,7 +14,7 @@
       ref="ruleForm"
       :label-position="flag ? 'top' : ''"
       :inline="flag"
-      label-width="120px">
+      label-width="140px">
       <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
         <div class="slxx_title title-block">
           申请业务信息
@@ -85,31 +85,77 @@
         </el-row>
         <el-row :gutter="10">
           <el-col :span="8">
-            <el-form-item label="权利设定方式：">
-              <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 label="地块代码：">
+              <el-input v-model="ruleForm.tdcbjyq.dkdm" :disabled="!viewEdit"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="地块名称：">
+              <el-input v-model="ruleForm.tdcbjyq.dkmc" :disabled="!viewEdit"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="承包方式：">
+              <el-input v-model="ruleForm.tdcbjyq.cbfs" :disabled="!viewEdit"></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.tdcbjyq.fbfdm" :disabled="!viewEdit"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="发包方全称：">
+              <el-input v-model="ruleForm.tdcbjyq.fbfqc" :disabled="!viewEdit"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="发包方负责人：">
+              <el-input v-model="ruleForm.tdcbjyq.fbffzr" :disabled="!viewEdit"></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.tdcbjyq.cbqssj" :disabled="!viewEdit"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="承包结束时间：">
+              <el-input v-model="ruleForm.tdcbjyq.cbjssj" :disabled="!viewEdit"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="承包期限：">
+              <el-input v-model="ruleForm.tdcbjyq.cbqx" :disabled="!viewEdit"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10">
+          <el-col :span="8">
+            <el-form-item label="承包经营权取得方式：">
+              <el-input :disabled="!viewEdit" v-model="ruleForm.tdcbjyq.cbjyqqdfs"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="16">
-            <el-form-item label="坐落：">
-              <el-input maxlength="100" :disabled="!viewEdit" v-model="ruleForm.sldy.zl"></el-input>
+            <el-form-item label="附记：">
+              <el-input maxlength="100" :disabled="!viewEdit" v-model="ruleForm.tdcbjyq.fj"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10">
+          <el-col :span="24">
+            <el-form-item label="用途：">
+              <el-input maxlength="100" :disabled="!viewEdit" v-model="ruleForm.tdcbjyq.yt"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
-        <div class="slxx_title title-block">
-          土地用途
-          <div class="triangle"></div>
-        </div>
-        <tdytTable
-          :ableOperation="viewEdit"
-          :tableData="ruleForm.tdytqxList"
-          @upDateTdytxxList="upDateTdytxxList" />
         <div class="slxx_title title-block">
           权利人信息
           <div class="triangle"></div>
@@ -189,7 +235,6 @@
   import { mapGetters } from "vuex";
   import ywmix from "@/views/ywbl/mixin/index";
   import { Init, saveData } from "@/api/workflow/tdcbjyq.js";
-  import tdytTable from "@/views/workflow/components/tdytTable";
   import qlrCommonTable from "@/views/workflow/components/qlrCommonTable";
   import ywrCommonTable from "@/views/workflow/components/ywrCommonTable";
   export default {
@@ -230,7 +275,7 @@
         this.isSave = false
       })
     },
-    components: { qlrCommonTable, tdytTable, ywrCommonTable },
+    components: { qlrCommonTable, ywrCommonTable },
     computed: {
       ...mapGetters(["dictData", "flag"]),
       // 根据流程判断表单是否为只读
@@ -272,15 +317,6 @@
     },
     methods: {
       /**
-       * @description: 更新土地用途信息
-       * @param {*} val
-       * @author: renchao
-       */
-      upDateTdytxxList (val) {
-        this.ruleForm.tdytqxList && (this.ruleForm.tdytqxList = _.cloneDeep(val));
-        this.key++;
-      },
-      /**
        * @description: 更新权利人信息
        * @param {*} val
        * @author: renchao
@@ -321,15 +357,6 @@
        */
       onSubmit () {
         let that = this;
-        let arr = this.ruleForm.tdytqxList.filter((item) => !item.yt);
-        if (arr.length > 0) {
-          this.$message({
-            showClose: true,
-            message: "土地用途不能为空",
-            type: "error",
-          });
-          return false;
-        }
         if (this.ruleForm.qlrList.length == 0) {
           this.$message({
             showClose: true,