From 2a5cf3ff62a7aa5bc912181848e24d2c115ae539 Mon Sep 17 00:00:00 2001
From: zhaoy <137053305@qq.com>
Date: Tue, 23 Jan 2024 17:53:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=9D=83=E9=99=90=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../company/account/components/CreateForm.jsx | 16 +++++++++
 .../company/account/components/MenuForm.jsx   |  4 ++-
 src/pages/company/account/index.jsx           | 22 +++++++++++--
 src/pages/company/account/service.js          |  4 +--
 src/pages/sys/menus/components/CreateForm.jsx | 29 +++++++++++-----
 src/pages/sys/menus/index.jsx                 | 33 +++++++++++++++++--
 src/pages/sys/menus/service.js                |  2 +-
 7 files changed, 94 insertions(+), 16 deletions(-)

diff --git a/src/pages/company/account/components/CreateForm.jsx b/src/pages/company/account/components/CreateForm.jsx
index f3c28d3..fab4c96 100644
--- a/src/pages/company/account/components/CreateForm.jsx
+++ b/src/pages/company/account/components/CreateForm.jsx
@@ -37,6 +37,22 @@ const CreateForm = (props) => {
 message: '邮箱格式不正确', }]}>
           <Input placeholder="电子邮件是登录账户" disabled={props.values.id?true:false} />
         </Form.Item>
+        <Form.Item name="type" label="所属平台" rules={[{ required: true }]}>
+               <Select placeholder='请选择所属平台' allowClear  options={[
+                  {
+                    value: 0,
+                    label: '团餐',
+                  },
+                  {
+                    value: 1,
+                    label: '门店',
+                  },
+                  {
+                    value: 2,
+                    label: '后厨',
+                  },
+                ]}/>
+              </Form.Item>
         <Form.Item name="phone" label="电话" rules={[{ max: 20,pattern: /0?(13|14|15|18|17)[0-9]{9}$/,
 message: '手机号格式不正确' }]}>
           <Input placeholder="请输入电话" />
diff --git a/src/pages/company/account/components/MenuForm.jsx b/src/pages/company/account/components/MenuForm.jsx
index db35e9e..cd21632 100644
--- a/src/pages/company/account/components/MenuForm.jsx
+++ b/src/pages/company/account/components/MenuForm.jsx
@@ -16,7 +16,9 @@ const MenuForm = (props) => {
 
     });
     setCheckedKeys(arr)
-    var ret = await api.GetMenu('ALL');
+    console.log("props.values",props.datas)
+    var parm={getType:'ALL',type:props.datas.type}
+    var ret = await api.GetMenu(parm);
     var data = Enumerable.from(ret.data).toArray();
     setLoad(data);
   }, [props.modalVisible])
