Skip to content

S
saas-manage
Commit 5034da30 by wuqian
Options

wq合并 

# Conflicts:
#	package-lock.json
parents 25c64c87 ac743931
Showing with 160 additions and 152 deletions
src/views/operation/lossOrder/index.vue
<template> <template>
<div class="saas-manage card"> <div class="saas-manage card">
<div class="search"> <div class="search">
<el-form <el-form :model="searchForm" size="small" :inline="true">
:model="searchForm" <el-form-item label="所属平台">
size="small"
:inline="true"
>
<el-form-item label="所属平台">
<el-select <el-select
style="width: 120px" style="width: 120px"
filterable filterable
clearable clearable
v-model="searchForm.salesPlatform" v-model="searchForm.salesPlatform"
placeholder="请选择所属平台" placeholder="请选择所属平台">
>
<el-option <el-option
v-for="(value, v-for="(value, index) in plateformList"
index) in plateformList"
:key="index" :key="index"
:value="value" :value="value"
:label="index" :label="index"></el-option>
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="三方平台订单ID"> <el-form-item label="三方平台订单ID">
<el-input <el-input
style="width: 160px" style="width: 160px"
clearable clearable
v-model="searchForm.orderThirdId" v-model="searchForm.orderThirdId"
placeholder="请输入三方平台订单ID" placeholder="请输入三方平台订单ID"></el-input>
></el-input> </el-form-item>
</el-form-item> <el-form-item label="店铺单号">
<el-form-item label="店铺单号"> <el-input
<el-input style="width: 140px"
style="width: 140px" clearable
clearable v-model="searchForm.shopNumber"
v-model="searchForm.shopNumber" placeholder="请输入店铺单号"></el-input>
placeholder="请输入店铺单号" </el-form-item>
></el-input> <el-form-item label="创建时间">
</el-form-item> <el-date-picker
<el-form-item label="创建时间"> style="width: 360px"
<el-date-picker v-model="searchForm.createTimeText"
style="width: 360px" type="datetimerange"
v-model="searchForm.createTimeText" value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" range-separator="至"
value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期"
range-separator="至" end-placeholder="结束日期"></el-date-picker>
start-placeholder="开始日期" </el-form-item>
end-placeholder="结束日期" <el-form-item label="失败类型">
> <el-select
</el-date-picker> v-model="searchForm.failType"
</el-form-item> style="width: 120px"
<el-form-item> filterable
<el-button clearable
type="primary" value-key=""
size="small" placeholder="请选择失败类型">
icon="el-icon-search" <el-option
@click="search" v-for="(type, index) in failTypes"
>查询</el-button :key="index"
> :label="type.value"
</el-form-item> :value="type.id"></el-option>
<el-form-item> </el-select>
<el-button </el-form-item>
type="danger" <el-form-item>
size="small" <el-button
icon="el-icon-delete" type="primary"
@click="deleteData()" size="small"
>删除</el-button icon="el-icon-search"
> @click="search">
</el-form-item> 查询
<el-form-item> </el-button>
<el-button </el-form-item>
type="primary" <el-form-item>
size="small" <el-button
icon="el-icon-download" type="danger"
@click="downloadData()" size="small"
>重新下载</el-button icon="el-icon-delete"
> @click="deleteData()">
</el-form-item> 删除
<el-form-item> </el-button>
<el-button </el-form-item>
type="default" <el-form-item>
size="small" <el-button
icon="el-icon-refresh" type="primary"
@click="transformData()" size="small"
>重新转化</el-button icon="el-icon-download"
> @click="downloadData()">
</el-form-item> 重新下载
</el-button>
</el-form-item>
<el-form-item>
<el-button
type="default"
size="small"
icon="el-icon-refresh"
@click="transformData()">
重新转化
</el-button>
</el-form-item>
</el-form> </el-form>
</div> </div>
<div class="table-wrap" v-loading="loading"> <div class="table-wrap" v-loading="loading">
...@@ -99,11 +103,14 @@ ...@@ -99,11 +103,14 @@
:highlight-current-row="true" :highlight-current-row="true"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
@row-click="rowClick" @row-click="rowClick"
header-row-class-name="header-row-class-name" header-row-class-name="header-row-class-name">
>
<el-table-column type="expand"> <el-table-column type="expand">
<template slot-scope="props"> <template slot-scope="props">
<el-form label-position="right" inline class="demo-table-expand" style="display: none;"> <el-form
label-position="right"
inline
class="demo-table-expand"
style="display: none">
<el-form-item label="所属平台"> <el-form-item label="所属平台">
<span>{{ props.row.salesPlatform }}</span> <span>{{ props.row.salesPlatform }}</span>
</el-form-item> </el-form-item>
...@@ -114,9 +121,20 @@ ...@@ -114,9 +121,20 @@
<span>{{ props.row.shopNumber }}</span> <span>{{ props.row.shopNumber }}</span>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form label-position="right" label-width="100px" size="medium" class="demo-table-expand"> <el-form
label-position="right"
label-width="100px"
size="medium"
class="demo-table-expand">
<el-form-item label="失败原因："> <el-form-item label="失败原因：">
<span style="background-color: #f8f8f9;display: block;padding: 0 13px 0 13px;">{{ props.row.failReason }}</span> <span
style="
background-color: #f8f8f9;
display: block;
padding: 0 13px 0 13px;
">
{{ props.row.failReason }}
</span>
</el-form-item> </el-form-item>
</el-form> </el-form>
</template> </template>
...@@ -125,59 +143,56 @@ ...@@ -125,59 +143,56 @@
type="selection" type="selection"
width="55" width="55"
header-align="center" header-align="center"
align="center" align="center"></el-table-column>
>
</el-table-column>
<el-table-column <el-table-column
label="序号" label="序号"
type="index" type="index"
width="50" width="50"
align="center" align="center"
header-align="center" header-align="center"></el-table-column>
>
</el-table-column>
<el-table-column <el-table-column
label="namespace" label="namespace"
prop="namespace" prop="namespace"
header-align="center" header-align="center"
align="center" align="center"
width="180" width="180"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"></el-table-column>
></el-table-column>
<el-table-column <el-table-column
label="所属平台" label="所属平台"
prop="salesPlatform" prop="salesPlatform"
header-align="center" header-align="center"
align="center" align="center"
width="180" width="180"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"></el-table-column>
></el-table-column> <el-table-column
label="店铺简称"
prop="shopShortName"
header-align="center"
align="center"
width="200"
:show-overflow-tooltip="true"></el-table-column>
<el-table-column <el-table-column
label="三方平台订单ID" label="三方平台订单ID"
prop="orderThirdId" prop="orderThirdId"
width="200" width="200"
header-align="center" header-align="center"></el-table-column>
>
</el-table-column>
<el-table-column <el-table-column
label="店铺单号" label="店铺单号"
prop="shopNumber" prop="shopNumber"
header-align="center" header-align="center"
align="center" align="center"
width="200" width="200"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"></el-table-column>
></el-table-column>
<el-table-column <el-table-column
label="失败类型" label="失败类型"
prop="failType" prop="failType"
header-align="center" header-align="center"
align="center" align="center"
min-width="50" min-width="50"
:show-overflow-tooltip="true" :show-overflow-tooltip="true">
> <template #default="{ row }">
<template #default="{row}"> {{ ['下载失败', '转化失败'][row.failType - 1] }}
{{['下载失败','转化失败'][row.failType-1]}} </template>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="失败原因" label="失败原因"
...@@ -185,29 +200,25 @@ ...@@ -185,29 +200,25 @@
header-align="center" header-align="center"
align="center" align="center"
min-width="160" min-width="160"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"></el-table-column>
></el-table-column>
<el-table-column <el-table-column
label="创建时间" label="创建时间"
prop="createTime" prop="createTime"
header-align="center" header-align="center"
align="center" align="center"
width="160" width="160"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"></el-table-column>
></el-table-column>
<el-table-column <el-table-column
label="操作" label="操作"
header-align="center" header-align="center"
align="center" align="center"
width="55" width="55"
fixed="right" fixed="right">
>
<template slot-scope="scope"> <template slot-scope="scope">
<i <i
style="cursor: pointer;color:#F56C6C" style="cursor: pointer; color: #f56c6c"
class="el-icon-delete" class="el-icon-delete"
@click="deleteData(scope.row)" @click="deleteData(scope.row)"></i>
></i>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -220,11 +231,8 @@ ...@@ -220,11 +231,8 @@
:page-size="pageSize" :page-size="pageSize"
:current-page="currentPage" :current-page="currentPage"
@size-change="sizeChange" @size-change="sizeChange"
@current-change="onCurrentChange" @current-change="onCurrentChange"></el-pagination>
>
</el-pagination>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
...@@ -233,12 +241,16 @@ import { ...@@ -233,12 +241,16 @@ import {
downloadData, downloadData,
convertOrderAgain, convertOrderAgain,
deleteData, // eslint-disable-line no-unused-vars deleteData, // eslint-disable-line no-unused-vars
listShopPlateformData, listShopPlateformData
} from '@/common/api/operation/lossOrder' } from '@/common/api/operation/lossOrder'
export default { export default {
name: 'lossOrderManage', name: 'lossOrderManage',
data() { data() {
return { return {
failTypes: [
{ id: 1, value: '下载失败' },
{ id: 2, value: '转化失败' }
],
manageData: [], manageData: [],
searchForm: {}, searchForm: {},
total: 0, total: 0,
...@@ -246,7 +258,7 @@ export default { ...@@ -246,7 +258,7 @@ export default {
currentPage: 1, currentPage: 1,
loading: false, loading: false,
selection: [], selection: [],
plateformList: [], plateformList: []
} }
}, },
async created() { async created() {
...@@ -257,16 +269,15 @@ export default { ...@@ -257,16 +269,15 @@ export default {
async getList() { async getList() {
this.loading = true this.loading = true
try { try {
const res = await listTableData( const res = await listTableData({
{ ...this.searchForm,
...this.searchForm, createTimeStart:
createTimeStart: this.searchForm.createTimeText && this.searchForm.createTimeText[0], this.searchForm.createTimeText && this.searchForm.createTimeText[0],
createTimeEnd: this.searchForm.createTimeText && this.searchForm.createTimeText[1], createTimeEnd:
currentPage: this.currentPage, this.searchForm.createTimeText && this.searchForm.createTimeText[1],
pageSize: this.pageSize, currentPage: this.currentPage,
}, pageSize: this.pageSize
})
)
this.manageData = res.data.records this.manageData = res.data.records
this.total = res.data.total this.total = res.data.total
} catch (e) { } catch (e) {
...@@ -292,14 +303,14 @@ export default { ...@@ -292,14 +303,14 @@ export default {
} }
console.log(this.selection) console.log(this.selection)
if (arr.length === 0) { if (arr.length === 0) {
this.$message.error('请至少选择一条记录') this.$message.error('请至少选择一条记录')
return return
} }
try { try {
await this.$confirm('确认重新下载？', '提示', { await this.$confirm('确认重新下载？', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning'
}) })
} catch { } catch {
return return
...@@ -307,7 +318,7 @@ export default { ...@@ -307,7 +318,7 @@ export default {
ids = this.selection.map((item) => item.id) ids = this.selection.map((item) => item.id)
ids = ids.join() ids = ids.join()
const l = this.$loading({ const l = this.$loading({
background: 'rgba(0, 0, 0, 0.3)', background: 'rgba(0, 0, 0, 0.3)'
}) })
try { try {
await downloadData(ids) await downloadData(ids)
...@@ -329,14 +340,14 @@ export default { ...@@ -329,14 +340,14 @@ export default {
} }
console.log(this.selection) console.log(this.selection)
if (arr.length === 0) { if (arr.length === 0) {
this.$message.error('请至少选择一条记录') this.$message.error('请至少选择一条记录')
return return
} }
try { try {
await this.$confirm('确认重新转化？', '提示', { await this.$confirm('确认重新转化？', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning'
}) })
} catch { } catch {
return return
...@@ -344,7 +355,7 @@ export default { ...@@ -344,7 +355,7 @@ export default {
ids = this.selection.map((item) => item.id) ids = this.selection.map((item) => item.id)
ids = ids.join() ids = ids.join()
const l = this.$loading({ const l = this.$loading({
background: 'rgba(0, 0, 0, 0.3)', background: 'rgba(0, 0, 0, 0.3)'
}) })
try { try {
await convertOrderAgain(ids) await convertOrderAgain(ids)
...@@ -366,14 +377,14 @@ export default { ...@@ -366,14 +377,14 @@ export default {
} }
console.log(this.selection) console.log(this.selection)
if (arr.length === 0) { if (arr.length === 0) {
this.$message.error('请至少选择一条记录') this.$message.error('请至少选择一条记录')
return return
} }
try { try {
await this.$confirm('确认删除？', '提示', { await this.$confirm('确认删除？', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning'
}) })
} catch { } catch {
return return
...@@ -381,7 +392,7 @@ export default { ...@@ -381,7 +392,7 @@ export default {
ids = this.selection.map((item) => item.id) ids = this.selection.map((item) => item.id)
ids = ids.join() ids = ids.join()
const l = this.$loading({ const l = this.$loading({
background: 'rgba(0, 0, 0, 0.3)', background: 'rgba(0, 0, 0, 0.3)'
}) })
try { try {
await deleteData(ids) await deleteData(ids)
...@@ -405,10 +416,7 @@ export default { ...@@ -405,10 +416,7 @@ export default {
this.getList() this.getList()
}, },
rowClick(row) { rowClick(row) {
if ( if (this.selection.length === 1 && this.selection[0] === row) {
this.selection.length === 1 &&
this.selection[0] === row
) {
this.selection = [] this.selection = []
this.$refs.table.clearSelection() this.$refs.table.clearSelection()
} else { } else {
...@@ -416,8 +424,8 @@ export default { ...@@ -416,8 +424,8 @@ export default {
this.$refs.table.clearSelection() this.$refs.table.clearSelection()
this.$refs.table.toggleRowSelection(row, true) this.$refs.table.toggleRowSelection(row, true)
} }
}, }
}, }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
...@@ -481,12 +489,12 @@ export default { ...@@ -481,12 +489,12 @@ export default {
} }
.demo-table-expand { .demo-table-expand {
font-size: 0; font-size: 0;
//padding: 0 20px 0 20px; //padding: 0 20px 0 20px;
} }
.el-form-item__label{ .el-form-item__label {
width: 90px!important; width: 90px !important;
color: #99a9bf!important; color: #99a9bf !important;
} }
</style> </style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment