Skip to content

S
soss
Commit 6c5feb09 by lixiaomin
Options

修改订单页面

parent f1225d1c
Showing with 10 additions and 184 deletions
src/components/order/orderDetial.vue
...@@ -123,7 +123,6 @@ ...@@ -123,7 +123,6 @@
<script> <script>
import { getOrder,getLogList,refund } from "@/api/system/order"; import { getOrder,getLogList,refund } from "@/api/system/order";
import { listShop} from "@/api/system/shop";
import piovince from '@/utils/piovince'; import piovince from '@/utils/piovince';
export default { export default {
name: "OrderDetial", name: "OrderDetial",
...@@ -268,7 +267,7 @@ export default { ...@@ -268,7 +267,7 @@ export default {
refund(this.refundForm).then(response => { refund(this.refundForm).then(response => {
if(response.code="200"){ if(response.code="200"){
this.open=false; this.open=false;
this.getList(); this.$emit('getList');
} }
}); });
} }
...@@ -286,6 +285,7 @@ export default { ...@@ -286,6 +285,7 @@ export default {
getOrderDetail(id){ getOrderDetail(id){
getOrder(id).then(response => { getOrder(id).then(response => {
if(response.code=="200"){ if(response.code=="200"){
this.goodsList=[];
this.form = response.data; this.form = response.data;
this.form.shopName=response.data.shop.name; this.form.shopName=response.data.shop.name;
this.form.state=this.formatterState(response.data.state); this.form.state=this.formatterState(response.data.state);
...@@ -301,18 +301,6 @@ export default { ...@@ -301,18 +301,6 @@ export default {
} }
}); });
}, },
/** 店铺列表 */
getShopList() {
listShop({pageNum:1,pageSize:10000}).then(response => {
if(response.code=="200"){
if(response.rows.length>0){
for(let i=0;i<response.rows.length;i++){
this.shopList.push({value:response.rows[i].id,label: response.rows[i].name},)
}
}
}
});
},
getPicsList(str){ getPicsList(str){
let picObj = JSON.parse(str); let picObj = JSON.parse(str);
return picObj.thumbnail return picObj.thumbnail
......
src/views/order/refund/index.vue
...@@ -62,112 +62,8 @@ ...@@ -62,112 +62,8 @@
@pagination="getList" /> @pagination="getList" />
<!-- 详情对话框 --> <!-- 详情对话框 -->
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body> <OrderDetial ref="orderDetial" ></OrderDetial>
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="订单信息" name="first">
<el-form ref="form" :model="form" label-width="80px">
<el-row>
<el-col :span="8">
<el-form-item label="订单编号" >
<el-input v-model="form.orderNo" disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="顺序号" >
<el-input v-model="form.orderNum" disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="订单状态" >
<el-input v-model="form.state" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="城市" >
<el-input v-model="form.city" disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="店铺" >
<el-input v-model="form.shopName" disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="创建时间" >
<el-input v-model="form.createdAt" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="商品数量" >
<el-input v-model="form.goodsNum" disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="金额" >
<el-input v-model="form.amount" disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="付款时间" >
<el-input v-model="form.payTime" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="用户昵称" >
<el-input v-model="form.userName" disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="用户电话" >
<el-input disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="完成时间" >
<el-input v-model="form.finishTime" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-table :data="goodsList">
<el-table-column label="商品名称" align="center" prop="goodsName" />
<el-table-column label="缩略图" align="center">
<template slot-scope="scope">
<div class="image-tmp">
<el-image style="width: 100px; height: 100px" :src="getPicsList(scope.row.pics)" :preview-src-list="getPicsBigList(scope.row.pics)">
<div slot="error" class="image-slot"></div>
</el-image>
</div>
</template>
</el-table-column>
<el-table-column label="商品分类" align="center" prop="categoryName" />
<el-table-column label="原售价" align="center" prop="price" />
<el-table-column label="折扣价" align="center" prop="discount" />
<el-table-column label="实付" align="center" prop="realAmount" />
<el-table-column label="数量" align="center" prop="num" />
</el-table>
</el-form>
</el-tab-pane>
<el-tab-pane label="订单日志" name="second">
<el-table :data="logList">
<el-table-column label="状态" align="center" prop="status" />
<el-table-column label="操作" align="center" prop="operation" />
<el-table-column label="时间" align="center" prop="createAt" />
<el-table-column label="操作人" align="center" prop="operationUser" />
<el-table-column label="内容" align="center" prop="content" />
</el-table>
</el-tab-pane>
</el-tabs>
<div slot="footer" class="dialog-footer" style="text-align: center;">
<el-button type="primary" @click="submitForm">确定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
...@@ -176,8 +72,10 @@ import { getOrder,getLogList } from "@/api/system/order"; ...@@ -176,8 +72,10 @@ import { getOrder,getLogList } from "@/api/system/order";
import { listRefund } from "@/api/system/refund"; import { listRefund } from "@/api/system/refund";
import { listShop} from "@/api/system/shop"; import { listShop} from "@/api/system/shop";
import piovince from '@/utils/piovince'; import piovince from '@/utils/piovince';
import OrderDetial from '@/components/order/orderDetial.vue';
export default { export default {
name: "Order", name: "Order",
components: { OrderDetial},
data() { data() {
return { return {
createdTime:[], createdTime:[],
...@@ -236,18 +134,12 @@ export default { ...@@ -236,18 +134,12 @@ export default {
payAtEnd: null, payAtEnd: null,
state: null state: null
}, },
shopName: null,
goodsList:[],
// 表单参数 // 表单参数
form: {}, form: {}
activeName:"first",
logList: []
}; };
}, },
created() { created() {
this.getList(); this.getList();
this.getShopList();
}, },
methods: { methods: {
getProvince(province){ getProvince(province){
...@@ -258,16 +150,6 @@ export default { ...@@ -258,16 +150,6 @@ export default {
} }
} }
}, },
// 取消按钮
cancel() {
this.activeName="first";
this.open = false;
},
/** 提交按钮 */
submitForm() {
this.open=false;
this.activeName="first"
},
formatterState(state){ formatterState(state){
if(state == 0){ if(state == 0){
return "创建未校验"; return "创建未校验";
...@@ -301,13 +183,6 @@ export default { ...@@ -301,13 +183,6 @@ export default {
return "其他人工干预状态"; return "其他人工干预状态";
} }
}, },
handleClick(tab) {
if(tab.name=="first"){
this.getOrderDetail(this.orderId);
}else if(tab.name=="second"){
this.getLogList();
}
},
/** 查询订单列表 */ /** 查询订单列表 */
getList() { getList() {
listRefund(this.queryParams).then(response => { listRefund(this.queryParams).then(response => {
...@@ -317,16 +192,6 @@ export default { ...@@ -317,16 +192,6 @@ export default {
} }
}); });
}, },
/** 查询订单日志列表 */
getLogList() {
//this.loading = true;
getLogList({orderId:this.orderId}).then(response => {
if(response.code=="200"){
this.logList = response.data;
}
});
},
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
if(this.createdTime.length>0){ if(this.createdTime.length>0){
...@@ -353,35 +218,13 @@ export default { ...@@ -353,35 +218,13 @@ export default {
}, },
/** 详情按钮操作 */ /** 详情按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.refundTag=false; this.$refs.orderDetial.handleUpdate(row);
this.goodsList=[];
this.orderId= row.id;
this.title="订单信息";
this.open = true;
this.getOrderDetail(this.orderId);
},
getOrderDetail(id){
getOrder(id).then(response => {
if(response.code=="200"){
this.form = response.data;
this.form.shopName=response.data.shop.name;
this.form.state=this.formatterState(response.data.state);
this.form.city=this.getProvince(response.data.shop.city);
if(response.data.orderDetails.length>0){
let list=response.data.orderDetails;
for(let i=0;i<list.length;i++){
this.goodsList.push({"goodsName":list[i].goods.name,"pics":list[i].goods.pics,
"categoryName":list[i].goods.categoryName,"price":list[i].goods.price,"discount":list[i].goods.discount,
"realAmount":list[i].realAmount,"num":list[i].num})
}
}
}
});
}, },
/** 店铺列表 */ /** 店铺列表 */
getShopList() { getShopList() {
listShop({pageNum:1,pageSize:10000}).then(response => { listShop({pageNum:1,pageSize:10000}).then(response => {
if(response.code=="200"){ if(response.code=="200"){
this.shopList=[];
if(response.rows.length>0){ if(response.rows.length>0){
for(let i=0;i<response.rows.length;i++){ for(let i=0;i<response.rows.length;i++){
this.shopList.push({value:response.rows[i].id,label: response.rows[i].name},) this.shopList.push({value:response.rows[i].id,label: response.rows[i].name},)
...@@ -389,13 +232,8 @@ export default { ...@@ -389,13 +232,8 @@ export default {
} }
} }
}); });
},
/** 导出按钮操作 */
handleExport() {
this.download('system/order/export', {
...this.queryParams
}, `order_${new Date().getTime()}.xlsx`)
} }
} }
}; };
</script> </script>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment