Ver código fonte

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

chengc 1 semana atrás
pai
commit
439e10ea8b

+ 7 - 5
lib/features/overtime/widgets/overtime_apply_detail_dialog.dart

@@ -429,13 +429,15 @@ class _OvertimeApplyDetailDialogState extends State<OvertimeApplyDetailDialog> {
                           _buildAttPeriodInput(colors),
                           const SizedBox(height: 12),
                           _buildReasonInput(colors),
-                          // TODO: 加班天数、补偿类型、补偿次数暂时隐藏
+                          const SizedBox(height: 12),
+                          _buildCompensationTypeSelector(colors),
+                          // TODO: 加班天数、折算补偿次数暂时隐藏
                           // const SizedBox(height: 12),
                           // _buildDaysInput(colors),
-                          // const SizedBox(height: 12),
-                          // _buildCompensationTypeSelector(colors),
-                          // const SizedBox(height: 12),
-                          // _buildCompCountInput(colors),
+                          // if (_compensationType != 'NO_COMPENSATION') ...[
+                          //   const SizedBox(height: 12),
+                          //   _buildCompCountInput(colors),
+                          // ],
                           const SizedBox(height: 12),
                           _buildAdrInput(colors),
                           const SizedBox(height: 12),

+ 2 - 1
lib/features/vehicle/vehicle_apply_create_page.dart

@@ -161,7 +161,8 @@ class _VehicleApplyCreatePageState
     _selectedDeptName = data['selectedDeptName'] as String? ?? '';
     _selectedApplicantId = data['selectedApplicantId'] as String? ?? '';
     _selectedApplicantName = data['selectedApplicantName'] as String? ?? '';
-    // 恢复同行人
+    // 恢复同行人(先清空自动添加的,避免重复)
+    _passengers.clear();
     final pCount = data['passengerCount'] as int? ?? 0;
     final pName = data['passengerName'] as String? ?? '';
     if (pCount > 0 && pName.isNotEmpty) {