Explorar o código

Merge branch 'feature/asyncOrder' of http://git.aseanbusiness.cn/qzyReal/market-admin-ui into feature/asyncOrder

# Conflicts:
#	sa-view/tb-order/tb-order-list.html
#	sa-view/tb-people/tb-people-list.html
qzy hai 2 meses
pai
achega
3a65bc6015

+ 36 - 2
sa-frame/menu-list-sp.js

@@ -85,8 +85,8 @@ window.menuList.unshift({
 				url: 'sa-view-sp/sp-role/menu-list.html',
 				info: '所有菜单项预览'
 			},
-		
-		
+
+
 			// {id: 'apilog-list', name: '请求日志监控', url: 'sa-view-sp/sp-apilog/api-log-list.html', info: '记录本系统所有的api请求'},
 		]
 	}, {
@@ -550,6 +550,40 @@ window.menuList.unshift({
 				]
 			},
 			{
+				id: 'listing-manage',
+				name: '上架管理',
+				parent: true,
+				childList: [
+					{
+						id: 'listing-management',
+						name: '商品整车列表',
+						url: 'sa-view/listing-management/listing-management.html',
+						childList: [
+							{
+								id: 'tb-order-edit-price',
+								name: '修改上架金额',
+								isShow: false
+							},
+							{
+								id: 'ht-trade-settlement-add',
+								name: '添加订单',
+								isShow: false
+							},
+							{
+								id: 'ht-trade-settlement-edit',
+								name: '修改订单',
+								isShow: false
+							},
+							{
+								id: 'ht-trade-settlement-del',
+								name: '删除订单',
+								isShow: false
+							},
+						]
+					}
+				]
+			},
+			{
 				id: 'order-list',
 				name: '订单管理',
 				parent: true,

+ 14 - 14
sa-view/ht-trade-settlement/ht-trade-settlement-order.html

@@ -35,8 +35,8 @@
 					<sa-td type="index" width="30px"></sa-td>
 					<sa-td name="订单号" prop="tradeNo" width="180px"></sa-td>
 					<sa-td name="买家" prop="buyUserName" ></sa-td>
-					<sa-td name="商家名称" prop="enterpriseName" ></sa-td>
-					<sa-td name="商品名称" prop="goodsNames" ></sa-td>
+					<sa-td name="商家名称" prop="enterpriseName" width="280px"></sa-td>
+					<sa-td name="商品名称" prop="goodsNames" width="200px"></sa-td>
 					<sa-td name="总重量" prop="totalWeight" ></sa-td>
 					<sa-td name="车牌号" prop="veNo" ></sa-td>
 					<sa-td name="总金额" prop="totalPrice" ></sa-td>
@@ -82,8 +82,8 @@
 		<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: {
@@ -96,17 +96,17 @@
 							selPrice:0
 						}
 					},
-					p: { // 查询参数  
-						tradeNo: '',		    // 订单号 
-						buyUserName: '',		// 买家 
-						enterpriseName: '',		// 商家名称 
+					p: { // 查询参数
+						tradeNo: '',		    // 订单号
+						buyUserName: '',		// 买家
+						enterpriseName: '',		// 商家名称
 						platSeqNo: sa.p('platSeqNo', 0),
-						pageNo: 1,		// 当前页 
-						pageSize: 20,	// 页大小 
-						sortType: 0		// 排序方式 
+						pageNo: 1,		// 当前页
+						pageSize: 20,	// 页大小
+						sortType: 0		// 排序方式
 					},
 					dataCount: 0,
-					dataList: [], // 数据集合 
+					dataList: [], // 数据集合
 				},
 				methods: {
 					editPrice(item){
@@ -142,8 +142,8 @@
 					f5: function() {
 						sa.ajax('/level-one-server/TbOrder/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));
 					},
 					// 查看银行回执

+ 236 - 0
sa-view/listing-management/listing-management-order.html

@@ -0,0 +1,236 @@
+<!DOCTYPE html>
+<html>
+	<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" />
+		<!-- 所有的 css & js 资源 -->
+		<link rel="stylesheet" href="../../static/kj/element-ui/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="../../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>
+		<style type="text/css">
+			hr {
+				border: none;          /* 移除默认边框 */
+				height: 1px;           /* 设置高度 */
+				background-color: gainsboro;/* 设置颜色 */
+				margin: 5px 0;        /* 设置上下外边距 */
+			}
+			.c-panel .el-form .c-label{width: 7em !important;}
+			.c-panel .el-form .el-input, .c-panel .el-form .el-textarea__inner{width: 250px;}
+		</style>
+	</head>
+	<body>
+		<div class="vue-box" style="display: none;" :style="'display: block;'">
+			<div class="c-panel">
+				<el-form v-if="bigData">
+					<el-row style="margin-left: 200px;">
+						<el-col span="12">
+							<sa-info name="商铺" br>{{bigData.shopName}}</sa-info>
+							<sa-info name="商品名称" br>{{bigData.goodsNames}}</sa-info>
+							<sa-info name="总金额" br>{{bigData.sumAmt}}</sa-info>
+						</el-col>
+						<el-col span="12">
+							<sa-info name="车牌号" br>{{bigData.veNo}}</sa-info>
+							<sa-info name="互市区" br>{{bigData.fieldName}}</sa-info>
+							<sa-info name="创建时间" br>{{bigData.createTime}}</sa-info>
+						</el-col>
+					</el-row>
+				</el-form>
+				<hr>
+				<el-form ref="form" :model='p' @submit.native.prevent>
+					<div style="margin: 15px 0px 15px 0px;">详情-边民订单</div>
+					<el-button v-if="sa.isAuth('tb-order-edit-price')"
+							type="primary" style="margin-bottom:10px;" @click="editPriceByIds()">批量修改总价</el-button>
+				</el-form>
+				<!-- ------------- 数据列表 ------------- -->
+				<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="buyUserName" ></sa-td>
+					<sa-td name="商家名称" prop="enterpriseName" width="280px"></sa-td>
+					<sa-td name="商品名称" prop="goodsNames" width="200px"></sa-td>
+					<sa-td name="总重量" prop="totalWeight" ></sa-td>
+					<sa-td name="车牌号" prop="veNo" ></sa-td>
+					<sa-td name="总金额" prop="totalPrice" ></sa-td>
+					<sa-td name="上架金额(元)" prop="upPrice" ></sa-td>
+					<sa-td name="是否上架" prop="upStatus" >
+						<template slot-scope="s">
+							<div v-if="s.row.upStatus==2">已上架</div>
+							<div v-else>未上架</div>
+						</template>
+					</sa-td>
+					<sa-td name="是否转售" prop="resaleStatus" >
+						<template slot-scope="s">
+							<div v-if="s.row.resaleStatus==1">已转售</div>
+							<div v-else>未转售</div>
+						</template>
+					</sa-td>
+					<el-table-column label="操作" fixed="right"  width="200px">
+						<template slot-scope="s">
+							<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-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>
+						</template>
+					</el-table-column>
+				</el-table>
+				<!-- ------------- 分页 ------------- -->
+				<sa-item type="page" :curr.sync="p.pageNo" :size.sync="p.pageSize" :total="dataCount" @change="f5()"></sa-item>
+			</div>
+			<el-dialog :title="model.title" :visible.sync="model.visible" width="500px">
+				<div>
+					当前价格(元):{{model.form.upPrice}}
+				</div>
+				<sa-item type="num" name="金额" v-model="model.form.selPrice" placeholder="确认金额" br></sa-item>
+				<span slot="footer" class="dialog-footer">
+					<el-button @click="model.visible = false">取 消</el-button>
+					<el-button type="primary" @click="save">保存</el-button>
+					<!--<el-button type="primary" @click="sel">转售二级</el-button>-->
+				</span>
+			</el-dialog>
+			<el-dialog :title="model1.title" :visible.sync="model1.visible" width="500px">
+				<sa-item type="num" name="金额" v-model="model1.selPrice" placeholder="确认金额" br></sa-item>
+				<span slot="footer" class="dialog-footer">
+					<el-button @click="model1.visible = false">取 消</el-button>
+					<el-button type="primary" @click="savePriceByIds">保存</el-button>
+					<!--<el-button type="primary" @click="sel">转售二级</el-button>-->
+				</span>
+			</el-dialog>
+		</div>
+		<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-info": httpVueLoader('../../sa-frame/com/sa-info.vue')
+				},
+				el: '.vue-box',
+				data: {
+					id: sa.p('id', 0),
+					bigData: [],
+					model: {
+						title: '修改价格',
+						visible: false,
+						form: {
+							id:'',
+							upPrice:'',
+							selPrice:0
+						}
+					},
+					model1: {
+						title: '批量修改订单价格',
+						visible: false,
+						ids:'',
+						selPrice:0
+					},
+					p: { // 查询参数
+						tradeNo: '',		    // 订单号
+						buyUserName: '',		// 买家
+						enterpriseName: '',		// 商家名称
+						platSeqNo: sa.p('platSeqNo', 0),
+						pageNo: 1,		// 当前页
+						pageSize: 20,	// 页大小
+						sortType: 0		// 排序方式
+					},
+					dataCount: 0,
+					dataList: [], // 数据集合
+				},
+				methods: {
+					// 批量修改总价
+					 editPriceByIds: function() {
+						// 获取选中元素的id列表
+						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].upStatus != 2) {
+								return sa.msg('当前选中数据包含未上架订单,不可修改总价,请重新选择!');
+							}
+							if(selectList[i].resaleStatus != 0) {
+								return sa.msg('当前选中数据包含已转售订单,不可修改总价,请重新选择!')
+							}
+						}
+						 this.model1={
+							 title:'批量修改订单价格',
+							 visible:true,
+							 ids:ids,
+						 }
+					},
+					// 修改总价
+					editPrice(item){
+						this.model={
+							title:'修改订单【'+item.tradeNo+'】价格',
+							visible:true,
+							form:item
+						}
+					},
+					savePriceByIds() {
+						let ids=this.model1.ids;
+						if(!ids){
+							sa.error('当前没有选择数据,请至少选择一条数据')
+							return;
+						}
+						let price=this.model1.selPrice;
+						if(!price){
+							sa.error('请输入金额')
+							return;
+						}
+						sa.ajax('/level-one-server/TbOrder/editUpPriceByIds', {ids:ids.toString(),price:price}, function(res) {
+							this.f5();
+							this.model1.visible=false;
+						}.bind(this));
+					},
+					save(){
+						let price=this.model.form.selPrice;
+						if(!price){
+							sa.error('请输入金额')
+							return;
+						}
+						sa.ajax('/level-one-server/TbOrder/editUpPrice', {id:this.model.form.id,price:price}, function(res) {
+							this.f5();
+							this.model.visible=false;
+						}.bind(this));
+					},
+
+					// 转售二级
+					sel(item){
+						sa.confirm('是否转售到二级市场,此操作不可撤销', function(){
+							sa.ajax('/level-two-server/TbOrders/addOrderByResale', {id:item.id,resalePrice:item.upPrice}, function(res) {
+								this.f5();
+							}.bind(this));
+						}.bind(this));
+					},
+					// 刷新
+					f5: function() {
+						sa.ajax('/level-one-server/TbOrder/getList', sa.removeNull(this.p), function(res) {
+							this.dataList = res.data; // 数据
+							this.dataCount = res.dataCount; // 数据总数
+							sa.f5TableHeight();		// 刷新表格高度
+						}.bind(this));
+					},
+					// 查看银行回执
+					getBank: function(data) {
+						sa.showIframe('银行回执', 'tb-order-bank-list.html?tradeNo=' + bigData.tradeNo, '1300px', '90%');
+					}
+				},
+				created: function() {
+					this.f5();
+					sa.ajax('/level-one-server/HtTradeSettlement/getById', {id : this.id}, function(res) {
+						this.bigData = res.data; // 数据
+						sa.f5TableHeight();		// 刷新表格高度
+					}.bind(this));
+					sa.onInputEnter();
+				}
+			})
+		</script>
+	</body>
+</html>

