二级市场-新增查询交易凭证、电子协议

sa-view/tb-import-order/tb-import-order-list.html

@@ -31,14 +31,15 @@
 					<sa-td name="业务编号" prop="platSeqNo" width="150px"></sa-td>
 					<sa-td name="预录入编号" prop="preNo" width="150px"></sa-td>
 					<sa-td name="申报人姓名" prop="declareName" ></sa-td>
-					<sa-td name="申报人身份证号" prop="ciphertextIdno" ></sa-td>
+					<!--<sa-td name="申报人身份证号" prop="ciphertextIdno" width="140px"></sa-td>-->
 					<sa-td name="车牌号" prop="veNo" ></sa-td>
-					<sa-td name="互市区" prop="fieldName" ></sa-td>
+					<sa-td name="互市区" prop="fieldName" width="120px"></sa-td>
 					<sa-td name="总金额" prop="sumAmt" ></sa-td>
 					<sa-td name="总毛重" prop="sumGrossWt" ></sa-td>
 					<sa-td name="总净重" prop="sumNetWt" ></sa-td>
 					<sa-td name="币制" prop="currCode" ></sa-td>
 					<sa-td name="件数" prop="packNo" ></sa-td>
+					<sa-td name="创建时间" prop="createTime" width="140px"></sa-td>
 					<el-table-column label="操作" fixed="right"  width="120px">
 						<template slot-scope="s">
 							<el-button class="c-btn" type="success" icon="el-icon-view" @click="get(s.row)">查看</el-button>

sa-view/tb-orders/tb-orders-email.html

@@ -58,90 +58,88 @@
 								<th>订单编号</th>
 								<td colspan='2'>{{m.orderNo}}</td>
 								<th>结算单号</th>
-								<td colspan='2'></td>
+								<td colspan='2'>{{m.settleBillNo}}</td>
 							</tr>
 							<tr>
 								<th>交易日期</th>
-								<td colspan='2'></td>
+								<td colspan='2'>{{m.payTime}}</td>
 								<th>交货日期</th>
 								<td colspan='2'></td>
 							</tr>
 							<tr>
 								<th>银行流水号</th>
-								<td colspan='5'></td>
+								<td colspan='5'>{{m.result}}</td>
 							</tr>
 							<tr>
 								<th>商品名称</th>
 								<th>数量</th>
-								<th>重量（KG）</th>								
+								<th>重量（KG）</th>
 								<th>单价（元）</th>
 								<th>合计（元）</th>
-								<th>备注</th>								
+								<th>备注</th>
 							</tr>
 							<tr>
-								<td>木薯淀粉</td>
-								<td>24</td>
-								<td>3.23</td>								
-								<td>345.01</td>								
-								<td>34663.33</td>
-								<td>含税价</td>
-							</tr>
-							<tr>
-								<td>龙虾</td>
-								<td>24</td>
-								<td>3.23</td>								
-								<td>345.01</td>								
-								<td>34663.33</td>
+								<td>{{m.goodsName}}</td>
+								<td>{{m.buyQty}}</td>
+								<td>{{m.netWet}}</td>
+								<td>{{m.singlePrice}}</td>
+								<td>{{m.resalePrice}}</td>
 								<td>含税价</td>
 							</tr>
 							<tr>
 								<td>合计</td>
-								<td>7.23</td>
-								<td>12</td>
-								<td>322.01</td>
-								<td>344455</td>
+								<td>{{m.buyQty}}</td>
+								<td>{{m.netWet}}</td>
+								<td>{{m.singlePrice}}</td>
+								<td>{{m.resalePrice}}</td>
 								<td>含税价</td>
 							</tr>
 							<tr>
-								<td colspan='6'>合计金额人民币（大写）：xxxxxxxxx</td>
+								<td colspan='6'>合计金额人民币（大写）：{{m.resalePrice}}</td>
 							</tr>
 							<tr>
 								<td colspan='6' style="font-weight: bold;" >二、卖方信息</td>
 							</tr>
 							<tr>
 								<th>卖方</th>
-								<td colspan='2'></td>
-								<th>联系人及方式</th>
-								<td colspan='2'></td>
+								<td colspan='2'>{{m.businessName}}</td>
+								<th>联系人</th>
+								<td colspan='2'>{{m.contacts}}</td>
 							</tr>
 							<tr>
 								<th>开户行</th>
