Browse Source

技术员奖金

liting2017 6 years ago
parent
commit
897a2392da

+ 1 - 1
js/component/login/loginFooter.jsx

@@ -6,7 +6,7 @@ const LoginFooter = React.createClass({
         return (
             <div className="footer">
                 <p>Copyright © 2016-2017 阿凡提 版权所有</p>
-                <p>技术支持:湖南智明科技有限公司</p>
+                <p>技术支持:湖南阿凡提科技有限公司</p>
             </div>
         )
     }

+ 11 - 10
js/component/manageCenter/financialManage/bonus/jsBonus.jsx

@@ -81,6 +81,7 @@ const JsBonus = React.createClass({
                             key: i,
                             id:thisdata.id,
                             tid:thisdata.tid,
+                            targetName:thisdata.targetName,
 		                    orderNo:thisdata.orderNo,
 		                    taskReceiver:thisdata.taskReceiver,
 		                    taskStatus:thisdata.taskStatus,
@@ -92,9 +93,9 @@ const JsBonus = React.createClass({
                             grantTime:thisdata.grantTime,
                             targetName:thisdata.targetName,
                             liquidationStatus:thisdata.liquidationStatus,
-                            licenceTime:thisdata.licenceTime?(new Date(thisdata.licenceTime)).toLocaleString():'',
-                            acceptTime:thisdata.acceptTime?(new Date(thisdata.acceptTime)).toLocaleString():'',
-                            reviewTime:thisdata.reviewTime?(new Date(thisdata.reviewTime)).toLocaleString():''
+                            licenceTime:thisdata.licenceTime,
+                            acceptTime:thisdata.acceptTime,
+                            reviewTime:thisdata.reviewTime
                         });
                     };
                 }
@@ -150,8 +151,8 @@ const JsBonus = React.createClass({
                 }, 
                 {
                     title: '任务负责人',
-                    dataIndex: 'taskReceiver',
-                    key: 'taskReceiver',
+                    dataIndex: 'targetName',
+                    key: 'targetName',
                 },
                 {
                     title: '任务状态',
@@ -351,10 +352,10 @@ const JsBonus = React.createClass({
                             })
                         }
                     </Select>
-                    <Input placeholder="订单负责人"
+                    {/* <Input placeholder="订单负责人"
                         value={this.state.orderRefundSearch}
-                        onChange={(e) => { this.setState({ orderRefundSearch: e.target.value }); }} /> 
-                    <Input placeholder="项目负责人"
+                        onChange={(e) => { this.setState({ orderRefundSearch: e.target.value }); }} />  */}
+                    <Input placeholder="任务负责人"
                         value={this.state.projectMenSearch}
                         onChange={(e) => { this.setState({ projectMenSearch: e.target.value }); }} /> 
                     <Select placeholder="发放状态"
@@ -404,13 +405,13 @@ const JsBonus = React.createClass({
                     <Form layout="horizontal" onSubmit={this.boHuiSubmit}>
 			                <Spin spinning={this.state.loading}>
                                 <FormItem labelCol={{ span: 8 }} wrapperCol={{ span: 10 }} label='应收人'>
-                                    <span>{this.state.proofData.salesName}</span>
+                                    <span>{this.state.proofData.targetName}</span>
                                 </FormItem>
                                 <FormItem labelCol={{ span: 8 }} wrapperCol={{ span: 10 }} label='发放人'>
                                     <span>{this.state.proofData.byName}</span>
                                 </FormItem>
                                 <FormItem wrapperCol={{ span: 12, offset:8 }}>  
-                                    <Button type="primary" htmlType="submit"  style={{marginRight:20}}>保存</Button>
+                                    <Button type="primary" htmlType="submit"  style={{marginRight:20}}>发放</Button>
                                     <Button type="default" onClick={()=>{this.boHuiCancel()}}>取消</Button>
                                 </FormItem>
                             </Spin>

+ 1 - 1
js/component/manageCenter/financialManage/bonus/jsBonusDetail.jsx

@@ -57,7 +57,7 @@ const BonusDetail=React.createClass({
                                         <span>{theData.orderNo}</span>
                                     </FormItem>
                                     <FormItem className="half-item" {...formItemLayout} label="任务负责人">
-                                        <span>{theData.taskReceiver}</span>
+                                        <span>{theData.targetName}</span>
                                     </FormItem>
                                     <FormItem className="half-item" {...formItemLayout} label="任务状态">
                                         <span>{getTaskStatus(theData.taskStatus)}</span>

+ 1 - 1
js/component/portal/footer.jsx

@@ -51,7 +51,7 @@ const Footer = React.createClass({
                 </div>
                 <div className="container support">
                     <a href="#">Copyright © 2016-2017 阿凡提 版权所有</a>
-                    <a href="#">技术支持:湖南智明科技有限公司</a>
+                    <a href="#">技术支持:湖南阿凡提科技有限公司</a>
                 </div>
             </footer >
         )

+ 2 - 2
webpack.config.js

@@ -304,7 +304,7 @@ module.exports = (function () {
     }
 
     //let staticHost = 'http://afts.hnzhiming.com';
-    let staticHost = 'http://192.168.0.190';
+    let staticHost = 'http://192.168.0.188';
     switch (argv.env.deploy) {
         case 'test':
             staticHost = 'http://static.kedexinxi.com';
@@ -343,7 +343,7 @@ module.exports = (function () {
         // }
         devServer: {
             disableHostCheck: true,
-            host: '192.168.0.190',
+            host: '192.168.0.188',
             port: 80,
             allowedHosts: ['127.0.0.1','192.168.0.20','192.168.0.99'],
             headers: {