liting2017 před 7 roky
rodič
revize
11d3792467

+ 4 - 6
js/component/manageCenter/order/departmentOrder/servicesOrder/addService.jsx

@@ -674,14 +674,12 @@ const NewService = Form.create()(React.createClass({
 		})
 		this.state.lookSource=[];
         $.ajax({
-            method: "post",
+            method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context +'/api/admin/order/queryAllBill',
+            url: globalConfig.context +'/api/admin/order/getBillByOrderNo',
             data: {
             	orderNo:this.props.datauser.orderNo,
-            	pageNo: 1,
-                pageSize: 99,
             },
             success: function (data) {
                 let theArr = [];
@@ -690,8 +688,8 @@ const NewService = Form.create()(React.createClass({
                         message.warning(data.error[0].message);
                     };
                 } else {
-                    for (let i = 0; i < data.data.list.length; i++) {
-                        let thisdata = data.data.list[i];
+                    for (let i = 0; i < data.data.length; i++) {
+                        let thisdata = data.data[i];
                         theArr.push({
                              key: i,
 	                         billNo: thisdata.billNo,

+ 1 - 3
js/component/manageCenter/order/myOrder/servicesOrder/addService.jsx

@@ -705,11 +705,9 @@ const NewService = Form.create()(React.createClass({
             method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context +'/api/admin/order/queryAllBill',
+            url: globalConfig.context +'/api/admin/order/getBillByOrderNo',
             data: {
             	orderNo:this.props.datauser.orderNo,
-            	pageNo: 1,
-                pageSize: 99,
             },
             success: function (data) {
                 let theArr = [];

+ 1 - 1
js/component/manageCenter/order/myOrder/servicesOrder/myService.jsx

@@ -354,7 +354,7 @@ const MyService=Form.create()(React.createClass({
         return (
             <div className="user-content" >
                 <div className="content-title">
-                	<span style={{fontSize:'16px'}}>我的科技服务订单</span>	
+                	<span style={{fontSize:'16px'}}>科技服务订单</span>	
 	                <div className="user-search">
 	                    <Input placeholder="客户名称" style={{width:'150px'}}
 	                        value={this.state.customerName}

+ 1 - 3
js/component/manageCenter/order/orderManagement/approveOrder/approveOrderDetaile.jsx

@@ -275,11 +275,9 @@ const ApproveOrderDetaile = Form.create()(React.createClass({
             method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context +'/api/admin/order/queryAllBill',
+            url: globalConfig.context +'/api/admin/order/getBillByOrderNo',
             data: {
             	orderNo:this.props.datauser.orderNo,
-            	pageNo: 1,
-                pageSize: 99,
             },
             success: function (data) {
                 let theArr = [];

+ 1 - 3
js/component/manageCenter/order/orderManagement/publicOrder/publicOrderDetaile.jsx

@@ -274,11 +274,9 @@ const ApproveDetaile = Form.create()(React.createClass({
             method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context +'/api/admin/order/queryAllBill',
+            url: globalConfig.context +'/api/admin/order/getBillByOrderNo',
             data: {
             	orderNo:this.props.datauser.orderNo,
-            	pageNo: 1,
-                pageSize: 99,
             },
             success: function (data) {
                 let theArr = [];

+ 2 - 1
js/component/manageCenter/order/settlementOrder/mySettlement/mySettlement.jsx

@@ -196,7 +196,8 @@ const MySettlement=Form.create()(React.createClass({
                     title: '订单负责人',
                     dataIndex: 'salesmanName',
                     key: 'salesmanName',
-                },{
+                },
+                {
                 	title: '测试用操作',
                     dataIndex: 'zhifu',
                     key: 'zhifu',

+ 1 - 3
js/component/manageCenter/order/settlementOrder/mySettlement/mySettlementDetaile.jsx

@@ -277,11 +277,9 @@ const MySettlementDetaile = Form.create()(React.createClass({
             method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context +'/api/admin/order/queryAllBill',
+            url: globalConfig.context +'/api/admin/order/getBillByOrderNo',
             data: {
             	orderNo:this.props.datauser.orderNo,
-            	pageNo: 1,
-                pageSize: 99,
             },
             success: function (data) {
                 let theArr = [];

+ 1 - 3
js/component/manageCenter/order/settlementOrder/settlementManage/managementDetaile.jsx

@@ -275,11 +275,9 @@ const ManagementDetaile = Form.create()(React.createClass({
             method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context +'/api/admin/order/queryAllBill',
+            url: globalConfig.context +'/api/admin/order/getBillByOrderNo',
             data: {
             	orderNo:this.props.datauser.orderNo,
-            	pageNo: 1,
-                pageSize: 99,
             },
             success: function (data) {
                 let theArr = [];

+ 1 - 3
js/component/manageCenter/servicesManage/projectOrder/orderOrder/projectOrderDetaile.jsx

@@ -222,11 +222,9 @@ const MySettlementDetaile = Form.create()(React.createClass({
             method: "post",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context +'/api/admin/order/queryAllBill',
+            url: globalConfig.context +'/api/admin/order/getBillByOrderNo',
             data: {
             	orderNo:this.props.datauser.orderNo,
-            	pageNo: 1,
-                pageSize: 99,
             },
             success: function (data) {
                 let theArr = [];

+ 0 - 1
js/component/manageCenter/servicesManage/projectOrder/projectManagement/projectManage.jsx

@@ -183,7 +183,6 @@ const ProjectOrder=Form.create()(React.createClass({
     		KnotState:false,
     		signBillVisible:true
     	})
-    	this.editData(record)
     },
     //部门
 	departmentList() {

+ 1 - 1
js/component/manageCenter/servicesManage/projectOrder/projectManagement/projectManageDetaile.jsx

@@ -854,7 +854,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 	                    		</div>
 				                <div>
 				                	<span style={{marginLeft:'50px',fontSize:'20px'}}>项目任务</span>
-				                	{!this.props.projectState&&<Button type='primary' onClick={this.addTask} style={{float:'right',marginRight:'100px'}}>添加任务</Button>}
+				                	{orderDetaiel.projectStatus<3?<Button type='primary' onClick={this.addTask} style={{float:'right',marginRight:'100px'}}>添加任务</Button>:''}
 				                </div>
 				                <div className="patent-table">
 				                    <Spin spinning={this.state.loading}>