product_platform/yxt-yyth-ui-admin
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2023-11-28

Browse Source
This commit is contained in:
guoxing
2023-11-28 14:28:52 +08:00
parent 10b7cf2a1d
commit 675e9a064f
2 changed files with 148 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
src/layout/components/Sidebar/index.vue
View File

@@ -121,49 +121,49 @@
name: "/order/index",
path: "/order/index"
},
{
alwaysShow: true,
component: "statisticalReport",
meta: {
icon: "el-icon-menu",
title: "统计报表",
},
name: "/statisticalReport/index",
path: "/statisticalReport/index",
children: [
// {
// alwaysShow: true,
// component: "statisticalReport",
// meta: {
// icon: "el-icon-menu",
// title: "统计报表",
// },
// name: "/statisticalReport/index",
// path: "/statisticalReport/index",
// children: [
{
alwaysShow: true,
component: "index",
meta: {
icon: "el-icon-help",
title: "提货卡汇总",
},
name: "/statisticalReport/index",
path: "/statisticalReport/index",
},
{
alwaysShow: true,
component: "collectionSummary",
meta: {
icon: "el-icon-help",
title: "提货汇总",
},
name: "/statisticalReport/collectionSummary",
path: "/statisticalReport/collectionSummary",
},
{
alwaysShow: true,
component: "deliveryDetails",
meta: {
icon: "el-icon-help",
title: "客户提货明细",
},
name: "/statisticalReport/deliveryDetails",
path: "/statisticalReport/deliveryDetails",
},
]
},
// {
// alwaysShow: true,
// component: "index",
// meta: {
// icon: "el-icon-help",
// title: "提货卡汇总",
// },
// name: "/statisticalReport/index",
// path: "/statisticalReport/index",
// },
// {
// alwaysShow: true,
// component: "collectionSummary",
// meta: {
// icon: "el-icon-help",
// title: "提货汇总",
// },
// name: "/statisticalReport/collectionSummary",
// path: "/statisticalReport/collectionSummary",
// },
// {
// alwaysShow: true,
// component: "deliveryDetails",
// meta: {
// icon: "el-icon-help",
// title: "客户提货明细",
// },
// name: "/statisticalReport/deliveryDetails",
// path: "/statisticalReport/deliveryDetails",
// },
// ]
// },
],
};
},

34
src/views/marketingCard/pickupCardSet.vue
View File

@@ -3,7 +3,7 @@
<el-tabs v-model="activeName" class="my-tabs" type="card" @tab-click="handleClick" style="margin-top: 20px;">
<el-tab-pane label="提货卡记录" name="roleList">
<div class="main-content">
<div class="container" v-show="viewState == 1">
<div class="tab-header">
<el-form :inline="true" :model="page.params" class="demo-form-inline">
@@ -11,15 +11,15 @@
<el-col :span="21">
<el-form-item label="发行开始日期">
<el-date-picker v-model="page.params.startDate" @change="selectTime1"
type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
style="width: 200px;">
type="date" placeholder="选择日期" format="yyyy-MM-dd"
value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
</el-form-item>
<el-form-item label="发行结束日期">
<el-date-picker v-model="page.params.endDate" @change="selectTime2" type="date"
placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
style="width: 200px;">
<el-date-picker v-model="page.params.endDate" @change="selectTime2"
type="date" placeholder="选择日期" format="yyyy-MM-dd"
value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
</el-form-item>
@@ -53,10 +53,10 @@
</el-table>
<pagination :total="page.total" :page.sync="page.current" :limit.sync="page.size"
@pagination="pagination" />
@pagination="pagination" style="padding-bottom: 100px;"/>
</div>
<div class="container" v-show="viewState == 2">
<div class="container" v-show="viewState == 2" >
<div class="tab-header">
<el-form :inline="true" :model="listQuery.params" class="demo-form-inline">
<el-row :gutter="20">
@@ -76,13 +76,15 @@
<el-button type="primary" @click="getPageList2()">查 询</el-button>
<el-button type="primary" @click="returnView()">返 回</el-button>
</el-col>
<el-col :span="2">
<el-col :span="4">
<el-form-item style="float: right;">
<div
style="display: flex;flex-direction: row;align-items: center;justify-content: space-between;">
<el-button type="primary" @click="exportExcel()">导出Excel</el-button>
</el-form-item>
</el-col <el-col :span="2">
<el-form-item style="float: right;">
<el-button type="primary" @click="downloadQR()">下载二维码</el-button>
<el-button type="primary" @click="downloadQR()"
style="margin-left: 10px;">下载二维码</el-button>
</div>
</el-form-item>
</el-col>
</el-row>
@@ -113,7 +115,8 @@
</el-table>
<pagination :total="page.total" :page.sync="page.current" :limit.sync="page.size"
@pagination="pagination" />
@pagination="pagination" style="padding-bottom: 100px;" />
</div>
</div>
</el-tab-pane>
@@ -350,7 +353,7 @@
loading.close()
})
},
downloadQR(){
downloadQR() {
this.$message({
showClose: true,
type: 'success',
@@ -407,6 +410,7 @@
margin-right: 60px;
min-width: 70%;
margin-top: 20px;
margin-bottom: 50px;
.item {
display: flex;