Merge branch 'dev' into master-hnz

@@ -8,4 +8,6 @@ NODE_ENV=development
 VUE_APP_BASE_API = '/api'
 
 # 开发环境
-VUE_APP_API_BASE_URL = 'http://192.168.2.38:8027'
+#VUE_APP_API_BASE_URL = 'http://192.168.2.38:8027'
+#VUE_APP_API_BASE_URL = 'http://192.168.2.91:8027' #田浩
+VUE_APP_API_BASE_URL = 'http://172.16.56.32:8027' #黄南州

@@ -25,6 +25,16 @@ class data extends filter {
       //   }
       // },
       {
+        prop: "djlx",
+        label: "登记类型",
+        minWidth: 200,
+      },
+      {
+        prop: "bdcdyh",
+        label: "不动产单元号",
+        width: 240
+      },
+      {
         prop: 'qlr',
         label: '权利人',
         width: 190
@@ -49,16 +59,8 @@ class data extends filter {
         label: "坐落",
         minWidth: 150,
       },
-      {
-        prop: "bdcdyh",
-        label: "不动产单元号",
-        width: 240
-      },
-      {
-        prop: "djlx",
-        label: "登记类型",
-        minWidth: 200,
-      },
+     
+     
       {
         prop: "djsj",
         label: "登记时间",

@@ -46,7 +46,7 @@ class data extends filter {
       },
       {
         prop: 'ZKHYSJE',
-        label: '折扣后应收金额',
+        label: '优惠后实收金额',
         width: 190
       },
       {
@@ -63,12 +63,7 @@ class data extends filter {
         prop: "SFDW",
         label: "收费单位",
         minWidth: 200,
-      },
-      {
-        prop: "FFF",
-        label: "付费方",
-        minWidth: 130,
-      },
+      },      
       {
         prop: "BZ",
         label: "备注",

@@ -20,9 +20,9 @@ class data {
         }
       },
       {
-        prop: "UPLOADTIME",
-        label: "汇交日期",
-        width: '140',
+        prop: "CREATEDATE",
+        label: "接收时间",
+        width: '150',
       },
       {
         prop: "AREANAME",
@@ -30,7 +30,7 @@ class data {
       },
       {
         prop: "ACCESSDATE",
-        label: "日期",
+        label: "登簿日期",
         width: '140',
       },
       {