Merge branch 'master' of http://git.ius.plus/Project-VNOTE/VNoteApp

lib/pages/check/follow_up/widgets/follow_up_from.dart

@@ -102,6 +102,7 @@ class FollowUpFrom extends GetView<FollowUpController> {
   }
 
   String getFollowUpTime(DateTime? time) {
+    // print(time);
     if (time != null) {
       return DateFormat('yyyy-MM-dd').format(time);
     }

lib/pages/check/follow_up_record/controller.dart

@@ -117,4 +117,17 @@ class FollowUpRecordController extends FControllerBase {
         return Colors.blue;
     }
   }
+
+  String getFollowUpMode(FollowUpModeEnum? modeEnum) {
+    switch (modeEnum) {
+      case FollowUpModeEnum.Outpatient:
+        return "门诊";
+      case FollowUpModeEnum.Phone:
+        return "电话";
+      case FollowUpModeEnum.Visit:
+        return "家庭";
+      default:
+        return "";
+    }
+  }
 }

lib/pages/check/follow_up_record/view.dart

@@ -94,7 +94,10 @@ class FollowUpRecordPage extends GetView<FollowUpRecordController> {
                                   fit: BoxFit.cover,
                                 ),
                               ),
-                              const Text("暂无数据，先看看别的吧"),
+                              const Text(
+                                "暂无数据，先看看别的吧",
+                                style: TextStyle(fontSize: 18),
+                              ),
                             ],
                           ),
                         )
@@ -163,8 +166,11 @@ class _followUpRecordCard extends StatelessWidget {
                             fontSize: 18,
                           ),
                         ),
-                        const SizedBox(
-                          width: 20,
+                        RecordCommonItem(
+                          itemName: '随访类型',
+                          itemValue:
+                              controller.getFollowUpMode(dataDto.followUpMode),
+                          fontSize: 18,
                         ),
                       ],
                     ),
@@ -172,6 +178,9 @@ class _followUpRecordCard extends StatelessWidget {
                       height: 20,
                     ),
                     Wrap(
+                      alignment: WrapAlignment.start,
+                      spacing: 20,
+                      runSpacing: 8,
                       children: [
                         SizedBox(
                           width: 300,
@@ -183,9 +192,9 @@ class _followUpRecordCard extends StatelessWidget {
                         ),
                         RecordCommonItem(
                           itemName: '随访时间',
-                          itemValue: dto.followUpTime != null
+                          itemValue: dataDto.followUpTime != null
                               ? DateFormat("yyyy-MM-dd")
-                                  .format(dto.followUpTime!.toLocal())
+                                  .format(dataDto.followUpTime!.toLocal())
                               : "",
                           fontSize: 18,
                         ),

lib/pages/check/healthCheckRecord/view.dart

@@ -93,7 +93,8 @@ class HealthCheckRecordPage extends GetView<HealthCheckRecordController> {
                                   fit: BoxFit.cover,
                                 ),
                               ),
-                              const Text("暂无数据，先看看别的吧"),
+                              const Text("暂无数据，先看看别的吧",
+                                style: TextStyle(fontSize: 18),),
                             ],
                           ),
                         )

lib/pages/contract/contract_records/view.dart

@@ -61,7 +61,10 @@ class ContractRecordsPage extends GetView<ContractRecordsController> {
                               fit: BoxFit.cover,
                             ),
                           ),
-                          const Text("暂无数据，先看看别的吧"),
+                          const Text(
+                            "暂无数据，先看看别的吧",
+                            style: TextStyle(fontSize: 18),
+                          ),
                         ],
                       ),
                     )

lib/pages/contract/contract_template/view.dart

@@ -2,7 +2,6 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 import 'package:get/get.dart';
-import 'package:vnoteapp/architecture/storage/text_storage.dart';
 import 'package:vnoteapp/components/appbar.dart';
 import 'package:vnoteapp/components/button.dart';
 

lib/pages/contract/package_list/view.dart

