协议相关、文章分类bug修改、文章逻辑完善、前端界面完善
This commit is contained in:
parent
e131da3db0
commit
0c6efcd179
|
@ -122,7 +122,7 @@
|
|||
|
||||
<!-- 添加或修改广告对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
||||
<el-form ref="form" :model="form" label-width="80px">
|
||||
<el-form-item label="广告类型" prop="type">
|
||||
<el-select v-model="form.type" placeholder="请选择广告类型">
|
||||
<el-option
|
||||
|
@ -227,18 +227,6 @@ export default {
|
|||
},
|
||||
// 表单参数
|
||||
form: {},
|
||||
// 表单校验
|
||||
// rules: {
|
||||
// createTime: [
|
||||
// { required: true, message: "创建时间不能为空", trigger: "blur" }
|
||||
// ],
|
||||
// deleted: [
|
||||
// { required: true, message: "逻辑删除标志,0否,1是不能为空", trigger: "blur" }
|
||||
// ],
|
||||
// urlType: [
|
||||
// { required: true, message: "跳转类型,1外链跳转,2站内跳转不能为空", trigger: "change" }
|
||||
// ]
|
||||
// }
|
||||
};
|
||||
},
|
||||
created() {
|
||||
|
|
|
@ -154,12 +154,11 @@
|
|||
</div>
|
||||
</form-col>
|
||||
</el-col>
|
||||
|
||||
<form-col :span="span" label="简介" prop="brief">
|
||||
<el-input v-model="form.brief" placeholder="请输入简介" />
|
||||
</form-col>
|
||||
<form-col :span="span" label="内容详情">
|
||||
<editor v-model="form.content" :min-height="200"/>
|
||||
<editor v-model="form.content" :min-height="200"/>
|
||||
</form-col>
|
||||
|
||||
</el-row>
|
||||
|
@ -176,6 +175,7 @@
|
|||
import { listAgreement, getAgreement, delAgreement, addAgreement, updateAgreement } from "@/api/bst/agreement";
|
||||
import { $showColumns } from '@/utils/mixins';
|
||||
import FormCol from "@/components/FormCol/index.vue";
|
||||
import Editor from "@/components/Editor/index.vue";
|
||||
|
||||
// 默认排序字段
|
||||
const defaultSort = {
|
||||
|
@ -187,23 +187,59 @@ export default {
|
|||
name: "Agreement",
|
||||
mixins: [$showColumns],
|
||||
dicts: ['agreement_type'],
|
||||
components: {FormCol},
|
||||
components: {FormCol,Editor},
|
||||
data() {
|
||||
return {
|
||||
span: 24,
|
||||
// 字段列表
|
||||
columns: [
|
||||
{key: 'id', visible: true, label: 'ID', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
|
||||
{ key: 'userName', visible: true, label: '商户', sortable: true, align: 'center' },
|
||||
{ key: 'areaName', visible: true, label: '运营区', sortable: true, align: 'center' },
|
||||
{
|
||||
key: 'id',
|
||||
visible: true,
|
||||
label: 'ID',
|
||||
minWidth: null,
|
||||
sortable: true,
|
||||
overflow: false,
|
||||
align: 'center',
|
||||
width: null
|
||||
},
|
||||
{key: 'userName', visible: true, label: '商户', sortable: true, align: 'center'},
|
||||
{key: 'areaName', visible: true, label: '运营区', sortable: true, align: 'center'},
|
||||
//{key: 'storeId', visible: true, label: '商户', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
|
||||
//{key: 'areaId', visible: true, label: '运营区', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
|
||||
{key: 'title', visible: true, label: '标题', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
|
||||
{key: 'brief', visible: true, label: '简介', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
|
||||
{
|
||||
key: 'title',
|
||||
visible: true,
|
||||
label: '标题',
|
||||
minWidth: null,
|
||||
sortable: true,
|
||||
overflow: false,
|
||||
align: 'center',
|
||||
width: null
|
||||
},
|
||||
{
|
||||
key: 'brief',
|
||||
visible: true,
|
||||
label: '简介',
|
||||
minWidth: null,
|
||||
sortable: true,
|
||||
overflow: false,
|
||||
align: 'center',
|
||||
width: null
|
||||
},
|
||||
|
||||
// {key: 'content', visible: true, label: '内容详情', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
|
||||
{key: 'agreementType', visible: true, label: '协议类型', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
|
||||
// {key: 'duration', visible: true, label: '展示时间', minWidth: null, sortable: false, overflow: false, align: 'center', width: "100"},
|
||||
// {key: 'content', visible: true, label: '内容详情', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
|
||||
{
|
||||
key: 'agreementType',
|
||||
visible: true,
|
||||
label: '协议类型',
|
||||
minWidth: null,
|
||||
sortable: true,
|
||||
overflow: false,
|
||||
align: 'center',
|
||||
width: null
|
||||
},
|
||||
// {key: 'duration', visible: true, label: '展示时间', minWidth: null, sortable: false, overflow: false, align: 'center', width: "100"},
|
||||
],
|
||||
// 排序方式
|
||||
orderSorts: ['ascending', 'descending', null],
|
||||
|
@ -245,7 +281,7 @@ export default {
|
|||
// 表单校验
|
||||
rules: {
|
||||
title: [
|
||||
{ required: true, message: "标题不能为空", trigger: "blur" }
|
||||
{required: true, message: "标题不能为空", trigger: "blur"}
|
||||
],
|
||||
}
|
||||
};
|
||||
|
@ -308,7 +344,7 @@ export default {
|
|||
// 多选框选中数据
|
||||
handleSelectionChange(selection) {
|
||||
this.ids = selection.map(item => item.id)
|
||||
this.single = selection.length!==1
|
||||
this.single = selection.length !== 1
|
||||
this.multiple = !selection.length
|
||||
},
|
||||
/** 新增按钮操作 */
|
||||
|
@ -322,9 +358,7 @@ export default {
|
|||
this.reset();
|
||||
const id = row.id || this.ids
|
||||
getAgreement(id).then(response => {
|
||||
const data = response.data;
|
||||
this.form = { ...data, duration: data.duration
|
||||
};
|
||||
this.form = response.data;
|
||||
this.open = true;
|
||||
this.title = "修改协议";
|
||||
});
|
||||
|
@ -333,7 +367,10 @@ export default {
|
|||
submitForm() {
|
||||
this.$refs["form"].validate(valid => {
|
||||
if (valid) {
|
||||
const submitData = { ...this.form };
|
||||
const submitData = {
|
||||
...this.form,
|
||||
};
|
||||
|
||||
if (this.form.id != null) {
|
||||
updateAgreement(submitData).then(response => {
|
||||
this.$modal.msgSuccess("修改成功");
|
||||
|
|
|
@ -91,11 +91,13 @@
|
|||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-audit"
|
||||
:icon="scope.row.appealStatus === '1' ? 'el-icon-audit' : 'el-icon-check'"
|
||||
@click="handleNext(scope.row, 1)"
|
||||
v-has-permi="['bst:fault:edit']"
|
||||
v-if="scope.row.appealStatus !=='3' && scope.row.appealStatus !=='0'"
|
||||
>处理</el-button>
|
||||
v-if="scope.row.appealStatus === '1' || scope.row.appealStatus === '2'"
|
||||
>
|
||||
{{ scope.row.appealStatus === '1' ? '处理' : '完成' }}
|
||||
</el-button>
|
||||
</template>
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <el-button-->
|
||||
|
|
Loading…
Reference in New Issue
Block a user