Преглед на файлове

Merge branch 'master' of ssh://git.jishutao.com:55555/jishutao/kede-client

dengzhiguo преди 6 години
родител
ревизия
ab805eabcb

+ 20 - 4
js/component/manageCenter/financialManage/distribute/receivable.jsx

@@ -25,6 +25,14 @@ const Receivable=React.createClass({
             message.warning('请选择交易渠道');
             return false;
         }
+        if(!this.state.contractNo){
+            message.warning('请填写合同编号');
+            return false;
+        }
+        if(!this.state.financialPayTimes){
+            message.warning('请选择财务流水时间');
+            return false;
+        }
         this.setState({
             loading: true
         });
@@ -38,6 +46,7 @@ const Receivable=React.createClass({
                 orderNo: data.orderNo,
                 payeeId:data.companyId,
                 payerId:data.buyerId,
+                contractNo:this.state.contractNo,
                 transactionAmount: this.state.settlementAmount,
                 transactionSubject: ~((this.props.title).indexOf('退款'))?'2':'0',
                 transactionChannel: this.state.transactionChannel,
@@ -84,10 +93,11 @@ const Receivable=React.createClass({
         this.setState({
             transactionProject:undefined,
             settlementAmount:undefined,
-            transactionChannel:undefined,
+            transactionChannel:'2',
             financialPayNo:'',
             financialPayTimes:undefined,
-            remarks:''
+            remarks:'',
+            contractNo:nextProps.data.contractNo
         })
     },
     render() {
@@ -139,13 +149,19 @@ const Receivable=React.createClass({
                                     <FormItem className="half-item" {...formItemLayout} label="订单编号">
                                         <span>{theData.orderNo}</span>
                                     </FormItem>
+                                    {!theData.contractNo?<FormItem className="half-item" {...formItemLayout} label={<span><strong style={{color:'#f00'}}>*</strong>合同编号</span>} >
+                                        <Input placeholder="合同编号"
+                                            value={this.state.contractNo}
+                                            onChange={(e) => { this.setState({ contractNo: e.target.value }); }} />  
+                                    </FormItem>:<FormItem className="half-item" {...formItemLayout} label="合同编号" >
+                                            <span>{theData.contractNo}</span>
+                                    </FormItem>}
                                     <FormItem className="half-item" {...formItemLayout} label="财务流水编号">
                                         <Input placeholder="财务流水编号"
                                             value={this.state.financialPayNo}
                                             onChange={(e) => { this.setState({ financialPayNo: e.target.value }); }} />  
-                                                        
                                     </FormItem>
-                                    <FormItem className="half-item" {...formItemLayout} label="财务流水时间">
+                                    <FormItem className="half-item" {...formItemLayout} label={<span><strong style={{color:'#f00'}}>*</strong>财务流水时间</span>}>
                                         <DatePicker 
                                             showTime
                                             format="YYYY-MM-DD HH:mm:ss"

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

@@ -54,7 +54,8 @@ const ShouKuang = React.createClass({
                             companyId:thisdata.companyId,
                             companyName:thisdata.companyName,
                             buyerId:thisdata.buyerId,
-                            buyerName:thisdata.buyerName
+                            buyerName:thisdata.buyerName,
+                            contractNo:thisdata.contractNo
                         });
                     };
                 }

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

@@ -50,6 +50,7 @@ const TuiDan = React.createClass({
                             buyName:thisdata.buyName,
                             companyName:thisdata.buyName,
                             buyerName:thisdata.saleName,
+                            contractNo:thisdata.contractNo,
                             buyerId:'0',
                             refundAmount:thisdata.refundAmount,
                             companyId:thisdata.buyid,