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", name: "/order/index",
path: "/order/index" path: "/order/index"
}, },
{ // {
alwaysShow: true, // alwaysShow: true,
component: "statisticalReport", // component: "statisticalReport",
meta: { // meta: {
icon: "el-icon-menu", // icon: "el-icon-menu",
title: "统计报表", // title: "统计报表",
}, // },
name: "/statisticalReport/index", // name: "/statisticalReport/index",
path: "/statisticalReport/index", // path: "/statisticalReport/index",
children: [ // children: [
{ // {
alwaysShow: true, // alwaysShow: true,
component: "index", // component: "index",
meta: { // meta: {
icon: "el-icon-help", // icon: "el-icon-help",
title: "提货卡汇总", // title: "提货卡汇总",
}, // },
name: "/statisticalReport/index", // name: "/statisticalReport/index",
path: "/statisticalReport/index", // path: "/statisticalReport/index",
}, // },
{ // {
alwaysShow: true, // alwaysShow: true,
component: "collectionSummary", // component: "collectionSummary",
meta: { // meta: {
icon: "el-icon-help", // icon: "el-icon-help",
title: "提货汇总", // title: "提货汇总",
}, // },
name: "/statisticalReport/collectionSummary", // name: "/statisticalReport/collectionSummary",
path: "/statisticalReport/collectionSummary", // path: "/statisticalReport/collectionSummary",
}, // },
{ // {
alwaysShow: true, // alwaysShow: true,
component: "deliveryDetails", // component: "deliveryDetails",
meta: { // meta: {
icon: "el-icon-help", // icon: "el-icon-help",
title: "客户提货明细", // title: "客户提货明细",
}, // },
name: "/statisticalReport/deliveryDetails", // name: "/statisticalReport/deliveryDetails",
path: "/statisticalReport/deliveryDetails", // path: "/statisticalReport/deliveryDetails",
}, // },
] // ]
}, // },
], ],
}; };
}, },

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

