yxt_product
/
yxt-yyth-ui-admin
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2023-11-28

master
guoxing 2 years ago
parent
10b7cf2a1d
commit
675e9a064f
2 changed files with 154 additions and 150 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 84
      src/layout/components/Sidebar/index.vue
  2. 220
      src/views/marketingCard/pickupCardSet.vue

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",
}, // },
] // ]
}, // },
], ],
}; };
}, },

220
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>
</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>
</el-form-item>
<el-button type="primary" @click="getPageList()">查 询</el-button>
</el-col>
</el-row>
</el-form>
</div>
<div class="container" v-show="viewState == 1"> <el-table :data="tableData" border style="width: 100%; margin-top: 20px;"
<div class="tab-header"> :row-style="{height: '40px'}">
<el-form :inline="true" :model="page.params" class="demo-form-inline"> <el-table-column label="序号" width="70px" type="index" align="center">
<el-row :gutter="20"> </el-table-column>
<el-col :span="21"> <el-table-column label="操作" width="150px" align="center">
<el-form-item label="发行开始日期"> <template slot-scope="scope">
<el-date-picker v-model="page.params.startDate" @change="selectTime1" <el-button type="primary" size="mini" @click="showRow(scope.row)">
type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" 明细
style="width: 200px;"> </el-button>
</el-date-picker> </template>
</el-table-column>
</el-form-item> <el-table-column prop="startNumber" label="序列起始号" align="center">
<el-form-item label="发行结束日期"> </el-table-column>
<el-date-picker v-model="page.params.endDate" @change="selectTime2" type="date" <el-table-column prop="endNumber" label="序列结束号" align="center">
placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" </el-table-column>
style="width: 200px;"> <el-table-column prop="buildDate" label="发行时间" align="center">
</el-date-picker> </el-table-column>
<el-table-column prop="countNumber" label="发行总数" align="center">
</el-form-item> </el-table-column>
<el-button type="primary" @click="getPageList()">查 询</el-button> <el-table-column prop="bagName" label="绑定礼包" align="center">
</el-col> </el-table-column>
</el-row> </el-table>
</el-form>
<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> </el-form-item>
</template> <el-form-item label="卡片状态">
</el-table-column> <el-select v-model="listQuery.params.state" placeholder="请选择">
<el-table-column prop="startNumber" label="序列起始号" align="center"> <el-option v-for="(item,i) in stateList" :key="i" :label="item.name"
</el-table-column> :value="item.sid">
<el-table-column prop="endNumber" label="序列结束号" align="center"> </el-option>
</el-table-column> </el-select>
<el-table-column prop="buildDate" label="发行时间" align="center">
</el-table-column> </el-form-item>
<el-table-column prop="countNumber" label="发行总数" align="center"> <el-button type="primary" @click="getPageList2()">查 询</el-button>
</el-table-column> <el-button type="primary" @click="returnView()">返 回</el-button>
<el-table-column prop="bagName" label="绑定礼包" align="center"> </el-col>
</el-table-column> <el-col :span="4">
</el-table> <el-form-item style="float: right;">
<div
<pagination :total="page.total" :page.sync="page.current" :limit.sync="page.size" style="display: flex;flex-direction: row;align-items: center;justify-content: space-between;">
@pagination="pagination" /> <el-button type="primary" @click="exportExcel()">导出Excel</el-button>
</div> <el-button type="primary" @click="downloadQR()"
style="margin-left: 10px;">下载二维码</el-button>
<div class="container" v-show="viewState == 2"> </div>
<div class="tab-header">
<el-form :inline="true" :model="listQuery.params" class="demo-form-inline"> </el-form-item>
<el-row :gutter="20"> </el-col>
<el-col :span="20"> </el-row>
<el-form-item label="卡片序列号"> </el-form>
<el-input v-model="listQuery.params.number" placeholder="" clearable /> </div>
</el-form-item>
<el-form-item label="卡片状态">
<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>
</el-form-item>
<el-button type="primary" @click="getPageList2()">查 询</el-button>
<el-button type="primary" @click="returnView()">返 回</el-button>
</el-col>
<el-col :span="2">
<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;" <el-table :data="tableData2" border style="width: 100%; margin-top: 20px;"
:row-style="{height: '40px'}"> :row-style="{height: '40px'}">
<el-table-column label="序号" width="70px" type="index" align="center"> <el-table-column label="序号" width="70px" type="index" align="center">
</el-table-column> </el-table-column>
<!-- <el-table-column label="操作" width="150px" align="center"> <!-- <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;

Write Preview
Loading…
Cancel
Save