dengzhiguo 5 years ago
parent
commit
e1d71005fa

+ 8 - 4
js/component/manageCenter/financialManage/distribute/inSpecial.jsx

@@ -118,7 +118,7 @@ const inSpecial = React.createClass({
                 pageSize: this.state.pagination.pageSize,
                 name: this.state.nameSearch,//客户名称
                 orderNo:this.state.orderNoSearch,
-				orderDep:this.state.orderDep,
+				orderDep:this.state.departmenttList,
 				type:0
             },
             success: function (data) {
@@ -420,6 +420,7 @@ const inSpecial = React.createClass({
 		    },
 			success: function (data) {
 			    let theArr = [];
+				let sum = 0;
 			    if (!data.data) {
 			        if (data.error && data.error.length) {
 			            message.warning(data.error[0].message);
@@ -427,17 +428,20 @@ const inSpecial = React.createClass({
 			    } else {
 			        for (let i = 0; i < data.data.list.length; i++) {
 			            let thisdata = data.data.list[i];
+						sum += parseFloat(thisdata.amount).toFixed(4);
 			            theArr.push({
 			                 id: thisdata.id,
 			                 orderno: thisdata.orderno,//订单编号
 			                 amount:thisdata.amount,//签单金额
 			                 createTime:thisdata.createTime,//流程状态
 			                 status:thisdata.status,//结算状态
+							 rejectReason:thisdata.rejectReason
 			            });
 			        };
 			    };
 				this.setState({
-					recordData:theArr
+					recordData:theArr,
+					sum:sum.toFixed(4)
 				})
 			}.bind(this),
 		}).done(function(data) {
@@ -495,7 +499,7 @@ const inSpecial = React.createClass({
 		var departmentArr = this.state.departmentArr ||[];
         return ( <div className="user-content">
             <div className="content-title">
-                    <span>开票申请列表</span>
+                    <span>省内特批</span>
                 </div>
                 <div className="user-search">
                     <Input placeholder="营销员名称"
@@ -745,7 +749,7 @@ const inSpecial = React.createClass({
 												开票总计
 											</span> 
 										} >
-										<span></span>
+										<span>{this.state.sum}</span>
 									</FormItem>
 								</div>
 							</div>

+ 4 - 4
js/component/manageCenter/financialManage/distribute/invoiceApplyList.jsx

@@ -118,7 +118,7 @@ const invoiceApplyList = React.createClass({
                 pageSize: this.state.pagination.pageSize,
                 name: this.state.nameSearch,//客户名称
                 orderNo:this.state.orderNoSearch,
-				orderDep:this.state.orderDep,
+				orderDep:this.state.departmenttList,
 				type:0
             },
             success: function (data) {
@@ -430,7 +430,7 @@ const invoiceApplyList = React.createClass({
 			    } else {
 			        for (let i = 0; i < data.data.list.length; i++) {
 			            let thisdata = data.data.list[i];
-						sum += parseFloat(thisdata.amount);
+						sum += parseFloat(thisdata.amount).toFixed(4);
 			            theArr.push({
 			                 id: thisdata.id,
 			                 orderno: thisdata.orderno,//订单编号
@@ -443,7 +443,7 @@ const invoiceApplyList = React.createClass({
 			    };
 				this.setState({
 					recordData:theArr,
-					sum:sum
+					sum:sum.toFixed(4)
 				})
 			}.bind(this),
 		}).done(function(data) {
@@ -501,7 +501,7 @@ const invoiceApplyList = React.createClass({
 		var departmentArr = this.state.departmentArr ||[];
         return ( <div className="user-content">
             <div className="content-title">
-                    <span>开票申请列表</span>
+                    <span>省内开票审核</span>
                 </div>
                 <div className="user-search">
                     <Input placeholder="营销员名称"

+ 4 - 4
js/component/manageCenter/financialManage/distribute/invoiceApplyListWai.jsx

@@ -118,7 +118,7 @@ const invoiceApplyListWai = React.createClass({
                 pageSize: this.state.pagination.pageSize,
                 name: this.state.nameSearch,//客户名称
                 orderNo:this.state.orderNoSearch,
-				orderDep:this.state.orderDep,
+				orderDep:this.state.departmenttList,
 				type:1
             },
             success: function (data) {
@@ -430,7 +430,7 @@ const invoiceApplyListWai = React.createClass({
 			    } else {
 			        for (let i = 0; i < data.data.list.length; i++) {
 			            let thisdata = data.data.list[i];
-						sum += parseFloat(thisdata.amount);
+						sum += parseFloat(thisdata.amount).toFixed(4);
 			            theArr.push({
 			                 id: thisdata.id,
 			                 orderno: thisdata.orderno,//订单编号
@@ -443,7 +443,7 @@ const invoiceApplyListWai = React.createClass({
 			    };
 				this.setState({
 					recordData:theArr,
-					sum:sum
+					sum:sum.toFixed(4)
 				})
 			}.bind(this),
 		}).done(function(data) {
@@ -501,7 +501,7 @@ const invoiceApplyListWai = React.createClass({
 		var departmentArr = this.state.departmentArr ||[];
         return ( <div className="user-content">
             <div className="content-title">
-                    <span>开票申请列表</span>
+                    <span>省外开票审核</span>
                 </div>
                 <div className="user-search">
                     <Input placeholder="营销员名称"

+ 8 - 4
js/component/manageCenter/financialManage/distribute/outSpecial.jsx

@@ -118,7 +118,7 @@ const outSpecial = React.createClass({
                 pageSize: this.state.pagination.pageSize,
                 name: this.state.nameSearch,//客户名称
                 orderNo:this.state.orderNoSearch,
-				orderDep:this.state.orderDep,
+				orderDep:this.state.departmenttList,
 				type:1
             },
             success: function (data) {
@@ -420,6 +420,7 @@ const outSpecial = React.createClass({
 		    },
 			success: function (data) {
 			    let theArr = [];
+				let sum = 0;
 			    if (!data.data) {
 			        if (data.error && data.error.length) {
 			            message.warning(data.error[0].message);
@@ -427,17 +428,20 @@ const outSpecial = React.createClass({
 			    } else {
 			        for (let i = 0; i < data.data.list.length; i++) {
 			            let thisdata = data.data.list[i];
+						sum += parseFloat(thisdata.amount).toFixed(4);
 			            theArr.push({
 			                 id: thisdata.id,
 			                 orderno: thisdata.orderno,//订单编号
 			                 amount:thisdata.amount,//签单金额
 			                 createTime:thisdata.createTime,//流程状态
 			                 status:thisdata.status,//结算状态
+							 rejectReason:thisdata.rejectReason
 			            });
 			        };
 			    };
 				this.setState({
-					recordData:theArr
+					recordData:theArr,
+					sum:sum.toFixed(4)
 				})
 			}.bind(this),
 		}).done(function(data) {
@@ -495,7 +499,7 @@ const outSpecial = React.createClass({
 		var departmentArr = this.state.departmentArr ||[];
         return ( <div className="user-content">
             <div className="content-title">
-                    <span>开票申请列表</span>
+                    <span>省外特批</span>
                 </div>
                 <div className="user-search">
                     <Input placeholder="营销员名称"
@@ -745,7 +749,7 @@ const outSpecial = React.createClass({
 												开票总计
 											</span> 
 										} >
-										<span></span>
+										<span>{this.state.sum}</span>
 									</FormItem>
 								</div>
 							</div>

+ 7 - 3
js/component/manageCenter/order/orderNew/billing.jsx

@@ -308,11 +308,12 @@ const MyService=Form.create()(React.createClass({
 			case 1:api = '/api/admin/orderInvoice/createOrderInvoice';
 					api1 = '/api/admin/orderInvoice/updateOrderInvoice'
 					sumData = fdata;
-					sumData1 = {id:record.id};
+					sumData1 = fdata;
+					sumData1.id = this.state.id;
 					method = 'post'
 				break;
 			case 3:api = '/api/admin/orderInvoice/selectByIdOrderInvoice'
-					sumData = {id:record.id};
+					sumData.id = record.id;
 					method='get';
 				break;	
 			default: api=''
@@ -411,6 +412,7 @@ const MyService=Form.create()(React.createClass({
 			if(!data.error.length) {
 				if(this.state.status === 1){
 					message.success('提交成功!');
+					this.inRecordData()
 					this.visitCancels()
 				}else if(this.state.status === 0){
 					message.success('保存成功!');
@@ -453,9 +455,11 @@ const MyService=Form.create()(React.createClass({
 	},
 	
 	recompose(record){
+		console.log(record)
 		this.setState({
 			avisible:true,
 			orderNo3:record.orderno,
+			id:record.id
 		})
 		this.setState({
 			status:3,
@@ -613,7 +617,7 @@ const MyService=Form.create()(React.createClass({
 			    };
 				this.setState({
 					recordData:theArr,
-					sum:sum
+					sum:sum.toFixed(4)
 				})
 			}.bind(this),
 		}).done(function(data) {