Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager into dev

src/pages/activity/detailActivity.jsx

@@ -114,6 +114,7 @@ const BasicForm = props => {
       <Form {...formItemLayout} onSubmit={handleSubmit}>
         <Form.Item label="所属项目">
         {getFieldDecorator('buildingId', {
+          initialValue: detailData.buildingId,
           rules: [
             {
               required: true,

src/pages/activity/drainage/DrainageList.jsx

@@ -306,14 +306,12 @@ const header = (props) => {
         )}
       </Form.Item>
       <Form.Item label="下架时间">
-        {getFieldDecorator('endDate',{initialValue : formsdate.endDate ? moment(formsdate.endDate, 'YYYY-MM-DD HH:mm') : null,
+        {getFieldDecorator('endDate',{initialValue : formsdate.endDate ? moment(formsdate.endDate, 'YYYY-MM-DD HH:mm:ss') : null,
           rules: [
             { required: true, message: '请输入下架时间' },
           ]})(
           <DatePicker
-          // prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-          // placeholder={formsdate.endDate}
-          // value= formsdate.endDate ? moment(formsdate.endDate, 'YYYY-MM-DD HH:mm') : null
+          showTime={{ format: 'HH:mm:ss' }}
           />,
         )}
       </Form.Item>

src/pages/activity/groupActivity/detailActivity.jsx

@@ -98,6 +98,7 @@ const BasicForm = props => {
       <Form {...formItemLayout} onSubmit={handleSubmit}>
         <Form.Item label="所属项目">
         {getFieldDecorator('buildingId', {
+          initialValue: detailData.buildingId,
           rules: [
             {
               required: true,

src/pages/activity/helpActivity/detailActivity.jsx

@@ -95,6 +95,7 @@ const BasicForm = props => {
       <Form {...formItemLayout} onSubmit={handleSubmit}>
         <Form.Item label="所属项目">
         {getFieldDecorator('buildingId', {
+          initialValue: detailData.buildingId,
           rules: [
             {
               required: true,