diff --git a/src/views/bst/remind/index.vue b/src/views/bst/remind/index.vue
index 4480286..40cc124 100644
--- a/src/views/bst/remind/index.vue
+++ b/src/views/bst/remind/index.vue
@@ -11,16 +11,8 @@
/>
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
搜索
重置
@@ -166,6 +95,9 @@
+
+
+
{{d.row[column.key]}}
@@ -214,11 +146,8 @@
>
-
-
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -291,33 +184,31 @@ import FormCol from "@/components/FormCol/index.vue";
// 默认排序字段
const defaultSort = {
- prop: "createTime",
+ prop: "creataDate",
order: "descending"
}
export default {
name: "Remind",
mixins: [$showColumns],
- dicts: ['remind_type', 'clock_type'],
+ dicts: ['remind_type', 'clock_type','remind_switch'],
components: {FormCol},
data() {
return {
span: 24,
// 字段列表
columns: [
- {key: 'id', visible: true, label: 'id', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
- {key: 'reminderPattern', visible: true, label: '提醒模式(如:每天、每月、每年、下一次提醒)', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
- {key: 'reminderVal', visible: true, label: '提醒时机(每天x时,每月x日,每年x月x日,下次x年x月x日);天、月:存数字,年:存月日(MM-dd),下次时间:yyyy-MM-dd', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
- {key: 'projectType', visible: true, label: '项目类型(如:服务器、域名等)', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
- {key: 'notes', visible: true, label: '备注', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+ {key: 'reminderPattern', visible: true, label: '提醒模式', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+ {key: 'projectType', visible: true, label: '项目类型', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+ {key: 'notes', visible: true, label: '备注', minWidth: null, sortable: true, overflow: false, align: 'center', width: "300"},
{key: 'isInvalid', visible: true, label: '是否失效', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'reminderNumber', visible: true, label: '提醒次数', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
- {key: 'lastReminderTime', visible: true, label: '最后提醒时间', minWidth: null, sortable: false, overflow: false, align: 'center', width: "100"},
- {key: 'nextRemindTime', visible: true, label: '下一次提醒日期', minWidth: null, sortable: false, overflow: false, align: 'center', width: "100"},
- {key: 'createId', visible: true, label: '创建者', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+ {key: 'lastReminderTime', visible: true, label: '最后提醒', minWidth: null, sortable: false, overflow: false, align: 'center', width: "100"},
+ {key: 'nextRemindTime', visible: true, label: '提醒日期', minWidth: null, sortable: false, overflow: false, align: 'center', width: "100"},
+ {key: 'createName', visible: true, label: '创建者', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'creataDate', visible: true, label: '创建时间', minWidth: null, sortable: false, overflow: false, align: 'center', width: "100"},
- {key: 'updateId', visible: true, label: '更新者', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
- {key: 'updateDate', visible: true, label: '跟新时间', minWidth: null, sortable: false, overflow: false, align: 'center', width: "100"},
+ {key: 'updateName', visible: true, label: '更新者', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+ {key: 'updateDate', visible: true, label: '更新时间', minWidth: null, sortable: false, overflow: false, align: 'center', width: "100"},
],
// 排序方式
orderSorts: ['ascending', 'descending', null],
@@ -347,7 +238,6 @@ export default {
orderByColumn: defaultSort.prop,
isAsc: defaultSort.order,
reminderPattern: null,
- reminderVal: null,
projectType: null,
notes: null,
isInvalid: null,
@@ -366,11 +256,8 @@ export default {
reminderPattern: [
{ required: true, message: "提醒模式不能为空", trigger: "change" }
],
- reminderVal: [
- { required: true, message: "提醒时机不能为空", trigger: "blur" }
- ],
projectType: [
- { required: true, message: "项目类型(如:服务器、域名等)不能为空", trigger: "change" }
+ { required: true, message: "项目类型不能为空", trigger: "change" }
],
notes: [
{ required: true, message: "备注不能为空", trigger: "blur" }
@@ -382,7 +269,7 @@ export default {
{ required: true, message: "提醒次数不能为空", trigger: "blur" }
],
lastReminderTime: [
- { required: true, message: "最后提醒时间不能为空", trigger: "blur" }
+ { required: true, message: "最后提醒不能为空", trigger: "blur" }
],
}
};