页面优化

sa-view/tb-freight-template/tb-freight-template-list.html

@@ -19,8 +19,8 @@
 			<div class="c-panel">
 				<!-- ------------- 检索参数 ------------- -->
 
-				<el-form ref="form" :model='p' @submit.native.prevent>					
-					<sa-item type="text" name="车型" v-model="p.vechileTypeId" width="40" br>
+				<el-form ref="form" :model='p' @submit.native.prevent>
+					<sa-item type="text" name="车型" v-model="p.vechileTypeId" br>
 						<el-select  v-model="p.vechileTypeId" placeholder="请选择" filterable size="mini">
 							<el-option v-for="(item,index) in catList" :key="item.id" :label="item.dictName" :value="item.id"> </el-option>
 						</el-select>
@@ -32,13 +32,13 @@
 				<div class="fast-btn">
 					<el-button v-if="sa.isAuth('tb-freight-template-add')" size="mini" type="primary" @click="add()">新增</el-button>
 					<!--<el-button size="mini" type="success" @click="getBySelect()">查看</el-button>-->
-					
+
 				</div>
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 
 					<sa-td name="车型" prop="vechileTypeName" ></sa-td>
-					<sa-td name="每公里单价" prop="unitPrice" ></sa-td>					
+					<sa-td name="每公里单价" prop="unitPrice" ></sa-td>
 					<sa-td name="备注" prop="remark" ></sa-td>
 					<sa-td name="更新人" prop="updateBy" ></sa-td>
 					<sa-td name="更新时间" prop="updateTime" ></sa-td>
@@ -57,23 +57,23 @@
 		<script>
 			var app = new Vue({
 				components: {
-					"sa-item": httpVueLoader('../../sa-frame/com/sa-item.vue'),  
-					"sa-td": httpVueLoader('../../sa-frame/com/sa-td.vue'),		
+					"sa-item": httpVueLoader('../../sa-frame/com/sa-item.vue'),
+					"sa-td": httpVueLoader('../../sa-frame/com/sa-td.vue'),
 				},
 				el: '.vue-box',
 				data: {
-					p: { // 查询参数  
-						id: '',		// ID 
-						vechileTypeId: '',		// 字典 ID 
-						vechileTypeName: '',		// 车型名称 
-						unitPrice: '',		// 每公里单价 
-						remark: '',		// 备注 
-						pageNo: 1,		// 当前页 
-						pageSize: 10,	// 页大小 
-						sortType: 0		// 排序方式 
+					p: { // 查询参数
+						id: '',		// ID
+						vechileTypeId: '',		// 字典 ID
+						vechileTypeName: '',		// 车型名称
+						unitPrice: '',		// 每公里单价
+						remark: '',		// 备注
+						pageNo: 1,		// 当前页
+						pageSize: 10,	// 页大小
+						sortType: 0		// 排序方式
 					},
 					dataCount: 0,
-					dataList: [], // 数据集合 
+					dataList: [], // 数据集合
 					catList:[],
 				},
 				methods: {
@@ -84,7 +84,7 @@
 							pageSize: 100,
 							pageNo: 1
 						}, function(resp) {
-							let list=resp.data; 							
+							let list=resp.data;
 							this.catList = list;
 						}.bind(this));
 					},
@@ -92,8 +92,8 @@
 					f5: function() {
 						sa.ajax('/transport-server/TbFreightTemplate/getList', sa.removeNull(this.p), function(res) {
 							this.dataList = res.data; // 数据
-							this.dataCount = res.dataCount; // 数据总数 
-							sa.f5TableHeight();		// 刷新表格高度 
+							this.dataCount = res.dataCount; // 数据总数
+							sa.f5TableHeight();		// 刷新表格高度
 						}.bind(this));
 					},
 					// 查看
@@ -122,24 +122,24 @@
 							sa.ajax('/transport-server/TbFreightTemplate/delete?id=' + data.id, function(res) {
 								sa.arrayDelete(this.dataList, data);
 								sa.ok('删除成功');
-								sa.f5TableHeight();		// 刷新表格高度 
+								sa.f5TableHeight();		// 刷新表格高度
 							}.bind(this))
 						}.bind(this));
 					},
 					// 批量删除
 					deleteByIds: function() {
-						// 获取选中元素的id列表 
+						// 获取选中元素的id列表
 						let selection = this.$refs['data-table'].selection;
 						let ids = sa.getArrayField(selection, 'id');
 						if(selection.length == 0) {
 							return sa.msg('请至少选择一条数据')
 						}
-						// 提交删除 
+						// 提交删除
 						sa.confirm('此操作不可撤销，是否批量删除选中数据？', function() {
 							sa.ajax('/transport-server/TbFreightTemplate/deleteByIds', {ids: ids.join(',')}, function(res) {
 								sa.arrayDelete(this.dataList, selection);
 								sa.ok('删除成功');
-								sa.f5TableHeight();		// 刷新表格高度 
+								sa.f5TableHeight();		// 刷新表格高度
 							}.bind(this))
 						}.bind(this));
 					},

sa-view/tb-transport-demand/tb-transport-demand-info.html

@@ -51,8 +51,15 @@
 							<tr>
 								<th>需求单号</th>
 								<td>{{m.demandId}}</td>
-								<th>下单时间</th>
-								<td>{{m.createdAt}}</td>
+								<th>当前状态</th>
+								<td>
+									<b v-if="m.status == 0">未发布</b>
+									<b v-if="m.status == 1">已发布待接单</b>
+									<b v-if="m.status == 2">已抢单，待确认</b>
+									<b v-if="m.status == 3">已接单，待支付</b>
+									<b v-if="m.status == 4">已完成</b>
+									<b v-if="m.status == 7">已取消</b>
+								</td>
 							</tr>
 							<tr>
 								<th>货主名称</th>
