admin1/jiangchengfeiyi-Web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: admin1:10d80f09b962b6248a3f0edc1b8a5b085ba0c9a8
Branches Tags
admin1:main
admin1:v2.0.5
admin1:v2.0
admin1:v1.1.0
admin1:v1.0.0
admin1:v0.0.7
admin1:v0.0.6
admin1:v0.0.5
admin1:v0.0.4
..
compare: admin1:1c7c4370e842e75a55e1790ab8ab89cb8f2ec3ab
Branches Tags
admin1:main
admin1:v2.0.5
admin1:v2.0
admin1:v1.1.0
admin1:v1.0.0
admin1:v0.0.7
admin1:v0.0.6
admin1:v0.0.5
admin1:v0.0.4

No commits in common. "10d80f09b962b6248a3f0edc1b8a5b085ba0c9a8" and "1c7c4370e842e75a55e1790ab8ab89cb8f2ec3ab" have entirely different histories.
10d80f09b9 ... 1c7c4370e8

2 changed files with 381 additions and 408 deletions
Show Stats Expand all files Collapse all files

94
src/views/Orders/OrderList.vue
View File

@ -1,10 +1,10 @@
<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="name"></el-input> v-model="name"></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>
@ -54,6 +54,15 @@
<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>
@ -117,41 +126,41 @@
</div> </div>
</template> </template>
</el-dialog> --> </el-dialog> -->
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import {onMounted, ref} from "vue"; import {onMounted, ref} 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 title = ref('')
const editForm : any = ref({}); const editForm : any = ref({});
const DialogVisible = ref(true); const DialogVisible = ref(true);
const name =ref('') const name =ref('')
const searchParams: any = ref({ //封装分页 const searchParams: any = ref({ //封装分页
current: 1, //当前页码 current: 1, //当前页码
pageSize: 5 //每页显示条数 pageSize: 5 //每页显示条数
}) })
const num = ref(0) const num = ref(0)
const orderDetail : any = ref([]) //订单中的商品明细，多个商品 const orderDetail : any = ref([]) //订单中的商品明细，多个商品
//订单列表 //订单列表
const orderList = ref([{}]) const orderList = ref([{}])
onMounted(()=>{ onMounted(()=>{
getOrderList() //页面加载获取订单列表 getOrderList() //页面加载获取订单列表
}) })
const handleSizeChange = (newSize: any) => { const handleSizeChange = (newSize: any) => {
searchParams.value.pageSize = newSize //新的页面数 searchParams.value.pageSize = newSize //新的页面数
getOrderList() getOrderList()
} }
const handleCurrentChange = (Current: any) => { const handleCurrentChange = (Current: any) => {
searchParams.value.current = Current searchParams.value.current = Current
getOrderList() getOrderList()
} }
const handleSelectionChange = (row: any) => { const handleSelectionChange = (row: any) => {
// id.value = JSON.parse(JSON.stringify(row)); // id.value = JSON.parse(JSON.stringify(row));
} }
const getOrderList = async () => { const getOrderList = async () => {
try { try {
const res = await myAxios.post('/order/list/page', { ...searchParams.value}); const res = await myAxios.post('/order/list/page', { ...searchParams.value});
console.log('订单信息--->',res.data); console.log('订单信息--->',res.data);
@ -182,16 +191,16 @@
message: '发生错误', message: '发生错误',
}); });
} }
} }
const delBatch =()=>{ const delBatch =()=>{
//批量删除 //批量删除
} }
const showDetail = (index: number, row: any , flag : number) => { const showDetail = (index: number, row: any , flag : number) => {
title.value = "订单详情" title.value = "订单详情"
DialogVisible.value = true; DialogVisible.value = true;
editForm.value = row; editForm.value = row;
}; };
const deleteProduct = async (index: number) => { const deleteProduct = async (index: number) => {
// console.log(typeof index) // console.log(typeof index)
const res = await myAxios.post('/goods/delete', { id: index }) const res = await myAxios.post('/goods/delete', { id: index })
console.log(res) console.log(res)
@ -202,15 +211,14 @@
}) })
getOrderList() getOrderList()
} }
} }
const reset = () => { const reset = () => {
name.value = ''; name.value = '';
}; };
const load =()=>{} const load =()=>{}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
</style>
</style>

355
src/views/Orders/orderOperations.vue
View File

@ -1,202 +1,167 @@
<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="goodSnapshot.name" label="商品名称"></el-table-column> <!-- <el-table-column prop="" label="购买商品名称"></el-table-column>-->
<el-table-column prop="quantity" label="购买数量" width="180"></el-table-column> <!-- <el-table-column prop="" 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="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="" 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="">--> <!-- <el-form :model=" null">-->
<!-- <el-form-item label="快递单号" :label-width="formLabelWidth">--> <!-- <el-form-item label="快递单号" :label-width="formLabelWidth">-->
<!-- <el-input v-model=" " autocomplete="off" />--> <!-- <el-input v-model=" null" autocomplete="off" />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-form>--> <!-- </el-form>-->
<!-- <template #footer>--> <!-- <template #footer>-->
<!-- <div class="dialog-footer">--> <!-- <div class="dialog-footer">-->
<!-- <el-button @click="dialogFormVisible = false">取消</el-button>--> <!-- <el-button @click="dialogFormVisible = false">取消</el-button>-->
<!-- <el-button type="primary" @click="dialogFormVisible = false">--> <!-- <el-button type="primary" @click="dialogFormVisible = false">-->
<!-- 确定--> <!-- 确定-->
<!-- </el-button>--> <!-- </el-button>-->
<!-- </div>--> <!-- </div>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-dialog>--> <!-- </el-dialog>-->
</template> </template>
<script lang="ts" setup> <!--<script lang="ts" setup>-->
import {ref,onMounted} from "vue"; <!--import {ref} 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 num = ref(0) <!--// const title = ref('')-->
const dialogFormVisible = ref(false) <!--// const editForm : any = ref({});-->
const formLabelWidth = '140px' <!--// const DialogVisible = ref(true);-->
onMounted(()=>{ <!--const dialogFormVisible = ref(false)-->
getOrderList() <!--const formLabelWidth = '140px'-->
}) <!--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, //当前页码 <!--//编辑-->
pageSize: 5 //每页显示条数 <!--const ReviseOrView = (index: number, row: any , flag : number) => {-->
})
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) => { <!--};-->
// try { <!--const load =()=>{}-->
// const res = await myAxios.post('/order/list/item', { id:tableData.value[key].id}); <!--</script>-->
// 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: '发生错误',
// });
// }
// }
// const orderList = ref({ <!--<style lang="scss" scoped>-->
// 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>