feats

config/routes.js

                 hideInMenu: true,
               },
               {
-                path: 'bill/ticket',
+                path: 'repair-type',
+                name: '工单分类',
+                component: './property/ticket/type',
+              },
+              {
+                path: 'repair-type/edit',
+                name: '分类详情',
+                component: './property/ticket/type/Editor',
+                hideInMenu: true,
+              },
+              {
+                path: 'ticket',
                 name: '工单管理',
                 component: './property/ticket',
               },
               {
-                path: 'bill/ticket/detail',
+                path: 'ticket/detail',
                 name: '工单详情',
                 component: './property/ticket/Detail',
                 hideInMenu: true,

src/components/EditableTagGroup/index.jsx

+import React, { useEffect, useRef, useState } from 'react'
+import { Tag, Input, Tooltip, Icon } from 'antd'
+
+export default React.forwardRef((props,ref) => {
+  const [tags, setTags] = useState([])
+  const [inputVisible, setInputVisible] = useState(false)
+  const [inputValue, setInputValue] = useState()
+  const inputRef = useRef()
+  const dataInited = useRef(false)
+
+  const handleClose = removedTag => {
+    const newTags = tags.filter(tag => tag !== removedTag)
+    setTags(newTags)
+  }
+
+  const handleInputChange = e => {
+    setInputValue(e.target.value)
+  }
+
+  const handleInputConfirm = () => {
+    if (inputValue && tags.indexOf(inputValue) === -1) {
+      const newTags = [...tags, inputValue]
+      setTags(newTags)
+      setInputValue()
+    }
+  }
+
+  const showInput = () => {
+    setInputVisible(true)
+    if (inputRef.current) {
+      inputRef.current.focus()
+    }
+  }
+
+  // 如果 prop.value 有更新
+  useEffect(() => {
+    if (props.value && !dataInited.current) {
+      setTags((props.value || '').split(',').filter(Boolean))
+      dataInited.current = true
+    }
+  }, [props.value])
+  
+  // 如果 tag 有更新
+  useEffect(() => {
+    const newValue = tags.join(',')
+    if (props.value != newValue) {
+      props.onChange && props.onChange(newValue)
+    }
+  }, [tags, props.value])
+
+  return (
+    <div ref={ref}>
+      {tags.map(tag => {
+        const isLongTag = tag.length > 20
+        const tagElem = (
+          <Tag key={tag} closable onClose={() => handleClose(tag)}>
+            {isLongTag ? `${tag.slice(0, 20)}...` : tag}
+          </Tag>
+        )
+        return isLongTag ? (
+          <Tooltip title={tag} key={tag}>
+            {tagElem}
+          </Tooltip>
+        ) : (
+          tagElem
+        )
+      })}
+      {inputVisible && (
+        <Input
+          ref={inputRef}
+          type="text"
+          size="small"
+          style={{ width: 78 }}
+          value={inputValue}
+          onChange={handleInputChange}
+          onBlur={handleInputConfirm}
+          onPressEnter={handleInputConfirm}
+        />
+      )}
+      {!inputVisible && (
+        <Tag onClick={showInput} style={{ background: '#fff', borderStyle: 'dashed' }}>
+          <Icon type="plus" /> 新建
+        </Tag>
+      )}
+    </div>
+  )
+})

src/pages/property/building/BatchImport.jsx

 import React, { useRef, useState } from 'react'
-import { Button, Spin, Table, Icon, notification } from 'antd'
+import { Button, Spin, Table, Icon, notification, Modal } from 'antd'
 import router from 'umi/router'
 import { fetch, apis } from '@/utils/request'
 
 
     setLoading(true)
     submitBuildingTreeExcel({ data: formData }).then(res => {
-      notification.success({ message: '提交成功' })
+      
+      Modal.success({
+        title: '提交成功',
+        onOk: () => router.go(-1)
+      })
 
       setLoading(false)
     }).catch(() => {

src/pages/property/ticket/index.jsx

           key="ticketTitle"
           render={(_, row) => {
             return (
-              <NavLink to={`/property/bill/ticket/detail?id=${row.id}`}>
+              <NavLink to={`/property/ticket/detail?id=${row.id}`}>
                 <Button type="link">{row.ticketTitle}</Button>
               </NavLink>
             )

src/pages/property/ticket/type/Editor.jsx

+import React, { useEffect, useState } from 'react'
+import { Form, Input, Button, Radio, InputNumber, notification, Select } from 'antd'
+import router from 'umi/router'
+import { fetch, apis } from '@/utils/request'
+import ImageUpload from '@/components/uploadImage/ImageUpload'
+import EditableTagGroup from '@/components/EditableTagGroup'
+
+const formItemLayout = {
+  labelCol: {
+    xs: { span: 24 },
+    sm: { span: 6 },
+  },
+  wrapperCol: {
+    xs: { span: 24 },
+    sm: { span: 12 },
+  },
+}
+
+const tailFormItemLayout = {
+  wrapperCol: {
+    xs: {
+      span: 24,
+      offset: 0,
+    },
+    sm: {
+      span: 16,
+      offset: 6,
+    },
+  },
+}
+
+const getDetail = fetch(apis.ticket.repairType.getDetail)
+const saveType = fetch(apis.ticket.repairType.saveType)
+const updateType = fetch(apis.ticket.repairType.updateType)
+
+export default Form.create()(props => {
+  const [loading, setLoading] = useState(false)
+  const [detailData, setDetailData] = useState({})
+
+  const { id } = props.location.query
+  
+  const handleSubmit = e => {
+    // e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        setLoading(true)
+        if (id) {
+          const data = {
+            ...(detailData || {}),
+            ...values,
+          }
+          updateType({data, urlData: {id}}).then(res => {
+            notification.success({ message: "修改内容成功" })
+            setLoading(false)
+          }).catch(err => {
+            setLoading(false)
+          })
+        } else {
+          saveType({data: values}).then(res => {
+            notification.success({ message: "保存内容成功" })
+            setLoading(false)
+            router.go(-1)
+          }).catch(err => {
+            setLoading(false)
+          })
+        }
+      }
+    });
+  }
+
+  useEffect(() => {
+    if (id) {
+      getDetail({urlData: {id}}).then(res => {
+        setDetailData(res)
+        props.form.setFieldsValue(res)
+      })
+    }
+  }, [id])
+  
+  return (
+    <div>
+      <Form {...formItemLayout} onSubmit={e => e.preventDefault()}>
+        <Form.Item label="名称">
+          {
+            props.form.getFieldDecorator('typeName', {
+              rules: [
+                { required: true, message: '请填写名称' },
+              ],
+            })(<Input placeholder="名称" />)
+          }
+        </Form.Item>
+        <Form.Item label="图标">
+          {
+            props.form.getFieldDecorator('icon')(<ImageUpload />)
+          }
+        </Form.Item>
+        <Form.Item label="快捷提问">
+          {
+            props.form.getFieldDecorator('tags')(<EditableTagGroup />)
+          }
+        </Form.Item>
+        <Form.Item label="排序">
+          {
+            props.form.getFieldDecorator('sortNum')(<InputNumber min={1} />)
+          }
+        </Form.Item>
+        <Form.Item label="状态">
+          {
+            props.form.getFieldDecorator('status')(
+              <Radio.Group>
+                <Radio value={0}>未发布</Radio>
+                <Radio value={1}>已发布</Radio>
+              </Radio.Group>
+            )
+          }
+        </Form.Item>
+        <Form.Item {...tailFormItemLayout} >
+          <Button loading={loading} type="primary" onClick={handleSubmit}>提交</Button>
+          <Button style={{ marginLeft: '24px' }} onClick={() => router.go(-1)}>取消</Button>
+        </Form.Item>
+      </Form>
+    </div>
+  )
+})

src/pages/property/ticket/type/index.jsx

+import React, { useState, useEffect } from 'react'
+import { Select, Spin, Table, Button, Form, Input, Divider, Popconfirm, Typography, notification } from 'antd'
+import NavLink from 'umi/navlink'
+import { fetchList, apis, fetch } from '@/utils/request'
+import Search from '../../components/Search'
+import List from '../../components/List'
+
+const StatusDict = [
+  {
+    label: '未发布',
+    value: 0,
+  },
+  {
+    label: '已发布',
+    value: 1,
+  },
+]
+
+const getDictValue = (dict, val) => (dict.filter(x => x.value === val)[0] || {}).label
+
+const getList = fetchList(apis.ticket.repairType.getList)
+const deleteType = fetch(apis.ticket.repairType.deleteType)
+
+export default props => {
+  const [loading, setLoading] = useState(false)
+  const [listData, setListData] = useState([])
+  const [pagination, setPagination] = useState({})
+  const [queryParams, setQueryParams] = useState({ pageNum: 1, pageSize: 10 })
+
+  const handlePageChange = (pageNum, pageSize) => {
+    setQueryParams({
+      ...queryParams,      
+      pageNum,
+      pageSize,
+    })
+  }
+
+  const handleDeleteRow = row => {
+    deleteType({urlData: {id: row.typeId}}).then(res => {
+      notification.success({message: '删除数据成功'})
+      setQueryParams({...queryParams})
+    })
+  }
+
+  useEffect(() => {
+    setLoading(true)
+    getList({params: queryParams}).then(res => {
+      const [list, pagi] = res
+      setListData(list)
+      setPagination(pagi)
+      setLoading(false)
+    }).catch(e => setLoading(false))
+  }, [queryParams])
+
+  return (
+    <div>
+      <div style={{ margin: '24px 0' }}>
+        <NavLink to={`/property/repair-type/edit`}>
+          <Button type="primary">添加</Button>
+        </NavLink>
+      </div>
+      <List dataSource={listData} loading={loading} pagination={pagination} onPageChange={handlePageChange} rowKey="typeId">
+        <Table.Column title="名称" dataIndex="typeName" key="typeName" />
+        <Table.Column
+          title="图标"
+          dataIndex="icon"
+          key="icon"
+          render={x => <img src={x} alt="" style={{width: '64px', height: '64px'}} />}
+        />
+        <Table.Column title="状态" dataIndex="status" key="status" render={x => getDictValue(StatusDict, x)} />
+        <Table.Column title="创建时间" dataIndex="createdTime" key="createdTime" />
+        <Table.Column title="最近操作时间" dataIndex="updatedTime" key="updatedTime" />
+        <Table.Column
+          title="操作"
+          key="action"
+          render={(_, row) => {
+            return (
+              <>
+                <Popconfirm
+                  title="确认进行删除操作?"
+                  onConfirm={() => handleDeleteRow(row)}
+                  okText="删除"
+                  cancelText="取消"
+                >
+                  <Button type="link">删除</Button>
+                </Popconfirm>
+                <Divider type="vertical" />
+                <NavLink to={`/property/repair-type/edit?id=${row.typeId}`}>
+                  <Button type="link">编辑</Button>
+                </NavLink>
+              </>
+            )
+          }}
+        />
+      </List>
+
+    </div>
+  )
+}

src/pages/staff/list/editStaff.jsx

       type: FieldTypes.Text,
       placeholder: '请输入职位',
       value: userData.position,
-      rules: [
-        { required: true, message: '请输入职位' },
-      ]
+      // rules: [
+      //   { required: true, message: '请输入职位' },
+      // ]
     },
     {
-      label: '是否生活顾问',
-      name: 'isConsultant',
-      type: FieldTypes.Switch,
-      value: userData.isConsultant,
-      props: {disabled: userData.isConsultant},
+      label: '工号',
+      name: 'jobNumber',
+      type: FieldTypes.Text,
+      placeholder: '请输入工号',
+      value: userData.jobNumber,
+    },
+    // {
+    //   label: '是否生活顾问',
+    //   name: 'isConsultant',
+    //   type: FieldTypes.Switch,
+    //   value: userData.isConsultant,
+    //   props: {disabled: userData.isConsultant},
+    // },
+    {
+      label: '身份',
+      name: 'type',
+      type: FieldTypes.Select,
+      placeholder: '请选择身份',
+      value: userData.type,
+      rules: [
+        { required: true, message: '请选择身份' },
+      ],
+      dict: [
+        {
+          label: '生活管家',
+          value: 'life-consultant'
+        },
+        {
+          label: '物业相关',
+          value: 'prop'
+        },
+        {
+          label: '维修工人',
+          value: 'worker'
+        },
+      ]
     },
     {
       label: '电话',
         },
       ]
     },
