Trang chủ Khám phá Trợ giúp
Đăng ký Đăng nhập
qzyReal
/
market-admin-ui
1
0
Fork 0
Các tập tin Các vấn đề 0 Yêu cầu kéo về 0 Wiki
Browse Source

银行卡修改，结算单优化，退转售

qzy 1 tháng trước cách đây
mục cha
d248f18984
commit
c4f257b4ea
12 tập tin đã thay đổi với 518 bổ sung và 152 xóa
Split View Hiển thị tình trạng sai khác
  1. 51 44
      sa-view/ht-trade-settlement/ht-trade-settlement-list.html
  2. 61 15
      sa-view/listing-management/listing-management-order.html
  3. 6 12
      sa-view/listing-management/listing-management.html
  4. 24 7
      sa-view/tb-orders/tb-orders-list.html
  5. 10 5
      sa-view/tb-people/tb-people-bank.html
  6. 16 23
      sa-view/tb-people/tb-people-list.html
  7. 3 3
      sa-view/tb-purchaser-personal/tb-purchaser-personal-list.html
  8. 27 21
      sa-view/tb-purchaser/tb-purchaser-add.html
  9. 142 0
      sa-view/tb-purchaser/tb-purchaser-bank.html
  10. 1 1
      sa-view/tb-purchaser/tb-purchaser-list.html
  11. 142 0
      sa-view/tb-shop/tb-shop-bank.html
  12. 35 21
      sa-view/tb-shop/tb-shop-list.html

+ 51 - 44
sa-view/ht-trade-settlement/ht-trade-settlement-list.html
Xem Tập Tin 

@@ -3,7 +3,8 @@
 
 	<head>
 
 		<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" />
 
+		<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="../../static/sa.css">
 
@@ -25,54 +26,56 @@
 
 				<!-- ------------- 检索参数 ------------- -->
 
 				<div class="c-title">检索参数</div>
 
 				<el-form ref="form" :model='p' @submit.native.prevent>
 
-					<sa-item type="text" name="预申报编号" v-model="p.platSeqNo" width="8em"></sa-item>
 
-					<sa-item type="text" name="申报单编号" v-model="p.declareId" width="8em"></sa-item>
 
-					<sa-item type="text" name="商品名称" v-model="p.goodsNames" width="7em"></sa-item>
 
+					<sa-item type="text" name="车牌号" v-model="p.veNo" width="7em"></sa-item>
 
+					<sa-item type="date" name="申报日期" v-model="p.declTime" width="7em"></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>
 
 				<!-- ------------- 数据列表 ------------- -->
 
-				<el-table class="data-table" ref="data-table" :data="dataList" >
 
+				<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="declareName" ></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>
 
-					<sa-td name="总毛重(kg)" prop="sumGrossWt" ></sa-td>
 
-					<sa-td name="总净重(kg)" prop="sumNetWt" ></sa-td>
 
-					<sa-td name="运输方式" prop="trafMode" ></sa-td>
 
-					<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="veNo"></sa-td>
 
+					<sa-td name="申报时间" prop="declTime" width="160"></sa-td>
 
+					<sa-td name="航次号" prop="voyageNo" width="160"></sa-td>
 
+					<sa-td name="申报人姓名" prop="declareName"></sa-td>
 
+					<sa-td name="商品名称" prop="goodsNames" width="160"></sa-td>
 
+					<sa-td name="总金额" prop="sumAmt"></sa-td>
 
+					<sa-td name="总毛重(kg)" prop="sumGrossWt"></sa-td>
 
+					<sa-td name="总净重(kg)" prop="sumNetWt"></sa-td>
 
+					<sa-td name="商铺名称" prop="shopName" width="160"></sa-td>
 
+					<sa-td name="件数" prop="packNo"></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="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="createTime"  width="160"></sa-td>
 
-					<el-table-column label="操作" width="210px" fixed="right" >
 
+					<sa-td name="提运单号" prop="billNo" 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>
 
+							<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="info" @click="hzsConfirm(s.row)">互助社确认</el-button>
 
+								<el-button
 
+									v-if="s.row.hzsConfirmStatus===0 &&sa.isAuth('ht-trade-settlement-hzsconfirm')"
 
+									class="c-btn" type="info" @click="hzsConfirm(s.row)">互助社确认</el-button>
 
 								<el-button v-else :disabled="true" class="c-btn" type="info">互助社确认</el-button>
 
 							</span>
 
 							<span>
 
-								<el-button v-if="sa.isAuth('tb-order-deduction')" class="c-btn" type="warning" @click="ToDeductionByVeNo(s.row)">按车订单扣款</el-button>
 
-								<el-button v-else :disabled="true"                class="c-btn" type="warning">按车订单扣款</el-button>
 
+								<el-button v-if="sa.isAuth('tb-order-deduction')" class="c-btn" type="warning"
 
+									@click="ToDeductionByVeNo(s.row)">按车订单扣款</el-button>
 
+								<el-button v-else :disabled="true" class="c-btn" type="warning">按车订单扣款</el-button>
 
 							</span>
 
 							<span>
 
-								<el-button v-if="sa.isAuth('tb-order-sendCXB001')" class="c-btn" type="warning" @click="ToSendCXB001ByVeNo(s.row)">按车推送结关</el-button>
 
-								<el-button v-else :disabled="true"                 class="c-btn" type="warning">按车推送结关</el-button>
 
+								<el-button v-if="sa.isAuth('tb-order-sendCXB001')" class="c-btn" type="warning"
 
+									@click="ToSendCXB001ByVeNo(s.row)">按车推送结关</el-button>
 
+								<el-button v-else :disabled="true" class="c-btn" type="warning">按车推送结关</el-button>
 
 							</span>
 
 						</template>
 
 					</el-table-column>
 
 				</el-table>
 
 				<!-- ------------- 分页 ------------- -->
 
-				<sa-item type="page" :curr.sync="p.pageNo" :size.sync="p.pageSize" :total="dataCount" @change="f5()"></sa-item>
 
+				<sa-item type="page" :curr.sync="p.pageNo" :size.sync="p.pageSize" :total="dataCount"
 
+					@change="f5()"></sa-item>
 
 			</div>
 
 		</div>
 
 		<script>
 
