Skip to content

C
cust_web
Commit 96c5062b authored by 罗林杰's avatar 罗林杰
Browse files
Options

修改查询

parent f424adfb
Hide whitespace changes
Inline Side-by-side
Showing with 112 additions and 43 deletions
src/views/contentManagement/activity/info/index.vue
View file @ 96c5062b
......@@ -84,43 +84,6 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label="是否实名:"
prop="isAuthentication"
:rules="{ required: !(controls.isOperation === '3'), message: '请选择是否需要实名认证', trigger: 'change' }"
>
<el-select
v-model="form.isAuthentication"
placeholder="请选择是否需要实名认证"
size="small"
class="normalInput"
:disabled="secondFromDisabled"
>
<el-option v-for="item in yesOrNo" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item
label="是否会员:"
prop="isNeedMember"
:rules="{ required: !(controls.isOperation === '3'), message: '请选择是否会员', trigger: 'change' }"
>
<el-select
v-model="form.isNeedMember"
placeholder="请选择是否会员"
size="small"
class="normalInput"
:disabled="secondFromDisabled"
>
<el-option v-for="item in yesOrNo" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label="发布日期:"
......@@ -138,6 +101,43 @@
/>
</el-form-item>
</el-col>
<!-- <el-col :span="12">-->
<!-- <el-form-item-->
<!-- label="是否实名:"-->
<!-- prop="isAuthentication"-->
<!-- :rules="{ required: !(controls.isOperation === '3'), message: '请选择是否需要实名认证', trigger: 'change' }"-->
<!-- >-->
<!-- <el-select-->
<!-- v-model="form.isAuthentication"-->
<!-- placeholder="请选择是否需要实名认证"-->
<!-- size="small"-->
<!-- class="normalInput"-->
<!-- :disabled="secondFromDisabled"-->
<!-- >-->
<!-- <el-option v-for="item in yesOrNo" :key="item.value" :label="item.label" :value="item.value" />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
<el-row :gutter="20">
<!-- <el-col :span="12">-->
<!-- <el-form-item-->
<!-- label="是否会员:"-->
<!-- prop="isNeedMember"-->
<!-- :rules="{ required: !(controls.isOperation === '3'), message: '请选择是否会员', trigger: 'change' }"-->
<!-- >-->
<!-- <el-select-->
<!-- v-model="form.isNeedMember"-->
<!-- placeholder="请选择是否会员"-->
<!-- size="small"-->
<!-- class="normalInput"-->
<!-- :disabled="secondFromDisabled"-->
<!-- >-->
<!-- <el-option v-for="item in yesOrNo" :key="item.value" :label="item.label" :value="item.value" />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
<el-row :gutter="20">
<el-col :span="12">
......@@ -342,7 +342,7 @@
</el-form>
</div>
</div>
<el-dialog :visible.sync="open" width="500px" append-to-body>
<el-dialog class="ql-editor" :visible.sync="open" width="500px" append-to-body>
<div v-if="formattedDetails" class="preview-content" v-html="formattedDetails" />
<div v-else>暂无预览内容</div>
</el-dialog>
......@@ -366,6 +366,7 @@ import {
import { VueEditor } from 'vue2-editor'
import { yesOrNo, enableOrDisable } from '@/utils/allPageData'
import { uploadPublic } from '@/api/system/ossInfo'
import 'quill/dist/quill.core.css'
export default {
components: {
......@@ -453,6 +454,7 @@ export default {
}
return match
})
console.log('formattedDetails', updatedHtml)
return updatedHtml
}
},
......
src/views/operationsManagement/memFeedBack/index.vue
View file @ 96c5062b
......@@ -51,6 +51,16 @@
/>
</el-select>
</el-form-item>
<el-form-item label="投诉人" prop="memCode">
<el-input
v-model="queryParams.memCode"
placeholder="请输入会员号"
clearable
:maxlength="50"
size="small"
style="width: 150px"
/>
</el-form-item>
<el-form-item>
<el-button
:class="commonField.queryClass"
......@@ -114,6 +124,11 @@
{{ scope.row.remarks || '-' }}
</template>
</el-table-column>
<el-table-column label="投诉人" prop="memNickname" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.memNickname || '' }}{{ scope.row.memCode ? '(' + scope.row.memCode + ')' : '' }}
</template>
</el-table-column>
<el-table-column label="创建时间" prop="createDate" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
......@@ -272,6 +287,7 @@ export default {
feedbackType: undefined,
title: undefined,
content: undefined,
status: '0',
flag: ''
}
this.handleQuery()
......
src/views/system/sysScheduledTaskLog/index.vue
View file @ 96c5062b
......@@ -2,14 +2,21 @@
<div class="app-container">
<el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
<el-form-item label="任务名称" prop="taskName">
<el-input
<el-select
v-model="queryParams.taskName"
placeholder="请输入任务名称"
clearable
:maxlength="255"
size="small"
style="width: 150px"
/>
style="width: 350px"
>
<el-option
v-for="dict in taskNameOptions"
:key="dict.dictLabel"
:label="dict.dictLabel"
:value="dict.dictLabel"
/>
</el-select>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker
......@@ -24,14 +31,21 @@
/>
</el-form-item>
<el-form-item label="执行情况" prop="taskState">
<el-input
<el-select
v-model="queryParams.taskState"
placeholder="请输入执行情况"
clearable
:maxlength="255"
size="small"
style="width: 150px"
/>
>
<el-option
v-for="dict in taskStateOptions"
:key="dict.dictLabel"
:label="dict.dictLabel"
:value="dict.dictLabel"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button
......@@ -113,6 +127,43 @@ export default {
dictValue: '0'
}
],
taskStateOptions: [
{
dictLabel: '成功'
},
{
dictLabel: '失败'
}
],
taskNameOptions: [
{
dictLabel: '订单关闭定时任务'
},
{
dictLabel: '订单落库定时任务'
},
{
dictLabel: '退款接口调用补救定时任务'
},
{
dictLabel: '退款确认补救定时任务'
},
{
dictLabel: '支付确认补救定时任务'
},
{
dictLabel: '用户访问数据定时任务'
},
{
dictLabel: '定时更新话题表动态数定时任务'
},
{
dictLabel: '定时更新会员表的被点赞数和被关注数定时任务'
},
{
dictLabel: '用户点赞数据定时任务'
}
],
// 日期范围
dateRange: [],
// 查询参数
......
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