|
@@ -32,7 +32,7 @@
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="操作系统">
|
|
<el-form-item label="操作系统">
|
|
<el-select v-model="form.platform" placeholder="请选择操作系统">
|
|
<el-select v-model="form.platform" placeholder="请选择操作系统">
|
|
- <el-option v-for="item in platformOptions" :key="item.value" :value="item.value" :label="item.label" />
|
|
|
|
|
|
+ <el-option v-for="item in systemOptions" :key="item.value" :value="item.value" :label="item.label" />
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</span>
|
|
</span>
|
|
@@ -88,22 +88,23 @@
|
|
<el-table-column label="支付时间" prop="goodsUpdateTime" key="goodsUpdateTime" align="center" />
|
|
<el-table-column label="支付时间" prop="goodsUpdateTime" key="goodsUpdateTime" align="center" />
|
|
<el-table-column label="用户账号" prop="userName" key="userName" align="center" />
|
|
<el-table-column label="用户账号" prop="userName" key="userName" align="center" />
|
|
<el-table-column label="支付流水号" prop="payId" key="payId" align="center" />
|
|
<el-table-column label="支付流水号" prop="payId" key="payId" align="center" />
|
|
- <el-table-column v-if="form.searchType === '2'" label="生效状态" prop="flowStatus" key="flowStatus" align="center" :formatter="flowFormatter" />
|
|
|
|
|
|
+ <el-table-column v-if="form.searchType === '2'" label="生效状态" prop="flowStatus" key="flowStatus" align="center"
|
|
|
|
+ :formatter="flowFormatter" />
|
|
<el-table-column v-if="form.searchType === '2'" label="生效时间" prop="effectTime" key="effectTime" align="center" />
|
|
<el-table-column v-if="form.searchType === '2'" label="生效时间" prop="effectTime" key="effectTime" align="center" />
|
|
</el-table>
|
|
</el-table>
|
|
<pagination v-show="total > 0" :total="total" :page.sync="form.pageNum" :limit.sync="form.pageSize"
|
|
<pagination v-show="total > 0" :total="total" :page.sync="form.pageNum" :limit.sync="form.pageSize"
|
|
@pagination="getList" />
|
|
@pagination="getList" />
|
|
<!-- 弹窗 -->
|
|
<!-- 弹窗 -->
|
|
<el-dialog :visible.sync="dialogVisible" title="导出历史" width="1000px">
|
|
<el-dialog :visible.sync="dialogVisible" title="导出历史" width="1000px">
|
|
- <el-table :data="dialogTable">
|
|
|
|
- <el-table-column type="index" label="序号" align="center"></el-table-column>
|
|
|
|
- <el-table-column label="任务ID" align="center"></el-table-column>
|
|
|
|
- <el-table-column label="任务名称" align="center"></el-table-column>
|
|
|
|
- <el-table-column label="任务类型" align="center"></el-table-column>
|
|
|
|
- <el-table-column label="导出时间" align="center"></el-table-column>
|
|
|
|
|
|
+ <el-table :data="dialogTable" v-loading="dialogLoading">
|
|
|
|
+ <el-table-column type="index" label="序号" align="center" />
|
|
|
|
+ <el-table-column label="任务ID" prop="msgId" align="center" />
|
|
|
|
+ <el-table-column label="任务名称" prop="jobName" align="center" />
|
|
|
|
+ <el-table-column label="任务类型" prop="jobType" align="center" />
|
|
|
|
+ <el-table-column label="导出时间" prop="updateTime" align="center" />
|
|
<el-table-column label="操作" align="center">
|
|
<el-table-column label="操作" align="center">
|
|
- <template>
|
|
|
|
- <el-button type="text">下载</el-button>
|
|
|
|
|
|
+ <template slot-scope="scope">
|
|
|
|
+ <el-button type="text" @click="getDownLoad(scope.row)" :disabled="scope.row.status === 1">下载</el-button>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
</el-table>
|
|
</el-table>
|
|
@@ -114,15 +115,16 @@
|
|
</template>
|
|
</template>
|
|
|
|
|
|
<script>
|
|
<script>
|
|
-import { list } from '@/api/order/list'
|
|
|
|
|
|
+import { list, dialogList, download, downLoadHistory } from '@/api/order/list'
|
|
import { list as sceneList } from '@/api/operation/scene'
|
|
import { list as sceneList } from '@/api/operation/scene'
|
|
-import { payTypeMixin } from '@/mixin/index'
|
|
|
|
|
|
+import { payTypeMixin, systemMixin } from '@/mixin/index'
|
|
export default {
|
|
export default {
|
|
- mixins: [payTypeMixin],
|
|
|
|
|
|
+ mixins: [payTypeMixin, systemMixin],
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
// 遮罩层
|
|
// 遮罩层
|
|
loading: false,
|
|
loading: false,
|
|
|
|
+ dialogLoading: false,
|
|
// 表单
|
|
// 表单
|
|
form: {
|
|
form: {
|
|
pageNum: 1,
|
|
pageNum: 1,
|
|
@@ -136,7 +138,10 @@ export default {
|
|
// 弹窗
|
|
// 弹窗
|
|
dialogVisible: false,
|
|
dialogVisible: false,
|
|
// 弹窗表单
|
|
// 弹窗表单
|
|
- dialogForm: {},
|
|
|
|
|
|
+ dialogForm: {
|
|
|
|
+ pageNum: 1,
|
|
|
|
+ pageSize: 10
|
|
|
|
+ },
|
|
// 弹窗列表
|
|
// 弹窗列表
|
|
dialogTable: [],
|
|
dialogTable: [],
|
|
// 历史数据
|
|
// 历史数据
|
|
@@ -182,14 +187,6 @@ export default {
|
|
value: 2,
|
|
value: 2,
|
|
label: '已失效'
|
|
label: '已失效'
|
|
}],
|
|
}],
|
|
- // 操作系统
|
|
|
|
- platformOptions: [{
|
|
|
|
- value: 1,
|
|
|
|
- label: 'Android'
|
|
|
|
- }, {
|
|
|
|
- value: 2,
|
|
|
|
- label: 'iOS'
|
|
|
|
- }],
|
|
|
|
platformIdOptions: [{
|
|
platformIdOptions: [{
|
|
value: 6,
|
|
value: 6,
|
|
label: 'QQ音乐'
|
|
label: 'QQ音乐'
|
|
@@ -237,14 +234,44 @@ export default {
|
|
|
|
|
|
// 导出
|
|
// 导出
|
|
handleExport() {
|
|
handleExport() {
|
|
- this.download('system/xxxx/export', {
|
|
|
|
- ...this.form
|
|
|
|
- }, `post_${new Date().getTime()}.xlsx`)
|
|
|
|
|
|
+ download(this.form).then(res => {
|
|
|
|
+ if (res.code === 0) {
|
|
|
|
+ this.$message.success(`${res.data}`)
|
|
|
|
+ }
|
|
|
|
+ })
|
|
},
|
|
},
|
|
|
|
|
|
// 弹窗
|
|
// 弹窗
|
|
getDialog() {
|
|
getDialog() {
|
|
this.dialogVisible = true
|
|
this.dialogVisible = true
|
|
|
|
+ this.getDialogList()
|
|
|
|
+ },
|
|
|
|
+
|
|
|
|
+ // 历史列表
|
|
|
|
+ getDialogList() {
|
|
|
|
+ this.dialogLoading = true
|
|
|
|
+ dialogList(this.dialogForm).then(res => {
|
|
|
|
+ if (res.code === 0) {
|
|
|
|
+ this.dialogTable = res.data.records
|
|
|
|
+ this.dialogTotal = res.data.total
|
|
|
|
+ this.dialogLoading = false
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ },
|
|
|
|
+
|
|
|
|
+ // 历史下载
|
|
|
|
+ getDownLoad(row) {
|
|
|
|
+ this.$confirm(`是否下载${row.jobName}?`, '提示', {
|
|
|
|
+ type: 'warning'
|
|
|
|
+ }).then(() => {
|
|
|
|
+ downLoadHistory(row.msgId).then(res => {
|
|
|
|
+ if (res.code === 0) {
|
|
|
|
+ this.$message.success('下载成功!')
|
|
|
|
+ window.location.href = res.data
|
|
|
|
+ this.getDialogList()
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ }).catch(() => { })
|
|
},
|
|
},
|
|
|
|
|
|
// 栏目
|
|
// 栏目
|
|
@@ -279,7 +306,7 @@ export default {
|
|
},
|
|
},
|
|
|
|
|
|
platformFormatter(row) {
|
|
platformFormatter(row) {
|
|
- return this.selectDictLabel(this.platformOptions, row.platform)
|
|
|
|
|
|
+ return this.selectDictLabel(this.systemOptions, row.platform)
|
|
},
|
|
},
|
|
|
|
|
|
platformIdFormatter(row) {
|
|
platformIdFormatter(row) {
|