@@ -84,14 +87,15 @@
 
 				el: '.vue-box',
 
 				data: {
 
 					p: { // 查询参数
 
-						platSeqNo: '',		// 预申报编号
 
-						declareId: '',		// 申报单编号
 
-						goodsNames: '',		// 商品名称
 
-						returns:0,
 
-						chargebacks:0,
 
-						pageNo: 1,		// 当前页
 
-						pageSize: 10,	// 页大小
 
-						sortType: 0		// 排序方式
 
+						platSeqNo: '', // 预申报编号
 
+						declareId: '', // 申报单编号
 
+						veNo: '',
 
+						goodsNames: '', // 商品名称
 
+						returns: 0,
 
+						chargebacks: 0,
 
+						pageNo: 1, // 当前页
 
+						pageSize: 10, // 页大小
 
+						sortType: 0 // 排序方式
 
 
 					},
 
 					dataCount: 0,
 
@@ -103,19 +107,20 @@
 
 						sa.ajax('/level-one-server/HtTradeSettlement/getList', sa.removeNull(this.p), function(res) {
 
 							this.dataList = res.data; // 数据
 
 							this.dataCount = res.dataCount; // 数据总数
 
-							sa.f5TableHeight();		// 刷新表格高度
 
+							sa.f5TableHeight(); // 刷新表格高度
 
 						}.bind(this));
 
 					},
 
 					// 查看
 
 					get: function(data) {
 
 						sa.showIframe('数据详情', 'ht-trade-settlement-info.html?id=' + data.id, '1050px', '90%');
 
 					},
 
-					getOrder(data){
 
-						sa.showIframe('边民订单', 'ht-trade-settlement-order.html?mainId='+data.id, '90%', '94%');
 
+					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.ajax('/level-one-server/HtTradeSettlement/hzsConfirm?id=' + data.id, function(
 
+							res) {
 
 								sa.ok('确认成功');
 
 								this.f5();
 
 							}.bind(this))
 
@@ -124,12 +129,14 @@
 
 					ToDeductionByVeNo(data) {
 
 						let veNo = data.veNo;
 
 						let id = data.id;
 
-						sa.showIframe('按车订单扣款【'+veNo+'】', 'tb-order-deductionByVeNo.html?veNo=' + veNo + '&id='+id, '1660px', '97%');
 
+						sa.showIframe('按车订单扣款【' + veNo + '】', 'tb-order-deductionByVeNo.html?veNo=' + veNo + '&id=' + id,
 
+							'1660px', '97%');
 
 					},
 
 					ToSendCXB001ByVeNo(data) {
 
 						let veNo = data.veNo;
 
 						let id = data.id;
 
-						sa.showIframe('按车推送结关【'+veNo+'】', 'tb-order-sendCXB001ByVeNo.html?veNo=' + veNo + '&id='+id, '1660px', '97%');
 
+						sa.showIframe('按车推送结关【' + veNo + '】', 'tb-order-sendCXB001ByVeNo.html?veNo=' + veNo + '&id=' +
 
+							id, '1660px', '97%');
 
 					},
 
 				},
 
 				created: function() {
 
@@ -139,4 +146,4 @@
 
 			})
 
 		</script>
 
 	</body>
 
-</html>
 
+</html>

+ 61 - 15
sa-view/listing-management/listing-management-order.html
Xem Tập Tin 

@@ -69,6 +69,7 @@
 
 							<el-option label="已转售" value="1"></el-option>
 
 						</el-select>
 
 					</sa-item>
 
+					<sa-item type="text" name="边民" v-model="p.buyUserName" width="11em"></sa-item>
 
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 
 					<el-button type="info" icon="el-icon-refresh" @click="sa.f5()">重置</el-button>
 
 				</el-form>
 
@@ -77,13 +78,16 @@
 
 						@click="editPriceByIds()">批量修改总价</el-button>
 
 					<el-button v-if="sa.isAuth('tb-order-edit-price')" type="primary" style="margin-bottom:10px;"
 
 						@click="saleBatch()">批量转售</el-button>
 
+					<el-button v-if="sa.isAuth('tb-order-edit-price')" type="warning" style="margin-bottom:10px;"
 
+						@click="callBackSleBatch()">批量撤销转售</el-button>
 
 
 				</el-form>
 
 				<div style="display: flex;padding: 10px;font-size: 16px;">
 
 					<div>订单总数：{{dataCount}};</div>
 
 					<div style="margin-left: 10px;">已上架:{{statics.upSize}};</div>
 
 					<div style="margin-left: 10px;">未上架:<span style="color:red">{{statics.notUpSize}}</span>;</div>
 
-					<div style="margin-left: 10px;">上架总金额:<span style="color:red;font-weight: bold;">{{statics.upTotalPrice}}元</span>;</div>
 
+					<div style="margin-left: 10px;">上架总金额:<span
 
+							style="color:red;font-weight: bold;">{{statics.upTotalPrice}}元</span>;</div>
 
 					<div style="margin-left: 10px;">已转售:{{statics.saleSize}};</div>
 
 					<div style="margin-left: 10px;">未转售:<span style="color:red">{{statics.notSaleSize}}</span></div>
 
 				</div>
 
@@ -91,13 +95,18 @@
 
 				<el-table class="data-table" ref="data-table" :data="dataList">
 
 					<sa-td type="selection"></sa-td>
 
 					<sa-td name="车牌号" prop="veNo"></sa-td>
 
-					<sa-td name="订单号" prop="tradeNo" width="180px"></sa-td>
 
-					<sa-td name="买家" prop="buyUserName"></sa-td>
 
+					<sa-td name="边民" prop="buyUserName"></sa-td>
 
 					<sa-td name="商家名称" prop="enterpriseName" width="280px"></sa-td>
 
 					<sa-td name="商品名称" prop="goodsNames" width="200px"></sa-td>
 
 					<sa-td name="净重(kg)" prop="netWt"></sa-td>
 
 					<sa-td name="总金额" prop="totalPrice"></sa-td>
 
-					<sa-td name="上架金额(元)" prop="upPrice"></sa-td>
 
+					<sa-td name="上架金额(元)" prop="upPrice" width="180"></sa-td>
 
+					<sa-td name="边民确认" prop="peopleConfirmStatus">
 
+						<template slot-scope="s">
 
+							<div v-if="s.row.peopleConfirmStatus==1">已确认</div>
 
+							<div v-else>未确认</div>
 
+						</template>
 
+					</sa-td>
 
 					<sa-td name="是否上架" prop="upStatus">
 
 						<template slot-scope="s">
 
 							<div v-if="s.row.upStatus==2">已上架</div>
 
@@ -121,18 +130,15 @@
 
 							<div>
 
 								<el-button
 
 									v-if="s.row.upStatus==2&&s.row.resaleStatus==0&&sa.isAuth('tb-order-edit-price')"
 
-									class="c-btn" type="success" icon="el-icon-view"
 
-									@click="editPrice(s.row)">修改总价</el-button>
 
-								<el-button v-else :disabled="true" class="c-btn" type="success" icon="el-icon-view"
 
-									@click="editPrice(s.row)">修改总价</el-button>
 
+									class="c-btn" type="success" @click="editPrice(s.row)">修改总价</el-button>
 
 							</div>
 
 							<div>
 
 								<el-button
 
-									v-if="s.row.upStatus==2&&s.row.resaleStatus==0&&sa.isAuth('tb-order-edit-price')"
 
-									class="c-btn" type="primary" icon="el-icon-plus"
 
-									@click="sel(s.row)">转售二级</el-button>
 
-								<el-button v-else :disabled="true" class="c-btn" type="primary" icon="el-icon-plus"
 
-									@click="sel(s.row)">转售二级</el-button>
 
+									v-if="s.row.peopleConfirmStatus==1&&s.row.upStatus==2&&s.row.resaleStatus==0&&sa.isAuth('tb-order-edit-price')"
 
+									class="c-btn" type="primary" @click="sel(s.row)">转售二级</el-button>
 
+								<el-button
 
+									v-if="s.row.beingOrder==0&&s.row.peopleConfirmStatus==1&&s.row.upStatus==2&&s.row.resaleStatus==1&&sa.isAuth('tb-order-edit-price')"
 
+									class="c-btn" type="warning" @click="callBackSel(s.row)">撤销转售</el-button>
 
 							</div>
 
 						</template>
 
 					</el-table-column>
 
@@ -207,11 +213,51 @@
 
 					dataList: [], // 数据集合
 
 				},
 
 				methods: {
 
+					callBackSleBatch(){
 
+						let selection = this.$refs['data-table'].selection;
 
+						let ids = sa.getArrayField(selection, 'id');
 
+						if (selection.length == 0) {
 
+							return sa.msg('请至少选择一条数据')
 
+						}
 
+						let selectList = [];
 
+						selectList = this.dataList.filter(item => ids.includes(item.id));
 
+						for (let i = 0; i < selectList.length; i++) {
 
+							if (selectList[i].resaleStatus == 0) {
 
+								return sa.msg('当前选中数据包含未转售订单，请重新选择！');
 
+							}
 
+							if (selectList[i].upStatus != 2) {
 
+								return sa.msg('当前选中数据包含未上架订单，请重新选择！');
 
+							}
 
+							if (selectList[i].peopleConfirmStatus == 0) {
 
+								return sa.msg('当前选中数据包含未确认订单，请重新选择！');
 
+							}
 
+							if (selectList[i].beingOrder == 1) {
 
+								return sa.msg('当前选中数据包含已销售订单，请重新选择！')
 
+							}
 
+						}
 
+						sa.confirm('批量撤销转售总数【' + selectList.length + '】单?', function() {
 
+							sa.ajax('/level-one-server/TbOrder/cancelSaleBatch', {
 
+								ids: ids.join(',')
 
+							}, function(res) {
 
+								this.f5();
 
+							}.bind(this));
 
+						}.bind(this));
 
+					},
 
+					callBackSel(data) {
 
+						sa.confirm('是否撤销转售订单【' + data.buyUserName + '】订单到二级市场?', function() {
 
+							sa.ajax('/level-one-server/TbOrder/cancelSale', {
 
+								id: data.id
 
+							}, function(res) {
 
+								this.f5();
 
+							}.bind(this));
 
+						}.bind(this));
 
+					},
 
+
 
 					getStatic() {
 
 						sa.ajax('/level-one-server/TbOrder/staticsStatus', {
 
 							saleMainId: this.p.saleMainId
 
 						}, function(res) {
 
-							this.statics=res.data;
 
+							this.statics = res.data;
 
 						}.bind(this));
 
 					},
 
 					// 批量修改总价
 
@@ -351,4 +397,4 @@
 
 			})
 
 		</script>
 
 	</body>
 
-</html>
 
+</html>

+ 6 - 12
sa-view/listing-management/listing-management.html
Xem Tập Tin 

@@ -25,30 +25,24 @@
 
 					<sa-item type="text" name="商铺" v-model="p.shopName" width="11em"></sa-item>
 
 				</el-form>
 
 				<el-form ref="form" :model='p' @submit.native.prevent>
 
-					<sa-item type="text" name="互市区" v-model="p.fieldName" width="8em"></sa-item>
 
 					<sa-item type="text" name="申报单编号" v-model="p.declareId" width="11em"></sa-item>
 
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()" style="margin-left: 163px">查询</el-button>
 
 					<el-button size="mini" type="info" @click="sa.f5()">重置</el-button>
 
 				</el-form>
 
 				<!-- ------------- 数据列表 ------------- -->
 
 				<el-table class="data-table" ref="data-table" :data="dataList" >
 
-					<!--<sa-td type="index" name="序号"></sa-td>-->
 
+					<sa-td type="index" name="序号" width="80"></sa-td>
 
 					<sa-td name="车牌号" prop="veNo"></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="declareName" ></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>
 
-					<sa-td name="总毛重(kg)" prop="sumGrossWt" ></sa-td>
 
-					<sa-td name="总净重(kg)" prop="sumNetWt" ></sa-td>
 
-					<sa-td name="运输方式" prop="trafMode" ></sa-td>
 
-					<sa-td name="币制" prop="currCode" ></sa-td>
 
+					<sa-td name="总毛重" prop="sumGrossWt" ></sa-td>
 
+					<sa-td name="总净重" prop="sumNetWt" ></sa-td>
 
 					<sa-td name="件数" prop="packNo" ></sa-td>
 
-					<sa-td name="互市区" prop="fieldName" width="160"></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>
 
+					<sa-td name="申报时间" prop="declTime"  width="160"></sa-td>
 
 					<el-table-column label="操作" fixed="right" >
 
 						<template slot-scope="s">
 
 							<!--<el-button class="c-btn" type="success" @click="get(s.row)">查看</el-button>-->

+ 24 - 7
sa-view/tb-orders/tb-orders-list.html
Xem Tập Tin 

@@ -23,8 +23,24 @@
 
 				<div class="c-title">检索参数</div>
 
 				<el-form ref="form" :model='p' @submit.native.prevent>
 
 					<sa-item type="text" name="车牌号" v-model="p.veNo" width="80px"></sa-item>
 
+					<sa-item type="text" name="货主" v-model="p.leaderName" width="90px"></sa-item>
 
 					<sa-item type="text" name="订单编号" v-model="p.orderNo" width="90px"></sa-item>
 
-					<sa-item type="text" name="商品名称" v-model="p.goodsName" width="90px"></sa-item>
 
+					<sa-item name="订单状态" width="90px">
 
+						<el-select v-model="p.orderFinish" style="width: 120px;">
 
+							<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 name="支付状态" width="90px">
 
+						<el-select v-model="p.isPay" style="width: 120px;">
 
+							<el-option label="全部" value=""></el-option>
 
+							<el-option label="未支付" value="0"></el-option>
 
+							<el-option label="支付中" value="3"></el-option>
 
+							<el-option label="支付失败" value="2"></el-option>
 
+							<el-option label="支付成功" value="1"></el-option>
 
+						</el-select>
 
+					</sa-item>
 
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 
 					<el-button type="info" icon="el-icon-refresh" @click="sa.f5()">重置</el-button>
 
 					<!-- <el-button v-if="sa.isAuth('tb-orders-add')" size="mini" type="primary" @click="add()">新增</el-button> -->
 
@@ -36,9 +52,8 @@
 
 					<sa-td name="订单编号" prop="orderNo" width="180px"></sa-td>
 
 					<sa-td name="商品名称" prop="goodsName" ></sa-td>
 
 					<sa-td name="买家" prop="purchaserName" width="100px"></sa-td>
 
-					<sa-td name="卖家" prop="leaderName" 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" 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="deductionCount" width="80px">
 
@@ -51,12 +66,12 @@
 
 					<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="success"  @click="get(s.row)">查看</el-button>
 
 							<el-button class="c-btn" type="primary" icon="el-icon-info" @click="getBank(s.row)">银行回执</el-button>
 
 							<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>
 
+								<el-button
 
+										   class="c-btn" type="warning"  @click="deduction(s.row)">采购补扣款</el-button>
 
+								<el-button v-else :disabled="true" class="c-btn" type="warning">采购补扣款</el-button>
 
 							</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>
 
@@ -115,6 +130,7 @@
 
 							sa.ajax('/level-two-server/TbOrders/deduction?id=' + data.id, function(res) {
 
 								sa.ok('操作成功');
 
 								sa.f5TableHeight();		// 刷新表格高度
 
+								this.f5();
 
 							}.bind(this))
 
 						}.bind(this));
 
 					},
 
@@ -133,6 +149,7 @@
 
 								sa.arrayDelete(this.dataList, data);
 
 								sa.ok('删除成功');
 
 								sa.f5TableHeight();		// 刷新表格高度
 
+								this.f5()
 
 							}.bind(this))
 
 						}.bind(this));
 
 					},

+ 10 - 5
sa-view/tb-people/tb-people-bank.html
Xem Tập Tin 

@@ -33,10 +33,10 @@
 
 						<el-row>
 
 							<div class="c-item br">
 
 								<label class="c-label">银行：</label>
 
-								<el-select v-model="m.bankName" placeholder="请选择" filterable size="mini">
 
+								<el-select v-model="m.bankNo" placeholder="请选择" filterable size="mini">
 
 									<el-option label="请选择" :value="0" disabled></el-option>
 
-									<el-option v-for="(item,index) in bankList" :key="index" :label="item.bankName"
 
-										:value="item.bankName"> </el-option>
 
+									<el-option v-for="(item,index) in bankList" :key="index" :label="item.bankName+'('+item.bankCode+')'"
 
+										:value="item.bankCode"> </el-option>
 
 								</el-select>
 
 							</div>
 
 							<div class="c-item br">
 
@@ -64,7 +64,7 @@
 
 					id: sa.p('id', 0), // 获取超链接中的id参数（0=添加，非0=修改）
 
 					m: {
 
 						id: '', // 主键
 
-						bankName: '', // 银行名称
 
+						bankNo: '', // 银行名称
 
 						bankCode: '', // 银行卡号
 
 					}, // 实体对象
 
 					bankList: []
 