@@ -97,33 +104,27 @@
 								<td>{{m.loadCapacity}} 吨</td>
 							</tr>
 							<tr>
-								<th>装货时间</th>
-								<td>{{m.loadingTime}}</td>
-								<th>发车时间</th>
+								<th>要求发车时间</th>
 								<td>{{m.departureTime}}</td>
-							</tr>
-							<tr>
-								<th>运达时间</th>
-								<td>{{m.arrivalTime}}</td>
-								<th>运费数额</th>
+								<th>运费</th>
 								<td>{{m.freightAmount}} 元</td>
 							</tr>
 							<tr>
+								<th>要求装货时间</th>
+								<td>{{m.loadingTime}}</td>
 								<th>服务费</th>
 								<td>{{m.serviceFee}} 元</td>
+							</tr>
+							<tr>
+								<th>要求运达时间</th>
+								<td>{{m.arrivalTime}}</td>
 								<th>订单金额</th>
 								<td>{{m.amount}} 元</td>
 							</tr>
 							<tr>
-								<th>当前状态</th>
-								<td>
-									<b v-if="m.status == 0">未发布</b>
-									<b v-if="m.status == 1">已发布待接单</b>
-									<b v-if="m.status == 2">已抢单，待确认</b>
-									<b v-if="m.status == 3">已接单，待支付</b>
-									<b v-if="m.status == 4">已完成</b>
-									<b v-if="m.status == 7">已取消</b>
-								</td>
+
+								<th>创建时间</th>
+								<td>{{m.createdAt}}</td>
 								<th>更新时间</th>
 								<td>{{m.updatedAt}}</td>
 							</tr>
@@ -158,7 +159,7 @@
 					}.bind(this))
 				}
 			})
-			
+
 		</script>
 	</body>
 </html>

sa-view/tb-transport-demand/tb-transport-demand-list.html

@@ -52,7 +52,7 @@
 							<el-option label="锁单中待支付" value="3"></el-option>
 							<el-option label="已完成" value="4"></el-option>
 							<el-option label="已取消" value="7"></el-option>
-						</el-select> 						
+						</el-select>
 					</sa-item>-->
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 					<el-button size="mini" type="info" @click="sa.f5()">重置</el-button>
@@ -66,23 +66,25 @@
 					<!--<sa-td type="selection"></sa-td>-->
 					<sa-td name="需求单号" prop="demandId" width="150px"></sa-td>
 					<sa-td name="货主" prop="shipperName" width="200px"></sa-td>
-					<sa-td name="商品名称" prop="itemName" width="260px" align="left"></sa-td>
+					<sa-td name="商品名称" prop="itemName" width="260px" ></sa-td>
 					<!--<sa-td name="包装方式" prop="packingMethod" ></sa-td>
 					<sa-td name="商品数量" prop="quantity" ></sa-td>
 					<sa-td name="商品重量" prop="weight" ></sa-td>
 					<sa-td name="商品容积" prop="volume" ></sa-td>-->
-					<sa-td name="起运地" prop="originAddress" align="left" width="320px"></sa-td>
-					<sa-td name="目的地" prop="destAddress" align="left" width="320px"> </sa-td>
+					<sa-td name="起运地" prop="originAddress" width="320px"></sa-td>
+					<sa-td name="目的地" prop="destAddress" width="320px"> </sa-td>
 					<!--<sa-td name="起运地联系人" prop="originContact" width="140px" ></sa-td>
 					<sa-td name="目的地联系人" prop="destinationContact" width="140px"></sa-td>
 					<sa-td name="车辆类型" prop="vehicleType" ></sa-td>
 					<sa-td name="车辆轴数" prop="axleNumber" ></sa-td>
 					<sa-td name="载重上限" prop="loadCapacity" ></sa-td>-->
-					<sa-td name="要求装货时间" prop="loadingTime" type="datetime" width="150px"></sa-td>
-					<!--<sa-td name="要求发车时间" prop="departureTime" type="date" width="140px"></sa-td>-->
-					<sa-td name="要求运达时间" prop="arrivalTime" type="datetime" width="150px"></sa-td>
-					<sa-td name="运费(元)" prop="freightAmount"  width="160px"></sa-td>
+					<sa-td name="运费(元)" prop="freightAmount"  width="120px"></sa-td>
+					<sa-td name="服务费(元)" prop="serviceFee"  width="120px"></sa-td>
+					<sa-td name="订单金额(元)" prop="amount"  width="120px"></sa-td>
 					<sa-td name="状态" prop="status" type="enum" :jv="{0: '暂存', 1: '待接单', 2: '待确认', 3: '待支付', 4:'已完成', 7:'已取消', 9:'已删除'}"  width="120px"></sa-td>
+					<!--<sa-td name="要求装货时间" prop="loadingTime" type="datetime" width="150px"></sa-td>-->
+					<!--<sa-td name="要求发车时间" prop="departureTime" type="date" width="140px"></sa-td>-->
+					<!--<sa-td name="要求运达时间" prop="arrivalTime" type="datetime" width="150px"></sa-td>-->
 					<sa-td name="创建时间" prop="createdAt" type="datetime" width="150px"></sa-td>
 					<!--<sa-td name="更新时间" prop="updatedAt" ></sa-td>-->
 					<el-table-column label="操作" fixed="right"  width="180px">
