Ver código fonte

审批界面时分秒处理,还原兼容性问题

zhouy 3 anos atrás
pai
commit
04b67bf20d

+ 5 - 7
uas-office-web/wxuasapproval/src/components/tableItem/TableItem.jsx

@@ -1,9 +1,7 @@
 import React, { Component } from 'react'
 import React, { Component } from 'react'
 import './tableItem.css'
 import './tableItem.css'
-import '../approvalAdd/formCommon.css'
 import { Input, Modal } from 'semantic-ui-react'
 import { Input, Modal } from 'semantic-ui-react'
-import { DatePicker} from 'antd-mobile'
-import { Radio } from 'antd'
+import { DatePicker, Radio } from 'antd'
 import locale from 'antd/lib/date-picker/locale/zh_CN'
 import locale from 'antd/lib/date-picker/locale/zh_CN'
 import { isObjEmpty, numFormat, strContain } from '../../utils/common'
 import { isObjEmpty, numFormat, strContain } from '../../utils/common'
 import ApprovalBean from '../../model/ApprovalBean'
 import ApprovalBean from '../../model/ApprovalBean'
@@ -119,7 +117,7 @@ export default class TableItem extends Component {
           }
           }
           console.log(mApproval.dfType);
           console.log(mApproval.dfType);
           if(mApproval.dfType == 'DT'){
           if(mApproval.dfType == 'DT'){
-            valueItem = <DatePicker locale={{okText: '确定', dismissText: '取消',}}
+           /* valueItem = <DatePicker locale={{okText: '确定', dismissText: '取消',}}
                                     className='value-input'
                                     className='value-input'
                                     mode={'datetime'}
                                     mode={'datetime'}
                                     extra={'选择时间'}
                                     extra={'选择时间'}
@@ -135,8 +133,8 @@ export default class TableItem extends Component {
                                       </div>
                                       </div>
                                       <div style={{ flex: 1 }}></div>
                                       <div style={{ flex: 1 }}></div>
                                     </DatePickerCustom>
                                     </DatePickerCustom>
-                       </DatePicker>
-           /* valueItem = <Space direction="vertical" size={12}>
+                       </DatePicker>*/
+            valueItem = <Space direction="vertical" size={12}>
               <DatePicker showTime  onOk={this.onDatePicker} />
               <DatePicker showTime  onOk={this.onDatePicker} />
               <RangePicker
               <RangePicker
                   showTime={{
                   showTime={{
@@ -145,7 +143,7 @@ export default class TableItem extends Component {
                   format="YYYY-MM-DD HH:mm"
                   format="YYYY-MM-DD HH:mm"
                   onOk={this.onDatePicker}
                   onOk={this.onDatePicker}
               />
               />
-            </Space>*/
+            </Space>
 
 
           }else {
           }else {
             valueItem = <DatePicker locale={locale} className='value-input'
             valueItem = <DatePicker locale={locale} className='value-input'