+ 123 - 0
sa-view/listing-management/listing-management.html

@@ -0,0 +1,123 @@
+<!DOCTYPE html>
+<html>
+	<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" />
+		<!-- 所有的 css & js 资源 -->
+		<link rel="stylesheet" href="../../static/kj/element-ui/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="../../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>
+	</head>
+	<body>
+		<div class="vue-box" style="display: none;" :style="'display: block;'">
+			<div class="c-panel">
+				<!-- ------------- 检索参数 ------------- -->
+				<!--<div class="c-title">检索参数</div>-->
+				<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.goodsNames" width="11em"></sa-item>
+					<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.platSeqNo" 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 name="车牌号" prop="veNo"></sa-td>
+					<sa-td name="申报单编号" prop="declareId" 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="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>
+					<el-table-column label="操作" 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>
+						</template>
+					</el-table-column>
+				</el-table>
+				<!-- ------------- 分页 ------------- -->
+				<sa-item type="page" :curr.sync="p.pageNo" :size.sync="p.pageSize" :total="dataCount" @change="f5()"></sa-item>
+			</div>
+		</div>
+		<script>
+			var app = new Vue({
+				components: {
+					"sa-item": httpVueLoader('../../sa-frame/com/sa-item.vue'),
+					"sa-td": httpVueLoader('../../sa-frame/com/sa-td.vue'),
+				},
+				el: '.vue-box',
+				data: {
+					p: { // 查询参数
+						platSeqNo: '',		// 预申报编号
+						declareId: '',		// 申报单编号
+						goodsNames: '',		// 商品名称
+						pageNo: 1,		// 当前页
+						pageSize: 10,	// 页大小
+						sortType: 0		// 排序方式
+					},
+					dataCount: 0,
+					dataList: [], // 数据集合
+				},
+				methods: {
+					// 刷新
+					f5: function() {
+						sa.ajax('/level-one-server/HtTradeSettlement/getListingList', sa.removeNull(this.p), function(res) {
+							this.dataList = res.data; // 数据
+							this.dataCount = res.dataCount; // 数据总数
+							sa.f5TableHeight();		// 刷新表格高度
+						}.bind(this));
+					},
+					// 查看
+					get: function(data) {
+						sa.showIframe('数据详情', 'ht-trade-settlement-info.html?id=' + data.id, '1050px', '90%');
+					},
+					getOrder(data){
+						sa.showIframe('详情', 'listing-management-order.html?platSeqNo='+data.platSeqNo+'&id='+data.id, '90%', '94%');
+					},
+					// 批量删除
+					deleteByIds: function() {
+						// 获取选中元素的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('/HtTradeSettlement/deleteByIds', {ids: ids.join(',')}, function(res) {
+								sa.arrayDelete(this.dataList, selection);
+								sa.ok('删除成功');
+								sa.f5TableHeight();		// 刷新表格高度
+							}.bind(this))
+						}.bind(this));
+					},
+				},
+				created: function() {
+					this.f5();
+					sa.onInputEnter();
+				}
+			})
+		</script>
+	</body>
+</html>

