Browse Source

项目状态

HW 4 years ago
parent
commit
04c25113c6
53 changed files with 171 additions and 146 deletions
  1. 9 21
      js/component/dataDic.js
  2. 4 4
      js/component/manageCenter/financialManage/bonus/bonusDetail.jsx
  3. 3 3
      js/component/manageCenter/financialManage/bonus/jsBonus.jsx
  4. 2 1
      js/component/manageCenter/financialManage/bonus/jsBonus11.jsx
  5. 4 4
      js/component/manageCenter/financialManage/bonus/jsBonusDetail.jsx
  6. 3 3
      js/component/manageCenter/financialManage/bonus/yxBonus.jsx
  7. 7 6
      js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx
  8. 9 8
      js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx
  9. 3 2
      js/component/manageCenter/financialManage/distribute/inSpecial.jsx
  10. 2 1
      js/component/manageCenter/financialManage/distribute/invoiceApplyList.jsx
  11. 2 1
      js/component/manageCenter/financialManage/distribute/invoiceApplyListQuery.jsx
  12. 2 1
      js/component/manageCenter/financialManage/distribute/invoiceApplyListWai.jsx
  13. 2 1
      js/component/manageCenter/financialManage/distribute/outInvoiceQuery.jsx
  14. 3 2
      js/component/manageCenter/financialManage/distribute/outOutsourcingList.jsx
  15. 3 2
      js/component/manageCenter/financialManage/distribute/outSpecial.jsx
  16. 3 2
      js/component/manageCenter/financialManage/distribute/outsourcingPaiDan.jsx
  17. 5 4
      js/component/manageCenter/financialManage/distribute/shouKuanAll.jsx
  18. 5 4
      js/component/manageCenter/financialManage/distribute/shouKuang.jsx
  19. 2 1
      js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx
  20. 3 3
      js/component/manageCenter/order/bonus/yxBonus.jsx
  21. 3 3
      js/component/manageCenter/order/orderNew/addService.jsx
  22. 2 2
      js/component/manageCenter/order/orderNew/addorders.js
  23. 4 3
      js/component/manageCenter/order/orderNew/approveds.jsx
  24. 2 1
      js/component/manageCenter/order/orderNew/arrearsList.jsx
  25. 3 3
      js/component/manageCenter/order/orderNew/billing.jsx
  26. 2 1
      js/component/manageCenter/order/orderNew/changeComponent/orderDetail.js
  27. 2 1
      js/component/manageCenter/order/orderNew/checkOutsourcing.jsx
  28. 2 1
      js/component/manageCenter/order/orderNew/contractCwjl.js
  29. 2 1
      js/component/manageCenter/order/orderNew/contractCwzj.js
  30. 2 1
      js/component/manageCenter/order/orderNew/contractCwzy.js
  31. 2 1
      js/component/manageCenter/order/orderNew/contractJsjl.js
  32. 3 2
      js/component/manageCenter/order/orderNew/contractJsy.js
  33. 2 1
      js/component/manageCenter/order/orderNew/contractJszj.js
  34. 2 1
      js/component/manageCenter/order/orderNew/contractYxgly.js
  35. 2 1
      js/component/manageCenter/order/orderNew/contractYxy.js
  36. 2 1
      js/component/manageCenter/order/orderNew/costAuditList/detailsModal/projectOverview.js
  37. 3 2
      js/component/manageCenter/order/orderNew/costAuditList/index.js
  38. 2 1
      js/component/manageCenter/order/orderNew/examine.jsx
  39. 2 2
      js/component/manageCenter/order/orderNew/glCostAuditList/detailsModal/projectOverview.js
  40. 3 3
      js/component/manageCenter/order/orderNew/glCostAuditList/index.js
  41. 3 3
      js/component/manageCenter/order/orderNew/inquiry.jsx
  42. 4 3
      js/component/manageCenter/order/orderNew/outsourcingList.jsx
  43. 2 1
      js/component/manageCenter/order/orderNew/outsourcingPro.jsx
  44. 11 10
      js/component/manageCenter/order/orderNew/press.jsx
  45. 2 1
      js/component/manageCenter/order/orderNew/pressList.jsx
  46. 3 2
      js/component/manageCenter/personnel/personnel/personnelAll.jsx
  47. 10 10
      js/component/manageCenter/project/project/zxsglyOutSourcingPaiDan.jsx
  48. 2 1
      js/component/manageCenter/project/task/myTask.jsx
  49. 4 3
      js/component/manageCenter/project/task/myTaskOutsource.jsx
  50. 2 1
      js/component/manageCenter/project/task/payApplyReject/index.jsx
  51. 3 3
      js/component/manageCenter/project/task/taskAssignment.jsx
  52. 1 1
      js/component/manageCenter/project/task/taskCount.jsx
  53. 1 1
      js/component/project.jsx

+ 9 - 21
js/component/dataDic.js

