导出数据 推荐客户

src/components/SelectButton/BuildSelect.jsx

@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useRef } from 'react';
 import { Select } from 'antd';
-
+import apis from '../../services/apis';
 import request from '../../utils/request'
 
 const { Option } = Select;
@@ -33,11 +33,7 @@ const BuildingSelect = (props) => {
   },[])
 
   const getCityList = (e) => {
-    request({
-        url: '/api/admin/buildinglist/select',
-        method: 'GET',
-        params: {pageNum: 1,pageSize: 999},
-    }).then((data) => {
+    request({ ...apis.building.buildingSelect, params: {pageNum: 1,pageSize: 999}, }).then((data) => {
         setData(data.records)
     })
   }

src/components/SelectButton/CitySelect.jsx

@@ -23,6 +23,7 @@ const CitySelect = (props) => {
         url: '/api/admin/tdCity',
         method: 'GET',
         params: {leveltype: 2, pageNum: 1,pageSize: 999},
+        action: 'select',
     }).then((data) => {
         setData(data)
     })

src/components/SelectButton/NewTypeSelect.jsx

@@ -23,6 +23,7 @@ const NewsTypeSelect = (props) => {
         url: '/api/admin/taNewsType',
         method: 'GET',
         params: {pageNum: 1,pageSize: 999},
+        action: 'select',
     }).then((data) => {
         setData(data.records)
     })

src/pages/news/list/NewsList.jsx

