Showing
4 changed files
with
118 additions
and
62 deletions
| @@ -138,6 +138,7 @@ class Constant { | @@ -138,6 +138,7 @@ class Constant { | ||
| 138 | '前台', | 138 | '前台', |
| 139 | ], | 139 | ], |
| 140 | '人数': ['管理员', '店长', '前台'], | 140 | '人数': ['管理员', '店长', '前台'], |
| 141 | + '订座详情-添加一项':['管理员', '店长', '前台'], | ||
| 141 | '图片备注': ['管理员', '店长', '前台'], | 142 | '图片备注': ['管理员', '店长', '前台'], |
| 142 | '用餐类型': ['管理员', '店长', '前台'], | 143 | '用餐类型': ['管理员', '店长', '前台'], |
| 143 | '服务人员': ['管理员', '店长', '前台'], | 144 | '服务人员': ['管理员', '店长', '前台'], |
| @@ -2150,7 +2150,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> | @@ -2150,7 +2150,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> | ||
| 2150 | } | 2150 | } |
| 2151 | 2151 | ||
| 2152 | ///预订订金UI | 2152 | ///预订订金UI |
| 2153 | - Widget _deposit() { | 2153 | + Widget _deposit(bool add) { |
| 2154 | return Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ | 2154 | return Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ |
| 2155 | VEmptyView(30), | 2155 | VEmptyView(30), |
| 2156 | MyDivider(double.infinity, w(0.5), color: MyColours.color_BFC4D4), | 2156 | MyDivider(double.infinity, w(0.5), color: MyColours.color_BFC4D4), |
| @@ -2169,14 +2169,16 @@ class NotebookDetailPageState extends State<NotebookDetailPage> | @@ -2169,14 +2169,16 @@ class NotebookDetailPageState extends State<NotebookDetailPage> | ||
| 2169 | width: w(72), | 2169 | width: w(72), |
| 2170 | height: w(22), | 2170 | height: w(22), |
| 2171 | fontSize: 24, | 2171 | fontSize: 24, |
| 2172 | - textColor: MyColours.color_438E93, | 2172 | + textColor: add ? MyColours.color_438E93 : MyColours.color_999999, |
| 2173 | isBold: false, | 2173 | isBold: false, |
| 2174 | - borderColor: MyColours.color_438E93, | 2174 | + borderColor: add ? MyColours.color_438E93 : MyColours.color_999999, |
| 2175 | gradientStart: MyColours.color_ffffff, | 2175 | gradientStart: MyColours.color_ffffff, |
| 2176 | gradientEnd: MyColours.color_ffffff, | 2176 | gradientEnd: MyColours.color_ffffff, |
| 2177 | onPressed: () { | 2177 | onPressed: () { |
| 2178 | - NavigatorUtil.goBookDepositPage( | ||
| 2179 | - context, detailModel!.detailModelAllSunModel!.id); | 2178 | + if (add) { |
| 2179 | + NavigatorUtil.goBookDepositPage( | ||
| 2180 | + context, detailModel!.detailModelAllSunModel!.id); | ||
| 2181 | + } | ||
| 2180 | }, | 2182 | }, |
| 2181 | ), | 2183 | ), |
| 2182 | ], | 2184 | ], |
| @@ -2230,18 +2232,22 @@ class NotebookDetailPageState extends State<NotebookDetailPage> | @@ -2230,18 +2232,22 @@ class NotebookDetailPageState extends State<NotebookDetailPage> | ||
| 2230 | data.insertUid) | 2232 | data.insertUid) |
| 2231 | InkWell( | 2233 | InkWell( |
| 2232 | onTap: () { | 2234 | onTap: () { |
| 2233 | - //弹框确认是否删除 | ||
| 2234 | - DialogUtil.cupertinoAlertDialog(context, | ||
| 2235 | - title: "", | ||
| 2236 | - content: "是否确定删除?", | ||
| 2237 | - isBoldContent: true, | ||
| 2238 | - contentColor: MyColours.color_E6000000, | ||
| 2239 | - rTitle: "删除", rCallback: () { | ||
| 2240 | - _delReserveDepositByid(data.id); | ||
| 2241 | - }); | 2235 | + if (add) { |
| 2236 | + //弹框确认是否删除 | ||
| 2237 | + DialogUtil.cupertinoAlertDialog(context, | ||
| 2238 | + title: "", | ||
| 2239 | + content: "是否确定删除?", | ||
| 2240 | + isBoldContent: true, | ||
| 2241 | + contentColor: | ||
| 2242 | + MyColours.color_E6000000, | ||
| 2243 | + rTitle: "删除", rCallback: () { | ||
| 2244 | + _delReserveDepositByid(data.id); | ||
| 2245 | + }); | ||
| 2246 | + } | ||
| 2242 | }, | 2247 | }, |
| 2243 | child: Image.asset( | 2248 | child: Image.asset( |
| 2244 | - Utils.getImgPath('delete_g'), | 2249 | + Utils.getImgPath( |
| 2250 | + add ? 'delete_g' : 'f_delete_red_un'), | ||
| 2245 | width: w(20), | 2251 | width: w(20), |
| 2246 | )) | 2252 | )) |
| 2247 | ], | 2253 | ], |
| @@ -2293,7 +2299,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> | @@ -2293,7 +2299,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> | ||
| 2293 | } | 2299 | } |
| 2294 | 2300 | ||
| 2295 | ///核餐确认UI | 2301 | ///核餐确认UI |
| 2296 | - Widget _verifyFood() { | 2302 | + Widget _verifyFood(bool add) { |
| 2297 | return Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ | 2303 | return Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ |
| 2298 | VEmptyView(30), | 2304 | VEmptyView(30), |
| 2299 | MyDivider(double.infinity, w(0.5), color: MyColours.color_BFC4D4), | 2305 | MyDivider(double.infinity, w(0.5), color: MyColours.color_BFC4D4), |
| @@ -2312,13 +2318,15 @@ class NotebookDetailPageState extends State<NotebookDetailPage> | @@ -2312,13 +2318,15 @@ class NotebookDetailPageState extends State<NotebookDetailPage> | ||
| 2312 | width: w(72), | 2318 | width: w(72), |
| 2313 | height: w(22), | 2319 | height: w(22), |
| 2314 | fontSize: 24, | 2320 | fontSize: 24, |
| 2315 | - textColor: MyColours.color_438E93, | 2321 | + textColor: add ? MyColours.color_438E93 : MyColours.color_999999, |
| 2316 | isBold: false, | 2322 | isBold: false, |
| 2317 | - borderColor: MyColours.color_438E93, | 2323 | + borderColor: add ? MyColours.color_438E93 : MyColours.color_999999, |
| 2318 | gradientStart: MyColours.color_ffffff, | 2324 | gradientStart: MyColours.color_ffffff, |
| 2319 | gradientEnd: MyColours.color_ffffff, | 2325 | gradientEnd: MyColours.color_ffffff, |
| 2320 | onPressed: () { | 2326 | onPressed: () { |
| 2321 | - NavigatorUtil.goVerifyFoodPage(context, widget.rid); | 2327 | + if (add) { |
| 2328 | + NavigatorUtil.goVerifyFoodPage(context, widget.rid); | ||
| 2329 | + } | ||
| 2322 | }, | 2330 | }, |
| 2323 | ), | 2331 | ), |
| 2324 | ], | 2332 | ], |
| @@ -2346,12 +2354,13 @@ class NotebookDetailPageState extends State<NotebookDetailPage> | @@ -2346,12 +2354,13 @@ class NotebookDetailPageState extends State<NotebookDetailPage> | ||
| 2346 | color: MyColours.color_515151, | 2354 | color: MyColours.color_515151, |
| 2347 | fontSize: font(14)), | 2355 | fontSize: font(14)), |
| 2348 | ), | 2356 | ), |
| 2349 | - Text( | ||
| 2350 | - '${data.nickName} ${data.cdateStr}', | ||
| 2351 | - overflow: TextOverflow.ellipsis, | ||
| 2352 | - style: TextStyle( | ||
| 2353 | - color: MyColours.color_999999, | ||
| 2354 | - fontSize: font(14)), | 2357 | + Expanded( |
| 2358 | + child: Text('${data.nickName} ${data.cdateStr}', | ||
| 2359 | + overflow: TextOverflow.ellipsis, | ||
| 2360 | + maxLines: 10, | ||
| 2361 | + style: TextStyle( | ||
| 2362 | + color: MyColours.color_999999, | ||
| 2363 | + fontSize: font(14))), | ||
| 2355 | ), | 2364 | ), |
| 2356 | ]), | 2365 | ]), |
| 2357 | Align( | 2366 | Align( |
| @@ -2551,13 +2560,16 @@ class NotebookDetailPageState extends State<NotebookDetailPage> | @@ -2551,13 +2560,16 @@ class NotebookDetailPageState extends State<NotebookDetailPage> | ||
| 2551 | style: | 2560 | style: |
| 2552 | TextStyle(color: MyColours.color_515151, fontSize: font(14)), | 2561 | TextStyle(color: MyColours.color_515151, fontSize: font(14)), |
| 2553 | ), | 2562 | ), |
| 2554 | - Spacer(), | ||
| 2555 | - Text( | 2563 | + HEmptyView(10), |
| 2564 | + Expanded( | ||
| 2565 | + child: Text( | ||
| 2556 | '${detailModel!.detailModelAllSunModel!.nickName ?? ''} ${_getDateTime(detailModel!.detailModelAllSunModel!.cdate)}', | 2566 | '${detailModel!.detailModelAllSunModel!.nickName ?? ''} ${_getDateTime(detailModel!.detailModelAllSunModel!.cdate)}', |
| 2557 | overflow: TextOverflow.ellipsis, | 2567 | overflow: TextOverflow.ellipsis, |
| 2568 | + maxLines: 10, | ||
| 2569 | + textAlign: TextAlign.right, | ||
| 2558 | style: | 2570 | style: |
| 2559 | TextStyle(color: MyColours.color_999999, fontSize: font(14)), | 2571 | TextStyle(color: MyColours.color_999999, fontSize: font(14)), |
| 2560 | - ), | 2572 | + )), |
| 2561 | if (showimage) HEmptyView(16), | 2573 | if (showimage) HEmptyView(16), |
| 2562 | if (showimage) | 2574 | if (showimage) |
| 2563 | InkWell( | 2575 | InkWell( |
| @@ -2612,14 +2624,17 @@ class NotebookDetailPageState extends State<NotebookDetailPage> | @@ -2612,14 +2624,17 @@ class NotebookDetailPageState extends State<NotebookDetailPage> | ||
| 2612 | color: MyColours.color_515151, | 2624 | color: MyColours.color_515151, |
| 2613 | fontSize: font(14)), | 2625 | fontSize: font(14)), |
| 2614 | ), | 2626 | ), |
| 2615 | - Spacer(), | ||
| 2616 | - Text( | 2627 | + HEmptyView(10), |
| 2628 | + Expanded( | ||
| 2629 | + child: Text( | ||
| 2617 | '${data.nickName ?? ''} ${data.upDate}', | 2630 | '${data.nickName ?? ''} ${data.upDate}', |
| 2618 | overflow: TextOverflow.ellipsis, | 2631 | overflow: TextOverflow.ellipsis, |
| 2632 | + maxLines: 10, | ||
| 2633 | + textAlign: TextAlign.right, | ||
| 2619 | style: TextStyle( | 2634 | style: TextStyle( |
| 2620 | color: MyColours.color_999999, | 2635 | color: MyColours.color_999999, |
| 2621 | fontSize: font(14)), | 2636 | fontSize: font(14)), |
| 2622 | - ), | 2637 | + )), |
| 2623 | if (show) HEmptyView(16), | 2638 | if (show) HEmptyView(16), |
| 2624 | if (show) | 2639 | if (show) |
| 2625 | InkWell( | 2640 | InkWell( |
| @@ -2858,6 +2873,9 @@ class NotebookDetailPageState extends State<NotebookDetailPage> | @@ -2858,6 +2873,9 @@ class NotebookDetailPageState extends State<NotebookDetailPage> | ||
| 2858 | detailModel!.detailModelAllSunModel!.guestUid || | 2873 | detailModel!.detailModelAllSunModel!.guestUid || |
| 2859 | userModel.user!.role_name == '管理员' || | 2874 | userModel.user!.role_name == '管理员' || |
| 2860 | userModel.user!.role_name == '店长'; | 2875 | userModel.user!.role_name == '店长'; |
| 2876 | + | ||
| 2877 | + bool add = Utils.getAuthority(context, '订座详情-添加一项') || | ||
| 2878 | + widget.uid == userModel.user!.openid; | ||
| 2861 | return Column( | 2879 | return Column( |
| 2862 | children: [ | 2880 | children: [ |
| 2863 | Expanded( | 2881 | Expanded( |
| @@ -4348,8 +4366,30 @@ class NotebookDetailPageState extends State<NotebookDetailPage> | @@ -4348,8 +4366,30 @@ class NotebookDetailPageState extends State<NotebookDetailPage> | ||
| 4348 | ? detailModel!.detailModelAllSunModel!.phone | 4366 | ? detailModel!.detailModelAllSunModel!.phone |
| 4349 | : Utils.starPhone(detailModel!.detailModelAllSunModel!.phone!), | 4367 | : Utils.starPhone(detailModel!.detailModelAllSunModel!.phone!), |
| 4350 | textColor: MyColours.color_515151, | 4368 | textColor: MyColours.color_515151, |
| 4351 | - textColorR: MyColours.color_438E93, | ||
| 4352 | - imageName: 'phone_detail')), | 4369 | + textColorR:(Utils.getAuthority( |
| 4370 | + context, | ||
| 4371 | + '订座详情-电话') || | ||
| 4372 | + widget.uid == | ||
| 4373 | + userModel | ||
| 4374 | + .user! | ||
| 4375 | + .openid || | ||
| 4376 | + (userModel.user!.role_name == '店长' && | ||
| 4377 | + detailModel!.detailModelAllSunModel!.roleName != | ||
| 4378 | + '管理员' && | ||
| 4379 | + detailModel!.detailModelAllSunModel!.roleName != | ||
| 4380 | + '店长'))? MyColours.color_438E93:MyColours.color_999999, | ||
| 4381 | + imageName:(Utils.getAuthority( | ||
| 4382 | + context, | ||
| 4383 | + '订座详情-电话') || | ||
| 4384 | + widget.uid == | ||
| 4385 | + userModel | ||
| 4386 | + .user! | ||
| 4387 | + .openid || | ||
| 4388 | + (userModel.user!.role_name == '店长' && | ||
| 4389 | + detailModel!.detailModelAllSunModel!.roleName != | ||
| 4390 | + '管理员' && | ||
| 4391 | + detailModel!.detailModelAllSunModel!.roleName != | ||
| 4392 | + '店长'))? 'phone_detail':'h_call')), | ||
| 4353 | RowMultiText("专属经理", | 4393 | RowMultiText("专属经理", |
| 4354 | '${detailModel!.detailModelAllSunModel!.placeOrderName ?? ''}', | 4394 | '${detailModel!.detailModelAllSunModel!.placeOrderName ?? ''}', |
| 4355 | textColor: MyColours | 4395 | textColor: MyColours |
| @@ -4516,8 +4556,8 @@ class NotebookDetailPageState extends State<NotebookDetailPage> | @@ -4516,8 +4556,8 @@ class NotebookDetailPageState extends State<NotebookDetailPage> | ||
| 4516 | ], | 4556 | ], |
| 4517 | ), | 4557 | ), |
| 4518 | 4558 | ||
| 4519 | - _deposit(), | ||
| 4520 | - _verifyFood(), | 4559 | + _deposit(add), |
| 4560 | + _verifyFood(add), | ||
| 4521 | _imageRemark(), | 4561 | _imageRemark(), |
| 4522 | _operatingRecord(), | 4562 | _operatingRecord(), |
| 4523 | 4563 |
| @@ -594,7 +594,7 @@ class TableManagerPageState extends State<TableManagerPage> { | @@ -594,7 +594,7 @@ class TableManagerPageState extends State<TableManagerPage> { | ||
| 594 | getDzSellerConf() async { | 594 | getDzSellerConf() async { |
| 595 | MarketingCenterProvider marketingCenterProvider = | 595 | MarketingCenterProvider marketingCenterProvider = |
| 596 | Provider.of<MarketingCenterProvider>(context, listen: false); | 596 | Provider.of<MarketingCenterProvider>(context, listen: false); |
| 597 | - bool success = await marketingCenterProvider.getDzSellerConf(context); | 597 | + bool success = await marketingCenterProvider.getDzSellerConf(context,showLoading: tableManagerModel?.pageStateOrReserve == PageState.Loading ?false:true ); |
| 598 | if (success && marketingCenterProvider.dzSellerConfModel != null) { | 598 | if (success && marketingCenterProvider.dzSellerConfModel != null) { |
| 599 | isAddOver = marketingCenterProvider.dzSellerConfModel!.isAddOver == '1' | 599 | isAddOver = marketingCenterProvider.dzSellerConfModel!.isAddOver == '1' |
| 600 | ? true | 600 | ? true |
| @@ -420,7 +420,7 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim> | @@ -420,7 +420,7 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim> | ||
| 420 | } | 420 | } |
| 421 | 421 | ||
| 422 | getSellerVersion() async { | 422 | getSellerVersion() async { |
| 423 | - await collectStoreProvider.getSellerVersion(context); | 423 | + await collectStoreProvider.getSellerVersion(context,showLoading: false); |
| 424 | 424 | ||
| 425 | setState(() {}); | 425 | setState(() {}); |
| 426 | } | 426 | } |
| @@ -1889,7 +1889,7 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim> | @@ -1889,7 +1889,7 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim> | ||
| 1889 | } | 1889 | } |
| 1890 | 1890 | ||
| 1891 | ///预订订金UI | 1891 | ///预订订金UI |
| 1892 | - Widget _deposit() { | 1892 | + Widget _deposit(bool add) { |
| 1893 | return Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ | 1893 | return Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ |
| 1894 | VEmptyView(30), | 1894 | VEmptyView(30), |
| 1895 | MyDivider(double.infinity, w(0.5), color: MyColours.color_BFC4D4), | 1895 | MyDivider(double.infinity, w(0.5), color: MyColours.color_BFC4D4), |
| @@ -1908,13 +1908,15 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim> | @@ -1908,13 +1908,15 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim> | ||
| 1908 | width: w(72), | 1908 | width: w(72), |
| 1909 | height: w(22), | 1909 | height: w(22), |
| 1910 | fontSize: 24, | 1910 | fontSize: 24, |
| 1911 | - textColor: MyColours.color_438E93, | 1911 | + textColor: add ? MyColours.color_438E93 : MyColours.color_999999, |
| 1912 | isBold: false, | 1912 | isBold: false, |
| 1913 | - borderColor: MyColours.color_438E93, | 1913 | + borderColor: add ? MyColours.color_438E93 : MyColours.color_999999, |
| 1914 | gradientStart: MyColours.color_ffffff, | 1914 | gradientStart: MyColours.color_ffffff, |
| 1915 | gradientEnd: MyColours.color_ffffff, | 1915 | gradientEnd: MyColours.color_ffffff, |
| 1916 | onPressed: () { | 1916 | onPressed: () { |
| 1917 | - NavigatorUtil.goBookDepositPage(context, detailEntity.id); | 1917 | + if (add) { |
| 1918 | + NavigatorUtil.goBookDepositPage(context, detailEntity.id); | ||
| 1919 | + } | ||
| 1918 | }, | 1920 | }, |
| 1919 | ), | 1921 | ), |
| 1920 | ], | 1922 | ], |
| @@ -2031,7 +2033,7 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim> | @@ -2031,7 +2033,7 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim> | ||
| 2031 | } | 2033 | } |
| 2032 | 2034 | ||
| 2033 | ///核餐确认UI | 2035 | ///核餐确认UI |
| 2034 | - Widget _verifyFood() { | 2036 | + Widget _verifyFood(bool add) { |
| 2035 | return Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ | 2037 | return Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ |
| 2036 | VEmptyView(30), | 2038 | VEmptyView(30), |
| 2037 | MyDivider(double.infinity, w(0.5), color: MyColours.color_BFC4D4), | 2039 | MyDivider(double.infinity, w(0.5), color: MyColours.color_BFC4D4), |
| @@ -2050,13 +2052,15 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim> | @@ -2050,13 +2052,15 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim> | ||
| 2050 | width: w(72), | 2052 | width: w(72), |
| 2051 | height: w(22), | 2053 | height: w(22), |
| 2052 | fontSize: 24, | 2054 | fontSize: 24, |
| 2053 | - textColor: MyColours.color_438E93, | 2055 | + textColor: add ? MyColours.color_438E93 : MyColours.color_999999, |
| 2054 | isBold: false, | 2056 | isBold: false, |
| 2055 | - borderColor: MyColours.color_438E93, | 2057 | + borderColor: add ? MyColours.color_438E93 : MyColours.color_999999, |
| 2056 | gradientStart: MyColours.color_ffffff, | 2058 | gradientStart: MyColours.color_ffffff, |
| 2057 | gradientEnd: MyColours.color_ffffff, | 2059 | gradientEnd: MyColours.color_ffffff, |
| 2058 | onPressed: () { | 2060 | onPressed: () { |
| 2059 | - NavigatorUtil.goVerifyFoodPage(context, widget.rid); | 2061 | + if (add) { |
| 2062 | + NavigatorUtil.goVerifyFoodPage(context, widget.rid); | ||
| 2063 | + } | ||
| 2060 | }, | 2064 | }, |
| 2061 | ), | 2065 | ), |
| 2062 | ], | 2066 | ], |
| @@ -2288,13 +2292,16 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim> | @@ -2288,13 +2292,16 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim> | ||
| 2288 | style: | 2292 | style: |
| 2289 | TextStyle(color: MyColours.color_515151, fontSize: font(14)), | 2293 | TextStyle(color: MyColours.color_515151, fontSize: font(14)), |
| 2290 | ), | 2294 | ), |
| 2291 | - Spacer(), | ||
| 2292 | - Text( | 2295 | + HEmptyView(10), |
| 2296 | + Expanded( | ||
| 2297 | + child: Text( | ||
| 2293 | '${detailEntity.place_order_name ?? ''} ${_getDateTime(detailEntity.cdate)}', | 2298 | '${detailEntity.place_order_name ?? ''} ${_getDateTime(detailEntity.cdate)}', |
| 2294 | overflow: TextOverflow.ellipsis, | 2299 | overflow: TextOverflow.ellipsis, |
| 2300 | + textAlign: TextAlign.right, | ||
| 2301 | + maxLines: 10, | ||
| 2295 | style: | 2302 | style: |
| 2296 | TextStyle(color: MyColours.color_999999, fontSize: font(14)), | 2303 | TextStyle(color: MyColours.color_999999, fontSize: font(14)), |
| 2297 | - ), | 2304 | + )), |
| 2298 | if (showimage) HEmptyView(16), | 2305 | if (showimage) HEmptyView(16), |
| 2299 | if (showimage) | 2306 | if (showimage) |
| 2300 | InkWell( | 2307 | InkWell( |
| @@ -2336,14 +2343,17 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim> | @@ -2336,14 +2343,17 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim> | ||
| 2336 | color: MyColours.color_515151, | 2343 | color: MyColours.color_515151, |
| 2337 | fontSize: font(14)), | 2344 | fontSize: font(14)), |
| 2338 | ), | 2345 | ), |
| 2339 | - Spacer(), | ||
| 2340 | - Text( | 2346 | + HEmptyView(10), |
| 2347 | + Expanded( | ||
| 2348 | + child: Text( | ||
| 2341 | '${data.nickName ?? ''} ${data.upDate}', | 2349 | '${data.nickName ?? ''} ${data.upDate}', |
| 2342 | overflow: TextOverflow.ellipsis, | 2350 | overflow: TextOverflow.ellipsis, |
| 2351 | + textAlign: TextAlign.right, | ||
| 2352 | + maxLines: 10, | ||
| 2343 | style: TextStyle( | 2353 | style: TextStyle( |
| 2344 | color: MyColours.color_999999, | 2354 | color: MyColours.color_999999, |
| 2345 | fontSize: font(14)), | 2355 | fontSize: font(14)), |
| 2346 | - ), | 2356 | + )), |
| 2347 | if (show) HEmptyView(16), | 2357 | if (show) HEmptyView(16), |
| 2348 | if (show) | 2358 | if (show) |
| 2349 | InkWell( | 2359 | InkWell( |
| @@ -2554,6 +2564,8 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim> | @@ -2554,6 +2564,8 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim> | ||
| 2554 | detailEntity.guest_uid || | 2564 | detailEntity.guest_uid || |
| 2555 | userModel.user!.role_name == '管理员' || | 2565 | userModel.user!.role_name == '管理员' || |
| 2556 | userModel.user!.role_name == '店长'; | 2566 | userModel.user!.role_name == '店长'; |
| 2567 | + bool add = Utils.getAuthority(context, '订座详情-添加一项') || | ||
| 2568 | + widget.uid == userModel.user!.openid; | ||
| 2557 | return Column( | 2569 | return Column( |
| 2558 | children: [ | 2570 | children: [ |
| 2559 | Expanded( | 2571 | Expanded( |
| @@ -3890,11 +3902,9 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim> | @@ -3890,11 +3902,9 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim> | ||
| 3890 | textColor: MyColours | 3902 | textColor: MyColours |
| 3891 | .color_515151), | 3903 | .color_515151), |
| 3892 | (detailEntity.status == "4" && | 3904 | (detailEntity.status == "4" && |
| 3893 | - detailEntity | ||
| 3894 | - .cancel != | 3905 | + detailEntity.cancel != |
| 3895 | null && | 3906 | null && |
| 3896 | - (detailEntity.phone == | ||
| 3897 | - null || | 3907 | + (detailEntity.phone == null || |
| 3898 | detailEntity.phone == | 3908 | detailEntity.phone == |
| 3899 | '')) | 3909 | '')) |
| 3900 | ? SizedBox() | 3910 | ? SizedBox() |
| @@ -3944,11 +3954,16 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim> | @@ -3944,11 +3954,16 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim> | ||
| 3944 | .phone!), | 3954 | .phone!), |
| 3945 | textColor: MyColours | 3955 | textColor: MyColours |
| 3946 | .color_515151, | 3956 | .color_515151, |
| 3947 | - textColorR: | ||
| 3948 | - MyColours | ||
| 3949 | - .color_438E93, | ||
| 3950 | - imageName: | ||
| 3951 | - 'phone_detail')), | 3957 | + textColorR: (Utils.getAuthority(context, '订座详情-电话') || widget.uid == userModel.user!.openid || (userModel.user!.role_name == '店长' && detailModel!.detailModelAllSunModel!.roleName != '管理员' && detailModel!.detailModelAllSunModel!.roleName != '店长')) |
| 3958 | + ? MyColours | ||
| 3959 | + .color_438E93 | ||
| 3960 | + : MyColours | ||
| 3961 | + .color_999999, | ||
| 3962 | + imageName: (Utils.getAuthority(context, '订座详情-电话') || | ||
| 3963 | + widget.uid == userModel.user!.openid || | ||
| 3964 | + (userModel.user!.role_name == '店长' && detailModel!.detailModelAllSunModel!.roleName != '管理员' && detailModel!.detailModelAllSunModel!.roleName != '店长')) | ||
| 3965 | + ? 'phone_detail' | ||
| 3966 | + : 'h_call')), | ||
| 3952 | (detailEntity.status == | 3967 | (detailEntity.status == |
| 3953 | "4" && | 3968 | "4" && |
| 3954 | detailEntity | 3969 | detailEntity |
| @@ -4111,8 +4126,8 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim> | @@ -4111,8 +4126,8 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim> | ||
| 4111 | ], | 4126 | ], |
| 4112 | ), | 4127 | ), |
| 4113 | 4128 | ||
| 4114 | - _deposit(), | ||
| 4115 | - _verifyFood(), | 4129 | + _deposit(add), |
| 4130 | + _verifyFood(add), | ||
| 4116 | _imageRemark(), | 4131 | _imageRemark(), |
| 4117 | _operatingRecord(), | 4132 | _operatingRecord(), |
| 4118 | 4133 |
-
Please register or login to post a comment