feats

config/routes.js

@@ -512,22 +512,22 @@ export default [
                 hideInMenu: true,
                 component: './carouselFigure/editCarousel',
               },
-              // {
-              //   path: '/carouselFigure/advertisingList',
-              //   name: '开屏广告',
-              //   component: './carouselFigure/advertisingList',
-              // },
+              {
+                path: '/carouselFigure/advertisingList',
+                name: '开屏广告',
+                component: './carouselFigure/advertisingList',
+              },
               {
                 path: '/carouselFigure/editAdvertising',
                 name: '开屏广告编辑',
                 hideInMenu: true,
                 component: './carouselFigure/editAdvertising',
               },
-              // {
-              //   path: '/carouselFigure/propagandaList',
-              //   name: '宣传位',
-              //   component: './carouselFigure/propagandaList',
-              // },
+              {
+                path: '/carouselFigure/propagandaList',
+                name: '宣传位',
+                component: './carouselFigure/propagandaList',
+              },
               {
                 path: '/carouselFigure/propaganda',
                 name: '宣传位编辑',

src/global.less

@@ -72,6 +72,10 @@ ol {
 .ant-pro-grid-content .ant-pro-page-header-wrap-children-content {
   margin-top: 8px !important;
 }
+
+.ant-steps-vertical .ant-steps-item-content {
+  width: calc(100% - 100px) !important;
+}
  
 .ant-layout{
 //   .ant-menu-vertical .ant-menu-item,

src/pages/carouselFigure/SelectNotice.jsx

@@ -0,0 +1,111 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Select, Modal, Button, Table, Divider, Tag, Input } from 'antd';
+import { apis, fetch } from '../../utils/request';
+import Navigate from '@/components/Navigate';
+
+const getList = fetch(apis.announcement.listAnnouncement)
+const { Search } = Input;
+
+export default (props) => {
+  const {
+    value,
+    onChange,
+    ...rest
+  } = props;
+
+  const [list, setList] = useState([]);
+  const [visible, setVisible] = useState(false);
+  const [activity, setActivity] = useState({ id: undefined, announcementTitle: '请选择公告' })
+  const getActTitle = val => ((list.filter(x => x.id === val)[0]) || {}).announcementTitle || '请选择公告'
+  const setAct = val => setActivity({ id: val, announcementTitle: getActTitle(val) })
+
+  const buildingId = props.buildingId()
+
+  useEffect(() => {
+    getList({
+      data: {
+        pageNum: 1,
+        pageSize: 999,
+        announcementTitle: '',
+      }
+    }).then((data) => {
+      setList(data.list || [])
+
+      console.log('----', buildingId, value)
+
+      setAct(buildingId ? undefined : value);
+    })
+  }, [buildingId]);
+
+  if (value !== activity.id) {
+    setAct(value);
+  }
+  const searchActivity =(e)=>{
+    getList({
+      data: {
+        pageNum: 1,
+        pageSize: 999,
+        announcementTitle:e
+      }
+    }).then((data) => {
+      setList(data.list || [])
+
+      console.log('----', buildingId, value)
+
+      // setAct(buildingId ? undefined : value);
+    })
+  }
+
+  let chooseVal = value
+
+  const handleChange = val => chooseVal = val
+
+  const setData = val => {
+    setAct(val)
+    onChange(val)
+    setVisible(false)
+  }
+
+  const columns = [
+    {
+      title: '标题',
+      dataIndex: 'announcementTitle',
+      key: 'id',
+      align: 'center',
+      ellipsis: true,
+      render: text => <a>{text}</a>,
+    },
+    {
+      title: '操作',
+      dataIndex: 'name',
+      align: 'center',
+      width: '20%',
+      render: (text, record) => (
+        <Navigate onClick={() => setData(record.id)}>选择</Navigate>
+      ),
+    },
+  ];
+
+  return (
+
+    <div>
+      <div ><Navigate onClick={() => setVisible(true)}>{activity.announcementTitle}</Navigate></div>
+      <Modal
+        title="请选择"
+        visible={visible}
+        onCancel={() => setVisible(false)}
+        footer={[]}
+      >
+        <Search
+          placeholder="请输入标题"
+          enterButton="搜索"
+          size="large"
+          onSearch={value => searchActivity(value)}
+          style={{ marginBottom: '16px' }}
+        />
+        <Table rowKey={list => list.id} columns={columns} dataSource={list} />
+      </Modal>
+    </div>
+
+  );
+}

src/pages/carouselFigure/SelectTpNews.jsx

@@ -0,0 +1,104 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Select, Modal, Button, Table, Divider, Tag, Input } from 'antd';
+import { apis, fetch } from '../../utils/request';
+import Navigate from '@/components/Navigate';
+
+const getNewsList = fetch(apis.propNews.getNewsList)
+const { Search } = Input;
+
+export default props => {
+  const {
+    value,
+    onChange,
+    ...rest
+  } = props;
+
+  const [list, setList] = useState([]);
+  const [visible, setVisible] = useState(false);
+  const [news, setNews] = useState({ newsId: undefined, newsName: '请选择服务' })
+  const getNewsTitle = val => ((list.filter(x => x.newsId == val)[0]) || {}).newsName || '请选择服务'
+  const updateNews = val => setNews({ newsId: val, newsName: getNewsTitle(val) })
+
+  const buildingId = props.buildingId()
+
+  useEffect(() => {
+    getNewsList({
+      params: {
+        buildingId,
+        pageNum: 1,
+        pageSize: 999,
+        newsStatus: 0,
+      },
+    }).then(data => {
+      setList(data.records || [])
+
+      updateNews(buildingId ? undefined : value);
+    })
+  }, [buildingId]);
+  const searchActivity = (e) => {
+    getNewsList({
+      params: {
+        pageNum: 1,
+        pageSize: 999,
+        newsName: e
+      },
+    }).then(data => {
+      setList(data.records || [])
+
+      updateNews(buildingId ? undefined : value);
+    })
+  }
+  if (value !== news.newsId) {
+    updateNews(value);
+  }
+
+  const handleChange = val => {
+    onChange(val)
+  }
+
+  const setData = val => {
+    updateNews(val)
+    onChange(val)
+    setVisible(false)
+  }
+
+  const columns = [
+    {
+      title: '标题',
+      dataIndex: 'newsName',
+      key: 'newsId',
+      align: 'center',
+      ellipsis: true,
+      render: text => <a>{text}</a>,
+    },
+    {
+      title: '操作',
+      align: 'center',
+      width: '20%',
+      render: (text, record) => (
+        <Navigate onClick={() => setData(record.newsId)}>选择</Navigate>
+      ),
+    },
+  ];
+
+  return (
+    <div>
+      <div ><Navigate onClick={() => setVisible(true)}>{news.newsName}</Navigate></div>
+      <Modal
+        title="请选择"
+        visible={visible}
+        onCancel={() => setVisible(false)}
+        footer={[]}
+      >
+        <Search
+          placeholder="请输入标题"
+          enterButton="搜索"
+          size="large"
+          onSearch={value => searchActivity(value)}
+          style={{ marginBottom: '16px' }}
+        />
+        <Table rowKey={list => list.newsId} columns={columns} dataSource={list} />
+      </Modal>
+    </div>
+  );
+}

src/pages/carouselFigure/advertisingList.jsx

@@ -15,6 +15,13 @@ import styles from '../style/GoodsList.less';
 const { Option } = Select;
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
+const ContentTypeDict = {
+  'notice': '公告',
+  'tpNews': '服务',
+  'activity': '活动',
+  'news': '资讯'
+}
+
 const header = (props) => {
   const [data, setData] = useState({})
   //   const [page, changePage] = useState({})
@@ -50,34 +57,33 @@ const header = (props) => {
       align: 'center',
       render: (image,row) => <Navigate onClick={toEdit(row.contentId)}><img src={image} className={styles.imgSmall} /></Navigate>,
     },
-    {
-      title: '发布城市',
-      dataIndex: 'cityName',
-      key: 'cityName',
-      align: 'center',
-    },
-    {
-      title: '关联项目',
-      dataIndex: 'buildingName',
-      key: 'buildingName',
-      align: 'center',
-      render: (buildingName) => <span>{buildingName === null ? '无' : buildingName}</span>
-    },
+    // {
+    //   title: '发布城市',
+    //   dataIndex: 'cityName',
+    //   key: 'cityName',
+    //   align: 'center',
+    // },
+    // {
+    //   title: '关联项目',
+    //   dataIndex: 'buildingName',
+    //   key: 'buildingName',
+    //   align: 'center',
+    //   render: (buildingName) => <span>{buildingName === null ? '无' : buildingName}</span>
+    // },
     {
       title: '关联内容类型',
       dataIndex: 'contentType',
       key: 'contentType',
       align: 'center',
-      render: (contentType) => <span>{contentType === 'project' ? '项目' : contentType === 'activity' ? '报名活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' :
-        contentType === 'help' ? '助力活动' : contentType === 'group' ? '拼团活动' : contentType === 'h5' ? 'H5活动' : contentType === 'salesBatch' ? '在线选房' : contentType === 'live' ? '直播活动' : '无'}</span>
-    },
-    {
-      title: '发布位置',
-      dataIndex: 'showPosition',
-      key: 'showPosition',
-      align: 'center',
-      render: (showPosition) => <span>{ showPosition === 'index' ? '首页' : showPosition === 'building' ? '项目' : '' }</span>
+      render: x => <span>{ContentTypeDict[x] || '无'}</span>
     },
+    // {
+    //   title: '发布位置',
+    //   dataIndex: 'showPosition',
+    //   key: 'showPosition',
+    //   align: 'center',
+    //   render: (showPosition) => <span>{ showPosition === 'index' ? '首页' : showPosition === 'building' ? '项目' : '' }</span>
+    // },
     {
       title: '发布时间',
       dataIndex: 'createDate',

src/pages/carouselFigure/editAdvertising.jsx

@@ -15,6 +15,8 @@ import request from '../../utils/request'
 import SelectHelp from './SelectHelp';
 import SelectGroup from './SelectGroup';
 import SelectH5 from './SelectH5';
+import SelectNotice from './SelectNotice';
+import SelectTpNews from './SelectTpNews';
 import SalesBatchGroup from './SalesBatchGroup';
 import LiveGroup from './LiveGroup';
 /**
@@ -32,6 +34,8 @@ const createEditor = () => {
   let salesBatchVisible = false
   let liveVisible = false
   let h5Visible = false
+  let noticeVisible = false
+  let tpNewsVisible = false
   let buildingId = ''
   let cityId = ''
   let isHaveActive = false
@@ -68,6 +72,8 @@ const createEditor = () => {
     salesBatchVisible = data.contentType === 'salesBatch';
     liveVisible = data.contentType === 'live';
     h5Visible = data.contentType === 'h5';
+    noticeVisible = data.contentType === 'notice';
+    tpNewsVisible = data.contentType === 'tpNews';
 
     cityId = data.cityId
     // console.log(data.buildingId, ' data.buildingId')
@@ -78,11 +84,11 @@ const createEditor = () => {
     console.log(data, "data.buildingIddata.buildingId2")
     islet = data.isHaveActive
 
-    if ((data.contentType === 'h5' && data.buildingId == null) || data.contentType === '' || data.contentType === 'nothing' || (data.contentType === 'live' && data.buildingId == null)) {
-      isHaveActive = false
-    } else {
-      isHaveActive = true
-    }
+    // if ((data.contentType === 'h5' && data.buildingId == null) || data.contentType === '' || data.contentType === 'nothing' || (data.contentType === 'live' && data.buildingId == null)) {
+    //   isHaveActive = false
+    // } else {
+    //   isHaveActive = true
+    // }
     // if (!isHaveActivea && data.contentType === 'h5') {
     //   // data.contentType=null
     //   data.buildingId = null
@@ -95,11 +101,11 @@ const createEditor = () => {
     //     data.buildingId = null
     //   }
     // }
-    if (data.showPosition == 'index') {
-      isHavePosition = true;
-    } else {
-      isHavePosition = false;
-    }
+    // if (data.showPosition == 'index') {
+    //   isHavePosition = true;
+    // } else {
+    //   isHavePosition = false;
+    // }
 
     contentVisible = data.contentType === 'other';
     activityVisible = data.contentType === 'activity';
@@ -109,6 +115,8 @@ const createEditor = () => {
     salesBatchVisible = data.contentType === 'salesBatch';
     liveVisible = data.contentType === 'live';
     h5Visible = data.contentType === 'h5';
+    noticeVisible = data.contentType === 'notice';
+    tpNewsVisible = data.contentType === 'tpNews';
 
     console.log(data.buildingId, ' data.buildingId')
     buildingId = data.buildingId
@@ -150,63 +158,63 @@ const createEditor = () => {
     }
 
     const fields = [
-      {
-        label: '是否关联项目',
-        name: 'isHaveActive',
-        type: FieldTypes.Switch,
-        value: isHaveActive,
-        hidden: () => !isCanChoose,
-        props: {
-          onChange: () => {
-            const type = formRef.current.props.form.getFieldValue('contentType')
-            if (formRef.current && (type !== 'live' && type !== 'h5')) {
-              console.log(formRef.current.props.form.getFieldValue('contentType'), '2222')
-              formRef.current.props.form.resetFields(['contentType', []]);
-            }
-          },
-        },
-        rules: [
-          { required: true, message: '是否城市活动' },
-        ],
-      },
-      {
-        label: '发布位置',
-        name: 'showPosition',
-        type: FieldTypes.Select,
-        value: isHaveActive,
-        dict: [{
-          label: '首页',
-          value: 'index',
-        },
-        {
-          label: '项目',
-          value: 'building',
-        }],
-        value: data.showPosition,
-        rules: [
-          { required: true, message: '请选择发布位置' },
-        ],
-      },
-      {
-        label: '所属项目',
-        name: 'buildingId',
-        render: <BuildSelect />,
-        value: data.buildingId,
-        hidden: () => !isHaveActive && isHavePosition,
-        rules: [
-          { required: true, message: '请选择所属项目' },
-        ],
-      },
-      {
-        label: '展示城市',
-        name: 'cityId',
-        render: <CitySelect />,
-        hidden: () => !isHavePosition || isHaveActive,
-        value: data.cityId,
-        rules: [
-          { required: true, message: '请选择展示城市' },
-        ],
-      },
+      // {
+      //   label: '是否关联项目',
+      //   name: 'isHaveActive',
+      //   type: FieldTypes.Switch,
+      //   value: isHaveActive,
+      //   hidden: () => !isCanChoose,
+      //   props: {
+      //     onChange: () => {
+      //       const type = formRef.current.props.form.getFieldValue('contentType')
+      //       if (formRef.current && (type !== 'live' && type !== 'h5')) {
+      //         console.log(formRef.current.props.form.getFieldValue('contentType'), '2222')
+      //         formRef.current.props.form.resetFields(['contentType', []]);
+      //       }
+      //     },
+      //   },
+      //   rules: [
+      //     { required: true, message: '是否城市活动' },
+      //   ],
+      // },
+      // {
+      //   label: '发布位置',
+      //   name: 'showPosition',
+      //   type: FieldTypes.Select,
+      //   value: isHaveActive,
+      //   dict: [{
+      //     label: '首页',
+      //     value: 'index',
+      //   },
+      //   {
+      //     label: '项目',
+      //     value: 'building',
+      //   }],
+      //   value: data.showPosition,
+      //   rules: [
+      //     { required: true, message: '请选择发布位置' },
+      //   ],
+      // },
+      // {
+      //   label: '所属项目',
+      //   name: 'buildingId',
+      //   render: <BuildSelect />,
+      //   value: data.buildingId,
+      //   hidden: () => !isHaveActive && isHavePosition,
+      //   rules: [
+      //     { required: true, message: '请选择所属项目' },
+      //   ],
+      // },
+      // {
+      //   label: '展示城市',
+      //   name: 'cityId',
+      //   render: <CitySelect />,
+      //   hidden: () => !isHavePosition || isHaveActive,
+      //   value: data.cityId,
+      //   rules: [
+      //     { required: true, message: '请选择展示城市' },
+      //   ],
+      // },
       {
         label: '开屏广告',
         name: 'image',
@@ -217,94 +225,100 @@ const createEditor = () => {
           { required: true, message: '请上传图片' },
         ],
       },
+      // {
+      //   label: '类型',
+      //   name: 'contentType',
+      //   type: FieldTypes.Select,
+      //   hidden: () => isHaveActive,
+      //   dict: [{
+      //     label: 'H5活动详情',
+      //     value: 'h5',
+      //   },
+      //   {
+      //     label: '直播活动详情',
+      //     value: 'live',
+      //   },
+      //   {
+      //     label: '其它',
+      //     value: 'others',
+      //   }],
+      //   value: data.contentType,
+      //   rules: [
+      //     { required: true, message: '请选择类型' },
+      //   ],
+      // },
+      // {
+      //   label: '标题',
+      //   name: 'title',
+      //   type: FieldTypes.Text,
+      //   hidden: true,
+      //   value: data.title,
+      //   rules: [
+      //     { required: true, message: '请输入标题' },
+      //   ],
+      // },
       {
         label: '类型',
         name: 'contentType',
+        // hidden: () => !isHaveActive,
         type: FieldTypes.Select,
-        hidden: () => isHaveActive,
-        dict: [{
-          label: 'H5活动详情',
-          value: 'h5',
-        },
-        {
-          label: '直播活动详情',
-          value: 'live',
-        },
-        {
-          label: '其它',
-          value: 'others',
-        }],
-        value: data.contentType,
-        rules: [
-          { required: true, message: '请选择类型' },
-        ],
-      },
-      {
-        label: '标题',
-        name: 'title',
-        type: FieldTypes.Text,
-        hidden: true,
-        value: data.title,
-        rules: [
-          { required: true, message: '请输入标题' },
+        dict: [
+          {
+            label: '公告',
+            value: 'notice'
+          },
+          {
+            label: '服务',
+            value: 'tpNews'
+          },
+          {
+            label: '活动',
+            value: 'activity'
+          },
+          // {
+          //   label: '项目详情',
+          //   value: 'project'
+          // },
+          {
+            label: '资讯',
+            value: 'news'
+          },
+          // {
+          //   label: '拼团活动详情',
+          //   value: 'group'
+          // },
+          // {
+          //   label: '助力活动详情',
+          //   value: 'help'
+          // },
+          // {
+          //   label: 'H5活动详情',
+          //   value: 'h5',
+          // },
+          // {
+          //   label: '在线选房详情',
+          //   value: 'salesBatch',
+          // },
+          // {
+          //   label: '直播活动详情',
+          //   value: 'live',
+          // }
         ],
-      },
-      {
-        label: '类型',
-        name: 'contentType',
-        hidden: () => !isHaveActive,
-        type: FieldTypes.Select,
-        dict: [{
-          label: '报名活动详情',
-          value: 'activity'
-        },
-        {
-          label: '项目详情',
-          value: 'project'
-        },
-        {
-          label: '资讯详情',
-          value: 'news'
-        },
-        {
-          label: '拼团活动详情',
-          value: 'group'
-        },
-        {
-          label: '助力活动详情',
-          value: 'help'
-        },
-        {
-          label: 'H5活动详情',
-          value: 'h5',
-        },
-        {
-          label: '在线选房详情',
-          value: 'salesBatch',
-        },
-        {
-          label: '直播活动详情',
-          value: 'live',
-        },
-        {
-          label: '其它',
-          value: 'others',
-        }],
         value: data.contentType,
         rules: [
           { required: true, message: '请选择类型' },
         ],
       },
-      {
-        label: '发布H5活动',
-        name: 'targetId',
-        render: <SelectH5 buildingId={() => islet ? buildingId : ''} />,
-        hidden: () => !h5Visible,
-        value: data.targetId,
-        rules: [
-          { required: true, message: '请选择发布H5' },
-        ],
-      },
+      // {
+      //   label: '发布H5活动',
+      //   name: 'targetId',
+      //   render: <SelectH5 buildingId={() => islet ? buildingId : ''} />,
+      //   hidden: () => !h5Visible,
+      //   value: data.targetId,
+      //   rules: [
+      //     { required: true, message: '请选择发布H5' },
+      //   ],
+      // },
       {
         label: '发布活动',
         name: 'targetId',
@@ -326,55 +340,75 @@ const createEditor = () => {
         ],
       },
       {
-        label: '发布内容',
-        name: 'content',
-        render: <Wangedit />,
-        value: data.content,
-        hidden: () => !contentVisible,
-        rules: [
-          { required: true, message: '请选择发布内容' },
-        ],
-      },
-      {
-        label: '发布助力',
-        name: 'targetId',
-        render: <SelectHelp buildingId={() => buildingId} />,
-        hidden: () => !helpVisible,
-        value: data.targetId,
-        rules: [
-          { required: true, message: '请选择发布助力' },
-        ],
-      },
-      {
-        label: '发布拼团',
-        name: 'targetId',
-        render: <SelectGroup buildingId={() => buildingId} />,
-        hidden: () => !groupVisible,
-        value: data.targetId,
-        rules: [
-          { required: true, message: '请选择发布拼团' },
-        ],
-      },
-      {
-        label: '发布销售批次',
+        label: '发布公告',
         name: 'targetId',
-        render: <SalesBatchGroup buildingId={() => buildingId} />,
-        hidden: () => !salesBatchVisible,
+        render: <SelectNotice buildingId={() => buildingId} />,
+        hidden: () => !noticeVisible,
         value: data.targetId,
         rules: [
-          { required: true, message: '请选择发布销售批次' },
+          { required: true, message: '请选择发布公告' },
         ],
       },
       {
-        label: '发布直播活动',
+        label: '发布服务',
         name: 'targetId',
-        render: <LiveGroup buildingId={() => islet ? buildingId : ''} />,
-        hidden: () => !liveVisible,
+        render: <SelectTpNews buildingId={() => buildingId} />,
+        hidden: () => !tpNewsVisible,
         value: data.targetId,
         rules: [
-          { required: true, message: '请选择发布直播活动' },
+          { required: true, message: '请选择发布服务' },
         ],
       },
+      // {
+      //   label: '发布内容',
+      //   name: 'content',
+      //   render: <Wangedit />,
+      //   value: data.content,
+      //   hidden: () => !contentVisible,
+      //   rules: [
+      //     { required: true, message: '请选择发布内容' },
+      //   ],
+      // },
+      // {
+      //   label: '发布助力',
+      //   name: 'targetId',
+      //   render: <SelectHelp buildingId={() => buildingId} />,
+      //   hidden: () => !helpVisible,
+      //   value: data.targetId,
+      //   rules: [
+      //     { required: true, message: '请选择发布助力' },
+      //   ],
+      // },
+      // {
+      //   label: '发布拼团',
+      //   name: 'targetId',
+      //   render: <SelectGroup buildingId={() => buildingId} />,
+      //   hidden: () => !groupVisible,
+      //   value: data.targetId,
+      //   rules: [
+      //     { required: true, message: '请选择发布拼团' },
+      //   ],
+      // },
+      // {
+      //   label: '发布销售批次',
+      //   name: 'targetId',
+      //   render: <SalesBatchGroup buildingId={() => buildingId} />,
+      //   hidden: () => !salesBatchVisible,
+      //   value: data.targetId,
+      //   rules: [
+      //     { required: true, message: '请选择发布销售批次' },
+      //   ],
+      // },
+      // {
+      //   label: '发布直播活动',
+      //   name: 'targetId',
+      //   render: <LiveGroup buildingId={() => islet ? buildingId : ''} />,
+      //   hidden: () => !liveVisible,
+      //   value: data.targetId,
+      //   rules: [
+      //     { required: true, message: '请选择发布直播活动' },
+      //   ],
+      // },
       {
         label: '状态',
         name: 'status',

src/pages/property/ticket/Detail.jsx

@@ -1,7 +1,10 @@
 import React, { useEffect, useState } from 'react'
-import { PageHeader, Descriptions, List, Steps, Row, Col, Rate, Button, Statistic } from 'antd'
+import { PageHeader, Descriptions, List, Steps, Row, Col, Rate, Button, Statistic, Modal } from 'antd'
 import { fetch, fetchList, apis } from '@/utils/request'
+import router from 'umi/router'
 import Prompt from '@/components/Prompt'
+import Title from './components/Title'
+import Dispatch from './components/Dispatch'
 
 const TicketTypeDict = {
   '0': '投诉',
@@ -26,10 +29,14 @@ const imgGrid = {
 }
 
 const getTicketDetail = fetch(apis.ticket.ticketEdit)
+const addDispatch = fetch(apis.ticket.addRecord)
+const rejectTicket = fetch(apis.ticket.updateTicketStatus)
 
 export default props => {
   const [loading, setLoading] = useState(false)
   const [showPrompt, setShowPrompt] = useState(false)
+  const [showDispatch, setShowDispatch] = useState(false)
+  const [showReject, setShowReject] = useState(false)
   const [ticketData, setTicketData] = useState({})
   const [approvalProcessList, setApprovalProcessList] = useState([])
 
@@ -40,6 +47,26 @@ export default props => {
 
   const { id } = props.location.query
 
+  const handleDispatchTicket = ({ userId }) => {
+    addDispatch({data: {ticketId: id, id: userId}}).then(res => {
+      Modal.success({
+        content: '分配人员成功',
+        onOk: () => window.location.reload()
+      })
+    })
+
+    setShowDispatch(false)
+  }
+
+  const handleReject = textContent => {
+    rejectTicket({data:{ticketId: id, textContent}}).then(res => {
+      Modal.success({
+        content: '拒绝受理成功',
+        onOk: () => router.go(-1)
+      })
+    })
+  }
+
   useEffect(() => {
     getTicketDetail({data: {id}}).then(res => {
       const { recordList } = res || {}
@@ -69,8 +96,11 @@ export default props => {
             </Descriptions>
           </div>
           <div style={{minWidth: '150px'}}>
-            <Statistic title={<b>费用</b>} prefix="￥" value={125.60} precision={2} />
-            <Button onClick={() => setShowPrompt(true)}>设置费用</Button>
+            {
+              !ticketData.billInvoiceId || !ticketData.isPay ?
+                <Button onClick={() => setShowPrompt(true)}>设置费用</Button> :
+                <Statistic title={<b>费用</b>} prefix="￥" value={ticketData.price || 0} precision={2} />
+            }
             <Prompt visible={showPrompt} onCancel={() => setShowPrompt(false)} placeholder="请填写金额比如: 100.00"></Prompt>
           </div>
         </div>
@@ -89,42 +119,63 @@ export default props => {
         {
           (approvalProcessList || []).map(item => {
             return (
-              <Steps.Step key={item.id} title={item.statusName} subTitle={item.createDate} description={(
-                <div>
-                  {
-                    item.status - 0 === 5 && (
-                      <Descriptions column={2}>
-                        <Descriptions.Item label="评分"><Rate value={item.score}/></Descriptions.Item>
-                        <Descriptions.Item label="时间"><Rate value={item.createDate}/></Descriptions.Item>
-                        <Descriptions.Item label="评语">{item.comment}</Descriptions.Item>
-                      </Descriptions>
-                    )
-                  }
-                  {
-                    item.statusContent && item.statusContent.length && (
-                      item.statusContent.map(ctt => {
-                        return (
-                          <div>
-                            <div>{ `${ctt.userName} : ${ctt.content}` }</div>
-                            {
-                              ctt.imgURL && ctt.imgURL.length && (
-                                <List dataSource={ctt.imgURL} grid={imgGrid} renderItem={it => (
-                                  <List.Item><img src={it.imageUrl} alt="" style={{width: '100%'}} /></List.Item>
-                                )} />
-                              )
-                            }
-                          </div>
-                        )
-                      })
-                    )
-                  }
-                </div>
+              <Steps.Step
+                key={item.id}
+                style={{width: '100%'}}
+                title={(
+                  <Title title={item.statusName}>
+                    {
+                      ticketData.status === '0' && (
+                        <>
+                          <Button type="primary" onClick={() => setShowDispatch(true)}>分配工单</Button>
+                          <Button type="danger" style={{marginLeft: '24px'}} onClick={() => setShowReject(true)}>拒绝受理</Button>
+                        </>
+                      )
+                    }
+                  </Title>
+                )}
+                subTitle={item.createDate}
+                description={(
+                  <div>
+                    {
+                      item.status - 0 === 5 && (
+                        <Descriptions column={2}>
+                          {/* <Descriptions.Item label="评分"><Rate value={item.score}/></Descriptions.Item> */}
+                          <Descriptions.Item label="时间"><Rate value={item.createDate}/></Descriptions.Item>
+                          <Descriptions.Item label="评语">{item.comment}</Descriptions.Item>
+                        </Descriptions>
+                      )
+                    }
+                    {
+                      item.statusContent && item.statusContent.length > 0 && (
+                        item.statusContent.map(ctt => {
+                          return (
+                            <div>
+                              <div>{ `${ctt.userName} : ${ctt.content}` }</div>
+                              {
+                                ctt.imgURL && ctt.imgURL.length > 0 && (
+                                  <List dataSource={ctt.imgURL} grid={imgGrid} renderItem={it => (
+                                    <List.Item><img src={it.imageUrl} alt="" style={{width: '100%'}} /></List.Item>
+                                  )} />
+                                )
+                              }
+                            </div>
+                          )
+                        })
+                      )
+                    }
+                  </div>
               )}/>
             )
           })
         }
         </Steps>
       </div>
