1

REBORN.Common/Enum/Finance/ClientTypeEnum.cs

@@ -22,11 +22,11 @@ namespace REBORN.Common.Enum.Finance
         /// </summary>
         [EnumField("票卷供应商")]
         TicketSupplier = 2,
-        ///// <summary>
-        ///// 餐厅供应商
-        ///// </summary>
-        //[EnumField("餐厅供应商")]
-        //DiningSupplier = 3,
+        /// <summary>
+        /// 餐厅供应商
+        /// </summary>
+        [EnumField("餐厅供应商")]
+        DiningSupplier = 3,
         /// <summary>
         /// 车辆供应商
         /// </summary>
@@ -52,11 +52,11 @@ namespace REBORN.Common.Enum.Finance
         /// </summary>
         [EnumField("我的客户")]
         MyClient = 8,
-        ///// <summary>
-        ///// OP
-        ///// </summary>
-        //[EnumField("OP")]
-        //OP = 9,
+        /// <summary>
+        /// OP
+        /// </summary>
+        [EnumField("OP")]
+        OP = 9,
         /// <summary>
         /// 员工
         /// </summary>
@@ -67,26 +67,26 @@ namespace REBORN.Common.Enum.Finance
         /// </summary>
         [EnumField("其他")]
         Other = 10,
-        ///// <summary>
-        ///// 地接供应商
-        ///// </summary>
-        //[EnumField("地接供应商")]
-        //DiJie = 11,
-        ///// <summary>
-        ///// 日本车行供应商
-        ///// </summary>
-        //[EnumField("日本车行供应商")]
-        //JapanSupplier = 12,
-        ///// <summary>
-        ///// 日本车行客户
-        ///// </summary>
-        //[EnumField("日本车行客户")]
-        //JapanCustomer = 13
-        ///// <summary>
-        ///// 直客客户
-        ///// </summary>
-        //[EnumField("直客客户")]
-        //DirectCustomer = 14,
+        /// <summary>
+        /// 地接供应商
+        /// </summary>
+        [EnumField("地接供应商")]
+        DiJie = 11,
+        /// <summary>
+        /// 日本车行供应商
+        /// </summary>
+        [EnumField("日本车行供应商")]
+        JapanSupplier = 12,
+        /// <summary>
+        /// 日本车行客户
+        /// </summary>
+        [EnumField("日本车行客户")]
+        JapanCustomer = 13,
+        /// <summary>
+        /// 直客客户
+        /// </summary>
+        [EnumField("直客客户")]
+        DirectCustomer = 14,
         /// <summary>
         /// 团队供应商
         /// </summary>

REBORN.Common/Enum/ResourceTypeEnum.cs

@@ -18,11 +18,11 @@ namespace REBORN.Common.Enum
         [EnumField("酒店")]
         Hotel = 1,
 
-        ///// <summary>
-        ///// 餐厅
-        ///// </summary>
-        //[EnumField("餐厅")]
-        //Dining = 2,
+        /// <summary>
+        /// 餐厅
+        /// </summary>
+        [EnumField("餐厅")]
+        Dining = 2,
 
         /// <summary>
         ///邮轮
@@ -31,31 +31,31 @@ namespace REBORN.Common.Enum
         [EnumField("邮轮")]
         TicketCoupons = 3,
 
-        ///// <summary>
-        ///// 票务(机票)
-        ///// </summary>
+        /// <summary>
+        /// 票务(机票)
+        /// </summary>
 
-        //[EnumField("票务")]
-        //TicketService = 4,
+        [EnumField("票务")]
+        TicketService = 4,
 
 
-        ///// <summary>
-        ///// 车辆
-        ///// </summary>
-        //[EnumField("车辆")]
-        //Vehicle = 5,
+        /// <summary>
+        /// 车辆
+        /// </summary>
+        [EnumField("车辆")]
+        Vehicle = 5,
 
-        ///// <summary>
-        ///// 领队
-        ///// </summary>
-        //[EnumField("领队")]
-        //Leader = 6,
+        /// <summary>
+        /// 领队
+        /// </summary>
+        [EnumField("领队")]
+        Leader = 6,
 
