dengzhiguo 6 years ago
parent
commit
cd2fedcb47

+ 2 - 1
js/component/manageCenter/customer/NEW/intentionCustomer/intentionCustomer.jsx

@@ -42,6 +42,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 				} else {
 					for(let i = 0; i < data.data.list.length; i++) {
 						let thisdata = data.data.list[i];
+						let diqu=(thisdata.province==null?"":thisdata.province)+(thisdata.city==null?"":"-"+thisdata.city)+(thisdata.area==null?"":"-"+thisdata.area);
 						theArr.push({
 							key: i,
 							id: thisdata.uid,
@@ -55,7 +56,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 							transferTime:thisdata.transferTime&&thisdata.transferTime.split(' ')[0],
 							surplusFollowTime:thisdata.surplusFollowTime&&thisdata.surplusFollowTime.split(' ')[0],
 							surplusSignTime:thisdata.surplusSignTime&&thisdata.surplusSignTime.split(' ')[0],
-							locationProvince: thisdata.province ? thisdata.province + '-' + thisdata.city + '-' + thisdata.area : '--'
+							locationProvince: diqu,
 						});
 					};
 					this.state.pagination.current = data.data.pageNo;

+ 2 - 1
js/component/manageCenter/customer/NEW/query/queryCutomer.jsx

@@ -36,6 +36,7 @@ const QueryCustomer = React.createClass({
 				} else {
 					for(let i = 0; i < data.data.list.length; i++) {
 						let thisdata = data.data.list[i];
+						let diqu=(thisdata.province==null?"":thisdata.province)+(thisdata.city==null?"":"-"+thisdata.city)+(thisdata.area==null?"":"-"+thisdata.area);
 						theArr.push({
 							key: i,
 							id: thisdata.uid,
@@ -43,7 +44,7 @@ const QueryCustomer = React.createClass({
 							adminName: thisdata.adminName,
 							informationMaintainer:thisdata.informationMaintainer,
 							createTime: thisdata.createTime&&thisdata.createTime.split(' ')[0],
-							locationProvince: thisdata.province ? thisdata.province + '-' + thisdata.city + '-' + thisdata.area : '--'
+							locationProvince: diqu
 						});
 					};
 					this.state.pagination.current = data.data.pageNo;

+ 2 - 1
js/component/manageCenter/customer/NEW/signCustomer/signCustomer.jsx

@@ -42,6 +42,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 				} else {
 					for(let i = 0; i < data.data.list.length; i++) {
 						let thisdata = data.data.list[i];
+						let diqu=(thisdata.province==null?"":thisdata.province)+(thisdata.city==null?"":"-"+thisdata.city)+(thisdata.area==null?"":"-"+thisdata.area);
 						theArr.push({
 							key: i,
 							id: thisdata.uid,
@@ -54,7 +55,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 							transferTime:thisdata.transferTime&&thisdata.transferTime.split(' ')[0],
 							lastSignTime:thisdata.lastSignTime&&thisdata.lastSignTime.split(' ')[0],
 							lastFollowTime:thisdata.lastFollowTime&&thisdata.lastFollowTime.split(' ')[0],
-							locationProvince: thisdata.province ? thisdata.province + '-' + thisdata.city+ '-' + thisdata.area : '--'
+							locationProvince: diqu,
 						});
 					};
 					this.state.pagination.current = data.data.pageNo;