@@ -77,8 +77,13 @@
 
 					},
 
 					// 提交数据
 
 					ok: function() {
 
+						let m=this.m;
 
+						sa.checkNull(m.bankNo, '请选择[银行]');
 
+						sa.checkNull(m.bankCode, '请输入 [银行卡号]');
 
+						let bankNo=m.bankNo;
 
+						let bankName=this.bankList.filter(bank=>bank.bankCode==bankNo)[0].bankName
 
 						if (this.id > 0) {
 
-							sa.ajax('/level-one-server/TbPeople/saveBankInfo', {id:this.id,bankName:this.m.bankName,bankAccount:this.m.bankCode}, function(res) {
 
+							sa.ajax('/level-one-server/TbPeople/saveBankInfo', {id:this.id,bankNo:this.m.bankNo,bankAccount:this.m.bankCode,bankName:bankName}, function(res) {
 
 								sa.alert('修改成功', this.clean);
 
 							}.bind(this));
 
 						}

+ 16 - 23
sa-view/tb-people/tb-people-list.html
Xem Tập Tin 

@@ -34,14 +34,7 @@
 
 				<el-form ref="form" :model='p' @submit.native.prevent>
 
 					<sa-item type="text" name="姓名" v-model="p.name" :need="false"></sa-item>
 
 					<sa-item type="num" name="手机号" v-model="p.phone" :need="false"></sa-item>
 
-					<div class="c-item">
 
-						<label class="c-label">商铺：</label>
 
-						<el-select v-model="p.shopId" placeholder="输入关键字搜索" filterable size="mini">
 
-							<el-option label="请选择" :value="0" disabled></el-option>
 
-							<el-option v-for="(item,index) in shopList" :key="index"
 
-								:label="item.shopName+'('+item.shopNo+')'" :value="item.id"> </el-option>
 
-						</el-select>
 
-					</div>
 
+					
 					<!-- <sa-item type="text" name="边民号" v-model="p.code" :need="false"></sa-item> -->
 
 					<el-button type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 
 					<el-button type="info" icon="el-icon-refresh" @click="sa.f5()">重置</el-button>
 
@@ -57,28 +50,20 @@
 
 					<sa-td name="性别" prop="sex" type="enum" :jv="{'1': '男', '2': '女'}"></sa-td>
 
 					<sa-td name="手机号码" prop="phone" type="phone"></sa-td>
 
 					<sa-td name="身份证" prop="idCard" type="idCard"></sa-td>
 
-					<sa-td name="互助组名称" prop="groupName"></sa-td>
 
-					<sa-td name="互市区" prop="tradeAreaName"></sa-td>
 
-					<sa-td name="场所编码" prop="fieldCode"></sa-td>
 
-					<!--<sa-td name="所属商铺" prop="shopName" width="200">
 
-						<template slot-scope="s">
 
-							<div>{{s.row.shopName}}
 
-								<el-link v-if="sa.isAuth('tb-people-bind-shop')&&s.row.shopName" type="primary"
 
-									@click="removeBind(s.row)" style="font-size: 12px;">(解绑)</el-link>
 
-							</div>
 
-							<el-link v-if="sa.isAuth('tb-people-bind-shop')&&!s.row.shopName" type="primary"
 
-								@click="selectShop(s.row)">选择</el-link>
 
-						</template>
 
-					</sa-td>-->
 
+					<sa-td name="互助组" prop="groupName"></sa-td>
 
+					<sa-td name="银行" prop="bankName" width="160"></sa-td>
 
+					<sa-td name="银行卡" prop="bankCode" width="200"></sa-td>
 
 					<sa-td name="创建时间" prop="createTime"></sa-td>
 
-					<el-table-column label="操作" width="240px" fixed="right">
 
-						<template slot-scope="s"> 
+					<el-table-column label="操作" width="280px" 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 v-if="sa.isAuth('tb-people-edit')" class="c-btn" type="primary" icon="el-icon-edit"
 
 									@click="editFn(s.row)">手机号</el-button>
 
 							<el-button v-if="sa.isAuth('tb-people-edit')" class="c-btn" type="primary" icon="el-icon-edit"
 
 								@click="updateBankInfo(s.row.id)">银行卡</el-button>
 
+								<el-button v-if="sa.isAuth('tb-people-edit')" class="c-btn" type="warning" icon="el-icon-delete"
 
+									@click="cleanFace(s.row)">人脸</el-button>
 
 						</template>
 
 					</el-table-column>
 
 				</el-table>
 
@@ -169,6 +154,14 @@
 
 					dataList: [], // 数据集合
 
 				},
 
 				methods: {
 
+					cleanFace(data){
 
+						sa.confirm('是否清除该边民人脸？', function() {
 
+							sa.ajax('/sp-admin/AppUser/cleanFace?id=' + data.id, function(res) {
 
+								sa.ok('清除成功，需退出APP重新登录');
 
+								sa.f5TableHeight(); // 刷新表格高度
 
+							}.bind(this))
 
+						}.bind(this));
 
+					},
 
 					editFn(data) {
 
 						this.phone = {
 
 							title: '修改【' + data.name + '】手机号',

+ 3 - 3
sa-view/tb-purchaser-personal/tb-purchaser-personal-list.html
Xem Tập Tin 

@@ -32,8 +32,8 @@
 
 					<sa-td name="姓名" prop="name" ></sa-td>
 
 					<sa-td name="联系电话" prop="contact" type="phone"></sa-td>
 
 					<sa-td name="身份证号" prop="idCard" type="idCard"></sa-td>
 
-					<sa-td name="邮箱" prop="email" ></sa-td>
 
-					<sa-td name="地址" prop="address" ></sa-td>
 
+					<sa-td name="银行" prop="bankName" width="240"></sa-td>
 
+					<sa-td name="银行账号" prop="bankAccount" ></sa-td>
 
 					<sa-td name="审核状态" prop="judgeStatus">
 
 						<template slot-scope="scope">
 
 							<el-tag type="danger" v-if="scope.row.judgeStatus==0">未审核</el-tag>
 
@@ -44,7 +44,7 @@
 
 					<el-table-column label="操作" fixed="right"  width="240px">
 
 						<template slot-scope="s">
 
 							<el-button class="c-btn" type="success" icon="el-icon-view" @click="get(s.row)">查看</el-button>
 
-							<el-button v-if="sa.isAuth('tb-purchaser-edit') && s.row.judgeStatus!=1" class="c-btn" type="primary" icon="el-icon-edit" @click="update(s.row)">修改</el-button>
 
+							<el-button v-if="sa.isAuth('tb-purchaser-edit')" class="c-btn" type="primary" icon="el-icon-edit" @click="update(s.row)">修改</el-button>
 
 							<el-button v-if="sa.isAuth('tb-purchaser-del')" class="c-btn" type="danger" icon="el-icon-delete" @click="del(s.row)">删除</el-button>
 
 						</template>
 
 					</el-table-column>

+ 27 - 21
sa-view/tb-purchaser/tb-purchaser-add.html
Xem Tập Tin 

@@ -71,7 +71,8 @@
 
 							<tr>
 
 								<th>统一社会信用代码</th>
 
 								<td>
 
-									<el-input type="text" v-model="m.dutyParagraph" placeholder="请输入统一社会信用代码"></el-input>
 
+									<el-input type="text" v-model="m.dutyParagraph"
 
+										placeholder="请输入统一社会信用代码"></el-input>
 
 								</td>
 
 								<th>营业执照</th>
 
 								<td>
 
@@ -83,27 +84,31 @@
 
 								<td>
 
 									<el-input type="text" v-model="m.name" placeholder="请输入联系人"></el-input>
 
 								</td>
 
-								<th>邮箱</th>
 
-								<td>
 
-									<el-input type="text" v-model="m.email" placeholder="请输入邮箱"></el-input>
 
-								</td>
 
-							</tr>
 
-							<tr>
 
 								<th>联系电话</th>
 
 								<td>
 
 									<el-input type="text" v-model="m.contact" placeholder="请输入联系电话"></el-input>
 
 								</td>
 
+
 
+							</tr>
 
+							<tr>
 
 								<th>身份证号</th>
 
 								<td>
 
 									<el-input type="text" v-model="m.idCard" placeholder="请输入身份证号"></el-input>
 
 								</td>
 
+								<th>邮箱</th>
 
+								<td>
 
+									<el-input type="text" v-model="m.email" placeholder="请输入邮箱"></el-input>
 
+								</td>
 
 							</tr>
 
+
 
 							<tr>
 
 								<th>银行名称</th>
 
 								<td>
 
 									<el-select v-model="m.bankNo" placeholder="请选择" filterable size="mini">
 
 										<el-option label="请选择" :value="0" disabled></el-option>
 
-										<el-option v-for="(item,index) in bankList" :key="index" :label="item.bankName" :value="item.bankCode"></el-option>
 
+										<el-option v-for="(item,index) in bankList" :key="index"
 
+											:label="item.bankName+'('+item.bankCode+')'"
 
+											:value="item.bankCode"></el-option>
 
 									</el-select>
 
 								</td>
 
 								<th>银行账号</th>
 
@@ -114,7 +119,8 @@
 
 							<tr>
 
 								<th>企业地址</th>
 
 								<td colspan="3">
 
-									<el-input type="text" v-model="m.address"  placeholder="请输入企业地址" style="width: 90%"></el-input>
 
+									<el-input type="text" v-model="m.address" placeholder="请输入企业地址"
 
+										style="width: 90%"></el-input>
 
 								</td>
 
 							</tr>
 
 						</table>
 
@@ -150,18 +156,18 @@
 
 					// 创建一个 默认Model
 
 					createModel: function() {
 
 						return {
 
-							businessName: '',		// 企业名称
 
-							legalPerson: '', 		// 企业法人
 
-							dutyParagraph: '', 		// 统一社会信用代码
 
-							businessLicense: '', 	// 营业执照
 
-							name: '', 				// 联系人
 
-							email: '', 				// 邮箱
 
-							contact: '', 			// 手机号码
 
-							idCard: '', 			// 身份证号
 
-							bankNo: '', 			// 银行编号
 
-							bankName: '', 			// 银行名称
 
-							bankAccount: '', 		// 银行账号
 
-							address: '', 			// 企业地址
 
+							businessName: '', // 企业名称
 
+							legalPerson: '', // 企业法人
 
+							dutyParagraph: '', // 统一社会信用代码
 
+							businessLicense: '', // 营业执照
 
+							name: '', // 联系人
 
+							email: '', // 邮箱
 
+							contact: '', // 手机号码
 
+							idCard: '', // 身份证号
 
+							bankNo: '', // 银行编号
 
+							bankName: '', // 银行名称
 
+							bankAccount: '', // 银行账号
 
+							address: '', // 企业地址
 
 						}
 
 					},
 
 					// 提交数据

+ 142 - 0
sa-view/tb-purchaser/tb-purchaser-bank.html
Xem Tập Tin 

@@ -0,0 +1,142 @@
 
+<!DOCTYPE html>
 
+<html>
 
+	<head>
 
+		<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="https://unpkg.com/element-ui@2.13.0/lib/theme-chalk/index.css">
 
+		<link rel="stylesheet" href="../../static/sa.css">
 
+		<script src="https://unpkg.com/vue@2.6.10/dist/vue.min.js"></script>
 
+		<script src="https://unpkg.com/element-ui@2.13.0/lib/index.js"></script>
 
+		<script src="https://unpkg.com/jquery@3.4.1/dist/jquery.js"></script>
 
+		<script src="../../static/kj/layer/layer.js"></script>
 
+		<script src="../../static/sa.js"></script>
 
+		<script src="../../static/kj/upload-util.js"></script>
 
+		<style type="text/css">
 
+			.c-panel .el-form .c-label {
 
+				width: 7em !important;
 
+			}
 
+
 
+			.c-panel .el-form .el-input,
 
+			.c-panel .el-form .el-textarea__inner {
 
+				width: 350px;
 
+			}
 
+		</style>
 
+	</head>
 
+	<body>
 
+		<div class="vue-box" :class="{sbot: id}" style="display: none;" :style="'display: block;'">
 
+			<!-- ------- 内容部分 ------- -->
 
+			<div class="s-body">
 
+				<div class="c-panel">
 
+					<el-form size="mini" v-if="m">
 
+						<el-row>
 
+							<div class="c-item br">
 
+								<label class="c-label">银行：</label>
 
+								<el-select v-model="m.bank" placeholder="请选择" filterable size="mini">
 
+									<el-option label="请选择" :value="0" disabled></el-option>
 
+									<el-option v-for="(item,index) in bankList" :key="index"
 
+										:label="item.bankName+'('+item.bankCode+')'" :value="item.bankCode">
 
+									</el-option>
 
+								</el-select>
 
+							</div>
 
+							<div class="c-item br">
 
+								<label class="c-label">银行卡号：</label>
 
+								<el-input size="mini" v-model="m.bankAccount"></el-input>
 
+							</div>
 
+							<div class="c-item br">
 
+								<label class="c-label">证件类型：</label>
 
+								<el-select v-model="m.ownerIdtype" placeholder="请选择" filterable size="mini">
 
+									<el-option label="请选择" :value="0" disabled></el-option>
 
+									<el-option label="身份证(0001)" value="0001" ></el-option>
 
+									<el-option label="护照(0002)" value="0002" ></el-option>
 
+									<el-option label="军官证(0003)" value="0003" ></el-option>
 
+									<el-option label="港澳通行证(0004)" value="0004" ></el-option>
 
+									<el-option label="马帮丁(0005)" value="0005" ></el-option>
 
+									<el-option label="营业执照(0006)" value="0006" ></el-option>
 
+									<el-option label="社会统一信用代码(0008)" value="0008" ></el-option>
 
+									<el-option label="其他(0007)" value="0007" ></el-option>
 
+								</el-select>
 
+							</div>
 
+							<div class="c-item br">
 
+								<label class="c-label">国籍：</label>
 
+								<el-select v-model="m.nationality" placeholder="请选择" filterable size="mini">
 
+									<el-option label="请选择" :value="0" disabled></el-option>
 
+									<el-option label="柬埔寨(0006)" value="0006" ></el-option>
 
+									<el-option label="俄罗斯(0007)" value="0007" ></el-option>
 
+									<el-option label="老挝(0004)" value="0004" ></el-option>
 
+									<el-option label="中国(0001)" value="0001"></el-option>
 
+									<el-option label="越南(0002)" value="0002"></el-option>
 
+									<el-option label="缅甸(0003)" value="0003"></el-option>
 
+									<el-option label="蒙古(0005)" value="0005"></el-option>
 
+								</el-select>
 
+							</div>
 
+						</el-row>
 
+						<div class="c-item br s-ok">
 
+							<label class="c-label"></label>
 
+							<el-button size="mini" type="primary" icon="el-icon-plus" @click="ok()">保存</el-button>
 
+						</div>
 
+					</el-form>
 
+				</div>
 
+			</div>
 
+			<!-- ------- 底部按钮 ------- -->
 
+			<div class="s-foot">
 
+				<el-button size="mini" type="primary" @click="ok()">确定</el-button>
 
+				<el-button size="mini" @click="sa.closeCurrIframe()">取消</el-button>
 
+			</div>
 
+		</div>
 
+		<script>
 
+			var app = new Vue({
 
+				el: '.vue-box',
 
+				data: {
 
+					id: sa.p('id', 0), // 获取超链接中的id参数（0=添加，非0=修改）
 
+					m: {
 
+						id: '', // 主键
 
+						bankName: '', // 银行名称
 
+						bankCode: '', // 银行卡号
 
+					}, // 实体对象
 
+					bankList: []
 
+				},
 
+				methods: {
 
+					getBankList() {
 
+						sa.ajax('/sp-admin/TbBank/getAll', function(resp) {
 
+							this.bankList = resp.data;
 
+						}.bind(this));
 
+					},
 
+					// 提交数据
 
+					ok: function() {
 
+						let m=this.m;
 
+						sa.checkNull(m.bank, '请选择[银行]');
 
+						sa.checkNull(m.bankAccount, '请输入 [银行卡号]');
 
+						sa.checkNull(m.ownerIdtype, '请选择 [证件类型]');
 
+						sa.checkNull(m.nationality, '请选择 [国籍]');
 
+						sa.ajax('/level-one-server/TbShop/update', sa.removeNull(m), function(res) {
 
+							sa.alert('修改成功', this.clean);
 
+						}.bind(this));
 
+					},
 
+					// 添加/修改 完成后的动作
 
+					clean: function() {
 
+						parent.app.f5(); // 刷新父页面列表
 
+						sa.closeCurrIframe(); // 关闭本页
 
+					},
 
+					initFn() {
 
+						// 初始化数据
 
+						if (this.id > 0) {
 
+							sa.ajax('/level-one-server/TbShop/getById?id=' + this.id, function(res) {
 
+								this.m = res.data;
 
+								if (res.data == null) {
 
+									sa.alert('未能查找到 id=' + this.id + " 详细数据");
 
+								}
 
+							}.bind(this))
 
+						};
 
+					}
 
+				},
 
+				mounted: function() {
 
+					this.initFn()
 
+					this.getBankList()
 
+				}
 
+			})
 
+		</script>
 
+	</body>
 
+</html>

+ 1 - 1
sa-view/tb-purchaser/tb-purchaser-list.html
Xem Tập Tin 

@@ -51,7 +51,7 @@
 
 					<el-table-column label="操作" fixed="right"  width="240px">
 
 						<template slot-scope="s">
 
 							<el-button class="c-btn" type="success" icon="el-icon-view" @click="get(s.row)">查看</el-button>
 
-							<el-button v-if="sa.isAuth('tb-purchaser-edit') && s.row.judgeStatus!=1" class="c-btn" type="primary" icon="el-icon-edit" @click="update(s.row)">修改</el-button>
 
+							<el-button v-if="sa.isAuth('tb-purchaser-edit')"  class="c-btn" type="primary" icon="el-icon-edit" @click="update(s.row)">修改</el-button>
 
 							<el-button v-if="sa.isAuth('tb-purchaser-del')" class="c-btn" type="danger" icon="el-icon-delete" @click="del(s.row)">删除</el-button>
 
 						</template>
 
 					</el-table-column>

+ 142 - 0
sa-view/tb-shop/tb-shop-bank.html
Xem Tập Tin 

@@ -0,0 +1,142 @@
 
+<!DOCTYPE html>
 
+<html>
 
+	<head>
 
+		<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="https://unpkg.com/element-ui@2.13.0/lib/theme-chalk/index.css">
 
+		<link rel="stylesheet" href="../../static/sa.css">
 
+		<script src="https://unpkg.com/vue@2.6.10/dist/vue.min.js"></script>
 
+		<script src="https://unpkg.com/element-ui@2.13.0/lib/index.js"></script>
 
+		<script src="https://unpkg.com/jquery@3.4.1/dist/jquery.js"></script>
 
+		<script src="../../static/kj/layer/layer.js"></script>
 
+		<script src="../../static/sa.js"></script>
 
+		<script src="../../static/kj/upload-util.js"></script>
 
+		<style type="text/css">
 
+			.c-panel .el-form .c-label {
 
+				width: 7em !important;
 
+			}
 
+
 
+			.c-panel .el-form .el-input,
 
+			.c-panel .el-form .el-textarea__inner {
 
+				width: 350px;
 
+			}
 
+		</style>
 
+	</head>
 
+	<body>
 
+		<div class="vue-box" :class="{sbot: id}" style="display: none;" :style="'display: block;'">
 
+			<!-- ------- 内容部分 ------- -->
 
+			<div class="s-body">
 
+				<div class="c-panel">
 
+					<el-form size="mini" v-if="m">
 
+						<el-row>
 
+							<div class="c-item br">
 
+								<label class="c-label">银行：</label>
 
+								<el-select v-model="m.bank" placeholder="请选择" filterable size="mini">
 
+									<el-option label="请选择" :value="0" disabled></el-option>
 
+									<el-option v-for="(item,index) in bankList" :key="index"
 
+										:label="item.bankName+'('+item.bankCode+')'" :value="item.bankCode">
 
+									</el-option>
 
+								</el-select>
 
+							</div>
 
+							<div class="c-item br">
 
+								<label class="c-label">银行卡号：</label>
 
+								<el-input size="mini" v-model="m.bankAccount"></el-input>
 
+							</div>
 
+							<div class="c-item br">
 
+								<label class="c-label">证件类型：</label>
 
+								<el-select v-model="m.ownerIdtype" placeholder="请选择" filterable size="mini">
 
+									<el-option label="请选择" :value="0" disabled></el-option>
 
+									<el-option label="身份证(0001)" value="0001" ></el-option>
 
+									<el-option label="护照(0002)" value="0002" ></el-option>
 
+									<el-option label="军官证(0003)" value="0003" ></el-option>
 
+									<el-option label="港澳通行证(0004)" value="0004" ></el-option>
 
+									<el-option label="马帮丁(0005)" value="0005" ></el-option>
 
+									<el-option label="营业执照(0006)" value="0006" ></el-option>
 
+									<el-option label="社会统一信用代码(0008)" value="0008" ></el-option>
 
+									<el-option label="其他(0007)" value="0007" ></el-option>
 
+								</el-select>
 
+							</div>
 
+							<div class="c-item br">
 
+								<label class="c-label">国籍：</label>
 
+								<el-select v-model="m.nationality" placeholder="请选择" filterable size="mini">
 
+									<el-option label="请选择" :value="0" disabled></el-option>
 
+									<el-option label="柬埔寨(0006)" value="0006" ></el-option>
 
+									<el-option label="俄罗斯(0007)" value="0007" ></el-option>
 
+									<el-option label="老挝(0004)" value="0004" ></el-option>
 
+									<el-option label="中国(0001)" value="0001"></el-option>
 
+									<el-option label="越南(0002)" value="0002"></el-option>
 
+									<el-option label="缅甸(0003)" value="0003"></el-option>
 
+									<el-option label="蒙古(0005)" value="0005"></el-option>
 
+								</el-select>
 
+							</div>
 
+						</el-row>
 
+						<div class="c-item br s-ok">
 
+							<label class="c-label"></label>
 
+							<el-button size="mini" type="primary" icon="el-icon-plus" @click="ok()">保存</el-button>
 
+						</div>
 
+					</el-form>
 
+				</div>
 
+			</div>
 
+			<!-- ------- 底部按钮 ------- -->
 
+			<div class="s-foot">
 
+				<el-button size="mini" type="primary" @click="ok()">确定</el-button>
 
+				<el-button size="mini" @click="sa.closeCurrIframe()">取消</el-button>
 
+			</div>
 
+		</div>
 
+		<script>
 
+			var app = new Vue({
 
+				el: '.vue-box',
 
+				data: {
 
+					id: sa.p('id', 0), // 获取超链接中的id参数（0=添加，非0=修改）
 
+					m: {
 
+						id: '', // 主键
 
+						bankName: '', // 银行名称
 
+						bankCode: '', // 银行卡号
 
+					}, // 实体对象
 
+					bankList: []
 
+				},
 
+				methods: {
 
+					getBankList() {
 
+						sa.ajax('/sp-admin/TbBank/getAll', function(resp) {
 
+							this.bankList = resp.data;
 
+						}.bind(this));
 
+					},
 
+					// 提交数据
 
+					ok: function() {
 
+						let m=this.m;
 
+						sa.checkNull(m.bank, '请选择[银行]');
 
+						sa.checkNull(m.bankAccount, '请输入 [银行卡号]');
 
+						sa.checkNull(m.ownerIdtype, '请选择 [证件类型]');
 
+						sa.checkNull(m.nationality, '请选择 [国籍]');
 
+						sa.ajax('/level-one-server/TbShop/update', sa.removeNull(m), function(res) {
 
+							sa.alert('修改成功', this.clean);
 
+						}.bind(this));
 
+					},
 
+					// 添加/修改 完成后的动作
 
+					clean: function() {
 
+						parent.app.f5(); // 刷新父页面列表
 
+						sa.closeCurrIframe(); // 关闭本页
 
+					},
 
+					initFn() {
 
+						// 初始化数据
 
+						if (this.id > 0) {
 
+							sa.ajax('/level-one-server/TbShop/getById?id=' + this.id, function(res) {
 
+								this.m = res.data;
 
+								if (res.data == null) {
 
+									sa.alert('未能查找到 id=' + this.id + " 详细数据");
 
+								}
 
+							}.bind(this))
 
+						};
 
+					}
 
+				},
 
+				mounted: function() {
 
+					this.initFn()
 
+					this.getBankList()
 
+				}
 
+			})
 
+		</script>
 
+	</body>
 
+</html>

+ 35 - 21
sa-view/tb-shop/tb-shop-list.html
Xem Tập Tin 

@@ -21,17 +21,21 @@
 
 				<!-- ------------- 检索参数 ------------- -->
 
 				<div class="c-title">检索参数</div>
 
 				<el-form ref="form" :model='p' @submit.native.prevent>
 
-					<div class="c-item">
 
+				<!-- 	<div class="c-item">
 
 						<label class="c-label">互市区：</label>
 
 						<el-select v-model="p.tradeAreaId" placeholder="请选择" filterable size="mini">
 
 							<el-option label="请选择" :value="0" disabled></el-option>
 
 							<el-option v-for="(item,index) in tradeAreaList" :key="index" :label="item.name" :value="item.id"> </el-option>
 
 						</el-select>
 
-					</div>
 
+					</div> -->
 
 					<div class="c-item">
 
 						<label class="c-label">商铺名称：</label>
 
 						<el-input size="mini" v-model="p.shopName"></el-input>
 
 					</div>
 
+					<div class="c-item">
 
+						<label class="c-label">铺主：</label>
 
+						<el-input size="mini" v-model="p.ownerName"></el-input>
 
+					</div>
 
 					<div class="c-item" style="min-width: 0px;">
 
 						<el-button size="mini" type="primary" icon="el-icon-search" @click="p.pageNo = 1; f5()">查询</el-button>
 
 						<el-button size="mini" type="info" icon="el-icon-refresh" @click="sa.f5()">重置</el-button>
 
@@ -40,39 +44,46 @@
 
 				</el-form>
 
 				<!-- ------------- 数据列表 ------------- -->
 
 				<el-table class="data-table" ref="data-table" :data="dataList" size="small">
 
-					<el-table-column align="center" label="" type="index" width="35px"></el-table-column>
 
+					<el-table-column align="center" label="序号" type="index" width="80px"></el-table-column>
 
 					<el-table-column align="center" label="商铺名称" prop="shopName"></el-table-column>
 
-					<el-table-column align="center" label="商铺编码" prop="shopNo"></el-table-column>
 
-					<el-table-column align="center" label="商铺类型" prop="shopType">
 
+					<el-table-column align="center" label="铺主姓名" prop="ownerName" width="340px"></el-table-column>
 
+					<el-table-column align="center" label="国别" prop="shopType">
 
 						<template slot-scope="s">
 
-							<span v-if="s.row.shopType == 1">中方商铺</span>
 
-							<span v-else-if="s.row.shopType == 2">外国商铺</span>
 
-							<span v-else>-</span>
 
+							<span v-if="s.row.nationality == 0006">柬埔寨</span>
 
+							<span v-if="s.row.nationality == 0007">俄罗斯</span>
 
+							<span v-if="s.row.nationality == 0004">老挝</span>
 
+							<span v-if="s.row.nationality == 0001">中国</span>
 
+							<span v-if="s.row.nationality == 0002">越南</span>
 
+							<span v-if="s.row.nationality == 0003">缅甸</span>
 
+							<span v-if="s.row.nationality == 0005">蒙古</span>
 
 						</template>
 
 					</el-table-column>
 
-					<el-table-column align="center" label="铺主姓名" prop="ownerName" width="340px"></el-table-column>
 
-					<el-table-column align="center" label="铺主电话" prop="ownerTel">
 
+					<el-table-column align="center" label="证件类型" prop="ownerName" width="180px">
 
 						<template slot-scope="s">
 
-							<span v-if="s.row.ownerTel">{{maskPhone(s.row.ownerTel)}}</span>
 
-							<span v-else>-</span>
 
+							<span v-if="s.row.ownerIdtype == 0001">身份证（0001）</span>
 
+							<span v-if="s.row.ownerIdtype == 0002">护照（0002）</span>
 
+							<span v-if="s.row.ownerIdtype == 0003">军官证（0003）</span>
 
+							<span v-if="s.row.ownerIdtype == 0004">港澳通行证（0004）</span>
 
+							<span v-if="s.row.ownerIdtype == 0005">马帮丁（0005）</span>
 
+							<span v-if="s.row.ownerIdtype == 0006">营业执照（0006）</span>
 
+							<span v-if="s.row.ownerIdtype == 0008">社会统一信用代码（0008）</span>
 
+							<span v-if="s.row.ownerIdtype == 0007">其他（0007）</span>
 
 						</template>
 
 					</el-table-column>
 
-					<el-table-column align="center" label="状态" prop="edstatus">
 
+					<el-table-column align="center" label="银行" prop="bank" width="140px"></el-table-column>
 
+					<el-table-column align="center" label="卡号" prop="bankAccount" width="140px"></el-table-column>
 
+					<el-table-column align="center" label="铺主电话" prop="ownerTel" width="120px">
 
 						<template slot-scope="s">
 
-							<span v-if="s.row.edstatus == 1">启用</span>
 
-							<span v-else-if="s.row.edstatus == 2">停用</span>
 
-							<span v-else-if="s.row.edstatus == 3">注销</span>
 
+							<span v-if="s.row.ownerTel">{{maskPhone(s.row.ownerTel)}}</span>
 
 							<span v-else>-</span>
 
 						</template>
 
 					</el-table-column>
 
-					<el-table-column align="center" label="互市区" prop="fieldName"></el-table-column>
 
-					<el-table-column align="center" label="经营范围" prop="bnsScope"></el-table-column>
 
-					<el-table-column align="center" label="操作" fixed="right" width="160px">
 
+					<el-table-column align="center" label="操作" fixed="right" width="200px">
 
 						<template slot-scope="s">
 
-							<el-button class="c-btn" type="primary" icon="el-icon-s-custom" @click="peopleFn(s.row)">边民
 
-							</el-button>
 
 							<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="bankInfo(s.row)">银行卡
 
+							</el-button>
 
 						</template>
 
 					</el-table-column>
 
 				</el-table>
 
@@ -127,6 +138,9 @@
 
 					get: function(data) {
 
 						sa.showIframe('数据详情', 'tb-shop-info.html?id=' + data.id, '1150px', '95%');
 
 					},
 
+					bankInfo: function(data) {
 
+						sa.showIframe('银行信息', 'tb-shop-bank.html?id=' + data.id, '700px', '75%');
 
+					},
 
 					// 查看 - 根据选中的
 
 					getBySelect: function(data) {
 
 						var selection = this.$refs['data-table'].selection;