-								<td colspan='2'></td>
-								<th rowspan='2'>统一信用代码</th>
-								<td colspan='2' rowspan='2'></td>
+								<td colspan='2'>{{m.peopleBankName}}</td>
+								<th>联系方式</th>
+								<td colspan='2'>{{m.phone}}</td>
 							</tr>
 							<tr>
 								<th>银行账号</th>
-								<td colspan='2'></td>
+								<td colspan='2'>{{m.peopleBankCode}}</td>
+								<th>统一信用代码</th>
+								<td colspan='2'>{{m.peopleDutyParagraph}}</td>
 							</tr>
 							<tr>
 								<td colspan='6' style="font-weight: bold;" >三、买方信息</td>
 							</tr>
 							<tr>
 								<th>买方</th>
-								<td colspan='2'></td>
-								<th>联系人及方式</th>
-								<td colspan='2'></td>
+								<td colspan='2' v-if="m.purchaserBusinessName">{{m.purchaserBusinessName}}</td>
+								<td colspan='2' v-else>{{m.purchaserName}}</td>
+								<th>联系人</th>
+								<td colspan='2' v-if="m.legalPerson">{{m.legalPerson}}</td>
+								<td colspan='2' v-else>{{m.purchaserName}}</td>
 							</tr>
 							<tr>
 								<th>开户行</th>
-								<td colspan='2'></td>
-								<th rowspan='2'>统一信用代码</th>
-								<td colspan='2' rowspan='2'></td>
+								<td colspan='2'>{{m.purchaserBankName}}</td>
+								<th>联系方式</th>
+								<td colspan='2'>{{m.purchaserContact}}</td>
 							</tr>
 							<tr>
 								<th>银行账号</th>
-								<td colspan='2'></td>
+								<td colspan='2'>{{m.purchaserBankAccount}}</td>
+								<th>统一信用代码</th>
+								<td colspan='2'>{{m.purchaserDutyParagraph}}</td>
 							</tr>
 							<tr>
 								<td colspan='6' style="font-weight: bold;" >四、其它信息</td>
@@ -172,12 +170,18 @@
 							</tr>
 							<tr>
 								<td colspan='3'>
-									卖方：xxxxxxx <br>
-									法定代表人或授权委托人：xxxxxxxxxxx
+									卖方：{{m.businessName}} <br>
+									法定代表人或授权委托人：{{m.contacts}}
 								</td>
 								<td colspan='3'>
-									买方：xxxxxxx <br>
-									法定代表人或授权委托人：xxxxxxxxxxx
+									<span>
+										<span v-if="m.purchaserBusinessName">买方：{{m.purchaserBusinessName}}<br></span>
+										<span v-else>买方：{{m.purchaserName}}<br></span>
+									</span>
+									<span>
+										<span v-if="m.legalPerson">法定代表人或授权委托人：{{m.legalPerson}}</span>
+										<span v-else>法定代表人或授权委托人：{{m.purchaserName}}</span>
+									</span>
 								</td>
 							</tr>
 						</table>
@@ -192,7 +196,7 @@
 			</div>
 		</div>
 		<script>
-			var app = new Vue({				
+			var app = new Vue({
 				components: {
 					"sa-info": httpVueLoader('../../sa-frame/com/sa-info.vue')
 				},
@@ -212,11 +216,11 @@
 								unit: 'px',
 								format: 'a4'
 							});
-					
+
 							const imgProps = pdf.getImageProperties(imgData);
 							const pdfWidth = pdf.internal.pageSize.getWidth();
 							const pdfHeight = (imgProps.height * pdfWidth) / imgProps.width;
-					
+
 							// 添加图片，适应页面大小
 							pdf.addImage(imgData, 'PNG', 0, 0, pdfWidth, pdfHeight);
 							pdf.save(Date.now()+'.pdf');
@@ -232,11 +236,11 @@
 								unit: 'px',
 								format: 'a4'
 							});
-					
+
 							const imgProps = pdf.getImageProperties(imgData);
 							const pdfWidth = pdf.internal.pageSize.getWidth();
 							const pdfHeight = (imgProps.height * pdfWidth) / imgProps.width;
