dev2 #1

Open
panjunjie wants to merge 174 commits from dev2 into main
Showing only changes of commit 60426f4594 - Show all commits

View File

@ -92,6 +92,7 @@
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) }}
@ -828,8 +829,8 @@
// //
return (val) => { return (val) => {
const map = { const map = {
0: '确认', 0: '确认',
1: '确认' 1: '确认'
} }
return map[val] ?? val return map[val] ?? val
} }