dengzhiguo 6 years ago
parent
commit
2bef7120dd

+ 11 - 5
js/component/manageCenter/financialManage/bonus/yxBonus.jsx

@@ -176,6 +176,11 @@ const YxBonus = React.createClass({
                     }
                 },
                 {
+                    title: '校对后单量',
+                    dataIndex: 'proofCount',
+                    key: 'proofCount'
+                },
+                {
                     title: '已收(万元)',
                     dataIndex: 'settlementAmount',
                     key: 'settlementAmount'
@@ -190,8 +195,8 @@ const YxBonus = React.createClass({
                     key: 'state11',
                     render:(text,recard)=>{
                         return <div>
-                            {(recard.proofStatus&&!recard.grantStatus)?<Button type="primary" onClick={(e)=>{e.stopPropagation(),this.proofread(recard,0)}}>发放</Button>:''}
-                            {(!recard.proofStatus&&!recard.grantStatus)?<Button type="primary" onClick={(e)=>{e.stopPropagation(),this.proofread(recard,1)}}>校对</Button>:''}
+                            {(recard.proofStatus&&!recard.grantStatus)?<Button type="primary" style={{marginRight:10}} onClick={(e)=>{e.stopPropagation(),this.proofread(recard,0)}}>发放</Button>:''}
+                             <Button type="primary" onClick={(e)=>{e.stopPropagation(),this.proofread(recard,1)}}>校对</Button>
                         </div>
                     }
                 },
@@ -205,7 +210,7 @@ const YxBonus = React.createClass({
             proofreadState:index,
             boHuiVisible:true,
             proofData: recard,
-            result:''
+            result:recard.proofCount
         })
     },
     tableRowClick(record, index) {
@@ -262,10 +267,11 @@ const YxBonus = React.createClass({
     //保存发放状态
     boHuiSubmit(e){
         e.preventDefault();
-        if(this.state.proofreadState&&!this.state.result){
+        var resType = typeof this.state.result;
+        if(this.state.proofreadState&&resType != 'number'){
             message.warning('请填写校对信息');
             return false;
-        }
+        };
         this.setState({
             loading:true
         });

+ 4 - 0
js/component/manageCenter/project/task/taskAssignment.jsx

@@ -417,7 +417,11 @@ const Task = React.createClass({
                     closeDesc={this.closeAssign.bind(this)}
                     fenpaiData={8}
                     specially={0}
+<<<<<<< HEAD
                     roleName={this.state.nub}
+=======
+                    roleName={this.state.nub?'咨询师':'咨询师经理'}
+>>>>>>> 29f0453ff88cd1dc1d10b9537d5ea89040bf8e40
                 />
                 <Modal	
 				      className="customeDetails"

+ 1 - 0
js/component/manageCenter/publicComponent/assign.jsx

@@ -219,6 +219,7 @@ const Assign=React.createClass({
     	});
     },
     componentWillMount() {
+        
     },
     componentWillReceiveProps(nextProps) {
         this.state.visible=nextProps.showDesc;