Merge branch 'master' of http://git.ycjcjy.com/xiangsong/xs-manage

src/pages/news/list/NewsList.jsx

@@ -232,12 +232,12 @@ function body(props) {
 
           <p style={{ fontSize: ' 0.106rem', color: '#555', marginBottom: '8px', display: 'flex', alignItems: 'center' }}>
             <span style={{ display: 'inline-block', width: '50%', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>阅读数量：{data.pvNum}</span>
-            <span>转发数量：{data.shareNum}</span>
+            {/* <span>转发数量：{data.shareNum}</span> */}
           </p>
 
           <p style={{ fontSize: ' 0.106rem', color: '#555', marginBottom: '8px', display: 'flex', alignItems: 'center' }}>
-            {/* <span style={{ display: 'inline-block', width: '50%', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>点赞数量：{data.favorNum}</span> */}
-            <span>收藏数量：{data.saveNum}</span>
+            {/* <span style={{ display: 'inline-block', width: '50%', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>点赞数量：{data.favorNum}</span>
+            <span>收藏数量：{data.saveNum}</span> */}
           </p>
 
           <p style={{ fontSize: ' 0.106rem', color: '#999', marginBottom: '8px' }}>发布时间：{moment(data.createDate).format('YYYY-MM-DD HH:mm:ss')}</p>

src/pages/property/bill/info/index.jsx

@@ -1,5 +1,6 @@
 import React, { useEffect, useRef, useState } from 'react'
 import { PageHeader, Button, Descriptions, Typography, Select, Icon, Table, Modal, Form, Input, Popconfirm, Divider, notification } from 'antd'
+import moment from 'moment'
 import { fetch, fetchList, apis } from '@/utils/request'
 import NavLink from 'umi/navlink'
 import Prompt from '@/components/Prompt'
@@ -315,9 +316,9 @@ export default props => {
           <Table.Column title="缴费途径" dataIndex="payType" key="payType" render={t => getDictLabel(PayTypeDict, t)} />
           <Table.Column title="缴费人" dataIndex="payName" key="payName" />
           <Table.Column title="缴费时间" dataIndex="payDate" key="payDate" />
-          <Table.Column title="新建时间" dataIndex="createDate" key="createDate" />
+          <Table.Column title="新建时间" dataIndex="createDate" key="createDate" render={t => moment(t).format('YYYY-MM-DD HH:mm')} />
           <Table.Column title="新建人" dataIndex="createUserName" key="createUserName" />
-          <Table.Column title="修改时间" dataIndex="updateDate" key="updateDate" />
+          <Table.Column title="修改时间" dataIndex="updateDate" key="updateDate" render={t => moment(t).format('YYYY-MM-DD HH:mm')}/>
           <Table.Column title="修改人" dataIndex="updateUserName" key="updateUserName" />
           <Table.Column
             title="操作"

src/pages/property/message/event/Editor.jsx

@@ -26,7 +26,7 @@ const tailFormItemLayout = {
 }
 
 export default Form.create()(props => {
-  const [evtType, setEvtType] = useState()
+  const [evtType, setEvtType] = useState('festival')
 
   const handleSubmit = e => {
     e.preventDefault()
@@ -34,7 +34,8 @@ export default Form.create()(props => {
       if (!err) {
         props.onSubmit({
           ...(props.dataSource || {}),
-          ...values
+          ...values,
+          evtType,
         })
       }
     })
@@ -44,15 +45,15 @@ export default Form.create()(props => {
     if (props.visible) {
       const data = props.dataSource || {}
       props.form.setFieldsValue(data)
-      setEvtType(data.evtType)
+      // setEvtType(data.evtType)
     }
   }, [props.dataSource, props.visible])
 
   return (
     <Modal  footer={null} maskClosable={false} onCancel={props.onCancel} visible={props.visible}>
       <Form onSubmit={handleSubmit} {...formItemLayout}>
-        <Form.Item label="类型">
-          {
+        <Form.Item label="类型">节日
+          {/* {
             props.form.getFieldDecorator('evtType', {
               rules: [{required: true, message: '请选择类型'}]
             })(
@@ -61,7 +62,7 @@ export default Form.create()(props => {
                 <Select.Option value="birthday">生日</Select.Option>
               </Select>
             )
-          }
+          } */}
         </Form.Item>
         <Form.Item label="名称">
           {
@@ -72,9 +73,11 @@ export default Form.create()(props => {
         </Form.Item>
         {
           evtType === 'festival' &&
-          <Form.Item label="发生日" help="mm-dd格式">
+          <Form.Item label="发生日" help="格式示例: 06-01">
             {
-              props.form.getFieldDecorator('evtDate')(<Input placeholder="mm-dd格式" />)
+              props.form.getFieldDecorator('evtDate', {
+                rules: [{required: true, message: '请填写发生日期'}]
+              })(<Input placeholder="格式示例: 08-15" />)
             }
           </Form.Item>
         }
@@ -82,7 +85,9 @@ export default Form.create()(props => {
           evtType === 'festival' &&
           <Form.Item label="是否阳历">
             {
-              props.form.getFieldDecorator('isSolar')(
+              props.form.getFieldDecorator('isSolar', {
+                rules: [{required: true, message: '请选择阴阳历'}]
+              })(
                 <Radio.Group>
                   <Radio value={true}>阳历</Radio>
                   <Radio value={false}>阴历</Radio>
@@ -91,11 +96,11 @@ export default Form.create()(props => {
             }
           </Form.Item>
         }
-        <Form.Item label="祝福语">
+        <Form.Item label="祝福语" help="示例: 祝您中秋节快乐">
           {
             props.form.getFieldDecorator('wishes', {
               rules: [{required: true, message: '请填写祝福语'}]
-            })(<Input placeholder="建议4-12个字, 比如祝您中秋节快乐" />)
+            })(<Input placeholder="建议4-12个字" />)
           }
         </Form.Item>
         <Form.Item {...tailFormItemLayout}>

src/pages/property/message/event/components/Preview.jsx

@@ -0,0 +1,37 @@
+import React, { useEffect, useState } from 'react'
+import moment from 'moment'
+import { Modal } from 'antd'
+import Styles from './style.less'
+
+export default props => {
+  const baseURL = props.dataSource.evtType === 'birthday'
+    ? 'https://xs.ycjcjy.com/shengrih5.html'
+    : 'https://xs.ycjcjy.com/jierih5.html'
+
+  const queryString = [
+    `name=${encodeURIComponent(' 张xx (先生)')}`,
+    `date=${moment().format('YYYY-MM-DD')}`,
+    `org=${encodeURIComponent(props.dataSource.org || '')}`,
+    `festival=${encodeURIComponent(props.dataSource.name || '')}`,
+  ].join('&')
+
+  const url = [baseURL, queryString].join('?')
+
+  return (
+    <Modal
+      title="祝福模板预览"
+      width={423}
+      visible={props.visible}
+      footer={null}
+      onOk={props.onOk}
+      onCancel={props.onCancel}
+    >
+      <iframe
+        src={url}
+        frameborder="0"
+        scrolling="no"
+        className={Styles['message-tpl-preview']}
+      />
+    </Modal>
+  )
+}

src/pages/property/message/event/components/style.less

@@ -0,0 +1,12 @@
+.message-tpl-preview {
+  width: 375px;
+  height: 667px;
+  top: 0;
+  left: 0;
+  overflow: hidden;
+  scrollbar-width: none;
+
+  &::-webkit-scrollbar {
+    display: none;
+  }
+}

src/pages/property/message/event/index.jsx

@@ -1,10 +1,12 @@
 import React, { useState, useEffect, useRef } from 'react'
 import { Select, Spin, Table, Button, Form, Input, Divider, Tag, Modal,Popconfirm } from 'antd'
+import { connect } from 'dva';
 import NavLink from 'umi/navlink'
 import { fetch, apis, fetchList } from '@/utils/request'
 import Search from '../../components/Search'
 import List from '../../components/List'
 import Editor from './Editor'
+import Preview from './components/Preview'
 
 const listMessageEvent = fetchList(apis.announcement.messageEvent.list)
 const saveMessageEvent = fetch(apis.announcement.messageEvent.save)
@@ -57,12 +59,14 @@ const Condition = props => {
   )
 }
 
-export default props => {
+export default connect(({user}) => ({user}))(props => {
   const [loading, setLoading] = useState(false)
   const [listData, setListData] = useState([])
   const [pagination, setPagination] = useState({})
   const [queryParams, setQueryParams] = useState({ pageNum: 1, pageSize: 10 })
   const [showEditor, setShowEditor] = useState(false)
+  const [showPreview, setShowPreview] = useState(false)
+  const currentRow = useRef({})
 
   const handleSearch = vals => {
     setQueryParams({
@@ -72,6 +76,14 @@ export default props => {
     })
   }
 
+  const handleNameClick = row => {
+    currentRow.current = {
+      ...row,
+      org: props.user.currentUser.orgName
+    }
+    setShowPreview(true)
+  }
+
   const handleSubmit = data => {
     saveMessageEvent({data}).then(res => {
       Modal.success({
@@ -90,7 +102,7 @@ export default props => {
     const data = {...row, status}
     updateMessageEvent({data, urlData: {id: row.evtId}}).then(res => {
       Modal.success({
-        content: '删除内容成功',
+        content: '操作成功',
         onOk: () => {
           // 触发数据刷新
           setQueryParams({...queryParams})
@@ -100,7 +112,7 @@ export default props => {
   }
 
   const handleDeleteRow = row => {
-    deleteAnnouncement({urlData: {id: row.evtId}}).then(res => {
+    deleteMessageEvent({urlData: {id: row.evtId}}).then(res => {
       Modal.success({
         content: '删除内容成功',
         onOk: () => {
@@ -137,7 +149,9 @@ export default props => {
       </div>
       <List dataSource={listData} loading={loading} pagination={pagination} onPageChange={handlePageChange} rowKey="evtId">
         <Table.Column title="类型" dataIndex="evtType" key="evtType" render={t => EvtTypeDict[t] || ''} />
-        <Table.Column title="名称" dataIndex="name" key="name" />
+        <Table.Column title="名称" dataIndex="name" key="name" render={(t, row) => {
+          return <Button type="link" onClick={() => handleNameClick(row)}>{t}</Button>
+        }} />
         <Table.Column title="发生日" dataIndex="evtDate" key="evtDate" render={(_, row) => {
           return row.evtDate && (
             <span>
@@ -156,15 +170,21 @@ export default props => {
           render={(_, row) => {
             return (
               <>
-                <Popconfirm
-                  title="确认进行作废操作?"
-                  onConfirm={() => handleDeleteRow(row)}
-                  okText="作废"
-                  cancelText="取消"
-                >
-                  <Button type="link">删除</Button>
-                </Popconfirm>
-                <Divider type="vertical" />
+                {
+                  row.evtType !== 'birthday' && (
+                    <>
+                      <Popconfirm
+                        title="确认进行删除操作?"
+                        onConfirm={() => handleDeleteRow(row)}
+                        okText="删除"
+                        cancelText="取消"
+                      >
+                        <Button type="link">删除</Button>
+                      </Popconfirm>
+                      <Divider type="vertical" />
+                    </>
+                  )
+                }
                 <Button type="link" onClick={() => handleEdit(row)}>{row.status === 1 ? '取消发布' : '发布'}</Button>
               </>
             )
@@ -172,6 +192,7 @@ export default props => {
         />
       </List>
       <Editor visible={showEditor} onCancel={() => setShowEditor(false)} onSubmit={handleSubmit} />
+      <Preview visible={showPreview} dataSource={currentRow.current} onOk={() => setShowPreview(false)} onCancel={() => setShowPreview(false)} />
     </div>
   )
-}
+})

src/pages/property/news/type/NewsType.jsx

@@ -58,7 +58,7 @@ function NewsType(props) {
 
 
   const changeNewsStatus = (row, newsId) => () => {
-    request({ ...propNews.newsType.put, urlData: { id: newsId }, data: { ...row, status: -1 } }).then((data) => {
+    request({ ...apis.propNews.newsType.put, urlData: { id: newsId }, data: { ...row, status: -1 } }).then((data) => {
       message.info('操作成功！')
       getList({ pageNum: 1, pageSize: 10 });
     }).catch((err) => {

src/pages/property/notice/Edit.jsx

@@ -89,7 +89,8 @@ export default Form.create()(props => {
         <Form.Item label="类型">
         {
           getFieldDecorator('annType')(
-            <Select style={{}} allowClear>
+            <Select allowClear>
+              <Select.Option value={undefined}></Select.Option>
               <Select.Option value="notice">提醒</Select.Option>
             </Select>
           )

src/pages/property/notice/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react'
-import { Select, Spin, Table, Button, Form, Input, Divider, Modal,Popconfirm } from 'antd'
+import { Select, Spin, Table, Button, Form, Input, Divider, Modal,Popconfirm, notification } from 'antd'
 import NavLink from 'umi/navlink'
 import { fetch, apis } from '@/utils/request'
 import Search from '../components/Search'
@@ -7,6 +7,7 @@ import List from '../components/List'
 
 const listAnnouncement = fetch(apis.announcement.listAnnouncement)
 const deleteAnnouncement = fetch(apis.announcement.deleteAnnouncement)
+const updateannouncement = fetch(apis.announcement.updateannouncement)
 
 const Condition = props => {
   return (
@@ -46,7 +47,7 @@ const Condition = props => {
 }
 
 const StatusDict = {
-  '0': '已作废',
+  '0': '未发布',
   '1': '已发布',
   '2': '草稿'
 }
@@ -65,15 +66,13 @@ export default props => {
     })
   }
 
-  const handleDeleteRow = row => {
-    deleteAnnouncement({ data: [row.id] }).then(res => {
-      Modal.success({
-        content: '删除内容成功',
-        onOk: () => {
-          // 触发数据刷新
-          setQueryParams({...queryParams})
-        }
-      })
+  const handleEditRow = row => {
+    updateannouncement({data: {
+      ...row,
+      status: Math.abs(row.status - 1)
+    }}).then(res => {
+      notification.success({message: '操作成功'})
+      setQueryParams({...queryParams})
     })
   }
 
@@ -88,7 +87,6 @@ export default props => {
   useEffect(() => {
     setLoading(true)
     listAnnouncement({ data: queryParams }).then(res => {
-      console.log(res,"222")
       const { list, ...pageInfo } = res || {}
       setListData(list)
       setPagination(pageInfo)
@@ -124,13 +122,7 @@ export default props => {
           title="状态"
           dataIndex="status"
           key="status"
-          render={(_, row) => {
-            if (row.status === '1' && (row.updateDate > row.createDate)) {
-              return '已修改'
-            }
-
-            return StatusDict[row.status]
-          }}
+          render={(_, row) => StatusDict[row.status]}
         />
         <Table.Column title="创建时间" dataIndex="createDate" key="createDate" />
         {/* <Table.Column title="发布人" dataIndex="createUserName" key="createUserName" />
@@ -143,12 +135,12 @@ export default props => {
             return (
               <>
                 <Popconfirm
-                  title="确认进行作废操作?"
-                  onConfirm={() => handleDeleteRow(row)}
-                  okText="作废"
+                  title="确认进行当前操作?"
+                  onConfirm={() => handleEditRow(row)}
+                  okText="确定"
                   cancelText="取消"
                 >
-                  <Button type="link">删除</Button>
+                  <Button type="link">{row.status === '1' ? '取消发布' : '发布'}</Button>
                 </Popconfirm>
                 <Divider type="vertical" />
                 <NavLink to={`/property/notice/edit?id=${row.id}`}>

src/pages/property/proprietor/Add.jsx

@@ -166,7 +166,8 @@ export default Form.create()(props => {
           }
         </Form.Item>
         <Form.Item label="身份">
-          {
+          户主
+          {/* {
             props.form.getFieldDecorator('roleId')(
               <Select style={{ minWidth: '120px' }} placeholder="请选择身份">
                 <Select.Option value="1" disabled={owerExist}>户主</Select.Option>
@@ -174,7 +175,7 @@ export default Form.create()(props => {
                 <Select.Option value="3">家属</Select.Option>
               </Select>
             )
-          }
+          } */}
         </Form.Item>
         <Form.Item label="姓名">
           {

src/pages/property/ticket/Detail.jsx

@@ -172,7 +172,7 @@ export default props => {
                 title={(
                   <Title title={item.statusName}>
                     {
-                      item.status === '0' && (
+                      ticketData.status === '0' && (
                         <>
                           <Button type="primary" onClick={() => setShowDispatch(true)}>分配工单</Button>
                           <Button type="danger" style={{marginLeft: '24px'}} onClick={() => setShowReject(true)}>拒绝受理</Button>
@@ -189,9 +189,9 @@ export default props => {
                     {
                       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 label="评分"><Rate disabled value={ticketData.score - 0}/></Descriptions.Item>
+                          {/* <Descriptions.Item label="时间"><div>{item.createDate}</div></Descriptions.Item> */}
+                          <Descriptions.Item label="评语">{ticketData.comment}</Descriptions.Item>
                         </Descriptions>
                       )
                     }