修改手机号

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

@@ -30,7 +30,7 @@
 				<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="160px"></sa-td>
+					<sa-td name="申报单编号" prop="declareId" width="220px"></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>
@@ -45,6 +45,7 @@
 					<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" >
 						<template slot-scope="s">
 							<el-button class="c-btn" type="success" @click="get(s.row)">查看</el-button>

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

@@ -49,15 +49,15 @@
 							</div>
 						</template>
 					</sa-td>
-					<sa-td name="边民操作" prop="upPrice" >
+					<sa-td name="订单状态" prop="upPrice" >
 						<template slot-scope="s">
 							<div v-if="s.row.upStatus==2">已上架</div>
 							<div v-else>未上架</div>
 						</template>
 					</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 type="enum" name="进口确认" prop="applyConfirmStatus" :jv="{1: '已确认[green]', 0: '未确认[#ff910a]'}" ></sa-td> -->
 					<el-table-column label="操作" fixed="right"  width="100px">
 						<template slot-scope="s">
 							<el-button class="c-btn" type="success" icon="el-icon-view" @click="getBank(s.row)">银行回执</el-button>
@@ -133,7 +133,7 @@
 							sa.error('请输入金额')
 							return;
 						}
-						sa.ajax('/level-two-server/TbOrders/addOrderByResale', {id:this.model.form.id,price:price}, function(res) {
+						sa.ajax('/level-two-server/TbOrders/addOrderByResale', {id:this.model.form.id,resalePrice:price}, function(res) {
 							this.f5();
 							this.model.visible=false;
 						}.bind(this));

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

@@ -36,11 +36,32 @@
 					<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="platSeqNo" width="180"></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" >
+						<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>
+						</template>
+					</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="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>
 					<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>
@@ -51,6 +72,17 @@
 				<!-- ------------- 分页 ------------- -->
 				<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>
 		</div>
 		<script>
 			var app = new Vue({
@@ -60,6 +92,15 @@
 				},
 				el: '.vue-box',
 				data: {
+					model: {
+						title: '修改价格',
+						visible: false,
+						form: {
+							id:'',
+							upPrice:'',
+							selPrice:0
+						}
+					},
 					p: { // 查询参数  
 						tradeNo: '',		    // 订单号 
 						buyUserName: '',		// 买家 
@@ -72,6 +113,44 @@
 					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+'】价格',
+							visible:true,
+							form:item
+						}
+					},
+					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(){
+						let price=this.model.form.selPrice;
+						if(!price){
+							sa.error('请输入金额')
+							return;
+						}
+						sa.ajax('/level-two-server/TbOrders/addOrderByResale', {id:this.model.form.id,resalePrice:price}, function(res) {
+							this.f5();
+							this.model.visible=false;
+						}.bind(this));
+					},
 					// 刷新
 					f5: function() {
 						sa.ajax('/level-one-server/TbOrder/getList', sa.removeNull(this.p), function(res) {

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

@@ -15,6 +15,16 @@
 		<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: 250px;
+			}
+		</style>
 	</head>
 	<body>
 		<div class="vue-box" style="display: none;" :style="'display: block;'">
@@ -23,6 +33,7 @@
 				<div class="c-title">检索参数</div>
 				<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">
@@ -60,11 +71,13 @@
 						</template>
 					</sa-td>
 					<sa-td name="创建时间" prop="createTime"></sa-td>
-					<el-table-column label="操作" width="240px" fixed="right">
+					<el-table-column label="操作" width="260px" 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>
 						</template>
 					</el-table-column>
@@ -91,6 +104,14 @@
 					<el-button type="primary" @click="sureSelect">确 定</el-button>
 				</span>
 			</el-dialog>
+			<el-dialog :title="phone.title" :visible.sync="phone.visible" width="500px">
+				<div>当前手机号：{{phone.form.phone}}</div>
+				<sa-item type="num" name="新手机号" width="7em" v-model="phone.phone" br></sa-item>
+				<span slot="footer" class="dialog-footer">
+					<el-button @click="phone.visible = false">取 消</el-button>
+					<el-button type="primary" @click="sureEdit">确 定</el-button>
+				</span>
+			</el-dialog>
 		</div>
 		<script>
 			var app = new Vue({
@@ -109,6 +130,16 @@
 							shopName: ""
 						}
 					},
+					phone: {
+						title: '修改手机号',
+						visible: false,
+						phone:'',
+						form: {
+							ids: '',
+							shopId: '',
+							shopName: ""
+						}
+					},
 					shopList: [],
 					p: { // 查询参数
 						name: '', // 姓名
@@ -138,6 +169,31 @@
 					dataList: [], // 数据集合
 				},
 				methods: {
+					editFn(data) {
+						this.phone = {
+							title: '修改【' + data.name + '】手机号',
+							visible: true,
+							phone:'',
+							form: data
+						}
+					},
+					sureEdit() {
+						let phone=this.phone.phone;
+						if(!sa.isPhone(phone)){
+							sa.error('手机号不正确')
+							return;
+						}
+						let data={
+							id:this.phone.form.id,
+							name:this.phone.name,
+							phone: phone
+						}
+						sa.ajax('/level-one-server/TbPeople/editPhone', data, function(res) {
+							sa.ok('修改成功');
+							this.phone.visible = false;
+							this.f5()
+						}.bind(this));
+					},
 					bindShopBatch() {
 						// 获取选中元素的id列表
 						let selection = this.$refs['data-table'].selection;