Bladeren bron

上架管理

linbl 11 maanden geleden
bovenliggende
commit
2817947024

+ 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));
 					},
 					// 查看银行回执

+ 15 - 40
sa-view/listing-management/listing-management-order.html

@@ -52,40 +52,36 @@
 					<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" ></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>
 					<sa-td name="上架金额(元)" prop="upPrice" ></sa-td>
-					<sa-td name="状态" prop="upPrice" >
+					<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="resale(s.row)">转售二级</el-button>
+									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="resaleModel.title" :visible.sync="resaleModel.visible" width="500px">
-				<div>
-					当前价格(元):{{resaleModel.form.upPrice}}
-				</div>
-				<sa-item type="num" name="金额" v-model="resaleModel.form.selPrice" placeholder="确认金额" br></sa-item>
-				<span slot="footer" class="dialog-footer">
-					<el-button @click="resaleModel.visible = false">取 消</el-button>
-					<el-button type="primary" @click="sel">转售二级</el-button>
-				</span>
-			</el-dialog>
 			<el-dialog :title="model.title" :visible.sync="model.visible" width="500px">
 				<div>
 					当前价格(元):{{model.form.upPrice}}
@@ -132,15 +128,6 @@
 						ids:'',
 						selPrice:0
 					},
-					resaleModel: {
-						title: '修改价格',
-						visible: false,
-						form: {
-							id:'',
-							upPrice:'',
-							selPrice:0
-						}
-					},
 					p: { // 查询参数
 						tradeNo: '',		    // 订单号
 						buyUserName: '',		// 买家
@@ -215,23 +202,11 @@
 					},
 
 					// 转售二级
-					resale(item){
-						this.resaleModel={
-							title:'修改订单【'+item.tradeNo+'】价格',
-							visible:true,
-							form:item
-						}
-					},
-					sel(){
-						let price=this.resaleModel.form.selPrice;
-						console.log("---sel="+price)
-						if(!price){
-							sa.error('请输入金额')
-							return;
-						}
-						sa.ajax('/level-two-server/TbOrders/addOrderByResale', {id:this.resaleModel.form.id,resalePrice:price}, function(res) {
-							this.f5();
-							this.resaleModel.visible=false;
+					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));
 					},
 					// 刷新

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

@@ -31,8 +31,8 @@
 					<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="upPrice" ></sa-td>
@@ -52,8 +52,8 @@
 						<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>
+							<!--<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>