Merge remote-tracking branch 'origin/main'

# Conflicts:
#	lib/pages/home/SafetyCommitment/company_safety_commitment_apply.dart

lib/pages/home/SafetyCommitment/company_safety_commitment_apply.dart

@@ -77,6 +77,7 @@ class _CompanySafetyCommitmentApplyState extends State<CompanySafetyCommitmentAp
                     isEditable: true,
                     controller: _controller1,
                     text:  '',
+
                     isNumericInput: true,
                     keyboardType:TextInputType.number,
                   ),

lib/pages/home/tap/tabList/special_wrok/MeasuresListWidget.dart

@@ -822,6 +822,7 @@ class _SelectionPopupState extends State<SelectionPopup> {
   }
 
   Future<void> _getData() async {
+    LoadingDialogHelper.show();
     // 构造参数
     Map<String, dynamic> params;
     if (widget.type == 'assignments') {
@@ -841,6 +842,7 @@ class _SelectionPopupState extends State<SelectionPopup> {
     try {
       if (widget.type == 'assignments') {
         final result = await ApiService.getEightWorkStartList(params);
+        LoadingDialogHelper.hide();
         setState(() {
           list = (result['varList'] as List).cast<Map<String, dynamic>>();
           for (var item in list) {