宴会可编辑权限------宴会管理>宴会员工里面的所有人可以编辑

wdn127929
1 parent d051b364
Showing 5 changed files with 55 additions and 29 deletions
ios/Runner.xcodeproj/project.pbxproj
lib/pages/feast/feast_detail_page.dart
lib/pages/feast/feast_followup_page.dart
lib/pages/my/feast_manage/feast_personal_page.dart
lib/provider/feast_model.dart
--- a/ios/Runner.xcodeproj/project.pbxproj
View file @94466d7
+++ b/ios/Runner.xcodeproj/project.pbxproj
View file @94466d7
@@ -548,7 +548,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5323;
+				CURRENT_PROJECT_VERSION = 5324;
 				DEVELOPMENT_TEAM = 8J59HM8B82;
 				ENABLE_BITCODE = NO;
 				FLUTTER_BUILD_MODE = release;
@@ -696,7 +696,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5323;
+				CURRENT_PROJECT_VERSION = 5324;
 				DEVELOPMENT_TEAM = 8J59HM8B82;
 				ENABLE_BITCODE = NO;
 				FLUTTER_BUILD_MODE = release;
@@ -732,7 +732,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5323;
+				CURRENT_PROJECT_VERSION = 5324;
 				DEVELOPMENT_TEAM = 8J59HM8B82;
 				ENABLE_BITCODE = NO;
 				FLUTTER_BUILD_MODE = release;
--- a/lib/pages/feast/feast_detail_page.dart
View file @94466d7
+++ b/lib/pages/feast/feast_detail_page.dart
View file @94466d7
@@ -49,6 +49,7 @@ class _FeastDetailPageState extends State<FeastDetailPage> {
     WidgetsBinding.instance.addPostFrameCallback((_) {
       _getBanquetById();
+      _getStaff();
     });
     bus.on("feast_detail_page", (arg) {
       _getBanquetById();
@@ -106,6 +107,13 @@ class _FeastDetailPageState extends State<FeastDetailPage> {
     }
   }
+  ///跟单人---宴会员工
+  _getStaff() async {
+    bool success = await feastModel.getStaff(context);
+    setState(() {});
+    if (success) {}
+  }
+
   Widget baseInfoItem(String title, String content) {
     return Padding(
         padding: EdgeInsets.symmetric(vertical: h(6)),
@@ -118,7 +126,7 @@ class _FeastDetailPageState extends State<FeastDetailPage> {
                       color: MyColours.color_999999, fontSize: font(12))),
             ),
             Expanded(
-                child: Text(content??'',
+                child: Text(content ?? '',
                     style: TextStyle(
                         color: MyColours.color_515151, fontSize: font(12))))
           ],
@@ -1383,7 +1391,10 @@ class _FeastDetailPageState extends State<FeastDetailPage> {
               ),
               widget.canEdit &&
                       (feastModel.banquetDetail.basicInfo.lost == null ||
-                          feastModel.banquetDetail.basicInfo.lost == '')
+                          feastModel.banquetDetail.basicInfo.lost == '') &&
+                      feastModel.personnalList.any((element) =>
+                          element.id ==
+                          Provider.of<UserModel>(context).user.openid)
                   ? Row(
                       children: [
                         Expanded(
--- a/lib/pages/feast/feast_followup_page.dart
View file @94466d7
+++ b/lib/pages/feast/feast_followup_page.dart
View file @94466d7
@@ -47,10 +47,11 @@ class _FeastFollowUpPageState extends State<FeastFollowUpPage> {
     WidgetsBinding.instance.addPostFrameCallback((_) {
       _getBanquetBeFollow();
+      _getStaff();
     });
-    bus.on('refresh_follow_feast', (arg) { 
-          _getBanquetBeFollow();
+    bus.on('refresh_follow_feast', (arg) {
+      _getBanquetBeFollow();
     });
   }
@@ -61,6 +62,13 @@ class _FeastFollowUpPageState extends State<FeastFollowUpPage> {
     Utils.changeStatusColor(color: MyColours.color_ffffff);
   }
+  ///跟单人---宴会员工
+  _getStaff() async {
+    bool success = await feastModel.getStaff(context);
+    setState(() {});
+    if (success) {}
+  }
+
   /// 根据时间范围查询待跟进订单
   _getBanquetBeFollow() async {
     Map<String, String> pramas = {
@@ -455,22 +463,25 @@ class _FeastFollowUpPageState extends State<FeastFollowUpPage> {
                           color: MyColours.color_000000,
                           fontSize: ScreenUtil().setSp(28)),
                     ),
-                    RoundButton(
-                      onPressed: () async {
-                        _showCancelWidget(context, data);
-                      },
-                      text: '丢单',
-                      fontSize: 28,
-                      isBold: false,
-                      height: h(28),
-                      width: w(44),
-                      // margin: EdgeInsets.only(top: w(18), bottom: w(4)),
-                      textColor: MyColours.color_F6F6F6,
-                      gradientStart: MyColours.color_E34D59,
-                      gradientEnd: MyColours.color_E34D59,
-                      borderColor: MyColours.color_E34D59,
-                      radius: r(4),
-                    ),
+                    if (feastModel.personnalList.any((element) =>
+                        element.id ==
+                        Provider.of<UserModel>(context).user.openid))
+                      RoundButton(
+                        onPressed: () async {
+                          _showCancelWidget(context, data);
+                        },
+                        text: '丢单',
+                        fontSize: 28,
+                        isBold: false,
+                        height: h(28),
+                        width: w(44),
+                        // margin: EdgeInsets.only(top: w(18), bottom: w(4)),
+                        textColor: MyColours.color_F6F6F6,
+                        gradientStart: MyColours.color_E34D59,
+                        gradientEnd: MyColours.color_E34D59,
+                        borderColor: MyColours.color_E34D59,
+                        radius: r(4),
+                      ),
                   ],
                 )
               ],
--- a/lib/pages/my/feast_manage/feast_personal_page.dart
View file @94466d7
+++ b/lib/pages/my/feast_manage/feast_personal_page.dart
View file @94466d7
@@ -129,7 +129,7 @@ class _FeastPersonalPageState extends State<FeastPersonalPage> {
         child: Column(
           children: [
             Container(
-              height: h(48),
+              constraints: BoxConstraints(minHeight: h(48)),
               margin: EdgeInsets.only(top: w(12)),
               // decoration: BoxDecoration(
               //     border: Border(
@@ -143,12 +143,14 @@ class _FeastPersonalPageState extends State<FeastPersonalPage> {
                     height: w(24),
                   ),
                   HEmptyView(16),
-                  Text(
-                    '${model.title}  ${model.phone ?? ''}',
-                    style: TextStyle(
-                        fontSize: font(16), color: MyColours.color_E6000000),
+                  Expanded(
+                    child: Text(
+                      '${model.title}  ${model.phone ?? ''}',
+                      style: TextStyle(
+                          fontSize: font(16), color: MyColours.color_E6000000),
+                    ),
                   ),
-                  Spacer(),
+                  // Spacer(),
                   Text(
                     '${model.roleName} ${model.account}',
                     style: TextStyle(
--- a/lib/provider/feast_model.dart
View file @94466d7
+++ b/lib/provider/feast_model.dart
View file @94466d7
@@ -1009,6 +1009,8 @@ class FeastModel extends ChangeNotifier {
       Utils.showToast(baseResp.msg ?? "");
       return false;
     }
+
+   
   }
   /**