Bläddra i källkod

总裁、董事长显示处理

dev01 2 år sedan
förälder
incheckning
57d7e1e563
53 ändrade filer med 309 tillägg och 303 borttagningar
  1. 1 1
      js/component/manageCenter/customer/operationalData/interviewStatistics/detailedList.jsx
  2. 1 1
      js/component/manageCenter/customer/operationalData/reexamine/detailedList.jsx
  3. 1 1
      js/component/manageCenter/customer/operationalData/reexamine/details.jsx
  4. 98 97
      js/component/manageCenter/customer/operationalData/signatureStatistics/detailedList.jsx
  5. 2 2
      js/component/manageCenter/customer/signcustomer/detaillist.jsx
  6. 1 1
      js/component/manageCenter/customerService/administration/followUpDetails.jsx
  7. 2 2
      js/component/manageCenter/customerService/administration/order.jsx
  8. 17 17
      js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx
  9. 19 19
      js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx
  10. 1 1
      js/component/manageCenter/financialManage/distribute/inSpecial.jsx
  11. 3 3
      js/component/manageCenter/financialManage/distribute/invoiceApplyList.jsx
  12. 2 2
      js/component/manageCenter/financialManage/distribute/invoiceApplyListQuery.jsx
  13. 2 2
      js/component/manageCenter/financialManage/distribute/invoiceApplyListWai.jsx
  14. 1 1
      js/component/manageCenter/financialManage/distribute/outInvoiceQuery.jsx
  15. 2 2
      js/component/manageCenter/financialManage/distribute/outOutsourcingList.jsx
  16. 28 28
      js/component/manageCenter/financialManage/distribute/outSpecial.jsx
  17. 2 2
      js/component/manageCenter/financialManage/distribute/outsourcingPaiDan.jsx
  18. 59 59
      js/component/manageCenter/financialManage/distribute/paiDan.jsx
  19. 4 4
      js/component/manageCenter/financialManage/distribute/shouKuanAll.jsx
  20. 4 4
      js/component/manageCenter/financialManage/distribute/shouKuang.jsx
  21. 2 2
      js/component/manageCenter/financialManage/orderDetail/orderDescTab.jsx
  22. 1 1
      js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx
  23. 5 5
      js/component/manageCenter/order/orderNew/addService.jsx
  24. 1 1
      js/component/manageCenter/order/orderNew/addorders.js
  25. 2 2
      js/component/manageCenter/order/orderNew/approveds.jsx
  26. 1 1
      js/component/manageCenter/order/orderNew/billing.jsx
  27. 2 2
      js/component/manageCenter/order/orderNew/changeComponent/changeApply.js
  28. 1 1
      js/component/manageCenter/order/orderNew/changeComponent/orderDetail.js
  29. 1 1
      js/component/manageCenter/order/orderNew/chargeback.jsx
  30. 1 1
      js/component/manageCenter/order/orderNew/checkOutsourcing.jsx
  31. 1 1
      js/component/manageCenter/order/orderNew/costAuditList/detailsModal/projectOverview.js
  32. 2 2
      js/component/manageCenter/order/orderNew/examine.jsx
  33. 1 1
      js/component/manageCenter/order/orderNew/glCostAuditList/detailsModal/projectOverview.js
  34. 2 2
      js/component/manageCenter/order/orderNew/inquiry.jsx
  35. 1 1
      js/component/manageCenter/order/orderNew/outsourcingList.jsx
  36. 1 1
      js/component/manageCenter/order/orderNew/outsourcingPro.jsx
  37. 1 1
      js/component/manageCenter/order/orderNew/reject.jsx
  38. 2 2
      js/component/manageCenter/order/source/order.jsx
  39. 1 1
      js/component/manageCenter/personnel/personnel/personnelAll.jsx
  40. 1 1
      js/component/manageCenter/project/project/outsourceTaskAssignment.jsx
  41. 3 3
      js/component/manageCenter/project/project/projectAssignment.jsx
  42. 3 3
      js/component/manageCenter/project/project/projectQuery.jsx
  43. 3 3
      js/component/manageCenter/project/project/zxsglyOutSourcingPaiDan.jsx
  44. 1 1
      js/component/manageCenter/project/summary/projectDetails.jsx
  45. 1 1
      js/component/manageCenter/project/task/businessManagement/orderInfor.jsx
  46. 2 2
      js/component/manageCenter/project/task/myTask.jsx
  47. 2 2
      js/component/manageCenter/project/task/myTaskCount.jsx
  48. 2 2
      js/component/manageCenter/project/task/myTaskOutsource.jsx
  49. 1 1
      js/component/manageCenter/project/task/payApplyReject/detailsModal/projectOverview.js
  50. 1 1
      js/component/manageCenter/project/task/taskAssignment.jsx
  51. 2 2
      js/component/manageCenter/project/task/taskCount.jsx
  52. 2 2
      js/component/manageCenter/project/task/taskQuery.jsx
  53. 6 1
      js/component/tools.js

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

