新增互助社确认进境结算单功能

sa-frame/menu-list-sp.js

@@ -684,6 +684,11 @@ window.menuList.unshift({
 								name: '删除订单',
 								isShow: false
 							},
+							{
+								id: 'ht-trade-settlement-hzsconfirm',
+								name: '互助社确认',
+								isShow: false
+							},
 						]
 					},
 					{

sa-view/ht-trade-settlement/ht-trade-settlement-list.html

@@ -29,10 +29,8 @@
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 					<sa-td type="index" name="序号"></sa-td>
-					<!-- <sa-td name="预申报编号" prop="platSeqNo" width="160px"></sa-td> -->
-					<sa-td name="申报单编号" prop="declareId" width="220px"></sa-td>
+					<sa-td name="预申报编号" prop="platSeqNo" width="160px"></sa-td>
 					<sa-td name="申报人姓名" prop="declareName" ></sa-td>
-					<sa-td name="互市区" prop="fieldName" width="160"></sa-td>
 					<sa-td name="商铺名称" prop="shopName"  width="160"></sa-td>
 					<sa-td name="商品名称" prop="goodsNames"  width="160"></sa-td>
 					<sa-td name="总金额" prop="sumAmt" ></sa-td>
@@ -42,14 +40,22 @@
 					<sa-td name="币制" prop="currCode" ></sa-td>
 					<sa-td name="件数" prop="packNo" ></sa-td>
 					<sa-td name="车牌号" prop="veNo" ></sa-td>
+					<sa-td type="enum" name="互助社确认" prop="hzsConfirmStatus" :jv="{1: '已确认[green]', 0: '未确认[#ff910a]'}" ></sa-td>
+					<sa-td name="确认时间" prop="hzsConfirmTime"  width="160"></sa-td>
+					<sa-td name="互市区" prop="fieldName" width="160"></sa-td>
+					<sa-td name="申报单编号" prop="declareId" width="160px"></sa-td>
 					<sa-td name="提运单号" prop="billNo"  width="160"></sa-td>
 					<sa-td name="航次号" prop="voyageNo"  width="160"></sa-td>
-					<sa-td name="单证代码" prop="preNo"  width="160"></sa-td>
-					<sa-td name="时间" prop="createTime"  width="160"></sa-td>
-					<el-table-column label="操作" width="140px" fixed="right" >
+					<sa-td name="创建时间" prop="createTime"  width="160"></sa-td>
+					<el-table-column label="操作" width="210px" fixed="right" >
 						<template slot-scope="s">
 							<el-button class="c-btn" type="success" @click="get(s.row)">查看</el-button>
 							<el-button class="c-btn" type="primary"  @click="getOrder(s.row)">边民订单</el-button>
+							<span>
+								<el-button v-if="s.row.hzsConfirmStatus===0 &&sa.isAuth('ht-trade-settlement-hzsconfirm')"
+										   class="c-btn" type="warning" @click="hzsConfirm(s.row)">互助社确认</el-button>
+								<el-button v-else :disabled="true" class="c-btn" type="warning">互助社确认</el-button>
+							</span>
 						</template>
 					</el-table-column>
 				</el-table>
@@ -74,7 +80,7 @@
 						pageNo: 1,		// 当前页
 						pageSize: 10,	// 页大小
 						sortType: 0		// 排序方式
-						
+
 					},
 					dataCount: 0,
 					dataList: [], // 数据集合
@@ -95,7 +101,14 @@
 					getOrder(data){
 						sa.showIframe('边民订单', 'ht-trade-settlement-order.html?mainId='+data.id, '90%', '94%');
 					},
-				
+					hzsConfirm(data) {
+						sa.confirm('是否确认订单', function() {
+							sa.ajax('/level-one-server/HtTradeSettlement/hzsConfirm?id=' + data.id, function(res) {
+								sa.ok('确认成功');
+								this.f5();
+							}.bind(this))
+						}.bind(this));
+					}
 				},
 				created: function() {
 					this.f5();