Merge branch 'dev'
Showing
24 changed files
with
425 additions
and
99 deletions
This diff is collapsed.
Click to expand it.
-
Please register or sign in to post a comment
... | ... | @@ -407,6 +407,7 @@ |
<el-date-picker | ||
v-model="ruleForm.qlxx.djsj" | ||
type="date" | ||
class="width100" | ||
placeholder="选择日期" | ||
value-format="yyyy-MM-dd HH:mm:ss" | ||
format="yyyy-MM-dd" | ||
... | ... |
... | ... | @@ -122,7 +122,7 @@ class data extends filter { |
minWidth: '130' | ||
}, | ||
{ | ||
label: '操作111', | ||
label: '操作', | ||
width: '160', | ||
align: 'center', | ||
fixed: 'right', | ||
... | ... |
... | ... | @@ -103,7 +103,7 @@ class data extends filter { |
minWidth: '130' | ||
}, | ||
{ | ||
label: '操作111', | ||
label: '操作', | ||
width: '160', | ||
align: 'center', | ||
fixed: 'right', | ||
... | ... |