活动管理

config/routes.js

@@ -454,48 +454,48 @@ export default [
             },
             ],
           },
-          {
-            path: '/staff',
-            name: '员工管理',
-            component: '../layouts/BlankLayout',
-            routes: [
-              {
-                path: '/staff/StaffList',
-                name: '员工列表',
-                component: './staff/list/StaffList',
-              },
-              {
-                path: '/staff/editStaff',
-                name: '编辑员工',
-                hideInMenu: true,
-                component: './staff/list/editStaff',
-              },
+          // {
+          //   path: '/staff',
+          //   name: '员工管理',
+          //   component: '../layouts/BlankLayout',
+          //   routes: [
+          //     {
+          //       path: '/staff/StaffList',
+          //       name: '员工列表',
+          //       component: './staff/list/StaffList',
+          //     },
+          //     {
+          //       path: '/staff/editStaff',
+          //       name: '编辑员工',
+          //       hideInMenu: true,
+          //       component: './staff/list/editStaff',
+          //     },
 
-              {
-                path: '/staff/RoleList',
-                name: '角色管理',
-                component: './staff/list/RoleList',
-              },
-              {
-                path: '/staff/editRole',
-                name: '编辑角色',
-                hideInMenu: true,
-                component: './staff/list/editRole',
-              },
-              {
-                path: '/staff/list/addRole',
-                name: '添加角色',
-                hideInMenu: true,
-                component: './staff/list/addRole',
-              },
-              {
-                path: '/staff/list/distribution',
-                name: '分配归属',
-                hideInMenu: true,
-                component: './staff/list/distribution',
-              },
-            ],
-          },
+          //     {
+          //       path: '/staff/RoleList',
+          //       name: '角色管理',
+          //       component: './staff/list/RoleList',
+          //     },
+          //     {
+          //       path: '/staff/editRole',
+          //       name: '编辑角色',
+          //       hideInMenu: true,
+          //       component: './staff/list/editRole',
+          //     },
+          //     {
+          //       path: '/staff/list/addRole',
+          //       name: '添加角色',
+          //       hideInMenu: true,
+          //       component: './staff/list/addRole',
+          //     },
+          //     {
+          //       path: '/staff/list/distribution',
+          //       name: '分配归属',
+          //       hideInMenu: true,
+          //       component: './staff/list/distribution',
+          //     },
+          //   ],
+          // },
           {
             path: '/carouselFigure',
             name: '资源位管理',

src/components/SelectButton/ActivityType.jsx

@@ -0,0 +1,77 @@
+import React, { useState, useEffect, useRef } from 'react';
+import { Select } from 'antd';
+import apis from '../../services/apis';
+import request from '../../utils/request'
+
+const { Option } = Select;
+
+function usePrevious(props) {
+  const ref = useRef();
+  useEffect(() => {
+    ref.current = props;
+  });
+  return ref.current;
+}
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const ActivityType = props => {
+  const [data, setData] = useState([])
+  const [value, setValue] = useState([])
+  console.log('props', props);
+  useEffect(() => {
+    getBuildList();
+  }, [props.dynamicTypeId])
+
+
+  const getBuildList = e => {
+    request({ ...apis.dynamicType.list, params: { pageNum: 1, pageSize: 999 } }).then(data => {
+      setData(data.records)
+      checkValue(data.records)
+      // 默认选中第一个
+    })
+  }
+
+
+  const checkValue = (data) => {
+    if (props.value) {
+      const tempData = data.filter(f => f.dynamicTypeId == props.value)
+      const va = (tempData.length > 0) ? props.value : '项目已下线，请重新选择项目'
+      props.onChange(va)
+
+    }
+  }
+
+  const onChange = (dynamicTypeId) => {
+    const type = data.filter(x => dynamicTypeId === x.dynamicTypeId)[0]
+
+    props.onChange(dynamicTypeId, type)
+    // if (props.value) {
+    //   const tempData = data.filter(f => f.buildingId == props.value)
+    //   const va = (tempData.length > 0) ? props.value : '项目已下线，请重新选择项目'
+    //   props.onChange(va)
+
+    // }={props.onChange}building.buildingId
+  }
+
+  return (
+    <Select
+      showSearch
+      value={props.value}
+      style={{ width: '300px' }}
+      placeholder="请选择项目"
+      onChange={ onChange}
+      filterOption={(input, option) =>
+        option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      }>
+      {data.map(type => (
+        <Option key={type.dynamicTypeId} value={type.dynamicTypeId}>{type.dynamicTypeName}</Option>
+      ))}
+    </Select>
+  )
+}
+export default ActivityType

src/pages/activity/ActivityList.jsx

@@ -188,9 +188,9 @@ const header = props => {
 
         <EditIcon type={row.home === 1 ? 'cancel' : 'top'} text={row.home === 1 ? '取消推首页' : '推荐首页'} onClick={homeDynamic(row)} />,
 
-        <AuthButton name="admin.buildingDynamic.dataRecord" noRight={null}>
-          <EditIcon type="record" text="数据记录" onClick={toDataReacord(row.dynamicId)} />
-        </AuthButton>,
+        // <AuthButton name="admin.buildingDynamic.dataRecord" noRight={null}>
+        //   <EditIcon type="record" text="数据记录" onClick={toDataReacord(row.dynamicId)} />
+        // </AuthButton>,
 
         (row.activityStatus === 0 || row.activityStatus === 1) ?
           <AuthButton name="admin.buildingDynamic.update.put" noRight={null}>

src/pages/activity/detailActivity.jsx

@@ -5,7 +5,7 @@ import styles from '../style/GoodsList.less';
 import apis from '../../services/apis';
 import moment from 'moment';
 import router from 'umi/router';
-import BuildSelect from '../../components/SelectButton/BuildSelect'
+import ActivityType from '../../components/SelectButton/ActivityType'
 import XForm, { FieldTypes } from '../../components/XForm';
 import Wangedit from '../../components/Wangedit/Wangedit'
 import request from '../../utils/request'
@@ -112,15 +112,15 @@ const BasicForm = props => {
     <>
       <Form {...formItemLayout} onSubmit={handleSubmit}>
         <Form.Item label="活动类型">
-          {getFieldDecorator('buildingId', {
-            initialValue: detailData.buildingId,
+          {getFieldDecorator('dynamicTypeId', {
+            initialValue: detailData.dynamicTypeId,
             rules: [
               {
                 required: true,
                 message: '请选择活动类型',
               },
             ],
-          })(<BuildSelect disabled />)}
+          })(<ActivityType disabled />)}
         </Form.Item>
         <Form.Item label="活动封面图1">
           <img src={detailData.listImgUrl} height="210px" width="375px" />

src/pages/activity/editActivity.jsx

@@ -6,7 +6,7 @@ import router from 'umi/router';
 import styles from '../style/GoodsList.less';
 import apis from '../../services/apis';
 import moment from 'moment';
-import BuildSelect from '../../components/SelectButton/BuildSelect2'
+import ActivityType from '../../components/SelectButton/ActivityType'
 import XForm, { FieldTypes } from '../../components/XForm';
 import Wangedit from '../../components/Wangedit/Wangedit'
 import request from '../../utils/request'
@@ -168,14 +168,14 @@ const BasicForm = props => {
     <>
       <Form {...formItemLayout} onSubmit={handleSubmit}>
         <Form.Item label="活动类型">
-          {getFieldDecorator('buildingId', {
+          {getFieldDecorator('dynamicTypeId', {
             rules: [
               {
                 required: true,
-                message: '请选择所属项目',
+                message: '请选择活动类型',
               },
             ],
-          })(<BuildSelect disabled={disable} />)}
+          })(<ActivityType disabled={disable} />)}
         </Form.Item>
         <Form.Item label="活动封面图1" help="建议图片尺寸：750px*420px，比例16:9,格式：jpg，用于：首页推荐/活动列表">
           {getFieldDecorator('listImgUrl', {