+ 2 - 1
sa-view/tb-group/tb-group-people.html

@@ -34,7 +34,7 @@
 				</el-form>
 				<!-- ------------- 快捷按钮 ------------- -->
 				<div class="fast-btn">
-				
+
 				</div>
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList" size="small">
@@ -84,6 +84,7 @@
 				el: '.vue-box',
 				data: {
 					p: { // 查询参数
+						groupId: sa.p('groupId', ''),
 						id: '',		// 主键
 						name: '',		// 姓名
 						phone: '',		// 手机号码

+ 32 - 51
sa-view/tb-order/tb-order-list.html

@@ -31,41 +31,31 @@
 					<sa-td type="index" width="30px"></sa-td>
 					<sa-td name="订单号" prop="tradeNo" width="180"></sa-td>
 					<sa-td name="买家" prop="buyUserName" ></sa-td>
-					<sa-td name="商家名称" prop="enterpriseName" ></sa-td>
-					<sa-td name="商品名称" prop="goodsNames" ></sa-td>
+					<sa-td name="商家名称" prop="enterpriseName" width="280px"></sa-td>
+					<sa-td name="商品名称" prop="goodsNames" width="200px"></sa-td>
 					<sa-td name="总重量" prop="totalWeight" ></sa-td>
 					<sa-td name="总金额" prop="totalPrice" ></sa-td>
-					<sa-td name="车牌号" prop="veNo" ></sa-td>
-					<sa-td name="上架金额(元)" prop="upPrice" >
-						<template slot-scope="s">
-							<div >{{s.row.upPrice}}
-							<el-link v-if="s.row.upStatus==2&&s.row.resaleStatus==0&&sa.isAuth('tb-order-edit-price')" style="font-size: 12px;"  type="primary" @click="editPrice(s.row)">
-								修改
-							</el-link>
-						<!-- 	<el-link v-if="s.row.resaleStatus==1" style="font-size: 12px;"  type="primary" @click="downGoods(s.row)">
-								下架
-							</el-link> -->
-							</div>
-						</template>
-					</sa-td>
-					<sa-td name="订单状态" prop="upPrice" >
+					<sa-td name="上架金额(元)" prop="upPrice" ></sa-td>
+					<sa-td name="边民操作" prop="upPrice" >
 						<template slot-scope="s">
-							<div v-if="s.row.resaleStatus==0">
-								<div v-if="s.row.upStatus==2">已上架</div>
-								<div v-else>未上架</div>
-							</div>
-							<div v-else>已转售</div>
+							<div v-if="s.row.upStatus==2">已上架</div>
+							<div v-else>未上架</div>
 						</template>
 					</sa-td>
+					<sa-td name="车牌号" prop="veNo" ></sa-td>
+					<sa-td name="预申报编号" prop="platSeqNo" width="180"></sa-td>
+					<sa-td name="时间" prop="createTime" width="140px"></sa-td>
+
 					<!-- <sa-td name="进出口预申报单号" prop="preIeportNo" width="180"></sa-td> -->
-					<sa-td type="enum" name="交易确认" prop="peopleConfirmStatus" :jv="{1: '已确认[green]', 0: '未确认[#ff910a]'}" ></sa-td>
+					<!--<sa-td type="enum" name="交易确认" prop="peopleConfirmStatus" :jv="{1: '已确认[green]', 0: '未确认[#ff910a]'}" ></sa-td>
 					<sa-td type="enum" name="委托确认" prop="cooperEntrustStatus" :jv="{1: '已确认[green]', 0: '未确认[#ff910a]'}" ></sa-td>
-					<sa-td type="enum" name="进口确认" prop="applyConfirmStatus" :jv="{1: '已确认[green]', 0: '未确认[#ff910a]'}" ></sa-td>
-					<sa-td name="时间" prop="createTime" width="140px"></sa-td>
+					<sa-td type="enum" name="进口确认" prop="applyConfirmStatus" :jv="{1: '已确认[green]', 0: '未确认[#ff910a]'}" ></sa-td>-->
 					<el-table-column label="操作" fixed="right"  width="180px">
 						<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-view" @click="getBank(s.row)">银行回执</el-button>
+							<!--<el-button v-if="s.row.upStatus==2&&s.row.resaleStatus==0&&sa.isAuth('tb-order-edit-price')"
+									   class="c-btn" type="warning" icon="el-icon-view" @click="editPrice(s.row)">修改上架金额</el-button>-->
 						</template>
 					</el-table-column>
 				</el-table>
@@ -87,8 +77,8 @@
 		<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: {
@@ -101,27 +91,18 @@
 							selPrice:0
 						}
 					},
-					p: { // 查询参数  
-						tradeNo: '',		    // 订单号 
-						buyUserName: '',		// 买家 
-						enterpriseName: '',		// 商家名称 
-						pageNo: 1,		// 当前页 
-						pageSize: 20,	// 页大小 
-						sortType: 0		// 排序方式 
+					p: { // 查询参数
+						tradeNo: '',		    // 订单号
+						buyUserName: '',		// 买家
+						enterpriseName: '',		// 商家名称
+						pageNo: 1,		// 当前页
+						pageSize: 20,	// 页大小
+						sortType: 0		// 排序方式
 					},
 					dataCount: 0,
-					dataList: [], // 数据集合 
+					dataList: [], // 数据集合
 				},
 				methods: {
-					downGoods(item){
-						sa.confirm('是否删除,此操作不可撤销', function() {
-							sa.ajax('/level-one-server/TbOrder/delete?id=' + data.id, function(res) {
-								sa.arrayDelete(this.dataList, data);
-								sa.ok('删除成功');
-								sa.f5TableHeight();		// 刷新表格高度 
-							}.bind(this))
-						}.bind(this));
-					},
 					editPrice(item){
 						this.model={
 							title:'修改订单【'+item.tradeNo+'】价格',
@@ -146,7 +127,7 @@
 							sa.error('请输入金额')
 							return;
 						}
-						sa.ajax('/level-two-server/TbOrders/addOrderByResale', {id:this.model.form.id,resalePrice:price}, function(res) {
+						sa.ajax('/level-two-server/TbOrders/addOrderByResale', {id:this.model.form.id,price:price}, function(res) {
 							this.f5();
 							this.model.visible=false;
 						}.bind(this));
@@ -155,8 +136,8 @@
 					f5: function() {
 						sa.ajax('/level-one-server/TbOrder/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));
 					},
 					// 查看
@@ -181,28 +162,28 @@
 							sa.ajax('/level-one-server/TbOrder/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('/level-one-server/TbOrder/deleteByIds', {ids: ids.join(',')}, function(res) {
 								sa.arrayDelete(this.dataList, selection);
 								sa.ok('删除成功');
-								sa.f5TableHeight();		// 刷新表格高度 
+								sa.f5TableHeight();		// 刷新表格高度
 							}.bind(this))
 						}.bind(this));
 					},
-					
+
 				},
 				created: function() {
 					this.f5();

+ 16 - 8
sa-view/tb-people/tb-people-list.html

@@ -19,7 +19,7 @@
 			.c-panel .el-form .c-label {
 				width: 7em !important;
 			}
-		
+
 			.c-panel .el-form .el-input,
 			.c-panel .el-form .el-textarea__inner {
 				width: 250px;
@@ -47,8 +47,8 @@
 					<el-button type="info" icon="el-icon-refresh" @click="sa.f5()">重置</el-button>
 					<el-button v-if="sa.isAuth('tb-people-add')" size="mini" type="primary"
 						@click="add()">新增</el-button>
-					<el-button v-if="sa.isAuth('tb-people-bind-shop')" size="mini" type="primary"
-						@click="bindShopBatch()">批量绑定店铺</el-button>
+					<!--<el-button v-if="sa.isAuth('tb-people-bind-shop')" size="mini" type="primary"
+						@click="bindShopBatch()">批量绑定店铺</el-button>-->
 				</el-form>
 				<!-- ------------- 数据列表 ------------- -->
 				<el-table class="data-table" ref="data-table" :data="dataList">
@@ -60,15 +60,23 @@
 					<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="createTime"></sa-td>
-					<el-table-column label="操作" width="260px" fixed="right">
+					<el-table-column label="操作" width="240px" fixed="right">
 						<template slot-scope="s">
 							<el-button class="c-btn" type="success" icon="el-icon-view"
 								@click="get(s.row)">查看</el-button>
 							<el-button class="c-btn" type="primary" icon="el-icon-edit"
-								@click="editFn(s.row)">手机</el-button>
-							<el-button class="c-btn" type="primary" icon="el-icon-edit"
-								@click="updateBankInfo(s.row.id)">银行卡</el-button>
+								@click="updateBankInfo(s.row.id)">银行卡修改</el-button>
 						</template>
 					</el-table-column>
 				</el-table>
@@ -320,4 +328,4 @@
 			})
 		</script>
 	</body>
-</html>
+</html>

+ 1 - 1
sa-view/tb-shop/tb-shop-list.html

@@ -50,7 +50,7 @@
 							<span v-else>-</span>
 						</template>
 					</el-table-column>
-					<el-table-column align="center" label="铺主姓名" prop="ownerName"></el-table-column>
+					<el-table-column align="center" label="铺主姓名" prop="ownerName" width="340px"></el-table-column>
 					<el-table-column align="center" label="铺主电话" prop="ownerTel">
 						<template slot-scope="s">
 							<span v-if="s.row.ownerTel">{{maskPhone(s.row.ownerTel)}}</span>