Compare commits
2 Commits
1c7c4370e8
...
10d80f09b9
| Author | SHA1 | Date | |
|---|---|---|---|
| 10d80f09b9 | |||
| 771cd1ede2 |
|
|
@ -54,15 +54,6 @@
|
||||||
<el-button size="small" @click="showDetail(scope.$index, scope.row , 0)">
|
<el-button size="small" @click="showDetail(scope.$index, scope.row , 0)">
|
||||||
详情
|
详情
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-popconfirm class="ml-5" confirm-button-text='确定' cancel-button-text='取消' icon="InfoFilled" icon-color="red"
|
|
||||||
title="是否确认删除" @confirm="deleteProduct(scope.row.id)" width=180>
|
|
||||||
<template #reference>
|
|
||||||
<el-button class="ml-5" type="danger">删除</el-button>
|
|
||||||
</template>
|
|
||||||
</el-popconfirm>
|
|
||||||
<el-popconfirm confirm-button-text='确定' cancel-button-text='取消' icon="el-icon-info" icon-color="red"
|
|
||||||
title="您确定删除吗？">
|
|
||||||
</el-popconfirm>
|
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
|
|
@ -222,3 +213,4 @@ const load =()=>{}
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|
@ -1,61 +1,61 @@
|
||||||
<template>
|
<template>
|
||||||
<!--<div>-->
|
<div>
|
||||||
<!-- <el-input style="width: 200px; height: 30px; margin-right: 10px;" suffix-icon="Search" placeholder="请输入商品名称"-->
|
<el-input style="width: 200px; height: 30px; margin-right: 10px;" suffix-icon="Search" placeholder="请输入商品名称"
|
||||||
<!-- v-model="id"></el-input>-->
|
v-model="id"></el-input>
|
||||||
<!-- <el-button class="ml-5" type="primary" @click="load" style="height: 25px;">搜索</el-button>-->
|
<el-button class="ml-5" type="primary" @click="load" style="height: 25px;">搜索</el-button>
|
||||||
<!-- <el-button type="warning" @click="reset" style="height:25px">重置</el-button>-->
|
<el-button type="warning" @click="reset" style="height:25px">重置</el-button>
|
||||||
<!--</div>-->
|
</div>
|
||||||
<!-- <div style="margin: 15px 0">-->
|
<div style="margin: 15px 0">
|
||||||
<!-- <el-popconfirm class="ml-5" confirm-button-text='确定' cancel-button-text='取消' icon="InfoFilled" icon-color="red"-->
|
<el-popconfirm class="ml-5" confirm-button-text='确定' cancel-button-text='取消' icon="InfoFilled" icon-color="red"
|
||||||
<!-- title="您确定批量删除这些数据吗？" @confirm="delBatch" width=180>-->
|
title="您确定批量删除这些数据吗？" @confirm="delBatch" width=180>
|
||||||
<!-- <template #reference>-->
|
<template #reference>
|
||||||
<!-- <el-button style="height: 25px" class="ml-5" type="danger">批量删除 <el-icon style="margin-left: 5px;">-->
|
<el-button style="height: 25px" class="ml-5" type="danger">批量删除 <el-icon style="margin-left: 5px;">
|
||||||
<!-- <Remove />-->
|
<Remove />
|
||||||
<!-- </el-icon></el-button>-->
|
</el-icon></el-button>
|
||||||
<!-- </template>-->
|
</template>
|
||||||
<!-- </el-popconfirm>-->
|
</el-popconfirm>
|
||||||
<!-- </div>-->
|
</div>
|
||||||
<!-- <el-table :data="tableData" border stripe header-cell-class-name="headerBg"-->
|
<el-table :data="tableData" border stripe header-cell-class-name="headerBg"
|
||||||
<!-- :cell-style="{ 'text-align': 'center', 'font-size': '16px' }" @selection-change="handleSelectionChange"-->
|
:cell-style="{ 'text-align': 'center', 'font-size': '16px' }" @selection-change="handleSelectionChange"
|
||||||
<!-- :header-cell-style="{ 'text-align': 'center' }">-->
|
:header-cell-style="{ 'text-align': 'center' }">
|
||||||
<!-- <el-table-column type="selection" width="55"></el-table-column>-->
|
<el-table-column type="selection" width="55"></el-table-column>
|
||||||
<!-- <el-table-column prop="id" label="订单id" width="80"></el-table-column>-->
|
<el-table-column prop="id" label="订单id" width="80"></el-table-column>
|
||||||
<!-- <el-table-column prop="" label="购买商品名称"></el-table-column>-->
|
<el-table-column prop="goodSnapshot.name" label="商品名称"></el-table-column>
|
||||||
<!-- <el-table-column prop="" label="购买数量" width="180"></el-table-column>-->
|
<el-table-column prop="quantity" label="购买数量" width="180"></el-table-column>
|
||||||
<!-- <el-table-column prop="totalAmount" label="订单总金额"></el-table-column>-->
|
<el-table-column prop="totalAmount" label="订单总金额"></el-table-column>
|
||||||
<!-- <el-table-column prop="" label="下单时间"></el-table-column>-->
|
<el-table-column prop="createTime" label="下单时间"></el-table-column>
|
||||||
<!-- <el-table-column prop="" label="快递单号"></el-table-column>-->
|
<el-table-column prop="orderNumber" label="快递单号"></el-table-column>
|
||||||
<!-- <el-table-column prop="orderStatus" label="订单状态"></el-table-column>-->
|
<el-table-column prop="orderStatus" label="订单状态"></el-table-column>
|
||||||
<!-- <el-table-column label="操作" width="250px">-->
|
<el-table-column label="操作" width="250px">
|
||||||
<!-- <template #default="scope">-->
|
<template #default="scope">
|
||||||
<!-- <el-button size="small" @click="ReviseOrView(scope.$index, scope.row , 0)">-->
|
<el-button size="small" @click="ReviseOrView(scope.$index, scope.row , 0)">
|
||||||
<!-- 编辑-->
|
编辑
|
||||||
<!-- </el-button>-->
|
</el-button>
|
||||||
<!-- <el-button plain @click="dialogFormVisible = true">-->
|
<el-button plain @click="dialogFormVisible = true">
|
||||||
<!-- 发货-->
|
发货
|
||||||
<!-- </el-button>-->
|
</el-button>
|
||||||
<!-- <el-popconfirm class="ml-5" confirm-button-text='确定' cancel-button-text='取消' icon="InfoFilled" icon-color="red"-->
|
<el-popconfirm class="ml-5" confirm-button-text='确定' cancel-button-text='取消' icon="InfoFilled" icon-color="red"
|
||||||
<!-- title="是否确认删除" @confirm="deleteProduct(scope.row.id)" width=180>-->
|
title="是否确认删除" @confirm="deleteProduct(scope.row.id)" width=180>
|
||||||
<!-- <template #reference>-->
|
<template #reference>
|
||||||
<!-- <el-button class="ml-5" type="danger">取消订单</el-button>-->
|
<el-button class="ml-5" type="danger">取消订单</el-button>
|
||||||
<!-- </template>-->
|
</template>
|
||||||
<!-- </el-popconfirm>-->
|
</el-popconfirm>
|
||||||
<!-- <el-popconfirm confirm-button-text='确定' cancel-button-text='取消' icon="el-icon-info" icon-color="red"-->
|
<el-popconfirm confirm-button-text='确定' cancel-button-text='取消' icon="el-icon-info" icon-color="red"
|
||||||
<!-- title="您确定删除吗？">-->
|
title="您确定删除吗？">
|
||||||
<!-- </el-popconfirm>-->
|
</el-popconfirm>
|
||||||
<!-- </template>-->
|
</template>
|
||||||
<!-- </el-table-column>-->
|
</el-table-column>
|
||||||
<!-- </el-table>-->
|
</el-table>
|
||||||
<!-- <div style="padding: 10px 0">-->
|
<div style="padding: 10px 0">
|
||||||
<!-- <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"-->
|
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
|
||||||
<!-- :current-page="searchParams.current" :page-size="searchParams.pageSize" :page-sizes="[5, 10, 15, 20]"-->
|
:current-page="searchParams.current" :page-size="searchParams.pageSize" :page-sizes="[5, 10, 15, 20]"
|
||||||
<!-- :small="null" :disabled="null" :background="null" layout="total, sizes, prev, pager, next, jumper"-->
|
:small="null" :disabled="null" :background="null" layout="total, sizes, prev, pager, next, jumper"
|
||||||
<!-- :total="total" />-->
|
:total="total" />
|
||||||
<!-- </div>-->
|
</div>
|
||||||
<!-- <el-dialog v-model="dialogFormVisible" title="Shipping address" width="500">-->
|
<!-- <el-dialog v-model="dialogFormVisible" title="Shipping address" width="500">-->
|
||||||
<!-- <el-form :model=" null">-->
|
<!-- <el-form :model="">-->
|
||||||
<!-- <el-form-item label="快递单号" :label-width="formLabelWidth">-->
|
<!-- <el-form-item label="快递单号" :label-width="formLabelWidth">-->
|
||||||
<!-- <el-input v-model=" null" autocomplete="off" />-->
|
<!-- <el-input v-model=" " autocomplete="off" />-->
|
||||||
<!-- </el-form-item>-->
|
<!-- </el-form-item>-->
|
||||||
<!-- </el-form>-->
|
<!-- </el-form>-->
|
||||||
<!-- <template #footer>-->
|
<!-- <template #footer>-->
|
||||||
|
|
@ -69,99 +69,134 @@
|
||||||
<!-- </el-dialog>-->
|
<!-- </el-dialog>-->
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<!--<script lang="ts" setup>-->
|
<script lang="ts" setup>
|
||||||
<!--import {ref} from "vue";-->
|
import {ref,onMounted} from "vue";
|
||||||
<!--import myAxios from "@/api/myAxios";-->
|
import myAxios from "@/api/myAxios";
|
||||||
<!--import {ElMessage} from "element-plus";-->
|
import {ElMessage} from "element-plus";
|
||||||
<!--const tableData : any= ref([]);-->
|
const tableData : any= ref([]);
|
||||||
<!--const total = ref(0);-->
|
const total = ref(0);
|
||||||
<!--// const title = ref('')-->
|
const num = ref(0)
|
||||||
<!--// const editForm : any = ref({});-->
|
const dialogFormVisible = ref(false)
|
||||||
<!--// const DialogVisible = ref(true);-->
|
const formLabelWidth = '140px'
|
||||||
<!--const dialogFormVisible = ref(false)-->
|
onMounted(()=>{
|
||||||
<!--const formLabelWidth = '140px'-->
|
getOrderList()
|
||||||
<!--const searchParams: any = ref({ //封装分页-->
|
})
|
||||||
<!-- current: 1, //当前页码-->
|
|
||||||
<!-- pageSize: 5 //每页显示条数-->
|
|
||||||
<!--})-->
|
|
||||||
<!--const handleSizeChange = (newSize: any) => {-->
|
|
||||||
<!-- searchParams.value.pageSize = newSize //新的页面数-->
|
|
||||||
<!-- getOrderList()-->
|
|
||||||
<!--}-->
|
|
||||||
<!--const handleCurrentChange = (Current: any) => {-->
|
|
||||||
<!-- searchParams.value.current = Current-->
|
|
||||||
<!-- getOrderList()-->
|
|
||||||
<!--}-->
|
|
||||||
<!--const handleSelectionChange = (row: any) => {-->
|
|
||||||
<!-- id.value = JSON.parse(JSON.stringify(row));-->
|
|
||||||
<!--}-->
|
|
||||||
<!--const getOrderList = async () => {-->
|
|
||||||
<!-- try {-->
|
|
||||||
<!-- const res = await myAxios.post('', { ...searchParams.value });-->
|
|
||||||
<!-- if (res.data.code === 1) {-->
|
|
||||||
<!-- tableData.value = res.data.data.records;-->
|
|
||||||
<!-- total.value = parseInt(res.data.data.total)-->
|
|
||||||
<!-- } else {-->
|
|
||||||
<!-- ElMessage({-->
|
|
||||||
<!-- message: '获取数据失败',-->
|
|
||||||
<!-- });-->
|
|
||||||
<!-- }-->
|
|
||||||
<!-- } catch (error) {-->
|
|
||||||
<!-- ElMessage({-->
|
|
||||||
<!-- message: '发生错误',-->
|
|
||||||
<!-- });-->
|
|
||||||
<!-- }-->
|
|
||||||
<!--}-->
|
|
||||||
<!--const orderList = ref({-->
|
|
||||||
<!--id:'',-->
|
|
||||||
<!--userId:'',-->
|
|
||||||
<!--addressSnapshot:{-->
|
|
||||||
<!--name:'',-->
|
|
||||||
<!--phone:'',-->
|
|
||||||
<!--region:'',-->
|
|
||||||
<!--detailAddress:''-->
|
|
||||||
<!--},-->
|
|
||||||
<!--couponSnapshot:{-->
|
|
||||||
<!--name:'',-->
|
|
||||||
<!--conditionAmount:''-->
|
|
||||||
<!--},-->
|
|
||||||
<!--totalAmount:'',-->
|
|
||||||
<!--orderStatus:'',-->
|
|
||||||
<!--createTime:'',-->
|
|
||||||
<!--updateTime:'',-->
|
|
||||||
<!--isDelete:'',-->
|
|
||||||
<!--orderNumber:''-->
|
|
||||||
<!--})-->
|
|
||||||
<!--const delBatch =()=>{-->
|
|
||||||
<!-- //批量取消-->
|
|
||||||
<!--}-->
|
|
||||||
<!--//发货-->
|
|
||||||
<!--const shipments = (index: number, row: any , flag : number) => {-->
|
|
||||||
|
|
||||||
<!--};-->
|
const searchParams: any = ref({ //封装分页
|
||||||
<!--//编辑-->
|
current: 1, //当前页码
|
||||||
<!--const ReviseOrView = (index: number, row: any , flag : number) => {-->
|
pageSize: 5 //每页显示条数
|
||||||
|
})
|
||||||
|
const handleSizeChange = (newSize: any) => {
|
||||||
|
searchParams.value.pageSize = newSize //新的页面数
|
||||||
|
getOrderList()
|
||||||
|
}
|
||||||
|
const handleCurrentChange = (Current: any) => {
|
||||||
|
searchParams.value.current = Current
|
||||||
|
getOrderList()
|
||||||
|
}
|
||||||
|
const handleSelectionChange = (row: any) => {
|
||||||
|
// id.value = JSON.parse(JSON.stringify(row));
|
||||||
|
}
|
||||||
|
const getOrderList = async () => {
|
||||||
|
try {
|
||||||
|
const res = await myAxios.post('/order/list/page', { ...searchParams.value });
|
||||||
|
// console.log(res)
|
||||||
|
if (res.data.code === 1) {
|
||||||
|
tableData.value = res.data.data.records
|
||||||
|
total.value = parseInt(res.data.data.total)
|
||||||
|
for(let key in tableData.value) {
|
||||||
|
num.value = parseInt(key)
|
||||||
|
const resOrderDetail = await myAxios.post('/order/list/item',{id:tableData.value[key].id})
|
||||||
|
if( resOrderDetail.data.code === 1 ) {
|
||||||
|
tableData.value.goodSnapshot= resOrderDetail.data.data[key].goodSnapshot
|
||||||
|
tableData.value.quantity = resOrderDetail.data.data[key].quality
|
||||||
|
// console.log(resOrderDetail.data.data[0].goodSnapshot.name)
|
||||||
|
console.log( tableData.value.goodSnapshot.name)
|
||||||
|
console.log( resOrderDetail.data.data[key].quantity)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
ElMessage({
|
||||||
|
message: '获取数据失败',
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
ElMessage({
|
||||||
|
message: '发生错误',
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
<!--};-->
|
|
||||||
<!--const deleteProduct = async (index: number) => {-->
|
|
||||||
<!-- console.log(typeof index)-->
|
|
||||||
<!-- const res = await myAxios.post('/goods/delete', { id: index })-->
|
|
||||||
<!-- console.log(res)-->
|
|
||||||
<!-- if (res.data.code === 1) {-->
|
|
||||||
<!-- ElMessage({-->
|
|
||||||
<!-- type: 'success',-->
|
|
||||||
<!-- message: '删除成功',-->
|
|
||||||
<!-- })-->
|
|
||||||
<!-- getOrderList()-->
|
|
||||||
<!-- }-->
|
|
||||||
<!--}-->
|
|
||||||
<!--const reset = () => {-->
|
|
||||||
<!-- id.value = '';-->
|
|
||||||
|
|
||||||
<!--};-->
|
// const getItemList = async (id: number) => {
|
||||||
<!--const load =()=>{}-->
|
// try {
|
||||||
<!--</script>-->
|
// const res = await myAxios.post('/order/list/item', { id:tableData.value[key].id});
|
||||||
|
// console.log(res)
|
||||||
|
// if (res.data.code === 1) {
|
||||||
|
// tableData.value = res.data.data.records;
|
||||||
|
// total.value = parseInt(res.data.data.total)
|
||||||
|
// } else {
|
||||||
|
// ElMessage({
|
||||||
|
// message: '获取数据失败',
|
||||||
|
// });
|
||||||
|
// }
|
||||||
|
// } catch (error) {
|
||||||
|
// ElMessage({
|
||||||
|
// message: '发生错误',
|
||||||
|
// });
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
<!--<style lang="scss" scoped>-->
|
// const orderList = ref({
|
||||||
|
// id:'',
|
||||||
|
// userId:'',
|
||||||
|
// addressSnapshot:{
|
||||||
|
// name:'',
|
||||||
|
// phone:'',
|
||||||
|
// region:'',
|
||||||
|
// detailAddress:''
|
||||||
|
// },
|
||||||
|
// couponSnapshot:{
|
||||||
|
// name:'',
|
||||||
|
// conditionAmount:''
|
||||||
|
// },
|
||||||
|
// totalAmount:'',
|
||||||
|
// orderStatus:'',
|
||||||
|
// createTime:'',
|
||||||
|
// updateTime:'',
|
||||||
|
// isDelete:'',
|
||||||
|
// orderNumber:''
|
||||||
|
// })
|
||||||
|
const delBatch =()=>{
|
||||||
|
//批量取消
|
||||||
|
}
|
||||||
|
//发货
|
||||||
|
const shipments = (index: number, row: any , flag : number) => {
|
||||||
|
|
||||||
<!--</style> -->
|
};
|
||||||
|
//编辑
|
||||||
|
const ReviseOrView = (index: number, row: any , flag : number) => {
|
||||||
|
|
||||||
|
};
|
||||||
|
const deleteProduct = async (index: number) => {
|
||||||
|
console.log(typeof index)
|
||||||
|
const res = await myAxios.post('/goods/delete', { id: index })
|
||||||
|
console.log(res)
|
||||||
|
if (res.data.code === 1) {
|
||||||
|
ElMessage({
|
||||||
|
type: 'success',
|
||||||
|
message: '删除成功',
|
||||||
|
})
|
||||||
|
getOrderList()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const reset = () => {
|
||||||
|
id.value = '';
|
||||||
|
|
||||||
|
};
|
||||||
|
const load =()=>{}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
|
||||||
|
</style>
|
||||||
Loading…
Reference in New Issue
Block a user