@@ -3,117 +3,120 @@
<el-tabs v-model="activeName" class="my-tabs" type="card" @tab-click="handleClick" style="margin-top: 20px;"> <el-tabs v-model="activeName" class="my-tabs" type="card" @tab-click="handleClick" style="margin-top: 20px;">
<el-tab-pane label="提货卡记录" name="roleList"> <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">
<el-row :gutter="20">
<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;">
</el-date-picker>
<div class="container" v-show="viewState == 1"> </el-form-item>
<div class="tab-header"> <el-form-item label="发行结束日期">
<el-form :inline="true" :model="page.params" class="demo-form-inline"> <el-date-picker v-model="page.params.endDate" @change="selectTime2"
<el-row :gutter="20"> type="date" placeholder="选择日期" format="yyyy-MM-dd"
<el-col :span="21"> value-format="yyyy-MM-dd" style="width: 200px;">
<el-form-item label="发行开始日期"> </el-date-picker>
<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;">
</el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="发行结束日期"> <el-button type="primary" @click="getPageList()">查 询</el-button>
<el-date-picker v-model="page.params.endDate" @change="selectTime2" type="date" </el-col>
placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" </el-row>
style="width: 200px;"> </el-form>
</el-date-picker> </div>
</el-form-item> <el-table :data="tableData" border style="width: 100%; margin-top: 20px;"
<el-button type="primary" @click="getPageList()">查 询</el-button> :row-style="{height: '40px'}">
</el-col> <el-table-column label="序号" width="70px" type="index" align="center">
</el-row> </el-table-column>
</el-form> <el-table-column label="操作" width="150px" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="showRow(scope.row)">
明细
</el-button>
</template>
</el-table-column>
<el-table-column prop="startNumber" label="序列起始号" align="center">
</el-table-column>
<el-table-column prop="endNumber" label="序列结束号" align="center">
</el-table-column>
<el-table-column prop="buildDate" label="发行时间" align="center">
</el-table-column>
<el-table-column prop="countNumber" label="发行总数" align="center">
</el-table-column>
<el-table-column prop="bagName" label="绑定礼包" align="center">
</el-table-column>
</el-table>
<pagination :total="page.total" :page.sync="page.current" :limit.sync="page.size"
@pagination="pagination" style="padding-bottom: 100px;"/>
</div> </div>
<el-table :data="tableData" border style="width: 100%; margin-top: 20px;" <div class="container" v-show="viewState == 2" >
:row-style="{height: '40px'}"> <div class="tab-header">
<el-table-column label="序号" width="70px" type="index" align="center"> <el-form :inline="true" :model="listQuery.params" class="demo-form-inline">
</el-table-column> <el-row :gutter="20">
<el-table-column label="操作" width="150px" align="center"> <el-col :span="20">
<template slot-scope="scope"> <el-form-item label="卡片序列号">
<el-button type="primary" size="mini" @click="showRow(scope.row)"> <el-input v-model="listQuery.params.number" placeholder="" clearable />
明细
</el-button>
</template>
</el-table-column>
<el-table-column prop="startNumber" label="序列起始号" align="center">
</el-table-column>
<el-table-column prop="endNumber" label="序列结束号" align="center">
</el-table-column>
<el-table-column prop="buildDate" label="发行时间" align="center">
</el-table-column>
<el-table-column prop="countNumber" label="发行总数" align="center">
</el-table-column>
<el-table-column prop="bagName" label="绑定礼包" align="center">
</el-table-column>
</el-table>
<pagination :total="page.total" :page.sync="page.current" :limit.sync="page.size" </el-form-item>
@pagination="pagination" /> <el-form-item label="卡片状态">
</div> <el-select v-model="listQuery.params.state" placeholder="请选择">
<el-option v-for="(item,i) in stateList" :key="i" :label="item.name"
:value="item.sid">
</el-option>
</el-select>
<div class="container" v-show="viewState == 2"> </el-form-item>
<div class="tab-header"> <el-button type="primary" @click="getPageList2()">查 询</el-button>
<el-form :inline="true" :model="listQuery.params" class="demo-form-inline"> <el-button type="primary" @click="returnView()">返 回</el-button>
<el-row :gutter="20"> </el-col>
<el-col :span="20"> <el-col :span="4">
<el-form-item label="卡片序列号"> <el-form-item style="float: right;">
<el-input v-model="listQuery.params.number" placeholder="" clearable /> <div
style="display: flex;flex-direction: row;align-items: center;justify-content: space-between;">
<el-button type="primary" @click="exportExcel()">导出Excel</el-button>
<el-button type="primary" @click="downloadQR()"
style="margin-left: 10px;">下载二维码</el-button>
</div>
</el-form-item> </el-form-item>
<el-form-item label="卡片状态"> </el-col>
<el-select v-model="listQuery.params.state" placeholder="请选择"> </el-row>
<el-option v-for="(item,i) in stateList" :key="i" :label="item.name" </el-form>
:value="item.sid"> </div>
</el-option>
</el-select>
</el-form-item> <el-table :data="tableData2" border style="width: 100%; margin-top: 20px;"
<el-button type="primary" @click="getPageList2()">查 询</el-button> :row-style="{height: '40px'}">
<el-button type="primary" @click="returnView()">返 回</el-button> <el-table-column label="序号" width="70px" type="index" align="center">
</el-col> </el-table-column>
<el-col :span="2"> <!-- <el-table-column label="操作" width="150px" align="center">
<el-form-item style="float: right;">
<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-form-item>
</el-col>
</el-row>
</el-form>
</div>
<el-table :data="tableData2" border style="width: 100%; margin-top: 20px;"
:row-style="{height: '40px'}">
<el-table-column label="序号" width="70px" type="index" align="center">
</el-table-column>
<!-- <el-table-column label="操作" width="150px" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" size="mini" @click="editRow(scope.row)"> <el-button type="primary" size="mini" @click="editRow(scope.row)">
明细 明细
</el-button> </el-button>
</template> </template>
</el-table-column> --> </el-table-column> -->
<el-table-column prop="serialNumber" label="序列号" align="center"> <el-table-column prop="serialNumber" label="序列号" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="code" label="提货码" align="center"> <el-table-column prop="code" label="提货码" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="codeKey" label="提货密码" align="center"> <el-table-column prop="codeKey" label="提货密码" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="state" label="卡片状态" align="center"> <el-table-column prop="state" label="卡片状态" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="customerMobile" label="客户手机号" align="center"> <el-table-column prop="customerMobile" label="客户手机号" align="center">
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination :total="page.total" :page.sync="page.current" :limit.sync="page.size" <pagination :total="page.total" :page.sync="page.current" :limit.sync="page.size"
@pagination="pagination" /> @pagination="pagination" style="padding-bottom: 100px;" />
</div>
</div> </div>
</el-tab-pane> </el-tab-pane>
@@ -278,8 +281,8 @@
.then(resp => { .then(resp => {
console.log('>>>>>>>>>recordDetails', resp.data) console.log('>>>>>>>>>recordDetails', resp.data)
this.tableData2 = resp.data.records this.tableData2 = resp.data.records
this.recordId = resp.data.records[0].recordId this.recordId = resp.data.records[0].recordId
this.listQuery.total = resp.data.total this.listQuery.total = resp.data.total
}) })
.catch(() => { .catch(() => {
@@ -292,12 +295,12 @@
this.viewState = 2 this.viewState = 2
req.recordDetails(this.listQuery) req.recordDetails(this.listQuery)
.then(resp => { .then(resp => {
console.log('>>>>>>>>>recordDetails', resp.data) console.log('>>>>>>>>>recordDetails', resp.data)
this.tableData2 = resp.data.records this.tableData2 = resp.data.records
this.recordId = resp.data.records[0].recordId this.recordId = resp.data.records[0].recordId
this.listQuery.total = resp.data.total this.listQuery.total = resp.data.total
}) })
.catch(() => { .catch(() => {
@@ -350,7 +353,7 @@
loading.close() loading.close()
}) })
}, },
downloadQR(){ downloadQR() {
this.$message({ this.$message({
showClose: true, showClose: true,
type: 'success', type: 'success',
@@ -407,6 +410,7 @@
margin-right: 60px; margin-right: 60px;
min-width: 70%; min-width: 70%;
margin-top: 20px; margin-top: 20px;
margin-bottom: 50px;
.item { .item {
display: flex; display: flex;