Skip to content

P
pica.cloud.web-education-admin
提交 4ff9ddc5 编写于 作者: yi.li's avatar yi.li
浏览文件
操作

订单管理接口联调

上级 ad17dc8a
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 360 行增加 和 227 行删除
src/utils/shop/index.js
浏览文件 @ 4ff9ddc5
...@@ -19,7 +19,7 @@ export const queryStore = (params) => { ...@@ -19,7 +19,7 @@ export const queryStore = (params) => {
return fetch({ return fetch({
headers, headers,
url: getBaseUrl(`store/query`), url: getBaseUrl(`store/query`),
method: 'get', method: 'post',
data: params, data: params,
description: '查询店铺信息', description: '查询店铺信息',
}) })
...@@ -33,4 +33,15 @@ export const queryOrderDetail = (orderId) => { ...@@ -33,4 +33,15 @@ export const queryOrderDetail = (orderId) => {
// params: params, // params: params,
description: '查询订单详情', description: '查询订单详情',
}) })
};
///trade/order/admin/query/list
export const queryOrderList = (params) => {
return fetch({
headers,
url: getBaseUrl(`trade/order/admin/query/list`),
method: 'get',
params: params,
description: '查询订单列表',
})
}; };
\ No newline at end of file
src/views/goods/order-detail.vue
浏览文件 @ 4ff9ddc5
...@@ -4,11 +4,11 @@ ...@@ -4,11 +4,11 @@
<div class="order-detail-content screenSet" id="screenSet"> <div class="order-detail-content screenSet" id="screenSet">
<div class="header-title">订单详情</div> <div class="header-title">订单详情</div>
<div class="detail-all-info"> <div class="detail-all-info">
<div class="trade-status" v-if="orderStatus == 1"><img src="../../assets/image/order/order_status1.png"/>交易成功</div> <div class="trade-status" v-if="orderDetailData.showStatus == 1"><img src="../../assets/image/order/order_status1.png"/>交易成功</div>
<div class="trade-status" v-if="orderStatus == 2"><img src="../../assets/image/order/order_status2.png"/>已发货</div> <div class="trade-status" v-if="orderDetailData.showStatus == 2"><img src="../../assets/image/order/order_status2.png"/>已发货</div>
<div class="trade-status" v-if="orderStatus == 3"><img src="../../assets/image/order/order_status3.png"/>待发货</div> <div class="trade-status" v-if="orderDetailData.showStatus == 3"><img src="../../assets/image/order/order_status3.png"/>待发货</div>
<div class="trade-status" v-if="orderStatus == 4"><img src="../../assets/image/order/order_status4.png"/>待支付</div> <div class="trade-status" v-if="orderDetailData.showStatus == 4"><img src="../../assets/image/order/order_status4.png"/>等待买家付款</div>
<div class="trade-status" v-if="orderStatus == 5"><img src="../../assets/image/order/order_status5.png"/>交易关闭</div> <div class="trade-status" v-if="orderDetailData.showStatus == 5"><img src="../../assets/image/order/order_status5.png"/>交易关闭</div>
<div class="trade-info"> <div class="trade-info">
<el-card class="left-card"> <el-card class="left-card">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<div> <div>
<p>订单编号：{{orderDetailData.orderNo}}</p> <p>订单编号：{{orderDetailData.orderNo}}</p>
<p>下单时间：{{orderDetailData.createdTime}}</p> <p>下单时间：{{orderDetailData.createdTime}}</p>
<p>支付方式：微信支付</p> <p>支付方式：{{orderDetailData.payChannel}}</p>
<p>支付时间：{{orderDetailData.paymentTime}}</p> <p>支付时间：{{orderDetailData.paymentTime}}</p>
<p>发货时间：{{orderDetailData.sendTime}}</p> <p>发货时间：{{orderDetailData.sendTime}}</p>
<p>成交时间：{{orderDetailData.finishTime}}</p> <p>成交时间：{{orderDetailData.finishTime}}</p>
...@@ -63,9 +63,9 @@ ...@@ -63,9 +63,9 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="total-set"> <div class="total-set">
<p><span>商品总额：</span><span>￥180.00</span></p> <p><span>商品总额：</span><span>￥{{orderDetailData.totalPrice}}</span></p>
<p><span>优惠：</span><span>￥10.00</span></p> <p><span>优惠：</span><span>￥{{orderDetailData.totalCouponFee}}</span></p>
<p class="total-price"><span>实付：</span><span>￥170.00</span></p> <p class="total-price"><span>实付：</span><span>￥{{orderDetailData.amount}}</span></p>
</div> </div>
</div> </div>
</div> </div>
...@@ -85,8 +85,9 @@ ...@@ -85,8 +85,9 @@
curmbSecond: '订单管理', curmbSecond: '订单管理',
jumPathThird: '/order-manage', jumPathThird: '/order-manage',
curmbThird: '订单详情', curmbThird: '订单详情',
orderId: 1, orderId: 111,
orderStatus: 1, showStatus: 1,
storeType: null,
orderDetailData: { orderDetailData: {
amount: '',//订单实付总金额 amount: '',//订单实付总金额
createdTime: '',//下单时间 createdTime: '',//下单时间
...@@ -103,11 +104,15 @@ ...@@ -103,11 +104,15 @@
totalPrice: '',//订单总金额 totalPrice: '',//订单总金额
remark: '',//备注 remark: '',//备注
sendTime: '',//发货时间 sendTime: '',//发货时间
payChannel: '',//支付方式
showStatus: null,//订单展示状态,1已完成,2已发货,3待发货,4待支付,5交易关闭
}, },
tableData: [], tableData: [],
} }
}, },
created() { created() {
this.orderId = this.$route.query.id;
this.init(); this.init();
}, },
methods: { methods: {
...@@ -117,6 +122,7 @@ ...@@ -117,6 +122,7 @@
if (res.code == '000000') { if (res.code == '000000') {
const { goodsInfoDtoList } = res.data; const { goodsInfoDtoList } = res.data;
this.orderDetailData = {...res.data}; this.orderDetailData = {...res.data};
this.storeType = res.data.storeType;
this.tableData = goodsInfoDtoList; this.tableData = goodsInfoDtoList;
} }
}) })
......
src/views/goods/order-manage.vue
浏览文件 @ 4ff9ddc5
...@@ -7,17 +7,17 @@ ...@@ -7,17 +7,17 @@
<el-row :gutter="30" type="flex" style="margin-top: 10px"> <el-row :gutter="30" type="flex" style="margin-top: 10px">
<el-col :span="18"> <el-col :span="18">
<el-form-item label="商品名称"> <el-form-item label="商品名称">
<el-input v-model="searchForm.name" size="small" placeholder="请输入商品名称"></el-input> <el-input v-model="searchForm.goodsName" size="small" placeholder="请输入商品名称"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="订单号"> <el-form-item label="订单号">
<el-input v-model="searchForm.id" size="small" placeholder="请输入订单号"></el-input> <el-input v-model="searchForm.orderNo" size="small" placeholder="请输入订单号"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="买家名称"> <el-form-item label="买家名称">
<el-input v-model="searchForm.name" size="small" placeholder="请输入买家名称"></el-input> <el-input v-model="searchForm.receiver" size="small" placeholder="请输入买家名称"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="下单时间"> <el-form-item label="下单时间">
<el-date-picker <el-date-picker
v-model="searchForm.orderTime" v-model="searchForm.orderDate"
type="datetime" type="datetime"
size="small" size="small"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
</el-tabs> </el-tabs>
<el-table :data="tableData" border max-height="1000" class="item-table" style="width: 100%;margin-top: 10px;"> <el-table :data="tableData" border max-height="1000" class="item-table" style="width: 100%;margin-top: 10px;">
<el-table-column prop="id" label="订单号" min-width="100" align="center"></el-table-column> <el-table-column prop="id" label="订单号" min-width="100" align="center"></el-table-column>
<el-table-column prop="name" label="商品名称" min-width="100" align="center"></el-table-column> <el-table-column prop="goodsName" label="商品名称" min-width="100" align="center"></el-table-column>
<el-table-column prop="status" label="交易状态" min-width="100" align="center"> <el-table-column prop="status" label="交易状态" min-width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.status | rangeStatus }}</span> <span>{{ scope.row.status | rangeStatus }}</span>
...@@ -49,20 +49,20 @@ ...@@ -49,20 +49,20 @@
</el-table-column> </el-table-column>
<el-table-column prop="name" label="实收款" min-width="100" align="center"></el-table-column> <el-table-column prop="name" label="实收款" min-width="100" align="center"></el-table-column>
<el-table-column prop="name" label="买家" min-width="100" align="center"></el-table-column> <el-table-column prop="name" label="买家" min-width="100" align="center"></el-table-column>
<el-table-column prop="name" label="数量" min-width="100" align="center"></el-table-column> <el-table-column prop="goodsQuantity" label="数量" min-width="100" align="center"></el-table-column>
<el-table-column prop="name" label="规格" min-width="100" align="center"></el-table-column> <el-table-column prop="size" label="规格" min-width="100" align="center"></el-table-column>
<el-table-column prop="name" label="单价" min-width="100" align="center"></el-table-column> <el-table-column prop="price" label="单价" min-width="100" align="center"></el-table-column>
<el-table-column prop="createdTime" label="下单时间" min-width="100" align="center"> <el-table-column prop="createdTime" label="下单时间" min-width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.createdTime | liveDateFilter }}</span> <span>{{ scope.row.createdTime | liveDateFilter }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="name" label="备注" min-width="100" align="center"></el-table-column> <el-table-column prop="comments" label="备注" min-width="100" align="center"></el-table-column>
<el-table-column label="操作" min-width="250" align="center" fixed="right"> <el-table-column label="操作" min-width="250" align="center" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
<el-button @click="closeTrade(scope.row)" type="text" size="small">关闭交易</el-button> <!--<el-button @click="closeTrade(scope.row)" type="text" size="small">关闭交易</el-button>-->
<el-button @click="changePrice(scope.row)" type="text" size="small">修改价格</el-button> <!--<el-button @click="changePrice(scope.row)" type="text" size="small">修改价格</el-button>-->
<el-button @click="sendGoods(scope.row)" type="text" size="small">发货</el-button> <el-button @click="sendGoods(scope.row)" type="text" size="small">发货</el-button>
<el-button @click="distribute(scope.row)" type="text" size="small">配送</el-button> <el-button @click="distribute(scope.row)" type="text" size="small">配送</el-button>
<el-button @click="viewLogistics(scope.row)" type="text" size="small">查看物流</el-button> <el-button @click="viewLogistics(scope.row)" type="text" size="small">查看物流</el-button>
...@@ -188,6 +188,7 @@ ...@@ -188,6 +188,7 @@
// import { openLoading, closeLoading } from "../../utils/utils"; // import { openLoading, closeLoading } from "../../utils/utils";
import BreadCrumb from "@/components/breadcrumb.vue"; import BreadCrumb from "@/components/breadcrumb.vue";
import SendSetDialog from "@/components/shop/send-set-dialog"; import SendSetDialog from "@/components/shop/send-set-dialog";
import { queryOrderList } from "@/utils/shop";
export default { export default {
components: { components: {
SendSetDialog, SendSetDialog,
...@@ -200,9 +201,12 @@ ...@@ -200,9 +201,12 @@
showAllFlag: false, showAllFlag: false,
showNewFlag: false, showNewFlag: false,
searchForm: { searchForm: {
name: '', showStatus: -1,
id: '', storeId: 0,
orderTime: '', goodsName: '',
orderNo: '',
receiver: '',
orderDate: '',
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
}, },
...@@ -255,17 +259,28 @@ ...@@ -255,17 +259,28 @@
} }
}, },
created() { created() {
this.searchList();
}, },
methods: { methods: {
searchList(){ searchList(){
queryOrderList(this.searchForm).then(res => {
console.log('查询结果',res)
if (res.code == '000000') {
this.tableData = res.data.orderSingleDtoList;
this.totalRows = res.data.totalNum;
}
})
}, },
resetForm() { resetForm() {
this.searchForm = { this.searchForm = {
name: '', showStatus: -1,
id: '', storeId: 0,
orderTime: '' goodsName: '',
orderNo: '',
receiver: '',
orderDate: '',
pageNo: 1,
pageSize: 10,
}; };
this.searchList(); this.searchList();
}, },
...@@ -308,7 +323,24 @@ ...@@ -308,7 +323,24 @@
this.searchForm.pageNo = val; this.searchForm.pageNo = val;
this.searchList(); this.searchList();
}, },
handleClick(tab, event) {}, handleClick(tab, event) {
//-1全部，1已完成,2已发货,3待发货,4待支付,5交易关闭
if (tab == 'all') {//全部
this.searchForm.showStatus = -1;
}else if (tab == 'first') {//等待买家付款
this.searchForm.showStatus = 4;
}else if (tab == 'second') {//待发货
this.searchForm.showStatus = 3;
}else if (tab == 'third') {//已发货
this.searchForm.showStatus = 2;
}else if (tab == 'fourth') {//交易成功
this.searchForm.showStatus = 1;
}else if (tab == 'five') {//交易关闭
this.searchForm.showStatus = 5;
}
this.searchForm.pageNo = 1;
this.searchList();
},
//关闭交易 //关闭交易
closeTrade(row) { closeTrade(row) {
this.closeTradeDialog = true; this.closeTradeDialog = true;
...@@ -398,7 +430,7 @@ ...@@ -398,7 +430,7 @@
this.$router.push({ this.$router.push({
path: `/order-detail`, path: `/order-detail`,
query:{ query:{
// storeId: row.orderId, id: row.id,
} }
}) })
}, },
......
src/views/shop/create-shop.vue
浏览文件 @ 4ff9ddc5
此差异已折叠。
src/views/shop/shop-list.vue
浏览文件 @ 4ff9ddc5
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<el-row :gutter="30" type="flex" style="margin-top: 10px"> <el-row :gutter="30" type="flex" style="margin-top: 10px">
<el-col :span="18"> <el-col :span="18">
<el-form-item label="店铺名称"> <el-form-item label="店铺名称">
<el-input v-model="searchForm.name" size="small" placeholder="请输入店铺名称"></el-input> <el-input v-model="searchForm.storeName" size="small" placeholder="请输入店铺名称"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="店铺ID"> <el-form-item label="店铺ID">
<el-input v-model="searchForm.id" size="small" placeholder="请输入店铺ID"></el-input> <el-input v-model="searchForm.id" size="small" placeholder="请输入店铺ID"></el-input>
...@@ -39,22 +39,35 @@ ...@@ -39,22 +39,35 @@
</el-row> </el-row>
</el-form> </el-form>
<el-table :data="tableData" class="item-table" style="width: 100%;margin-top: 10px;"> <el-table :data="tableData" class="item-table" style="width: 100%;margin-top: 10px;">
<el-table-column prop="id" label="店铺ID" min-width="100" align="center"></el-table-column> <el-table-column prop="id" label="店铺ID" min-width="100" align="center">
<el-table-column prop="name" label="店铺名称" min-width="100" align="center"></el-table-column>
<el-table-column prop="type" label="店铺类型" min-width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.type | dynamicFlagStatus }}</span> <span>{{ scope.row.tradeStore.id }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="status" label="店铺状态" min-width="100" align="center"> <el-table-column prop="storeName" label="店铺名称" min-width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.status | rangeStatus }}</span> <span>{{ scope.row.tradeStore.storeName }}</span>
</template>
</el-table-column>
<el-table-column prop="storeType" label="店铺类型" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.tradeStore.storeType | storeTypeFormat}}</span>
</template>
</el-table-column>
<el-table-column prop="storeStatus" label="店铺状态" min-width="100" align="center">
<template slot-scope="scope">
<span>{{ scope.row.tradeStore.storeStatus | statusFormat }}</span>
</template>
</el-table-column>
<el-table-column prop="num" label="已上架商品数" min-width="120" align="center">
<template slot-scope="scope">
<span>{{ scope.row.tradeStore.count }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="num" label="已上架商品数" min-width="120" align="center"></el-table-column>
<el-table-column prop="createdTime" label="创建时间" min-width="100" align="center"> <el-table-column prop="createdTime" label="创建时间" min-width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.createdTime | liveDateFilter }}</span> <!--<span>{{ scope.row.createdTime | liveDateFilter }}</span>-->
<span>{{ scope.row.tradeStore.createdTime }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" min-width="370" align="center"> <el-table-column label="操作" min-width="370" align="center">
...@@ -84,7 +97,7 @@ ...@@ -84,7 +97,7 @@
<script> <script>
import { openLoading, closeLoading } from "../../utils/utils"; import { openLoading, closeLoading } from "../../utils/utils";
import BreadCrumb from "@/components/breadcrumb.vue"; import BreadCrumb from "@/components/breadcrumb.vue";
// import { getRangeList,updateRangeStatus} from "../../utils/yqrange/yqrangeApi"; import { queryStore } from '@/utils/shop';
export default { export default {
components: { components: {
BreadCrumb BreadCrumb
...@@ -95,38 +108,32 @@ ...@@ -95,38 +108,32 @@
showAllFlag: false, showAllFlag: false,
showNewFlag: false, showNewFlag: false,
searchForm: { searchForm: {
name: '', storeName: '',
id: '', storeId: 0,
type: '', storeType: 0,
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
id: null,
type: null,
}, },
totalRows: 0, totalRows: 0,
tableData: [ tableData: [],
// { typeList: [
// id: '', {
// name: '',
// type: null,
// status: '',
// num: null,
// createdTime: '',
// }
],
typeList: [{
label: '供货商', label: '供货商',
value: '1', value: 1,
}, { }, {
label: '医生小店', label: '医生小店',
value: '2', value: 2,
}, { }, {
label: '小药房', label: '小药房',
value: '3', value: 3,
}] }]
} }
}, },
created() { created() {
// this.initPrivilege(); // this.initPrivilege();
// this.searchList(); this.searchList();
}, },
methods: { methods: {
initPrivilege(){ initPrivilege(){
...@@ -160,113 +167,63 @@ ...@@ -160,113 +167,63 @@
searchList() { searchList() {
openLoading(this); openLoading(this);
let params = this.searchForm; let params = this.searchForm;
if (this.searchForm.id) {
/* getRangeList(params).then((res) => { params.storeId = this.searchForm.id;
}else {
params.storeId = 0;
}
if (this.searchForm.type) {
params.storeType = this.searchForm.type;
}else {
params.storeType = 0;
}
queryStore(params).then((res) => {
closeLoading(this); closeLoading(this);
if(res.code == "000000") { if(res.code == "000000") {
this.tableData = res.data.circleList; this.tableData = res.data.tradeStore;
this.totalRows = res.data.count; this.totalRows = res.data.totalCount;
} else { } else {
this.tableData = []; this.tableData = [];
} }
}).catch((error) => { }).catch((error) => {
this.$message.error("请重试"); this.$message.error("请重试");
})*/ })
}, },
resetForm() { resetForm() {
this.searchForm = { this.searchForm = {
name: '', storeName: '',
id: '', storeId: 0,
type: '' storeType: 0,
pageNo: 1,
pageSize: 10,
id: null,
type: null,
}; };
this.searchList(); this.searchList();
}, },
//新建店铺 //新建店铺
createShop() { createShop() {
let enterType = 1;//1:add 2 edit
this.$router.push({ this.$router.push({
path: `/create-shop?enterType=${enterType}` path: `/create-shop`
}) })
}, },
//上线
publishRange(row) {
this.$confirm(`确定上线“${row.name}”吗？`, '', {
confirmButtonText: '上线',
cancelButtonText: '取消',
type: 'warning',
customClass: 'range-make-box',
}).then(() => {
// confirm
this.updateStatus(row.id, "30");
}).catch(() => {
// cancel
// this.$message.error("上线失败");
});
},
//下线
unPublishRange(row) {
this.$confirm(`确定下线“${row.name}”吗？`, '', {
confirmButtonText: '下线',
cancelButtonText: '取消',
type: 'warning',
customClass: 'range-make-box',
}).then(() => {
this.updateStatus(row.id, "40");
// confirm
}).catch(() => {
// cancel
});
},
// 更新圈子状态（上线，下线）
updateStatus(id, status){
let params = {"id": id, "status": status};
updateRangeStatus(params).then((res) => {
closeLoading(this);
if(res.code == "000000") {
if(status == "40"){
this.$message.success("下线成功");
} else if(status == "30") {
this.$message.success("上线成功");
}else if(status == "50") {
this.$message.success("解散成功");
}
this.searchList();
} else {
if(status == "40"){
this.$message.error("下线失败，请重试");
} else if(status == "30") {
this.$message.error("上线失败，请重试");
}else if(status == "50") {
this.$message.error("解散失败，请重试");
}
}
}).catch((error) => {
if(status == "40"){
this.$message.error("下线失败，请重试");
} else if(status == "30") {
this.$message.error("上线失败，请重试");
}else if(status == "50") {
this.$message.error("解散失败，请重试");
}
})
},
//店铺管理 //店铺管理
shopManage(row) { shopManage(row) {
this.$router.push({ this.$router.push({
path: '/role-manage?id=' + row.id, path: '/goods-manage',
query: {
storeId: row.tradeStore.id,
}
}) })
}, },
//编辑 //编辑
editShop(row) { editShop(row) {
let enterType = 2;//1:add 2 edit
this.$router.push({ this.$router.push({
path: `/create-shop?enterType`, path: `/create-shop`,
query:{ query:{
storeId:row.storeId, storeId: row.tradeStore.id,
enterType:enterType, storeData: JSON.stringify(row),
} }
}) })
}, },
...@@ -280,6 +237,31 @@ ...@@ -280,6 +237,31 @@
this.searchList(); this.searchList();
}, },
}, },
filters: {
storeTypeFormat: function(value){
if (!value && value != 0) {
return "-";
} else {
let hash = {
1: "供货商",
2: "医生小店",
3: "小药房"
};
return hash[value];
}
},
statusFormat(value) {
if (!value && value != 0) {
return "-";
} else {
let hash = {
0: "下线",
1: "上线",
};
return hash[value];
}
},
},
} }
</script> </script>
<style lang="scss"> <style lang="scss">
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或