Browse Source

流程进度负责人显示

dev01 2 years ago
parent
commit
fa8d45c51d
77 changed files with 1222 additions and 1166 deletions
  1. 26 25
      js/component/common/initiateOrder/paymentRecord.jsx
  2. 0 11
      js/component/dataDic.js
  3. 2 2
      js/component/manageCenter/customer/operationalData/interviewStatistics/detailedList.jsx
  4. 124 123
      js/component/manageCenter/customer/operationalData/reexamine/detailedList.jsx
  5. 2 1
      js/component/manageCenter/customer/operationalData/reexamine/details.jsx
  6. 2 2
      js/component/manageCenter/customer/operationalData/signatureStatistics/detailedList.jsx
  7. 3 4
      js/component/manageCenter/customer/signcustomer/detaillist.jsx
  8. 2 1
      js/component/manageCenter/customerService/administration/followUpDetails.jsx
  9. 7 1
      js/component/manageCenter/customerService/administration/order.jsx
  10. 9 7
      js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx
  11. 11 10
      js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx
  12. 169 127
      js/component/manageCenter/financialManage/distribute/huiKuan.jsx
  13. 4 2
      js/component/manageCenter/financialManage/distribute/inSpecial.jsx
  14. 6 3
      js/component/manageCenter/financialManage/distribute/invoiceApplyList.jsx
  15. 9 7
      js/component/manageCenter/financialManage/distribute/invoiceApplyListQuery.jsx
  16. 5 3
      js/component/manageCenter/financialManage/distribute/invoiceApplyListWai.jsx
  17. 5 3
      js/component/manageCenter/financialManage/distribute/outInvoiceQuery.jsx
  18. 4 3
      js/component/manageCenter/financialManage/distribute/outOutsourcingList.jsx
  19. 5 3
      js/component/manageCenter/financialManage/distribute/outSpecial.jsx
  20. 4 3
      js/component/manageCenter/financialManage/distribute/outsourcingPaiDan.jsx
  21. 4 3
      js/component/manageCenter/financialManage/distribute/paiDan.jsx
  22. 7 6
      js/component/manageCenter/financialManage/distribute/shouKuanAll.jsx
  23. 7 6
      js/component/manageCenter/financialManage/distribute/shouKuang.jsx
  24. 110 108
      js/component/manageCenter/financialManage/orderDetail/orderDescTab.jsx
  25. 1 1
      js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx
  26. 4 7
      js/component/manageCenter/order/orderNew/addService.jsx
  27. 2 1
      js/component/manageCenter/order/orderNew/addorders.js
  28. 5 3
      js/component/manageCenter/order/orderNew/approveds.jsx
  29. 9 7
      js/component/manageCenter/order/orderNew/billing.jsx
  30. 95 99
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwjl.js
  31. 241 245
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzj.js
  32. 2 6
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzy.js
  33. 88 92
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsjl.js
  34. 88 92
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsy.js
  35. 2 6
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailJszj.js
  36. 2 6
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxgly.js
  37. 2 6
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxy.js
  38. 1 1
      js/component/manageCenter/order/orderNew/changeComponent/orderDetail.js
  39. 2 1
      js/component/manageCenter/order/orderNew/chargeback.jsx
  40. 2 1
      js/component/manageCenter/order/orderNew/checkOutsourcing.jsx
  41. 1 0
      js/component/manageCenter/order/orderNew/contractCwjl.js
  42. 1 0
      js/component/manageCenter/order/orderNew/contractCwzj.js
  43. 1 0
      js/component/manageCenter/order/orderNew/contractCwzy.js
  44. 1 0
      js/component/manageCenter/order/orderNew/contractJsjl.js
  45. 1 0
      js/component/manageCenter/order/orderNew/contractJsy.js
  46. 1 0
      js/component/manageCenter/order/orderNew/contractJszj.js
  47. 1 0
      js/component/manageCenter/order/orderNew/contractYxgly.js
  48. 1 0
      js/component/manageCenter/order/orderNew/contractYxy.js
  49. 14 13
      js/component/manageCenter/order/orderNew/costAuditList/component/orderPaymentModal.js
  50. 2 1
      js/component/manageCenter/order/orderNew/costAuditList/detailsModal/projectOverview.js
  51. 4 3
      js/component/manageCenter/order/orderNew/examine.jsx
  52. 14 13
      js/component/manageCenter/order/orderNew/glCostAuditList/component/orderPaymentModal.js
  53. 3 2
      js/component/manageCenter/order/orderNew/glCostAuditList/detailsModal/projectOverview.js
  54. 6 3
      js/component/manageCenter/order/orderNew/inquiry.jsx
  55. 2 1
      js/component/manageCenter/order/orderNew/outsourcingList.jsx
  56. 2 1
      js/component/manageCenter/order/orderNew/outsourcingPro.jsx
  57. 8 7
      js/component/manageCenter/order/orderNew/reject.jsx
  58. 3 4
      js/component/manageCenter/order/source/order.jsx
  59. 2 1
      js/component/manageCenter/personnel/personnel/personnelAll.jsx
  60. 2 1
      js/component/manageCenter/project/project/outsourceTaskAssignment.jsx
  61. 8 7
      js/component/manageCenter/project/project/projectAssignment.jsx
  62. 2 1
      js/component/manageCenter/project/project/projectQuery.jsx
  63. 3 2
      js/component/manageCenter/project/project/zxsglyOutSourcingPaiDan.jsx
  64. 2 1
      js/component/manageCenter/project/summary/projectDetails.jsx
  65. 3 2
      js/component/manageCenter/project/task/businessManagement/orderInfor.jsx
  66. 3 2
      js/component/manageCenter/project/task/myTask.jsx
  67. 3 2
      js/component/manageCenter/project/task/myTaskCount.jsx
  68. 3 2
      js/component/manageCenter/project/task/myTaskOutsource.jsx
  69. 14 13
      js/component/manageCenter/project/task/payApplyReject/component/orderPaymentModal.js
  70. 2 1
      js/component/manageCenter/project/task/payApplyReject/detailsModal/projectOverview.js
  71. 2 1
      js/component/manageCenter/project/task/taskAssignment.jsx
  72. 3 2
      js/component/manageCenter/project/task/taskCount.jsx
  73. 3 2
      js/component/manageCenter/project/task/taskQuery.jsx
  74. 1 1
      js/component/manageCenter/publicComponent/assign.jsx
  75. 2 2
      js/component/manageCenter/set/userManagementS/user.jsx
  76. 2 1
      js/component/project.jsx
  77. 23 36
      js/component/tools.js

+ 26 - 25
js/component/common/initiateOrder/paymentRecord.jsx

@@ -1,5 +1,5 @@
-import React, {Component} from "react";
-import {Button, Col, Form, message, Spin, Table} from "antd";
+import React, { Component } from "react";
+import { Button, Col, Form, message, Spin, Table } from "antd";
 import $ from "jquery";
 import PayRecord from "../../manageCenter/components/checkProject/payRecord";
 
