d64677ad by renchao@pashanhoo.com

Merge branch 'dev' into master-hnz

2 parents f784c9c5 ad769bd9
...@@ -8,4 +8,6 @@ NODE_ENV=development ...@@ -8,4 +8,6 @@ NODE_ENV=development
8 VUE_APP_BASE_API = '/api' 8 VUE_APP_BASE_API = '/api'
9 9
10 # 开发环境 10 # 开发环境
11 VUE_APP_API_BASE_URL = 'http://192.168.2.38:8027' 11 #VUE_APP_API_BASE_URL = 'http://192.168.2.38:8027'
12 #VUE_APP_API_BASE_URL = 'http://192.168.2.91:8027' #田浩
13 VUE_APP_API_BASE_URL = 'http://172.16.56.32:8027' #黄南州
......
...@@ -25,6 +25,16 @@ class data extends filter { ...@@ -25,6 +25,16 @@ class data extends filter {
25 // } 25 // }
26 // }, 26 // },
27 { 27 {
28 prop: "djlx",
29 label: "登记类型",
30 minWidth: 200,
31 },
32 {
33 prop: "bdcdyh",
34 label: "不动产单元号",
35 width: 240
36 },
37 {
28 prop: 'qlr', 38 prop: 'qlr',
29 label: '权利人', 39 label: '权利人',
30 width: 190 40 width: 190
...@@ -49,16 +59,8 @@ class data extends filter { ...@@ -49,16 +59,8 @@ class data extends filter {
49 label: "坐落", 59 label: "坐落",
50 minWidth: 150, 60 minWidth: 150,
51 }, 61 },
52 { 62
53 prop: "bdcdyh", 63
54 label: "不动产单元号",
55 width: 240
56 },
57 {
58 prop: "djlx",
59 label: "登记类型",
60 minWidth: 200,
61 },
62 { 64 {
63 prop: "djsj", 65 prop: "djsj",
64 label: "登记时间", 66 label: "登记时间",
......
...@@ -46,7 +46,7 @@ class data extends filter { ...@@ -46,7 +46,7 @@ class data extends filter {
46 }, 46 },
47 { 47 {
48 prop: 'ZKHYSJE', 48 prop: 'ZKHYSJE',
49 label: '折扣后应收金额', 49 label: '优惠后实收金额',
50 width: 190 50 width: 190
51 }, 51 },
52 { 52 {
...@@ -63,12 +63,7 @@ class data extends filter { ...@@ -63,12 +63,7 @@ class data extends filter {
63 prop: "SFDW", 63 prop: "SFDW",
64 label: "收费单位", 64 label: "收费单位",
65 minWidth: 200, 65 minWidth: 200,
66 }, 66 },
67 {
68 prop: "FFF",
69 label: "付费方",
70 minWidth: 130,
71 },
72 { 67 {
73 prop: "BZ", 68 prop: "BZ",
74 label: "备注", 69 label: "备注",
......
...@@ -20,9 +20,9 @@ class data { ...@@ -20,9 +20,9 @@ class data {
20 } 20 }
21 }, 21 },
22 { 22 {
23 prop: "UPLOADTIME", 23 prop: "CREATEDATE",
24 label: "汇交日期", 24 label: "接收时间",
25 width: '140', 25 width: '150',
26 }, 26 },
27 { 27 {
28 prop: "AREANAME", 28 prop: "AREANAME",
...@@ -30,7 +30,7 @@ class data { ...@@ -30,7 +30,7 @@ class data {
30 }, 30 },
31 { 31 {
32 prop: "ACCESSDATE", 32 prop: "ACCESSDATE",
33 label: "日期", 33 label: "登簿日期",
34 width: '140', 34 width: '140',
35 }, 35 },
36 { 36 {
......