Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into 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 () {

@@ -211,6 +211,7 @@
        */
        */
       getNextNode (bsmSqyw) {
       getNextNode (bsmSqyw) {
         getNextNode(bsmSqyw).then(res => {
         getNextNode(bsmSqyw).then(res => {
+          if (res.result) {
             if (res.result.djqx) {
             if (res.result.djqx) {
               this.djqxList = res.result.djqx;
               this.djqxList = res.result.djqx;
               this.djqxList.forEach(item => {
               this.djqxList.forEach(item => {
@@ -223,6 +224,7 @@
                 this.$set(item, 'selected', false);
                 this.$set(item, 'selected', false);
               });
               });
             }
             }
+          }
         })
         })
       },
       },