Merge branch 'dev'

@@ -54,7 +54,9 @@ service.interceptors.response.use(
          */
          */
         if (response.status == 200) {
         if (response.status == 200) {
             return response.data;
             return response.data;
-        } else {
+        }else if (response.status == 2002){
+            Message.error(response.message);
+        }else {
             handleErrorData(response.data);
             handleErrorData(response.data);
         }
         }
         return response;
         return response;

@@ -24,6 +24,116 @@ class data extends filter {
           label: "历史",
           label: "历史",
         },
         },
       ],
       ],
+      TDSYQ: [
+        {
+          prop: "qszt",
+          label: "权属状态",
+        },
+        {
+          prop: "sjlx",
+          label: "数据类型",
+        },
+        {
+          prop: "qllxmc",
+          label: "权利类型",
+        },
+        {
+          prop: "djlxmc",
+          label: "登记类型",
+        },
+        {
+          prop: "ssywh",
+          label: "上手业务号",
+        },
+        {
+          prop: "dah",
+          label: "档案号",
+        },
+        {
+          prop: "ywh",
+          label: "业务号",
+        },
+        {
+          prop: "bdcdyh",
+          label: "不动产单元号",
+        },
+        {
+          prop: "zl",
+          label: "坐落",
+        },
+        {
+          prop: "gyqk",
+          label: "共有情况",
+        },
+        {
+          prop: "qlrlx",
+          label: "权利人类型",
+        },
+        {
+          prop: "qlrmc",
+          label: "权利人",
+        },
+        {
+          prop: "qlrzjzl",
+          label: "证件种类",
+        },
+        {
+          prop: "qlrzjhm",
+          label: "证件号",
+        },       
+        {
+          prop: "ytmc",
+          label: "土地用途",
+        },
+        {
+          prop: "mjdw",
+          label: "面积单位",
+        },
+        {
+          prop: "gdmj",
+          label: "耕地面积",
+        },
+        {
+          prop: "ldmj",
+          label: "林地面积",
+        },
+        {
+          prop: "cdmj",
+          label: "草地面积",
+        },
+        {
+          prop: "qtnydmj",
+          label: "其他农用地面积",
+        },
+        {
+          prop: "jsydmj",
+          label: "建设用地面积",
+        },
+        {
+          prop: "wlydmj",
+          label: "未利用地面积",
+        },
+        {
+          prop: "djyy",
+          label: "登记原因",
+        },
+        {
+          prop: "bdcqzh",
+          label: "不动产权证号",
+        },
+        {
+          prop: "djsj",
+          label: "登记时间",
+        },
+        {
+          prop: "dbr",
+          label: "登簿人",
+        },
+        {
+          prop: "fj",
+          label: "附记",
+        },
+      ],
       JSYDSYQ: [
       JSYDSYQ: [
         {
         {
           prop: "qszt",
           prop: "qszt",

@@ -78,7 +78,7 @@
         //空列值个数
         //空列值个数
         emptycolNum: datas.columns().emptycolNum,
         emptycolNum: datas.columns().emptycolNum,
         //列名称对象
         //列名称对象
-        columns: datas.columns().JSYDSYQ,
+        columns: datas.columns().TDSYQ,
       };
       };
     },
     },
     created () {
     created () {

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-08-02 09:53:05
+ * @LastEditTime: 2023-08-15 09:43:46
 -->
 -->
 <template>
 <template>
   <div class="clmlmx-box">
   <div class="clmlmx-box">
-    <div class="title">申请材料目录</div>
     <lb-table :column="column" :key="key" :heightNumSetting="true" :calcHeight="600" :pagination="false" :data="tableData">
     <lb-table :column="column" :key="key" :heightNumSetting="true" :calcHeight="600" :pagination="false" :data="tableData">
     </lb-table>
     </lb-table>
     <div class="text-center">
     <div class="text-center">
@@ -61,7 +60,7 @@
             label: "材料名称",
             label: "材料名称",
             render: (h, scope) => {
             render: (h, scope) => {
               return (
               return (
-                this.formData.ableOperation ?
+                (this.formData.ableOperation && scope.row.isrequired != '1') ?
                   <el-input value={scope.row.sjmc} onInput={(val) => { scope.row.sjmc = val }}></el-input> : <span>{scope.row.sjmc}</span>
                   <el-input value={scope.row.sjmc} onInput={(val) => { scope.row.sjmc = val }}></el-input> : <span>{scope.row.sjmc}</span>
               )
               )
             }
             }
@@ -209,14 +208,14 @@
         return new Promise(resolve => {
         return new Promise(resolve => {
           this.unitData = this.$parent.unitData;
           this.unitData = this.$parent.unitData;
           var formdata = new FormData();
           var formdata = new FormData();
-        formdata.append("bsmSlsq", Vue.prototype.$currentRoute.query.bsmSlsq);
-        if (Vue.prototype.$currentRoute.query.sqywbm == "DJBBL") {
-          formdata.append("bsmSldy", this.formData.bsmRepair);
-          formdata.append("clfl", 3);
-        } else {
-             formdata.append("bsmSldy", this.formData.unitData[0]?.bsmSldy);
-          formdata.append("clfl", 2);
-        }
+          formdata.append("bsmSlsq", Vue.prototype.$currentRoute.query.bsmSlsq);
+          if (Vue.prototype.$currentRoute.query.sqywbm == "DJBBL") {
+            formdata.append("bsmSldy", this.formData.bsmRepair);
+            formdata.append("clfl", 3);
+          } else {
+            formdata.append("bsmSldy", this.formData.unitData[0]?.bsmSldy);
+            formdata.append("clfl", 2);
+          }
           InitClml(formdata).then((res) => {
           InitClml(formdata).then((res) => {
             if (res.code == 200) {
             if (res.code == 200) {
               resolve(res.code)
               resolve(res.code)

@@ -211,17 +211,19 @@
        */
        */
       getNextNode (bsmSqyw) {
       getNextNode (bsmSqyw) {
         getNextNode(bsmSqyw).then(res => {
         getNextNode(bsmSqyw).then(res => {
-          if (res.result.djqx) {
-            this.djqxList = res.result.djqx;
-            this.djqxList.forEach(item => {
-              this.$set(item, 'selected', false);
-            });
-          }
-          if (res.result.djlx) {
-            this.djlxList = res.result.djlx;
-            this.djlxList.forEach(item => {
-              this.$set(item, 'selected', false);
-            });
+          if (res.result) {
+            if (res.result.djqx) {
+              this.djqxList = res.result.djqx;
+              this.djqxList.forEach(item => {
+                this.$set(item, 'selected', false);
+              });
+            }
+            if (res.result.djlx) {
+              this.djlxList = res.result.djlx;
+              this.djlxList.forEach(item => {
+                this.$set(item, 'selected', false);
+              });
+            }
           }
           }
         })
         })
       },
       },