diff --git a/src/pages/company/account/index.jsx b/src/pages/company/account/index.jsx
index 7c3220c..0ce10ce 100644
--- a/src/pages/company/account/index.jsx
+++ b/src/pages/company/account/index.jsx
@@ -120,7 +120,8 @@ const companyManage = () => {
   const [row, setRow] = useState();
 
   useEffect(() => {
-    api.GetMenu().then((r) => {
+    var parm={getType:'ALL',type:0}
+    api.GetMenu(parm).then((r) => {
       if(r.data){
         setTreeData(r.data.data);
       }
@@ -164,7 +165,23 @@ const companyManage = () => {
       dataIndex: 'email',
       ellipsis: true,
     },
-   
+    {
+      title: '所属平台',
+      dataIndex: 'type',
+      valueType: 'select',
+      ellipsis:true,
+      valueEnum: {
+        0: {
+          text: '团餐',
+        },
+        1: {
+          text: '门店',
+        },
+        2: {
+          text: '后厨',
+        },
+      },
+    },
     {
       title: '电话',
       dataIndex: 'phone',
@@ -423,6 +440,7 @@ const companyManage = () => {
           }}
           modalVisible={updateMenuModalVisible}
           values={row || {}}
+          datas={stepFormValues || {}}
         />
       ) : null}
       <Drawer
diff --git a/src/pages/company/account/service.js b/src/pages/company/account/service.js
index deeb223..3619c3a 100644
--- a/src/pages/company/account/service.js
+++ b/src/pages/company/account/service.js
@@ -18,7 +18,7 @@ export default {
   /** 修改企业信息*/
   updateCompany(data) {
     return request(`/saasbase/api/company/update`, {
-      method: 'PUT',
+      method: 'POST',
       data: data,
     });
   },
@@ -50,7 +50,7 @@ export default {
   },
   /** 查询功能菜单*/
   GetMenu(params) {
-    return request(`​/saasbase/api/menu/menutrees?getType=${params}`,
+    return request(`​/saasbase/api/menu/menuparmytrees?getType=${params.getType}&&type=${params.type}`,
     {
       method: 'Get',
     });
diff --git a/src/pages/sys/menus/components/CreateForm.jsx b/src/pages/sys/menus/components/CreateForm.jsx
index 6c95a44..87c2b86 100644
--- a/src/pages/sys/menus/components/CreateForm.jsx
+++ b/src/pages/sys/menus/components/CreateForm.jsx
@@ -111,15 +111,28 @@ const CreateForm = (props) => {
             </Form.Item>
           </Col>
           <Col span={12}>
-            {RadioKey != 0 && props.values.type != 0 ? (
-              ''
-            ) : (
-              <Form.Item name="permission" label="权限标识">
-               <Select placeholder='请选择权限标识'>
-                 {props.dictData}
-               </Select>
+           
+              <Form.Item name="type" label="所属平台">
+               <Select placeholder='请选择所属平台'  mode="multiple" allowClear  options={[
+                {
+                  value: '0',
+                  label: '团餐',
+                },
+                {
+                  value: '1',
+                  label: '门店',
+                },
+                {
+                  value: '2',
+                  label: '后厨',
+                },
+                {
+                  value: '3',
+                  label: '公共',
+                },
+              ]}/>
               </Form.Item>
-            )}
+            
           </Col>
         </Row>
         <Form.Item>
diff --git a/src/pages/sys/menus/index.jsx b/src/pages/sys/menus/index.jsx
index 5dbf35b..c15e07b 100644
--- a/src/pages/sys/menus/index.jsx
+++ b/src/pages/sys/menus/index.jsx
@@ -28,7 +28,7 @@ const menuManager = () => {
  */
 
  const handleAdd = async (fields) => {
-    fields.type=3
+  fields.type=fields.type.join(',');
     await api.add({ ...fields }).then((r) => {
       if (r.succeeded) {
         message.success('添加成功');
@@ -47,6 +47,7 @@ const menuManager = () => {
  */
 
 const handleUpdate = async (fields) => {
+  fields.type=fields.type.join(',');
     api.update(fields).then((r) => {
       if (r.succeeded) {
         message.success('更新成功');
@@ -72,6 +73,7 @@ const handleUpdate = async (fields) => {
       onClick={() => {
         InitTree();
         handleModalVisible(true);
+        record.type=record.type.split(',');
         setStepFormValues(record);
       }}
     >
@@ -157,6 +159,32 @@ const handleUpdate = async (fields) => {
       dataIndex: 'name',
       ellipsis:true,
     },
+    {
+      title: '所属平台',
+      dataIndex: 'typeName',
+      
+    },
+    {
+      title: '所属平台',
+      dataIndex: 'type',
+      valueType: 'select',
+      ellipsis:true,
+      hideInTable: true,
+      valueEnum: {
+        0: {
+          text: '团餐',
+        },
+        1: {
+          text: '门店',
+        },
+        2: {
+          text: '后厨',
+        },
+        3: {
+          text: '公共',
+        },
+      },
+    },
     {
       title: '菜单编码',
       dataIndex: 'code',
@@ -232,7 +260,8 @@ const handleUpdate = async (fields) => {
           let UserData = [];
           //添加机构组织
           await api.menutreepage(value).then((r) => {
-            UserData = r.data;
+            UserData=r.data
+            console.log("UserData",UserData)
           });
           return {
             data: UserData,
diff --git a/src/pages/sys/menus/service.js b/src/pages/sys/menus/service.js
index 8fff673..d331e64 100644
--- a/src/pages/sys/menus/service.js
+++ b/src/pages/sys/menus/service.js
@@ -36,7 +36,7 @@ function update(params) {
 }
 
 function trees() {
-  return request(`​/saasbase/api/menu/menutrees?getType=ALL`, {
+  return request(`​/saasbase/api/menu/menutreesall`, {
     method: 'Get',
   });
 }