update

config/routes.ts

@@ -692,6 +692,174 @@ export default [
                                         path: 'MemberAddress',
                                         name: 'MemberAddress',
                                         component: './travelMember/MemberAddress/index'
+                                    },
+                                    // 失物招领申请
+                                    {
+                                        path: 'LostandFoundAPPliance',
+                                        name: 'LostandFoundAPPliance',
+                                        component: './travelMember/LostandFoundAPPliance/index'
+                                    },
+                                    // 失物招领审核
+                                    {
+                                        path: 'LostandFoundReview',
+                                        name: 'LostandFoundReview',
+                                        component: './travelMember/LostandFoundReview/index'
+                                    },
+                                    // 图库类型管理
+                                    {
+                                        path: 'LibraryTypeManager',
+                                        name: 'LibraryTypeManager',
+                                        component: './travelMember/LibraryTypeManager/index'
+                                    },
+                                    // 图库信息管理
+                                    {
+                                        path: 'LibraryInformationManager',
+                                        name: 'LibraryInformationManager',
+                                        component: './travelMember/LibraryInformationManager/index'
+                                    },
+                                    // 点餐类别管理
+                                    {
+                                        path: 'OrderCategoryManage',
+                                        name: 'OrderCategoryManage',
+                                        component: './travelMember/OrderCategoryManage/index'
+                                    },
+                                    // 点餐商品管理
+                                    {
+                                        path: 'OrderProductManage',
+                                        name: 'OrderProductManage',
+                                        component: './travelMember/OrderProductManage/index'
+                                    },
+                                    // 商家评价管理
+                                    {
+                                        path: 'MerchantEvaluationManage',
+                                        name: 'MerchantEvaluationManage',
+                                        component: './travelMember/MerchantEvaluationManage/index'
+                                    },
+                                    // 自营餐饮商品申请
+                                    {
+                                        path: 'SelfOperatedProductApplication',
+                                        name: 'SelfOperatedProductApplication',
+                                        component: './travelMember/SelfOperatedProductApplication/index'
+                                    },
+                                    // 自营餐饮商品审核
+                                    {
+                                        path: 'SelfOperatedProductReview',
+                                        name: 'SelfOperatedProductReview',
+                                        component: './travelMember/SelfOperatedProductReview/index'
+                                    },
+                                    // 合作商户商品申请
+                                    {
+                                        path: 'MerchantProductApplication',
+                                        name: 'MerchantProductApplication',
+                                        component: './travelMember/MerchantProductApplication/index'
+                                    },
+                                    // 合作商户商品审核
+                                    {
+                                        path: 'MerchantProductReview',
+                                        name: 'MerchantProductReview',
+                                        component: './travelMember/MerchantProductReview/index'
+                                    },
+                                    // 供货商户分类
+                                    {
+                                        path: 'SupplierClassification',
+                                        name: 'SupplierClassification',
+                                        component: './travelMember/SupplierClassification/index'
+                                    },
+                                    // 供货商户管理
+                                    {
+                                        path: 'SupplierMerchantManage',
+                                        name: 'SupplierMerchantManage',
+                                        component: './travelMember/SupplierMerchantManage/index'
+                                    },
+                                    // 商城品牌管理
+                                    {
+                                        path: 'MallBrandManage',
+                                        name: 'MallBrandManage',
+                                        component: './travelMember/MallBrandManage/index'
+                                    },
+                                    // 商城分类管理
+                                    {
+                                        path: 'MallClassificationManage',
+                                        name: 'MallClassificationManage',
+                                        component: './travelMember/MallClassificationManage/index'
+                                    },
+                                    // 商品规格管理
+                                    {
+                                        path: 'ProductSpecificationManage',
+                                        name: 'ProductSpecificationManage',
+                                        component: './travelMember/ProductSpecificationManage/index'
+                                    },
+                                    // 商品上架管理
+                                    {
+                                        path: 'ProductListingManagement',
+                                        name: 'ProductListingManagement',
+                                        component: './travelMember/ProductListingManagement/index'
+                                    },
+                                    // 商城商品查询
+                                    {
+                                        path: 'ShoppingMallProductSearch',
+                                        name: 'ShoppingMallProductSearch',
+                                        component: './travelMember/ShoppingMallProductSearch/index'
+                                    },
+                                    // 售后类型管理
+                                    {
+                                        path: 'AfterSalesTypeManage',
+                                        name: 'AfterSalesTypeManage',
+                                        component: './travelMember/AfterSalesTypeManage/index'
+                                    },
+                                    // 商城订单管理
+                                    {
+                                        path: 'MallOrderManage',
+                                        name: 'MallOrderManage',
+                                        component: './travelMember/MallOrderManage/index'
+                                    },
+                                    // 订单售后管理
+                                    {
+                                        path: 'OrderAfterSalesManage',
+                                        name: 'OrderAfterSalesManage',
+                                        component: './travelMember/OrderAfterSalesManage/index'
+                                    },
+                                    // 商城评价管理
+                                    {
+                                        path: 'MallEvaluationManage',
+                                        name: 'MallEvaluationManage',
+                                        component: './travelMember/MallEvaluationManage/index'
+                                    },
+                                    // 首页精选商家
+                                    {
+                                        path: 'HomeSelectedMerchants',
+                                        name: 'HomeSelectedMerchants',
+                                        component: './travelMember/HomeSelectedMerchants/index'
+                                    },
+                                    // 首页精选卡券
+                                    {
+                                        path: 'HomeSelectedCoupons',
+                                        name: 'HomeSelectedCoupons',
+                                        component: './travelMember/HomeSelectedCoupons/index'
+                                    },
+                                    // 首页精选商城
+                                    {
+                                        path: 'HomeSelectedMall',
+                                        name: 'HomeSelectedMall',
+                                        component: './travelMember/HomeSelectedMall/index'
+                                    },
+                                    // 预约点餐订单
+                                    {
+                                        path: 'BookingMealOrder',
+                                        name: 'BookingMealOrder',
+                                        component: './travelMember/BookingMealOrder/index'
+                                    },
+                                    // 点餐售后管理
+                                    {
+                                        path: 'AfterSalesManage',
+                                        name: 'AfterSalesManage',
+                                        component: './travelMember/AfterSalesManage/index'
+                                    },
+                                    // 预约订单汇总
+                                    {
+                                        path: 'SummaryOfReservation',
+                                        name: 'SummaryOfReservation',
+                                        component: './travelMember/SummaryOfReservation/index'
                                     }
                                 ]
                             },
