贵宾

@@ -177,10 +177,7 @@ class DetailModelAllSunModel {
   DateTime get ddateFhms {
     DateTime dateTime =
         DateTime.fromMillisecondsSinceEpoch(int.parse(ddate) * 1000);
-   
-    
 
-   
     return dateTime;
   }
 
@@ -266,7 +263,14 @@ class DetailModelAllSunModel {
   }
 
   String get rnameStr {
-    if (rname == null || rname == '' || rname == ' ') return "";
+    if (rname == null || rname == '' || rname == ' ') {
+      if (sex == '4') {
+        return "贵宾";
+      } else {
+        return "";
+      }
+    }
+
     switch (sex) {
       case "1": //先生
         return rname + "先生";

@@ -72,7 +72,13 @@ class NoteBookOnlySunModel {
   }
 
   String get rnameStr {
-    if (rname == null || rname.isEmpty || rname == ' ') return "";
+    if (rname == null || rname.isEmpty || rname == ' ') {
+      if(sex == '4'){
+        return '贵宾';
+      }else{
+        return '';
+      }
+    }
     switch (sex) {
       case "1": //先生
         return rname + "先生";

@@ -26,6 +26,7 @@ import 'package:permission_handler/permission_handler.dart';
 import 'package:provider/provider.dart';
 
 import '../../models/user_history_entity.dart';
+import '../../provider/customer_provider.dart';
 import '../../utils/call_log_utils.dart';
 import '../../utils/common_utils.dart';
 import '../../utils/screen_util.dart';
@@ -64,6 +65,7 @@ class _EditReserverPageState extends State<EditReserverPage> {
   ScrollController _scrollCrl = ScrollController();
 
   MarketingCenterProvider marketingCenterProvider;
+  CustomerProvider customerProvider;
 
   @override
   void initState() {
@@ -93,6 +95,7 @@ class _EditReserverPageState extends State<EditReserverPage> {
         setState(() {});
       }
       getDzSellerConf();
+      _sellerGuestGet();
     });
   }
 
@@ -100,6 +103,11 @@ class _EditReserverPageState extends State<EditReserverPage> {
     await marketingCenterProvider.getDzSellerConf(context);
   }
 
+  ///获取客情配置
+  _sellerGuestGet() async {
+    await customerProvider.getSellerGuest(context);
+  }
+
   _openAddressBook() async {
     if (!(await checkContactPermission())) {
       PermissionStatus permissionStatus = await contactPermissionStatus();
@@ -344,6 +352,7 @@ class _EditReserverPageState extends State<EditReserverPage> {
     marketingCenterProvider =
         Provider.of<MarketingCenterProvider>(context, listen: true);
     detailModel = Provider.of<NotebookDetailModel>(context, listen: true);
+    customerProvider = Provider.of<CustomerProvider>(context, listen: true);
     return Scaffold(
         backgroundColor: MyColours.color_ffffff,
         appBar: SystemAppBar(
@@ -414,7 +423,7 @@ class _EditReserverPageState extends State<EditReserverPage> {
                                       print('ggg');
                                       if (value.endsWith('先生') ||
                                           value.endsWith('女士') ||
-                                          value.endsWith('公司')||
+                                          value.endsWith('公司') ||
                                           value.endsWith('贵宾')) {
                                         nameStr = value.substring(
                                             0, value.length - 2);
@@ -778,8 +787,9 @@ class _EditReserverPageState extends State<EditReserverPage> {
                                         : MyColours.color_ffffff,
                                     borderColor: MyColours.color_199095,
                                     onPressed: () async {
-                                      if (nameStr == null ||
-                                          nameStr.trim().length == 0) {
+                                      if (customerProvider.isrepair &&
+                                          (nameStr == null ||
+                                              nameStr.trim().length == 0)) {
                                         Utils.showToast('请填写客人姓名');
                                         return;
                                       }

@@ -2537,8 +2537,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
           onTap: () {
             FocusScope.of(context).requestFocus(FocusNode()); //隐藏键盘
           },
-          child: SafeArea(
-              child: WillPopScope(
+          child:  WillPopScope(
             child: Scaffold(
                 backgroundColor: MyColours.color_ffffff,
                 resizeToAvoidBottomInset: false,
@@ -5394,7 +5393,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
               Navigator.of(context).pop();
               return true;
             },
-          ))),
+          )),
     );
   }
 }

@@ -97,6 +97,12 @@ class TableItemOrReserveState extends State<TableItemOrReserve> {
           table.reserveList.rname != ' ') {
         table.reserver =
             rnameStr(table.reserveList.rname) + sexStr(table.reserveList.sex);
+      } else if (table.reserveList.rname == null ||
+          table.reserveList.rname == '' ||
+          table.reserveList.rname == ' ') {
+        if (table.reserveList.sex == '4') {
+          table.reserver = '贵宾';
+        }
       }
 
       table.pnum = table.reserveList.actualPum;
@@ -211,7 +217,9 @@ class TableItemOrReserveState extends State<TableItemOrReserve> {
           if (islock && table.signStr != '已预订') {
             return;
           }
-          if (widget.fromPage == 'table_manage' && widget.addOrder == false&& table.signStr != '已预订') {
+          if (widget.fromPage == 'table_manage' &&
+              widget.addOrder == false &&
+              table.signStr != '已预订') {
             Utils.showToast('不允许新建过去餐段的订单！');
             return;
           }