liting2017 6 years ago
parent
commit
0dec9fa962

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

@@ -2,7 +2,7 @@ import React from 'react';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import { Form, Spin, message, Modal } from 'antd';
-import {getTaskStatus,getProjectStatus,getLiquidationStatus,getJsyPaymentType} from '@/tools.js';
+import {getTaskStatus,getProjectStatus,getLiquidationStatus,getJsyPaymentType,getBonusState} from '@/tools.js';
 
 const BonusDetail=React.createClass({
     getInitialState() {
@@ -84,7 +84,7 @@ const BonusDetail=React.createClass({
                                         <span>{getJsyPaymentType(theData.bonusSubject)}</span>
                                     </FormItem>
                                     <FormItem className="half-item" {...formItemLayout} label="发放状态">
-                                        <span>{theData.grantStatus}</span>
+                                        <span>{getBonusState(theData.grantStatus)}</span>
                                     </FormItem>
                                 </div>
 			                </Spin>

+ 1 - 0
js/component/manageCenter/financialManage/distribute/paiDan.jsx

@@ -266,6 +266,7 @@ const PaiDan = React.createClass({
                     closeDesc={this.closeDesc.bind(this)}
                 />
                 <Assign
+                    title='订单'
                     selApi="/api/admin/financial/distributionFinance"
                     data={this.state.assignData}
                     showDesc={this.state.assignVisible}

+ 2 - 1
js/component/manageCenter/financialManage/distribute/tuiDan.jsx

@@ -51,6 +51,7 @@ const TuiDan = React.createClass({
                             companyName:thisdata.buyName,
                             buyerName:thisdata.saleName,
                             buyerId:'0',
+                            refundAmount:thisdata.refundAmount,
                             companyId:thisdata.buyid,
 		                    orderStatus:thisdata.orderStatus,
 		                    liquidationStatus:thisdata.liquidationStatus,
@@ -149,7 +150,7 @@ const TuiDan = React.createClass({
                     key: 'caouzo',
                     render:(text,recard)=>{
                         return <div>
-                            {recard.refundStatus==1&&<Button type="primary" onClick={(e)=>{e.stopPropagation(),this.evaluate(recard)}}>添加退款记录</Button>}
+                            {recard.refundStatus==1&&recard.liquidationStatus!='4'&&<Button type="primary" onClick={(e)=>{e.stopPropagation(),this.evaluate(recard)}}>添加退款记录</Button>}
                             {recard.refundStatus==0&&<Button type="primary" onClick={(e)=>{e.stopPropagation(),this.reject(recard)}}>审批</Button>}
                         </div>
                     }

+ 5 - 0
js/component/manageCenter/financialManage/flowWater/departWater.jsx

@@ -66,6 +66,7 @@ const MyWater = React.createClass({
                 payerName:this.state.payerNameSearch,
                 startTime: this.state.releaseDate[0],
                 endTime: this.state.releaseDate[1],
+                orderNo:this.state.orderNo
             },
             success: function (data) {
                 let theArr = [];
@@ -222,6 +223,7 @@ const MyWater = React.createClass({
     reset() {
         this.state.payeeNameSearch='';
         this.state.releaseDate = [];
+        this.state.orderNo='';
         this.state.payerNameSearch='';
         this.state.departmentId=undefined;
         this.loadData();
@@ -259,6 +261,9 @@ const MyWater = React.createClass({
                             })
                         }
                     </Select>
+                    <Input placeholder="订单编号"
+                        value={this.state.orderNo}
+                        onChange={(e) => { this.setState({ orderNo: e.target.value }); }} />
                     <Input placeholder="收款方"
                         value={this.state.payeeNameSearch}
                         onChange={(e) => { this.setState({ payeeNameSearch: e.target.value }); }} /> 

+ 5 - 0
js/component/manageCenter/financialManage/flowWater/myWater.jsx

@@ -28,6 +28,7 @@ const MyWater = React.createClass({
                 payerName:this.state.payerNameSearch,
                 startTime: this.state.releaseDate[0],
                 endTime: this.state.releaseDate[1],
+                orderNo:this.state.orderNo
             },
             success: function (data) {
                 let theArr = [];
@@ -161,6 +162,7 @@ const MyWater = React.createClass({
         this.loadData();
     },
     reset() {
+        this.state.orderNo = '';
         this.state.payeeNameSearch='';
         this.state.releaseDate = [];
         this.state.payerNameSearch='';
@@ -188,6 +190,9 @@ const MyWater = React.createClass({
                 <span>我的流水订单</span>
                 </div>
                 <div className="user-search">
+                    <Input placeholder="订单编号"
+                        value={this.state.orderNo}
+                        onChange={(e) => { this.setState({ orderNo: e.target.value }); }} />
                     <Input placeholder="收款方"
                         value={this.state.payeeNameSearch}
                         onChange={(e) => { this.setState({ payeeNameSearch: e.target.value }); }} /> 

+ 3 - 0
js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx

@@ -255,6 +255,9 @@ const OrderDetail = Form.create()(React.createClass({
                         <FormItem className="half-item" {...formItemLayout} label="是否特批">
 							<span>{getApproval(theData.approval)}</span>
 						</FormItem>
+                        {this.props.data.orderStatus=='6'&&<FormItem className="half-item" {...formItemLayout} label="已退(万元)">
+							<span>{this.props.data.refundAmount}</span>
+						</FormItem>}
 					</div>
                     <div className="clearfix">
                         <FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="合同扫描件">

+ 1 - 0
js/component/manageCenter/project/project/projectAssignment.jsx

@@ -254,6 +254,7 @@ const PaiDan = React.createClass({
                     closeDesc={this.closeDesc.bind(this)}
                 />
                 <Assign
+                    title="项目"
                     selApi="/api/admin/financial/distributionFinance"
                     data={this.state.assignData}
                     showDesc={this.state.assignVisible}

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

@@ -266,6 +266,7 @@ const Task = React.createClass({
                     closeDesc={this.closeDesc.bind(this)}
                 />
                 <Assign
+                    title="任务"
                     selApi={this.state.nub?"/api/admin/financial/fenpei":'/api/admin/financial/zhuanjiao'}
                     data={this.state.assignData}
                     showDesc={this.state.assignVisible}

+ 5 - 4
js/component/manageCenter/publicComponent/assign.jsx

@@ -45,7 +45,7 @@ const Assign=React.createClass({
 	},
     getInitialState() {
         return {
-            contact:0,
+            contact:1,
             selectedRows: [],
             searchMore: true,
             loading: false,
@@ -94,7 +94,7 @@ const Assign=React.createClass({
                     width:100,
                     render:(text,record,index)=>{
                     	return (
-                                <Popconfirm title={'您确认将(订单/任务/项目) 【'+this.props.data.orderNo+'】 分配给【'+record.departmentName+'-'+record.name+'】?'} onConfirm={(e)=>{this.confirmSelect(record)}} okText="确认" cancelText="取消">
+                                <Popconfirm title={'您确认将'+this.props.title+' 【'+this.props.data.orderNo+'】 分配给【'+record.departmentName+'-'+record.name+'】?'} onConfirm={(e)=>{this.confirmSelect(record)}} okText="确认" cancelText="取消">
                                     <Button style={{marginRight:'5px'}} type="primary">选定</Button>                 
                                 </Popconfirm>
 							)
@@ -214,10 +214,11 @@ const Assign=React.createClass({
     componentWillReceiveProps(nextProps) {
         this.state.visible=nextProps.showDesc;
         if(nextProps.showDesc){
-            this.departmentList();
+            this.contactList();
+            this.departmentList()
         }
         this.setState({
-            contact:0
+            contact:1
         })
     },
     render() {

+ 0 - 1
js/component/manageCenter/topTab.jsx

@@ -356,7 +356,6 @@ const UserModal = React.createClass({
                 pwd: this.state.pwd
             }
         }).always(function (data) {
-        	 console.log(data);
             if (data.error && data.error.length) {
                 message.warning(data.error[0].message);
             } else {