+    {
+      label: '头像',
+      name: 'photo',
+      type: FieldTypes.ImageUploader,
+      extra: '建议图片尺寸：320*320px，比例1:1,格式：jpg，用于置业顾问头像,限制大小：100k',
+      value: userData.photo,
+      beforeUpload: (e) => photoBeforeUpload(e),
+      rules: [
+        { required: true, message: '请选择头像' },
+      ]
+    },
+    {
+      label: '简介',
+      name: 'description',
+      render: <TextArea className={channels.inpuitTxt} placeholder="生活管家请在此填写服务范围" ></TextArea>,
+      value: userData.description
+
+    },
+    {
+      label: '状态',
+      name: 'status',
+      render: <Radio.Group initialValue="1" buttonStyle="solid">
+        <Radio.Button value="9">禁用</Radio.Button>
+        <Radio.Button value="1">启用</Radio.Button>
+      </Radio.Group>,
+      value: userData.status != null ? userData.status.toString() : "1"
+    },
+    {
+      label: '权重',
+      name: 'weight',
+      type: FieldTypes.Number,
+      render: <Input type="number" style={{ width: 150}} />,
+      value: userData.weight,
+      help: '数字越大越靠前',
+    },
     {
       label: '登录名',
       name: 'loginName',
     //     { required: true, message: '请选择授权项目' },
     //   ]
     // },
-    {
-      label: '生活顾问头像',
-      name: 'photo',
-      type: FieldTypes.ImageUploader,
-      extra: '建议图片尺寸：320*320px，比例1:1,格式：jpg，用于置业顾问头像,限制大小：100k',
-      value: userData.photo,
-      beforeUpload: (e) => photoBeforeUpload(e),
-      rules: [
-        { required: true, message: '请选择头像' },
-      ]
-    },
-    {
-      label: '简介',
-      name: 'description',
-      render: <TextArea className={channels.inpuitTxt} ></TextArea>,
-      value: userData.description
-
-    },
-    {
-      label: '状态',
-      name: 'status',
-      render: <Radio.Group initialValue="1" buttonStyle="solid">
-        <Radio.Button value="9">禁用</Radio.Button>
-        <Radio.Button value="1">启用</Radio.Button>
-      </Radio.Group>,
-      value: userData.status != null ? userData.status.toString() : "1"
-    },
-    {
-      label: '权重',
-      name: 'weight',
-      type: FieldTypes.Number,
-      render: <Input type="number" style={{ width: 150}} />,
-      value: userData.weight,
-      help: '数字越大越靠前',
-    },
   ]
 
   console.log('--------->', fields)

src/services/ticket_api.js

       url: `${prefix}/endTicket`,
       method: 'post',
       action: 'admin.ticket.endTicket'
+    },
+
+    repairType: {
+      getList: {
+        url: `${prefix}/tpRepairType`,
+        method: 'get',
+        action: 'admin.tpRepairType.list'
+      },
+      saveType: {
+        url: `${prefix}/tpRepairType`,
+        method: 'post',
+        action: 'admin.tpRepairType.save'
+      },
+      updateType: {
+        url: `${prefix}/tpRepairType/:id`,
+        method: 'put',
+        action: 'admin.tpRepairType.update'
+      },
+      deleteType: {
+        url: `${prefix}/tpRepairType/:id`,
+        method: 'delete',
+        action: 'admin.tpRepairType.delete'
+      },
+      getDetail: {
+        url: `${prefix}/tpRepairType/:id`,
+        method: 'get',
+        action: 'admin.tpRepairType.get'
+      },
+
     }
   }
 }