@@ -102,34 +104,34 @@
 		<script>
 			var app = new Vue({
 				components: {
-					"sa-item": httpVueLoader('../../sa-frame/com/sa-item.vue'),  
-					"sa-td": httpVueLoader('../../sa-frame/com/sa-td.vue'),		
+					"sa-item": httpVueLoader('../../sa-frame/com/sa-item.vue'),
+					"sa-td": httpVueLoader('../../sa-frame/com/sa-td.vue'),
 				},
 				el: '.vue-box',
 				data: {
-					p: { // 查询参数  
-						demandId: '',		// 货运需求单唯一标识，自增主键 
+					p: { // 查询参数
+						demandId: '',		// 货运需求单唯一标识，自增主键
 						shipperId: '',		// 货主 ID，关联货主表
 						shipperName: '',		// 货主
-						itemName: '',		// 商品名称 
-						packingMethod: '',		// 商品包装方式 
-						destinationAddress: '',		// 货物目标地址 
-						originContact: '',		// 起运地联系人 
-						destinationContact: '',		// 目的地联系人 
-						vehicleType: '',		// 所需车辆类型 
-						status: '',		// 货运需求单状态 
+						itemName: '',		// 商品名称
+						packingMethod: '',		// 商品包装方式
+						destinationAddress: '',		// 货物目标地址
+						originContact: '',		// 起运地联系人
+						destinationContact: '',		// 目的地联系人
+						vehicleType: '',		// 所需车辆类型
+						status: '',		// 货运需求单状态
 						deleteStatus: '1',
-						createdAt: '',		// 货运需求单创建时间 
-						updatedAt: '',		// 货运需求单更新时间 
-						pageNo: 1,		// 当前页 
-						pageSize: 10,	// 页大小 
-						sortType: 0		// 排序方式 
+						createdAt: '',		// 货运需求单创建时间
+						updatedAt: '',		// 货运需求单更新时间
+						pageNo: 1,		// 当前页
+						pageSize: 10,	// 页大小
+						sortType: 0		// 排序方式
 					},
 					orderStepTabs: [],
 					activeTab: 'all',
 
 					dataCount: 0,
-					dataList: [], // 数据集合 
+					dataList: [], // 数据集合
 				},
 				methods: {
 					handleTabClick(tab, event) {
@@ -148,8 +150,8 @@
 
 						sa.ajax('/transport-server/TbTransportDemand/getList', sa.removeNull(this.p), function(res) {
 							this.dataList = res.data; // 数据
-							this.dataCount = res.dataCount; // 数据总数 
-							sa.f5TableHeight();		// 刷新表格高度 
+							this.dataCount = res.dataCount; // 数据总数
+							sa.f5TableHeight();		// 刷新表格高度
 						}.bind(this));
 					},
 					// 查看
@@ -168,7 +170,7 @@
 						this.get(selection[0]);
 					},
 					viewApply: function(data){
-						sa.showIframe('货运申请单', 'tb-transport-demand-apply.html?demandId=' + data.demandId, '1050px', '70%');
+						sa.showIframe('货运申请单', 'tb-transport-demand-apply.html?demandId=' + data.demandId, '1200px', '80%');
 					},
 					// 修改
 					update: function(data) {
@@ -190,7 +192,7 @@
 								}
 							}.bind(this))
 						}.bind(this));