+
+      {/* 工单分配 */}
+      <Dispatch visible={showDispatch} userList={ticketData.tpUsersList} onSubmit={handleDispatchTicket} onCancel={() => setShowDispatch(false)} />
+      {/* 拒绝原因 */}
+      <Prompt visible={showReject} onCancel={() => setShowReject(false)} onOk={handleReject} placeholder="请填写拒绝原因"></Prompt>
     </div>
   )
 }

src/pages/property/ticket/components/Dispatch.jsx

@@ -0,0 +1,35 @@
+import React, { useEffect, useState } from 'react'
+import { Form, Modal, Select, Button } from 'antd'
+
+export default Form.create()(props => {
+  const [userId, setUserId] = useState()
+
+  const handleSubmit = e => {
+    e.preventDefault()
+    props.onSubmit({userId})
+    // props.form.validateFields((err, values) => {
+    //   if (!err) {
+    //     props.onSubmit(...values)
+    //   }
+    // })
+  }
+
+
+  return (
+    <Modal  footer={null} maskClosable={false} onCancel={props.onCancel} visible={props.visible}>
+      <Form onSubmit={handleSubmit}>
+        <Form.Item label="选择受理人">
+          <Select onChange={e => setUserId(e)}>
+            {
+              (props.userList || []).map(user => (<Select.Option key={user.userId} value={user.userId}>{user.userName}</Select.Option>))
+            }
+          </Select>
+        </Form.Item>
+        <Form.Item>
+          <Button type="primary" htmlType="submit">确定</Button>
+          <Button onClick={props.onCancel} style={{ marginLeft: '48px' }}>取消</Button>
+        </Form.Item>
+      </Form>
+    </Modal>
+  )
+})

src/pages/property/ticket/components/Title.jsx

@@ -0,0 +1,10 @@
+import React, { useEffect, useState } from 'react'
+
+export default props => {
+  return (
+    <div style={{display: 'flex', minWidth: '100%'}}>
+      <div>{props.title}</div>
+      <div style={{flex: 1, padding: '0 16px'}}>{props.children}</div>
+    </div>
+  )
+}