-					
+
 							// 添加图片，适应页面大小
 							pdf.addImage(imgData, 'PNG', 0, 0, pdfWidth, pdfHeight);
 							// 将 PDF 保存为 Blob 并处理它  这里需要处理跨域问题
@@ -247,12 +251,12 @@
 								newWindow.focus();
 							} else {
 								alert('请允许弹出窗口或在新标签页中手动查看 PDF。');
-							}	
+							}
 						});
 					},
 				},
 				mounted: function() {
-					sa.ajax('/level-two-server/TbOrders/getById?id=' + this.id, function(res) {
+					sa.ajax('/level-two-server/TbOrders/getSubEmail?id=' + this.id, function(res) {
 						this.m = res.data;
 						if(res.data == null) {
 							sa.alert('未能查找到 id=' + this.id + " 详细数据");
@@ -263,4 +267,4 @@
 
 		</script>
 	</body>
-</html>
+</html>

sa-view/tb-orders/tb-orders-list.html

@@ -35,12 +35,12 @@
 					<sa-td name="车牌号" prop="veNo" width="80px"></sa-td>
 					<sa-td name="订单编号" prop="orderNo" width="180px"></sa-td>
 					<sa-td name="商品名称" prop="goodsName" ></sa-td>
-					<sa-td name="买家" prop="purchaserName" ></sa-td>
-					<sa-td name="卖家" prop="leaderName" width="120px"></sa-td>
+					<sa-td name="买家" prop="purchaserName" width="100px"></sa-td>
+					<sa-td name="卖家" prop="leaderName" width="100px"></sa-td>
 					<sa-td name="转售金额" prop="resalePrice" width="80px"></sa-td>
-					<sa-td name="互市区" prop="tradeAreaName" ></sa-td>
+					<sa-td name="互市区" prop="tradeAreaName" width="120px"></sa-td>
 					<sa-td name="订单状态" prop="orderFinish" type="enum" :jv="{0: '未完成[#ff910a]', 1: '已完成[green]'}" @change="s => updateOrderFinish(s.row)" width="80px"></sa-td>
-					<sa-td name="支付状态" prop="isPay" type="enum" :jv="{0: '未支付[#ff910a]', 1: '支付成功[green]', 2: '支付失败[red]', 3: '支付中[blue]'}" width="80px"></sa-td>					
+					<sa-td name="支付状态" prop="isPay" type="enum" :jv="{0: '未支付[#ff910a]', 1: '支付成功[green]', 2: '支付失败[red]', 3: '支付中[blue]'}" width="80px"></sa-td>
 					<sa-td name="补扣次数" prop="deductionCount" width="80px">
 						<template slot-scope="s">
 							<div v-if="s.row.deductionCount==0">0</div>
@@ -48,17 +48,17 @@
 						</template>
 					</sa-td>
 					<sa-td name="补扣时间" prop="deductionTime" width="140px"></sa-td>
-					
-					<el-table-column label="操作" width="100px">
+					<sa-td name="创建时间" prop="createTime" width="140px"></sa-td>
+					<el-table-column label="操作" fixed="right" width="190px">
 						<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-printer" @click="subPrint(s.row)">交易凭证</el-button>
-							<el-button class="c-btn" type="info" icon="el-icon-info" @click="subEmail(s.row)">电子协议</el-button>
-							<div>
+							<span>
 								<el-button v-if="s.row.isPay==2&&sa.isAuth('tb-orders-deduction')"
 										   class="c-btn" type="warning" icon="el-icon-view" @click="deduction(s.row)">采购补扣款</el-button>
 								<el-button v-else :disabled="true" class="c-btn" type="warning" icon="el-icon-view">采购补扣款</el-button>
-							</div>
+							</span>
+							<el-button class="c-btn" type="primary" icon="el-icon-printer" @click="subPrint(s.row)">交易凭证</el-button>
+							<el-button class="c-btn" type="info" icon="el-icon-info" @click="subEmail(s.row)">电子协议</el-button>
 						</template>
 					</el-table-column>
 				</el-table>
@@ -99,11 +99,11 @@
 					},
 					// 交易凭证
 					subPrint: function(data) {
-						sa.showIframe('交易凭证', 'tb-orders-print.html?id=' + data.id, '950px', '80%');
+						sa.showIframe('交易凭证', 'tb-orders-print.html?id=' + data.id, '1200px', '80%');
 					},
 					// 电子协议
 					subEmail: function(data) {
-						sa.showIframe('电子协议', 'tb-orders-email.html?id=' + data.id, '950px', '90%');
+						sa.showIframe('电子协议', 'tb-orders-email.html?id=' + data.id, '1000px', '90%');
 					},
 					deduction(data) {
 						sa.confirm('是否执行补扣款操作', function() {

sa-view/tb-orders/tb-orders-print.html

@@ -58,29 +58,29 @@
 								<th>订单编号</th>
 								<td>{{m.orderNo}}</td>
 								<th>银行流水</th>
-								<td>{{m.goodsName}}</td>
+								<td>{{m.result}}</td>
 								<th>交易时间</th>
-								<td>{{m.goodsName}}</td>
+								<td>{{m.payTime}}</td>
 							</tr>
 							<tr>
 								<th>卖家</th>
 								<td>{{m.leaderName}}</td>
 								<th>证件号码</th>
-								<td>{{m.purchaserName}}</td>
+								<td>{{m.idCard}}</td>
 								<th>所属合作社（互助组）</th>
-								<td>{{m.purchaserName}}</td>
+								<td>{{m.groupName}}</td>
 							</tr>
 							<tr>
 								<th>买家</th>
 								<td>{{m.purchaserName}}</td>
 								<th>支付方式</th>
-								<td>{{m.leaderName}}</td>
+								<td></td>
 								<th>交易金额</th>
 								<td>{{m.resalePrice}}</td>
 							</tr>
 							<tr>
 								<th>关区</th>
-								<td></td>
+								<td>天保海关</td>
 								<th>口岸</th>
 								<td colspan='3'>{{m.tradeAreaName}}</td>
 							</tr>
@@ -98,8 +98,8 @@
 							<tr>
 								<td>{{m.goodsName}}</td>
 								<td>{{m.singlePrice}}</td>
-								<td>24</td>
-								<td>{{m.totalWeight}}</td>
+								<td>{{m.buyQty}}</td>
+								<td>{{m.netWet}}</td>
 								<td>{{m.goodsUnit}}</td>
 								<td>{{m.resalePrice}}</td>
 							</tr>
@@ -115,7 +115,7 @@
 			</div>
 		</div>
 		<script>
-			var app = new Vue({				
+			var app = new Vue({
 				components: {
 					"sa-info": httpVueLoader('../../sa-frame/com/sa-info.vue')
 				},
@@ -135,11 +135,11 @@
 								unit: 'px',
 								format: 'a4'
 							});
-					
+
 							const imgProps = pdf.getImageProperties(imgData);
 							const pdfWidth = pdf.internal.pageSize.getWidth();
 							const pdfHeight = (imgProps.height * pdfWidth) / imgProps.width;
-					
+
 							// 添加图片，适应页面大小
 							pdf.addImage(imgData, 'PNG', 0, 0, pdfWidth, pdfHeight);
 							pdf.save(Date.now()+'.pdf');
@@ -155,14 +155,14 @@
 								unit: 'px',
 								format: 'a4'
 							});
-					
+
 							const imgProps = pdf.getImageProperties(imgData);
 							const pdfWidth = pdf.internal.pageSize.getWidth();
 							const pdfHeight = (imgProps.height * pdfWidth) / imgProps.width;
-					
+
 							// 添加图片，适应页面大小
 							pdf.addImage(imgData, 'PNG', 0, 0, pdfWidth, pdfHeight);
-							
+
 							// 将 PDF 保存为 Blob 并处理它  这里需要处理跨域问题
 							const pdfBlob = pdf.output('blob');
 							var blobURL = window.URL.createObjectURL(pdfBlob);
@@ -171,12 +171,12 @@
 								newWindow.focus();
 							} else {
 								alert('请允许弹出窗口或在新标签页中手动查看 PDF。');
-							}							
+							}
 						});
 					},
 				},
 				mounted: function() {
-					sa.ajax('/level-two-server/TbOrders/getById?id=' + this.id, function(res) {
+					sa.ajax('/level-two-server/TbOrders/getSubPrint?id=' + this.id, function(res) {
 						this.m = res.data;
 						if(res.data == null) {
 							sa.alert('未能查找到 id=' + this.id + " 详细数据");