liting2017 7 years ago
parent
commit
30559fa01d

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

@@ -878,7 +878,7 @@ const NewService = Form.create()(React.createClass({
 							                    		<FormItem className="half-item"
 								                            {...formItemLayout}
 								                            label="特批立项" >   
-								                            <span>{orderDetaiel.approval}</span>
+								                            <span>{getApprovedState(orderDetaiel.approval)}</span>
 							                    		</FormItem>
 														<div className="clearfix">
 															<FormItem

+ 1 - 1
js/component/manageCenter/order/departmentOrder/servicesOrder/serviceManage.jsx

@@ -204,7 +204,7 @@ const ServiceManage=Form.create()(React.createClass({
                     title: '是否特批',
                     dataIndex: 'approval',
                     key: 'approval',
-                    render:text=>{return text==2?'已特批':'未特批'}
+                    render:text=>{return getApprovedState(text)}
                 },{
                     title: '订单渠道',
                     dataIndex: 'orderChannel',

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

@@ -1037,7 +1037,7 @@ const NewService = Form.create()(React.createClass({
 							                    		<FormItem className="half-item"
 								                            {...formItemLayout}
 								                            label="特批立项" >   
-								                            <span>{orderDetaiel.approval}</span>
+								                            <span>{getApprovedState(orderDetaiel.approval)}</span>
 							                    		</FormItem>
 														<div className="clearfix">
 															<FormItem

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

@@ -145,7 +145,7 @@ const MyService=Form.create()(React.createClass({
                     title: '是否特批',
                     dataIndex: 'approval',
                     key: 'approval',
-                    render:text=>{return text==2?'已特批':'未特批'}
+                    render:text=>{return getApprovedState(text)}
                 },{
                     title: '订单渠道',
                     dataIndex: 'orderChannel',

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

@@ -200,7 +200,7 @@ const ApproveOrder=Form.create()(React.createClass({
                     title: '是否特批',
                     dataIndex: 'approval',
                     key: 'approval',
-                    render:text=>{return text==2?'已特批':'未特批'}
+                    render:text=>{return getApprovedState(text)}
                 },{
                     title: '订单渠道',
                     dataIndex: 'orderChannel',

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

@@ -8,7 +8,7 @@ import MySettlementDetaile from "./mySettlementDetaile.jsx";
 import moment from 'moment';
 import '../../userMangagement.less';
 import {paymentState ,orderChannel} from '../../../../dataDic.js';
-import {getProjectState,getOrderChannel,getOrderType,getOrderState,getPaymentState} from '../../../../tools.js';
+import {getProjectState,getOrderChannel,getOrderType,getOrderState,getPaymentState,getApprovedState} from '../../../../tools.js';
 
 const MySettlement=Form.create()(React.createClass({
 	loadData(pageNo,depart) {
@@ -191,7 +191,7 @@ const MySettlement=Form.create()(React.createClass({
                     title: '是否特批',
                     dataIndex: 'approval',
                     key: 'approval',
-                    render:text=>{return text==2?'已特批':'未特批'}
+                    render:text=>{return getApprovedState(text)}
                 },{
                     title: '订单负责人',
                     dataIndex: 'salesmanName',

+ 2 - 2
js/component/manageCenter/order/settlementOrder/settlementManage/settlementManagement.jsx

@@ -8,7 +8,7 @@ import ManagementDetaile from "./managementDetaile.jsx";
 import moment from 'moment';
 import '../../userMangagement.less';
 import {orderState,orderChannel,orderType} from '../../../../dataDic.js';
-import {getProjectState,getOrderChannel,getOrderType,getOrderState,getPaymentState} from '../../../../tools.js';
+import {getProjectState,getOrderChannel,getOrderType,getOrderState,getPaymentState,getApprovedState} from '../../../../tools.js';
 
 const SettlementManage=Form.create()(React.createClass({
 	loadData(pageNo,depart) {
@@ -203,7 +203,7 @@ const SettlementManage=Form.create()(React.createClass({
                     title: '是否特批',
                    dataIndex: 'approval',
                     key: 'approval',
-                    render:text=>{return text==2?'已特批':'未特批'}
+                    render:text=>{return getApprovedState(text)}
                 },{
                     title: '订单部门',
                     dataIndex: 'departmentName',

+ 2 - 2
js/component/manageCenter/servicesManage/projectOrder/orderOrder/projectOrder.jsx

@@ -7,7 +7,7 @@ import MySettlementDetaile from "./projectOrderDetaile.jsx";
 import moment from 'moment';
 import '../userMangagement.less';
 import {orderState} from '../../../../dataDic.js';
-import {getPaymentState,getOrderState ,getOrderType   } from '../../../../tools.js';
+import {getPaymentState,getOrderState ,getOrderType ,getApprovedState} from '../../../../tools.js';
 
 const ProjectOrder=Form.create()(React.createClass({
 	loadData(pageNo) {
@@ -172,7 +172,7 @@ const ProjectOrder=Form.create()(React.createClass({
                     title: '是否特批',
                     dataIndex: 'approval',
                     key: 'approval',
-                    render:(text)=>{return text==2?'已特批':'未特批' }
+                    render:(text)=>{return getApprovedState(text) }
                 },{
                     title: '订单部门',
                     dataIndex: 'departmentName',

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

@@ -7,7 +7,7 @@ import MySettlementDetaile from "./projectManageDetaile.jsx";
 import moment from 'moment';
 import '../userMangagement.less';
 import {projectState} from '../../../../dataDic.js';
-import {getProjectState,getOrderState,getOrderType,getPaymentState} from '../../../../tools.js';
+import {getProjectState,getOrderState,getOrderType,getPaymentState,getApprovedState} from '../../../../tools.js';
 
 const ProjectOrder=Form.create()(React.createClass({
 	loadData(pageNo) {
@@ -153,7 +153,7 @@ const ProjectOrder=Form.create()(React.createClass({
                     title: '是否特批',
                     dataIndex: 'approval',
                     key: 'approval',
-                     render:(text)=>{return text==2?'已特批':'未特批' }
+                     render:(text)=>{return getApprovedState(text) }
                 },{
                 	title: '操作',
                     dataIndex: 'rr',