@@ -97,13 +97,12 @@ function body(props) {
         okText: '确认',
         cancelText: '取消',
         onOk() {
-          request({
-            url: '/api/admin/taNews/' + newsId,
-            method: 'DELETE',
-            // data: { ...row },
-          }).then((data) => {
+          request({ ...apis.news.delete, urlData: { id: newsId },}).then((data) => {
             message.info('操作成功！')
             getList({ pageNum: 1, pageSize: 10 });
+          }).catch((err) => {
+            console.log(err)
+            message.info(err.msg || err.message)
           })
         }
       });
@@ -127,13 +126,12 @@ function body(props) {
           okText: '确认',
           cancelText: '取消',
           onOk() {
-            request({
-              url: '/api/admin/taNews/' + newsId,
-              method: 'PUT',
-              data: { "newsStatus": newsStatus, "buildingId": buildingId, "newsTypeId": newsTypeId },
-            }).then((data) => {
+            request({ ...apis.news.cancel, data:{"newsStatus": newsStatus, "buildingId": buildingId, "newsTypeId": newsTypeId}, urlData: { id: newsId },}).then((data) => {
               message.info('操作成功！')
               getList({ pageNum: 1, pageSize: 10 });
+            }).catch((err) => {
+              console.log(err)
+              message.info(err.msg || err.message)
             })
           },
           onCancel() {
@@ -146,13 +144,12 @@ function body(props) {
           okText: '确认',
           cancelText: '取消',
           onOk() {
-            request({
-              url: '/api/admin/taNews/' + newsId,
-              method: 'PUT',
-              data: { "newsStatus": newsStatus, "buildingId": buildingId, "newsTypeId": newsTypeId },
-            }).then((data) => {
+            request({ ...apis.news.cancel, data:{"newsStatus": newsStatus, "buildingId": buildingId, "newsTypeId": newsTypeId}, urlData: { id: newsId },}).then((data) => {
               message.info('操作成功！')
               getList({ pageNum: 1, pageSize: 10 });
+            }).catch((err) => {
+              console.log(err)
+              message.info(err.msg || err.message)
             })
           },
           onCancel() {
@@ -175,11 +172,11 @@ function body(props) {
                   <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '10px' }} />
           </span>
           {data.newsStatus === 0 ?
-            <span style={{ position: 'absolute', left: '280px', bottom: ' 0.11rem', fontSize: ' 0.11rem', color: '#FF7E48' }} onClick={cancelRelease.bind(this, data.newsId, 1, data.buildingId, data.newsType.newsTypeId)}>
+            <span style={{ position: 'absolute', left: '280px', bottom: ' 0.11rem', fontSize: ' 0.11rem', color: '#FF7E48',zIndex:1 }} onClick={cancelRelease.bind(this, data.newsId, 1, data.buildingId, data.newsType.newsTypeId)}>
               取消发布
                 <Icon type="close-circle" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
             </span> :
-            <span style={{ position: 'absolute', left: '280px', bottom: ' 0.11rem', fontSize: ' 0.11rem', color: '#FF7E48' }} onClick={cancelRelease.bind(this, data.newsId, 0, data.buildingId, data.newsType.newsTypeId)}>
+            <span style={{ position: 'absolute', left: '280px', bottom: ' 0.11rem', fontSize: ' 0.11rem', color: '#FF7E48',zIndex:1 }} onClick={cancelRelease.bind(this, data.newsId, 0, data.buildingId, data.newsType.newsTypeId)}>
               发布
                 <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
             </span>

src/pages/news/type/NewsType.jsx

@@ -5,7 +5,7 @@ import styles from '../../style/GoodsList.less';
 import router from 'umi/router';
 import BuildSelect from '../../../components/SelectButton/BuildSelect';
 import AuthButton from '@/components/AuthButton';
-
+import apis from '../../../services/apis';
 import request from '../../../utils/request'
 
 const { Option } = Select;
@@ -21,15 +21,12 @@ function header(props) {
 
   // 查询列表
   const getList = (params) => {
-    request({
-        url: '/api/admin/taNewsType',
-        method: 'GET',
-        params: { ...params },
-    }).then((data) => {
+    request({ ...apis.newsType.list, params: { ...params } }).then((data) => {
         console.log(data)
         setData(data)
     })
   }
+
   
   // 提交事件
   const handleSubmit = (e, props) => {
@@ -63,14 +60,22 @@ function header(props) {
       okText: '确认',
       cancelText: '取消',
       onOk() {
-        request({
-          url: '/api/admin/taNewsType/' + newsId,
-          method: 'DELETE',
-          data: { ...row },
-        }).then((data) => {
+        request({ ...apis.newsType.delete, urlData: { id: newsId },}).then((data) => {
           message.info('操作成功！')
           getList({ pageNum: 1, pageSize: 10 });
+        }).catch((err) => {
+          console.log(err)
+          message.info(err.msg || err.message)
         })
+
+        // request({
+        //   url: '/api/admin/taNewsType/' + newsId,
+        //   method: 'DELETE',
+        //   data: { ...row },
+        // }).then((data) => {
+        //   message.info('操作成功！')
+        //   getList({ pageNum: 1, pageSize: 10 });
+        // })
       }
     });
   }

src/pages/staff/list/addRole.jsx

@@ -41,16 +41,6 @@ const Poster = props => {
     buttonList({ pageNum: 1, pageSize: 100 })
   }, [])
   // 当前所有的菜单
-  // function menuList(params) {
-  //   request({
-  //     url: '/api/admin/menuList',
-  //     method: 'GET',
-  //     params: { ...params },
-  //     // eslint-disable-next-line no-shadow
-  //   }).then(data => {
-  //     setData(data)
-  //   })
-  // }
   function menuList(params) {
     request({ ...apis.role.menuList, params: { ...params } }).then((data) => {
       setData(data)
@@ -61,18 +51,6 @@ const Poster = props => {
   }
 
   // 所有按钮
-  // function buttonList(params) {
-  //   request({
-  //     url: '/api/admin/buttonList',
-  //     method: 'GET',
-  //     params: { ...params },
-  //     // eslint-disable-next-line no-shadow
-  //   }).then(data => {
-  //     console.log(data)
-  //     setBuutonDate(data)
-  //   })
-  // }
-
   function buttonList(params) {
     request({ ...apis.role.buttonList, params: { ...params } }).then((data) => {
       setBuutonDate(data)
@@ -83,27 +61,6 @@ const Poster = props => {
 
 
   // 根据角色id查询当前的菜单及其按钮
-  // function buttonAndMenuList(params, id) {
-  //   console.log('id: ', id)
-  //   request({
-  //     url: `/api/admin/taRole/details/${id}`,
-  //     method: 'GET',
-  //     params: { ...params },
-  //     // eslint-disable-next-line no-shadow
-  //   }).then(data => {
-  //     console.log('data.roleName: ', data)
-  //     props.form.setFieldsValue({ roleName: data.roleName })
-  //     console.log(data)
-  //     setData(data)
-
-  //     // 获取所有的权限Id
-  //     if (data.sysMenuList) {
-  //       setDataMenuId(data.sysMenuList.map(item => item.menuId))
-  //       setDataButtonId((data.sysMenuList.map(item => item.sysButtonInMenu && item.sysButtonInMenu.map(btn => btn.btnId).join(',')).filter(f => f !== '').join(',').split(',')).map(a => parseInt(a)))
-  //     }
-  //   })
-  // }
-
   function buttonAndMenuList(params, ids) {
     request({ ...apis.role.buttonAndMenuList, urlData: { id: ids }, params: { ...params } }).then(data => {
       props.form.setFieldsValue({ roleName: data.roleName })
@@ -168,16 +125,6 @@ const Poster = props => {
       pathname: '/staff/RoleList',
     });
   }
-  // function updateAuthMenu(params) {
-  //   request({
-  //     url: '/api/admin/updateAuthMenu',
-  //     method: 'POST',
-  //     data: { ...params },
-  //     // eslint-disable-next-line no-shadow
-  //   }).then(data => {
-  //     toRoleList()
-  //   })
-  // }
 
   function updateAuthMenu(data) {
     request({ ...apis.role.updateAuthMenu, data: { ...data } }).then((data) => {

src/pages/staff/list/editStaff.jsx

@@ -26,6 +26,7 @@ const Edit = (props) => {
   const userId = props.location.query.userId
   const [userData, setUserData] = useState({})
   const [tagData, setTagData] = useState([])
+  const [roleData, setRoleData] = useState([])
 
   const getTagList = () => {
     request({ ...apis.staff.taTags, params: {pageNum:1,pageSize:999} }).then((data) => {
@@ -33,6 +34,13 @@ const Edit = (props) => {
     })
   }
 
+  const getRoleList = () => {
+    request({ ...apis.role.getRoleList, params: {pageNum:1,pageSize:999} }).then((data) => {
+      console.log(data)
+      setRoleData(data.records)
+    })
+  }
+
   // 查询列表
   const getUserData = (userId) => {
     request({ ...apis.staff.getTaUser, urlData: {id:userId} }).then((data) => {
@@ -43,6 +51,7 @@ const Edit = (props) => {
 
   useEffect(() => {
     getTagList();
+    getRoleList();
     if (userId) {
       getUserData(userId);
     }
@@ -103,6 +112,22 @@ const Edit = (props) => {
       placeholder: '请输入电话号码',
       value: userData.phone,
     },
+    {
+      label: '角色',
+      name: 'roleIds',
+      render: <Select
+                mode="multiple"
+                style={{ width: '100%' }}
+                placeholder="请选择标签"
+                onChange={tagsChange} >
+                  {roleData.map(item => (
+                    <Select.Option key={item.roleId} value={item.roleId}>
+                      {item.roleName}
+                    </Select.Option>
+                  ))}
+              </Select>,
+      value: userData.roleIds,
+    },
     {
       label: '标签',
       name: 'taTags',

src/services/apis.js

@@ -5,10 +5,12 @@ export default {
     uploadForAnt: {
       url: `${prefix}/antd/image`,
       method: 'POST',
+      action: 'upload',
     },
     upload: {
       url: `${prefix}/image`,
       method: 'POST',
+      action: 'upload',
     },
   },
   user: {
@@ -27,6 +29,7 @@ export default {
       method: 'POST',
       url: `${prefix}/taUser/signout`,
       logout: true,
+      action: 'signout',
     },
   },
   building: {
@@ -85,6 +88,11 @@ export default {
       url: `${prefix}/apartment/deleted/id`,
       action: 'admin.apartment.deleted.id.delete',
     },
+    buildingSelect: {
+      url: `${prefix}/buildinglist/select`,
+      method: 'GET',
+      action: 'select',
+    }
   },
   buildingType: {
     getList: {
@@ -119,6 +127,28 @@ export default {
       url: `${prefix}/taNews`,
       action: 'admin.taNews.get',
     },
+    delete: {
+        method: 'DELETE',
+        url: `${prefix}/taNews/:id`,
+        action: 'admin.taNews.id.delete',
+    },
+    cancel: {
+        method: 'PUT',
+        url: `${prefix}/taNews/:id`,
+        action: 'admin.taNews.id.put',
+    },
+  },
+  newsType: {
+    list: {
+        method: 'GET',
+        url: `${prefix}/taNewsType`,
+        action: 'admin.taNewsType.get',
+      },
+    delete: {
+        method: 'DELETE',
+        url: `${prefix}/taNewsType/:id`,
+        action: 'admin.taNewsType.id.delete',
+    },
   },
   customer: {
     drift: {