@@ -24,13 +24,13 @@ class PaymentRecord extends Component {
                     key: 'companyName',
                     render: (text, record) => {
                         return <span>
-                                    {
-                                        record.status === 4 ? text : (
-                                            record.chooseType === 2 ? text : (text + '-' + record.tpcId) +
-                                            (text !== record.tpcName && record.tpcName ? '(' + record.tpcName + ')' : '')
-                                        )
-                                    }
-                                </span>
+                            {
+                                record.status === 4 ? text : (
+                                    record.chooseType === 2 ? text : (text + '-' + record.tpcId) +
+                                        (text !== record.tpcName && record.tpcName ? '(' + record.tpcName + ')' : '')
+                                )
+                            }
+                        </span>
                     },
                 },
                 {
@@ -39,9 +39,9 @@ class PaymentRecord extends Component {
                     key: 'chooseType',
                     render: (text) => {
                         return <span>
-                                {/*0第三方 1催款 2官费*/}
-                                {text === 0 ? '第三方' : text === 1 ? '催款' : '官费'}
-                               </span>
+                            {/*0第三方 1催款 2官费*/}
+                            {text === 0 ? '第三方' : text === 1 ? '催款' : '官费'}
+                        </span>
                     },
                 },
                 {
@@ -50,8 +50,8 @@ class PaymentRecord extends Component {
                     key: 'applicationAmount',
                     render: (text, record) => {
                         return <span>
-                                  {isNaN(parseFloat(text)) ? text : parseFloat(text)}
-                               </span>
+                            {isNaN(parseFloat(text)) ? text : parseFloat(text)}
+                        </span>
                     },
                 },
                 {
@@ -76,6 +76,7 @@ class PaymentRecord extends Component {
                             <div style={{
                                 paddingRight: '15px',
                             }}>
+                                {(!!record.financeName && text === 0) ? record.financeName : ""}
                                 {
                                     text === 0 ? '审核中' :
                                         text === 1 ? '审核通过' :
@@ -96,25 +97,25 @@ class PaymentRecord extends Component {
                     },
                 },
             ],//支付记录
-            selectOrderPayments:[]
+            selectOrderPayments: []
         }
         this.operationJudgmentName = this.operationJudgmentName.bind(this);
         this.getSelectOrderPayment = this.getSelectOrderPayment.bind(this);
     }
 
     componentDidMount() {
-        if(this.props.tid){
+        if (this.props.tid) {
             this.getSelectOrderPayment();
         }
     }
 
     //0审核 1待支付 2驳回 3已支付 4取消
     operationJudgmentName(id) {
-        if(this.props.isAuditPayment){          //财务
+        if (this.props.isAuditPayment) {          //财务
             return id === 0 ? '待审核' :
                 id === 1 ? '待支付' :
                     id === 2 ? '查看详情' : '查看详情'
-        }else{
+        } else {
             return id === 0 ? '待审核' :
                 id === 1 ? '待支付' :
                     id === 2 ? '查看详情' : '查看详情'
@@ -155,8 +156,8 @@ class PaymentRecord extends Component {
     }
 
     //刷新
-    refresh(){
-        if(this.props.tid){
+    refresh() {
+        if (this.props.tid) {
             this.getSelectOrderPayment();
         }
     }
@@ -180,11 +181,11 @@ class PaymentRecord extends Component {
                                     orderPaymentsId: record.id,
                                 })
                             }}
-                            scroll={{x: 'max-content', y: 0}}
+                            scroll={{ x: 'max-content', y: 0 }}
                             bordered
                             size="middle"
                         />
-                        <Col span={24} offset={9} style={{marginTop: '15px'}}/>
+                        <Col span={24} offset={9} style={{ marginTop: '15px' }} />
                     </Form>
                 </Spin>
 
@@ -198,18 +199,18 @@ class PaymentRecord extends Component {
                     visible={this.state.payRecordVisible}
                     isAuditPayment={this.props.isAuditPayment}
                     isAuditPaymentGLY={this.props.isAuditPaymentGLY}
-                    onRefresh={()=>{
+                    onRefresh={() => {
                         this.props.onRefresh();
                         this.refresh();
                     }}
-                    changeVisible={()=>{
+                    changeVisible={() => {
                         this.refresh();
                         this.props.onRefresh && this.props.onRefresh();
                         this.setState({
                             payRecordVisible: false,
                         })
                     }}
-                /> : <div/>}
+                /> : <div />}
             </div> : null
         )
     }

+ 0 - 11
js/component/dataDic.js

@@ -3363,17 +3363,6 @@ module.exports = {
       key: "材料已完成",
     },
   ],
-  //分配状态
-  // 	processStatus:[
-  // 		 {
-  // 		    value: "3",
-  // 		    key: "未分配"
-  // 		},{
-  // 		    value: "4",
-  // 		    key: "已分配"
-  // 		}
-  // 	],
-
   //退单状态
   refundStatus: [
     {

+ 2 - 2
js/component/manageCenter/customer/operationalData/interviewStatistics/detailedList.jsx

@@ -387,8 +387,8 @@ class DetailedList extends Component {
                     title: "流程状态",
                     dataIndex: "processStatus",
                     key: "processStatus",
-                    render: (text) => {
-                        return getProcessStatus(text);
+                    render: (text, record) => {
+                        return getProcessStatus(text, record.examineName);
                     },
                 },
                 {

+ 124 - 123
js/component/manageCenter/customer/operationalData/reexamine/detailedList.jsx

@@ -1,4 +1,4 @@
-import React,{ Component } from 'react';
+import React, { Component } from 'react';
 import {
     Modal,
     Tooltip,
@@ -14,10 +14,10 @@ import {
 
 import Details from './details';
 
-class DetailedList extends Component{
+class DetailedList extends Component {
     constructor(props) {
         super(props);
-        this.state= {
+        this.state = {
             columns: [
                 {
                     title: "编号",
@@ -43,11 +43,11 @@ class DetailedList extends Component{
                     key: "quantity",
                     width: 120,
                     className: 'projectTable',
-                    onCellClick :(record, event)=>{
+                    onCellClick: (record, event) => {
                         event.stopPropagation();
                         this.setState({
-                            visible1:true,
-                            aid:record.aid
+                            visible1: true,
+                            aid: record.aid
                         })
                     }
                 },
@@ -57,11 +57,11 @@ class DetailedList extends Component{
                     key: "pass",
                     width: 120,
                     className: 'projectTable',
-                    onCellClick :(record, event)=>{
+                    onCellClick: (record, event) => {
                         event.stopPropagation();
                         this.setState({
-                            visible1:true,
-                            aid:record.aid
+                            visible1: true,
+                            aid: record.aid
                         })
                     }
                 },
@@ -71,11 +71,11 @@ class DetailedList extends Component{
                     key: "signBacks",
                     width: 120,
                     className: 'projectTable',
-                    onCellClick :(record, event)=>{
+                    onCellClick: (record, event) => {
                         event.stopPropagation();
                         this.setState({
-                            visible1:true,
-                            aid:record.aid
+                            visible1: true,
+                            aid: record.aid
                         })
                     }
                 },
@@ -85,11 +85,11 @@ class DetailedList extends Component{
                     key: "notPass",
                     width: 120,
                     className: 'projectTable',
-                    onCellClick :(record, event)=>{
+                    onCellClick: (record, event) => {
                         event.stopPropagation();
                         this.setState({
-                            visible1:true,
-                            aid:record.aid
+                            visible1: true,
+                            aid: record.aid
                         })
                     }
                 },
@@ -109,14 +109,14 @@ class DetailedList extends Component{
                     title: "客户名称",
                     dataIndex: "userName",
                     key: "userName",
-                    render:text=>{
+                    render: text => {
                         return (
                             <Tooltip title={text}>
                                 <div style={{
-                                    maxWidth:'150px',
-                                    overflow:'hidden',
+                                    maxWidth: '150px',
+                                    overflow: 'hidden',
                                     textOverflow: "ellipsis",
-                                    whiteSpace:'nowrap',
+                                    whiteSpace: 'nowrap',
                                 }}>{text}</div>
                             </Tooltip>
                         )
@@ -141,8 +141,8 @@ class DetailedList extends Component{
                     title: "流程状态",
                     dataIndex: "processStatus",
                     key: "processStatus",
-                    render: (text) => {
-                        return getProcessStatus(text);
+                    render: (text, record) => {
+                        return getProcessStatus(text, record.examineName);
                     },
                 },
                 {
@@ -190,120 +190,120 @@ class DetailedList extends Component{
                     key: "financeName",
                 },
             ],
-            searchList:[
-            {
-                type:'newDepartmentSelect',
-                dataKey:'deps',
-                placeholder:'请选择部门'
-            },
-            {
-                type:'autoComplete',
-                dataTitle:'aName',
-                dataKey:'aid',
-                api:'/api/admin/customer/listAdminByName',
-                search:'adminName',
-                placeholder:'请输入跟进人'
-            },
-            {
-                type:'select',
-                dataKey:'sort',
-                placeholder:'请选择排序',
-                selectList:[
-                    {
-                        value:'0',
-                        label:'按总金额排序'
-                    },
-                    {
-                        value:'1',
-                        label:'按数量排序'
-                    },
-                ]
-            },
-            {
-                type:'times',
-                title:'时间',
-                dataKey:['startDate','endDate'],
-            },
-        ],
-            searchList1:[
+            searchList: [
+                {
+                    type: 'newDepartmentSelect',
+                    dataKey: 'deps',
+                    placeholder: '请选择部门'
+                },
+                {
+                    type: 'autoComplete',
+                    dataTitle: 'aName',
+                    dataKey: 'aid',
+                    api: '/api/admin/customer/listAdminByName',
+                    search: 'adminName',
+                    placeholder: '请输入跟进人'
+                },
+                {
+                    type: 'select',
+                    dataKey: 'sort',
+                    placeholder: '请选择排序',
+                    selectList: [
+                        {
+                            value: '0',
+                            label: '按总金额排序'
+                        },
+                        {
+                            value: '1',
+                            label: '按数量排序'
+                        },
+                    ]
+                },
                 {
-                    type:'text',
-                    placeholder:'请输入订单编号',
-                    dataKey:'orderNo',
+                    type: 'times',
+                    title: '时间',
+                    dataKey: ['startDate', 'endDate'],
+                },
+            ],
+            searchList1: [
+                {
+                    type: 'text',
+                    placeholder: '请输入订单编号',
+                    dataKey: 'orderNo',
                 },
                 {
-                    type:'text',
-                    placeholder:'请输入客户名称',
-                    dataKey:'name',
+                    type: 'text',
+                    placeholder: '请输入客户名称',
+                    dataKey: 'name',
                 },
                 {
-                    type:'text',
-                    placeholder:'请输入合同编号',
-                    dataKey:'contractNo',
+                    type: 'text',
+                    placeholder: '请输入合同编号',
+                    dataKey: 'contractNo',
                 },
                 {
-                    type:'select',
-                    dataKey:'liquidationStatus',
-                    placeholder:'请选择结算状态',
-                    selectList:[
+                    type: 'select',
+                    dataKey: 'liquidationStatus',
+                    placeholder: '请选择结算状态',
+                    selectList: [
                         {
-                            value:'0',
-                            label:'首付待付请'
+                            value: '0',
+                            label: '首付待付请'
                         },
                         {
-                            value:'1',
-                            label:'尾款待付清'
+                            value: '1',
+                            label: '尾款待付清'
                         },
                         {
-                            value:'2',
-                            label:'已付清'
+                            value: '2',
+                            label: '已付清'
                         },
                     ]
                 },
                 {
-                    type:'select',
-                    dataKey:'approval',
-                    placeholder:'请选择特批状态',
-                    selectList:[
+                    type: 'select',
+                    dataKey: 'approval',
+                    placeholder: '请选择特批状态',
+                    selectList: [
                         {
-                            value:'0',
-                            label:'非特批'
+                            value: '0',
+                            label: '非特批'
                         },
                         {
-                            value:'1',
-                            label:'特批'
+                            value: '1',
+                            label: '特批'
                         },
                     ]
                 },
                 {
-                    type:'select',
-                    dataKey:'amountStatus',
-                    placeholder:'请选择签单金额',
-                    selectList:[
+                    type: 'select',
+                    dataKey: 'amountStatus',
+                    placeholder: '请选择签单金额',
+                    selectList: [
                         {
-                            value:'0',
-                            label:'10万元以下'
+                            value: '0',
+                            label: '10万元以下'
                         },
                         {
-                            value:'1',
-                            label:'10~20万元'
+                            value: '1',
+                            label: '10~20万元'
                         },
                         {
-                            value:'2',
-                            label:'20~30万元'
+                            value: '2',
+                            label: '20~30万元'
                         },
                         {
-                            value:'3',
-                            label:'30~40万元'
+                            value: '3',
+                            label: '30~40万元'
                         },
                         {
-                            value:'4',
-                            label:'40万元以上'
+                            value: '4',
+                            label: '40万元以上'
                         },
                     ]
                 },
             ],
-            searchConfig:{},
+            searchConfig: {},
         }
     }
 
@@ -321,30 +321,31 @@ class DetailedList extends Component{
                     className="admin-desc-content">
                     <div className="user-content">
                         <TabelContent
-                            scroll={{ x: 0, y: 500}}
+                            scroll={{ x: 0, y: 500 }}
                             searchList={this.state.searchList}
                             columns={this.state.columns}
                             searchConfig={this.props.searchConfig}
-                            onRowClick={()=>{}}
-                            searchOperation={(value)=>{
-                                for(let i of Object.keys(value)){
-                                    if(i === 'sort' || i === 'pageNo' || i === 'pageSize'){
+                            onRowClick={() => { }}
+                            searchOperation={(value) => {
+                                for (let i of Object.keys(value)) {
+                                    if (i === 'sort' || i === 'pageNo' || i === 'pageSize') {
                                         delete value[i]
                                     }
 
                                 }
-                                this.setState({searchConfig:value})}
+                                this.setState({ searchConfig: value })
+                            }
                             }
                             tabelApi={'/api/admin/orderProject/highNewRetrialList'}
                             exportApi={'/api/admin/orderProject/highNewRetrialList/export'}
                             query={{
-                                province:this.props.recordInfor.province,
+                                province: this.props.recordInfor.province,
                             }}
-                            dataProcessing={(data)=>{
+                            dataProcessing={(data) => {
                                 let theArr = [];
                                 for (let i = 0; i < data.data.length; i++) {
                                     let thisdata = data.data[i];
-                                    thisdata.key=i + 1;
+                                    thisdata.key = i + 1;
                                     theArr.push(thisdata);
                                 }
                                 return theArr;
@@ -354,16 +355,16 @@ class DetailedList extends Component{
                     {this.state.visible1 && <Modal
                         maskClosable={false}
                         visible={this.state.visible1}
-                        onOk={()=>{
+                        onOk={() => {
                             this.setState({
-                                visible1:false,
-                                aid:'',
+                                visible1: false,
+                                aid: '',
                             })
                         }}
-                        onCancel={()=>{
+                        onCancel={() => {
                             this.setState({
-                                visible1:false,
-                                aid:'',
+                                visible1: false,
+                                aid: '',
                             })
                         }}
                         width='1600px'
@@ -378,20 +379,20 @@ class DetailedList extends Component{
                                 columns={this.state.columns1}
                                 tabelApi={'/api/admin/newOrder/orderNewList'}
                                 query={{
-                                    aid:this.state.aid,
+                                    aid: this.state.aid,
                                     specially: 9,
                                 }}
-                                onRowClick={(obj)=>{
+                                onRowClick={(obj) => {
                                     this.setState({
-                                        detailsVisible:true,
-                                        orderNo:obj.orderNo
+                                        detailsVisible: true,
+                                        orderNo: obj.orderNo
                                     })
                                 }}
-                                dataProcessing={(data)=>{
+                                dataProcessing={(data) => {
                                     let theArr = [];
                                     for (let i = 0; i < data.data.list.length; i++) {
                                         let thisdata = data.data.list[i];
-                                        thisdata.key=(data.data.pageNo - 1) * data.data.pageSize + i + 1;
+                                        thisdata.key = (data.data.pageNo - 1) * data.data.pageSize + i + 1;
                                         theArr.push(thisdata);
                                     }
                                     return theArr;
@@ -403,10 +404,10 @@ class DetailedList extends Component{
                 {this.state.detailsVisible && <Details
                     orderNo={this.state.orderNo}
                     visible={this.state.detailsVisible}
-                    onCancel={()=>{
+                    onCancel={() => {
                         this.setState({
-                            detailsVisible:false,
-                            orderNo:''
+                            detailsVisible: false,
+                            orderNo: ''
                         })
                     }}
                 />}

+ 2 - 1
js/component/manageCenter/customer/operationalData/reexamine/details.jsx

@@ -299,6 +299,7 @@ class Details extends Component {
                         contractNo: thisdata.contractNo, //合同编号
                         userName: thisdata.userName, //客户名称
                         signDate: thisdata.signDate, //签单时间
+                        examineName: thisdata.examineName,
                         processStatus: thisdata.processStatus, //流程状态
                         liquidationStatus: thisdata.liquidationStatus, //结算状态
                         contacts: thisdata.contacts, //企业联系人
@@ -635,7 +636,7 @@ class Details extends Component {
                                 {...formItemLayout}
                                 label="流程状态"
                             >
-                                <span>{getProcessStatus(this.state.processStatus)}</span>
+                                <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
                             </FormItem>
                             <FormItem
                                 className="half-item"

+ 2 - 2
js/component/manageCenter/customer/operationalData/signatureStatistics/detailedList.jsx

@@ -106,8 +106,8 @@ class DetailedList extends Component{
                     title: "流程状态",
                     dataIndex: "processStatus",
                     key: "processStatus",
-                    render: (text) => {
-                        return getProcessStatus(text);
+                    render: (text, record) => {
+                        return getProcessStatus(text, record.examineName);
                     },
                 },
                 {

+ 3 - 4
js/component/manageCenter/customer/signcustomer/detaillist.jsx

@@ -93,10 +93,9 @@ class DetailList extends Component {
           title: "流程状态",
           dataIndex: "processStatus",
           key: "processStatus",
-          render: (text, record) =>
-            <span >
-              {getProcessStatus(text)}
-            </span>
+          render: (text, record) => {
+            return getProcessStatus(text, record.examineName);
+        },
         },
         {
           title: "签单金额(万元)",

+ 2 - 1
js/component/manageCenter/customerService/administration/followUpDetails.jsx

@@ -475,6 +475,7 @@ class FollowUpDetails extends Component {
                         contractNo: thisdata.contractNo, //合同编号
                         userName: thisdata.userName, //客户名称
                         signDate: thisdata.signDate, //签单时间
+                        examineName: thisdata.examineName,
                         processStatus: thisdata.processStatus, //流程状态
                         liquidationStatus: thisdata.liquidationStatus, //结算状态
                         contacts: thisdata.contacts, //企业联系人
@@ -638,7 +639,7 @@ class FollowUpDetails extends Component {
                                             {...formItemLayout}
                                             label="流程状态"
                                         >
-                                            <span>{getProcessStatus(this.state.processStatus)}</span>
+                                            <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
                                         </FormItem>
                                         <FormItem
                                             className="half-item"

+ 7 - 1
js/component/manageCenter/customerService/administration/order.jsx

@@ -168,6 +168,7 @@ const Order = Form.create()(
                 totalAmount: thisdata.totalAmount, //签单金额
                 processStatus: thisdata.processStatus, //流程状态
                 liquidationStatus: thisdata.liquidationStatus, //结算状态
+                examineName: !thisdata.examineName ? undefined : thisdata.examineName,
                 approval: thisdata.approval, //特批状态
                 signDate: thisdata.signDate, //签单时间
                 userName: thisdata.userName, //客户名称
@@ -1074,6 +1075,7 @@ const Order = Form.create()(
               orderNo: thisdata.orderNo,
               type: thisdata.type,
               status: thisdata.status,
+              examineName: !thisdata.examineName ? undefined : thisdata.examineName,
               ordapproval: thisdata.approval,
               remarks: thisdata.remarks,
               invoiceType: thisdata.invoiceType,
@@ -1309,6 +1311,7 @@ const Order = Form.create()(
             this.setState({
               contractNo: thisdata.contractNo,
               orderNo: thisdata.orderNo,
+              examineName: !thisdata.examineName ? undefined : thisdata.examineName,
               ordapproval: thisdata.approval,
               type: thisdata.type,
               status: thisdata.status,
@@ -1372,6 +1375,7 @@ const Order = Form.create()(
           this.setState({
             contractNo: thisdata.contractNo,
             orderNo: thisdata.orderNo,
+            examineName: !thisdata.examineName ? undefined : thisdata.examineName,
             ordapproval: thisdata.approval,
             type: thisdata.type,
             status: thisdata.status,
@@ -1451,6 +1455,7 @@ const Order = Form.create()(
                 status: thisdata.status, //结算状态
                 rejectReason: thisdata.rejectReason,
                 approval: thisdata.approval,
+                examineName: !thisdata.examineName ? undefined : thisdata.examineName,
               });
             }
           }
@@ -1690,6 +1695,7 @@ const Order = Form.create()(
               contractNo: thisdata.contractNo, //合同编号
               userName: thisdata.userName, //客户名称
               signDate: thisdata.signDate, //签单时间
+              examineName: thisdata.examineName,
               processStatus: thisdata.processStatus, //流程状态
               liquidationStatus: thisdata.liquidationStatus, //结算状态
               contacts: thisdata.contacts, //企业联系人
@@ -4139,7 +4145,7 @@ const Order = Form.create()(
                         label="流程状态"
                       >
                         <span>
-                          {getProcessStatus(this.state.processStatus)}
+                          {getProcessStatus(this.state.processStatus, this.state.examineName,)}
                         </span>
                       </FormItem>
                       <FormItem

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

@@ -95,6 +95,7 @@ const approvedOutsourcing = React.createClass({
               orderType: thisdata.orderType,
               orderStatus: thisdata.orderStatus,
               sellerName: thisdata.sellerName,
+              examineName: thisdata.examineName,
               processStatus: thisdata.processStatus,
               liquidationStatus: thisdata.liquidationStatus,
               approval: thisdata.approval,
@@ -443,9 +444,9 @@ const approvedOutsourcing = React.createClass({
           dataIndex: 'processStatus',
           key: 'processStatus',
           className: 'title-table',
-          render: (text) => {
-            return getProcessStatus(text)
-          },
+          render: (text, record) => {
+            return getProcessStatus(text, record.examineName);
+        },
         },
         {
           title: '操作',
@@ -1477,9 +1478,9 @@ const approvedOutsourcing = React.createClass({
           title: '流程状态',
           dataIndex: 'processStatus',
           key: 'processStatus',
-          render: (text) => {
-            return getProcessStatus(text)
-          },
+          render: (text, record) => {
+            return getProcessStatus(text, record.examineName);
+        },
         },
         {
           title: '特批状态',
@@ -2222,6 +2223,7 @@ const approvedOutsourcing = React.createClass({
               status: thisdata.status, //结算状态
               rejectReason: thisdata.rejectReason,
               approval: thisdata.approval,//0非特批 1待审核 2审核通过
+              examineName: !thisdata.examineName ? undefined : thisdata.examineName,
             })
           }
         }
@@ -3437,7 +3439,7 @@ const approvedOutsourcing = React.createClass({
                         {...formItemLayout}
                         label="流转状态"
                       >
-                        <span>{getProcessStatus(theData.processStatus)}</span>
+                        <span>{getProcessStatus(theData.processStatus,theData.examineName)}</span>
                       </FormItem>
                       <FormItem
                         className="half-item"

+ 11 - 10
js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx

@@ -130,6 +130,7 @@ const approvedOutsourcing = React.createClass({
               orderType: thisdata.orderType,
               orderStatus: thisdata.orderStatus,
               sellerName: thisdata.sellerName,
+              examineName: thisdata.examineName,
               processStatus: thisdata.processStatus,
               liquidationStatus: thisdata.liquidationStatus,
               approval: thisdata.approval,
@@ -478,9 +479,9 @@ const approvedOutsourcing = React.createClass({
           dataIndex: "processStatus",
           key: "processStatus",
           className: "title-table",
-          render: (text) => {
-            return getProcessStatus(text);
-          },
+          render: (text, record) => {
+            return getProcessStatus(text, record.examineName);
+        },
         },
         {
           title: "驳回状态",
@@ -1117,9 +1118,9 @@ const approvedOutsourcing = React.createClass({
           title: "流程状态",
           dataIndex: "processStatus",
           key: "processStatus",
-          render: (text) => {
-            return getProcessStatus(text);
-          },
+          render: (text, record) => {
+            return getProcessStatus(text, record.examineName);
+        },
         },
         {
           title: "特批状态",
@@ -1410,9 +1411,9 @@ const approvedOutsourcing = React.createClass({
           title: "流程状态",
           dataIndex: "processStatus",
           key: "processStatus",
-          render: (text) => {
-            return getProcessStatus(text);
-          },
+          render: (text, record) => {
+            return getProcessStatus(text, record.examineName);
+        },
         },
         {
           title: "特批状态",
@@ -3401,7 +3402,7 @@ const approvedOutsourcing = React.createClass({
                         {...formItemLayout}
                         label="流转状态"
                       >
-                        <span>{getProcessStatus(theData.processStatus)}</span>
+                        <span>{getProcessStatus(theData.processStatus,theData.examineName)}</span>
                       </FormItem>
                       <FormItem
                         className="half-item"

+ 169 - 127
js/component/manageCenter/financialManage/distribute/huiKuan.jsx

@@ -37,6 +37,11 @@ const FormItem = Form.Item;
 const { TextArea } = Input;
 const { TabPane } = Tabs;
 
+const formItemLayout = {
+  labelCol: { span: 10 },
+  wrapperCol: { span: 14 }
+};
+
 const HuiKuan = React.createClass({
   loadData(pageNo, pageSize) {
     this.state.data = [];
@@ -683,10 +688,6 @@ const HuiKuan = React.createClass({
   // },
 
   render() {
-    const formItemLayout = {
-      labelCol: { span: 8 },
-      wrapperCol: { span: 14 }
-    };
     var departmentArr = this.state.departmentArr || [];
     const { loading, selectedRowKeys, visible } = this.state;
     const rowSelection = {
@@ -1015,55 +1016,73 @@ const HuiKuan = React.createClass({
               display: this.state.choose ? "block" : "none"
             }}
           >
-            合同编号:
-            <Input
-              style={{
-                width: "auto"
-              }}
-              disabled={this.state.choose}
-              value={this.state.modalData.contractNo}
-              onChange={e => {
-                let val = e.target.value;
-                this.state.modalData.contractNo = val;
-                this.setState({ modalData: this.state.modalData });
-              }}
-            />
+            <FormItem
+              className="half-item"
+              {...formItemLayout}
+              label="合同编号"
+            >
+              <Input
+                style={{ width: 180 }}
+                disabled={this.state.choose}
+                value={this.state.modalData.contractNo}
+                onChange={e => {
+                  let val = e.target.value;
+                  this.state.modalData.contractNo = val;
+                  this.setState({ modalData: this.state.modalData });
+                }}
+              />
+            </FormItem>
           </p>
           <p style={{ marginBottom: 10 }}>
-            订单编号:
-            <Input
-              style={{ width: "auto" }}
-              value={this.state.modalData.orderNo}
-              onChange={e => {
-                let val = e.target.value;
-                this.state.modalData.orderNo = val;
-                this.setState({ modalData: this.state.modalData });
-              }}
-            />
+            <FormItem
+              className="half-item"
+              {...formItemLayout}
+              label="订单编号"
+            >
+              <Input
+                style={{ width: 180 }}
+                value={this.state.modalData.orderNo}
+                onChange={e => {
+                  let val = e.target.value;
+                  this.state.modalData.orderNo = val;
+                  this.setState({ modalData: this.state.modalData });
+                }}
+              />
+            </FormItem>
           </p>
           <p style={{ marginBottom: 10 }}>
-            流水编号:
-            <Input
-              style={{ width: "auto" }}
-              value={this.state.modalData.financialPayNo}
-              onChange={e => {
-                let val = e.target.value;
-                this.state.modalData.financialPayNo = val;
-                this.setState({ modalData: this.state.modalData });
-              }}
-            />
+            <FormItem
+              className="half-item"
+              {...formItemLayout}
+              label="流水编号"
+            >
+              <Input
+                style={{ width: 180 }}
+                value={this.state.modalData.financialPayNo}
+                onChange={e => {
+                  let val = e.target.value;
+                  this.state.modalData.financialPayNo = val;
+                  this.setState({ modalData: this.state.modalData });
+                }}
+              />
+            </FormItem>
           </p>
           <p style={{ marginBottom: 10 }}>
-            付款方:
-            <Input
-              style={{ width: "auto" }}
-              value={this.state.modalData.corporateName}
-              onChange={e => {
-                let val = e.target.value;
-                this.state.modalData.corporateName = val;
-                this.setState({ modalData: this.state.modalData });
-              }}
-            />
+            <FormItem
+              className="half-item"
+              {...formItemLayout}
+              label="付款方"
+            >
+              <Input
+                style={{ width: 180 }}
+                value={this.state.modalData.corporateName}
+                onChange={e => {
+                  let val = e.target.value;
+                  this.state.modalData.corporateName = val;
+                  this.setState({ modalData: this.state.modalData });
+                }}
+              />
+            </FormItem>
           </p>
           <p
             style={{
@@ -1071,19 +1090,22 @@ const HuiKuan = React.createClass({
               display: this.state.choose ? "block" : "none"
             }}
           >
-            客户名称:
-            <Input
-              style={{
-                width: "auto"
-              }}
-              disabled={this.state.choose}
-              value={this.state.modalData.nickname}
-              onChange={e => {
-                let val = e.target.value;
-                this.state.modalData.nickname = val;
-                this.setState({ modalData: this.state.modalData });
-              }}
-            />
+            <FormItem
+              className="half-item"
+              {...formItemLayout}
+              label="客户名称"
+            >
+              <Input
+                style={{ width: 180 }}
+                disabled={this.state.choose}
+                value={this.state.modalData.nickname}
+                onChange={e => {
+                  let val = e.target.value;
+                  this.state.modalData.nickname = val;
+                  this.setState({ modalData: this.state.modalData });
+                }}
+              />
+            </FormItem>
           </p>
           <p
             style={{
@@ -1091,51 +1113,65 @@ const HuiKuan = React.createClass({
               display: this.state.choose ? "block" : "none"
             }}
           >
-            合同额(万元):
-            <Input
-              style={{
-                width: "auto",
-                display: this.state.choose ? "inline-block" : "none"
-              }}
-              disabled={this.state.choose}
-              value={this.state.modalData.totalAmount}
-              onChange={e => {
-                let val = e.target.value;
-                this.state.modalData.totalAmount = val;
-                this.setState({ modalData: this.state.modalData });
-              }}
-            />
+            <FormItem
+              className="half-item"
+              {...formItemLayout}
+              label="合同额(万元)"
+            >
+              <Input
+                style={{
+                  width: 180,
+                  display: this.state.choose ? "inline-block" : "none"
+                }}
+                disabled={this.state.choose}
+                value={this.state.modalData.totalAmount}
+                onChange={e => {
+                  let val = e.target.value;
+                  this.state.modalData.totalAmount = val;
+                  this.setState({ modalData: this.state.modalData });
+                }}
+              />
+            </FormItem>
           </p>
           <p style={{ marginBottom: 10 }}>
-            本次回款(万元):
-            <Input
-              style={{ width: "auto" }}
-              value={this.state.modalData.amount}
-              onChange={e => {
-                let val = e.target.value;
-                this.state.modalData.amount = val;
-                this.setState({ modalData: this.state.modalData });
-              }}
-            />
+            <FormItem
+              className="half-item"
+              {...formItemLayout}
+              label="本次回款(万元)"
+            >
+              <Input
+                style={{ width: 180 }}
+                value={this.state.modalData.amount}
+                onChange={e => {
+                  let val = e.target.value;
+                  this.state.modalData.amount = val;
+                  this.setState({ modalData: this.state.modalData });
+                }}
+              />
+            </FormItem>
           </p>
           <p style={{ marginBottom: 10 }}>
-            回款时间:
-            <DatePicker
-              showTime
-              placeholder="选择回款时间"
-              value={
-                this.state.modalData.receivablesTimes
-                  ? moment(this.state.modalData.receivablesTimes, "YYYY-MM-DD")
-                  : ""
-              }
-              onChange={(v, e) => {
-                this.state.modalData.receivablesTimes = e;
-                // console.log(e);
-
-                this.setState({ modalData: this.state.modalData });
-              }}
-              onOk={() => { }}
-            />
+            <FormItem
+              className="half-item"
+              {...formItemLayout}
+              label="回款时间"
+            >
+              <DatePicker
+                style={{ width: 180 }}
+                showTime
+                placeholder="选择回款时间"
+                value={
+                  this.state.modalData.receivablesTimes
+                    ? moment(this.state.modalData.receivablesTimes, "YYYY-MM-DD")
+                    : ""
+                }
+                onChange={(v, e) => {
+                  this.state.modalData.receivablesTimes = e;
+                  this.setState({ modalData: this.state.modalData });
+                }}
+                onOk={() => { }}
+              />
+            </FormItem>
           </p>
           <p
             style={{
@@ -1143,34 +1179,40 @@ const HuiKuan = React.createClass({
               display: this.state.choose ? "block" : "none"
             }}
           >
-            批量导入时间:
-            <Input
-              style={{ width: "auto" }}
-              value={this.state.modalData.createTimes}
-              disabled
-              onChange={e => {
-                let val = e.target.value;
-                this.state.modalData.createTimes = val;
-                this.setState({ modalData: this.state.modalData });
-              }}
-            />
+            <FormItem
+              className="half-item"
+              {...formItemLayout}
+              label="批量导入时间"
+            >
+              <Input
+                style={{ width: 180 }}
+                value={this.state.modalData.createTimes}
+                disabled
+                onChange={e => {
+                  let val = e.target.value;
+                  this.state.modalData.createTimes = val;
+                  this.setState({ modalData: this.state.modalData });
+                }}
+              />
+            </FormItem>
           </p>
           <p style={{ marginBottom: 10 }}>
-            <span style={{ display: "inline-block", marginBottom: 20 }}>
-              备注:
-            </span>
-            <TextArea
-              style={{ width: "70%" }}
-              value={this.state.modalData.remarks}
-              onChange={e => {
-                this.state.modalData.remarks = e.target.value;
-                // console.log(e);
-
-                this.setState({ modalData: this.state.modalData });
-              }}
-              placeholder="请输入备注信息"
-              autosize={{ minRows: 3, maxRows: 5 }}
-            />
+            <FormItem
+              className="half-item"
+              {...formItemLayout}
+              label="备注"
+            >
+              <TextArea
+                style={{ width: 180, maxWidth: 180 }}
+                value={this.state.modalData.remarks}
+                onChange={e => {
+                  this.state.modalData.remarks = e.target.value;
+                  this.setState({ modalData: this.state.modalData });
+                }}
+                placeholder="请输入备注信息"
+                autosize={{ minRows: 3, maxRows: 5 }}
+              />
+            </FormItem>
           </p>
         </Modal>
         <Modal

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

@@ -76,6 +76,7 @@ const inSpecial = React.createClass({
               unitName: thisdata.unitName,
               orderNo: thisdata.orderno,
               name: thisdata.name,
+              examineName: thisdata.examineName,
               processStatus: thisdata.processStatus,
               projectStatus: thisdata.projectStatus,
               amount: thisdata.amount,
@@ -243,8 +244,8 @@ const inSpecial = React.createClass({
           title: "流程状态",
           dataIndex: "processStatus",
           key: "processStatus",
-          render: (text) => {
-            return getProcessStatus(text);
+          render: (text, record) => {
+            return getProcessStatus(text, record.examineName);
           },
         },
         {
@@ -535,6 +536,7 @@ const inSpecial = React.createClass({
               status: thisdata.status, //结算状态
               rejectReason: thisdata.rejectReason,
               approval: thisdata.approval, //0非特批 1待审核 2审核通过
+              examineName: thisdata.examineName,
             });
           }
         }

+ 6 - 3
js/component/manageCenter/financialManage/distribute/invoiceApplyList.jsx

@@ -76,6 +76,7 @@ const invoiceApplyList = React.createClass({
               unitName: thisdata.unitName,
               orderNo: thisdata.orderno,
               name: thisdata.name,
+              examineName: thisdata.examineName,
               processStatus: thisdata.processStatus,
               projectStatus: thisdata.projectStatus,
               amount: thisdata.amount,
@@ -125,6 +126,7 @@ const invoiceApplyList = React.createClass({
       success: function (data) {
         let thisdata = data.data;
         let obj = {
+          examineName:thisdata.examineName,
           contractNo: thisdata.contractNo,
           orderNo: thisdata.orderNo,
           approval: thisdata.approval,
@@ -243,9 +245,9 @@ const invoiceApplyList = React.createClass({
           title: "流程状态",
           dataIndex: "processStatus",
           key: "processStatus",
-          render: (text) => {
-            return getProcessStatus(text);
-          },
+          render: (text, record) => {
+            return getProcessStatus(text, record.examineName);
+        },
         },
         {
           title: "项目状态",
@@ -535,6 +537,7 @@ const invoiceApplyList = React.createClass({
               status: thisdata.status, //结算状态
               rejectReason: thisdata.rejectReason,
               approval: thisdata.approval, //0非特批 1待审核 2审核通过
+              examineName: thisdata.examineName,
             });
           }
         }

+ 9 - 7
js/component/manageCenter/financialManage/distribute/invoiceApplyListQuery.jsx

@@ -84,7 +84,8 @@ const invoiceApplyListQuery = React.createClass({
                 : "",
               settlementAmount: thisdata.settlementAmount,
               notAmount: thisdata.notAmount,
-              approval: thisdata.approval
+              approval: thisdata.approval,
+              examineName: !thisdata.examineName ? undefined : thisdata.examineName,
             });
           }
         }
@@ -235,17 +236,17 @@ const invoiceApplyListQuery = React.createClass({
           title: "流程状态",
           dataIndex: "processStatus",
           key: "processStatus",
-          render: text => {
-            return getProcessStatus(text);
-          }
+          render: (text, record) => {
+            return getProcessStatus(text, record.examineName);
+          },
         },
         {
           title: "项目状态",
           dataIndex: "projectStatus",
           key: "projectStatus",
-          render: text => {
-            return getProjectName(text);
-          }
+          render: (text, record) => {
+            return getProcessStatus(text, record.examineName);
+          },
         },
         // {
         //   title: "特批状态",
@@ -489,6 +490,7 @@ const invoiceApplyListQuery = React.createClass({
               status: thisdata.status, //结算状态
               rejectReason: thisdata.rejectReason,
               approval: thisdata.approval,//0非特批 1待审核 2审核通过
+              examineName: !thisdata.examineName ? undefined : thisdata.examineName,
             });
           }
         }

+ 5 - 3
js/component/manageCenter/financialManage/distribute/invoiceApplyListWai.jsx

@@ -72,6 +72,7 @@ const invoiceApplyListWai = React.createClass({
               orderNo: thisdata.orderno,
               name: thisdata.name,
               projectStatus: thisdata.projectStatus,
+              examineName: thisdata.examineName,
               processStatus: thisdata.processStatus,
               amount: thisdata.amount,
               sumAmount: thisdata.sumAmount,
@@ -243,9 +244,9 @@ const invoiceApplyListWai = React.createClass({
           title: "流程状态",
           dataIndex: "processStatus",
           key: "processStatus",
-          render: (text) => {
-            return getProcessStatus(text);
-          },
+          render: (text, record) => {
+            return getProcessStatus(text, record.examineName);
+        },
         },
         {
           title: "项目状态",
@@ -538,6 +539,7 @@ const invoiceApplyListWai = React.createClass({
               status: thisdata.status, //结算状态
               rejectReason: thisdata.rejectReason,
               approval: thisdata.approval, //0非特批 1待审核 2审核通过
+              examineName: !thisdata.examineName ? undefined : thisdata.examineName,
             });
           }
         }

+ 5 - 3
js/component/manageCenter/financialManage/distribute/outInvoiceQuery.jsx

@@ -77,6 +77,7 @@ const outInvoiceQuery = React.createClass({
               orderno: thisdata.orderno,
               name: thisdata.name,
               projectStatus: thisdata.projectStatus,
+              examineName: thisdata.examineName,
               processStatus: thisdata.processStatus,
               amount: thisdata.amount,
               sumAmount: thisdata.sumAmount,
@@ -233,9 +234,9 @@ const outInvoiceQuery = React.createClass({
           title: "流程状态",
           dataIndex: "processStatus",
           key: "processStatus",
-          render: text => {
-            return getProcessStatus(text);
-          }
+          render: (text, record) => {
+            return getProcessStatus(text, record.examineName);
+          },
         },
         {
           title: "项目状态",
@@ -482,6 +483,7 @@ const outInvoiceQuery = React.createClass({
               status: thisdata.status, //结算状态
               rejectReason: thisdata.rejectReason,
               approval: thisdata.approval,//0非特批 1待审核 2审核通过
+              examineName: thisdata.examineName,
             });
           }
         }

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

@@ -73,6 +73,7 @@ const outsourcingPaiDan = React.createClass({
               orderNo: thisdata.orderNo,
               approval: thisdata.approval,
               orderType: thisdata.orderType,
+              examineName: thisdata.examineName,
               processStatus: thisdata.processStatus,
               signTotalAmount: thisdata.signTotalAmount,
               buyerName: thisdata.buyerName,
@@ -172,8 +173,8 @@ const outsourcingPaiDan = React.createClass({
           title: "流程状态",
           dataIndex: "processStatus",
           key: "processStatus",
-          render: (text) => {
-            return getProcessStatus(text);
+          render: (text, record) => {
+            return getProcessStatus(text, record.examineName);
           },
         },
         {
@@ -1054,7 +1055,7 @@ const outsourcingPaiDan = React.createClass({
                         {...formItemLayout}
                         label="流转状态"
                       >
-                        <span>{getProcessStatus(theData.processStatus)}</span>
+                        <span>{getProcessStatus(theData.processStatus, theData.examineName)}</span>
                       </FormItem>
                       <FormItem
                         className="half-item"

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

@@ -69,6 +69,7 @@ const outSpecial = React.createClass({
               orderNo: thisdata.orderno,
               name: thisdata.name,
               projectStatus: thisdata.projectStatus,
+              examineName: thisdata.examineName,
               processStatus: thisdata.processStatus,
               amount: thisdata.amount,
               sumAmount: thisdata.sumAmount,
@@ -229,9 +230,9 @@ const outSpecial = React.createClass({
           title: "流程状态",
           dataIndex: "processStatus",
           key: "processStatus",
-          render: (text) => {
-            return getProcessStatus(text);
-          },
+          render: (text, record) => {
+            return getProcessStatus(text, record.examineName);
+        },
         },
         {
           title: "项目状态",
@@ -521,6 +522,7 @@ const outSpecial = React.createClass({
               status: thisdata.status, //结算状态
               rejectReason: thisdata.rejectReason,
               approval: thisdata.approval, //0非特批 1待审核 2审核通过
+              examineName: thisdata.examineName,
             });
           }
         }

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

@@ -116,6 +116,7 @@ const outsourcingPaiDan = React.createClass({
               orderNo: thisdata.orderNo,
               approval: thisdata.approval,
               orderType: thisdata.orderType,
+              examineName: thisdata.examineName,
               processStatus: thisdata.processStatus,
               signTotalAmount: thisdata.signTotalAmount,
               buyerName: thisdata.buyerName,
@@ -220,8 +221,8 @@ const outsourcingPaiDan = React.createClass({
           title: "流程状态",
           dataIndex: "processStatus",
           key: "processStatus",
-          render: (text) => {
-            return getProcessStatus(text);
+          render: (text, record) => {
+            return getProcessStatus(text, record.examineName);
           },
         },
         {
@@ -1210,7 +1211,7 @@ const outsourcingPaiDan = React.createClass({
                         {...formItemLayout}
                         label="流转状态"
                       >
-                        <span>{getProcessStatus(theData.processStatus)}</span>
+                        <span>{getProcessStatus(theData.processStatus, theData.examineName)}</span>
                       </FormItem>
                       <FormItem
                         className="half-item"

+ 4 - 3
js/component/manageCenter/financialManage/distribute/paiDan.jsx

@@ -61,6 +61,7 @@ const PaiDan = React.createClass({
               orderNo: thisdata.orderNo,
               approval: thisdata.approval,
               orderType: thisdata.orderType,
+              examineName: thisdata.examineName,
               processStatus: thisdata.processStatus,
               signTotalAmount: thisdata.signTotalAmount,
               buyerName: thisdata.buyerName,
@@ -151,9 +152,9 @@ const PaiDan = React.createClass({
           title: "流程状态",
           dataIndex: "processStatus",
           key: "processStatus",
-          render: text => {
-            return getProcessStatus(text);
-          }
+          render: (text, record) => {
+            return getProcessStatus(text, record.examineName);
+        },
         },
         {
           title: "订单部门",

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

@@ -998,9 +998,9 @@ const ShouKuang = React.createClass({
           title: "流程状态",
           dataIndex: "processStatus",
           key: "processStatus",
-          render: (text) => {
-            return getProcessStatus(text);
-          },
+          render: (text, record) => {
+            return getProcessStatus(text, record.examineName);
+        },
         },
         // {
         //   title: "特批状态",
@@ -1334,9 +1334,9 @@ const ShouKuang = React.createClass({
           dataIndex: "processStatus",
           key: "processStatus",
           className: "title-table",
-          render: (text) => {
-            return getProcessStatus(text);
-          },
+          render: (text, record) => {
+            return getProcessStatus(text, record.examineName);
+        },
         },
         {
           title: "驳回状态",
@@ -1802,6 +1802,7 @@ const ShouKuang = React.createClass({
               status: thisdata.status, //结算状态
               rejectReason: thisdata.rejectReason,
               approval: thisdata.approval,//0非特批 1待审核 2审核通过
+              examineName: thisdata.examineName,
             });
           }
         }

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

@@ -1009,9 +1009,9 @@ const ShouKuang = React.createClass({
           title: "流程状态",
           dataIndex: "processStatus",
           key: "processStatus",
-          render: (text) => {
-            return getProcessStatus(text);
-          },
+          render: (text, record) => {
+            return getProcessStatus(text, record.examineName);
+        },
         },
         {
           title: "特批状态",
@@ -1358,9 +1358,9 @@ const ShouKuang = React.createClass({
           dataIndex: "processStatus",
           key: "processStatus",
           className: "title-table",
-          render: (text) => {
-            return getProcessStatus(text);
-          },
+          render: (text, record) => {
+            return getProcessStatus(text, record.examineName);
+        },
         },
 
         //                 {
@@ -1858,6 +1858,7 @@ const ShouKuang = React.createClass({
               status: thisdata.status, //结算状态
               rejectReason: thisdata.rejectReason,
               approval: thisdata.approval,//0非特批 1待审核 2审核通过
+              examineName: thisdata.examineName,
             });
           }
         }

+ 110 - 108
js/component/manageCenter/financialManage/orderDetail/orderDescTab.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Modal, Tabs} from 'antd';
+import { Modal, Tabs } from 'antd';
 import OrderDetaiel from './orderDetail';
 
 class DemandDesc extends React.Component {
@@ -7,108 +7,110 @@ class DemandDesc extends React.Component {
 		super(props);
 		this.state = {
 			loading: false,
-			showState:false
+			showState: false
 		};
 	}
 	getInitialState() {
-	    return {
-	        modKey:'1',
-	        loading: false,
-	        pagination: {
-	            defaultCurrent: 1,
-	            defaultPageSize: 10,
-	            showQuickJumper: true,
-	            pageSize: 10,
-	            onChange: function (page) {
-	                this.loadData(page);
-	            }.bind(this),
-	            showTotal: function (total) {
-	                return '共' + total + '条数据';
-	            }
-	        },
-	        columns: [
-	            {
-	                title: '订单编号',
-	                dataIndex: 'orderNo',
-	                key: 'orderNo',
+		return {
+			modKey: '1',
+			loading: false,
+			pagination: {
+				defaultCurrent: 1,
+				defaultPageSize: 10,
+				showQuickJumper: true,
+				pageSize: 10,
+				onChange: function (page) {
+					this.loadData(page);
+				}.bind(this),
+				showTotal: function (total) {
+					return '共' + total + '条数据';
+				}
+			},
+			columns: [
+				{
+					title: '订单编号',
+					dataIndex: 'orderNo',
+					key: 'orderNo',
 					fixed: 'left'
-	            }, {
-	                title: '合同编号',
-	                dataIndex: 'contractNo',
-	                key: 'contractNo',
-	            }, {
-	                title: '下单时间',
-	                dataIndex: 'createTime',
-	                key: 'createTime',
-	            },  {
-	                title: '签单时间',
-	                dataIndex: 'signTime',
-	                key: 'signTime',
-	            },
-	            {
-	                title: '签单客户',
-	                dataIndex: 'buyerName',
-	                key: 'buyerName',
-					render:(text)=>{
-						return (text&&text.length>8?text.substr(0,8)+'...':text)
+				}, {
+					title: '合同编号',
+					dataIndex: 'contractNo',
+					key: 'contractNo',
+				}, {
+					title: '下单时间',
+					dataIndex: 'createTime',
+					key: 'createTime',
+				}, {
+					title: '签单时间',
+					dataIndex: 'signTime',
+					key: 'signTime',
+				},
+				{
+					title: '签单客户',
+					dataIndex: 'buyerName',
+					key: 'buyerName',
+					render: (text) => {
+						return (text && text.length > 8 ? text.substr(0, 8) + '...' : text)
 					}
-	            },
+				},
 				{
-				    title: '外包公司',
-				    dataIndex: 'outsourceName',
-				    key: 'outsourceName',
-					render:(text)=>{
-						return (text&&text.length>8?text.substr(0,8)+'...':text)
+					title: '外包公司',
+					dataIndex: 'outsourceName',
+					key: 'outsourceName',
+					render: (text) => {
+						return (text && text.length > 8 ? text.substr(0, 8) + '...' : text)
 					}
 				},
-	            {
-	                title: '流程状态',
-	                dataIndex: 'processStatus',
-	                key: 'processStatus',
-	                render: text => { return getProcessStatus(text)}
-	            },
 				{
-				    title: '订单部门',
-				    dataIndex: 'departmentName',
-				    key: 'departmentName',
-					render:(text)=>{
-						return (text&&text.length>8?text.substr(0,8)+'...':text)
+					title: '流程状态',
+					dataIndex: 'processStatus',
+					key: 'processStatus',
+					render: (text, record) => {
+						return getProcessStatus(text, record.examineName);
+				},
+				},
+				{
+					title: '订单部门',
+					dataIndex: 'departmentName',
+					key: 'departmentName',
+					render: (text) => {
+						return (text && text.length > 8 ? text.substr(0, 8) + '...' : text)
 					}
 				},
-	            {
-	                title: '订单总金额(万)',
-	                dataIndex: 'signTotalAmount',
-	                key: 'signTotalAmount'
-	            },
-	            {
-	                title: '是否特批',
-	                dataIndex: 'approval',
-	                key: 'approval',
-	                render: text => { return getApproval(text)}
-	            },
-	            {
-	                title: '订单负责人',
-	                dataIndex: 'sellerName',
-	                key: 'sellerName'
-	            },
-	            {
-	                title:'操作',
-	                dataIndex: 'caozuo',
-	                key: 'caouzo',
-	                render:(text,recard)=>{
-	                    return <div>
-	                        {this.judgeFenpai(recard)}
-	                    </div>
-	                }
-	            }
-	        ],
-	        dataSource: [],
-	        searchTime: [,]
-	    }
+				{
+					title: '订单总金额(万)',
+					dataIndex: 'signTotalAmount',
+					key: 'signTotalAmount'
+				},
+				{
+					title: '是否特批',
+					dataIndex: 'approval',
+					key: 'approval',
+					render: text => { return getApproval(text) }
+				},
+				{
+					title: '订单负责人',
+					dataIndex: 'sellerName',
+					key: 'sellerName'
+				},
+				{
+					title: '操作',
+					dataIndex: 'caozuo',
+					key: 'caouzo',
+					render: (text, recard) => {
+						return <div>
+							{this.judgeFenpai(recard)}
+						</div>
+					}
+				}
+			],
+			dataSource: [],
+			searchTime: [,]
+		}
 	}
-	callBack(){
+	callBack() {
 		this.setState({
-			modKey:'2'
+			modKey: '2'
 		})
 	}
 	handleCancel() {
@@ -127,7 +129,7 @@ class DemandDesc extends React.Component {
 		this.state.visible = nextProps.showDesc;
 	}
 	render() {
-		let data = this.props.data || {releaseStatus:0};
+		let data = this.props.data || { releaseStatus: 0 };
 		const { TabPane } = Tabs
 		return (
 			<div className="patent-desc">
@@ -141,23 +143,23 @@ class DemandDesc extends React.Component {
 					footer=""
 					className="admin-desc-content"
 				>
-				<Tabs onChange={this.callBack} type='card' activeKey={this.state.modKey}>
-					<TabPane tab="项目概况" key="1">
-					<div>
-						<div>
-							<OrderDetaiel
-								closeDesc={this.handleCancel.bind(this)}
-								data={this.props.data}
-								visible={this.state.visible}
-								handOk={this.handOk.bind(this)}
-							/>
-						</div>
-					</div>
-					</TabPane>
-					<TabPane tab="外包详情" key="2">
-						
-					</TabPane>
-				</Tabs>	
+					<Tabs onChange={this.callBack} type='card' activeKey={this.state.modKey}>
+						<TabPane tab="项目概况" key="1">
+							<div>
+								<div>
+									<OrderDetaiel
+										closeDesc={this.handleCancel.bind(this)}
+										data={this.props.data}
+										visible={this.state.visible}
+										handOk={this.handOk.bind(this)}
+									/>
+								</div>
+							</div>
+						</TabPane>
+						<TabPane tab="外包详情" key="2">
+
+						</TabPane>
+					</Tabs>
 				</Modal>
 			</div>
 		);

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

@@ -913,7 +913,7 @@ const OrderDetail = Form.create()(
                   {...formItemLayout}
                   label="流程状态"
                 >
-                  <span>{getProcessStatus(theData.processStatus)}</span>
+                  <span>{getProcessStatus(theData.processStatus, theData.examineName)}</span>
                 </FormItem>
                 <FormItem
                   className="half-item"

+ 4 - 7
js/component/manageCenter/order/orderNew/addService.jsx

@@ -2349,6 +2349,7 @@ const NewService = Form.create()(
             totalAmount: thisData.totalAmount, //总金额
             settlementAmount: thisData.settlementAmount, //结算金额
             liquidationStatus: thisData.liquidationStatus, //清算状态
+            examineName: thisData.examineName,
             processStatus: thisData.processStatus, //流程状态
             approval: thisData.approval, //特批状态
             orderRemarks: thisData.orderRemarks, //订单备注
@@ -5917,7 +5918,7 @@ const NewService = Form.create()(
                               label="流程状态"
                             >
                               <span>
-                                {getProcessStatus(this.state.processStatus)}
+                                {getProcessStatus(this.state.processStatus, this.state.examineName)}
                               </span>
                             </FormItem>
                             <FormItem
@@ -7874,13 +7875,9 @@ const NewService = Form.create()(
                                   {/*当前是进度角色是咨询师以及咨询师经理时使用shenhePeo函数,其他流程正常显示*/}
                                   {this.state.detailChange.processState === 2 ||
                                     this.state.detailChange.processState === 3
-                                    ? shenghePeo(
-                                      this.state.detailChange.processState === 2
-                                        ? this.state.detailChange.consultantExamine
-                                        : this.state.detailChange.managerExamine,
-                                      this.state.detailChange.processState
-                                    )
+                                    ? shenghePeo(this.state.detailChange.examineName, this.state.detailChange.processState)
                                     : getProcessStatusNew(
+                                      this.state.detailChange.examineName,
                                       this.state.detailChange.processState,
                                       this.state.detailChange.status
                                     )}

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

@@ -1080,6 +1080,7 @@ const Addorders = Form.create()(
             totalAmount: thisData.totalAmount, //总金额
             settlementAmount: thisData.settlementAmount, //结算金额
             liquidationStatus: thisData.liquidationStatus, //清算状态
+            examineName: thisData.examineName,
             processStatus: thisData.processStatus, //流程状态
             approval: thisData.approval.toString(), //特批状态
             orderRemarks: thisData.orderRemarks, //订单备注
@@ -2131,7 +2132,7 @@ const Addorders = Form.create()(
                 {...formItemLayout}
                 label="流程状态"
               >
-                <span>{getProcessStatus(this.state.processStatus)}</span>
+                <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
               </FormItem>
               <FormItem
                 className="half-item"

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

@@ -340,8 +340,8 @@ const IntentionCustomer = Form.create()(
             dataIndex: "processStatus",
             key: "processStatus",
             className: "title-table",
-            render: (text) => {
-              return getProcessStatus(text);
+            render: (text, record) => {
+              return getProcessStatus(text, record.examineName);
             },
           },
         ],
@@ -1016,6 +1016,7 @@ const IntentionCustomer = Form.create()(
               contractNo: thisdata.contractNo, //合同编号
               userName: thisdata.userName, //客户名称
               signDate: thisdata.signDate, //签单时间
+              examineName: thisdata.examineName,
               processStatus: thisdata.processStatus, //流程状态
               liquidationStatus: thisdata.liquidationStatus, //结算状态
               contacts: thisdata.contacts, //企业联系人
@@ -1883,6 +1884,7 @@ const IntentionCustomer = Form.create()(
                 status: thisdata.status, //结算状态
                 rejectReason: thisdata.rejectReason,
                 approval: thisdata.approval,//0非特批 1待审核 2审核通过
+                examineName: thisdata.examineName,
               });
             }
           }
@@ -2449,7 +2451,7 @@ const IntentionCustomer = Form.create()(
                       {...formItemLayout}
                       label="流程状态"
                     >
-                      <span>{getProcessStatus(this.state.processStatus)}</span>
+                      <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
                     </FormItem>
                     <FormItem
                       className="half-item"

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

@@ -155,6 +155,7 @@ const MyService = Form.create()(
                 orderNo: thisdata.orderNo, //订单编号
                 totalAmount: thisdata.totalAmount, //签单金额
                 projectType: thisdata.projectType, // 会员状态
+                examineName: thisdata.examineName,
                 processStatus: thisdata.processStatus, //流程状态
                 liquidationStatus: thisdata.liquidationStatus, //结算状态
                 approval: thisdata.approval, //特批状态
@@ -628,8 +629,8 @@ const MyService = Form.create()(
             title: "流程状态",
             dataIndex: "processStatus",
             key: "processStatus",
-            render: (text) => {
-              return getProcessStatus(text);
+            render: (text, record) => {
+              return getProcessStatus(text, record.examineName);
             },
           },
           {
@@ -959,15 +960,15 @@ const MyService = Form.create()(
           });
           return;
         }
-        if (!this.state.amount) {
-          message.warning("金额不能为空");
+        if (isNaN(this.state.amount)) {
+          message.warning("开票金额包含非法字符,请重新输入");
           this.setState({
             flagA: false,
           });
           return;
         }
-        if (isNaN(this.state.amount)) {
-          message.warning("开票金额包含非法字符,请重新输入");
+        if (!Number(this.state.amount)) {
+          message.warning("金额不能为空");
           this.setState({
             flagA: false,
           });
@@ -1367,6 +1368,7 @@ const MyService = Form.create()(
                 id: thisdata.id,
                 orderno: thisdata.orderno, //订单编号
                 amount: thisdata.amount, //签单金额
+                examineName: thisdata.examineName,
                 createTime: thisdata.createTime, //流程状态
                 status: thisdata.status, //结算状态
                 rejectReason: thisdata.rejectReason,
@@ -2032,7 +2034,7 @@ const MyService = Form.create()(
                       <Option value="3">已派财务专员</Option>
                       <Option value="4">已派咨询师管理员</Option>
                       <Option value="5">已部分派咨询师经理</Option>
-                      <Option value="6">已全部派咨询师经理</Option>
+                      <Option value="6">已全部派咨询师经理</Option>
                     </Select>
                     <Button
                       type="primary"

+ 95 - 99
js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwjl.js

@@ -143,8 +143,8 @@ class ItemInput extends Component {
               }}
             />
           ) : (
-              ""
-            )}
+            ""
+          )}
         </Form.Item>
       </div>
     );
@@ -215,7 +215,7 @@ class ChangeDetail extends Component {
                   style={{ display: !this.props.refundStatus ? "block" : "none" }}
                   type="danger">
                   删除
-              </Button>
+                </Button>
               </Popconfirm>
             )
           }
@@ -317,8 +317,8 @@ class ChangeDetail extends Component {
                     保存
                   </Button>
                 ) : (
-                    ""
-                  )}
+                  ""
+                )}
               </div>
             );
           }
@@ -917,13 +917,9 @@ class ChangeDetail extends Component {
         // 当前是咨询师以及咨询师经理时使用shenhePeo函数,其他流程正常显示
         dataA:
           this.props.data.processState == 2 || this.props.data.processState == 3
-            ? shenghePeo(
-              this.props.data.processState == 2
-                ? this.props.data.consultantExamine
-                : this.props.data.managerExamine,
-              this.props.data.processState
-            )
+            ? shenghePeo(this.props.data.examineName, this.props.data.processState)
             : getProcessStatusNew(
+              this.props.data.examineName,
               this.props.data.processState,
               this.props.data.status
             ),
@@ -1066,7 +1062,7 @@ class ChangeDetail extends Component {
               display:
                 (this.props.data.processState == 7 ||
                   this.props.data.processState == 8) &&
-                this.props.data.status == 4
+                  this.props.data.status == 4
                   ? "block"
                   : "none",
             }}
@@ -1112,8 +1108,8 @@ class ChangeDetail extends Component {
             labelCol={{ span: 4 }}
             wrapperCol={{ span: 18 }}
           >
-            <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-              <ImgList domId={this.props.domId ? this.props.domId : 'changeDetailCwjlqq'} fileList={orgCodeUrl} ItemWidth={'96px'}/>
+            <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+              <ImgList domId={this.props.domId ? this.props.domId : 'changeDetailCwjlqq'} fileList={orgCodeUrl} ItemWidth={'96px'} />
             </div>
             <Modal
               maskClosable={false}
@@ -1286,12 +1282,12 @@ class ChangeDetail extends Component {
           ) : (
             ""
           )} */}
-{/* 当前财务状态 */}
+          {/* 当前财务状态 */}
           {(this.props.data.processState > 5 &&
             this.props.data.processState <= 8) ||
-          (this.props.data.processState === 9 &&
-            this.props.data.status === 4) ||
-          (1 == 1)  ? (
+            (this.props.data.processState === 9 &&
+              this.props.data.status === 4) ||
+            (1 == 1) ? (
             <div>
               <h3 style={{ marginLeft: 20, fontWeight: 800, marginBottom: 10 }}>
                 当前财务状态(财务填写)
@@ -1488,10 +1484,10 @@ class ChangeDetail extends Component {
               display:
                 (this.props.data.processState == 8 ||
                   this.props.data.processState == 7) &&
-                (this.props.data.status == 2 || this.props.data.status == 4 || this.props.data.status == 3 || this.props.data.status == 6)
+                  (this.props.data.status == 2 || this.props.data.status == 4 || this.props.data.status == 3 || this.props.data.status == 6)
                   ? "block"
                   : "none",
-                  marginTop:'10px'
+              marginTop: '10px'
             }}
           >
             <h3 style={{ marginLeft: 20, fontWeight: 800, marginBottom: 10 }}>
@@ -1513,7 +1509,7 @@ class ChangeDetail extends Component {
               display:
                 (this.props.data.processState == 7 ||
                   this.props.data.processState == 8) &&
-                (this.props.data.status == 4 || this.props.data.status == 2 || this.props.data.status == 3 || this.props.data.status == 6)
+                  (this.props.data.status == 4 || this.props.data.status == 2 || this.props.data.status == 3 || this.props.data.status == 6)
                   ? "inline-block"
                   : "none",
             }}
@@ -1531,17 +1527,17 @@ class ChangeDetail extends Component {
                   : this.state.refundInvoice)}
             </li>
           </ul>
-{/* 完成审核,上传附件 */}
-<div style={{
-              position: "relative",
-              display:
-                (this.props.data.processState == 7 ||
-                  this.props.data.processState == 8) &&
-                  this.props.data.status == 2 || this.props.data.status == 4  || this.props.data.status == 3 || this.props.data.status == 6
-                    ? "block"
-                    : "none",
-              marginTop: 10,
-            }}
+          {/* 完成审核,上传附件 */}
+          <div style={{
+            position: "relative",
+            display:
+              (this.props.data.processState == 7 ||
+                this.props.data.processState == 8) &&
+                this.props.data.status == 2 || this.props.data.status == 4 || this.props.data.status == 3 || this.props.data.status == 6
+                ? "block"
+                : "none",
+            marginTop: 10,
+          }}
           >
             <hr
               style={{
@@ -1552,7 +1548,7 @@ class ChangeDetail extends Component {
                 border: "none",
               }}
             />
-          <h3
+            <h3
               style={{
                 marginLeft: 20,
                 fontWeight: 800,
@@ -1568,70 +1564,70 @@ class ChangeDetail extends Component {
               </span>
             </h3>
             <div>
-            <Form.Item
-            label="变更附件"
-            labelCol={{ span: 4 }}
-            wrapperCol={{ span: 18 }}
-          >
-            <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-             { attachment.length > 0  ? <ImgList domId={this.props.domId+2 ? this.props.domId+2 : 'changeDetailCwjlqq1'} fileList={attachment} ItemWidth={'96px'}/> :'无附件'}
-            </div>
-            <Modal
-              maskClosable={false}
-              footer={null}
-              width={"50%"}
-              visible={this.state.previewVisible}
-              onCancel={() => {
-                this.setState({ previewVisible: false, rotateDeg: 0 }, () => {
-                  // this.reset();
-                });
-              }}
-            >
-              <img
-                alt=""
-                style={{
-                  width: "100%",
-                  transform: `rotate(${this.state.rotateDeg}deg)`,
-                }}
-                src={this.state.previewImage || ""}
-              />
-              <Button
-                onClick={this.rotate}
-                style={{
-                  position: "relative",
-                  left: "50%",
-                  transform: "translateX(-50%)",
-                }}
-              >
-                旋转
-              </Button>
-              <Button
-                onClick={this.upImg}
-                style={{
-                  position: "absolute",
-                  left: -81,
-                  top: "50%",
-                  transform: "translateY(-50%)",
-                }}
-              >
-                上一张
-              </Button>
-              <Button
-                onClick={this.downImg}
-                style={{
-                  position: "absolute",
-                  right: -81,
-                  top: "50%",
-                  transform: "translateY(-50%)",
-                }}
+              <Form.Item
+                label="变更附件"
+                labelCol={{ span: 4 }}
+                wrapperCol={{ span: 18 }}
               >
-                下一张
-              </Button>
-            </Modal>
-            {/* <Rizhi changeId={this.props.id} /> */}
-          </Form.Item>
-            </div>
+                <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+                  {attachment.length > 0 ? <ImgList domId={this.props.domId + 2 ? this.props.domId + 2 : 'changeDetailCwjlqq1'} fileList={attachment} ItemWidth={'96px'} /> : '无附件'}
+                </div>
+                <Modal
+                  maskClosable={false}
+                  footer={null}
+                  width={"50%"}
+                  visible={this.state.previewVisible}
+                  onCancel={() => {
+                    this.setState({ previewVisible: false, rotateDeg: 0 }, () => {
+                      // this.reset();
+                    });
+                  }}
+                >
+                  <img
+                    alt=""
+                    style={{
+                      width: "100%",
+                      transform: `rotate(${this.state.rotateDeg}deg)`,
+                    }}
+                    src={this.state.previewImage || ""}
+                  />
+                  <Button
+                    onClick={this.rotate}
+                    style={{
+                      position: "relative",
+                      left: "50%",
+                      transform: "translateX(-50%)",
+                    }}
+                  >
+                    旋转
+                  </Button>
+                  <Button
+                    onClick={this.upImg}
+                    style={{
+                      position: "absolute",
+                      left: -81,
+                      top: "50%",
+                      transform: "translateY(-50%)",
+                    }}
+                  >
+                    上一张
+                  </Button>
+                  <Button
+                    onClick={this.downImg}
+                    style={{
+                      position: "absolute",
+                      right: -81,
+                      top: "50%",
+                      transform: "translateY(-50%)",
+                    }}
+                  >
+                    下一张
+                  </Button>
+                </Modal>
+                {/* <Rizhi changeId={this.props.id} /> */}
+              </Form.Item>
             </div>
+          </div>
           {/* <div
             style={{
               position: "relative",
@@ -1677,8 +1673,8 @@ class ChangeDetail extends Component {
               display:
                 (this.props.data.processState == 7 ||
                   this.props.data.processState == 8) &&
-                this.props.data.status == 4 &&
-                this.props.data.refundStatus
+                  this.props.data.status == 4 &&
+                  this.props.data.refundStatus
                   ? "block"
                   : "none",
             }}
@@ -1840,7 +1836,7 @@ class ChangeDetail extends Component {
                 display:
                   (this.props.data.processState == 7 ||
                     this.props.data.processState == 8) &&
-                  this.props.data.status == 4
+                    this.props.data.status == 4
                     ? "block"
                     : "block",
               }}
@@ -1863,7 +1859,7 @@ class ChangeDetail extends Component {
           <Form
             layout="horizontal"
             onSubmit={this.nextSubmit}
-            // id="demand-form"
+          // id="demand-form"
           >
             <Spin spinning={this.state.loading}>
               <div className="clearfix">

+ 241 - 245
js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzj.js

@@ -1,5 +1,5 @@
 import React, { Component } from "react";
-import {Form, Upload, Modal, Button, message, Input, Select, Table, Tooltip} from "antd";
+import { Form, Upload, Modal, Button, message, Input, Select, Table, Tooltip } from "antd";
 import AgreeButton from "./agreeButton.js";
 import Rizhi from "./rizhi.js";
 import { getProcessStatusNew, changeColor } from "@/tools.js";
@@ -51,7 +51,7 @@ class Itemlist extends Component {
           {...pageData.formItemLayoutA}
           className="half-item"
         >
-          {pageData.labelA ===  '变更原因' ? <Tooltip placement="topLeft" title={pageData.dataA}>
+          {pageData.labelA === '变更原因' ? <Tooltip placement="topLeft" title={pageData.dataA}>
             <div style={{
               width: '150px !important',
               whiteSpace: 'nowrap',
@@ -59,11 +59,11 @@ class Itemlist extends Component {
               overflow: 'hidden',
               textOverflow: 'ellipsis',
             }}>{pageData.dataA}</div>
-          </Tooltip>: pageData.dataA}
+          </Tooltip> : pageData.dataA}
           {pageData.labelA === '客户名称' ? <EnterpriseNameChange
-              type='journal'
-              style={{ marginLeft: 10 }}
-              enterpriseId={this.props.orderUid}/> : null}
+            type='journal'
+            style={{ marginLeft: 10 }}
+            enterpriseId={this.props.orderUid} /> : null}
         </Form.Item>
         <Form.Item
           label={pageData.labelB}
@@ -349,13 +349,9 @@ class ChangeDetail extends Component {
         // 当前是咨询师以及咨询师经理时使用shenhePeo函数,其他流程正常显示
         dataA:
           this.props.data.processState == 2 || this.props.data.processState == 3
-            ? shenghePeo(
-              this.props.data.processState == 2
-                ? this.props.data.consultantExamine
-                : this.props.data.managerExamine,
-              this.props.data.processState
-            )
+            ? shenghePeo(this.props.data.examineName, this.props.data.processState)
             : getProcessStatusNew(
+              this.props.data.examineName,
               this.props.data.processState,
               this.props.data.status
             ),
@@ -495,7 +491,7 @@ class ChangeDetail extends Component {
               display:
                 (this.props.data.processState == 7 ||
                   this.props.data.processState == 8) &&
-                this.props.data.status == 4
+                  this.props.data.status == 4
                   ? "block"
                   : "none",
             }}
@@ -552,8 +548,8 @@ class ChangeDetail extends Component {
             {/*    });*/}
             {/*  }}*/}
             {/*/>*/}
-            <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-              {orgCodeUrl ? <ImgList domId={'changeDetailCwzj'+this.props.id} fileList={orgCodeUrl}/>: <div/>}
+            <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+              {orgCodeUrl ? <ImgList domId={'changeDetailCwzj' + this.props.id} fileList={orgCodeUrl} /> : <div />}
             </div>
             <Modal
               maskClosable={false}
@@ -561,7 +557,7 @@ class ChangeDetail extends Component {
               width={"50%"}
               visible={this.state.previewVisible}
               onCancel={() => {
-                this.setState({ previewVisible: false }, () => {});
+                this.setState({ previewVisible: false }, () => { });
               }}
             >
               <img
@@ -667,7 +663,7 @@ class ChangeDetail extends Component {
           </ul>
 
           <ProAndCuiList id={this.props.id} />
-{/* 收款情况 */}
+          {/* 收款情况 */}
           <div className="clearfix">
             <h3 style={{ marginLeft: 20, fontWeight: 800, marginBottom: 10 }}>
               收款情况
@@ -713,173 +709,173 @@ class ChangeDetail extends Component {
           </div>
           {/* 当前财务状态 */}
           {this.props.data.processState > 5 &&
-        (this.props.data.status == 1 || this.props.data.status == 3)&&
-        this.props.processState == this.props.data.processState ? (
-          // this.state.buttonStatus ? (
-          <div>
-            <div style={{ marginBottom: 10 }}>
-              <div className="clearfix">
-                <div>
-                  <h3
-                    style={{
-                      marginLeft: 10,
-                      fontWeight: 800,
-                      marginBottom: 10,
-                    }}
+            (this.props.data.status == 1 || this.props.data.status == 3) &&
+            this.props.processState == this.props.data.processState ? (
+            // this.state.buttonStatus ? (
+            <div>
+              <div style={{ marginBottom: 10 }}>
+                <div className="clearfix">
+                  <div>
+                    <h3
+                      style={{
+                        marginLeft: 10,
+                        fontWeight: 800,
+                        marginBottom: 10,
+                      }}
+                    >
+                      当前财务状态(财务填写)
+                    </h3>
+                    {financeData.map((item, index) => {
+                      return <Itemlist key={index} pageData={item} orderUid={this.props.orderUid} />;
+                    })}
+                  </div>
+                </div>
+
+                <div
+                  style={{
+                    marginTop: "10px",
+                    display:
+                      this.props.processState == this.props.data.processState
+                        ? "block"
+                        : "none",
+                  }}
+                >
+                  <Form.Item
+                    label="备注"
+                    labelCol={{ span: 4 }}
+                    wrapperCol={{ span: 14 }}
                   >
-                    当前财务状态(财务填写)
-                  </h3>
-                  {financeData.map((item, index) => {
-                    return <Itemlist key={index} pageData={item} orderUid={this.props.orderUid} />;
-                  })}
+                    <Input.TextArea
+                      rows={4}
+                      value={this.state.reason}
+                      placeholder="请输入补充资料/备注"
+                      onChange={(e) => {
+                        this.setState({
+                          reason: e.target.value,
+                        });
+                      }}
+                    />
+                  </Form.Item>
                 </div>
               </div>
-
               <div
-                style={{
-                  marginTop: "10px",
-                  display:
-                      this.props.processState == this.props.data.processState
-                      ? "block"
-                      : "none",
-                }}
+                className="clearfix"
+                style={{ display: "flex", justifyContent: "space-around" }}
               >
-                <Form.Item
-                  label="备注"
-                  labelCol={{ span: 4 }}
-                  wrapperCol={{ span: 14 }}
-                >
-                  <Input.TextArea
-                    rows={4}
-                    value={this.state.reason}
-                    placeholder="请输入补充资料/备注"
-                    onChange={(e) => {
-                      this.setState({
-                        reason: e.target.value,
-                      });
-                    }}
-                  />
-                </Form.Item>
+                {buttonData.map((item, index) => {
+                  return (
+                    <AgreeButton
+                      data={item}
+                      key={index}
+                      backData={this.props.data}
+                      processState={this.props.processState}
+                      visible={this.changeButtonStatus}
+                      ajaxData={this.state}
+                      loadData={this.props.loadData}
+                      reason={this.state.reason}
+                      rejectState={this.state.rejectState}
+                      onCancel={this.props.onCancel}
+                    />
+                  );
+                })}
               </div>
-            </div>
-            <div
-              className="clearfix"
-              style={{ display: "flex", justifyContent: "space-around" }}
-            >
-              {buttonData.map((item, index) => {
-                return (
-                  <AgreeButton
-                    data={item}
-                    key={index}
-                    backData={this.props.data}
-                    processState={this.props.processState}
-                    visible={this.changeButtonStatus}
-                    ajaxData={this.state}
-                    loadData={this.props.loadData}
-                    reason={this.state.reason}
-                    rejectState={this.state.rejectState}
-                    onCancel={this.props.onCancel}
-                  />
-                );
-              })}
-            </div>
 
-            <Select
-              defaultValue="0"
-              style={{
-                width: 120,
-                float: "left",
-                position: "relative",
-                bottom: "28px",
-                right: "-600px",
-              }}
-              onChange={(val) => {
-                this.setState({ rejectState: val });
-              }}
-            >
-              <Option
-                value="0"
-                style={{
-                  display: this.props.processState >= 1 ? "block" : "none",
-                }}
-              >
-                营销员
-              </Option>
-              <Option
-                value="1"
-                style={{
-                  display: this.props.processState >= 2 ? "block" : "none",
-                }}
-              >
-                营销管理员
-              </Option>
-              <Option
-                value="2"
-                style={{
-                  display: this.props.processState >= 3 ? "block" : "none",
-                }}
-              >
-                咨询师
-              </Option>
-              <Option
-                value="3"
+              <Select
+                defaultValue="0"
                 style={{
-                  display: this.props.processState >= 4 ? "block" : "none",
-                }}
-              >
-                咨询师经理
-              </Option>
-              <Option
-                value="4"
-                style={{
-                  display: this.props.processState >= 5 ? "block" : "none",
-                }}
-              >
-                咨询师总监
-              </Option>
-              <Option
-                value="5"
-                style={{
-                  display: this.props.processState >= 6 ? "block" : "none",
-                }}
-              >
-                财务专员(退单)
-              </Option>
-              <Option
-                value="6"
-                style={{
-                  display: this.props.processState >= 7 ? "block" : "none",
+                  width: 120,
+                  float: "left",
+                  position: "relative",
+                  bottom: "28px",
+                  right: "-600px",
                 }}
-              >
-                财务总监
-              </Option>
-              <Option
-                value="7"
-                style={{
-                  display: this.props.processState >= 8 ? "block" : "none",
+                onChange={(val) => {
+                  this.setState({ rejectState: val });
                 }}
               >
-                总裁
-              </Option>
-            </Select>
-          </div>
-        ) : (
-          <div>
-            <h3 style={{ marginLeft: 10, fontWeight: 800, marginBottom: 10 }}>
-              当前财务状态(财务填写)
-            </h3>
-            {financeData.map((item, index) => {
-              return <Itemlist key={index} pageData={item} orderUid={this.props.orderUid} />;
-            })}
-          </div>
-        )}
-{/* 回收退票 */}
+                <Option
+                  value="0"
+                  style={{
+                    display: this.props.processState >= 1 ? "block" : "none",
+                  }}
+                >
+                  营销员
+                </Option>
+                <Option
+                  value="1"
+                  style={{
+                    display: this.props.processState >= 2 ? "block" : "none",
+                  }}
+                >
+                  营销管理员
+                </Option>
+                <Option
+                  value="2"
+                  style={{
+                    display: this.props.processState >= 3 ? "block" : "none",
+                  }}
+                >
+                  咨询师
+                </Option>
+                <Option
+                  value="3"
+                  style={{
+                    display: this.props.processState >= 4 ? "block" : "none",
+                  }}
+                >
+                  咨询师经理
+                </Option>
+                <Option
+                  value="4"
+                  style={{
+                    display: this.props.processState >= 5 ? "block" : "none",
+                  }}
+                >
+                  咨询师总监
+                </Option>
+                <Option
+                  value="5"
+                  style={{
+                    display: this.props.processState >= 6 ? "block" : "none",
+                  }}
+                >
+                  财务专员(退单)
+                </Option>
+                <Option
+                  value="6"
+                  style={{
+                    display: this.props.processState >= 7 ? "block" : "none",
+                  }}
+                >
+                  财务总监
+                </Option>
+                <Option
+                  value="7"
+                  style={{
+                    display: this.props.processState >= 8 ? "block" : "none",
+                  }}
+                >
+                  总裁
+                </Option>
+              </Select>
+            </div>
+          ) : (
+            <div>
+              <h3 style={{ marginLeft: 10, fontWeight: 800, marginBottom: 10 }}>
+                当前财务状态(财务填写)
+              </h3>
+              {financeData.map((item, index) => {
+                return <Itemlist key={index} pageData={item} orderUid={this.props.orderUid} />;
+              })}
+            </div>
+          )}
+          {/* 回收退票 */}
           <div
             style={{
               display:
                 (this.props.data.processState == 8 ||
                   this.props.data.processState == 7) &&
-                (this.props.data.status == 2 || this.props.data.status == 4 || this.props.data.status == 3 || this.props.data.status == 6)
+                  (this.props.data.status == 2 || this.props.data.status == 4 || this.props.data.status == 3 || this.props.data.status == 6)
                   ? "block"
                   : "none",
             }}
@@ -913,17 +909,17 @@ class ChangeDetail extends Component {
               dataSource={this.state.contactList}
             />
           </div>
-{/* 完成审核,上传附件 */}
-<div style={{
-              position: "relative",
-              display:
-                (this.props.data.processState == 7 ||
-                  this.props.data.processState == 8) &&
-                  this.props.data.status == 2 || this.props.data.status == 4  || this.props.data.status == 3 || this.props.data.status == 6
-                    ? "block"
-                    : "none",
-              marginTop: 10,
-            }}
+          {/* 完成审核,上传附件 */}
+          <div style={{
+            position: "relative",
+            display:
+              (this.props.data.processState == 7 ||
+                this.props.data.processState == 8) &&
+                this.props.data.status == 2 || this.props.data.status == 4 || this.props.data.status == 3 || this.props.data.status == 6
+                ? "block"
+                : "none",
+            marginTop: 10,
+          }}
           >
             <hr
               style={{
@@ -934,7 +930,7 @@ class ChangeDetail extends Component {
                 border: "none",
               }}
             />
-          <h3
+            <h3
               style={{
                 marginLeft: 20,
                 fontWeight: 800,
@@ -950,70 +946,70 @@ class ChangeDetail extends Component {
               </span>
             </h3>
             <div>
-            <Form.Item
-            label="变更附件"
-            labelCol={{ span: 4 }}
-            wrapperCol={{ span: 18 }}
-          >
-            <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-             { attachment.length > 0  ? <ImgList domId={this.props.domId+2 ? this.props.domId+2 : 'changeDetailCwzj1'} fileList={attachment} ItemWidth={'96px'}/> :'无附件'}
-            </div>
-            <Modal
-              maskClosable={false}
-              footer={null}
-              width={"50%"}
-              visible={this.state.previewVisible}
-              onCancel={() => {
-                this.setState({ previewVisible: false, rotateDeg: 0 }, () => {
-                  // this.reset();
-                });
-              }}
-            >
-              <img
-                alt=""
-                style={{
-                  width: "100%",
-                  transform: `rotate(${this.state.rotateDeg}deg)`,
-                }}
-                src={this.state.previewImage || ""}
-              />
-              <Button
-                onClick={this.rotate}
-                style={{
-                  position: "relative",
-                  left: "50%",
-                  transform: "translateX(-50%)",
-                }}
-              >
-                旋转
-              </Button>
-              <Button
-                onClick={this.upImg}
-                style={{
-                  position: "absolute",
-                  left: -81,
-                  top: "50%",
-                  transform: "translateY(-50%)",
-                }}
-              >
-                上一张
-              </Button>
-              <Button
-                onClick={this.downImg}
-                style={{
-                  position: "absolute",
-                  right: -81,
-                  top: "50%",
-                  transform: "translateY(-50%)",
-                }}
+              <Form.Item
+                label="变更附件"
+                labelCol={{ span: 4 }}
+                wrapperCol={{ span: 18 }}
               >
-                下一张
-              </Button>
-            </Modal>
-            {/* <Rizhi changeId={this.props.id} /> */}
-          </Form.Item>
-            </div>
+                <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+                  {attachment.length > 0 ? <ImgList domId={this.props.domId + 2 ? this.props.domId + 2 : 'changeDetailCwzj1'} fileList={attachment} ItemWidth={'96px'} /> : '无附件'}
+                </div>
+                <Modal
+                  maskClosable={false}
+                  footer={null}
+                  width={"50%"}
+                  visible={this.state.previewVisible}
+                  onCancel={() => {
+                    this.setState({ previewVisible: false, rotateDeg: 0 }, () => {
+                      // this.reset();
+                    });
+                  }}
+                >
+                  <img
+                    alt=""
+                    style={{
+                      width: "100%",
+                      transform: `rotate(${this.state.rotateDeg}deg)`,
+                    }}
+                    src={this.state.previewImage || ""}
+                  />
+                  <Button
+                    onClick={this.rotate}
+                    style={{
+                      position: "relative",
+                      left: "50%",
+                      transform: "translateX(-50%)",
+                    }}
+                  >
+                    旋转
+                  </Button>
+                  <Button
+                    onClick={this.upImg}
+                    style={{
+                      position: "absolute",
+                      left: -81,
+                      top: "50%",
+                      transform: "translateY(-50%)",
+                    }}
+                  >
+                    上一张
+                  </Button>
+                  <Button
+                    onClick={this.downImg}
+                    style={{
+                      position: "absolute",
+                      right: -81,
+                      top: "50%",
+                      transform: "translateY(-50%)",
+                    }}
+                  >
+                    下一张
+                  </Button>
+                </Modal>
+                {/* <Rizhi changeId={this.props.id} /> */}
+              </Form.Item>
             </div>
+          </div>
           {/* {this.props.data.type === 0 && this.props.data.processState >= 4 ? (
             <div>
               <h3 style={{ marginLeft: 10, fontWeight: 800, marginBottom: 10 }}>
@@ -1054,14 +1050,14 @@ class ChangeDetail extends Component {
             ""
           )} */}
         </div>
-        
+
         <div
           style={{
             display:
               (this.props.data.processState == 7 ||
                 this.props.data.processState == 8) &&
-              this.props.data.status == 4 && 
-              this.props.data.refundStatus
+                this.props.data.status == 4 &&
+                this.props.data.refundStatus
                 ? "block"
                 : "none",
           }}

+ 2 - 6
js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzy.js

@@ -971,13 +971,9 @@ class ChangeDetail extends Component {
         // 当前是咨询师以及咨询师经理时使用shenhePeo函数,其他流程正常显示
         dataA:
           this.props.data.processState == 2 || this.props.data.processState == 3
-            ? shenghePeo(
-              this.props.data.processState == 2
-                ? this.props.data.consultantExamine
-                : this.props.data.managerExamine,
-              this.props.data.processState
-            )
+            ? shenghePeo(this.props.data.examineName, this.props.data.processState)
             : getProcessStatusNew(
+              this.props.data.examineName,
               this.props.data.processState,
               this.props.data.status
             ),

+ 88 - 92
js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsjl.js

@@ -243,16 +243,12 @@ class ChangeDetail extends Component {
         // 当前是咨询师以及咨询师经理时使用shenhePeo函数,其他流程正常显示
         dataA:
           this.props.data.processState == 2 || this.props.data.processState == 3
-            ? shenghePeo(
-                this.props.data.processState == 2
-                  ? this.props.data.consultantExamine
-                  : this.props.data.managerExamine,
-                this.props.data.processState
-              )
+            ? shenghePeo(this.props.data.examineName, this.props.data.processState)
             : getProcessStatusNew(
-                this.props.data.processState,
-                this.props.data.status
-              ),
+              this.props.data.examineName,
+              this.props.data.processState,
+              this.props.data.status
+            ),
         labelB: "变更类型",
         formItemLayoutB: formItemLayout,
         dataB: getChangeType(this.props.data.type),
@@ -368,7 +364,7 @@ class ChangeDetail extends Component {
               display:
                 (this.props.data.processState == 7 ||
                   this.props.data.processState == 8) &&
-                this.props.data.status == 4
+                  this.props.data.status == 4
                   ? "block"
                   : "none",
             }}
@@ -414,8 +410,8 @@ class ChangeDetail extends Component {
             labelCol={{ span: 4 }}
             wrapperCol={{ span: 18 }}
           >
-            <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-              <ImgList domId={this.props.domId ? this.props.domId+'1' : 'changeDetailJsjl1'} fileList={orgCodeUrl} ItemWidth={'96px'}/>
+            <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+              <ImgList domId={this.props.domId ? this.props.domId + '1' : 'changeDetailJsjl1'} fileList={orgCodeUrl} ItemWidth={'96px'} />
             </div>
             <Modal
               maskClosable={false}
@@ -579,7 +575,7 @@ class ChangeDetail extends Component {
           <div
             style={{
               display: this.props.data.processState > 5 ? "block" : "none",
-              marginTop:'10px'
+              marginTop: '10px'
             }}
           >
             <h3 style={{ marginLeft: 20, fontWeight: 800, marginBottom: 10 }}>
@@ -601,13 +597,13 @@ class ChangeDetail extends Component {
           ) : (
             ""
           )} */}
-{/* 回收退票 */}
+          {/* 回收退票 */}
           <div
             style={{
               display:
                 (this.props.data.processState == 8 ||
                   this.props.data.processState == 7) &&
-                (this.props.data.status == 2 || this.props.data.status == 4 || this.props.data.status == 3 || this.props.data.status == 6)
+                  (this.props.data.status == 2 || this.props.data.status == 4 || this.props.data.status == 3 || this.props.data.status == 6)
                   ? "block"
                   : "none",
             }}
@@ -624,17 +620,17 @@ class ChangeDetail extends Component {
               dataSource={this.state.contactList}
             />
           </div>
-{/* 完成审核,上传附件 */}
-<div style={{
-              position: "relative",
-              display:
-                (this.props.data.processState == 7 ||
-                  this.props.data.processState == 8) &&
-                  this.props.data.status == 2 || this.props.data.status == 4 || this.props.data.status == 3 || this.props.data.status == 6
-                    ? "block"
-                    : "none",
-              marginTop: 10,
-            }}
+          {/* 完成审核,上传附件 */}
+          <div style={{
+            position: "relative",
+            display:
+              (this.props.data.processState == 7 ||
+                this.props.data.processState == 8) &&
+                this.props.data.status == 2 || this.props.data.status == 4 || this.props.data.status == 3 || this.props.data.status == 6
+                ? "block"
+                : "none",
+            marginTop: 10,
+          }}
           >
             <hr
               style={{
@@ -645,7 +641,7 @@ class ChangeDetail extends Component {
                 border: "none",
               }}
             />
-          <h3
+            <h3
               style={{
                 marginLeft: 20,
                 fontWeight: 800,
@@ -661,71 +657,71 @@ class ChangeDetail extends Component {
               </span>
             </h3>
             <div>
-            <Form.Item
-            label="变更附件"
-            labelCol={{ span: 4 }}
-            wrapperCol={{ span: 18 }}
-          >
-            <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-             { attachment.length > 0  ? <ImgList domId={this.props.domId+2 ? this.props.domId+2 : 'changeDetailJsjl2'} fileList={attachment} ItemWidth={'96px'}/> :'无附件'}
-            </div>
-            <Modal
-              maskClosable={false}
-              footer={null}
-              width={"50%"}
-              visible={this.state.previewVisible}
-              onCancel={() => {
-                this.setState({ previewVisible: false, rotateDeg: 0 }, () => {
-                  // this.reset();
-                });
-              }}
-            >
-              <img
-                alt=""
-                style={{
-                  width: "100%",
-                  transform: `rotate(${this.state.rotateDeg}deg)`,
-                }}
-                src={this.state.previewImage || ""}
-              />
-              <Button
-                onClick={this.rotate}
-                style={{
-                  position: "relative",
-                  left: "50%",
-                  transform: "translateX(-50%)",
-                }}
-              >
-                旋转
-              </Button>
-              <Button
-                onClick={this.upImg}
-                style={{
-                  position: "absolute",
-                  left: -81,
-                  top: "50%",
-                  transform: "translateY(-50%)",
-                }}
-              >
-                上一张
-              </Button>
-              <Button
-                onClick={this.downImg}
-                style={{
-                  position: "absolute",
-                  right: -81,
-                  top: "50%",
-                  transform: "translateY(-50%)",
-                }}
+              <Form.Item
+                label="变更附件"
+                labelCol={{ span: 4 }}
+                wrapperCol={{ span: 18 }}
               >
-                下一张
-              </Button>
-            </Modal>
-            {/* <Rizhi changeId={this.props.id} /> */}
-          </Form.Item>
-            </div>
+                <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+                  {attachment.length > 0 ? <ImgList domId={this.props.domId + 2 ? this.props.domId + 2 : 'changeDetailJsjl2'} fileList={attachment} ItemWidth={'96px'} /> : '无附件'}
+                </div>
+                <Modal
+                  maskClosable={false}
+                  footer={null}
+                  width={"50%"}
+                  visible={this.state.previewVisible}
+                  onCancel={() => {
+                    this.setState({ previewVisible: false, rotateDeg: 0 }, () => {
+                      // this.reset();
+                    });
+                  }}
+                >
+                  <img
+                    alt=""
+                    style={{
+                      width: "100%",
+                      transform: `rotate(${this.state.rotateDeg}deg)`,
+                    }}
+                    src={this.state.previewImage || ""}
+                  />
+                  <Button
+                    onClick={this.rotate}
+                    style={{
+                      position: "relative",
+                      left: "50%",
+                      transform: "translateX(-50%)",
+                    }}
+                  >
+                    旋转
+                  </Button>
+                  <Button
+                    onClick={this.upImg}
+                    style={{
+                      position: "absolute",
+                      left: -81,
+                      top: "50%",
+                      transform: "translateY(-50%)",
+                    }}
+                  >
+                    上一张
+                  </Button>
+                  <Button
+                    onClick={this.downImg}
+                    style={{
+                      position: "absolute",
+                      right: -81,
+                      top: "50%",
+                      transform: "translateY(-50%)",
+                    }}
+                  >
+                    下一张
+                  </Button>
+                </Modal>
+                {/* <Rizhi changeId={this.props.id} /> */}
+              </Form.Item>
             </div>
-          
+          </div>
+
 
           {/* 
           
@@ -807,8 +803,8 @@ class ChangeDetail extends Component {
               display:
                 (this.props.data.processState == 7 ||
                   this.props.data.processState == 8) &&
-                this.props.data.status == 4 &&
-                this.props.data.refundStatus
+                  this.props.data.status == 4 &&
+                  this.props.data.refundStatus
                   ? "block"
                   : "none",
             }}

+ 88 - 92
js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsy.js

@@ -53,9 +53,9 @@ class Itemlist extends Component {
           <p style={{ width: 350, wordWrap: "break-word" }}>
             {pageData.dataA}
             {pageData.labelA === '客户名称' ? <EnterpriseNameChange
-                type='journal'
-                style={{ marginLeft: 10 }}
-                enterpriseId={this.props.orderUid}/> : null}
+              type='journal'
+              style={{ marginLeft: 10 }}
+              enterpriseId={this.props.orderUid} /> : null}
           </p>
         </Form.Item>
         <Form.Item
@@ -228,16 +228,12 @@ class ChangeDetail extends Component {
         // 当前是咨询师以及咨询师经理时使用shenhePeo函数,其他流程正常显示
         dataA:
           this.props.data.processState == 2 || this.props.data.processState == 3
-            ? shenghePeo(
-                this.props.data.processState == 2
-                  ? this.props.data.consultantExamine
-                  : this.props.data.managerExamine,
-                this.props.data.processState
-              )
+            ? shenghePeo(this.props.data.examineName, this.props.data.processState)
             : getProcessStatusNew(
-                this.props.data.processState,
-                this.props.data.status
-              ),
+              this.props.data.examineName,
+              this.props.data.processState,
+              this.props.data.status
+            ),
         labelB: "变更类型",
         formItemLayoutB: formItemLayout,
         dataB: getChangeType(this.props.data.type),
@@ -359,7 +355,7 @@ class ChangeDetail extends Component {
               display:
                 (this.props.data.processState == 7 ||
                   this.props.data.processState == 8) &&
-                this.props.data.status == 4
+                  this.props.data.status == 4
                   ? "block"
                   : "none",
             }}
@@ -398,15 +394,15 @@ class ChangeDetail extends Component {
             合同变更记录
           </h2>
           {pageData.map((item, index) => {
-            return <Itemlist key={index} pageData={item} orderUid={this.props.orderUid}/>;
+            return <Itemlist key={index} pageData={item} orderUid={this.props.orderUid} />;
           })}
           <Form.Item
             label="变更凭证"
             labelCol={{ span: 4 }}
             wrapperCol={{ span: 18 }}
           >
-            <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-              <ImgList domId={this.props.domId ? this.props.domId : 'changeDetailJsy1'} fileList={orgCodeUrl} ItemWidth={'96px'}/>
+            <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+              <ImgList domId={this.props.domId ? this.props.domId : 'changeDetailJsy1'} fileList={orgCodeUrl} ItemWidth={'96px'} />
             </div>
             <Modal
               maskClosable={false}
@@ -556,17 +552,17 @@ class ChangeDetail extends Component {
           ) : (
             ""
           )} */}
-                       {/* 完成审核,上传附件 */}
-                       <div style={{
-              position: "relative",
-              display:
-                (this.props.data.processState == 7 ||
-                  this.props.data.processState == 8) &&
-                  this.props.data.status == 2 || this.props.data.status == 4 || this.props.data.status == 3 || this.props.data.status == 6
-                    ? "block"
-                    : "none",
-              marginTop: 10,
-            }}
+          {/* 完成审核,上传附件 */}
+          <div style={{
+            position: "relative",
+            display:
+              (this.props.data.processState == 7 ||
+                this.props.data.processState == 8) &&
+                this.props.data.status == 2 || this.props.data.status == 4 || this.props.data.status == 3 || this.props.data.status == 6
+                ? "block"
+                : "none",
+            marginTop: 10,
+          }}
           >
             <hr
               style={{
@@ -577,7 +573,7 @@ class ChangeDetail extends Component {
                 border: "none",
               }}
             />
-          <h3
+            <h3
               style={{
                 marginLeft: 20,
                 fontWeight: 800,
@@ -593,77 +589,77 @@ class ChangeDetail extends Component {
               </span>
             </h3>
             <div>
-            <Form.Item
-            label="变更附件"
-            labelCol={{ span: 4 }}
-            wrapperCol={{ span: 18 }}
-          >
-            <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-             { attachment.length > 0  ? <ImgList domId={this.props.domId+2 ? this.props.domId+2 : 'changeDetailJsy2'} fileList={attachment} ItemWidth={'96px'}/> :'无附件'}
-            </div>
-            <Modal
-              maskClosable={false}
-              footer={null}
-              width={"50%"}
-              visible={this.state.previewVisible}
-              onCancel={() => {
-                this.setState({ previewVisible: false, rotateDeg: 0 }, () => {
-                  // this.reset();
-                });
-              }}
-            >
-              <img
-                alt=""
-                style={{
-                  width: "100%",
-                  transform: `rotate(${this.state.rotateDeg}deg)`,
-                }}
-                src={this.state.previewImage || ""}
-              />
-              <Button
-                onClick={this.rotate}
-                style={{
-                  position: "relative",
-                  left: "50%",
-                  transform: "translateX(-50%)",
-                }}
-              >
-                旋转
-              </Button>
-              <Button
-                onClick={this.upImg}
-                style={{
-                  position: "absolute",
-                  left: -81,
-                  top: "50%",
-                  transform: "translateY(-50%)",
-                }}
-              >
-                上一张
-              </Button>
-              <Button
-                onClick={this.downImg}
-                style={{
-                  position: "absolute",
-                  right: -81,
-                  top: "50%",
-                  transform: "translateY(-50%)",
-                }}
+              <Form.Item
+                label="变更附件"
+                labelCol={{ span: 4 }}
+                wrapperCol={{ span: 18 }}
               >
-                下一张
-              </Button>
-            </Modal>
-            {/* <Rizhi changeId={this.props.id} /> */}
-          </Form.Item>
-            </div>
+                <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+                  {attachment.length > 0 ? <ImgList domId={this.props.domId + 2 ? this.props.domId + 2 : 'changeDetailJsy2'} fileList={attachment} ItemWidth={'96px'} /> : '无附件'}
+                </div>
+                <Modal
+                  maskClosable={false}
+                  footer={null}
+                  width={"50%"}
+                  visible={this.state.previewVisible}
+                  onCancel={() => {
+                    this.setState({ previewVisible: false, rotateDeg: 0 }, () => {
+                      // this.reset();
+                    });
+                  }}
+                >
+                  <img
+                    alt=""
+                    style={{
+                      width: "100%",
+                      transform: `rotate(${this.state.rotateDeg}deg)`,
+                    }}
+                    src={this.state.previewImage || ""}
+                  />
+                  <Button
+                    onClick={this.rotate}
+                    style={{
+                      position: "relative",
+                      left: "50%",
+                      transform: "translateX(-50%)",
+                    }}
+                  >
+                    旋转
+                  </Button>
+                  <Button
+                    onClick={this.upImg}
+                    style={{
+                      position: "absolute",
+                      left: -81,
+                      top: "50%",
+                      transform: "translateY(-50%)",
+                    }}
+                  >
+                    上一张
+                  </Button>
+                  <Button
+                    onClick={this.downImg}
+                    style={{
+                      position: "absolute",
+                      right: -81,
+                      top: "50%",
+                      transform: "translateY(-50%)",
+                    }}
+                  >
+                    下一张
+                  </Button>
+                </Modal>
+                {/* <Rizhi changeId={this.props.id} /> */}
+              </Form.Item>
             </div>
+          </div>
           <div
             style={{
               display:
                 (this.props.data.processState == 7 ||
                   this.props.data.processState == 8) &&
-                this.props.data.status == 4 &&
-                this.props.data.refundStatus
+                  this.props.data.status == 4 &&
+                  this.props.data.refundStatus
                   ? "block"
                   : "none",
             }}

+ 2 - 6
js/component/manageCenter/order/orderNew/changeComponent/changeDetailJszj.js

@@ -246,13 +246,9 @@ class ChangeDetail extends Component {
         // 当前是咨询师以及咨询师经理时使用shenhePeo函数,其他流程正常显示
         dataA:
           this.props.data.processState == 2 || this.props.data.processState == 3
-            ? shenghePeo(
-              this.props.data.processState == 2
-                ? this.props.data.consultantExamine
-                : this.props.data.managerExamine,
-              this.props.data.processState
-            )
+            ? shenghePeo(this.props.data.examineName, this.props.data.processState)
             : getProcessStatusNew(
+              this.props.data.examineName,
               this.props.data.processState,
               this.props.data.status
             ),

+ 2 - 6
js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxgly.js

@@ -298,13 +298,9 @@ class ChangeDetail extends Component {
         // 当前是咨询师以及咨询师经理时使用shenhePeo函数,其他流程正常显示
         dataA:
           this.props.data.processState == 2 || this.props.data.processState == 3
-            ? shenghePeo(
-              this.props.data.processState == 2
-                ? this.props.data.consultantExamine
-                : this.props.data.managerExamine,
-              this.props.data.processState
-            )
+            ? shenghePeo(this.props.data.examineName, this.props.data.processState)
             : getProcessStatusNew(
+              this.props.data.examineName,
               this.props.data.processState,
               this.props.data.status
             ),

+ 2 - 6
js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxy.js

@@ -332,13 +332,9 @@ class ChangeDetail extends Component {
         // 当前是咨询师以及咨询师经理时使用shenhePeo函数,其他流程正常显示
         dataA:
           this.props.data.processState == 2 || this.props.data.processState == 3
-            ? shenghePeo(
-              this.props.data.processState == 2
-                ? this.props.data.consultantExamine
-                : this.props.data.managerExamine,
-              this.props.data.processState
-            )
+            ? shenghePeo(this.props.data.examineName, this.props.data.processState)
             : getProcessStatusNew(
+              this.props.data.examineName,
               this.props.data.processState,
               this.props.data.status
             ),

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

@@ -626,7 +626,7 @@ class OrderDetail extends Component {
           <span>{data.signDate}</span>
         </FormItem>
         <FormItem className="half-item" {...formItemLayout} label="流程状态">
-          <span>{getProcessStatus(data.processStatus)}</span>
+          <span>{getProcessStatus(data.processStatus, data.examineName)}</span>
         </FormItem>
         <FormItem className="half-item" {...formItemLayout} label="结算状态">
           <span>{getLiquidationStatus(data.liquidationStatus)}</span>

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

@@ -675,6 +675,7 @@ const IntentionCustomer = Form.create()(
               contractNo: thisdata.contractNo, //合同编号
               userName: thisdata.userName, //客户名称
               signDate: thisdata.signDate, //签单时间
+              examineName: thisdata.examineName,
               processStatus: thisdata.processStatus, //流程状态
               liquidationStatus: thisdata.liquidationStatus, //结算状态
               contacts: thisdata.contacts, //企业联系人
@@ -1177,7 +1178,7 @@ const IntentionCustomer = Form.create()(
                       {...formItemLayout}
                       label="流程状态"
                     >
-                      <span>{getProcessStatus(this.state.processStatus)}</span>
+                      <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
                     </FormItem>
                     <FormItem
                       className="half-item"

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

@@ -532,6 +532,7 @@ const checkOutsourcing = Form.create()(
               contractNo: thisdata.contractNo, //合同编号
               userName: thisdata.userName, //客户名称
               signDate: thisdata.signDate, //签单时间
+              examineName: thisdata.examineName,
               processStatus: thisdata.processStatus, //流程状态
               liquidationStatus: thisdata.liquidationStatus, //结算状态
               contacts: thisdata.contacts, //企业联系人
@@ -1376,7 +1377,7 @@ const checkOutsourcing = Form.create()(
                         label="流程状态"
                       >
                         <span>
-                          {getProcessStatus(this.state.processStatus)}
+                          {getProcessStatus(this.state.processStatus, this.state.examineName)}
                         </span>
                       </FormItem>
                       <FormItem

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

@@ -81,6 +81,7 @@ const contractChange = Form.create()(
                 id: thisdata.id,
                 contractNo: thisdata.contractNo,
                 processStateText: getProcessStatusNew(
+                  thisdata.examineName,
                   thisdata.processState,
                   thisdata.status
                 )

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

@@ -80,6 +80,7 @@ const contractChange = Form.create()(
                 id: thisdata.id,
                 contractNo: thisdata.contractNo,
                 processStateText: getProcessStatusNew(
+                  thisdata.examineName,
                   thisdata.processState,
                   thisdata.status
                 )

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

@@ -81,6 +81,7 @@ const contractChange = Form.create()(
                 id: thisdata.id,
                 contractNo: thisdata.contractNo,
                 processStateText: getProcessStatusNew(
+                  thisdata.examineName,
                   thisdata.processState,
                   thisdata.status
                 )

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

@@ -80,6 +80,7 @@ const contractChange = Form.create()(
                 id: thisdata.id,
                 contractNo: thisdata.contractNo,
                 processStateText: getProcessStatusNew(
+                  thisdata.examineName,
                   thisdata.processState,
                   thisdata.status
                 )

+ 1 - 0
js/component/manageCenter/order/orderNew/contractJsy.js

@@ -80,6 +80,7 @@ const contractChange = Form.create()(
                 id: thisdata.id,
                 contractNo: thisdata.contractNo,
                 processStateText: getProcessStatusNew(
+                  thisdata.examineName,
                   thisdata.processState,
                   thisdata.status
                 )

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

@@ -80,6 +80,7 @@ const contractChange = Form.create()(
                 id: thisdata.id,
                 contractNo: thisdata.contractNo,
                 processStateText: getProcessStatusNew(
+                  thisdata.examineName,
                   thisdata.processState,
                   thisdata.status
                 )

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

@@ -80,6 +80,7 @@ const contractChange = Form.create()(
                 id: thisdata.id,
                 contractNo: thisdata.contractNo,
                 processStateText: getProcessStatusNew(
+                  thisdata.examineName,
                   thisdata.processState,
                   thisdata.status
                 )

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

@@ -83,6 +83,7 @@ const contractChange = Form.create()(
                 id: thisdata.id,
                 contractNo: thisdata.contractNo,
                 processStateText: getProcessStatusNew(
+                  thisdata.examineName,
                   thisdata.processState,
                   thisdata.status
                 )

+ 14 - 13
js/component/manageCenter/order/orderNew/costAuditList/component/orderPaymentModal.js

@@ -1,12 +1,12 @@
-import React,{Component} from 'react';
-import {Button, message, Modal, Spin, Table} from "antd";
+import React, { Component } from 'react';
+import { Button, message, Modal, Spin, Table } from "antd";
 import $ from "jquery";
 import PayRecord from "../../../../components/checkProject/payRecord";
 
-class OrderPaymentModal extends Component{
+class OrderPaymentModal extends Component {
     constructor(props) {
         super(props);
-        this.state={
+        this.state = {
             loading: false,
             selectOrderPayments: [],
             payRecordVisible: false,
@@ -98,6 +98,7 @@ class OrderPaymentModal extends Component{
                                 display: 'flex',
                             }}>
                                 <div className="operation">
+                                    {(!!record.financeName && text === 0) ? record.financeName : ""}
                                     {
                                         text === 0 ? '审核中' :
                                             text === 1 ? '审核通过' :
@@ -106,7 +107,7 @@ class OrderPaymentModal extends Component{
                                                         text === 4 ? '已取消' : ''
                                     }
                                 </div>
-                                <Button type="primary" size='small' style={{marginLeft:'10px'}} onClick={()=>{
+                                <Button type="primary" size='small' style={{ marginLeft: '10px' }} onClick={() => {
                                     this.setState({
                                         payRecordVisible: true,
                                         orderPaymentsId: record.id,
@@ -124,18 +125,18 @@ class OrderPaymentModal extends Component{
     }
 
     componentDidMount() {
-        if(this.props.tid){
+        if (this.props.tid) {
             this.getSelectOrderPayment();
         }
     }
 
     //0审核 1待支付 2驳回 3已支付 4取消
     operationJudgmentName(id) {
-        if(this.props.isAuditPayment){          //财务
+        if (this.props.isAuditPayment) {          //财务
             return id === 0 ? '待审核' :
                 id === 1 ? '待支付' :
                     id === 2 ? '查看详情' : '查看详情'
-        }else{
+        } else {
             return id === 0 ? '待审核' :
                 id === 1 ? '待支付' :
                     id === 2 ? '查看详情' : '查看详情'
@@ -171,7 +172,7 @@ class OrderPaymentModal extends Component{
     }
 
     render() {
-        return(
+        return (
             <Modal
                 maskClosable={false}
                 className="customeDetails"
@@ -179,10 +180,10 @@ class OrderPaymentModal extends Component{
                 title="支付记录"
                 width="1200px"
                 visible={this.props.visible}
-                onOk={()=>{
+                onOk={() => {
                     this.props.onSuccess && this.props.onSuccess();
                 }}
-                onCancel={()=>{
+                onCancel={() => {
                     this.props.onCancer && this.props.onCancer();
                 }}
             >
@@ -207,14 +208,14 @@ class OrderPaymentModal extends Component{
                     tid={this.props.tid}
                     isAuditPayment={this.props.isAuditPayment}
                     projectType={this.props.projectType}
-                    changeVisible={()=>{
+                    changeVisible={() => {
                         this.getSelectOrderPayment();
                         this.setState({
                             payRecordVisible: false,
                             orderPaymentsId: 0,
                         })
                     }}
-                /> : <div/>}
+                /> : <div />}
             </Modal>
         )
     }

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

@@ -477,6 +477,7 @@ class projectOverview extends Component {
                         userType: thisdata.userType,//
                         salesType: thisdata.salesType, //销售类型
                         other: thisdata.other,
+                        examineName: thisdata.examineName,
                         processStatus: thisdata.processStatus, //流程状态
                         liquidationStatus: thisdata.liquidationStatus, //结算状态
                         approval: thisdata.approval, //特批状态
@@ -626,7 +627,7 @@ class projectOverview extends Component {
                                 {...formItemLayout}
                                 label="流程状态"
                             >
-                                <span>{getProcessStatus(this.state.processStatus)}</span>
+                                <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
                             </FormItem>
                             <FormItem
                                 className="half-item"

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

@@ -348,8 +348,8 @@ const IntentionCustomer = Form.create()(
             title: "流程状态",
             dataIndex: "processStatus",
             key: "processStatus",
-            render: (text) => {
-              return getProcessStatus(text);
+            render: (text, record) => {
+              return getProcessStatus(text, record.examineName);
             },
           },
           {
@@ -723,6 +723,7 @@ const IntentionCustomer = Form.create()(
               contractNo: thisdata.contractNo, //合同编号
               userName: thisdata.userName, //客户名称
               signDate: thisdata.signDate, //签单时间
+              examineName: thisdata.examineName,
               processStatus: thisdata.processStatus, //流程状态
               liquidationStatus: thisdata.liquidationStatus, //结算状态
               contacts: thisdata.contacts, //企业联系人
@@ -1836,7 +1837,7 @@ const IntentionCustomer = Form.create()(
                           label="流程状态"
                         >
                           <span>
-                            {getProcessStatus(this.state.processStatus)}
+                            {getProcessStatus(this.state.processStatus, this.state.examineName)}
                           </span>
                         </FormItem>
                         <FormItem

+ 14 - 13
js/component/manageCenter/order/orderNew/glCostAuditList/component/orderPaymentModal.js

@@ -1,12 +1,12 @@
-import React,{Component} from 'react';
-import {Button, message, Modal, Spin, Table} from "antd";
+import React, { Component } from 'react';
+import { Button, message, Modal, Spin, Table } from "antd";
 import $ from "jquery";
 import PayRecord from "../../../../components/checkProject/payRecord";
 
-class OrderPaymentModal extends Component{
+class OrderPaymentModal extends Component {
     constructor(props) {
         super(props);
-        this.state={
+        this.state = {
             loading: false,
             selectOrderPayments: [],
             payRecordVisible: false,
@@ -98,6 +98,7 @@ class OrderPaymentModal extends Component{
                                 display: 'flex',
                             }}>
                                 <div className="operation">
+                                    {(!!record.financeName && text === 0) ? record.financeName : ""}
                                     {
                                         text === 0 ? '审核中' :
                                             text === 1 ? '审核通过' :
@@ -106,7 +107,7 @@ class OrderPaymentModal extends Component{
                                                         text === 4 ? '已取消' : ''
                                     }
                                 </div>
-                                <Button type="primary" size='small' style={{marginLeft:'10px'}} onClick={()=>{
+                                <Button type="primary" size='small' style={{ marginLeft: '10px' }} onClick={() => {
                                     this.setState({
                                         payRecordVisible: true,
                                         orderPaymentsId: record.id,
@@ -124,18 +125,18 @@ class OrderPaymentModal extends Component{
     }
 
     componentDidMount() {
-        if(this.props.tid){
+        if (this.props.tid) {
             this.getSelectOrderPayment();
         }
     }
 
     //0审核 1待支付 2驳回 3已支付 4取消
     operationJudgmentName(id) {
-        if(this.props.isAuditPayment){          //财务
+        if (this.props.isAuditPayment) {          //财务
             return id === 0 ? '待审核' :
                 id === 1 ? '待支付' :
                     id === 2 ? '查看详情' : '查看详情'
-        }else{
+        } else {
             return id === 0 ? '待审核' :
                 id === 1 ? '待支付' :
                     id === 2 ? '查看详情' : '查看详情'
@@ -171,17 +172,17 @@ class OrderPaymentModal extends Component{
     }
 
     render() {
-        return(
+        return (
             <Modal
                 className="customeDetails"
                 footer={false}
                 title="支付记录"
                 width="1200px"
                 visible={this.props.visible}
-                onOk={()=>{
+                onOk={() => {
                     this.props.onSuccess && this.props.onSuccess();
                 }}
-                onCancel={()=>{
+                onCancel={() => {
                     this.props.onCancer && this.props.onCancer();
                 }}
             >
@@ -207,14 +208,14 @@ class OrderPaymentModal extends Component{
                     isAuditPayment={this.props.isAuditPayment}
                     isAuditPaymentGLY={this.props.isAuditPaymentGLY}
                     projectType={this.props.projectType}
-                    changeVisible={()=>{
+                    changeVisible={() => {
                         this.getSelectOrderPayment();
                         this.setState({
                             payRecordVisible: false,
                             orderPaymentsId: 0,
                         })
                     }}
-                /> : <div/>}
+                /> : <div />}
             </Modal>
         )
     }

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

@@ -170,7 +170,7 @@ class projectOverview extends Component {
                     key: "serviceLife",
                     render: (text, record) => {
                         return (
-<div>{!!text && JSON.parse(text).toString()}</div>
+                            <div>{!!text && JSON.parse(text).toString()}</div>
                         );
                     }
                 },
@@ -479,6 +479,7 @@ class projectOverview extends Component {
                         userType: thisdata.userType,//
                         salesType: thisdata.salesType, //销售类型
                         other: thisdata.other,
+                        examineName: thisdata.examineName,
                         processStatus: thisdata.processStatus, //流程状态
                         liquidationStatus: thisdata.liquidationStatus, //结算状态
                         approval: thisdata.approval, //特批状态
@@ -639,7 +640,7 @@ class projectOverview extends Component {
                                 {...formItemLayout}
                                 label="流程状态"
                             >
-                                <span>{getProcessStatus(this.state.processStatus)}</span>
+                                <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
                             </FormItem>
                             <FormItem
                                 className="half-item"

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

@@ -176,6 +176,7 @@ const IntentionCustomer = Form.create()(
                 projectType: thisdata.projectType, // 会员状态
                 orderNo: thisdata.orderNo, //订单编号
                 totalAmount: thisdata.totalAmount, //签单金额
+                examineName: thisdata.examineName,
                 processStatus: thisdata.processStatus, //流程状态
                 liquidationStatus: thisdata.liquidationStatus, //结算状态
                 approval: thisdata.approval, //特批状态
@@ -844,8 +845,8 @@ const IntentionCustomer = Form.create()(
             title: "流程状态",
             dataIndex: "processStatus",
             key: "processStatus",
-            render: (text) => {
-              return getProcessStatus(text);
+            render: (text, record) => {
+              return getProcessStatus(text, record.examineName);
             },
           },
           {
@@ -1528,6 +1529,7 @@ const IntentionCustomer = Form.create()(
                 status: thisdata.status, //结算状态
                 rejectReason: thisdata.rejectReason,
                 approval: thisdata.approval,
+                examineName: thisdata.examineName,
               });
             }
           }
@@ -1770,6 +1772,7 @@ const IntentionCustomer = Form.create()(
               contractNo: thisdata.contractNo, //合同编号
               userName: thisdata.userName, //客户名称
               signDate: thisdata.signDate, //签单时间
+              examineName: thisdata.examineName,
               processStatus: thisdata.processStatus, //流程状态
               liquidationStatus: thisdata.liquidationStatus, //结算状态
               contacts: thisdata.contacts, //企业联系人
@@ -4361,7 +4364,7 @@ const IntentionCustomer = Form.create()(
                         {...formItemLayout}
                         label="流程状态"
                       >
-                        <span>{getProcessStatus(this.state.processStatus)}</span>
+                        <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
                       </FormItem>
                       <FormItem
                         className="half-item"

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

@@ -806,6 +806,7 @@ const outsourcingList = Form.create()(
               contractNo: thisdata.contractNo, //合同编号
               userName: thisdata.userName, //客户名称
               signDate: thisdata.signDate, //签单时间
+              examineName: thisdata.examineName,
               processStatus: thisdata.processStatus, //流程状态
               liquidationStatus: thisdata.liquidationStatus, //结算状态
               contacts: thisdata.contacts, //企业联系人
@@ -1702,7 +1703,7 @@ const outsourcingList = Form.create()(
                           label="流程状态"
                         >
                           <span>
-                            {getProcessStatus(this.state.processStatus)}
+                            {getProcessStatus(this.state.processStatus, this.state.examineName)}
                           </span>
                         </FormItem>
                         <FormItem

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

@@ -600,6 +600,7 @@ const outsourcingPro = Form.create()(
               contractNo: thisdata.contractNo, //合同编号
               userName: thisdata.userName, //客户名称
               signDate: thisdata.signDate, //签单时间
+              examineName: thisdata.examineName,
               processStatus: thisdata.processStatus, //流程状态
               liquidationStatus: thisdata.liquidationStatus, //结算状态
               projectStatus: thisdata.projectStatus.toString(), //项目状态
@@ -1759,7 +1760,7 @@ const outsourcingPro = Form.create()(
                           label="流程状态"
                         >
                           <span>
-                            {getProcessStatus(this.state.processStatus)}
+                            {getProcessStatus(this.state.processStatus, this.state.examineName)}
                           </span>
                         </FormItem>
                         <FormItem

+ 8 - 7
js/component/manageCenter/order/orderNew/reject.jsx

@@ -1050,6 +1050,7 @@ const IntentionCustomer = Form.create()(
               contractNo: thisdata.contractNo, //合同编号
               userName: thisdata.userName, //客户名称
               signDate: thisdata.signDate, //签单时间
+              examineName: thisdata.examineName,
               processStatus: thisdata.processStatus, //流程状态
               liquidationStatus: thisdata.liquidationStatus, //结算状态
               contacts: thisdata.contacts, //企业联系人
@@ -2019,12 +2020,12 @@ const IntentionCustomer = Form.create()(
                   return (
                     <Tooltip title={text}>
                       <div
-                        // style={{
-                        //   width: 100,
-                        //   overflow: "hidden",
-                        //   whiteSpace: "nowrap",
-                        //   textOverflow: "ellipsis",
-                        // }}
+                      // style={{
+                      //   width: 100,
+                      //   overflow: "hidden",
+                      //   whiteSpace: "nowrap",
+                      //   textOverflow: "ellipsis",
+                      // }}
                       >{text}</div>
                     </Tooltip>
                   )
@@ -2301,7 +2302,7 @@ const IntentionCustomer = Form.create()(
                       {...formItemLayout}
                       label="流程状态"
                     >
-                      <span>{getProcessStatus(this.state.processStatus)}</span>
+                      <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
                     </FormItem>
                     <FormItem
                       className="half-item"

+ 3 - 4
js/component/manageCenter/order/source/order.jsx

@@ -134,10 +134,9 @@ class OrderList extends Component {
           title: "流程状态",
           dataIndex: "processStatus",
           key: "processStatus",
-          render: (text, record) =>
-            <span >
-              {getProcessStatus(text)}
-            </span>
+          render: (text, record) => {
+            return getProcessStatus(text, record.examineName);
+        },
         },
         {
           title: "签单金额(万元)",

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

@@ -445,6 +445,7 @@ const PersonnelAll = React.createClass({
             contractNo: thisdata.contractNo, //合同编号
             userName: thisdata.userName, //客户名称
             signDate: thisdata.signDate, //签单时间
+            examineName: thisdata.examineName,
             processStatus: thisdata.processStatus, //流程状态
             liquidationStatus: thisdata.liquidationStatus, //结算状态
             contacts: thisdata.contacts, //企业联系人
@@ -1002,7 +1003,7 @@ const PersonnelAll = React.createClass({
                   {...formItemLayout}
                   label="流程状态"
                 >
-                  <span>{getProcessStatus(this.state.processStatus)}</span>
+                  <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
                 </FormItem>
                 <FormItem
                   className="half-item"

+ 2 - 1
js/component/manageCenter/project/project/outsourceTaskAssignment.jsx

@@ -450,6 +450,7 @@ const OutsourceTaskAssignment = React.createClass({
             contractNo: thisdata.contractNo, //合同编号
             userName: thisdata.userName, //客户名称
             signDate: thisdata.signDate, //签单时间
+            examineName: thisdata.examineName,
             processStatus: thisdata.processStatus, //流程状态
             liquidationStatus: thisdata.liquidationStatus, //结算状态
             contacts: thisdata.contacts, //企业联系人
@@ -1210,7 +1211,7 @@ const OutsourceTaskAssignment = React.createClass({
                       {...formItemLayout}
                       label="流程状态"
                     >
-                      <span>{getProcessStatus(this.state.processStatus)}</span>
+                      <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
                     </FormItem>
                     <FormItem
                       className="half-item"

+ 8 - 7
js/component/manageCenter/project/project/projectAssignment.jsx

@@ -536,6 +536,7 @@ const PaiDan = React.createClass({
             userName: thisdata.userName, //客户名称
             depName: thisdata.depName, //订单部门
             signDate: thisdata.signDate, //签单时间
+            examineName: thisdata.examineName,
             processStatus: thisdata.processStatus, //流程状态
             liquidationStatus: thisdata.liquidationStatus, //结算状态
             contacts: thisdata.contacts, //企业联系人
@@ -1061,12 +1062,12 @@ const PaiDan = React.createClass({
                 return (
                   <Tooltip title={text}>
                     <div
-                      // style={{
-                      //   width: 100,
-                      //   overflow: "hidden",
-                      //   whiteSpace: "nowrap",
-                      //   textOverflow: "ellipsis",
-                      // }}
+                    // style={{
+                    //   width: 100,
+                    //   overflow: "hidden",
+                    //   whiteSpace: "nowrap",
+                    //   textOverflow: "ellipsis",
+                    // }}
                     >{text}</div>
                   </Tooltip>
                 )
@@ -1381,7 +1382,7 @@ const PaiDan = React.createClass({
                     {...formItemLayout}
                     label="流程状态"
                   >
-                    <span>{getProcessStatus(this.state.processStatus)}</span>
+                    <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
                   </FormItem>
                   <FormItem
                     className="half-item"

+ 2 - 1
js/component/manageCenter/project/project/projectQuery.jsx

@@ -385,6 +385,7 @@ const PaiDan = React.createClass({
             contractNo: thisdata.contractNo, //合同编号
             userName: thisdata.userName, //客户名称
             signDate: thisdata.signDate, //签单时间
+            examineName: thisdata.examineName,
             processStatus: thisdata.processStatus, //流程状态
             liquidationStatus: thisdata.liquidationStatus, //结算状态
             contacts: thisdata.contacts, //企业联系人
@@ -964,7 +965,7 @@ const PaiDan = React.createClass({
                   {...formItemLayout}
                   label="流程状态"
                 >
-                  <span>{getProcessStatus(this.state.processStatus)}</span>
+                  <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
                 </FormItem>
                 <FormItem
                   className="half-item"

+ 3 - 2
js/component/manageCenter/project/project/zxsglyOutSourcingPaiDan.jsx

@@ -404,7 +404,7 @@ const zxsglyOutSourcingPaiDan = React.createClass({
           key: "serviceLife",
           render: (text, record) => {
             return (
-<div>{!!text && JSON.parse(text).toString()}</div>
+              <div>{!!text && JSON.parse(text).toString()}</div>
             );
           }
         },
@@ -563,6 +563,7 @@ const zxsglyOutSourcingPaiDan = React.createClass({
             userName: thisdata.userName, //客户名称
             depName: thisdata.depName, //订单部门
             signDate: thisdata.signDate, //签单时间
+            examineName: thisdata.examineName,
             processStatus: thisdata.processStatus, //流程状态
             liquidationStatus: thisdata.liquidationStatus, //结算状态
             contacts: thisdata.contacts, //企业联系人
@@ -1323,7 +1324,7 @@ const zxsglyOutSourcingPaiDan = React.createClass({
                       {...formItemLayout}
                       label="流程状态"
                     >
-                      <span>{getProcessStatus(this.state.processStatus)}</span>
+                      <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
                     </FormItem>
                     <FormItem
                       className="half-item"

+ 2 - 1
js/component/manageCenter/project/summary/projectDetails.jsx

@@ -598,6 +598,7 @@ class ProjectDetails extends Component {
                 } else {
                     this.setState({
                         orderUid: thisdata.uid,
+                        examineName: thisdata.examineName,
                         processStatus: thisdata.processStatus, //流程状态
                         liquidationStatus: thisdata.liquidationStatus, //结算状态
                         approval: thisdata.approval, //特批状态
@@ -1071,7 +1072,7 @@ class ProjectDetails extends Component {
                                             label="流程状态"
                                         >
                                             <span>
-                                                {getProcessStatus(this.state.processStatus)}
+                                                {getProcessStatus(this.state.processStatus, this.state.examineName)}
                                             </span>
                                         </FormItem>
                                         <FormItem

+ 3 - 2
js/component/manageCenter/project/task/businessManagement/orderInfor.jsx

@@ -108,7 +108,7 @@ class OrderInfor extends Component {
                     key: "serviceLife",
                     render: (text, record) => {
                         return (
-<div>{!!text && JSON.parse(text).toString()}</div>
+                            <div>{!!text && JSON.parse(text).toString()}</div>
                         );
                     }
                 },
@@ -225,6 +225,7 @@ class OrderInfor extends Component {
                     totalAmount: thisData.totalAmount, //总金额
                     settlementAmount: thisData.settlementAmount, //结算金额
                     liquidationStatus: thisData.liquidationStatus, //清算状态
+                    examineName: thisData.examineName,
                     processStatus: thisData.processStatus, //流程状态
                     orderRemarks: thisData.orderRemarks, //订单备注
                     contractNo: thisData.contractNo, //合同编号
@@ -393,7 +394,7 @@ class OrderInfor extends Component {
                             label="流程状态"
                         >
                             <span>
-                                {getProcessStatus(this.state.processStatus)}
+                                {getProcessStatus(this.state.processStatus, this.state.examineName)}
                             </span>
                         </FormItem>
                         <FormItem

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

@@ -1766,6 +1766,7 @@ const Task = React.createClass({
                 } else {
                     this.setState({
                         orderUid: thisdata.uid,
+                        examineName: thisdata.examineName,
                         processStatus: thisdata.processStatus, //流程状态
                         liquidationStatus: thisdata.liquidationStatus, //结算状态
                         approval: thisdata.approval, //特批状态
@@ -4091,7 +4092,7 @@ const Task = React.createClass({
                                                     label="流程状态"
                                                 >
                                                     <span>
-                                                        {getProcessStatus(this.state.processStatus)}
+                                                        {getProcessStatus(this.state.processStatus, this.state.examineName)}
                                                     </span>
                                                 </FormItem>
                                                 <FormItem
@@ -5636,7 +5637,7 @@ const Task = React.createClass({
                                         {...formItemLayout}
                                         label="流程状态"
                                     >
-                                        <span>{getProcessStatus(this.state.processStatus)}</span>
+                                        <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
                                     </FormItem>
                                     <FormItem
                                         className="half-item"

+ 3 - 2
js/component/manageCenter/project/task/myTaskCount.jsx

@@ -693,6 +693,7 @@ const MyTaskCount = Form.create()(
           } else {
             this.setState({
               orderUid: thisdata.uid,
+              examineName: thisdata.examineName,
               processStatus: thisdata.processStatus, //流程状态
               liquidationStatus: thisdata.liquidationStatus, //结算状态
               approval: thisdata.approval, //特批状态
@@ -1342,7 +1343,7 @@ const MyTaskCount = Form.create()(
                       {...formItemLayout}
                       label="流程状态"
                     >
-                      <span>{getProcessStatus(this.state.processStatus)}</span>
+                      <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
                     </FormItem>
                     <FormItem
                       className="half-item"
@@ -1834,7 +1835,7 @@ const MyTaskCount = Form.create()(
                 {...formItemLayout}
                 label="流程状态"
               >
-                <span>{getProcessStatus(this.state.processStatus)}</span>
+                <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
               </FormItem>
               <FormItem
                 className="half-item"

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

@@ -1198,6 +1198,7 @@ const MyTaskOutsource = React.createClass({
         } else {
           this.setState({
             orderUid: thisdata.uid,
+            examineName: thisdata.examineName,
             processStatus: thisdata.processStatus, //流程状态
             liquidationStatus: thisdata.liquidationStatus, //结算状态
             approval: thisdata.approval, //特批状态
@@ -3550,7 +3551,7 @@ const MyTaskOutsource = React.createClass({
                           label="流程状态"
                         >
                           <span>
-                            {getProcessStatus(this.state.processStatus)}
+                            {getProcessStatus(this.state.processStatus, this.state.examineName)}
                           </span>
                         </FormItem>
                         <FormItem
@@ -4994,7 +4995,7 @@ const MyTaskOutsource = React.createClass({
                     {...formItemLayout}
                     label="流程状态"
                   >
-                    <span>{getProcessStatus(this.state.processStatus)}</span>
+                    <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
                   </FormItem>
                   <FormItem
                     className="half-item"

+ 14 - 13
js/component/manageCenter/project/task/payApplyReject/component/orderPaymentModal.js

@@ -1,12 +1,12 @@
-import React,{Component} from 'react';
-import {Button, message, Modal, Spin, Table} from "antd";
+import React, { Component } from 'react';
+import { Button, message, Modal, Spin, Table } from "antd";
 import $ from "jquery";
 import PayRecord from "../../../../components/checkProject/payRecord";
 
-class OrderPaymentModal extends Component{
+class OrderPaymentModal extends Component {
     constructor(props) {
         super(props);
-        this.state={
+        this.state = {
             loading: false,
             selectOrderPayments: [],
             payRecordVisible: false,
@@ -98,6 +98,7 @@ class OrderPaymentModal extends Component{
                                 display: 'flex',
                             }}>
                                 <div className="operation">
+                                    {(!!record.financeName && text === 0) ? record.financeName : ""}
                                     {
                                         text === 0 ? '审核中' :
                                             text === 1 ? '审核通过' :
@@ -106,7 +107,7 @@ class OrderPaymentModal extends Component{
                                                         text === 4 ? '已取消' : ''
                                     }
                                 </div>
-                                <Button type="primary" size='small' style={{marginLeft:'10px'}} onClick={()=>{
+                                <Button type="primary" size='small' style={{ marginLeft: '10px' }} onClick={() => {
                                     this.setState({
                                         payRecordVisible: true,
                                         orderPaymentsId: record.id,
@@ -124,18 +125,18 @@ class OrderPaymentModal extends Component{
     }
 
     componentDidMount() {
-        if(this.props.tid){
+        if (this.props.tid) {
             this.getSelectOrderPayment();
         }
     }
 
     //0审核 1待支付 2驳回 3已支付 4取消
     operationJudgmentName(id) {
-        if(this.props.isAuditPayment){          //财务
+        if (this.props.isAuditPayment) {          //财务
             return id === 0 ? '待审核' :
                 id === 1 ? '待支付' :
                     id === 2 ? '查看详情' : '查看详情'
-        }else{
+        } else {
             return id === 0 ? '待审核' :
                 id === 1 ? '待支付' :
                     id === 2 ? '查看详情' : '查看详情'
@@ -171,7 +172,7 @@ class OrderPaymentModal extends Component{
     }
 
     render() {
-        return(
+        return (
             <Modal
                 maskClosable={false}
                 className="customeDetails"
@@ -179,10 +180,10 @@ class OrderPaymentModal extends Component{
                 title="支付记录"
                 width="1200px"
                 visible={this.props.visible}
-                onOk={()=>{
+                onOk={() => {
                     this.props.onSuccess && this.props.onSuccess();
                 }}
-                onCancel={()=>{
+                onCancel={() => {
                     this.props.onCancer && this.props.onCancer();
                 }}
             >
@@ -207,14 +208,14 @@ class OrderPaymentModal extends Component{
                     tid={this.props.tid}
                     isAuditPayment={this.props.isAuditPayment}
                     projectType={this.props.projectType}
-                    changeVisible={()=>{
+                    changeVisible={() => {
                         this.getSelectOrderPayment();
                         this.setState({
                             payRecordVisible: false,
                             orderPaymentsId: 0,
                         })
                     }}
-                /> : <div/>}
+                /> : <div />}
             </Modal>
         )
     }

+ 2 - 1
js/component/manageCenter/project/task/payApplyReject/detailsModal/projectOverview.js

@@ -499,6 +499,7 @@ class projectOverview extends Component {
                 } else {
                     this.setState({
                         orderUid: thisdata.uid,
+                        examineName: thisdata.examineName,
                         processStatus: thisdata.processStatus, //流程状态
                         liquidationStatus: thisdata.liquidationStatus, //结算状态
                         approval: thisdata.approval, //特批状态
@@ -629,7 +630,7 @@ class projectOverview extends Component {
                                 {...formItemLayout}
                                 label="流程状态"
                             >
-                                <span>{getProcessStatus(this.state.processStatus)}</span>
+                                <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
                             </FormItem>
                             <FormItem
                                 className="half-item"

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

@@ -445,6 +445,7 @@ const Task = React.createClass({
             contractNo: thisdata.contractNo, //合同编号
             userName: thisdata.userName, //客户名称
             signDate: thisdata.signDate, //签单时间
+            examineName: thisdata.examineName,
             processStatus: thisdata.processStatus, //流程状态
             liquidationStatus: thisdata.liquidationStatus, //结算状态
             contacts: thisdata.contacts, //企业联系人
@@ -1309,7 +1310,7 @@ const Task = React.createClass({
                       {...formItemLayout}
                       label="流程状态"
                     >
-                      <span>{getProcessStatus(this.state.processStatus)}</span>
+                      <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
                     </FormItem>
                     <FormItem
                       className="half-item"

+ 3 - 2
js/component/manageCenter/project/task/taskCount.jsx

@@ -680,6 +680,7 @@ const IntentionCustomer = Form.create()(
           } else {
             this.setState({
               orderUid: thisdata.uid,
+              examineName: thisdata.examineName,
               processStatus: thisdata.processStatus, //流程状态
               liquidationStatus: thisdata.liquidationStatus, //结算状态
               approval: thisdata.approval, //特批状态
@@ -1506,7 +1507,7 @@ const IntentionCustomer = Form.create()(
                       {...formItemLayout}
                       label="流程状态"
                     >
-                      <span>{getProcessStatus(this.state.processStatus)}</span>
+                      <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
                     </FormItem>
                     <FormItem
                       className="half-item"
@@ -2092,7 +2093,7 @@ const IntentionCustomer = Form.create()(
                 {...formItemLayout}
                 label="流程状态"
               >
-                <span>{getProcessStatus(this.state.processStatus)}</span>
+                <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
               </FormItem>
               <FormItem
                 className="half-item"

+ 3 - 2
js/component/manageCenter/project/task/taskQuery.jsx

@@ -590,6 +590,7 @@ const Task = React.createClass({
         } else {
           this.setState({
             orderUid: thisdata.uid,
+            examineName: thisdata.examineName,
             processStatus: thisdata.processStatus, //流程状态
             liquidationStatus: thisdata.liquidationStatus, //结算状态
             approval: thisdata.approval, //特批状态
@@ -1469,7 +1470,7 @@ const Task = React.createClass({
                         label="流程状态"
                       >
                         <span>
-                          {getProcessStatus(this.state.processStatus)}
+                          {getProcessStatus(this.state.processStatus, this.state.examineName)}
                         </span>
                       </FormItem>
                       <FormItem
@@ -2099,7 +2100,7 @@ const Task = React.createClass({
                       {...formItemLayout}
                       label="流程状态"
                     >
-                      <span>{getProcessStatus(this.state.processStatus)}</span>
+                      <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
                     </FormItem>
                     <FormItem
                       className="half-item"

+ 1 - 1
js/component/manageCenter/publicComponent/assign.jsx

@@ -155,7 +155,7 @@ const Assign = React.createClass({
                 departmentId: this.state.departmenttList,
                 name: this.state.financeNameSearch,
                 roleName: this.props.roleName,
-                status: !nub ? undefined : "正常",//不是常用联系人时 只要需要查询账号正常的咨询师
+                status: !nub ? undefined : 0,//不是常用联系人时 只要需要查询账号正常的咨询师
             },
             success: function (data) {
                 let theArr = [];

+ 2 - 2
js/component/manageCenter/set/userManagementS/user.jsx

@@ -113,7 +113,7 @@ const User = Form.create()(React.createClass({
 				pageNo: pageNo || 1,
 				pageSize: this.state.paginations.pageSize,
 				name: this.state.userNameSearchs,
-				status: "正常"
+				status: 0
 				// departmentId: admin?this.state.organizationSearch:departmentId,
 				// rid: this.state.rolesSearch,
 				// duty: this.state.postSearch,
@@ -608,7 +608,7 @@ const User = Form.create()(React.createClass({
 				roles: rolesId,
 				data: JSON.stringify({
 					id: deletedIds,
-					status: '正常',
+					status: 0,
 					name: names,
 					mobile: mobiles,
 				})

+ 2 - 1
js/component/project.jsx

@@ -384,6 +384,7 @@ const project = React.createClass({
           }
         } else {
           this.setState({
+            examineName: thisdata.examineName,
             processStatus: thisdata.processStatus, //流程状态
             liquidationStatus: thisdata.liquidationStatus, //结算状态
             approval: thisdata.approval, //特批状态
@@ -981,7 +982,7 @@ const project = React.createClass({
                         {...formItemLayout}
                         label="流程状态"
                       >
-                        <span>{getProcessStatus(this.state.processStatus)}</span>
+                        <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
                       </FormItem>
                       <FormItem
                         className="half-item"

+ 23 - 36
js/component/tools.js

@@ -1828,16 +1828,20 @@ const obj = {
     return '';
   },
   //流程状态
-  getProcessStatus: function (e) {
+  getProcessStatus: function (e, name) {
     if (e || e == 0) {
       let str = e.toString();
       let theType = "";
+      let theName = "(" + name + ")"
       processStatus.map(function (item) {
         if (item.value == str) {
           theType = item.key;
         }
       });
-      return theType;
+      if (e == 5 || e == 6 || !name) {
+        theName = ""
+      }
+      return theType + theName;
     }
   },
   //结算状态
@@ -1965,6 +1969,10 @@ const obj = {
   // approval(0非特批 1待审核 2审核通过)    status(0未提交 1处理中 2通过 3拒绝 4撤销)
   getInvoiceStatus: function (e, record) {
     let theType = "";
+    let name = "(" + record.examineName + ")"
+    if (!record.examineName) {
+      name = ""
+    }
     if (record) {
       if (record.status === 4) {
         theType = "撤销"
@@ -1984,9 +1992,9 @@ const obj = {
         }
       }
     } else {
-      theType = "-";
+      theType = "";
     }
-    return theType;
+    return theType + name;
   },
 
   getApprovalA: function (e) {
@@ -2001,7 +2009,7 @@ const obj = {
       return theType;
     }
   },
-  getProcessStatusNew: function (pro, status) {
+  getProcessStatusNew: function (name, pro, status) {
     // if (e||e==0) {
     //     let str=e.toString()
     //  let theType = '';
@@ -2012,6 +2020,10 @@ const obj = {
     //     });
     //     return theType;
     // }
+    let names = "(" + name + ")";
+    if (!name) {
+      names = ""
+    }
     let str = "";
     if (pro == 0) {
       str = "营销员";
@@ -2052,15 +2064,15 @@ const obj = {
       num = "待上传附件";
     }
     if (pro == 7 && status == 2) {
-      return "订单变更退票中 (财务处理中)";
+      return `订单变更退票中 (${name}处理中)`;
     } else if (pro == 8 && status == 2) {
-      return "订单变更退票中 (财务处理中)";
+      return `订单变更退票中 (${name}处理中)`;
     } else if (status == 4) {
       return "订单变更已完成";
     } else if (pro >= 7 && status == 6) {
       return "待上传附件(营销员处理中)";
     } else {
-      return str + num;
+      return str + names + num;
     }
   },
   getContractChangeStatus: function (e) {
@@ -2076,41 +2088,16 @@ const obj = {
     }
   },
   // 咨询师以及咨询师经理审核内容显示
-  shenghePeo(arr, status) {
-    let newArr = arr
-    if (arr.length === 0) {
-      newArr = []
-    } else {
-      for (var i = 0; i < arr.length; i++) {
-        for (var j = 0; j < arr.length; j++) {
-          if (arr[i].name == arr[j].name && i != j) { //将后面重复的数删掉
-            arr.splice(j, 1);
-          }
-        }
-      }
-      newArr = arr;
-    }
+  shenghePeo(name, status) {
     if (status == 2) {
-      // arr = arr || [];
       let str = "咨询师(";
-      for (let a = 0; a < newArr.length; a++) {
-        if (newArr[a].status == 0) {
-          str += newArr[a].name + ",";
-        }
-      }
-      str = str.substr(0, str.length - 1);
+      str = str + name;
       return str + ")审核中";
     }
 
     if (status == 3) {
-      // arr =  arr || [];
       let str = "咨询师经理(";
-      for (let a = 0; a < newArr.length; a++) {
-        if (newArr[a].status == 0) {
-          str += newArr[a].name + ",";
-        }
-      }
-      str = str.substr(0, str.length - 1);
+      str = str + name;
       return str + ")审核中";
     }
   },