-					}, 
+					},
 					// 删除
 					del: function(data) {
 						sa.confirm('确定要删除货运需求单['+ data.demandId +']吗？', function() {
@@ -207,18 +209,18 @@
 					},
 					// 批量删除
 					deleteByIds: function() {
-						// 获取选中元素的id列表 
+						// 获取选中元素的id列表
 						let selection = this.$refs['data-table'].selection;
 						let ids = sa.getArrayField(selection, 'id');
 						if(selection.length == 0) {
 							return sa.msg('请至少选择一条数据')
 						}
-						// 提交删除 
+						// 提交删除
 						sa.confirm('是否批量删除选中数据？此操作不可撤销', function() {
 							sa.ajax('/transport-server/TbTransportDemand/deleteByIds', {ids: ids.join(',')}, function(res) {
 								sa.arrayDelete(this.dataList, selection);
 								sa.ok('删除成功');
-								sa.f5TableHeight();		// 刷新表格高度 
+								sa.f5TableHeight();		// 刷新表格高度
 							}.bind(this))
 						}.bind(this));
 					},

sa-view/tb-transport-fundflow-bill/tb-transport-fundflow-bill-info.html

@@ -68,7 +68,7 @@
 						<td style="text-align:center" v-else >异常</td>
 					</tr>
 					<tr>
-						<td style="text-align:center" >收入金额</td>
+						<td style="text-align:center" >收入金额(元)</td>
 						<td style="text-align:center" >{{m.inAmountPlatform}}</td>
 						<td style="text-align:center" >{{m.inAmountWechat}}</td>
 						<td style="text-align:center" v-if="m.inAmountPlatform==m.inAmountWechat">一致</td>
@@ -82,7 +82,7 @@
 						<td style="text-align:center;text-color:red" v-else >异常</td>
 					</tr>
 					<tr>
-						<td style="text-align:center" >支出金额</td>
+						<td style="text-align:center" >支出金额(元)</td>
 						<td style="text-align:center" >{{m.outAmountPlatform}}</td>
 						<td style="text-align:center" >{{m.outAmountWechat}}</td>
 						<td style="text-align:center" v-if="m.outAmountPlatform==m.outAmountWechat">一致</td>

sa-view/tb-transport-fundflow-bill/tb-transport-fundflow-bill-list.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 	<head>
-		<title>日资金对账</title>
+		<title>平台与微信资金对账表-列表</title>
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 		<!-- 所有的 css & js 资源 -->
@@ -20,14 +20,22 @@
 				<!-- ------------- 检索参数 -------------
 				<div class="c-title">检索参数</div> -->
 				<el-form ref="form" :model='p' @submit.native.prevent>
-					<sa-item type="text" name="账单日期" v-model="p.billDate"  width="120px"></sa-item>
-					<sa-item type="text" name="对账结果" v-model="p.status" width="120px">
+					<sa-item type="text" name="账单日期" v-model="p.billDate" width="100px">
+						<el-date-picker
+								v-model="p.billDate"
+								type="date"
+								format="yyyy-MM-dd"
+								value-format="yyyy-MM-dd"
+								placeholder="选择日期">
+						</el-date-picker>
+					</sa-item>
+					<!--<sa-item type="text" name="对账结果" v-model="p.status" width="120px">
 						<el-select v-model="p.result">
 							<el-option label="全部" value=""></el-option>
 							<el-option label="对账一致" value="0"></el-option>
 							<el-option label="对账异常" value="1"></el-option>
 						</el-select>
-					</sa-item>
+					</sa-item>-->
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 					<el-button size="mini" type="info" @click="sa.f5()">重置</el-button>
 				</el-form>
@@ -38,15 +46,15 @@
 
 					<el-table-column label="货运平台" align="center"  >
 						<sa-td name="收入笔数" prop="inCountPlatform" ></sa-td>
-						<sa-td name="收入金额" prop="inAmountPlatform" ></sa-td>
+						<sa-td name="收入金额(元)" prop="inAmountPlatform" ></sa-td>
 						<sa-td name="支出笔数" prop="outCountPlatform" ></sa-td>
-						<sa-td name="支出金额" prop="outAmountPlatform" ></sa-td>
+						<sa-td name="支出金额(元)" prop="outAmountPlatform" ></sa-td>
 					</el-table-column>
 					<el-table-column label="微信平台" align="center"  >
 						<sa-td name="收入笔数" prop="inCountWechat" ></sa-td>
-						<sa-td name="收入金额" prop="inAmountWechat" ></sa-td>
+						<sa-td name="收入金额(元)" prop="inAmountWechat" ></sa-td>
 						<sa-td name="支出笔数" prop="outCountWechat" ></sa-td>
-						<sa-td name="支出金额" prop="outAmountWechat" ></sa-td>
+						<sa-td name="支出金额(元)" prop="outAmountWechat" ></sa-td>
 					</el-table-column>
 					<sa-td name="对账结果" prop="result" type="enum" :jv="{0: '一致', 1: '不一致'}" ></sa-td>
 					<el-table-column label="操作" fixed="right"  width="80px">
@@ -70,6 +78,7 @@
 					p: { // 查询参数
 						billId: '',		// 账单ID
 						billDate: '',		// 账单日期
+						result : '',
 						inCountPlatform: '',		// 平台收入笔数
 						inAmountPlatform: '',		// 平台收入金额
 						outCountPlatform: '',		// 平台支出笔数

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

@@ -1,31 +1,54 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<title>货运订单信息-详情</title>
+	<title>货运订单结算信息</title>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 	<!-- 所有的 css js 资源 -->
-	<link rel="stylesheet" href="../../static/kj/element-ui/theme-chalk/index.css">
+	<link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
 	<link rel="stylesheet" href="../../static/sa.css">
 	<script src="../../static/kj/vue.min.js"></script>
-	<script src="../../static/kj/element-ui/index.js"></script>
+	<script src="https://unpkg.com/element-ui/lib/index.js"></script>
 	<script src="../../static/kj/httpVueLoader.js"></script>
 	<script src="../../static/kj/jquery.min.js"></script>
 	<script src="../../static/kj/layer/layer.js"></script>
 	<script src="../../static/sa.js"></script>
+	<script src="../../sa-frame/com/upload-util.js"></script>
 	<style type="text/css">
 		.c-panel .c-label{width: 8em;}
-		.info-row {
-			display: flex;
-			justify-content: space-between;
-			margin-bottom: 1em;
+		.info-table {
+			width: 100%;
+			border-collapse: collapse;
+			margin-bottom: 20px;
 		}
-		.info-row .c-label {
-			width: 30%;
+		.info-table th, .info-table td {
+			border: 1px solid #ebeef5;
+			padding: 12px 10px;
+			font-size: 14px;
+			line-height: 1.5;
 		}
-		.info-row .c-value {
-			width: 70%;
+		.info-table th {
+			border: 1px solid darkgray;
+			text-align: left;
+			height: 22px;
+			padding: 8px;
+			background-color: #dddddd;
+			width: 15%;
+			min-width: 120px;
 		}
+		.info-table td {
+			border: 1px solid darkgray;
+			text-align: left;
+			width: 35%;
+		}
+		h3 {
+			margin: 20px 0 15px 0;
+			color: #303133;
+			font-size: 16px;
+			font-weight: bold;
+		}
+		.c-item .image-box{max-width: 700px; padding-left: 0px; display: flex;}
+		.c-item .image-box-2{width: 90px; height: 125px; cursor: pointer; float: left;}
 	</style>
 </head>
 <body>
@@ -34,108 +57,97 @@
 	<div class="s-body">
 		<div class="c-panel">
 			<el-form v-if="m">
-				<el-divider content-position="center">货运订单</el-divider>
-				<el-row :gutter="50">
-					<el-col :span="12">
-						<sa-info name="货运单号" br>{{m.orderId}}</sa-info>
-					</el-col>
-					<el-col :span="12">
-						<sa-info type="enum"  name="订单状态" :value="m.status" :jv="{0: '待进场', 1: '待装货', 2: '已装货', 3:'运输中', 4:'待卸货', 5:'卸货中', 6:'已卸货', 7:'已结算', 11:'退款中', 12:'已退款'}" br></sa-info>
-					</el-col>
-				</el-row>
 
-				<el-row :gutter="50">
-					<el-col :span="12">
-						<sa-info name="货      主" br>{{m.shipperName}}</sa-info>
-					</el-col>
-					<el-col :span="12">
-						<sa-info name="商品名称" br>{{m.itemName}}</sa-info>
-					</el-col>
-				</el-row>
-				<el-row :gutter="50">
-					<el-col :span="12">
-						<sa-info name="起运地" br>{{m.originAddress}}</sa-info>
-					</el-col>
-					<el-col :span="12">
-						<sa-info name="目的地" br>{{m.destAddress}}</sa-info>
-					</el-col>
-				</el-row>
+				<h3>货运订单信息</h3>
+				<table class="info-table">
+					<tr>
+						<th>货运单号</th>
+						<td>{{m.orderId}}</td>
+						<th>订单状态</th>
+						<td>
+							<span v-if="m.status === 0">待进场</span>
+							<span v-else-if="m.status === 1">待装货</span>
+							<span v-else-if="m.status === 2">已装货</span>
+							<span v-else-if="m.status === 3">运输中</span>
+							<span v-else-if="m.status === 4">待卸货</span>
+							<span v-else-if="m.status === 5">卸货中</span>
+							<span v-else-if="m.status === 6">已卸货</span>
+							<span v-else-if="m.status === 7">已结算</span>
+							<span v-else-if="m.status === 11">退款中</span>
+							<span v-else-if="m.status === 12">已退款</span>
+						</td>
+					</tr>
+					<tr>
+						<th>货主</th>
+						<td>{{m.shipperName}}</td>
+						<th>商品名称</th>
+						<td>{{m.itemName}}</td>
+					</tr>
+					<tr>
+						<th>起运地</th>
+						<td>{{m.originAddress}}</td>
+						<th>目的地</th>
+						<td>{{m.destAddress}}</td>
+					</tr>
 
-				<el-row :gutter="50">
-					<el-col :span="12">
-						<sa-info name="接单司机" br>{{m.driverName}}</sa-info>
-					</el-col>
-					<el-col :span="12">
-						<sa-info name="接单车辆" br>{{m.plateNo}}</sa-info>
-					</el-col>
-				</el-row>
-				<el-row :gutter="50">
-					<el-col :span="12">
-						<sa-info name="运输里程" br>{{m.distance}}公里</sa-info>
-					</el-col>
-					<el-col :span="12">
-						<sa-info name="运输单价" br>{{m.unitPrice}}元/公里</sa-info>
-					</el-col>
-				</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>
+					<tr>
+						<th>接单司机</th>
+						<td>{{m.driverName}}</td>
+						<th>接单车辆</th>
+						<td>{{m.plateNo}}</td>
+					</tr>
+					<tr>
+						<th>运输里程</th>
+						<td>{{m.distance}}公里</td>
+						<th>运输单价</th>
+						<td>{{m.unitPrice}}元/公里</td>
+					</tr>
+					<tr>
+						<th>装货时间</th>
+						<td>{{m.realLoadingTime}}</td>
+						<th>发车时间</th>
+						<td>{{m.realDepartureTime}}</td>
+					</tr>
+					<tr>
+						<th>运达时间</th>
+						<td>{{m.realArrivalTime}}</td>
+						<th>创建时间</th>
+						<td>{{m.createdAt}}</td>
+					</tr>
 
+				</table>
 
-				<el-divider content-position="center">货运结算</el-divider>
-				<el-row :gutter="50">
-					<el-col :span="12">
-						<sa-info name="应收金额" br>{{m.receivableAmount}}元</sa-info>
-					</el-col>
-					<el-col :span="12">
-						<sa-info name="实收金额" br>{{m.receivedAmount}}元</sa-info>
-					</el-col>
-				</el-row>
+				<h3>货运结算信息</h3>
+				<table class="info-table">
 
-				<el-row :gutter="50">
-					<el-col :span="12">
-						<sa-info name="本次运费" br>{{m.freightAmount}}元</sa-info>
-					</el-col>
-					<el-col :span="12">
-						<sa-info name="本次服务费" br>{{m.serviceFee}}元</sa-info>
-					</el-col>
-				</el-row>
+					<tr>
+						<th>实收金额</th>
+						<td colspan="3">{{m.receivableAmount}} 元</td>
+						<!--<th>实收金额</th>
+						<td>{{m.receivedAmount}} 元</td>-->
+					</tr>
 
+					<tr>
+						<th>本次运费</th>
+						<td>{{m.freightAmount}} 元</td>
+						<th>本次服务费</th>
+						<td>{{m.serviceFee}} 元</td>
+					</tr>
 
-				<el-row :gutter="50">
-					<el-col :span="12">
-						<sa-info name="结算时间" br>{{m.settleTime}}</sa-info>
-					</el-col>
-					<el-col :span="12">
-						<sa-info type="enum"  name="退款状态" :value="m.refundStatus" :jv="{0: '未退款', 1: '退款申请中', 2: '同意退款', 3:'退款关闭'}" br></sa-info>
-					</el-col>
-				</el-row>
+					<tr>
+						<th>结算时间</th>
+						<td>{{m.settleTime}}</td>
+						<th>退款状态</th>
+						<td>
+							<span v-if="m.refundStatus === 0">未退款</span>
+							<span v-else-if="m.refundStatus === 1">退款申请中</span>
+							<span v-else-if="m.refundStatus === 2">确认退款</span>
+							<span v-else-if="m.refundStatus === 3">退款关闭</span>
+						</td>
+					</tr>
 
+				</table>
 
-				<!--<el-row :gutter="50">
-					<el-col :span="8">
-						<sa-info type="img-list" name="装货照片" :value="m.loadingPhoto" br></sa-info>
-					</el-col>
-					<el-col :span="8">
-						<sa-info type="img-list" name="到货照片" :value="m.arrivalPhoto" br></sa-info>
-					</el-col>
-					<el-col :span="8">
-						<sa-info type="img-list" name="卸货照片" :value="m.unloadingPhoto" br></sa-info>
-					</el-col>
-				</el-row>-->
 
 
 			</el-form>
@@ -171,3 +183,4 @@
 </script>
 </body>
 </html>
+

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

@@ -60,12 +60,12 @@
 					<sa-td name="接单车辆" prop="plateNo"  ></sa-td>
 					<sa-td name="订单状态" prop="status" type="enum" :jv="{0: '待进场', 1: '待装货', 2: '已装货', 3:'运输中', 4:'待卸货', 5:'卸货中', 6:'已卸货', 7:'已结算', 11:'退款中', 12:'已退款'}"></sa-td>
 					<sa-td name="退款状态" prop="refundStatus" type="enum" :jv="{0: '未退款', 1: '退款申请中', 2: '同意退款', 3:'退款关闭'}" br></sa-td>
-					<sa-td name="货主应付" prop="receivableAmount" ></sa-td>
-					<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" type="datetime" width="150px"></sa-td>
-					<sa-td name="运达时间" prop="realArrivalTime" type="datetime" width="150px" ></sa-td>
+					<sa-td name="货主实付(元)" prop="receivableAmount" ></sa-td>
+					<!--<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" 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">

sa-view/tb-transport-trade-bill/tb-transport-trade-bill-detail-list.html

@@ -41,7 +41,7 @@
 						<sa-td name="货运单号" prop="orderId" width="200px"></sa-td>
 						<sa-td name="商品名称" prop="goodsName" width="200px"></sa-td>
 						<sa-td name="业务类型" prop="busiType"  type="enum" :jv="{0: '付款', 1: '转账', 2: '退款'}"></sa-td>
-						<sa-td name="交易金额" prop="tradeAmount" ></sa-td>
+						<sa-td name="交易金额(元)" prop="tradeAmount" ></sa-td>
 						<sa-td name="交易时间" prop="tradeTime" width="150px"></sa-td>
 					</el-table-column>
 					<el-table-column label="微信平台" align="center" >JSAPI、NATIVE、APP、MICROPAY、MWEB、FACEPAY
@@ -49,7 +49,7 @@
 						<sa-td name="交易类型" prop="wxTradeType" type="enum" :jv="{'JSAPI': '小程序支付', 'NATIVE': 'Native支付', 'APP': 'APP支付', 'MICROPAY': '付款码支付', 'MWEB': 'H5支付', 'FACEPAY': '刷脸支付'}"></sa-td>
 						<sa-td name="交易状态" prop="wxTradeState" type="enum" :jv="{'SUCCESS': '支付成功', 'REFUND': '转入退款', 'NOTPAY': '未支付', 'CLOSED': '已关闭', 'REVOKED': '已撤销','PAYERROR':'付款失败'}"></sa-td>
 						<sa-td name="支付方式" prop="wxBankType" ></sa-td>
-						<sa-td name="交易金额" prop="wxAmount" ></sa-td>
+						<sa-td name="交易金额(元)" prop="wxAmount" ></sa-td>
 						<sa-td name="用户标识" prop="wxUserId" ></sa-td>
 					</el-table-column>
 

sa-view/tb-transport-trade-bill/tb-transport-trade-bill-info.html

@@ -68,7 +68,7 @@
 						<td style="text-align:center" v-else >异常</td>
 					</tr>
 					<tr>
-						<td style="text-align:center" >收款金额</td>
+						<td style="text-align:center" >收款金额(元)</td>
 						<td style="text-align:center" >{{m.receiveAmountPlatform}}</td>
 						<td style="text-align:center" >{{m.receiveAmountWechat}}</td>
 						<td style="text-align:center" v-if="m.receiveAmountPlatform==m.receiveAmountWechat">一致</td>
@@ -82,7 +82,7 @@
 						<td style="text-align:center;text-color:red" v-else >异常</td>
 					</tr>
 					<tr>
-						<td style="text-align:center" >转账金额</td>
+						<td style="text-align:center" >转账金额(元)</td>
 						<td style="text-align:center" >{{m.transferAmountPlatform}}</td>
 						<td style="text-align:center" >{{m.transferAmountWechat}}</td>
 						<td style="text-align:center" v-if="m.transferAmountPlatform==m.transferAmountWechat">一致</td>
@@ -96,7 +96,7 @@
 						<td style="text-align:center;text-color:red" v-else >异常</td>
 					</tr>
 					<tr>
-						<td style="text-align:center" >退款金额</td>
+						<td style="text-align:center" >退款金额(元)</td>
 						<td style="text-align:center" >{{m.refundAmountPlatform}}</td>
 						<td style="text-align:center" >{{m.refundAmountWechat}}</td>
 						<td style="text-align:center" v-if="m.refundAmountPlatform==m.refundAmountWechat">一致</td>

sa-view/tb-transport-trade-bill/tb-transport-trade-bill-list.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 	<head>
-		<title>日交易对账</title>
+		<title>平台与微信交易对账信息表-列表</title>
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 		<!-- 所有的 css & js 资源 -->
@@ -20,8 +20,16 @@
 				<!-- ------------- 检索参数 -------------
 				<div class="c-title">检索参数</div>-->
 				<el-form ref="form" :model='p' @submit.native.prevent>
-					<sa-item type="text" name="账单日期" v-model="p.billDate" width="120px"></sa-item>
-					<sa-item type="text" name="对账结果" v-model="p.status" width="120px">
+					<sa-item type="text" name="账单日期" v-model="p.billDate" width="100px">
+						<el-date-picker
+								v-model="p.billDate"
+								type="date"
+								format="yyyy-MM-dd"
+								value-format="yyyy-MM-dd"
+								placeholder="选择日期">
+						</el-date-picker>
+					</sa-item>
+					<sa-item type="text" name="对账结果" v-model="p.result" width="100px">
 						<el-select v-model="p.result">
 							<el-option label="全部" value=""></el-option>
 							<el-option label="对账一致" value="0"></el-option>
@@ -38,24 +46,25 @@
 					<sa-td name="账单日期" prop="billDate" style="background-color:#dddddd" ></sa-td>
 					<el-table-column label="货运平台" align="center"  >
 						<sa-td name="收款笔数" prop="receiveCountPlatform" ></sa-td>
-						<sa-td name="收款金额" prop="receiveAmountPlatform" ></sa-td>
+						<sa-td name="收款金额(元)" prop="receiveAmountPlatform" ></sa-td>
 						<sa-td name="转账笔数" prop="transferCountPlatform" ></sa-td>
-						<sa-td name="转账金额" prop="transferAmountPlatform" ></sa-td>
+						<sa-td name="转账金额(元)" prop="transferAmountPlatform" ></sa-td>
 						<sa-td name="退款笔数" prop="refundCountPlatform" ></sa-td>
-						<sa-td name="退款金额" prop="refundAmountPlatform" ></sa-td>
+						<sa-td name="退款金额(元)" prop="refundAmountPlatform" ></sa-td>
 					</el-table-column>
 					<el-table-column label="微信平台"  align="center" style="background-color:#dddddd">
 						<sa-td name="收款笔数" prop="receiveCountWechat" ></sa-td>
-						<sa-td name="收款金额" prop="receiveAmountWechat" ></sa-td>
+						<sa-td name="收款金额(元)" prop="receiveAmountWechat" ></sa-td>
 						<sa-td name="转账笔数" prop="transferCountWechat" ></sa-td>
-						<sa-td name="转账金额" prop="transferAmountWechat" ></sa-td>
+						<sa-td name="转账金额(元)" prop="transferAmountWechat" ></sa-td>
 						<sa-td name="退款笔数" prop="refundCountWechat" ></sa-td>
-						<sa-td name="退款金额" prop="refundAmountWechat" ></sa-td>
+						<sa-td name="退款金额(元)" prop="refundAmountWechat" ></sa-td>
 					</el-table-column>
 					<sa-td name="对账结果" prop="result" type="enum" :jv="{0: '一致', 1: '不一致'}" ></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>
+
 						</template>
 					</el-table-column>
 				</el-table>
@@ -74,6 +83,7 @@
 					p: { // 查询参数
 						billId: '',		// 账单ID
 						billDate: '',		// 账单日期
+						result : '',
 						receiveCountPlatform: '',		// 平台收款笔数
 						receiveAmountPlatform: '',		// 平台收款金额
 						transferCountPlatform: '',		// 平台转账笔数

sa-view/tb-vehicle-audit/tb-vehicle-audit-list.html

@@ -23,18 +23,18 @@
 				<!-- ------------- 检索参数 ------------- -->
 				<!-- <div class="c-title">检索参数</div> -->
 				<el-form ref="form" :model='p' @submit.native.prevent>
-					<sa-item type="text" name="车牌" v-model="p.vehiclePlate" width="80"></sa-item>
+					<sa-item type="text" name="车牌" v-model="p.vehiclePlate"></sa-item>
 					<sa-item type="text" name="品牌型号" v-model="p.vehicleModel" width="80"></sa-item>
-					<sa-item type="text" name="所有人" v-model="p.owner"></sa-item>
+					<sa-item type="text" name="所有人" v-model="p.owner" width="80"></sa-item>
 					<!--<sa-item type="text" name="车辆类型" v-model="p.vehicleType" width="90px">
 						<el-select v-model="p.vehicleType">
 							<el-option label="微型货车" value="0"></el-option>
 							<el-option label="轻型货车" value="1"></el-option>
 							<el-option label="中型货车" value="2"></el-option>
 							<el-option label="重型货车" value="3"></el-option>
-						</el-select> 
+						</el-select>
 					</sa-item>-->
-					
+
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 					<el-button icon="el-icon-refresh" type="info" @click="sa.f5()">重置</el-button>
 				</el-form>
@@ -58,7 +58,7 @@
 					<!--<sa-td name="容积" prop="volume" ></sa-td>-->
 
 					<sa-td name="注册时间" width="150px" prop="createTime"></sa-td>
-					<sa-td name="审核状态" prop="auditStatus" type="enum" :jv="{0: '待审核', 3: '审核中', 1: '已审核', 2: '审核不通过'}"></sa-td>					
+					<sa-td name="审核状态" prop="auditStatus" type="enum" :jv="{0: '待审核', 3: '审核中', 1: '已审核', 2: '审核不通过'}"></sa-td>
 					<sa-td name="审核时间" width="150px" prop="auditTime"></sa-td>
 					<el-table-column label="操作" fixed="right"  width="150px">
 						<template slot-scope="s">
@@ -137,7 +137,7 @@
 						sa.ajax('/transport-server/TbVehicle/startAudit?id='+data.id, function(res) {
 							sa.showIframe('车辆审核', 'tb-vehicle-audit.html?id=' + data.id, '1000px', '90%');
 						}.bind(this))
-						
+
 					},
 					// 新增
 					add: function(data) {

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

@@ -71,20 +71,16 @@
 						<tr>
 							<th>订单商品名称</th>
 							<td>{{m.goodsName}}</td>
-							<th>应支付金额(分)</th>
-							<td>{{m.amount}}</td>
-						</tr>
-						<tr>
-							<th>预支付时间</th>
-							<td>{{m.tradeTime}}</td>
-							<th>创建时间</th>
-							<td>{{m.createTime}}</td>
-						</tr>
-						<tr>
 							<th>微信支付订单号</th>
 							<td>{{m.transactionId}}</td>
-							<th>是否已支付</th>
-							<td>{{m.isPaid?'已支付':'未支付'}}</td>
+
+						</tr>
+						<tr>
+							<th>实付金额(分)</th>
+							<td>{{m.payAmount}}</td>
+							<th>应支付金额(分)</th>
+							<td>{{m.amount}}</td>
+
 						</tr>
 						<tr>
 							<th>交易状态</th>
@@ -93,14 +89,20 @@
 							<td>{{m.tradeStateDesc}}</td>
 						</tr>
 						<tr>
+							<th>预支付时间</th>
+							<td>{{m.tradeTime}}</td>
+							<th>创建时间</th>
+							<td>{{m.createTime}}</td>
+						</tr>
+						<tr>
 							<th>支付成功时间</th>
 							<td>{{m.successTime}}</td>
 							<th>支付者信息</th>
 							<td>{{m.payerOpenId}}</td>
 						</tr>
 						<tr>
-							<th>实付金额(分)</th>
-							<td colspan="3">{{m.payAmount}}</td>
+							<th>是否已支付</th>
+							<td colspan="3">{{m.isPaid?'已支付':'未支付'}}</td>
 						</tr>
 					</table>
 

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

@@ -61,14 +61,14 @@
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 					<sa-td type="selection"></sa-td>
 					<sa-td name="业务订单号" prop="tradeNo" width="180px"></sa-td>
-					<sa-td name="商品名称" prop="goodsName" width="260px"></sa-td>
-					<sa-td name="应付金额(分)" prop="amount" width="120px"></sa-td>
-					<sa-td name="创建时间" prop="createTime" width="150px"></sa-td>
 					<sa-td name="微信支付订单号" prop="transactionId" width="240px"></sa-td>
+					<sa-td name="商品名称" prop="goodsName" width="270px"></sa-td>
+					<sa-td name="应付金额(分)" prop="amount" width="120px"></sa-td>
+					<sa-td name="实付金额(分)" prop="payAmount" width="120px"></sa-td>
 					<sa-td name="是否已支付" prop="isPaid" type="enum" :jv="{0: '未支付', 1: '已支付'}" width="120px"></sa-td>
 					<sa-td name="交易状态" prop="tradeState" width="120px" ></sa-td>
 					<sa-td name="完成时间" prop="successTime" width="150px"></sa-td>
-					<sa-td name="实付金额(分)" prop="payAmount" width="120px"></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>

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

@@ -63,32 +63,32 @@
 								<td>{{m.outTradeNo}}</td>
 							</tr>
 							<tr>
-								<th>用户微信openid</th>
-								<td>{{m.openId}}</td>
-								<th>用户姓名</th>
-								<td>{{m.userName}}</td>
+								<!--<th>用户微信openid</th>
+								<td>{{m.openId}}</td>-->
+								<th>微信业务单号</th>
+								<td>{{m.transferBillNo}}</td>
 							</tr>
 							<tr>
+								<th>用户姓名</th>
+								<td>{{m.userName}}</td>
 								<th>转账场景</th>
 								<td>{{m.transferSceneId}}</td>
-								<th>转账金额(分)</th>
-								<td>{{m.transferAmount}}</td>
 							</tr>
 							<tr>
+								<th>转账金额(分)</th>
+								<td>{{m.transferAmount}}</td>
 								<th>转账备注</th>
 								<td>{{m.transferRemark}}</td>
-								<th>创建时间</th>
-								<td>{{m.createTime}}</td>
 							</tr>
 							<tr>
-								<th>微信业务单号</th>
-								<td>{{m.transferBillNo}}</td>
-								<th>状态</th>
+								<th>状态标识</th>
 								<td>{{m.state}}</td>
+								<th>是否成功</th>
+								<td>{{m.isTransfer == 1 ? '转账成功' : '-'}}</td>
 							</tr>
 							<tr>
-								<th>转账状态</th>
-								<td>{{m.isTransfer == 1 ? '成功' : '失败'}}</td>
+								<th>创建时间</th>
+								<td>{{m.createTime}}</td>
 								<th>更新时间</th>
 								<td>{{m.updateTime}}</td>
 							</tr>
@@ -106,7 +106,7 @@
 			var app = new Vue({
 				el: '.vue-box',
 				data: {
-					transferId: sa.p('transferId', 0),	// 获取数据ID 
+					transferId: sa.p('transferId', 0),	// 获取数据ID
 					m: null
 				},
 				methods: {
@@ -120,7 +120,7 @@
 					}.bind(this))
 				}
 			})
-			
+
 		</script>
 	</body>
 </html>

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

@@ -22,9 +22,9 @@
 				<el-form ref="form" :model='p' @submit.native.prevent>
 					<!--<sa-item type="text"  width="100px"name="转账单号" v-model="p.transferId"></sa-item>-->
 					<sa-item type="text"  width="100px" name="业务订单号" v-model="p.outTradeNo"></sa-item>
+					<sa-item type="text" width="100px"name="微信业务单号" v-model="p.transferBillNo"></sa-item>
 					<!--<sa-item type="text" width="100px" name="微信openid" v-model="p.openId"></sa-item>-->
 					<sa-item type="text" width="100px" name="用户姓名" v-model="p.userName"></sa-item>
-					<sa-item type="text" width="100px"name="微信业务单号" v-model="p.transferBillNo"></sa-item>
 					<sa-item type="text" width="100px" name="状态" v-model="p.state"></sa-item>
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 					<el-button size="mini" type="info" @click="sa.f5()">重置</el-button>
@@ -34,10 +34,10 @@
 					<sa-td type="selection"></sa-td>
 					<!--<sa-td name="转账单号" prop="transferId" ></sa-td>-->
 					<sa-td name="业务订单号" prop="outTradeNo" width="200px"></sa-td>
+					<sa-td name="微信业务单号" prop="transferBillNo" width="260px"></sa-td>
 					<!--<sa-td name="微信openid" prop="openId" ></sa-td>-->
 					<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" type="enum" :jv="{0: '--', 1: '转账成功'}"></sa-td>
 					<sa-td name="创建时间" prop="createTime" width="150px"></sa-td>