liting2017 6 years ago
parent
commit
bef009166f

+ 17 - 26
js/component/manageCenter/financialManage/distribute/examine.jsx

@@ -14,9 +14,9 @@ const Examine=React.createClass({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + '/api/admin/order/getOrderCommodity',
+            url: globalConfig.context + '/api/admin/newOrder/orderRefundDetail',
             data: {
-            	orderNo:record?record.orderNo:this.props.data.orderNo
+            	id:record?record.id:this.props.data.id
             },
             success: function (data) {
                 let theArr = [];
@@ -25,17 +25,14 @@ const Examine=React.createClass({
                         message.warning(data.error[0].message);
                     };
                 } else {
-                    for (let i = 0; i < data.data.length; i++) {
-                        let thisdata = data.data[i];
-                        theArr.push({
-                             key: i,
-                             id:thisdata.id,
-                             data:thisdata,
-                             orderNo:thisdata.orderNo,
-                            orgCodeUrl: thisdata.contractPictureUrl ? splitUrl(thisdata.contractPictureUrl, ',', globalConfig.avatarHost + '/upload') : [],
-                            orgCodeUrlNo: thisdata.contractPictureUrl ? splitUrl(thisdata.contractPictureUrl, ',', globalConfig.avatarHost + '/upload') : [],
-                        });
-                    };
+                    let thisdata=data.data;
+                    this.setState({
+                        id:thisdata.id,
+                        data:thisdata,
+                        orderNo:thisdata.orderNo,
+                        orgCodeUrl: thisdata.contractUrl ? splitUrl(thisdata.contractUrl, ',', globalConfig.avatarHost + '/upload') : [],
+                        orgCodeUrlNo: thisdata.applicationUrl ? splitUrl(thisdata.applicationUrl, ',', globalConfig.avatarHost + '/upload') : [],
+                    });
                    }
             }.bind(this),
         }).always(function () {
@@ -54,7 +51,7 @@ const Examine=React.createClass({
     //保存
     handleSubmit(e,index){
         e.preventDefault();
-        if(index=='2'&&!this.state.remark){
+        if(index=='2'&&!this.state.remarks){
             message.warning('请填写拒绝退单的原因');
             return false;
         }
@@ -66,10 +63,13 @@ const Examine=React.createClass({
             dataType: "json",
             async:true,
             url:  globalConfig.context + '/api/admin/financial/changeRefund',
-            data: {
+            data: index=='2'?{
                 id: this.props.data.id,
                 refundStatus:index,
-                remarks:index=='2'?this.state.remarks:''
+                remarks:this.state.remarks
+            }:{
+                id: this.props.data.id,
+                refundStatus:index, 
             }
         }).done(function (data) {
             this.setState({
@@ -131,7 +131,7 @@ const Examine=React.createClass({
                                         <span>{theData.id}</span>
                                     </FormItem>
                                     <FormItem className="half-item" {...formItemLayout} label="退单时间">
-							            <span>{theData.createTime?(new Date(theData.createTime)).toLocaleString():''}</span>
+							            <span>{theData.createDate}</span>
                                     </FormItem>
                                     <FormItem className="half-item" {...formItemLayout} label="订单编号">
                                         <span>{theData.orderNo}</span>
@@ -142,15 +142,6 @@ const Examine=React.createClass({
                                     <FormItem className="half-item" {...formItemLayout} label="结算状态">
                                         <span>{getLiquidationStatus(theData.liquidationStatus)}</span>
                                     </FormItem>
-                                    <FormItem className="half-item" {...formItemLayout} label="付款方">
-                                        <span>{theData.payerName}</span>
-                                    </FormItem>
-                                    <FormItem className="half-item" {...formItemLayout} label="收款方">
-                                        <span>{theData.payeeName}</span>
-                                    </FormItem>
-                                    <FormItem className="half-item" {...formItemLayout} label="财务流水编号">
-                                        <span>{theData.billNo}</span>
-                                    </FormItem>
                                     <div className="clearfix">
                                         <FormItem labelCol={{ span:5 }} wrapperCol={{ span: 17 }} label="终止合同">
                                             <Upload className="demandDetailShow-upload"

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

@@ -45,7 +45,8 @@ const TuiDan = React.createClass({
                             key: i,
                             id:thisdata.id,
 		                    orderNo: thisdata.orderNo,
-		                    orderType:thisdata.orderType,
+                            orderType:thisdata.orderType,
+                            buyName:thisdata.buyName,
 		                    orderStatus:thisdata.orderStatus,
 		                    liquidationStatus:thisdata.liquidationStatus,
                             refundStatus:thisdata.refundStatus,
@@ -252,7 +253,7 @@ const TuiDan = React.createClass({
                     <Button onClick={this.reset}>重置</Button>
                     <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch.bind(this)} /></span>
                     <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
-                        <span>单时间 :</span>
+                        <span>退单时间 :</span>
                         <RangePicker
                             value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
                             this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}

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

@@ -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.data.orderNo+'】 分配给【'+record.departmentName+'-'+record.name+'】?'} onConfirm={(e)=>{this.confirmSelect(record)}} okText="确认" cancelText="取消">
                                     <Button style={{marginRight:'5px'}} type="primary">选定</Button>                 
                                 </Popconfirm>
 							)
@@ -150,7 +150,8 @@ const Assign=React.createClass({
                         let thisdata = data.data.list[i];
                         theArr.push({
                              key: i,
-	                         id: thisdata.id,
+                             id: thisdata.id,
+                             contactId:thisdata.contactId,
 	                         userNo: thisdata.userNo,
 	                         name:thisdata.name,
 	                         departmentName:thisdata.departmentName,
@@ -182,7 +183,7 @@ const Assign=React.createClass({
             url: globalConfig.context +this.props.selApi,
             data: {
             	orderNo:this.props.data.orderNo,
-                financeId:record.id,    //分配人物id
+                financeId: !this.state.contact?record.id:record.contactId,    //分配人物id
                 approval:this.props.data.approval   //是否特批
             }
         }).done(function (data) {