-        ///// <summary>
-        ///// 购物店
-        ///// </summary>
-        //[EnumField("购物店")]
-        //Shopping = 7,
+        /// <summary>
+        /// 购物店
+        /// </summary>
+        [EnumField("购物店")]
+        Shopping = 7,
 
         /// <summary>
         /// 单机票-6

REBORN.Services.DMCService/SupplierService.cs

@@ -213,7 +213,19 @@ namespace REBORN.Services.DMCService
         public virtual ApiResult GetSupplierResourceTypeEnumList(RequestParm request)
         {
             var List = Common.Plugin.EnumHelper.EnumToList(typeof(Common.Enum.ResourceTypeEnum));
-            return ApiResult.Success(data: List);
+            List<EnumItem> result = new List<EnumItem>();
+            UserInfo userInfo = CacheManager.User.RbUserCache.GetUserLoginInfo(request.uid);
+            if (userInfo.SimpleEasy == 1)
+            {
+                foreach (var item in List)
+                {
+                    if (item.Id != 2 && item.Id != 4 && item.Id != 5 && item.Id != 6 && item.Id != 7)
+                    {
+                        result.Add(item);
+                    }
+                }
+            }
+            return ApiResult.Success(data: result);
         }
         #region 团期供应商
 

REBORN.Services.DMCService/VisaService.cs

@@ -5604,12 +5604,16 @@ namespace REBORN.Services.DMCService
                         y.ApplyMoney,
                         y.InvoiceApplyState
                     }),
-                    GuestList = x.GuestList.Select(subItem => new { subItem.OrderId, userName = subItem.SurName + subItem.Name, subItem.PassportNo, SexStr = subItem.Sex == 1 ? "男" : subItem.Sex == 2 ? "女" : "保密", Age = subItem.Birthday.HasValue ? System.DateTime.Now.Year - subItem.Birthday.Value.Year : 0, subItem.MobilePhone }),
                     x.VisaFeeNum,
                     x.PremiumNum,
                     x.ExpressFeeNum,
                     x.ServiceFeeNum,
                     x.IsChargeLossOrders,
+                    GuestList = x.GuestList.Select(subItem => new { GuestId = subItem.Id, Tel = subItem?.Tel ?? "", IdCard = subItem?.IdCard ?? "", PassportNo = subItem?.PassportNo ?? "", PassportExpiry = StringHelper.FormatDate(subItem.PassportExpiry), PassportIssued = StringHelper.FormatDate(subItem.PassportIssued), Birthday = StringHelper.FormatDate(subItem.Birthday), subItem.IsApplyPhoto, subItem.OrderId, userName = subItem.SurName + subItem.Name, SexStr = subItem.Sex == 1 ? "男" : subItem.Sex == 2 ? "女" : "保密", Age = subItem.Birthday.HasValue ? System.DateTime.Now.Year - subItem.Birthday.Value.Year : 0, subItem.MobilePhone, subItem.VisaType, subItem.TicketOutType, subItem.TicketOutTypeStr, subItem.ProtocolId, subItem.DisclaimerId }),
+                    x.FinalPriceTips,
+                    x.Meet,
+                    SupplierModel = new { SupplierId = x?.SupplierModel?.ID ?? 0, SupplierName = x?.SupplierModel?.Name ?? "", Tel = x?.SupplierModel?.Tel ?? "", Contact = x?.SupplierModel?.Contact ?? "", CompanyName = x?.SupplierModel?.CompanyName ?? "", DutyParagraph = x?.SupplierModel?.DutyParagraph ?? "", CompanyPhone = x?.SupplierModel?.CompanyPhone ?? "", OpeningBank = x?.SupplierModel?.OpeningBank ?? "", BankNo = x?.SupplierModel?.BankNo ?? "" },
+                    AppointOPList = x.AppointOPList?.Select(z => new { z.OPId, OPName = CacheManager.User.RbUserCache.GetUserLoginInfo(z.OPId.ToString())?.emName ?? "" }),
                 });
                 pmodel.pageData = data;
             }