@@ -2943,14 +2943,14 @@ module.exports = {
       label:'暂停(业务线通知暂停)',
     },
     {
-      value: '',
+      value:4,
+      label:'已提交',
+    },
+    {
+      value: '高新',
       label: '高新',
       children:[
         {
-          value:4,
-          label:'已提交',
-        },
-        {
           value:5,
           label:'未推荐',
         },
@@ -2985,14 +2985,10 @@ module.exports = {
       ]
     },
     {
-      value: '',
+      value: '科技',
       label: '科技',
       children:[
         {
-          value:4,
-          label:'已提交',
-        },
-        {
           value:5,
           label:'未推荐',
         },
@@ -3035,14 +3031,10 @@ module.exports = {
       ]
     },
     {
-      value: '',
+      value: '专利',
       label: '专利',
       children:[
         {
-          value:4,
-          label:'已提交',
-        },
-        {
           value:19,
           label:'已完成/下证',
         },
@@ -3061,14 +3053,10 @@ module.exports = {
       ]
     },
     {
-      value: '',
+      value: '通用',
       label: '通用',
       children:[
         {
-          value:4,
-          label:'已提交',
-        },
-        {
           value:19,
           label:'已完成/下证',
         },
@@ -3079,7 +3067,7 @@ module.exports = {
       ]
     },
     {
-      value: '',
+      value: '会员',
       label: '会员',
       children:[
         {

+ 4 - 4
js/component/manageCenter/financialManage/bonus/bonusDetail.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import { Form, Spin, message, Modal } from 'antd';
-import {getProjectStatus,getNewOrderStatus,getJsyPaymentType} from '@/tools.js';
+import {getProjectName,getNewOrderStatus,getJsyPaymentType} from '@/tools.js';
 
 const BonusDetail=React.createClass({
     getInitialState() {
@@ -44,7 +44,7 @@ const BonusDetail=React.createClass({
 	            <Modal maskClosable={false} visible={this.state.visible}
                         onOk={this.onShow} onCancel={this.onCancel}
                         width='800px'
-                        title='订单详情'                     
+                        title='订单详情'
                         footer=''
                         className="admin-desc-content">
 			            <Form layout="horizontal" onSubmit={(e)=>{this.handleSubmit(e,0)}} >
@@ -78,7 +78,7 @@ const BonusDetail=React.createClass({
                                         <span>{getNewOrderStatus(theData.orderStatus)}</span>
                                     </FormItem>
                                     <FormItem className="half-item" {...formItemLayout} label="项目状态">
-                                        <span>{getProjectStatus(theData.projectStatus)}</span>
+                                        <span>{getProjectName(theData.projectStatus)}</span>
                                     </FormItem>
                                     <FormItem className="half-item" {...formItemLayout} label="发放类型">
                                         <span>{getJsyPaymentType(theData.bonusSubject)}</span>
@@ -107,4 +107,4 @@ const BonusDetail=React.createClass({
     }
 });
 
-export default Form.create()(BonusDetail);
+export default Form.create()(BonusDetail);

+ 3 - 3
js/component/manageCenter/financialManage/bonus/jsBonus.jsx

@@ -4,7 +4,7 @@ import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import '../distribute/public.less';
 import { Button, Input, Spin, Table, Select, Switch, message, DatePicker, Modal, Form, Tabs } from 'antd';
-import { getProjectStatus, getTaskStatus, getBonusState, getLiquidationStatus, getJsyPaymentType } from '@/tools';
+import { getProjectName, getTaskStatus, getBonusState, getLiquidationStatus, getJsyPaymentType } from '@/tools';
 import JsBonuseDetail from './jsBonusDetail';
 import { ChooseList } from "../../order/orderNew/chooseList";
 const FormItem = Form.Item;
@@ -189,7 +189,7 @@ const JsBonus = React.createClass({
           dataIndex: "projectStatus",
           key: "projectStatus",
           render: text => {
-            return getProjectStatus(text);
+            return getProjectName(text);
           }
         },
         {
@@ -581,4 +581,4 @@ const JsBonus = React.createClass({
   }
 });
 
-export default JsBonus;
+export default JsBonus;

+ 2 - 1
js/component/manageCenter/financialManage/bonus/jsBonus11.jsx

@@ -7,6 +7,7 @@ import {  Button, Input, Spin, Table,Select, Switch, message, DatePicker,Modal ,
 import {getProjectStatus,getTaskStatus,getBonusState,getLiquidationStatus,getJsyPaymentType} from '@/tools';
 import JsBonuseDetail from './jsBonusDetail';
 import { ChooseList } from "../../order/orderNew/chooseList";
+import {getProjectName} from "../../../tools";
 const FormItem= Form.Item;
 
 const JsBonus = React.createClass({
@@ -189,7 +190,7 @@ const JsBonus = React.createClass({
           dataIndex: "projectStatus",
           key: "projectStatus",
           render: text => {
-            return getProjectStatus(text);
+            return getProjectName(text);
           }
         },
         {

+ 4 - 4
js/component/manageCenter/financialManage/bonus/jsBonusDetail.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import { Form, Spin, message, Modal } from 'antd';
-import {getTaskStatus,getProjectStatus,getLiquidationStatus,getJsyPaymentType,getBonusState} from '@/tools.js';
+import {getTaskStatus,getProjectName,getLiquidationStatus,getJsyPaymentType,getBonusState} from '@/tools.js';
 
 const BonusDetail=React.createClass({
     getInitialState() {
@@ -44,7 +44,7 @@ const BonusDetail=React.createClass({
 	            <Modal maskClosable={false} visible={this.state.visible}
                         onOk={this.onShow} onCancel={this.onCancel}
                         width='800px'
-                        title='任务详情'                     
+                        title='任务详情'
                         footer=''
                         className="admin-desc-content">
 			            <Form layout="horizontal" onSubmit={(e)=>{this.handleSubmit(e,0)}} >
@@ -69,7 +69,7 @@ const BonusDetail=React.createClass({
                                         <span>{theData.commodityQuantity}</span>
                                     </FormItem>
                                     <FormItem className="half-item" {...formItemLayout} label="项目状态">
-                                        <span>{getProjectStatus(theData.projectStatus)}</span>
+                                        <span>{getProjectName(theData.projectStatus)}</span>
                                     </FormItem>
                                     <FormItem className="half-item" {...formItemLayout} label="受理日期">
 							            <span>{theData.acceptTime}</span>
@@ -98,4 +98,4 @@ const BonusDetail=React.createClass({
     }
 });
 
-export default Form.create()(BonusDetail);
+export default Form.create()(BonusDetail);

+ 3 - 3
js/component/manageCenter/financialManage/bonus/yxBonus.jsx

@@ -4,7 +4,7 @@ import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import '../distribute/public.less';
 import { Button, Input, Spin, Table, Select, Switch, InputNumber, message, DatePicker, Modal, Form, Tabs } from 'antd';
-import { getNewOrderStatus, getProjectStatus, getJsyPaymentType, getBonusState, ShowModal } from '@/tools';
+import { getNewOrderStatus, getProjectName, getJsyPaymentType, getBonusState, ShowModal } from '@/tools';
 import BonuseDetail from './bonusDetail';
 import { ChooseList } from "../../order/orderNew/chooseList";
 const FormItem = Form.Item;
@@ -169,7 +169,7 @@ const YxBonus = React.createClass({
           dataIndex: "projectStatus",
           key: "projectStatus",
           render: text => {
-            return getProjectStatus(text);
+            return getProjectName(text);
           }
         },
         {
@@ -613,4 +613,4 @@ const YxBonus = React.createClass({
   }
 });
 
-export default YxBonus;
+export default YxBonus;

+ 7 - 6
js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx

@@ -42,6 +42,7 @@ import {
 } from '@/tools'
 import { ChooseList } from '../../../../component/manageCenter/order/orderNew/chooseList'
 import ImgList from "../../../common/imgList";
+import {getProjectName} from "../../../tools";
 const FormItem = Form.Item
 
 const approvedOutsourcing = React.createClass({
@@ -531,7 +532,7 @@ const approvedOutsourcing = React.createClass({
           dataIndex: 'projectStatus',
           key: 'projectStatus',
           render: (text) => {
-            return getProjectStatus(text)
+            return getProjectName(text)
           },
         },
         {
@@ -594,7 +595,7 @@ const approvedOutsourcing = React.createClass({
           dataIndex: 'projectStatus',
           key: 'projectStatus',
           render: (text) => {
-            return getProjectStatus(text)
+            return getProjectName(text)
           },
         },
         {
@@ -694,7 +695,7 @@ const approvedOutsourcing = React.createClass({
           dataIndex: 'projectStatus',
           key: 'projectStatus',
           render: (text) => {
-            return getProjectStatus(text)
+            return getProjectName(text)
           },
         },
         {
@@ -929,7 +930,7 @@ const approvedOutsourcing = React.createClass({
           dataIndex: 'projectStatus',
           key: 'projectStatus',
           render: (text) => {
-            return getProjectStatus(text)
+            return getProjectName(text)
           },
         },
         {
@@ -1111,7 +1112,7 @@ const approvedOutsourcing = React.createClass({
           dataIndex: 'projectStatus',
           key: 'projectStatus',
           render: (text) => {
-            return getProjectStatus(text)
+            return getProjectName(text)
           },
         },
         {
@@ -1248,7 +1249,7 @@ const approvedOutsourcing = React.createClass({
           dataIndex: 'projectStatus',
           key: 'projectStatus',
           render: (text) => {
-            return getProjectStatus(text)
+            return getProjectName(text)
           },
         },
       ],

+ 9 - 8
js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx

@@ -41,6 +41,7 @@ import {
 } from "@/tools";
 import { ChooseList } from "../../../../component/manageCenter/order/orderNew/chooseList";
 import ImgList from "../../../common/imgList";
+import {getProjectName} from "../../../tools";
 const FormItem = Form.Item;
 
 const approvedOutsourcing = React.createClass({
@@ -647,7 +648,7 @@ const approvedOutsourcing = React.createClass({
           dataIndex: "projectStatus",
           key: "projectStatus",
           render: (text) => {
-            return getProjectStatus(text);
+            return getProjectName(text);
           },
         },
         {
@@ -710,7 +711,7 @@ const approvedOutsourcing = React.createClass({
           dataIndex: "projectStatus",
           key: "projectStatus",
           render: (text) => {
-            return getProjectStatus(text);
+            return getProjectName(text);
           },
         },
         {
@@ -835,7 +836,7 @@ const approvedOutsourcing = React.createClass({
           dataIndex: "projectStatus",
           key: "projectStatus",
           render: (text) => {
-            return getProjectStatus(text);
+            return getProjectName(text);
           },
         },
         {
@@ -1028,7 +1029,7 @@ const approvedOutsourcing = React.createClass({
           dataIndex: "projectStatus",
           key: "projectStatus",
           render: (text) => {
-            return getProjectStatus(text);
+            return getProjectName(text);
           },
         },
         {
@@ -1162,7 +1163,7 @@ const approvedOutsourcing = React.createClass({
           dataIndex: "projectStatus",
           key: "projectStatus",
           render: (text) => {
-            return getProjectStatus(text);
+            return getProjectName(text);
           },
         },
       ],
@@ -1393,7 +1394,7 @@ const approvedOutsourcing = React.createClass({
           dataIndex: "projectStatus",
           key: "projectStatus",
           render: (text) => {
-            return getProjectStatus(text);
+            return getProjectName(text);
           },
         },
         {
@@ -3606,7 +3607,7 @@ const approvedOutsourcing = React.createClass({
 												<FormItem className="half-item"
 												     labelCol={{ span: 8 }}
 												    wrapperCol={{ span: 14 }}
-												    label="上传协议文件" >  
+												    label="上传协议文件" >
 													<Upload header={{authorization: 'authorization-text'}} action={globalConfig.context + "/api/admin/outsourceOrg/uploadOutsourceFile"}
 															data={(e)=>{
 																return {
@@ -3614,7 +3615,7 @@ const approvedOutsourcing = React.createClass({
 																}
 															}}
 															fileList={this.state.attachmentUrl}
-															showUploadList={{showRemoveIcon:false}} 
+															showUploadList={{showRemoveIcon:false}}
 															onPreview={(e)=>{
 																let url = window.location.href.substring(7)
 																window.location.href="http://"+url.substring(0,url.indexOf("/"))+"/api/admin/outsourceOrg//downloadFile?path="+e.response.data

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

@@ -30,6 +30,7 @@ const FormItem = Form.Item;
 const {TabPane} = Tabs
 import OrderDesc from "../../financialManage/orderDetail/orderDesc";
 import ImgList from "../../../common/imgList";
+import {getProjectName} from "../../../tools";
 const inSpecial = React.createClass({
   departmentList() {
     this.setState({
@@ -267,7 +268,7 @@ const inSpecial = React.createClass({
           dataIndex: "projectStatus",
           key: "projectStatus",
           render: text => {
-            return getProjectStatus(text);
+            return getProjectName(text);
           }
         },
         {
@@ -696,7 +697,7 @@ const inSpecial = React.createClass({
           top={55}
         />
         </div>
-        
+
 </TabPane>
 </Tabs>
         <div className="patent-table">

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

@@ -28,6 +28,7 @@ import { ChooseList } from "../../../../component/manageCenter/order/orderNew/ch
 import ShowModalDiv from "@/showModal.jsx";
 import OrderDesc from "../orderDetail/orderDesc";
 import KaiPiaoModal from "./kaiPiaoModal"
+import {getProjectName} from "../../../tools";
 const FormItem = Form.Item;
 const { TabPane } = Tabs
 
@@ -266,7 +267,7 @@ const invoiceApplyList = React.createClass({
           dataIndex: "projectStatus",
           key: "projectStatus",
           render: text => {
-            return getProjectStatus(text);
+            return getProjectName(text);
           }
         },
         {

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

@@ -28,6 +28,7 @@ import {
 import { ChooseList } from "../../../../component/manageCenter/order/orderNew/chooseList";
 import ShowModalDiv from "@/showModal.jsx";
 import OrderDesc from "../orderDetail/orderDesc";
+import {getProjectName} from "../../../tools";
 const FormItem = Form.Item;
 const { TabPane } = Tabs
 
@@ -264,7 +265,7 @@ const invoiceApplyListQuery = React.createClass({
           dataIndex: "projectStatus",
           key: "projectStatus",
           render: text => {
-            return getProjectStatus(text);
+            return getProjectName(text);
           }
         },
         // {

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

@@ -28,6 +28,7 @@ const FormItem = Form.Item;
 const {TabPane}= Tabs
 import OrderDesc from "../orderDetail/orderDesc";
 import {ChooseList} from "../../order/orderNew/chooseList";
+import {getProjectName} from "../../../tools";
 const invoiceApplyListWai = React.createClass({
   departmentList() {
     this.setState({
@@ -266,7 +267,7 @@ const invoiceApplyListWai = React.createClass({
           dataIndex: "projectStatus",
           key: "projectStatus",
           render: text => {
-            return getProjectStatus(text);
+            return getProjectName(text);
           }
         },
         {

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

@@ -28,6 +28,7 @@ import {
 import ShowModalDiv from "@/showModal.jsx";
 import { ChooseList } from "../../../../component/manageCenter/order/orderNew/chooseList";
 import ImgList from "../../../common/imgList";
+import {getProjectName} from "../../../tools";
 
 const FormItem = Form.Item;
 const { TabPane } = Tabs
@@ -262,7 +263,7 @@ const outInvoiceQuery = React.createClass({
           dataIndex: "projectStatus",
           key: "projectStatus",
           render: text => {
-            return getProjectStatus(text);
+            return getProjectName(text);
           }
         },
         // {

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

@@ -30,6 +30,7 @@ import {
 } from "@/tools";
 import ImgList from "../../../common/imgList";
 import {ChooseList} from "../../order/orderNew/chooseList";
+import {getProjectName} from "../../../tools";
 const FormItem = Form.Item;
 
 const outsourcingPaiDan = React.createClass({
@@ -258,7 +259,7 @@ const outsourcingPaiDan = React.createClass({
           dataIndex: "projectStatus",
           key: "projectStatus",
           render: (text) => {
-            return getProjectStatus(text);
+            return getProjectName(text);
           },
         },
         {
@@ -362,7 +363,7 @@ const outsourcingPaiDan = React.createClass({
           dataIndex: "projectStatus",
           key: "projectStatus",
           render: (text) => {
-            return getProjectStatus(text);
+            return getProjectName(text);
           },
         },
       ],

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

@@ -17,6 +17,7 @@ const FormItem = Form.Item;
 
 import OrderDesc from "../orderDetail/orderDesc";
 import {ChooseList} from "../../order/orderNew/chooseList";
+import {getProjectName} from "../../../tools";
 
 const outSpecial = React.createClass({
   departmentList() {
@@ -245,7 +246,7 @@ const outSpecial = React.createClass({
           dataIndex: "projectStatus",
           key: "projectStatus",
           render: text => {
-            return getProjectStatus(text);
+            return getProjectName(text);
           }
         },
         {
@@ -590,7 +591,7 @@ const outSpecial = React.createClass({
     const formItemLayout = {
       labelCol: { span: 8 },
       wrapperCol: { span: 14 }
-    }; 
+    };
     const { TabPane } = Tabs
     return (
       <div className="user-content">

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

@@ -31,6 +31,7 @@ import {
 } from "@/tools";
 import ImgList from "../../../common/imgList";
 import {ChooseList} from "../../order/orderNew/chooseList";
+import {getProjectName} from "../../../tools";
 const FormItem = Form.Item;
 
 const outsourcingPaiDan = React.createClass({
@@ -307,7 +308,7 @@ const outsourcingPaiDan = React.createClass({
           dataIndex: "projectStatus",
           key: "projectStatus",
           render: (text) => {
-            return getProjectStatus(text);
+            return getProjectName(text);
           },
         },
         {
@@ -411,7 +412,7 @@ const outsourcingPaiDan = React.createClass({
           dataIndex: "projectStatus",
           key: "projectStatus",
           render: (text) => {
-            return getProjectStatus(text);
+            return getProjectName(text);
           },
         },
       ],

+ 5 - 4
js/component/manageCenter/financialManage/distribute/shouKuanAll.jsx

@@ -37,6 +37,7 @@ import {
 } from "@/tools";
 import { ChooseList } from "../../order/orderNew/chooseList";
 import Project from "../../../../component/project"
+import {getProjectName} from "../../../tools";
 const FormItem = Form.Item;
 const { TabPane } = Tabs;
 
@@ -264,7 +265,7 @@ const ShouKuang = React.createClass({
           dataIndex: "projectStatus",
           key: "projectStatus",
           render: (text) => {
-            return getProjectStatus(text);
+            return getProjectName(text);
           },
         },
         {
@@ -339,7 +340,7 @@ const ShouKuang = React.createClass({
           dataIndex: "projectStatus",
           key: "projectStatus",
           render: (text) => {
-            return getProjectStatus(text);
+            return getProjectName(text);
           },
         },
         {
@@ -439,7 +440,7 @@ const ShouKuang = React.createClass({
           dataIndex: "projectStatus",
           key: "projectStatus",
           render: (text) => {
-            return getProjectStatus(text);
+            return getProjectName(text);
           },
         },
         {
@@ -564,7 +565,7 @@ const ShouKuang = React.createClass({
           dataIndex: "projectStatus",
           key: "projectStatus",
           render: (text) => {
-            return getProjectStatus(text);
+            return getProjectName(text);
           },
         },
         {

+ 5 - 4
js/component/manageCenter/financialManage/distribute/shouKuang.jsx

@@ -39,6 +39,7 @@ import {
 import { ChooseList } from "../../order/orderNew/chooseList"
 import Project from "../../../../component/project"
 import { throws } from "assert";
+import {getProjectName} from "../../../tools";
 const FormItem = Form.Item;
 const { TabPane } = Tabs;
 const { TextArea } = Input;
@@ -282,7 +283,7 @@ const ShouKuang = React.createClass({
           dataIndex: "projectStatus",
           key: "projectStatus",
           render: (text) => {
-            return getProjectStatus(text);
+            return getProjectName(text);
           },
         },
         {
@@ -357,7 +358,7 @@ const ShouKuang = React.createClass({
           dataIndex: "projectStatus",
           key: "projectStatus",
           render: (text) => {
-            return getProjectStatus(text);
+            return getProjectName(text);
           },
         },
         {
@@ -457,7 +458,7 @@ const ShouKuang = React.createClass({
           dataIndex: "projectStatus",
           key: "projectStatus",
           render: (text) => {
-            return getProjectStatus(text);
+            return getProjectName(text);
           },
         },
         {
@@ -584,7 +585,7 @@ const ShouKuang = React.createClass({
           dataIndex: "projectStatus",
           key: "projectStatus",
           render: (text) => {
-            return getProjectStatus(text);
+            return getProjectName(text);
           },
         },
         {

+ 2 - 1
js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx

@@ -25,6 +25,7 @@ import {
 import OrderRiZi from "@/orderRiZi.jsx";
 import ResolutionDetail from "@/resolutionDetail";
 import ImgList from "../../../common/imgList";
+import {getProjectName} from "../../../tools";
 const OrderDetail = Form.create()(
   React.createClass({
     loadXmu(record) {
@@ -155,7 +156,7 @@ const OrderDetail = Form.create()(
             dataIndex: "projectStatus",
             key: "projectStatus",
             render: (text) => {
-              return getProjectStatus(text);
+              return getProjectName(text);
             },
           },
           {

+ 3 - 3
js/component/manageCenter/order/bonus/yxBonus.jsx

@@ -6,7 +6,7 @@ import '@/manageCenter/financialManage/distribute/public.less';
 import { Button, Input, Spin, Table, Select, Switch, message, DatePicker, Tabs } from 'antd';
 import {
   getNewOrderStatus,
-  getProjectStatus,
+  getProjectName,
   getJsyPaymentType,
   getBonusState,
   ShowModal
@@ -169,7 +169,7 @@ const YxBonus = React.createClass({
           dataIndex: 'projectStatus',
           key: 'projectStatus',
           render: (text) => {
-            return getProjectStatus(text)
+            return getProjectName(text)
           }
         },
         {
@@ -434,4 +434,4 @@ const YxBonus = React.createClass({
   }
 })
 
-export default YxBonus;
+export default YxBonus;

+ 3 - 3
js/component/manageCenter/order/orderNew/addService.jsx

@@ -44,9 +44,9 @@ import {
   getApprovedState,
   getjiedian,
   getCuikuan,
-  getProjectStatus,
+  getProjectName,
   moneyVerify,
-  getProcessStatusNew
+  getProcessStatusNew,
 } from "../../../tools.js";
 import { cuiJieDian } from "@/dataDic.js"
 import PicturesWall from "./changeComponent/picturesWall.js";
@@ -261,7 +261,7 @@ const NewService = Form.create()(
             dataIndex: "projectStatus",
             key: "projectStatus",
             render: (text) => {
-              return getProjectStatus(text);
+              return getProjectName(text);
             },
           },
           {

+ 2 - 2
js/component/manageCenter/order/orderNew/addorders.js

@@ -29,7 +29,7 @@ import {
   getApprovedState,
   getjiedian,
   getCuikuan,
-  getProjectStatus
+  getProjectStatus, getProjectName
 } from "../../../tools.js";
 import PicturesWall from "./changeComponent/picturesWall.js";
 import ResolutionDetail from "@/resolutionDetail";
@@ -217,7 +217,7 @@ const Addorders = Form.create()(
             dataIndex: "projectStatus",
             key: "projectStatus",
             render: (text) => {
-              return getProjectStatus(text);
+              return getProjectName(text);
             },
           },
           {

+ 4 - 3
js/component/manageCenter/order/orderNew/approveds.jsx

@@ -39,6 +39,7 @@ import { ChooseList } from "../orderNew/chooseList";
 import ShowModalDiv from "@/showModal.jsx";
 import Project from "../../../../component/project";
 import ImgList from "../../../common/imgList";
+import {getProjectName} from "../../../tools";
 const { TabPane } = Tabs;
 const { TextArea } = Input;
 //图片组件
@@ -669,7 +670,7 @@ const IntentionCustomer = Form.create()(
             dataIndex: "projectStatus",
             key: "projectStatus",
             render: (text) => {
-              return getProjectStatus(text);
+              return getProjectName(text);
             },
           },
           {
@@ -755,7 +756,7 @@ const IntentionCustomer = Form.create()(
             dataIndex: "projectStatus",
             key: "projectStatus",
             render: (text) => {
-              return getProjectStatus(text);
+              return getProjectName(text);
             },
           },
           {
@@ -889,7 +890,7 @@ const IntentionCustomer = Form.create()(
             dataIndex: "projectStatus",
             key: "projectStatus",
             render: (text) => {
-              return getProjectStatus(text);
+              return getProjectName(text);
             },
           },
           {

+ 2 - 1
js/component/manageCenter/order/orderNew/arrearsList.jsx

@@ -23,6 +23,7 @@ import {
 } from "@/tools.js";
 import "./customer.less";
 import {ChooseList} from "./chooseList";
+import {getProjectName} from "../../../tools";
 
 const ArrearsList = Form.create()(
   React.createClass({
@@ -149,7 +150,7 @@ const ArrearsList = Form.create()(
             dataIndex: "projectStatus",
             key: "projectStatus",
             render: (text) => {
-              return getProjectStatus(text);
+              return getProjectName(text);
             },
           },
           {

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

@@ -16,7 +16,7 @@ import {
   getInvoiceStatus,
   splitUrl,
   ShowModal,
-  getProjectStatus
+  getProjectStatus, getProjectName
 } from "../../../tools.js";
 import ShowModalDiv from "@/showModal.jsx";
 import { ChooseList } from "../orderNew/chooseList";
@@ -259,7 +259,7 @@ const MyService = Form.create()(
             dataIndex: "projectStatus",
             key: "projectStatus",
             render: text => {
-              return getProjectStatus(text);
+              return getProjectName(text);
             }
           },
           {
@@ -376,7 +376,7 @@ const MyService = Form.create()(
             dataIndex: "projectStatus",
             key: "projectStatus",
             render: text => {
-              return getProjectStatus(text);
+              return getProjectName(text);
             }
           },
           {

+ 2 - 1
js/component/manageCenter/order/orderNew/changeComponent/orderDetail.js

@@ -13,6 +13,7 @@ import {
 import img from "./img.png"
 import ResolutionDetail from "@/resolutionDetail";
 import ImgList from "../../../../common/imgList";
+import {getProjectName} from "../../../../tools";
 
 const FormItem = Form.Item;
 class OrderDetail extends Component {
@@ -193,7 +194,7 @@ class OrderDetail extends Component {
           dataIndex: "projectStatus",
           key: "projectStatus",
           render: text => {
-            return getProjectStatus(text);
+            return getProjectName(text);
           }
         },
         {

+ 2 - 1
js/component/manageCenter/order/orderNew/checkOutsourcing.jsx

@@ -31,6 +31,7 @@ import './customer.less'
 import ResolutionDetail from '@/resolutionDetail'
 import ImgList from "../../../common/imgList";
 import {ChooseList} from "./chooseList";
+import {getProjectName} from "../../../tools";
 
 const checkOutsourcing = Form.create()(
   React.createClass({
@@ -244,7 +245,7 @@ const checkOutsourcing = Form.create()(
             dataIndex: 'projectStatus',
             key: 'projectStatus',
             render: (text) => {
-              return getProjectStatus(text)
+              return getProjectName(text)
             },
           },
           {

+ 2 - 1
js/component/manageCenter/order/orderNew/contractCwjl.js

@@ -21,6 +21,7 @@ import ShowModalDiv from "@/showModal.jsx";
 const { RangePicker } = DatePicker;
 import ReactToPrint from "react-to-print";
 import OrderRiZi from "@/orderRiZi.jsx";
+import {getProjectName} from "../../../tools";
 
 const contractChange = Form.create()(
   React.createClass({
@@ -259,7 +260,7 @@ const contractChange = Form.create()(
             dataIndex: "projectStatus",
             key: "projectStatus",
             render: text => {
-              return getProjectStatus(text);
+              return getProjectName(text);
             }
           },
           {

+ 2 - 1
js/component/manageCenter/order/orderNew/contractCwzj.js

@@ -19,6 +19,7 @@ import OrderDetail from "./changeComponent/orderDetail";
 import { ChooseList } from "./chooseList.jsx";
 import ShowModalDiv from "@/showModal.jsx";
 import OrderRiZi from "@/orderRiZi.jsx";
+import {getProjectName} from "../../../tools";
 
 const contractChange = Form.create()(
   React.createClass({
@@ -256,7 +257,7 @@ const contractChange = Form.create()(
             dataIndex: "projectStatus",
             key: "projectStatus",
             render: text => {
-              return getProjectStatus(text);
+              return getProjectName(text);
             }
           },
           {

+ 2 - 1
js/component/manageCenter/order/orderNew/contractCwzy.js

@@ -21,6 +21,7 @@ import ShowModalDiv from "@/showModal.jsx";
 const { RangePicker } = DatePicker;
 import ReactToPrint from "react-to-print";
 import OrderRiZi from "@/orderRiZi.jsx";
+import {getProjectName} from "../../../tools";
 
 const contractChange = Form.create()(
   React.createClass({
@@ -259,7 +260,7 @@ const contractChange = Form.create()(
             dataIndex: "projectStatus",
             key: "projectStatus",
             render: text => {
-              return getProjectStatus(text);
+              return getProjectName(text);
             }
           },
           {

+ 2 - 1
js/component/manageCenter/order/orderNew/contractJsjl.js

@@ -19,6 +19,7 @@ import OrderDetail from "./changeComponent/orderDetail";
 import ShowModalDiv from "@/showModal.jsx";
 import OrderRiZi from "@/orderRiZi.jsx";
 import {ChooseList} from "./chooseList";
+import {getProjectName} from "../../../tools";
 
 const contractChange = Form.create()(
   React.createClass({
@@ -255,7 +256,7 @@ const contractChange = Form.create()(
             dataIndex: "projectStatus",
             key: "projectStatus",
             render: text => {
-              return getProjectStatus(text);
+              return getProjectName(text);
             }
           },
           {

+ 3 - 2
js/component/manageCenter/order/orderNew/contractJsy.js

@@ -19,6 +19,7 @@ import OrderDetail from "./changeComponent/orderDetail";
 import ShowModalDiv from "@/showModal.jsx";
 import OrderRiZi from "@/orderRiZi.jsx";
 import {ChooseList} from "./chooseList";
+import {getProjectName} from "../../../tools";
 const contractChange = Form.create()(
   React.createClass({
     loadData(pageNo) {
@@ -251,7 +252,7 @@ const contractChange = Form.create()(
             dataIndex: "projectStatus",
             key: "projectStatus",
             render: text => {
-              return getProjectStatus(text);
+              return getProjectName(text);
             }
           },
           {
@@ -1157,7 +1158,7 @@ const contractChange = Form.create()(
                 {tabList.map((item, index) => {
                   return (
                     <TabPane tab={"合同变更记录" + (index + 1)} key={item.id}>
-                      
+
                           <ChangeDetail
                             id={item.id}
                             data={this.state.contractData}

+ 2 - 1
js/component/manageCenter/order/orderNew/contractJszj.js

@@ -19,6 +19,7 @@ import OrderDetail from "./changeComponent/orderDetail";
 import ShowModalDiv from "@/showModal.jsx";
 import OrderRiZi from "@/orderRiZi.jsx";
 import {ChooseList} from "./chooseList";
+import {getProjectName} from "../../../tools";
 const contractChange = Form.create()(
   React.createClass({
     loadData(pageNo) {
@@ -254,7 +255,7 @@ const contractChange = Form.create()(
             dataIndex: "projectStatus",
             key: "projectStatus",
             render: text => {
-              return getProjectStatus(text);
+              return getProjectName(text);
             }
           },
           {

+ 2 - 1
js/component/manageCenter/order/orderNew/contractYxgly.js

@@ -19,6 +19,7 @@ import OrderDetail from "./changeComponent/orderDetail";
 import ShowModalDiv from "@/showModal.jsx";
 import OrderRiZi from "@/orderRiZi.jsx";
 import {ChooseList} from "./chooseList";
+import {getProjectName} from "../../../tools";
 const contractChange = Form.create()(
   React.createClass({
     loadData(pageNo) {
@@ -249,7 +250,7 @@ const contractChange = Form.create()(
             dataIndex: "projectStatus",
             key: "projectStatus",
             render: text => {
-              return getProjectStatus(text);
+              return getProjectName(text);
             }
           },
           {

+ 2 - 1
js/component/manageCenter/order/orderNew/contractYxy.js

@@ -22,6 +22,7 @@ import ChangeApply from "./changeComponent/changeApply";
 import { ChooseList } from "./chooseList.jsx";
 import ShowModalDiv from "@/showModal.jsx";
 import OrderRiZi from "@/orderRiZi.jsx";
+import {getProjectName} from "../../../tools";
 
 const contractChange = Form.create()(
   React.createClass({
@@ -258,7 +259,7 @@ const contractChange = Form.create()(
             dataIndex: "projectStatus",
             key: "projectStatus",
             render: text => {
-              return getProjectStatus(text);
+              return getProjectName(text);
             }
           },
           {

+ 2 - 1
js/component/manageCenter/order/orderNew/costAuditList/detailsModal/projectOverview.js

@@ -35,6 +35,7 @@ import '@/manageCenter/financialManage/distribute/shouKuan.less'
 import OrderRiZi from '@/orderRiZi.jsx'
 import moment from "moment";
 import $ from "jquery";
+import {getProjectName} from "../../../../../tools";
 
 const FormItem = Form.Item
 const { Option } = Select
@@ -551,7 +552,7 @@ class projectOverview extends Component{
                                 label="项目状态"
                             >
                                 {/* <span>{getProcessStatus(this.state.projectStatus)}</span> */}
-                                <span>{getProjectStatus(this.state.projectStatus)}</span>
+                                <span>{getProjectName(this.state.projectStatus)}</span>
                             </FormItem>
                             <FormItem
                                 className="half-item"

+ 3 - 2
js/component/manageCenter/order/orderNew/costAuditList/index.js

@@ -15,6 +15,7 @@ import "../customer.less";
 import CheckProject from "../../../components/checkProject";
 import PayRecord from "../../../components/checkProject/payRecord";
 import {ChooseList} from "../chooseList";
+import {getProjectName} from "../../../../tools";
 
 const { TabPane } = Tabs;
 
@@ -44,7 +45,7 @@ class CostAuditList extends Component{
                     dataIndex: "projectStatus",
                     key: "projectStatus",
                     render: (text) => {
-                        return getProjectStatus(text);
+                        return getProjectName(text);
                     },
                 },
                 {
@@ -528,4 +529,4 @@ class CostAuditList extends Component{
     }
 }
 
-export default CostAuditList
+export default CostAuditList

+ 2 - 1
js/component/manageCenter/order/orderNew/examine.jsx

@@ -36,6 +36,7 @@ import ResolutionDetail from "@/resolutionDetail";
 import OrderRiZi from "@/orderRiZi.jsx";
 import ImgList from "../../../common/imgList";
 import {ChooseList} from "./chooseList";
+import {getProjectName} from "../../../tools";
 const confirm = Modal.confirm;
 const { Option } = Select;
 //图片组件
@@ -335,7 +336,7 @@ const IntentionCustomer = Form.create()(
             dataIndex: "projectStatus",
             key: "projectStatus",
             render: (text) => {
-              return getProjectStatus(text);
+              return getProjectName(text);
             },
           },
           {

+ 2 - 2
js/component/manageCenter/order/orderNew/glCostAuditList/detailsModal/projectOverview.js

@@ -26,7 +26,7 @@ import {
     getboutique,
     getprovince,
     ShowModal,
-    getRefundStatus,
+    getProjectName,
 } from '@/tools'
 import { taskStatus, projectStatus, cuiJieDian } from '@/dataDic.js'
 import { areaSelect } from '@/NewDicProvinceList'
@@ -551,7 +551,7 @@ class projectOverview extends Component{
                                 label="项目状态"
                             >
                                 {/* <span>{getProcessStatus(this.state.projectStatus)}</span> */}
-                                <span>{getProjectStatus(this.state.projectStatus)}</span>
+                                <span>{getProjectName(this.state.projectStatus)}</span>
                             </FormItem>
                             <FormItem
                                 className="half-item"

+ 3 - 3
js/component/manageCenter/order/orderNew/glCostAuditList/index.js

@@ -6,7 +6,7 @@ import {
     message,
     Tooltip, Tabs, Button,Modal
 } from "antd";
-import {ShowModal,getProjectStatus} from "@/tools";
+import {ShowModal,getProjectName} from "@/tools";
 import FilterColumn from './filterColumn';
 import DetailsModal from './detailsModal/index';
 import OrderPaymentModal from './component/orderPaymentModal';
@@ -43,7 +43,7 @@ class CostAuditList extends Component{
                     dataIndex: "projectStatus",
                     key: "projectStatus",
                     render: (text) => {
-                        return getProjectStatus(text);
+                        return getProjectName(text);
                     },
                 },
                 {
@@ -443,4 +443,4 @@ class CostAuditList extends Component{
     }
 }
 
-export default CostAuditList
+export default CostAuditList

+ 3 - 3
js/component/manageCenter/order/orderNew/inquiry.jsx

@@ -39,7 +39,7 @@ import {
   getProjectStatus,
   getboutique,
   getCuikuan,
-  getjiedian
+  getjiedian, getProjectName
 } from "../../../tools.js";
 import ShowModalDiv from "@/showModal.jsx";
 import { ChooseList } from "../orderNew/chooseList";
@@ -476,7 +476,7 @@ const IntentionCustomer = Form.create()(
             dataIndex: "projectStatus",
             key: "projectStatus",
             render: (text) => {
-              return getProjectStatus(text);
+              return getProjectName(text);
             },
           },
           {
@@ -613,7 +613,7 @@ const IntentionCustomer = Form.create()(
             dataIndex: "projectStatus",
             key: "projectStatus",
             render: (text) => {
-              return getProjectStatus(text);
+              return getProjectName(text);
             },
           },
           {

+ 4 - 3
js/component/manageCenter/order/orderNew/outsourcingList.jsx

@@ -37,6 +37,7 @@ const confirm = Modal.confirm;
 import OrderRiZi from "@/orderRiZi.jsx";
 import ImgList from "../../../common/imgList";
 import {ChooseList} from "./chooseList";
+import {getProjectName} from "../../../tools";
 //图片组件
 const PicturesWall = React.createClass({
   getInitialState() {
@@ -624,7 +625,7 @@ const outsourcingList = Form.create()(
             dataIndex: "projectStatus",
             key: "projectStatus",
             render: (text) => {
-              return getProjectStatus(text);
+              return getProjectName(text);
             },
           },
           {
@@ -2263,7 +2264,7 @@ const outsourcingList = Form.create()(
                       {/*<div className="clearfix">
 										<FormItem className="half-item"
 										    {...formItemLayout}
-										    label="上传协议文件" style={{height:"auto"}}>  
+										    label="上传协议文件" style={{height:"auto"}}>
 										     <Upload header={{authorization: 'authorization-text'}} action={globalConfig.context + "/api/admin/outsourceOrg/uploadOutsourceFile"}
 													data={(e)=>{
 														return {
@@ -2376,7 +2377,7 @@ const outsourcingList = Form.create()(
                       {/*<div className="clearfix">
 										<FormItem className="half-item" style={{height:'auto'}}
 										    {...formItemLayout}
-										    label="上传协议文件" >  
+										    label="上传协议文件" >
 											<Upload header={{authorization: 'authorization-text'}} action={globalConfig.context + "/api/admin/outsourceOrg/uploadOutsourceFile"}
 													data={(e)=>{
 														return {

+ 2 - 1
js/component/manageCenter/order/orderNew/outsourcingPro.jsx

@@ -39,6 +39,7 @@ import { taskStatus, projectStatus, cuiJieDian } from '@/dataDic.js'
 import OrderRiZi from "@/orderRiZi.jsx";
 import ImgList from "../../../common/imgList";
 import {ChooseList} from "./chooseList";
+import {getProjectName} from "../../../tools";
 //图片组件
 const PicturesWall = React.createClass({
   getInitialState() {
@@ -353,7 +354,7 @@ const outsourcingPro = Form.create()(
             dataIndex: "projectStatus",
             key: "projectStatus",
             render: (text) => {
-              return getProjectStatus(text);
+              return getProjectName(text);
             },
           },
           {

+ 11 - 10
js/component/manageCenter/order/orderNew/press.jsx

@@ -5,6 +5,7 @@ import moment from 'moment';
 import { getLiquidationStatus,getjiedian,getNewOrderStatus,getProjectStatus} from '@/tools.js';
 import './customer.less';
 import {ChooseList} from "./chooseList";
+import {getProjectName} from "../../../tools";
 
 
 const IntentionCustomer = Form.create()(React.createClass({
@@ -190,7 +191,7 @@ const IntentionCustomer = Form.create()(React.createClass({
         dataIndex: "projectStatus",
         key: "projectStatus",
         render: text => {
-          return getProjectStatus(text);
+          return getProjectName(text);
         }
       },
       {
@@ -286,7 +287,7 @@ const IntentionCustomer = Form.create()(React.createClass({
     dataSources: []
   };
 	},
-	
+
 	//页面加载函数
 	componentWillMount() {
 		this.departmentList();
@@ -305,10 +306,10 @@ const IntentionCustomer = Form.create()(React.createClass({
 			visibles:true,
 		});
 		this.loadDatas(record.id);
-	},	
-	
-    
-	
+	},
+
+
+
 	//新增催款记录
 	examOk(){
 		$.ajax({
@@ -334,7 +335,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 					this.loadData();
 					this.resets();
 				};
-				
+
 			}.bind(this),
 		}).always(function() {
 			this.setState({
@@ -342,8 +343,8 @@ const IntentionCustomer = Form.create()(React.createClass({
 			});
 		}.bind(this));
 	},
-	
-	
+
+
 	//关闭输入理由框
 	noCancel(){
 		this.setState({
@@ -368,7 +369,7 @@ const IntentionCustomer = Form.create()(React.createClass({
     	this.state.departmenttSearch=undefined;
     	this.state.releaseDate[0] = undefined;
 		this.state.releaseDate[1] = undefined;
-        this.loadData();       
+        this.loadData();
     },
     resets(){
     	this.state.orderNo='';

+ 2 - 1
js/component/manageCenter/order/orderNew/pressList.jsx

@@ -5,6 +5,7 @@ import moment from 'moment';
 import { getLiquidationStatus,getjiedian,getNewOrderStatus,getProjectStatus} from '@/tools.js';
 import './customer.less';
 import {ChooseList} from "./chooseList";
+import {getProjectName} from "../../../tools";
 
 
 const IntentionCustomer = Form.create()(React.createClass({
@@ -191,7 +192,7 @@ const IntentionCustomer = Form.create()(React.createClass({
           dataIndex: "projectStatus",
           key: "projectStatus",
           render: text => {
-            return getProjectStatus(text);
+            return getProjectName(text);
           }
         },
         {

+ 3 - 2
js/component/manageCenter/personnel/personnel/personnelAll.jsx

@@ -26,6 +26,7 @@ import {
   ShowModal,
 } from "@/tools";
 import ShowModalDiv from "@/showModal.jsx";
+import {getProjectName} from "../../../tools";
 // import ResolutionPro from "../task/resolutionPro";
 const FormItem = Form.Item;
 const { TabPane } = Tabs;
@@ -160,7 +161,7 @@ const PersonnelAll = React.createClass({
           dataIndex: "projectStatus",
           key: "projectStatus",
           render: (text) => {
-            return getProjectStatus(text);
+            return getProjectName(text);
           },
         },
         {
@@ -666,7 +667,7 @@ const PersonnelAll = React.createClass({
             dataIndex: "projectStatus",
             key: "projectStatus",
             render: (text) => {
-              return getProjectStatus(text);
+              return getProjectName(text);
             },
           },
           {

+ 10 - 10
js/component/manageCenter/project/project/zxsglyOutSourcingPaiDan.jsx

@@ -291,7 +291,7 @@ const zxsglyOutSourcingPaiDan = React.createClass({
           dataIndex: "projectStatus",
           key: "projectStatus",
           render: text => {
-            return getProjectStatus(text);
+            return getProjectName(text);
           }
         }
       ],
@@ -1607,21 +1607,21 @@ const zxsglyOutSourcingPaiDan = React.createClass({
 								<div className="clearfix">
 									<FormItem className="half-item"
 									    {...formItemLayout}
-									    label="外包公司" >  
+									    label="外包公司" >
 									    <span>{this.state.companyName}</span>
 									</FormItem>
 								</div>
 								<div className="clearfix">
 									<FormItem className="half-item"
 									    {...formItemLayout}
-									    label="成本(万元)" >  
+									    label="成本(万元)" >
 									    <span>{this.state.amount}</span>
 									</FormItem>
 								</div>
 								<div className="clearfix">
 									<FormItem className="half-item"
 									    {...formItemLayout}
-									    label="上传协议文件" >  
+									    label="上传协议文件" >
 										<Upload header={{authorization: 'authorization-text'}} action={globalConfig.context + "/api/admin/outsourceOrg/uploadOutsourceFile"}
 												data={(e)=>{
 													return {
@@ -1646,7 +1646,7 @@ const zxsglyOutSourcingPaiDan = React.createClass({
 									    >
 										<Upload className="demandDetailShow-upload"
 										    listType="picture-card"
-										    fileList={this.state.pictureUrl}                               
+										    fileList={this.state.pictureUrl}
 										    onPreview={(file) => {
 										        this.setState({
 										            previewImage: file.url || file.thumbUrl,
@@ -1666,21 +1666,21 @@ const zxsglyOutSourcingPaiDan = React.createClass({
 									<div className="clearfix">
 										<FormItem className="half-item"
 										    {...formItemLayout}
-										    label="审核意见" >  
+										    label="审核意见" >
 										   <span>{this.state.remarks}</span>
 										</FormItem>
 									</div>
 									<div className="clearfix">
 										<FormItem className="half-item"
 										    {...formItemLayout}
-										    label="审核结果" >  
+										    label="审核结果" >
 										   <span>{getRefundStatus(this.state.refundStatus)}</span>
 										</FormItem>
 									</div>
 									<div className="clearfix">
 										<FormItem className="half-item"
 										    {...formItemLayout}
-										    label="审核时间" >  
+										    label="审核时间" >
 										   <span>{this.state.auditTimes}</span>
 										</FormItem>
 									</div>
@@ -2010,5 +2010,5 @@ const zxsglyOutSourcingPaiDan = React.createClass({
     );
   }
 });
- 
-export default zxsglyOutSourcingPaiDan;
+
+export default zxsglyOutSourcingPaiDan;

+ 2 - 1
js/component/manageCenter/project/task/myTask.jsx

@@ -119,7 +119,8 @@ const Task = React.createClass({
         contractNo: this.state.contractNoSearch, //合同编号
         taskId: this.state.taskNoSearch, //项目编号
         taskStatus: this.state.taskStatuSearch, //项目状态
-        projectStatus: this.state.projectStatusSearch ? this.state.projectStatusSearch[0] || this.state.projectStatusSearch[1] || undefined : undefined, //项目状态
+        projectStatus: this.state.projectStatusSearch && this.state.projectStatusSearch.length > 0 ?
+            (typeof this.state.projectStatusSearch[0] === 'string' ? this.state.projectStatusSearch[1] : this.state.projectStatusSearch[0]) : undefined,  //项目状态
         adminName: this.state.adminName, //项目受理人
         approval: this.state.approvalSearch, //特批状态搜索
         outsourceStatus:

+ 4 - 3
js/component/manageCenter/project/task/myTaskOutsource.jsx

@@ -120,7 +120,8 @@ const MyTaskOutsource = React.createClass({
         adminName: this.state.adminName, //项目受理人
         outsource: 1,
         approval: this.state.approvalSearch, //特批状态搜索
-        projectStatus: this.state.projectStatusSearch ? this.state.projectStatusSearch[0] || this.state.projectStatusSearch[1] || undefined : undefined, //项目状态
+        projectStatus: this.state.projectStatusSearch && this.state.projectStatusSearch.length > 0 ?
+            (typeof this.state.projectStatusSearch[0] === 'string' ? this.state.projectStatusSearch[1] : this.state.projectStatusSearch[0]) : undefined  //项目状态
       },
       success: function (data) {
         ShowModal(this);
@@ -391,7 +392,7 @@ const MyTaskOutsource = React.createClass({
           dataIndex: "projectStatus",
           key: "projectStatus",
           render: (text) => {
-            return getProjectStatus(text);
+            return getProjectName(text);
           },
         },
         {
@@ -1685,7 +1686,7 @@ const MyTaskOutsource = React.createClass({
       setUpStatus: '',
       setUpTime: '',
       highTechStatus: '',
-      projectStatusSearch : [], //项目状态
+      projectStatusSearch : undefined, //项目状态
     })
   },
   searchSwitch() {

+ 2 - 1
js/component/manageCenter/project/task/payApplyReject/index.jsx

@@ -14,6 +14,7 @@ import './index.less';
 import CheckProject from "../../../components/checkProject";
 import PayRecord from "../../../components/checkProject/payRecord";
 import {ChooseList} from "../../../order/orderNew/chooseList";
+import {getProjectName} from "../../../../tools";
 
 const { TabPane } = Tabs;
 
@@ -43,7 +44,7 @@ class PayApplyReject extends Component{
                     dataIndex: "projectStatus",
                     key: "projectStatus",
                     render: (text) => {
-                        return getProjectStatus(text);
+                        return getProjectName(text);
                     },
                 },
                 {

+ 3 - 3
js/component/manageCenter/project/task/taskAssignment.jsx

@@ -11,7 +11,7 @@ import {
   getLiquidationStatus,
   getApprovedState,
   splitUrl,
-  getProjectStatus,
+  getProjectName,
   getboutique,
   ShowModal
 } from "@/tools";
@@ -155,7 +155,7 @@ const Task = React.createClass({
           dataIndex: "projectStatus",
           key: "projectStatus",
           render: (text) => {
-            return getProjectStatus(text);
+            return getProjectName(text);
           },
         },
         {
@@ -843,7 +843,7 @@ const Task = React.createClass({
             dataIndex: "projectStatus",
             key: "projectStatus",
             render: (text) => {
-              return getProjectStatus(text);
+              return getProjectName(text);
             },
           },
           {

+ 1 - 1
js/component/manageCenter/project/task/taskCount.jsx

@@ -275,7 +275,7 @@ const IntentionCustomer = Form.create()(
             dataIndex: "projectStatus",
             key: "projectStatus",
             render: text => {
-              return getProjectStatus(text);
+              return getProjectName(text);
             }
           },
           {

+ 1 - 1
js/component/project.jsx

@@ -911,7 +911,7 @@ const project = React.createClass({
                       label="项目状态"
                     >
                       {/* <span>{getProcessStatus(this.state.projectStatus)}</span> */}
-                      <span>{getProjectStatus(this.state.projectStatus)}</span>
+                      <span>{getProjectName(this.state.projectStatus)}</span>
                     </FormItem>
                     <FormItem
                       className="half-item"