@@ -729,7 +897,25 @@ export default [
                                         path: 'CardVoucherSearch',
                                         name: 'CardVoucherSearch',
                                         component: './CardInformation/CardVoucherSearch/index'
+                                    },
+                                    // 新增卡券申请
+                                    {
+                                        path: 'NewCouponApplication',
+                                        name: 'NewCouponApplication',
+                                        component: './CardInformation/NewCouponApplication/index'
+                                    },
+                                    // 新增卡券审核
+                                    {
+                                        path: 'NewCouponReview',
+                                        name: 'NewCouponReview',
+                                        component: './CardInformation/NewCouponReview/index'
                                     }
+
+                                    
+
+
+
+                                    
                                 ]
                             },
                             {

src/pages/CardInformation/NewCouponApplication/index.tsx

@@ -0,0 +1 @@
+// 新增卡券申请

src/pages/CardInformation/NewCouponReview/index.tsx

@@ -0,0 +1 @@
+// 新增卡券审核

src/pages/operatingMerchants/service.ts

@@ -1,3 +1,4 @@
+import { wrapTreeNode } from '@/utils/format';
 import requestEncryption from '@/utils/requestEncryption';
 
 // 拿到服务区商家信息表
@@ -48,4 +49,39 @@ export async function handleGetSERVERPARTSHOPList(params: any) {
     return data.Result_Data
 }
 
+// 获取服务区商家信息表明细
+export async function handleGetSERVERPARTSELLERDetail(params: any) {
+    const data = await requestEncryption(`/BaseInfo/GetSERVERPARTSELLERDetail`, {
+        method: 'POST',
+        data: { ...params, requestEncryption: true }
+    })
+    if (data.Result_Code !== 100) {
+        return []
+    }
+    return data.Result_Data
+}
 
+
+// 关联商家经营门店
+export async function handleGetRelateShopToSeller(params: any) {
+    const data = await requestEncryption(`/BaseInfo/RelateShopToSeller`, {
+        method: 'POST',
+        data: { ...params, requestEncryption: true }
+    })
+    if (data.Result_Code !== 100) {
+        return data
+    }
+    return data
+}
+
+// 解除门店关联
+export async function handleRemoveShopFromSeller(params: any) {
+    const data = await requestEncryption(`/BaseInfo/RemoveShopFromSeller`, {
+        method: 'POST',
+        data: { ...params, requestEncryption: true }
+    })
+    if (data.Result_Code !== 100) {
+        return data
+    }
+    return data
+}

src/pages/reports/settlementAccount/component/leftSelectTree.tsx

@@ -25,8 +25,9 @@ type DetailProps = {
     haveTest?: boolean;// 是否有测试服务区
     handleGetLeftTreeData?: any // 拿到树数据的方法 必须要有输出值的
     noWj?: any // 把万佳商贸隐藏
+    selectOnly?: boolean// 传入的时候 仅支持单选
 }
-const LeftSelectTree = ({ setSelectedId, reload, actionRef, currentUser, width, otherFun, setCollapsible, collapsible, haveTest, handleGetLeftTreeData, noWj }: DetailProps) => {
+const LeftSelectTree = ({ setSelectedId, reload, actionRef, currentUser, width, otherFun, setCollapsible, collapsible, haveTest, handleGetLeftTreeData, noWj, selectOnly }: DetailProps) => {
     const searchTreeRef = useRef<FormInstance>();
     // 默认的服务区树
     const [allTreeViews, setAllTreeViews] = useState<any>()
@@ -72,6 +73,9 @@ const LeftSelectTree = ({ setSelectedId, reload, actionRef, currentUser, width,
             list = handleFilterList(list, 89)
         }
         console.log('list2', list);
+
+        sessionStorage.setItem('SERVERPARTTree', JSON.stringify(list))
+
         if (handleGetLeftTreeData) {
             let newData: any = await handleGetLeftTreeData()
             console.log('newData', newData);
@@ -144,6 +148,19 @@ const LeftSelectTree = ({ setSelectedId, reload, actionRef, currentUser, width,
         return res
     }
 
+    // 仅支持单选一个服务区的时候 调用的方法
+    const convertTreeForSelectOnly = (treeData: any[]): any[] => {
+        return treeData.map(item => {
+            const newItem = {
+                ...item,
+                disabled: item.type !== 1,
+            };
+            if (item.children) {
+                newItem.children = convertTreeForSelectOnly(item.children);
+            }
+            return newItem;
+        });
+    };
 
     return (
         <div>
@@ -203,29 +220,59 @@ const LeftSelectTree = ({ setSelectedId, reload, actionRef, currentUser, width,
             >
                 {treeView && treeView.length > 0 ? <Tree
                     checkable
-                    treeData={isShowAllInTree ? [{
+                    treeData={selectOnly
-                        label: '全部',
+                        ? (isShowAllInTree
-                        value: 0,
+                            ? [{
-                        key: '0-0',
+                                label: '全部',
-                        children: treeView
+                                value: 0,
-                    }] : treeView}
+                                key: '0-0',
-                    fieldNames={{
+                                children: convertTreeForSelectOnly(treeView)
-                        title: "label",
+                            }]
-                        key: "key"
+                            : convertTreeForSelectOnly(treeView))
-                    }}
+                        : (isShowAllInTree
+                            ? [{
+                                label: '全部',
+                                value: 0,
+                                key: '0-0',
+                                children: treeView
+                            }]
+                            : treeView)}
                     blockNode
                     defaultExpandAll={isShowAllInTree ? false : true}
                     defaultExpandedKeys={isShowAllInTree ? treeShowRow && treeShowRow.length > 0 ? treeShowRow : ['0-0'] : []}
                     onCheck={(checkedKeys: React.Key[] | any, info) => {
-                        const selectedIds = info.checkedNodes.filter((n: any) => n?.type === 1)
+                        if (selectOnly) {
-                        setSelectedId(selectedIds.map(n => n?.value)?.toString() || '')
+                            // 只允许单选且只允许type为1
-                        if (reload) {
+                            const checked = Array.isArray(checkedKeys.checked) ? checkedKeys.checked : checkedKeys;
-                            actionRef?.current?.reload()
+                            const node = info.node;
-                        }
+                            if (node.type === 1) {
-                        if (otherFun) {
+                                setSelectedId(node.value);
-                            otherFun(info)
+                                if (reload) {
+                                    actionRef?.current?.reload();
+                                }
+                                if (otherFun) {
+                                    otherFun(info);
+                                }
+                            } else {
+                                // 取消非type=1的勾选
+                                setSelectedId('');
+                            }
+                        } else {
+                            // 多选逻辑
+                            const selectedIds = info.checkedNodes.filter((n: any) => n?.type === 1)
+                            setSelectedId(selectedIds.map((n: any) => n?.value)?.toString() || '')
+                            if (reload) {
+                                actionRef?.current?.reload()
+                            }
+                            if (otherFun) {
+                                otherFun(info)
+                            }
                         }
                     }}
+                    fieldNames={{
+                        title: "label",
+                        key: "key"
+                    }}
                 /> : ''}
             </ProCard>
         </div>

src/pages/travelMember/AfterSalesManage/index.tsx

@@ -0,0 +1 @@
+// 点餐售后管理

src/pages/travelMember/AfterSalesTypeManage/index.tsx

@@ -0,0 +1 @@
+// 售后类型管理

src/pages/travelMember/BookingMealOrder/index.tsx

@@ -0,0 +1 @@
+// 预约点餐订单

src/pages/travelMember/HomeSelectedCoupons/index.tsx

@@ -0,0 +1 @@
+// 首页精选卡券

src/pages/travelMember/HomeSelectedMall/index.tsx

@@ -0,0 +1 @@
+// 首页精选商城

src/pages/travelMember/HomeSelectedMerchants/index.tsx

@@ -0,0 +1 @@
+// 首页精选商家

src/pages/travelMember/LibraryInformationManager/index.tsx

@@ -0,0 +1 @@
+// 图库信息管理

src/pages/travelMember/LibraryTypeManager/index.tsx

@@ -0,0 +1 @@
+// 图库类型管理

src/pages/travelMember/LostandFoundAPPliance/index.tsx

@@ -0,0 +1,2 @@
+// 失物招领申请
+

src/pages/travelMember/LostandFoundReview/index.tsx

@@ -0,0 +1 @@
+// 失物招领审核

src/pages/travelMember/MallBrandManage/index.tsx

@@ -0,0 +1 @@
+// 商城品牌管理

src/pages/travelMember/MallClassificationManage/index.tsx

@@ -0,0 +1 @@
+// 商城分类管理

src/pages/travelMember/MallEvaluationManage/index.tsx

@@ -0,0 +1 @@
+// 商城评价管理

src/pages/travelMember/MallOrderManage/index.tsx

@@ -0,0 +1 @@
+// 商城订单管理

src/pages/travelMember/MerchantEvaluationManage/index.tsx

@@ -0,0 +1 @@
+// 商家评价管理

src/pages/travelMember/MerchantProductApplication/index.tsx

@@ -0,0 +1 @@
+// 合作商户商品申请

src/pages/travelMember/MerchantProductReview/index.tsx

@@ -0,0 +1 @@
+// 合作商户商品审核

src/pages/travelMember/OrderAfterSalesManage/index.tsx

@@ -0,0 +1 @@
+// 订单售后管理

src/pages/travelMember/OrderCategoryManage/index.tsx

@@ -0,0 +1 @@
+// 点餐类别管理

src/pages/travelMember/OrderProductManage/index.tsx

@@ -0,0 +1 @@
+// 点餐商品管理

src/pages/travelMember/ProductListingManagement/index.tsx

@@ -0,0 +1 @@
+// 商品上架管理

src/pages/travelMember/ProductSpecificationManage/index.tsx

@@ -0,0 +1 @@
+// 商品规格管理

src/pages/travelMember/SelfOperatedProductApplication/index.tsx

@@ -0,0 +1 @@
+// 自营餐饮商品申请

src/pages/travelMember/SelfOperatedProductReview/index.tsx

@@ -0,0 +1 @@
+// 自营餐饮商品审核

src/pages/travelMember/ShoppingMallProductSearch/index.tsx

@@ -0,0 +1 @@
+//商城商品查询

src/pages/travelMember/SummaryOfReservation/index.tsx

@@ -0,0 +1 @@
+// 预约订单汇总

src/pages/travelMember/SupplierClassification/index.tsx

@@ -0,0 +1 @@
+// 供货商户分类

src/pages/travelMember/SupplierMerchantManage/index.tsx

@@ -0,0 +1 @@
+// 供货商户管理