Commit d7cb7848 authored by 冷冷's avatar 冷冷

💄 Updating the UI and style files.

parent 58d66ad2
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
"test:e2e": "vue-cli-service test:e2e" "test:e2e": "vue-cli-service test:e2e"
}, },
"dependencies": { "dependencies": {
"@smallwei/avue": "^1.4.3", "@smallwei/avue": "^1.4.6-beta2",
"avue-plugin-transfer": "^0.0.2", "avue-plugin-transfer": "^0.0.2",
"avue-plugin-ueditor": "^0.0.1", "avue-plugin-ueditor": "^0.0.1",
"axios": "^0.18.0", "axios": "^0.18.0",
......
...@@ -57,7 +57,7 @@ export const tableOption = { ...@@ -57,7 +57,7 @@ export const tableOption = {
prop: 'createTime', prop: 'createTime',
type: 'datetime', type: 'datetime',
format: 'yyyy-MM-dd HH:mm', format: 'yyyy-MM-dd HH:mm',
valueFormat: 'yyyy-MM-dd HH:mm:ss', valueFormat: 'timestamp',
editDisabled: true, editDisabled: true,
addVisdiplay: false addVisdiplay: false
}, { }, {
...@@ -66,13 +66,8 @@ export const tableOption = { ...@@ -66,13 +66,8 @@ export const tableOption = {
prop: 'lastUpdateTime', prop: 'lastUpdateTime',
type: 'datetime', type: 'datetime',
format: 'yyyy-MM-dd HH:mm', format: 'yyyy-MM-dd HH:mm',
valueFormat: 'yyyy-MM-dd HH:mm:ss', valueFormat: 'timestamp',
editDisabled: true, editDisabled: true,
addVisdiplay: false addVisdiplay: false
}, {
label: '备注',
prop: 'desc',
editVisdiplay: false,
hide: true
}] }]
} }
...@@ -49,6 +49,7 @@ export const tableOption = { ...@@ -49,6 +49,7 @@ export const tableOption = {
label: '请假时间', label: '请假时间',
prop: 'leaveTime', prop: 'leaveTime',
type: 'datetime', type: 'datetime',
overHidden:true,
format: 'yyyy-MM-dd HH:mm', format: 'yyyy-MM-dd HH:mm',
valueFormat: "yyyy-MM-dd hh:mm:ss" valueFormat: "yyyy-MM-dd hh:mm:ss"
}, },
...@@ -56,25 +57,28 @@ export const tableOption = { ...@@ -56,25 +57,28 @@ export const tableOption = {
label: '提交时间', label: '提交时间',
prop: 'createTime', prop: 'createTime',
type: 'datetime', type: 'datetime',
overHidden:true,
format: 'yyyy-MM-dd HH:mm', format: 'yyyy-MM-dd HH:mm',
editDisabled: true, editDisabled: true,
addVisdiplay: false,
hide: true
},
{
label: '状态',
prop: 'state',
type: 'select',
dicData: 'leave_status',
search: true,
addVisdiplay: false addVisdiplay: false
}, },
{ {
label: '备注', label: '备注',
prop: 'content', prop: 'content',
type:'textarea', type:'textarea',
overHidden:true,
minRows:2, minRows:2,
row:true, row:true,
span:24 span:24
},
{
label: '状态',
prop: 'state',
type: 'select',
dicData: 'leave_status',
search: true,
addVisdiplay: false
} }
] ]
} }
...@@ -54,7 +54,7 @@ export const tableOption = { ...@@ -54,7 +54,7 @@ export const tableOption = {
prop: 'deploymentTime', prop: 'deploymentTime',
type: 'datetime', type: 'datetime',
format: 'yyyy-MM-dd HH:mm', format: 'yyyy-MM-dd HH:mm',
valueFormat: 'yyyy-MM-dd HH:mm:ss', valueFormat: 'timestamp',
editDisabled: true, editDisabled: true,
addVisdiplay: false addVisdiplay: false
}] }]
......
...@@ -77,7 +77,6 @@ export const tableOption = { ...@@ -77,7 +77,6 @@ export const tableOption = {
width: 180, width: 180,
label: '创建时间', label: '创建时间',
prop: 'createTime', prop: 'createTime',
more: true,
type: 'datetime', type: 'datetime',
format: 'yyyy-MM-dd HH:mm', format: 'yyyy-MM-dd HH:mm',
valueFormat: 'yyyy-MM-dd HH:mm:ss', valueFormat: 'yyyy-MM-dd HH:mm:ss',
......
...@@ -141,7 +141,6 @@ export const tableOption = { ...@@ -141,7 +141,6 @@ export const tableOption = {
type: 'datetime', type: 'datetime',
format: 'yyyy-MM-dd HH:mm', format: 'yyyy-MM-dd HH:mm',
valueFormat: 'yyyy-MM-dd HH:mm:ss', valueFormat: 'yyyy-MM-dd HH:mm:ss',
more: true,
editDisabled: true, editDisabled: true,
addVisdiplay: false, addVisdiplay: false,
span: 24, span: 24,
......
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