@@ -388,7 +388,7 @@ class DetailedList extends Component {
                     dataIndex: "processStatus",
                     key: "processStatus",
                     render: (text, record) => {
-                        return getProcessStatus(text, record.examineName);
+                        return getProcessStatus(text, record.examineName, record.approval);
                     },
                 },
                 {

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

@@ -142,7 +142,7 @@ class DetailedList extends Component {
                     dataIndex: "processStatus",
                     key: "processStatus",
                     render: (text, record) => {
-                        return getProcessStatus(text, record.examineName);
+                        return getProcessStatus(text, record.examineName, record.approval);
                     },
                 },
                 {

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

@@ -636,7 +636,7 @@ class Details extends Component {
                                 {...formItemLayout}
                                 label="流程状态"
                             >
-                                <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
+                                <span>{getProcessStatus(this.state.processStatus, this.state.examineName, this.state.approval)}</span>
                             </FormItem>
                             <FormItem
                                 className="half-item"

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

@@ -1,16 +1,16 @@
-import React,{ Component } from 'react';
+import React, { Component } from 'react';
 import {
     Modal,
     Tooltip,
 } from "antd";
 import './index.less';
 import TabelContent from "../../../../common/tabelContent";
-import {getApprovedState, getLiquidationStatus, getNewOrderStatus, getProcessStatus} from "../../../../tools";
+import { getApprovedState, getLiquidationStatus, getNewOrderStatus, getProcessStatus } from "../../../../tools";
 
-class DetailedList extends Component{
+class DetailedList extends Component {
     constructor(props) {
         super(props);
-        this.state= {
+        this.state = {
             columns: [
                 {
                     title: "编号",
@@ -74,14 +74,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>
                         )
@@ -107,7 +107,7 @@ class DetailedList extends Component{
                     dataIndex: "processStatus",
                     key: "processStatus",
                     render: (text, record) => {
-                        return getProcessStatus(text, record.examineName);
+                        return getProcessStatus(text, record.examineName, record.approval);
                     },
                 },
                 {
@@ -155,132 +155,132 @@ class DetailedList extends Component{
                     key: "financeName",
                 },
             ],
-            searchList:[
+            searchList: [
                 {
-                    type:'newDepartmentSelect',
-                    dataKey:'deps',
-                    placeholder:'请选择部门'
+                    type: 'newDepartmentSelect',
+                    dataKey: 'deps',
+                    placeholder: '请选择部门'
                 },
                 {
-                    type:'times',
-                    title:'下单时间',
-                    dataKey:['startCreate','endCreate'],
+                    type: 'times',
+                    title: '下单时间',
+                    dataKey: ['startCreate', 'endCreate'],
                 },
                 {
-                    type:'times',
-                    title:'合同时间',
-                    dataKey:['startSign','endSign'],
+                    type: 'times',
+                    title: '合同时间',
+                    dataKey: ['startSign', 'endSign'],
                 },
                 {
-                    type:'select',
-                    dataKey:'sort',
-                    placeholder:'请选择排序',
-                    selectList:[
+                    type: 'select',
+                    dataKey: 'sort',
+                    placeholder: '请选择排序',
+                    selectList: [
                         {
-                            value:'0',
-                            label:'按总金额排序'
+                            value: '0',
+                            label: '按总金额排序'
                         },
                         {
-                            value:'1',
-                            label:'按数量排序'
+                            value: '1',
+                            label: '按数量排序'
                         },
                     ]
                 },
             ],
-            searchList1:[
+            searchList1: [
                 {
-                    type:'text',
-                    dataKey:'orderNo',
-                    placeholder:'请输入订单编号'
+                    type: 'text',
+                    dataKey: 'orderNo',
+                    placeholder: '请输入订单编号'
                 },
                 {
-                    type:'text',
-                    dataKey:'name',
-                    placeholder:'请输入客户名称'
+                    type: 'text',
+                    dataKey: 'name',
+                    placeholder: '请输入客户名称'
                 },
                 {
-                    type:'departmentSelect',
-                    dataKey:'depId',
-                    placeholder:'请选择部门'
+                    type: 'departmentSelect',
+                    dataKey: 'depId',
+                    placeholder: '请选择部门'
                 },
                 {
-                    type:'text',
-                    dataKey:'contractNo',
-                    placeholder:'请输入合同编号'
+                    type: 'text',
+                    dataKey: 'contractNo',
+                    placeholder: '请输入合同编号'
                 },
                 {
-                    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万元以上'
                         },
                     ]
                 },
                 {
-                    type:'times',
-                    title:'下单时间',
-                    dataKey:['starTime','endTime'],
+                    type: 'times',
+                    title: '下单时间',
+                    dataKey: ['starTime', 'endTime'],
                 },
                 {
-                    type:'times',
-                    title:'合同时间',
-                    dataKey:['contractStart','contractEnd'],
+                    type: 'times',
+                    title: '合同时间',
+                    dataKey: ['contractStart', 'contractEnd'],
                 },
             ],
-            searchConfig:{},
+            searchConfig: {},
         }
     }
 
@@ -308,35 +308,36 @@ 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}
                             tabelApi={'/api/admin/newOrder/provinceStatisticsList'}
                             searchConfig={this.props.searchConfig}
-                            searchOperation={(value)=>{
-                                for(let i of Object.keys(value)){
-                                    if(i === 'sort' || i === 'pageNo' || i === 'pageSize'){
+                            searchOperation={(value) => {
+                                for (let i of Object.keys(value)) {
+                                    if (i === 'sort' || i === 'pageNo' || i === 'pageSize') {
                                         delete value[i]
                                     }
-                                    if(i === 'startSign'){
+                                    if (i === 'startSign') {
                                         value['contractStart'] = value['startSign']
                                     }
-                                    if(i === 'endSign'){
+                                    if (i === 'endSign') {
                                         value['contractEnd'] = value['endSign']
                                     }
                                 }
-                                this.setState({searchConfig:value})}
+                                this.setState({ searchConfig: value })
+                            }
                             }
                             exportApi={'/api/admin/newOrder/provinceStatisticsListExprot'}
                             query={{
-                                province:this.props.recordInfor.id,
+                                province: this.props.recordInfor.id,
                             }}
-                            dataProcessing={(data)=>{
+                            dataProcessing={(data) => {
                                 let theArr = [];
                                 for (let i = 0; i < data.data.length; i++) {
                                     let thisdata = data.data[i];
                                     // thisdata.key=(data.data.pageNo - 1) * data.data.pageSize + i + 1;
-                                    thisdata.key=i + 1;
+                                    thisdata.key = i + 1;
                                     theArr.push(thisdata);
                                 }
                                 return theArr;
@@ -346,15 +347,15 @@ class DetailedList extends Component{
                     {this.state.visible1 && <Modal
                         maskClosable={false}
                         visible={this.state.visible1}
-                        onOk={()=>{
+                        onOk={() => {
                             this.setState({
-                                visible1:false
+                                visible1: false
                             })
                         }}
-                        onCancel={()=>{
+                        onCancel={() => {
                             // console.log(this.state.searchConfig,'this.state.searchConfig')
                             this.setState({
-                                visible1:false
+                                visible1: false
                             })
                         }}
                         width='1600px'
@@ -369,14 +370,14 @@ class DetailedList extends Component{
                                 tabelApi={'/api/admin/newOrder/orderNewList'}
                                 exportApi={false}
                                 query={{
-                                    specially:7,
-                                    aid:this.state.aid
+                                    specially: 7,
+                                    aid: this.state.aid
                                 }}
-                                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;

+ 2 - 2
js/component/manageCenter/customer/signcustomer/detaillist.jsx

@@ -94,8 +94,8 @@ class DetailList extends Component {
           dataIndex: "processStatus",
           key: "processStatus",
           render: (text, record) => {
-            return getProcessStatus(text, record.examineName);
-        },
+            return getProcessStatus(text, record.examineName, record.approval);
+          },
         },
         {
           title: "签单金额(万元)",

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

@@ -639,7 +639,7 @@ class FollowUpDetails extends Component {
                                             {...formItemLayout}
                                             label="流程状态"
                                         >
-                                            <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
+                                            <span>{getProcessStatus(this.state.processStatus, this.state.examineName, this.state.approval)}</span>
                                         </FormItem>
                                         <FormItem
                                             className="half-item"

+ 2 - 2
js/component/manageCenter/customerService/administration/order.jsx

@@ -769,7 +769,7 @@ const Order = Form.create()(
             dataIndex: "processStatus",
             key: "processStatus",
             render: (text) => {
-              return getProcessStatus(text);
+              return getProcessStatus(text, record.examineName, record.approval);
             },
           },
           {
@@ -4145,7 +4145,7 @@ const Order = Form.create()(
                         label="流程状态"
                       >
                         <span>
-                          {getProcessStatus(this.state.processStatus, this.state.examineName,)}
+                          {getProcessStatus(this.state.processStatus, this.state.examineName, this.state.approval)}
                         </span>
                       </FormItem>
                       <FormItem

+ 17 - 17
js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx

@@ -119,18 +119,18 @@ const approvedOutsourcing = React.createClass({
               orderReceivables: thisdata.orderReceivables,
               orderArrears: thisdata.orderArrears,
 
-              costAmount:thisdata.costAmount,
-              paymentAmount:thisdata.paymentAmount,
-              patentCost:thisdata.patentCost,
-              patentCostActual:thisdata.patentCostActual,
-              softCost:thisdata.softCost,
-              softCostActual:thisdata.softCostActual,
-              auditCost:thisdata.auditCost,
-              auditCostActual:thisdata.auditCostActual,
-              otherCost:thisdata.otherCost,
-              otherCostActual:thisdata.otherCostActual,
-              expectProfit:thisdata.expectProfit,
-              actualProfit:thisdata.actualProfit,
+              costAmount: thisdata.costAmount,
+              paymentAmount: thisdata.paymentAmount,
+              patentCost: thisdata.patentCost,
+              patentCostActual: thisdata.patentCostActual,
+              softCost: thisdata.softCost,
+              softCostActual: thisdata.softCostActual,
+              auditCost: thisdata.auditCost,
+              auditCostActual: thisdata.auditCostActual,
+              otherCost: thisdata.otherCost,
+              otherCostActual: thisdata.otherCostActual,
+              expectProfit: thisdata.expectProfit,
+              actualProfit: thisdata.actualProfit,
             })
           }
         }
@@ -445,8 +445,8 @@ const approvedOutsourcing = React.createClass({
           key: 'processStatus',
           className: 'title-table',
           render: (text, record) => {
-            return getProcessStatus(text, record.examineName);
-        },
+            return getProcessStatus(text, record.examineName, record.approval);
+          },
         },
         {
           title: '操作',
@@ -1479,8 +1479,8 @@ const approvedOutsourcing = React.createClass({
           dataIndex: 'processStatus',
           key: 'processStatus',
           render: (text, record) => {
-            return getProcessStatus(text, record.examineName);
-        },
+            return getProcessStatus(text, record.examineName, record.approval);
+          },
         },
         {
           title: '特批状态',
@@ -3439,7 +3439,7 @@ const approvedOutsourcing = React.createClass({
                         {...formItemLayout}
                         label="流转状态"
                       >
-                        <span>{getProcessStatus(theData.processStatus,theData.examineName)}</span>
+                        <span>{getProcessStatus(theData.processStatus, theData.examineName, theData.approval)}</span>
                       </FormItem>
                       <FormItem
                         className="half-item"

+ 19 - 19
js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx

@@ -154,18 +154,18 @@ const approvedOutsourcing = React.createClass({
               orderReceivables: thisdata.orderReceivables,
               orderArrears: thisdata.orderArrears,
 
-              costAmount:thisdata.costAmount,
-              paymentAmount:thisdata.paymentAmount,
-              patentCost:thisdata.patentCost,
-              patentCostActual:thisdata.patentCostActual,
-              softCost:thisdata.softCost,
-              softCostActual:thisdata.softCostActual,
-              auditCost:thisdata.auditCost,
-              auditCostActual:thisdata.auditCostActual,
-              otherCost:thisdata.otherCost,
-              otherCostActual:thisdata.otherCostActual,
-              expectProfit:thisdata.expectProfit,
-              actualProfit:thisdata.actualProfit,
+              costAmount: thisdata.costAmount,
+              paymentAmount: thisdata.paymentAmount,
+              patentCost: thisdata.patentCost,
+              patentCostActual: thisdata.patentCostActual,
+              softCost: thisdata.softCost,
+              softCostActual: thisdata.softCostActual,
+              auditCost: thisdata.auditCost,
+              auditCostActual: thisdata.auditCostActual,
+              otherCost: thisdata.otherCost,
+              otherCostActual: thisdata.otherCostActual,
+              expectProfit: thisdata.expectProfit,
+              actualProfit: thisdata.actualProfit,
             });
           }
         }
@@ -480,8 +480,8 @@ const approvedOutsourcing = React.createClass({
           key: "processStatus",
           className: "title-table",
           render: (text, record) => {
-            return getProcessStatus(text, record.examineName);
-        },
+            return getProcessStatus(text, record.examineName, record.approval);
+          },
         },
         {
           title: "驳回状态",
@@ -1119,8 +1119,8 @@ const approvedOutsourcing = React.createClass({
           dataIndex: "processStatus",
           key: "processStatus",
           render: (text, record) => {
-            return getProcessStatus(text, record.examineName);
-        },
+            return getProcessStatus(text, record.examineName, record.approval);
+          },
         },
         {
           title: "特批状态",
@@ -1412,8 +1412,8 @@ const approvedOutsourcing = React.createClass({
           dataIndex: "processStatus",
           key: "processStatus",
           render: (text, record) => {
-            return getProcessStatus(text, record.examineName);
-        },
+            return getProcessStatus(text, record.examineName, record.approval);
+          },
         },
         {
           title: "特批状态",
@@ -3402,7 +3402,7 @@ const approvedOutsourcing = React.createClass({
                         {...formItemLayout}
                         label="流转状态"
                       >
-                        <span>{getProcessStatus(theData.processStatus,theData.examineName)}</span>
+                        <span>{getProcessStatus(theData.processStatus, theData.examineName, theData.approval)}</span>
                       </FormItem>
                       <FormItem
                         className="half-item"

+ 1 - 1
js/component/manageCenter/financialManage/distribute/inSpecial.jsx

@@ -245,7 +245,7 @@ const inSpecial = React.createClass({
           dataIndex: "processStatus",
           key: "processStatus",
           render: (text, record) => {
-            return getProcessStatus(text, record.examineName);
+            return getProcessStatus(text, record.examineName, record.approval);
           },
         },
         {

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

@@ -126,7 +126,7 @@ const invoiceApplyList = React.createClass({
       success: function (data) {
         let thisdata = data.data;
         let obj = {
-          examineName:thisdata.examineName,
+          examineName: thisdata.examineName,
           contractNo: thisdata.contractNo,
           orderNo: thisdata.orderNo,
           approval: thisdata.approval,
@@ -246,8 +246,8 @@ const invoiceApplyList = React.createClass({
           dataIndex: "processStatus",
           key: "processStatus",
           render: (text, record) => {
-            return getProcessStatus(text, record.examineName);
-        },
+            return getProcessStatus(text, record.examineName, record.approval);
+          },
         },
         {
           title: "项目状态",

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

@@ -237,7 +237,7 @@ const invoiceApplyListQuery = React.createClass({
           dataIndex: "processStatus",
           key: "processStatus",
           render: (text, record) => {
-            return getProcessStatus(text, record.examineName);
+            return getProcessStatus(text, record.examineName, record.approval);
           },
         },
         {
@@ -245,7 +245,7 @@ const invoiceApplyListQuery = React.createClass({
           dataIndex: "projectStatus",
           key: "projectStatus",
           render: (text, record) => {
-            return getProcessStatus(text, record.examineName);
+            return getProcessStatus(text, record.examineName, record.approval);
           },
         },
         // {

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

@@ -245,8 +245,8 @@ const invoiceApplyListWai = React.createClass({
           dataIndex: "processStatus",
           key: "processStatus",
           render: (text, record) => {
-            return getProcessStatus(text, record.examineName);
-        },
+            return getProcessStatus(text, record.examineName, record.approval);
+          },
         },
         {
           title: "项目状态",

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

@@ -235,7 +235,7 @@ const outInvoiceQuery = React.createClass({
           dataIndex: "processStatus",
           key: "processStatus",
           render: (text, record) => {
-            return getProcessStatus(text, record.examineName);
+            return getProcessStatus(text, record.examineName, record.approval);
           },
         },
         {

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

@@ -174,7 +174,7 @@ const outsourcingPaiDan = React.createClass({
           dataIndex: "processStatus",
           key: "processStatus",
           render: (text, record) => {
-            return getProcessStatus(text, record.examineName);
+            return getProcessStatus(text, record.examineName, record.approval);
           },
         },
         {
@@ -1055,7 +1055,7 @@ const outsourcingPaiDan = React.createClass({
                         {...formItemLayout}
                         label="流转状态"
                       >
-                        <span>{getProcessStatus(theData.processStatus, theData.examineName)}</span>
+                        <span>{getProcessStatus(theData.processStatus, theData.examineName, theData.approval)}</span>
                       </FormItem>
                       <FormItem
                         className="half-item"

+ 28 - 28
js/component/manageCenter/financialManage/distribute/outSpecial.jsx

@@ -143,10 +143,10 @@ const outSpecial = React.createClass({
           recipientAddress: thisdata.recipientAddress,
           orgCodeUrl: thisdata.voucherUrl
             ? splitUrl(
-                thisdata.voucherUrl,
-                ",",
-                globalConfig.avatarHost + "/upload"
-              )
+              thisdata.voucherUrl,
+              ",",
+              globalConfig.avatarHost + "/upload"
+            )
             : [],
         });
       }.bind(this),
@@ -231,8 +231,8 @@ const outSpecial = React.createClass({
           dataIndex: "processStatus",
           key: "processStatus",
           render: (text, record) => {
-            return getProcessStatus(text, record.examineName);
-        },
+            return getProcessStatus(text, record.examineName, record.approval);
+          },
         },
         {
           title: "项目状态",
@@ -424,7 +424,7 @@ const outSpecial = React.createClass({
         examine: this.state.examine,
         reason: this.state.reason,
       },
-      success: function () {}.bind(this),
+      success: function () { }.bind(this),
     }).done(
       function () {
         this.setState({
@@ -694,26 +694,26 @@ const outSpecial = React.createClass({
           width="400px"
           onCancel={this.rejectCancels}
         >
-            <Input.TextArea
-              placeholder="请输入拒绝理由"
-              rows={4}
-              value={this.state.reason}
-              onChange={(e) => {
-                this.setState({ reason: e.target.value });
+          <Input.TextArea
+            placeholder="请输入拒绝理由"
+            rows={4}
+            value={this.state.reason}
+            onChange={(e) => {
+              this.setState({ reason: e.target.value });
+            }}
+          />
+          <div className="clearfix" style={{ marginTop: "20px" }}>
+            <Button
+              type="primary"
+              loading={this.state.loading}
+              onClick={(e) => {
+                e.stopPropagation(), this.commit();
               }}
-            />
-            <div className="clearfix" style={{ marginTop: "20px" }}>
-              <Button
-                type="primary"
-                loading={this.state.loading}
-                onClick={(e) => {
-                  e.stopPropagation(), this.commit();
-                }}
-                style={{ float: "right" }}
-              >
-                提交
-              </Button>
-            </div>
+              style={{ float: "right" }}
+            >
+              提交
+            </Button>
+          </div>
         </Modal>
         <Modal
           className="admin-desc-content"
@@ -784,8 +784,8 @@ const outSpecial = React.createClass({
                       {this.state.invoiceType === 0
                         ? "增值税专用发票"
                         : this.state.invoiceType === 1
-                        ? "增值税普通发票"
-                        : "其他"}
+                          ? "增值税普通发票"
+                          : "其他"}
                     </span>
                   </FormItem>
                 </div>

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

@@ -222,7 +222,7 @@ const outsourcingPaiDan = React.createClass({
           dataIndex: "processStatus",
           key: "processStatus",
           render: (text, record) => {
-            return getProcessStatus(text, record.examineName);
+            return getProcessStatus(text, record.examineName, record.approval);
           },
         },
         {
@@ -1211,7 +1211,7 @@ const outsourcingPaiDan = React.createClass({
                         {...formItemLayout}
                         label="流转状态"
                       >
-                        <span>{getProcessStatus(theData.processStatus, theData.examineName)}</span>
+                        <span>{getProcessStatus(theData.processStatus, theData.examineName, theData.approval)}</span>
                       </FormItem>
                       <FormItem
                         className="half-item"

+ 59 - 59
js/component/manageCenter/financialManage/distribute/paiDan.jsx

@@ -16,10 +16,10 @@ import {
 import OrderDesc from "@/manageCenter/financialManage/orderDetail/orderDesc";
 import Assign from "@/manageCenter/publicComponent/assign";
 import { getProcessStatus, getApproval } from "@/tools";
-import {ChooseList} from "../../order/orderNew/chooseList";
+import { ChooseList } from "../../order/orderNew/chooseList";
 import DepartmentList from "../../../common/departmentList";
 const FormItem = Form.Item;
-const {TabPane} = Tabs;
+const { TabPane } = Tabs;
 
 const PaiDan = React.createClass({
   loadData(pageNo) {
@@ -47,7 +47,7 @@ const PaiDan = React.createClass({
         departmentId: this.state.departmenttList,
         outsource: 0
       },
-      success: function(data) {
+      success: function (data) {
         let theArr = [];
         if (!data.data || !data.data.list) {
           if (data.error && data.error.length) {
@@ -89,7 +89,7 @@ const PaiDan = React.createClass({
         });
       }.bind(this)
     }).always(
-      function() {
+      function () {
         this.setState({
           loading: false
         });
@@ -112,10 +112,10 @@ const PaiDan = React.createClass({
         defaultPageSize: 10,
         showQuickJumper: true,
         pageSize: 10,
-        onChange: function(page) {
+        onChange: function (page) {
           this.loadData(page);
         }.bind(this),
-        showTotal: function(total) {
+        showTotal: function (total) {
           return "共" + total + "条数据";
         }
       },
@@ -153,8 +153,8 @@ const PaiDan = React.createClass({
           dataIndex: "processStatus",
           key: "processStatus",
           render: (text, record) => {
-            return getProcessStatus(text, record.examineName);
-        },
+            return getProcessStatus(text, record.examineName, record.approval);
+          },
         },
         {
           title: "订单部门",
@@ -331,62 +331,62 @@ const PaiDan = React.createClass({
           <TabPane tab="搜索" key="1">
             <div className="user-search">
               <Input
-                  placeholder="客户名称"
-                  value={this.state.nameSearch}
-                  onChange={e => {
-                    this.setState({ nameSearch: e.target.value });
-                  }}
+                placeholder="客户名称"
+                value={this.state.nameSearch}
+                onChange={e => {
+                  this.setState({ nameSearch: e.target.value });
+                }}
               />
               <Input
-                  placeholder="订单编号"
-                  value={this.state.orderNoSearch}
-                  onChange={e => {
-                    this.setState({ orderNoSearch: e.target.value });
-                  }}
+                placeholder="订单编号"
+                value={this.state.orderNoSearch}
+                onChange={e => {
+                  this.setState({ orderNoSearch: e.target.value });
+                }}
               />
               <DepartmentList
-                  value={this.state.departmenttList}
-                  onChange={e => {
-                    this.setState({ departmenttList: e });
-                  }}/>
+                value={this.state.departmenttList}
+                onChange={e => {
+                  this.setState({ departmenttList: e });
+                }} />
               <Select
-                  placeholder="流程状态"
-                  onChange={e => {
-                    this.setState({ processStatusSearch: e });
-                  }}
-                  style={{ width: 160, marginRight: 5 }}
-                  value={this.state.processStatusSearch}
+                placeholder="流程状态"
+                onChange={e => {
+                  this.setState({ processStatusSearch: e });
+                }}
+                style={{ width: 160, marginRight: 5 }}
+                value={this.state.processStatusSearch}
               >
                 <Option value="2">未分配</Option>
                 <Option value="3">已分配</Option>
               </Select>
               <Input
-                  placeholder="合同编号"
-                  value={this.state.contractNoSearch}
-                  onChange={e => {
-                    this.setState({
-                      contractNoSearch: e.target.value
-                    });
-                  }}
+                placeholder="合同编号"
+                value={this.state.contractNoSearch}
+                onChange={e => {
+                  this.setState({
+                    contractNoSearch: e.target.value
+                  });
+                }}
               />
               <span style={{ marginRight: 10 }}>下单时间 :</span>
               <RangePicker
-                  value={[
-                    this.state.releaseDate[0]
-                        ? moment(this.state.releaseDate[0])
-                        : null,
-                    this.state.releaseDate[1]
-                        ? moment(this.state.releaseDate[1])
-                        : null
-                  ]}
-                  onChange={(data, dataString) => {
-                    this.setState({ releaseDate: dataString });
-                  }}
+                value={[
+                  this.state.releaseDate[0]
+                    ? moment(this.state.releaseDate[0])
+                    : null,
+                  this.state.releaseDate[1]
+                    ? moment(this.state.releaseDate[1])
+                    : null
+                ]}
+                onChange={(data, dataString) => {
+                  this.setState({ releaseDate: dataString });
+                }}
               />
               <Button
-                  type="primary"
-                  onClick={this.search}
-                  style={{ marginLeft: 10 }}
+                type="primary"
+                onClick={this.search}
+                style={{ marginLeft: 10 }}
               >
                 搜索
               </Button>
@@ -396,11 +396,11 @@ const PaiDan = React.createClass({
           <TabPane tab="更改表格显示数据" key="2">
             <div style={{ marginLeft: 10 }}>
               <ChooseList
-                  columns={this.state.columns}
-                  changeFn={this.changeList}
-                  changeList={this.state.changeList}
-                  top={55}
-                  margin={11}
+                columns={this.state.columns}
+                changeFn={this.changeList}
+                changeList={this.state.changeList}
+                top={55}
+                margin={11}
               />
             </div>
           </TabPane>
@@ -408,11 +408,11 @@ const PaiDan = React.createClass({
         <div className="patent-table">
           <Spin spinning={this.state.loading}>
             <Table
-                columns={
-                  this.state.changeList
-                      ? this.state.changeList
-                      : this.state.columns
-                }
+              columns={
+                this.state.changeList
+                  ? this.state.changeList
+                  : this.state.columns
+              }
               dataSource={this.state.dataSource}
               scroll={{ x: 1500, y: 0 }}
               rowSelection={false}

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

@@ -999,8 +999,8 @@ const ShouKuang = React.createClass({
           dataIndex: "processStatus",
           key: "processStatus",
           render: (text, record) => {
-            return getProcessStatus(text, record.examineName);
-        },
+            return getProcessStatus(text, record.examineName, record.approval);
+          },
         },
         // {
         //   title: "特批状态",
@@ -1335,8 +1335,8 @@ const ShouKuang = React.createClass({
           key: "processStatus",
           className: "title-table",
           render: (text, record) => {
-            return getProcessStatus(text, record.examineName);
-        },
+            return getProcessStatus(text, record.examineName, record.approval);
+          },
         },
         {
           title: "驳回状态",

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

@@ -1010,8 +1010,8 @@ const ShouKuang = React.createClass({
           dataIndex: "processStatus",
           key: "processStatus",
           render: (text, record) => {
-            return getProcessStatus(text, record.examineName);
-        },
+            return getProcessStatus(text, record.examineName, record.approval);
+          },
         },
         {
           title: "特批状态",
@@ -1359,8 +1359,8 @@ const ShouKuang = React.createClass({
           key: "processStatus",
           className: "title-table",
           render: (text, record) => {
-            return getProcessStatus(text, record.examineName);
-        },
+            return getProcessStatus(text, record.examineName, record.approval);
+          },
         },
 
         //                 {

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

@@ -66,8 +66,8 @@ class DemandDesc extends React.Component {
 					dataIndex: 'processStatus',
 					key: 'processStatus',
 					render: (text, record) => {
-						return getProcessStatus(text, record.examineName);
-				},
+						return getProcessStatus(text, record.examineName, record.approval);
+					},
 				},
 				{
 					title: '订单部门',

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

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

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

@@ -3658,7 +3658,7 @@ const NewService = Form.create()(
         message.warning("首付款金额不能为空!");
         return false;
       }
-      if (this.state.totalAmount < this.state.firstAmount) {
+      if (Number(this.state.totalAmount) < Number(this.state.firstAmount)) {
         message.warning("首付款不能大于合同额!");
         return;
       }
@@ -3667,7 +3667,7 @@ const NewService = Form.create()(
         this.state.typeChange == 1 ||
         this.state.typeChange == 3
       ) {
-        if (this.state.settlementAmount < this.state.changeAmount) {
+        if (Number(this.state.settlementAmount) < Number(this.state.changeAmount)) {
           message.warning("退款金额大于已收款金额");
           return;
         }
@@ -4334,7 +4334,7 @@ const NewService = Form.create()(
         message.warning("首付款金额不能为空!");
         return false;
       }
-      if (this.state.totalAmount < this.state.firstAmount) {
+      if (Number(this.state.totalAmount) < Number(this.state.firstAmount)) {
         message.warning("首付款不能大于合同额!");
         return;
       }
@@ -4343,7 +4343,7 @@ const NewService = Form.create()(
         this.state.typeChange == 1 ||
         this.state.typeChange == 3
       ) {
-        if (this.state.settlementAmount < this.state.changeAmount) {
+        if (Number(this.state.settlementAmount) < Number(this.state.changeAmount)) {
           message.warning("退款金额大于已收款金额");
           return;
         }
@@ -5918,7 +5918,7 @@ const NewService = Form.create()(
                               label="流程状态"
                             >
                               <span>
-                                {getProcessStatus(this.state.processStatus, this.state.examineName)}
+                                {getProcessStatus(this.state.processStatus, this.state.examineName, this.state.approval)}
                               </span>
                             </FormItem>
                             <FormItem

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

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

+ 2 - 2
js/component/manageCenter/order/orderNew/approveds.jsx

@@ -341,7 +341,7 @@ const IntentionCustomer = Form.create()(
             key: "processStatus",
             className: "title-table",
             render: (text, record) => {
-              return getProcessStatus(text, record.examineName);
+              return getProcessStatus(text, record.examineName, record.approval);
             },
           },
         ],
@@ -2451,7 +2451,7 @@ const IntentionCustomer = Form.create()(
                       {...formItemLayout}
                       label="流程状态"
                     >
-                      <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
+                      <span>{getProcessStatus(this.state.processStatus, this.state.examineName, this.state.approval)}</span>
                     </FormItem>
                     <FormItem
                       className="half-item"

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

@@ -630,7 +630,7 @@ const MyService = Form.create()(
             dataIndex: "processStatus",
             key: "processStatus",
             render: (text, record) => {
-              return getProcessStatus(text, record.examineName);
+              return getProcessStatus(text, record.examineName, record.approval);
             },
           },
           {

+ 2 - 2
js/component/manageCenter/order/orderNew/changeComponent/changeApply.js

@@ -986,7 +986,7 @@ class ChangeApply extends Component {
       message.warning("首付款金额不能为空!");
       return false;
     }
-    if (this.state.data.totalAmount < this.state.data.firstAmount) {
+    if (Number(this.state.data.totalAmount) < Number(this.state.data.firstAmount)) {
       message.warning("首付款不能大于合同额!");
       return;
     }
@@ -1001,7 +1001,7 @@ class ChangeApply extends Component {
       this.state.data.type == 1 ||
       this.state.data.type == 3
     ) {
-      if (this.state.data.settlementAmount < this.state.data.changeAmount) {
+      if (Number(this.state.data.settlementAmount) < Number(this.state.data.changeAmount)) {
         message.warning("退款金额大于已收款金额");
         return;
       }

+ 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, data.examineName)}</span>
+          <span>{getProcessStatus(data.processStatus, data.examineName, data.approval)}</span>
         </FormItem>
         <FormItem className="half-item" {...formItemLayout} label="结算状态">
           <span>{getLiquidationStatus(data.liquidationStatus)}</span>

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

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

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

@@ -1377,7 +1377,7 @@ const checkOutsourcing = Form.create()(
                         label="流程状态"
                       >
                         <span>
-                          {getProcessStatus(this.state.processStatus, this.state.examineName)}
+                          {getProcessStatus(this.state.processStatus, this.state.examineName, this.state.approval)}
                         </span>
                       </FormItem>
                       <FormItem

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

@@ -627,7 +627,7 @@ class projectOverview extends Component {
                                 {...formItemLayout}
                                 label="流程状态"
                             >
-                                <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
+                                <span>{getProcessStatus(this.state.processStatus, this.state.examineName, this.state.approval)}</span>
                             </FormItem>
                             <FormItem
                                 className="half-item"

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

@@ -349,7 +349,7 @@ const IntentionCustomer = Form.create()(
             dataIndex: "processStatus",
             key: "processStatus",
             render: (text, record) => {
-              return getProcessStatus(text, record.examineName);
+              return getProcessStatus(text, record.examineName, record.approval);
             },
           },
           {
@@ -1837,7 +1837,7 @@ const IntentionCustomer = Form.create()(
                           label="流程状态"
                         >
                           <span>
-                            {getProcessStatus(this.state.processStatus, this.state.examineName)}
+                            {getProcessStatus(this.state.processStatus, this.state.examineName, this.state.approval)}
                           </span>
                         </FormItem>
                         <FormItem

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

@@ -640,7 +640,7 @@ class projectOverview extends Component {
                                 {...formItemLayout}
                                 label="流程状态"
                             >
-                                <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
+                                <span>{getProcessStatus(this.state.processStatus, this.state.examineName, this.state.approval)}</span>
                             </FormItem>
                             <FormItem
                                 className="half-item"

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

@@ -846,7 +846,7 @@ const IntentionCustomer = Form.create()(
             dataIndex: "processStatus",
             key: "processStatus",
             render: (text, record) => {
-              return getProcessStatus(text, record.examineName);
+              return getProcessStatus(text, record.examineName, record.approval);
             },
           },
           {
@@ -4364,7 +4364,7 @@ const IntentionCustomer = Form.create()(
                         {...formItemLayout}
                         label="流程状态"
                       >
-                        <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
+                        <span>{getProcessStatus(this.state.processStatus, this.state.examineName, this.state.approval)}</span>
                       </FormItem>
                       <FormItem
                         className="half-item"

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

@@ -1703,7 +1703,7 @@ const outsourcingList = Form.create()(
                           label="流程状态"
                         >
                           <span>
-                            {getProcessStatus(this.state.processStatus, this.state.examineName)}
+                            {getProcessStatus(this.state.processStatus, this.state.examineName, this.state.approval)}
                           </span>
                         </FormItem>
                         <FormItem

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

@@ -1760,7 +1760,7 @@ const outsourcingPro = Form.create()(
                           label="流程状态"
                         >
                           <span>
-                            {getProcessStatus(this.state.processStatus, this.state.examineName)}
+                            {getProcessStatus(this.state.processStatus, this.state.examineName, this.state.approval)}
                           </span>
                         </FormItem>
                         <FormItem

+ 1 - 1
js/component/manageCenter/order/orderNew/reject.jsx

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

+ 2 - 2
js/component/manageCenter/order/source/order.jsx

@@ -135,8 +135,8 @@ class OrderList extends Component {
           dataIndex: "processStatus",
           key: "processStatus",
           render: (text, record) => {
-            return getProcessStatus(text, record.examineName);
-        },
+            return getProcessStatus(text, record.examineName, record.approval);
+          },
         },
         {
           title: "签单金额(万元)",

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

@@ -1003,7 +1003,7 @@ const PersonnelAll = React.createClass({
                   {...formItemLayout}
                   label="流程状态"
                 >
-                  <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
+                  <span>{getProcessStatus(this.state.processStatus, this.state.examineName, this.state.approval)}</span>
                 </FormItem>
                 <FormItem
                   className="half-item"

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

@@ -1211,7 +1211,7 @@ const OutsourceTaskAssignment = React.createClass({
                       {...formItemLayout}
                       label="流程状态"
                     >
-                      <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
+                      <span>{getProcessStatus(this.state.processStatus, this.state.examineName, this.state.approval)}</span>
                     </FormItem>
                     <FormItem
                       className="half-item"

+ 3 - 3
js/component/manageCenter/project/project/projectAssignment.jsx

@@ -219,8 +219,8 @@ const PaiDan = React.createClass({
           title: "分派状态",
           dataIndex: "processStatus",
           key: "processStatus",
-          render: text => {
-            return text == 5 || text == 6 ? getProcessStatus(text) : "未分配";
+          render: (text, record) => {
+            return text == 5 || text == 6 ? getProcessStatus(text, record.examineName, record.approval) : "未分配";
           }
         },
         {
@@ -1382,7 +1382,7 @@ const PaiDan = React.createClass({
                     {...formItemLayout}
                     label="流程状态"
                   >
-                    <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
+                    <span>{getProcessStatus(this.state.processStatus, this.state.examineName, this.state.approval)}</span>
                   </FormItem>
                   <FormItem
                     className="half-item"

+ 3 - 3
js/component/manageCenter/project/project/projectQuery.jsx

@@ -188,8 +188,8 @@ const PaiDan = React.createClass({
           title: "分派状态",
           dataIndex: "processStatus",
           key: "processStatus",
-          render: text => {
-            return text == 5 || text == 6 ? getProcessStatus(text) : "未分配";
+          render: (text, record) => {
+            return text == 5 || text == 6 ? getProcessStatus(text, record.examineName, record.approval) : "未分配";
           }
         }
       ],
@@ -965,7 +965,7 @@ const PaiDan = React.createClass({
                   {...formItemLayout}
                   label="流程状态"
                 >
-                  <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
+                  <span>{getProcessStatus(this.state.processStatus, this.state.examineName, this.state.approval)}</span>
                 </FormItem>
                 <FormItem
                   className="half-item"

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

@@ -213,8 +213,8 @@ const zxsglyOutSourcingPaiDan = React.createClass({
           title: "分派状态",
           dataIndex: "processStatus",
           key: "processStatus",
-          render: text => {
-            return text == 5 || text == 6 ? getProcessStatus(text) : "未分配";
+          render: (text, record) => {
+            return text == 5 || text == 6 ? getProcessStatus(text, record.examineName, record.approval) : "未分配";
           }
         },
         {
@@ -1324,7 +1324,7 @@ const zxsglyOutSourcingPaiDan = React.createClass({
                       {...formItemLayout}
                       label="流程状态"
                     >
-                      <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
+                      <span>{getProcessStatus(this.state.processStatus, this.state.examineName, this.state.approval)}</span>
                     </FormItem>
                     <FormItem
                       className="half-item"

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

@@ -1072,7 +1072,7 @@ class ProjectDetails extends Component {
                                             label="流程状态"
                                         >
                                             <span>
-                                                {getProcessStatus(this.state.processStatus, this.state.examineName)}
+                                                {getProcessStatus(this.state.processStatus, this.state.examineName, this.state.approval)}
                                             </span>
                                         </FormItem>
                                         <FormItem

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

@@ -394,7 +394,7 @@ class OrderInfor extends Component {
                             label="流程状态"
                         >
                             <span>
-                                {getProcessStatus(this.state.processStatus, this.state.examineName)}
+                                {getProcessStatus(this.state.processStatus, this.state.examineName, this.state.approval)}
                             </span>
                         </FormItem>
                         <FormItem

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

@@ -4092,7 +4092,7 @@ const Task = React.createClass({
                                                     label="流程状态"
                                                 >
                                                     <span>
-                                                        {getProcessStatus(this.state.processStatus, this.state.examineName)}
+                                                        {getProcessStatus(this.state.processStatus, this.state.examineName, this.state.approval)}
                                                     </span>
                                                 </FormItem>
                                                 <FormItem
@@ -5637,7 +5637,7 @@ const Task = React.createClass({
                                         {...formItemLayout}
                                         label="流程状态"
                                     >
-                                        <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
+                                        <span>{getProcessStatus(this.state.processStatus, this.state.examineName, this.state.approval)}</span>
                                     </FormItem>
                                     <FormItem
                                         className="half-item"

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

@@ -1343,7 +1343,7 @@ const MyTaskCount = Form.create()(
                       {...formItemLayout}
                       label="流程状态"
                     >
-                      <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
+                      <span>{getProcessStatus(this.state.processStatus, this.state.examineName, this.state.approval)}</span>
                     </FormItem>
                     <FormItem
                       className="half-item"
@@ -1835,7 +1835,7 @@ const MyTaskCount = Form.create()(
                 {...formItemLayout}
                 label="流程状态"
               >
-                <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
+                <span>{getProcessStatus(this.state.processStatus, this.state.examineName, this.state.approval)}</span>
               </FormItem>
               <FormItem
                 className="half-item"

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

@@ -3551,7 +3551,7 @@ const MyTaskOutsource = React.createClass({
                           label="流程状态"
                         >
                           <span>
-                            {getProcessStatus(this.state.processStatus, this.state.examineName)}
+                            {getProcessStatus(this.state.processStatus, this.state.examineName, this.state.approval)}
                           </span>
                         </FormItem>
                         <FormItem
@@ -4995,7 +4995,7 @@ const MyTaskOutsource = React.createClass({
                     {...formItemLayout}
                     label="流程状态"
                   >
-                    <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
+                    <span>{getProcessStatus(this.state.processStatus, this.state.examineName, this.state.approval)}</span>
                   </FormItem>
                   <FormItem
                     className="half-item"

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

@@ -630,7 +630,7 @@ class projectOverview extends Component {
                                 {...formItemLayout}
                                 label="流程状态"
                             >
-                                <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
+                                <span>{getProcessStatus(this.state.processStatus, this.state.examineName, this.state.approval)}</span>
                             </FormItem>
                             <FormItem
                                 className="half-item"

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

@@ -1310,7 +1310,7 @@ const Task = React.createClass({
                       {...formItemLayout}
                       label="流程状态"
                     >
-                      <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
+                      <span>{getProcessStatus(this.state.processStatus, this.state.examineName, this.state.approval)}</span>
                     </FormItem>
                     <FormItem
                       className="half-item"

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

@@ -1507,7 +1507,7 @@ const IntentionCustomer = Form.create()(
                       {...formItemLayout}
                       label="流程状态"
                     >
-                      <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
+                      <span>{getProcessStatus(this.state.processStatus, this.state.examineName, this.state.approval)}</span>
                     </FormItem>
                     <FormItem
                       className="half-item"
@@ -2093,7 +2093,7 @@ const IntentionCustomer = Form.create()(
                 {...formItemLayout}
                 label="流程状态"
               >
-                <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
+                <span>{getProcessStatus(this.state.processStatus, this.state.examineName, this.state.approval)}</span>
               </FormItem>
               <FormItem
                 className="half-item"

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

@@ -1470,7 +1470,7 @@ const Task = React.createClass({
                         label="流程状态"
                       >
                         <span>
-                          {getProcessStatus(this.state.processStatus, this.state.examineName)}
+                          {getProcessStatus(this.state.processStatus, this.state.examineName, this.state.approval)}
                         </span>
                       </FormItem>
                       <FormItem
@@ -2100,7 +2100,7 @@ const Task = React.createClass({
                       {...formItemLayout}
                       label="流程状态"
                     >
-                      <span>{getProcessStatus(this.state.processStatus, this.state.examineName)}</span>
+                      <span>{getProcessStatus(this.state.processStatus, this.state.examineName, this.state.approval)}</span>
                     </FormItem>
                     <FormItem
                       className="half-item"

+ 6 - 1
js/component/tools.js

@@ -1828,7 +1828,7 @@ const obj = {
     return '';
   },
   //流程状态
-  getProcessStatus: function (e, name) {
+  getProcessStatus: function (e, name, state) {
     if (e || e == 0) {
       let str = e.toString();
       let theType = "";
@@ -1838,6 +1838,11 @@ const obj = {
           theType = item.key;
         }
       });
+      if (state == "1" || state == "2" || state == "3") {
+        theName = "(总裁)"
+      } else if (state == "4" || state == "5" || state == "6") {
+        theName = "(董事长)"
+      }
       if (e == 5 || e == 6 || !name) {
         theName = ""
       }