页面优化

sa-view/tb-transport-settle/tb-transport-order-info.html

@@ -79,15 +79,22 @@
 				</el-row>
 				<el-row :gutter="50">
 					<el-col :span="12">
+						<sa-info name="装货时间" br>{{m.realLoadingTime}}</sa-info>
+					</el-col>
+					<el-col :span="12">
 						<sa-info name="发车时间" br>{{m.realDepartureTime}}</sa-info>
 					</el-col>
+				</el-row>
+				<el-row :gutter="50">
 					<el-col :span="12">
 						<sa-info name="运达时间" br>{{m.realArrivalTime}}</sa-info>
 					</el-col>
+					<el-col :span="12">
+						<sa-info name="创建时间" br>{{m.createdAt}}</sa-info>
+					</el-col>
 				</el-row>
 
 
-
 				<el-divider content-position="center">货运结算</el-divider>
 				<el-row :gutter="50">
 					<el-col :span="12">

sa-view/tb-transport-settle/tb-transport-order-settle.html

@@ -64,9 +64,10 @@
 					<sa-td name="货主实付" prop="receivedAmount" ></sa-td>
 					<sa-td name="司机运费" prop="freightAmount" ></sa-td>
 					<sa-td name="平台服务费" prop="serviceFee" ></sa-td>
-					<sa-td name="发车时间" prop="realDepartureTime" width="150px" type="datetime"></sa-td>
+					<sa-td name="发车时间" prop="realDepartureTime" type="datetime" width="150px"></sa-td>
 					<sa-td name="运达时间" prop="realArrivalTime" type="datetime" width="150px" ></sa-td>
 					<sa-td name="结算时间" prop="settleTime" type="datetime" width="150px" ></sa-td>
+					<sa-td name="创建时间" prop="createdAt" type="datetime" width="150px" ></sa-td>
 					<el-table-column label="操作" fixed="right"  width="80px">
 						<template slot-scope="s">
 							<el-button class="c-btn" type="success" icon="el-icon-view" @click="get(s.row)">详情</el-button>

sa-view/tb-wechat-pay/tb-wechat-pay-list.html

@@ -137,12 +137,11 @@
 					},
 					syn: function(data) {
 						sa.ajax('/transport-server/TbWechatPay/syn?tradeNo=' + data.tradeNo, function(res) {
-							this.dataList == data;
 							//sa.arrayDelete(this.dataList, data);
 							sa.ok('同步刷新成功');
-							sa.f5TableHeight();		// 刷新表格高度
+							//sa.f5TableHeight();		// 刷新表格高度
+							this.f5();
 						}.bind(this))
-
 					},
 				},
 				created: function() {

sa-view/tb-wechat-transfer/tb-wechat-transfer-list.html

@@ -38,13 +38,14 @@
 					<sa-td name="用户姓名" prop="userName" ></sa-td>
 					<sa-td name="转账金额(分)" prop="transferAmount" ></sa-td>
 					<sa-td name="微信业务单号" prop="transferBillNo" width="260px"></sa-td>
-					<sa-td name="状态" prop="state" ></sa-td>
-					<sa-td name="转账状态" prop="isTransfer" ></sa-td>
+					<sa-td name="状态标识" prop="state" ></sa-td>
+					<sa-td name="是否成功" prop="isTransfer" type="enum" :jv="{0: '--', 1: '转账成功'}"></sa-td>
 					<sa-td name="创建时间" prop="createTime" width="150px"></sa-td>
 					<el-table-column label="操作" fixed="right">
 						<template slot-scope="s">
 							<el-button class="c-btn" type="success" icon="el-icon-view" @click="get(s.row)">查看</el-button>
 							<el-button class="c-btn" type="primary" icon="el-icon-edit" @click="syn(s.row)">同步</el-button>
+							<el-button class="c-btn" type="primary" v-if="s.row.state=='WAIT_USER_CONFIRM' || s.row.state=='PROCESSING' || s.row.state=='TRANSFERING' "  icon="el-icon-cancel" @click="cancel(s.row)">撤销</el-button>
 						</template>
 					</el-table-column>
 				</el-table>
@@ -99,12 +100,20 @@
 					},
 					syn: function(data) {
 						sa.ajax('/transport-server/TbWechatTransfer/syn?tradeNo=' + data.outTradeNo, function(res) {
-							this.dataList == data;//sa.arrayDelete(this.dataList, data);
+							//sa.arrayDelete(this.dataList, data);
 							sa.ok('同步刷新成功');
-							sa.f5TableHeight();		// 刷新表格高度
+							//sa.f5TableHeight();		// 刷新表格高度
+							this.f5();
 						}.bind(this))
 
 					},
+					cancel: function(data) {
+						sa.ajax('/transport-server/TbWechatTransfer/cancel?tradeNo=' + data.outTradeNo, function(res) {
+							//sa.arrayDelete(this.dataList, data);
+							sa.ok('取消操作成功');
+							sa.f5TableHeight();		// 刷新表格高度
+						}.bind(this))
+					},
 				},
 				created: function() {
 					this.f5();