Compare commits

..

No commits in common. "24f3786c1c63314d7bf6e00bc1267bc2125cb413" and "b497242585ae09a660a340b40c87a078bf5404be" have entirely different histories.

2 changed files with 2 additions and 4 deletions

View File

@ -92,7 +92,6 @@
align="center" align="center"
:label="__('用户是否确认')" :label="__('用户是否确认')"
prop="order_item_confirm_status" prop="order_item_confirm_status"
> >
<template slot-scope="scope"> <template slot-scope="scope">
{{ formatUserConfirmType(scope.row.order_item_confirm_status) }} {{ formatUserConfirmType(scope.row.order_item_confirm_status) }}
@ -829,8 +828,8 @@
// //
return (val) => { return (val) => {
const map = { const map = {
0: '确认', 0: '确认',
1: '确认' 1: '确认'
} }
return map[val] ?? val return map[val] ?? val
} }

View File

@ -40,7 +40,6 @@
:style="{ width: '100%' }" :style="{ width: '100%' }"
type="datetime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
default-time="23:59:59"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>