@@ -335,8 +335,24 @@ class ServicePackageContractPage
       return Obx(
         () => Expanded(
           child: controller.state.servicePackageItems.isEmpty
-              ? const Center(
-                  child: Text('暂无数据'),
+              ? Container(
+                  margin: const EdgeInsets.only(top: 80),
+                  child: Column(
+                    children: [
+                      Center(
+                        child: Image.asset(
+                          "assets/images/no_data.png",
+                          width: 300,
+                          height: 300,
+                          fit: BoxFit.cover,
+                        ),
+                      ),
+                      const Text(
+                        "暂无数据，先看看别的吧",
+                        style: TextStyle(fontSize: 18),
+                      ),
+                    ],
+                  ),
                 )
               : ListView(
                   children: controller.state.servicePackageItems

lib/pages/dashboard/home.dart

@@ -16,7 +16,10 @@ class HomePage extends StatelessWidget {
               fit: BoxFit.cover,
             ),
           ),
-          const Text("暂无数据，先看看别的吧"),
+          const Text(
+            "暂无数据，先看看别的吧",
+            style: TextStyle(fontSize: 18),
+          ),
         ],
       ),
     );

lib/pages/patient/info/view.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:vnoteapp/architecture/utils/prompt_box.dart';
 import 'package:vnoteapp/components/appbar.dart';
+import 'package:vnoteapp/components/button.dart';
 import 'package:vnoteapp/pages/patient/info/widgets/base.dart';
 
 import 'controller.dart';
@@ -23,29 +24,27 @@ class PatientInfoPage extends GetView<PatientInfoController> {
             style: const TextStyle(fontSize: 24),
           ),
         ),
-        actions: [
-          TextButton(
-            onPressed: () async {
-              var result = await controller.updatePatientAsync();
-              if (result) {
-                PromptBox.toast("保存成功");
-              }
-              else
-              {
-                PromptBox.toast("保存失败");
-              }
-            },
-            child: const Text(
-              "保存",
-              style: TextStyle(
-                color: Colors.white,
-                fontSize: 32,
-                fontWeight: FontWeight.bold,
-              ),
-            ),
-          ),
-          const SizedBox(width: 8),
-        ],
+        // actions: [
+        //   TextButton(
+        //     onPressed: () async {
+        //       var result = await controller.updatePatientAsync();
+        //       if (result) {
+        //         PromptBox.toast("保存成功");
+        //       } else {
+        //         PromptBox.toast("保存失败");
+        //       }
+        //     },
+        //     child: const Text(
+        //       "保存",
+        //       style: TextStyle(
+        //         color: Colors.white,
+        //         fontSize: 32,
+        //         fontWeight: FontWeight.bold,
+        //       ),
+        //     ),
+        //   ),
+        //   const SizedBox(width: 8),
+        // ],
       ),
       body: Padding(
         padding: const EdgeInsets.only(top: 2),
@@ -166,11 +165,36 @@ class _NavWidget extends GetView<PatientInfoController> {
         color: Colors.white,
         borderRadius: BorderRadius.circular(8),
       ),
-      child: Obx(() {
-        final builder = _pageBuilders[controller.state.anchor];
-        if (builder != null) return builder(context);
-        return const Center(child: Text("Unknown"));
-      }),
+      child: Stack(
+        children: [
+          Obx(() {
+            final builder = _pageBuilders[controller.state.anchor];
+            if (builder != null) return builder(context);
+            return const Center(child: Text("Unknown"));
+          }),
+          Positioned(
+            bottom: 8,
+            left: 200,
+            right: 200,
+            child: Row(
+              mainAxisAlignment: MainAxisAlignment.spaceAround,
+              children: [
+                VButton(
+                  label: "保存信息",
+                  onTap: () async {
+                    var result = await controller.updatePatientAsync();
+                    if (result) {
+                      PromptBox.toast("保存成功");
+                    } else {
+                      PromptBox.toast("保存失败");
+                    }
+                  },
+                ),
+              ],
+            ),
+          ),
+        ],
+      ),
     );
   }
 }

pubspec.lock

@@ -183,7 +183,7 @@ packages:
     description:
       path: "."
       ref: HEAD
-      resolved-ref: "59e93d6618eb6c92d6598911cf08aed8f5e40b23"
+      resolved-ref: "36686374d1fef238529e736bd7a56f0cc4a399f1"
       url: "http://git.ius.plus:88/Project-VNOTE/FlutterJsonRPC.git"
     source: git
     version: "0.0.1"

pubspec.yaml

@@ -72,7 +72,7 @@ dependencies_overrides:
   fis_jsonrpc:
     git:
       url: http://git.ius.plus:88/Project-VNOTE/FlutterJsonRPC.git
-      ref: "59e93d6"
+      ref: "36686374d1f"
   # fis_ui:
   #   git:
   #     url: http://git.ius.plus:88/Project-Wing/fis_lib_ui.git