소스 검색

fix #19900 #19888 加班申请单、用车申请单

chengc 2 주 전
부모
커밋
7719ad902d
1개의 변경된 파일5개의 추가작업 그리고 4개의 파일을 삭제
  1. 5 4
      lib/shared/widgets/bill_status_bar.dart

+ 5 - 4
lib/shared/widgets/bill_status_bar.dart

@@ -79,6 +79,7 @@ class BillStatusBar {
   bool get showCancelSubmit => _approvalStatus == 'SHCOUNT1';
 
   bool get showReturn {
+    if (onReturn == null) return false;
     final s = _approvalStatus;
     return (s == 'SHCOUNT4' || s == 'SHCOUNT6') && !_isClosed && !_isTransferred;
   }
@@ -187,7 +188,7 @@ class BillStatusBar {
                 text: _editLabel(l10n),
                 size: TDButtonSize.medium,
                 type: TDButtonType.outline,
-                shape: TDButtonShape.rectangle,
+                shape: TDButtonShape.round,
                 theme: TDButtonTheme.primary,
                 onTap: onEdit,
               ),
@@ -202,7 +203,7 @@ class BillStatusBar {
                 text: _submitLabel(l10n),
                 size: TDButtonSize.medium,
                 type: TDButtonType.fill,
-                shape: TDButtonShape.rectangle,
+                shape: TDButtonShape.round,
                 theme: TDButtonTheme.primary,
                 onTap: onSubmit,
               ),
@@ -214,7 +215,7 @@ class BillStatusBar {
                 text: _cancelSubmitLabel(l10n),
                 size: TDButtonSize.medium,
                 type: TDButtonType.fill,
-                shape: TDButtonShape.rectangle,
+                shape: TDButtonShape.round,
                 theme: TDButtonTheme.danger,
                 onTap: onCancelSubmit,
               ),
@@ -228,7 +229,7 @@ class BillStatusBar {
                 text: _returnLabel(l10n),
                 size: TDButtonSize.medium,
                 type: TDButtonType.fill,
-                shape: TDButtonShape.rectangle,
+                shape: TDButtonShape.round,
                 theme: TDButtonTheme.primary,
                 onTap: onReturn,
               ),