Browse Source

增加项目和订单详情

HW 3 years ago
parent
commit
56bc0a6881
29 changed files with 413 additions and 86 deletions
  1. 49 0
      js/component/dataDic.js
  2. 3 18
      js/component/manageCenter/customer/NEW/intentionCustomer/transferRecords.jsx
  3. 15 5
      js/component/manageCenter/customerService/administration/followUp.jsx
  4. 13 1
      js/component/manageCenter/customerService/administration/followUpDetails.jsx
  5. 5 0
      js/component/manageCenter/customerService/administration/order.jsx
  6. 34 0
      js/component/manageCenter/financialManage/bonus/bonusDetail.jsx
  7. 33 0
      js/component/manageCenter/financialManage/bonus/jsBonusDetail.jsx
  8. 7 0
      js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx
  9. 7 0
      js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx
  10. 7 0
      js/component/manageCenter/financialManage/distribute/outOutsourcingList.jsx
  11. 7 0
      js/component/manageCenter/financialManage/distribute/outsourcingPaiDan.jsx
  12. 5 0
      js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx
  13. 71 38
      js/component/manageCenter/order/orderManagement/approveOrder/approveOrderDetaile.jsx
  14. 7 0
      js/component/manageCenter/order/orderNew/addService.jsx
  15. 5 0
      js/component/manageCenter/order/orderNew/approveds.jsx
  16. 5 0
      js/component/manageCenter/order/orderNew/chargeback.jsx
  17. 10 1
      js/component/manageCenter/order/orderNew/checkOutsourcing.jsx
  18. 8 1
      js/component/manageCenter/order/orderNew/contractJszj.js
  19. 8 1
      js/component/manageCenter/order/orderNew/contractYxgly.js
  20. 33 0
      js/component/manageCenter/order/orderNew/costAuditList/detailsModal/index.js
  21. 5 0
      js/component/manageCenter/order/orderNew/examine.jsx
  22. 33 0
      js/component/manageCenter/order/orderNew/glCostAuditList/detailsModal/index.js
  23. 5 0
      js/component/manageCenter/order/orderNew/inquiry.jsx
  24. 3 0
      js/component/manageCenter/order/orderNew/outsourcingPro.jsx
  25. 5 0
      js/component/manageCenter/project/project/projectQuery.jsx
  26. 8 2
      js/component/manageCenter/project/project/zxsglyOutSourcingPaiDan.jsx
  27. 5 0
      js/component/manageCenter/project/task/myTaskCount.jsx
  28. 14 1
      js/component/tools.js
  29. 3 18
      js/component/zhuanjiaoDetail.jsx

+ 49 - 0
js/component/dataDic.js

@@ -3867,5 +3867,54 @@ module.exports = {
       value:28,
       label:'抽查未备案',
     },
+  ],
+  //转交类型
+  transferType:[
+    {
+      value:0,
+      label:'录入',
+    },{
+      value:1,
+      label:'领取',
+    },{
+      value:2,
+      label:'转交私有客户',
+    },{
+      value:3,
+      label:'转交业务',
+    },{
+      value:4,
+      label:'未跟进丢失(30)',
+    },{
+      value:5,
+      label:'未签单丢失(270天)',
+    },{
+      value:6,
+      label:'移除',
+    },{
+      value:7,
+      label:'转交签单客户',
+    },{
+      value:8,
+      label:'渠道录入',
+    },{
+      value:9,
+      label:'渠道客户总监分配',
+    },{
+      value:10,
+      label:'渠道客户经理分配',
+    },{
+      value:11,
+      label:'渠道释放',
+    },{
+      value:12,
+      label:'回收',
+    },{
+      value:13,
+      label:'离职客户转交',
+    },{
+      value:14,
+      label:'离职签单业务转交',
+    },
   ]
 };

+ 3 - 18
js/component/manageCenter/customer/NEW/intentionCustomer/transferRecords.jsx

@@ -1,6 +1,7 @@
 import React from "react";
 import {Spin, Table, message, Modal, Tooltip} from "antd";
 import $ from "jquery/src/ajax";
+import {getTransferType} from '@/tools.js';
 const TransferRecords = React.createClass({
     getInitialState() {
         return {
@@ -26,7 +27,6 @@ const TransferRecords = React.createClass({
                     dataIndex: "newAName",
                     key: "newAName",
                 },
-                //  0录入 1 领取 2 转交私有客户 3转交业务 4 未跟进丢失(30) 5未签单丢失(270天)6释放  7转交签单客户  8渠道录入  9渠道客户分配  10 渠道客户转交 11渠道释放 12 回收 13离职转交
                 {
                     title: "转交类型",
                     dataIndex: "type",
@@ -34,23 +34,8 @@ const TransferRecords = React.createClass({
                     render: text => {
                         return (
                             <span>
-                  {
-                      text === 0 ? "录入":
-                          text === 1 ? "领取":
-                              text === 2 ? "转交私有客户":
-                                  text === 3 ? "转交业务":
-                                      text === 4 ? "未跟进丢失(30天)":
-                                          text === 5 ? "未签单丢失(270天)" :
-                                              text === 6 ? "移除" :
-                                                  text === 7 ? "转交签单客户" :
-                                                      text === 8 ? "渠道录入" :
-                                                          text === 9 ? "渠道客户总监分配" :
-                                                              text === 10 ? "渠道客户经理分配" :
-                                                                  text === 11 ? "渠道释放" :
-                                                                      text === 12 ? '回收' :
-                                                                          text === 13 ? '离职转交' :""
-                  }
-                </span>
+                              {getTransferType(text)}
+                            </span>
                         )
                     }
                 },

+ 15 - 5
js/component/manageCenter/customerService/administration/followUp.jsx

@@ -21,17 +21,22 @@ class FollowUp extends Component{
                     title: "合同编号",
                     dataIndex: "contractNo",
                     key: "contractNo",
+                    width: 120,
+                    fixed:'left',
                 },
                 {
                     title: "订单编号",
                     dataIndex: "orderNo",
                     key: "orderNo",
+                    width: 140,
+                    fixed:'left',
                 },
                 {
                     title: "状态",
                     dataIndex: "deleteSign",
                     key: "deleteSign",
                     width:90,
+                    fixed:'left',
                     render: (text) => {
                         //0=正常, 1=作废, 2=锁定, 3=变更中
                         return <Tag color="#f50">{
@@ -46,6 +51,15 @@ class FollowUp extends Component{
                     title: "订单部门",
                     dataIndex: "depName",
                     key: "depName",
+                    width: 130,
+                    fixed:'left',
+                },
+                {
+                    title: "客户名称",
+                    dataIndex: "userName",
+                    key: "userName",
+                    width:120,
+                    fixed:'left',
                 },
                 {
                     title: "合同签订时间",
@@ -58,11 +72,6 @@ class FollowUp extends Component{
                     key: "orderTimes",
                 },
                 {
-                    title: "客户名称",
-                    dataIndex: "userName",
-                    key: "userName",
-                },
-                {
                     title: "申报项目",
                     dataIndex: "projects",
                     key: "projects",
@@ -523,6 +532,7 @@ class FollowUp extends Component{
                             columns={this.state.columns}
                             dataSource={this.state.dataSource}
                             pagination={this.state.pagination}
+                            scroll={{ x: "max-content", y: 0 }}
                             onRowClick={(record)=>{
                                 this.setState({
                                     visible:true,

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

@@ -13,6 +13,7 @@ import $ from "jquery/src/ajax";
 import OrderRiZi from "@/orderRiZi.jsx";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 import CustomerServiceRecord from './customerServiceRecord';
+import OrderItemStatus from "../../../common/orderItemStatus";
 
 const FormItem = Form.Item;
 const { TabPane } = Tabs;
@@ -467,6 +468,7 @@ class FollowUpDetails extends Component{
                         nowFinanceMobile: thisdata.nowFinanceMobile, //财务电话
                         depName: thisdata.depName,
                         outsource: thisdata.outsource == 0 ? "否" : "是",
+                        deleteSign:thisdata.deleteSign,
                     });
                 }
             }.bind(this),
@@ -531,7 +533,17 @@ class FollowUpDetails extends Component{
                 onCancel={this.props.onCancel}
             >
                 <div>
-                    <Tabs defaultActiveKey="1" className="test" activeKey={this.state.tabsKey} onChange={(e)=>{this.setState({tabsKey:e})}}>
+                    <Tabs
+                        defaultActiveKey="1"
+                        className="test"
+                        activeKey={this.state.tabsKey}
+                        onChange={(e)=>{this.setState({tabsKey:e})}}
+                        tabBarExtraContent={
+                            <div style={{fontWeight:'bold',paddingRight:'15px'}}>
+                                <OrderItemStatus deleteSign={this.state.deleteSign}/>
+                            </div>
+                        }
+                    >
                         <TabPane tab="订单详情" key="1">
                             <Form
                                 layout="horizontal"

+ 5 - 0
js/component/manageCenter/customerService/administration/order.jsx

@@ -44,6 +44,7 @@ import ReactToPrint from "react-to-print";
 import Project from "../../../../component/project";
 import ImgList from "../../../common/imgList";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
+import OrderItemStatus from "../../../common/orderItemStatus";
 const { Option } = Select;
 const { TabPane } = Tabs;
 const PicturesWall = React.createClass({
@@ -1630,6 +1631,7 @@ const Order = Form.create()(
                             nowFinanceMobile: thisdata.nowFinanceMobile, //财务电话
                             depName: thisdata.depName,
                             outsource: thisdata.outsource == 0 ? "否" : "是",
+                            deleteSign:thisdata.deleteSign,
                         });
                     }
                 }.bind(this),
@@ -3960,6 +3962,9 @@ const Order = Form.create()(
                             >
                                 <Spin spinning={this.state.loading}>
                                     <div className="clearfix">
+                                        <div style={{position:"absolute",top:'-52px',left:'81px',zIndex:10000}}>
+                                            <OrderItemStatus deleteSign={this.state.deleteSign}/>
+                                        </div>
                                         <FormItem
                                             className="half-item"
                                             {...formItemLayout}

+ 34 - 0
js/component/manageCenter/financialManage/bonus/bonusDetail.jsx

@@ -3,6 +3,7 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import { Form, Spin, message, Modal } from 'antd';
 import {getProjectName,getNewOrderStatus,getJsyPaymentType} from '@/tools.js';
+import OrderItemStatus from "../../../common/orderItemStatus";
 
 const BonusDetail=React.createClass({
     getInitialState() {
@@ -26,9 +27,39 @@ const BonusDetail=React.createClass({
 	},
     componentWillMount() {
     },
+    xiangqings(orderNo) {
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/newOrder/getOrderNewDetail",
+            data: {
+                orderNo,
+            },
+            success: function (data) {
+                let thisdata = data.data;
+                if (data.error.length || data.data.list == "") {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    }
+                } else {
+                    this.setState({
+                        deleteSign:thisdata.deleteSign,
+                    });
+                }
+            }.bind(this),
+        }).always(
+            function () {
+                this.setState({
+                    loading: false,
+                });
+            }.bind(this)
+        );
+    },
     componentWillReceiveProps(nextProps) {
         if(nextProps.data.orderNo){
             this.setState({data:nextProps.data});
+            this.xiangqings(nextProps.data.orderNo);
         }
         this.state.visible=nextProps.showDesc;
     },
@@ -50,6 +81,9 @@ const BonusDetail=React.createClass({
 			            <Form layout="horizontal" onSubmit={(e)=>{this.handleSubmit(e,0)}} >
 			                <Spin spinning={this.state.loading}>
                                 <div className="clearfix">
+                                    <div style={{position:"absolute",top:'-52px',left:'81px',zIndex:10000}}>
+                                        <OrderItemStatus deleteSign={this.state.deleteSign}/>
+                                    </div>
                                     <FormItem className="half-item" {...formItemLayout} label="订单编号">
                                         <span>{theData.orderNo}</span>
                                     </FormItem>

+ 33 - 0
js/component/manageCenter/financialManage/bonus/jsBonusDetail.jsx

@@ -3,6 +3,8 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import { Form, Spin, message, Modal } from 'antd';
 import {getTaskStatus,getProjectName,getLiquidationStatus,getJsyPaymentType,getBonusState} from '@/tools.js';
+import {splitUrl} from "../../../tools";
+import OrderItemStatus from "../../../common/orderItemStatus";
 
 const BonusDetail=React.createClass({
     getInitialState() {
@@ -26,9 +28,37 @@ const BonusDetail=React.createClass({
 	},
     componentWillMount() {
     },
+    xiangqing(orderNo) {
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/newOrder/getOrderNewDetail",
+            data: {
+                orderNo,
+            },
+            success: function (data) {
+                if (data.error.length || data.data.list == "") {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    }
+                } else {
+                    let thisdata = data.data;
+                    this.setState({
+                        deleteSign:thisdata.deleteSign,
+                    });
+                }
+            }.bind(this),
+        }).always(
+            function () {
+
+            }.bind(this)
+        );
+    },
     componentWillReceiveProps(nextProps) {
         if(nextProps.data.orderNo){
             this.setState({data:nextProps.data});
+            this.xiangqing(nextProps.data.orderNo);
         }
         this.state.visible=nextProps.showDesc;
     },
@@ -50,6 +80,9 @@ const BonusDetail=React.createClass({
 			            <Form layout="horizontal" onSubmit={(e)=>{this.handleSubmit(e,0)}} >
 			                <Spin spinning={this.state.loading}>
                                 <div className="clearfix">
+                                    <div style={{position:"absolute",top:'-52px',left:'81px',zIndex:10000}}>
+                                        <OrderItemStatus deleteSign={this.state.deleteSign}/>
+                                    </div>
                                     <FormItem className="half-item" {...formItemLayout} label="任务编号">
                                         <span>{theData.tid}</span>
                                     </FormItem>

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

@@ -44,6 +44,7 @@ import { ChooseList } from '../../../../component/manageCenter/order/orderNew/ch
 import ImgList from "../../../common/imgList";
 import {getProjectName} from "../../../tools";
 import DepartmentList from "../../../common/departmentList";
+import OrderItemStatus from "../../../common/orderItemStatus";
 const FormItem = Form.Item
 
 const approvedOutsourcing = React.createClass({
@@ -1809,6 +1810,7 @@ const approvedOutsourcing = React.createClass({
           orderNo: thisData.orderNo, //订单编号
           buyerId: thisData.buyerId,
           depName: thisData.depName,
+          deleteSign:thisData.deleteSign,
         })
       }.bind(this),
     }).always(
@@ -3155,6 +3157,11 @@ const approvedOutsourcing = React.createClass({
               onChange={this.callBack}
               type="card"
               activeKey={this.state.modKey}
+              tabBarExtraContent={
+                <div style={{fontWeight:'bold',paddingRight:'15px'}}>
+                  <OrderItemStatus deleteSign={this.state.deleteSign}/>
+                </div>
+              }
             >
               <TabPane tab="项目概况" key="1">
                 {this.state.modKey === "1" ? <Form layout="horizontal" id="demand-form">

+ 7 - 0
js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx

@@ -41,6 +41,7 @@ import {
 import { ChooseList } from "../../../../component/manageCenter/order/orderNew/chooseList";
 import ImgList from "../../../common/imgList";
 import {getProjectName} from "../../../tools";
+import OrderItemStatus from "../../../common/orderItemStatus";
 const FormItem = Form.Item;
 
 const approvedOutsourcing = React.createClass({
@@ -1804,6 +1805,7 @@ const approvedOutsourcing = React.createClass({
           orderNo: thisData.orderNo, //订单编号
           buyerId: thisData.buyerId,
           depName: thisData.depName,
+          deleteSign:thisData.deleteSign,
         });
       }.bind(this),
     }).always(
@@ -3112,6 +3114,11 @@ const approvedOutsourcing = React.createClass({
               onChange={this.callBack}
               type="card"
               activeKey={this.state.modKey}
+              tabBarExtraContent={
+                <div style={{fontWeight:'bold',paddingRight:'15px'}}>
+                  <OrderItemStatus deleteSign={this.state.deleteSign}/>
+                </div>
+              }
             >
               <TabPane tab="项目概况" key="1">
                 {this.state.modKey === '1' ? <Form layout="horizontal" id="demand-form">

+ 7 - 0
js/component/manageCenter/financialManage/distribute/outOutsourcingList.jsx

@@ -31,6 +31,7 @@ import {
 import ImgList from "../../../common/imgList";
 import {ChooseList} from "../../order/orderNew/chooseList";
 import {getProjectName} from "../../../tools";
+import OrderItemStatus from "../../../common/orderItemStatus";
 const FormItem = Form.Item;
 
 const outsourcingPaiDan = React.createClass({
@@ -673,6 +674,7 @@ const outsourcingPaiDan = React.createClass({
           orderNo: thisData.orderNo, //订单编号
           buyerId: thisData.buyerId,
           depName: thisData.depName,
+          deleteSign:thisData.deleteSign,
         });
       }.bind(this),
     }).always(
@@ -986,6 +988,11 @@ const outsourcingPaiDan = React.createClass({
               onChange={this.callBack}
               type="card"
               activeKey={this.state.modKey}
+              tabBarExtraContent={
+                <div style={{fontWeight:'bold',paddingRight:'15px'}}>
+                  <OrderItemStatus deleteSign={this.state.deleteSign}/>
+                </div>
+              }
             >
               <TabPane tab="项目概况" key="1">
                 {this.state.modKey === "1" ? <Form layout="horizontal" id="demand-form">

+ 7 - 0
js/component/manageCenter/financialManage/distribute/outsourcingPaiDan.jsx

@@ -31,6 +31,7 @@ import {
 import ImgList from "../../../common/imgList";
 import {ChooseList} from "../../order/orderNew/chooseList";
 import {getProjectName} from "../../../tools";
+import OrderItemStatus from "../../../common/orderItemStatus";
 const FormItem = Form.Item;
 
 const outsourcingPaiDan = React.createClass({
@@ -782,6 +783,7 @@ const outsourcingPaiDan = React.createClass({
           orderNo: thisData.orderNo, //订单编号
           buyerId: thisData.buyerId,
           depName: thisData.depName,
+          deleteSign:thisData.deleteSign,
         });
       }.bind(this),
     }).always(
@@ -1142,6 +1144,11 @@ const outsourcingPaiDan = React.createClass({
               onChange={this.callBack}
               type="card"
               activeKey={this.state.modKey}
+              tabBarExtraContent={
+                <div style={{fontWeight:'bold',paddingRight:'15px'}}>
+                  <OrderItemStatus deleteSign={this.state.deleteSign}/>
+                </div>
+              }
             >
               <TabPane tab="项目概况" key="1">
                 {this.state.modKey === "1" ? <Form layout="horizontal" id="demand-form">

+ 5 - 0
js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx

@@ -26,6 +26,7 @@ import ResolutionDetail from "@/resolutionDetail";
 import ImgList from "../../../common/imgList";
 import {getProjectName} from "../../../tools";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
+import OrderItemStatus from "../../../common/orderItemStatus";
 const OrderDetail = Form.create()(
   React.createClass({
     loadXmu(record) {
@@ -390,6 +391,7 @@ const OrderDetail = Form.create()(
             buyerId: thisData.buyerId,
             depName: thisData.depName,
             outsource: thisData.outsource == 0 ? "否" : "是",
+            deleteSign:thisData.deleteSign,
           });
         }.bind(this),
       }).always(
@@ -712,6 +714,9 @@ const OrderDetail = Form.create()(
       const cuiDataList = this.state.contactList || [];
       return (
         <div className="login">
+          <div style={{position:"absolute",top:'12px',left:'81px',zIndex:10000}}>
+            <OrderItemStatus deleteSign={this.state.deleteSign}/>
+          </div>
           {this.state.resVisible ? (
             <ResolutionDetail
               cancel={this.resCancel}

+ 71 - 38
js/component/manageCenter/order/orderManagement/approveOrder/approveOrderDetaile.jsx

@@ -4,6 +4,7 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import '../../userMangagement.less';
 import {getApprovedState,getPaymentState,getOrderState,getProjectState,getOrderChannel,getOrderType,getTransactionChannel ,getTransactionProject } from '../../../../tools.js';
+import OrderItemStatus from "../../../../common/orderItemStatus";
 
 //图片组件
 const PicturesWall = React.createClass({
@@ -29,7 +30,7 @@ const PicturesWall = React.createClass({
         this.props.fileList(fileList);
     },
     componentWillReceiveProps(nextProps) {
-        this.state.fileList = nextProps.pictureUrl; 
+        this.state.fileList = nextProps.pictureUrl;
     },
     render() {
         const { previewVisible, previewImage, fileList } = this.state;
@@ -219,7 +220,7 @@ const ApproveOrderDetaile = Form.create()(React.createClass({
               orderNo: record.orderNo
             },
             success: function (data) {
-                let thisData = data.data;                
+                let thisData = data.data;
                 if (!thisData) {
                     if (data.error && data.error.length) {
                         message.warning(data.error[0].message);
@@ -242,10 +243,10 @@ const ApproveOrderDetaile = Form.create()(React.createClass({
                 });
             }.bind(this),
        }).always(function () {
-            this.setState({            	
+            this.setState({
                 loading: false
             });
-        }.bind(this));  
+        }.bind(this));
        }
     },
 	handleOk(e) {
@@ -265,6 +266,34 @@ const ApproveOrderDetaile = Form.create()(React.createClass({
 			addnextVisible: false
 		})
 	},
+	//订单详情
+	xiangqings(record) {
+		$.ajax({
+			method: "get",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + "/api/admin/newOrder/getOrderNewDetail",
+			data: {
+				orderNo: record?record.orderNo:this.props.datauser.orderNo,
+			},
+			success: function (data) {
+				let thisdata = data.data;
+				if (data.error.length || data.data.list == "") {
+					if (data.error && data.error.length) {
+						message.warning(data.error[0].message);
+					}
+				} else {
+					this.setState({
+						deleteSign:thisdata.deleteSign,
+					});
+				}
+			}.bind(this),
+		}).always(
+			function () {
+
+			}.bind(this)
+		);
+	},
 	lookflow(){
 		this.setState({
 			loading: true,
@@ -292,7 +321,7 @@ const ApproveOrderDetaile = Form.create()(React.createClass({
                              key: i,
 	                         billNo: thisdata.billNo,
 	                         transactionAmount:thisdata.transactionAmount,
-	                         createTime:thisdata.createTime, 
+	                         createTime:thisdata.createTime,
 	                         transactionAmount:thisdata.transactionAmount,
 	                         payerName:thisdata.payerName,
 	                         payeeName:thisdata.payeeName,
@@ -332,13 +361,14 @@ const ApproveOrderDetaile = Form.create()(React.createClass({
         });
     },
 	componentWillMount() {
-		
+
 	},
 	componentWillReceiveProps(nextProps) { //props改变时触发
 		this.state.visible = nextProps.showDesc;
 		if(nextProps.userDetaile && nextProps.showDesc ) {
 			this.loaduser(nextProps.datauser);
 			this.loadData(nextProps.datauser);
+			this.xiangqings(nextProps.datauser)
 		}
 	},
 	render() {
@@ -354,13 +384,16 @@ const ApproveOrderDetaile = Form.create()(React.createClass({
             <Modal maskClosable={false} visible={this.state.visible}
                         onOk={this.handleOk} onCancel={this.handleCancel}
                         width='1000px'
-                        title='订单详情'                     
+                        title='订单详情'
                         footer=''
                         className="admin-desc-content">
 			            <Form layout="horizontal" id="demand-form" style={{paddingBottom:'40px'}}  >
 			                <Spin spinning={this.state.loading}>
 		                        <div className="clearfix">
 		                            <div className="clearfix">
+										<div style={{position:"absolute",top:'-52px',left:'81px',zIndex:10000}}>
+											<OrderItemStatus deleteSign={this.state.deleteSign}/>
+										</div>
 			                       		<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            label="订单编号" >
@@ -368,68 +401,68 @@ const ApproveOrderDetaile = Form.create()(React.createClass({
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="下单时间" >  
+				                            label="下单时间" >
 				                            <span>{orderDetaiel.createTime}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="客户名称" >  
+				                            label="客户名称" >
 				                            <span>{orderDetaiel.buyerName}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="订单类型" >  
+				                            label="订单类型" >
 				                            <span>{getOrderType(orderDetaiel.orderType)}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="订单渠道" >  
+				                            label="订单渠道" >
 				                            <span>{getOrderChannel(orderDetaiel.orderChannel)}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="订单状态" >  
+				                            label="订单状态" >
 				                            <span>{getOrderState(orderDetaiel.orderStatus)}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="已收款项" >  
+				                            label="已收款项" >
 				                            <span>{orderDetaiel.actuallyTotalAmount+'万元'}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="结算状态" >  
+				                            label="结算状态" >
 				                            <span>{getPaymentState(orderDetaiel.liquidationStatus)}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="市价订单金额" >    
+				                            label="市价订单金额" >
 			                            	<span>{orderDetaiel.orderAmount+'万元'}</span>
 					                    </FormItem>
 					                    <FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="市价首款金额" >   
+				                            label="市价首款金额" >
 				                            <span>{orderDetaiel.firstPayment+'万元'}</span>
 					                    </FormItem>
 					                    <div className='clearfix'>
 								        	<FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="实签订单金额" >   
+					                            label="实签订单金额" >
 					                            <span>{orderDetaiel.signTotalAmount+'万元'}</span>
 				                    		</FormItem>
 				                    		<FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="实签首款金额" >   
+					                            label="实签首款金额" >
 					                            <span>{orderDetaiel.signFirstPayment+'万元'}</span>
 				                    		</FormItem>
 				                    		<FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="特批立项" >   
+					                            label="特批立项" >
 					                            <span>{getApprovedState(orderDetaiel.approval)}</span>
 				                    		</FormItem>
 				                    		<FormItem className="half-item"
 					                            {...formItemLayout}
-					                            label="合同编号" >   
+					                            label="合同编号" >
 					                            <span>{orderDetaiel.contractNo}</span>
 				                    		</FormItem>
 					                        <div className='clearfix'>
@@ -445,45 +478,45 @@ const ApproveOrderDetaile = Form.create()(React.createClass({
 			                        <div className='clearfix'>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="订单负责人" >  
+				                            label="订单负责人" >
 				                            <span>{orderDetaiel.salesmanName}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="业务品类" >  
+				                            label="业务品类" >
 				                            <span>{orderDetaiel.projectType}</span>
 			                    		</FormItem>
 			                    	</div>
 			                    	<div className='clearfix'>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="意向时间" >  
+				                            label="意向时间" >
 				                            <span>{orderDetaiel.createTime}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="签单时间" >  
+				                            label="签单时间" >
 				                            <span>{orderDetaiel.signTime}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="财务负责人" >  
+				                            label="财务负责人" >
 						                    <span>{orderDetaiel.financeName}</span>
 						                    <Button onClick={this.lookflow} style={{float:'right'}}>查看流水</Button>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="项目负责人" >  
+				                            label="项目负责人" >
 				                            <span>{orderDetaiel.technicianName}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="立项时间" >  
+				                            label="立项时间" >
 				                            <span>{orderDetaiel.setUpTime}</span>
 			                    		</FormItem>
 			                    		<FormItem className="half-item"
 				                            {...formItemLayout}
-				                            label="项目状态" >  
+				                            label="项目状态" >
 				                            <span>{getProjectState(orderDetaiel.projectStage)}</span>
 			                    		</FormItem>
 		                    		</div>
@@ -495,18 +528,18 @@ const ApproveOrderDetaile = Form.create()(React.createClass({
 					                        <Table size="middle" columns={this.state.columns}
 					                            dataSource={this.state.dataSource}
 					                            pagination={false}
-					                            onRowClick={this.tableRowClick} 
+					                            onRowClick={this.tableRowClick}
 					                            />
 					                    </Spin>
 						            </div>
 			                    </div>
 			                </Spin>
 			            </Form >
-			        </Modal> 
+			        </Modal>
 			        <Modal maskClosable={false} visible={this.state.addnextVisible}
                         onOk={this.nextCancel} onCancel={this.nextCancel}
                         width='550px'
-                        title='查看项目详细'                     
+                        title='查看项目详细'
                         footer=''
                         className="admin-desc-content">
 			            <Form layout="horizontal" id="demand-form">
@@ -534,16 +567,16 @@ const ApproveOrderDetaile = Form.create()(React.createClass({
 			                    	</FormItem>
 				                    <FormItem className="half-item"
 			                            {...formItemLayout}
-			                            label="市场首付金额" >   
-		                                <span>{editFws.commodityFirstPayment+'万元'}</span>    
+			                            label="市场首付金额" >
+		                                <span>{editFws.commodityFirstPayment+'万元'}</span>
 				                    </FormItem>
 				                    <FormItem className="half-item"
 			                            {...formItemLayout}
-			                            label="签单首付金额" >   
-		                                <span>{editFws.discountFirstPayment+'万元'}</span>    
+			                            label="签单首付金额" >
+		                                <span>{editFws.discountFirstPayment+'万元'}</span>
 				                    </FormItem>
 				                    <div className='clearfix'>
-				                    	<FormItem 
+				                    	<FormItem
 				                            labelCol={{ span: 4 }}
 								            wrapperCol={{ span: 16 }}
 				                            label="项目说明" >
@@ -557,7 +590,7 @@ const ApproveOrderDetaile = Form.create()(React.createClass({
 			        <Modal maskClosable={false} visible={this.state.lookVisible}
                         onOk={this.lookCancel} onCancel={this.lookCancel}
                         width='1300px'
-                        title= '查看流水'                   
+                        title= '查看流水'
                         footer=''
                         className="admin-desc-content">
 			            <Form layout="horizontal" id="demand-form">
@@ -576,4 +609,4 @@ const ApproveOrderDetaile = Form.create()(React.createClass({
 	}
 }));
 
-export default ApproveOrderDetaile;
+export default ApproveOrderDetaile;

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

@@ -52,6 +52,7 @@ import { cuiJieDian } from "@/dataDic.js"
 import PicturesWall from "./changeComponent/picturesWall.js";
 import { changeType, getChangeType } from "./changeComponent/changeDetailYxgly";
 import ImgList from "../../../common/imgList";
+import OrderItemStatus from "../../../common/orderItemStatus";
 // const Options = Select.Option;
 const Option = AutoComplete.Option;
 const confirm = Modal.confirm;
@@ -1926,6 +1927,7 @@ const NewService = Form.create()(
             depName: thisData.depName,
             status: thisData.status,
             outsource: thisData.outsource,
+            deleteSign:thisData.deleteSign,
           });
           // console.log("kkkk",this.state.processStatus);
         }.bind(this),
@@ -4470,6 +4472,11 @@ const NewService = Form.create()(
                     <Tabs
                       onChange={this.callback}
                       activeKey={this.state.activeKey}
+                      tabBarExtraContent={
+                        <div style={{fontWeight:'bold',paddingRight:'15px'}}>
+                          <OrderItemStatus deleteSign={this.state.deleteSign}/>
+                        </div>
+                      }
                     >
                       <TabPane tab={"最新订单"} key="1">
                         <div className="clearfix">

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

@@ -42,6 +42,7 @@ import ImgList from "../../../common/imgList";
 import {getProjectName} from "../../../tools";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 import DepartmentList from "../../../common/departmentList";
+import OrderItemStatus from "../../../common/orderItemStatus";
 const { TabPane } = Tabs;
 const { TextArea } = Input;
 //图片组件
@@ -1002,6 +1003,7 @@ const IntentionCustomer = Form.create()(
               financeName: thisdata.financeName, //财务名称
               financeMobile: thisdata.financeMobile, //财务电话
               outsource: thisdata.outsource == 0 ? "否" : "是",
+              deleteSign:thisdata.deleteSign,
             });
           }
         }.bind(this),
@@ -2187,6 +2189,9 @@ const IntentionCustomer = Form.create()(
               >
                 <Spin spinning={this.state.loading}>
                   <div className="clearfix">
+                    <div style={{position:"absolute",top:'-52px',left:'81px',zIndex:10000}}>
+                      <OrderItemStatus deleteSign={this.state.deleteSign}/>
+                    </div>
                     <FormItem
                       className="half-item"
                       {...formItemLayout}

+ 5 - 0
js/component/manageCenter/order/orderNew/chargeback.jsx

@@ -20,6 +20,7 @@ import ShowModalDiv from "@/showModal.jsx";
 import OrderRiZi from "@/orderRiZi.jsx";
 import ImgList from "../../../common/imgList";
 import {ChooseList} from "./chooseList";
+import OrderItemStatus from "../../../common/orderItemStatus";
 
 const IntentionCustomer = Form.create()(
   React.createClass({
@@ -657,6 +658,7 @@ const IntentionCustomer = Form.create()(
               nowFinanceMobile: thisdata.nowFinanceMobile, //财务电话
               approval: thisdata.approval.toString(), //特批状态
               //approval:thisdata.approval==0?thisdata.approval.toString():thisdata.approval,//特批状态
+              deleteSign:thisdata.deleteSign,
             });
           }
         }.bind(this),
@@ -1084,6 +1086,9 @@ const IntentionCustomer = Form.create()(
               >
                 <Spin spinning={this.state.loading}>
                   <div className="clearfix">
+                    <div style={{position:"absolute",top:'-52px',left:'81px',zIndex:10000}}>
+                      <OrderItemStatus deleteSign={this.state.deleteSign}/>
+                    </div>
                     <FormItem
                       className="half-item"
                       {...formItemLayout}

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

@@ -33,6 +33,7 @@ import ImgList from "../../../common/imgList";
 import {ChooseList} from "./chooseList";
 import {getProjectName} from "../../../tools";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
+import OrderItemStatus from "../../../common/orderItemStatus";
 
 const checkOutsourcing = Form.create()(
   React.createClass({
@@ -511,6 +512,7 @@ const checkOutsourcing = Form.create()(
               nowFinanceMobile: thisdata.nowFinanceMobile, //财务电话
               depName: thisdata.depName,
               outsource: thisdata.outsource == 0 ? '否' : '是',
+              deleteSign:thisdata.deleteSign,
             })
           }
         }.bind(this),
@@ -1257,7 +1259,14 @@ const checkOutsourcing = Form.create()(
             onOk={this.visitOk}
             onCancel={this.visitCancel}
           >
-            <Tabs activeKey={this.state.activeKey} onChange={this.callback}>
+            <Tabs
+                activeKey={this.state.activeKey}
+                onChange={this.callback}
+                tabBarExtraContent={
+                  <div style={{fontWeight:'bold',paddingRight:'15px'}}>
+                    <OrderItemStatus deleteSign={this.state.deleteSign}/>
+                  </div>
+            }>
               <TabPane tab="订单详情" key="1">
                 {this.state.activeKey === '1' ? <Form
                   layout="horizontal"

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

@@ -21,6 +21,7 @@ import OrderRiZi from "@/orderRiZi.jsx";
 import {ChooseList} from "./chooseList";
 import {getProjectName} from "../../../tools";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
+import OrderItemStatus from "../../../common/orderItemStatus";
 const contractChange = Form.create()(
   React.createClass({
     loadData(pageNo) {
@@ -479,7 +480,8 @@ const contractChange = Form.create()(
               contractNo: thisdata.contractNo,
               // arrears: thisdata.arrears,
               orderData: thisdata,
-              isAddition: thisdata.additionalOrder ? true : false
+              isAddition: thisdata.additionalOrder ? true : false,
+              deleteSign:thisdata.deleteSign,
             });
           }
         }.bind(this)
@@ -1163,6 +1165,11 @@ const contractChange = Form.create()(
                 activeKey={this.state.activeKey}
                 onChange={this.callback}
                 type="card"
+                tabBarExtraContent={
+                  <div style={{fontWeight:'bold',paddingRight:'15px'}}>
+                    <OrderItemStatus deleteSign={this.state.deleteSign}/>
+                  </div>
+                }
               >
                 <TabPane tab="订单详情" key="a">
                   {this.state.activeKey === "a" ? <Form

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

@@ -21,6 +21,7 @@ import OrderRiZi from "@/orderRiZi.jsx";
 import {ChooseList} from "./chooseList";
 import {getProjectName} from "../../../tools";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
+import OrderItemStatus from "../../../common/orderItemStatus";
 const contractChange = Form.create()(
   React.createClass({
     loadData(pageNo) {
@@ -474,7 +475,8 @@ const contractChange = Form.create()(
               contractNo: thisdata.contractNo,
               // arrears: thisdata.arrears,
               orderData: thisdata,
-              isAddition: thisdata.additionalOrder ? true : false
+              isAddition: thisdata.additionalOrder ? true : false,
+              deleteSign:thisdata.deleteSign,
             });
           }
         }.bind(this)
@@ -1170,6 +1172,11 @@ const contractChange = Form.create()(
                 activeKey={this.state.activeKey}
                 onChange={this.callback}
                 type="card"
+                tabBarExtraContent={
+                  <div style={{fontWeight:'bold',paddingRight:'15px'}}>
+                    <OrderItemStatus deleteSign={this.state.deleteSign}/>
+                  </div>
+                }
               >
                 <TabPane tab="订单详情" key="a">
                   <Form

+ 33 - 0
js/component/manageCenter/order/orderNew/costAuditList/detailsModal/index.js

@@ -5,6 +5,7 @@ import ProjectOverview from './projectOverview'
 import {splitUrl} from '@/tools'
 import CheckProject from "../../../../components/checkProject";
 import $ from "jquery";
+import OrderItemStatus from "../../../../../common/orderItemStatus";
 
 const { TabPane } = Tabs
 
@@ -25,6 +26,7 @@ class DetailsModal extends Component{
     async componentDidMount() {
         if(this.props.tid){
             this.waiDetail();
+            this.getOrderNewDetail();
             this.thirdTable(this.props.tid);
 
             await this.xiangqing(this.props.tid);
@@ -283,6 +285,34 @@ class DetailsModal extends Component{
         )
     }
 
+    getOrderNewDetail() {
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/newOrder/getOrderNewDetail",
+            data: {
+                orderNo: this.props.orderNo,
+            },
+            success: function (data) {
+                if (data.error.length || data.data.list == "") {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    }
+                } else {
+                    let thisdata = data.data;
+                    this.setState({
+                        deleteSign:thisdata.deleteSign,
+                    });
+                }
+            }.bind(this),
+        }).always(
+            function () {
+
+            }.bind(this)
+        );
+    }
+
     render() {
         return(
             <Modal
@@ -304,6 +334,7 @@ class DetailsModal extends Component{
                         })
                         if(e === '1'){
                             this.waiDetail();
+                            this.getOrderNewDetail();
                             this.thirdTable(this.props.tid);
                             this.payNodeTable(this.props.tid);
                             this.xiangqing(this.props.tid);
@@ -321,6 +352,7 @@ class DetailsModal extends Component{
                               {this.props.taskID}
                           </span>
                           </span>
+                            <OrderItemStatus deleteSign={this.state.deleteSign}/>
                         </div>
                     }
                 >
@@ -346,6 +378,7 @@ class DetailsModal extends Component{
                             startType={this.state.startType}
                             onRefresh={()=>{
                                 this.waiDetail();
+                                this.getOrderNewDetail();
                                 this.thirdTable(this.props.tid);
                                 this.payNodeTable(this.props.tid);
                                 this.xiangqing(this.props.tid);

+ 5 - 0
js/component/manageCenter/order/orderNew/examine.jsx

@@ -38,6 +38,7 @@ import ImgList from "../../../common/imgList";
 import {ChooseList} from "./chooseList";
 import {getProjectName} from "../../../tools";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
+import OrderItemStatus from "../../../common/orderItemStatus";
 const confirm = Modal.confirm;
 const { Option } = Select;
 //图片组件
@@ -604,6 +605,7 @@ const IntentionCustomer = Form.create()(
               nowFinanceMobile: thisdata.nowFinanceMobile, //财务电话
               depName: thisdata.depName,
               outsource: thisdata.outsource == 0 ? "否" : "是",
+              deleteSign:thisdata.deleteSign,
             });
           }
         }.bind(this),
@@ -1463,6 +1465,9 @@ const IntentionCustomer = Form.create()(
                   >
                     <Spin spinning={this.state.loading}>
                       <div className="clearfix">
+                        <div style={{position:"absolute",top:'-30px',left:'92px',zIndex:10000}}>
+                          <OrderItemStatus deleteSign={this.state.deleteSign}/>
+                        </div>
                         <FormItem
                           className="half-item"
                           {...formItemLayout}

+ 33 - 0
js/component/manageCenter/order/orderNew/glCostAuditList/detailsModal/index.js

@@ -5,6 +5,7 @@ import ProjectOverview from './projectOverview'
 import {splitUrl} from '@/tools'
 import CheckProject from "../../../../components/checkProject";
 import $ from "jquery";
+import OrderItemStatus from "../../../../../common/orderItemStatus";
 
 const { TabPane } = Tabs
 
@@ -24,6 +25,7 @@ class DetailsModal extends Component{
     async componentDidMount() {
         if(this.props.tid){
             this.waiDetail();
+            this.getOrderNewDetail();
             this.thirdTable(this.props.tid);
 
             await this.xiangqing(this.props.tid);
@@ -282,6 +284,34 @@ class DetailsModal extends Component{
         )
     }
 
+    getOrderNewDetail() {
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/newOrder/getOrderNewDetail",
+            data: {
+                orderNo: this.props.orderNo,
+            },
+            success: function (data) {
+                if (data.error.length || data.data.list == "") {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    }
+                } else {
+                    let thisdata = data.data;
+                    this.setState({
+                        deleteSign:thisdata.deleteSign,
+                    });
+                }
+            }.bind(this),
+        }).always(
+            function () {
+
+            }.bind(this)
+        );
+    }
+
     render() {
         return(
             <Modal
@@ -306,6 +336,7 @@ class DetailsModal extends Component{
                             this.thirdTable(this.props.tid);
                             this.payNodeTable(this.props.tid);
                             this.xiangqing(this.props.tid);
+                            this.getOrderNewDetail();
                         }
                     }}
                     tabBarExtraContent={
@@ -320,6 +351,7 @@ class DetailsModal extends Component{
                               {this.props.taskID}
                           </span>
                           </span>
+                            <OrderItemStatus deleteSign={this.state.deleteSign}/>
                         </div>
                     }
                 >
@@ -348,6 +380,7 @@ class DetailsModal extends Component{
                                 this.thirdTable(this.props.tid);
                                 this.payNodeTable(this.props.tid);
                                 this.xiangqing(this.props.tid);
+                                this.getOrderNewDetail();
                                 this.props.refreshList && this.props.refreshList();
                             }}
                         /> : <div/>}

+ 5 - 0
js/component/manageCenter/order/orderNew/inquiry.jsx

@@ -47,6 +47,7 @@ import ReactToPrint from "react-to-print";
 import Project from "../../../../component/project";
 import ImgList from "../../../common/imgList";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
+import OrderItemStatus from "../../../common/orderItemStatus";
 const { Option } = Select;
 const { TabPane } = Tabs;
 const PicturesWall = React.createClass({
@@ -1635,6 +1636,7 @@ const IntentionCustomer = Form.create()(
               nowFinanceMobile: thisdata.nowFinanceMobile, //财务电话
               depName: thisdata.depName,
               outsource: thisdata.outsource == 0 ? "否" : "是",
+              deleteSign:thisdata.deleteSign,
             });
           }
         }.bind(this),
@@ -3965,6 +3967,9 @@ const IntentionCustomer = Form.create()(
               >
                 <Spin spinning={this.state.loading}>
                   <div className="clearfix">
+                    <div style={{position:"absolute",top:'-52px',left:'81px',zIndex:10000}}>
+                      <OrderItemStatus deleteSign={this.state.deleteSign}/>
+                    </div>
                     <FormItem
                       className="half-item"
                       {...formItemLayout}

+ 3 - 0
js/component/manageCenter/order/orderNew/outsourcingPro.jsx

@@ -40,6 +40,7 @@ import OrderRiZi from "@/orderRiZi.jsx";
 import ImgList from "../../../common/imgList";
 import {ChooseList} from "./chooseList";
 import {getProjectName} from "../../../tools";
+import OrderItemStatus from "../../../common/orderItemStatus";
 //图片组件
 const PicturesWall = React.createClass({
   getInitialState() {
@@ -582,6 +583,7 @@ const outsourcingPro = Form.create()(
               nowFinanceMobile: thisdata.nowFinanceMobile, //财务电话
               depName: thisdata.depName,
               outsource: thisdata.outsource == 0 ? "否" : "是",
+              deleteSign:thisdata.deleteSign,
             });
           }
         }.bind(this),
@@ -1518,6 +1520,7 @@ const outsourcingPro = Form.create()(
                         }
                       </span>
                       </span>
+                      <OrderItemStatus deleteSign={this.state.deleteSign}/>
                     </div>
                   }
               >

+ 5 - 0
js/component/manageCenter/project/project/projectQuery.jsx

@@ -22,6 +22,7 @@ import OrderRiZi from "@/orderRiZi.jsx";
 import ImgList from "../../../common/imgList";
 import {ChooseList} from "../../order/orderNew/chooseList";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
+ import OrderItemStatus from "../../../common/orderItemStatus";
 
 const {TabPane} = Tabs
 const PaiDan = React.createClass({
@@ -358,6 +359,7 @@ const PaiDan = React.createClass({
             nowFinanceMobile: thisdata.nowFinanceMobile, //财务电话
             depName: thisdata.depName, //订单部门
             outsource: thisdata.outsource == 0 ? "否" : "是",
+            deleteSign:thisdata.deleteSign,
           });
         }
       }.bind(this)
@@ -821,6 +823,9 @@ const PaiDan = React.createClass({
           >
             <Spin spinning={this.state.loading}>
               <div className="clearfix">
+                <div style={{position:"absolute",top:'-52px',left:'81px',zIndex:10000}}>
+                  <OrderItemStatus deleteSign={this.state.deleteSign}/>
+                </div>
                 <FormItem
                   className="half-item"
                   {...formItemLayout}

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

@@ -35,6 +35,7 @@ import ShowModalDiv from "@/showModal.jsx";
 import OrderRiZi from "@/orderRiZi.jsx";
 import {ChooseList} from "../../order/orderNew/chooseList";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
+import OrderItemStatus from "../../../common/orderItemStatus";
 const zxsglyOutSourcingPaiDan = React.createClass({
   loadData(pageNo) {
     this.state.data = [];
@@ -535,7 +536,8 @@ const zxsglyOutSourcingPaiDan = React.createClass({
             oldSalesmanName: thisdata.oldSalesmanName, //营销员名称
             oldSalesmanMobile: thisdata.oldSalesmanMobile, //营销员电话
             nowFinance: thisdata.nowFinance, //财务名称
-            nowFinanceMobile: thisdata.nowFinanceMobile //财务电话
+            nowFinanceMobile: thisdata.nowFinanceMobile, //财务电话
+            deleteSign:thisdata.deleteSign,
           });
         }
       }.bind(this)
@@ -1343,7 +1345,11 @@ const zxsglyOutSourcingPaiDan = React.createClass({
           onOk={this.visitOk}
           onCancel={this.visitCancel}
         >
-          <Tabs onChange={this.callBack} activeKey={this.state.modKey}>
+          <Tabs onChange={this.callBack} activeKey={this.state.modKey} tabBarExtraContent={
+            <div style={{fontWeight:'bold',paddingRight:'15px'}}>
+              <OrderItemStatus deleteSign={this.state.deleteSign}/>
+            </div>
+          }>
             <TabPane tab="项目概况" key="1">
               <Form
                 layout="horizontal"

+ 5 - 0
js/component/manageCenter/project/task/myTaskCount.jsx

@@ -30,6 +30,7 @@ import {ChooseList} from "../../order/orderNew/chooseList";
 import PatentSchedule from './patentSchedule';
 import DeclarationProgress from "../../../common/declarationProgress";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
+import OrderItemStatus from "../../../common/orderItemStatus";
 
 const { TabPane } = Tabs
 const MyTaskCount = Form.create()(
@@ -649,6 +650,7 @@ const MyTaskCount = Form.create()(
               ProvinceCity: ProvinceCityArr,
               postalAddress: thisdata.postalAddress, //详细地址
               outsource: thisdata.outsource,
+              deleteSign:thisdata.deleteSign,
             });
           }
         }.bind(this)
@@ -1233,6 +1235,9 @@ const MyTaskCount = Form.create()(
             >
               <Spin spinning={this.state.loading}>
                 <div className="clearfix">
+                  <div style={{position:"absolute",top:'-52px',left:'81px',zIndex:10000}}>
+                    <OrderItemStatus deleteSign={this.state.deleteSign}/>
+                  </div>
                   <div className="clearfix">
                     <FormItem
                         className="half-item"

+ 14 - 1
js/component/tools.js

@@ -105,7 +105,8 @@ import {
   processStatusNew,
   contractChangeStatus,
   typeList,
-  channelAllocationStatus
+  channelAllocationStatus,
+  transferType
 } from "./dataDic.js";
 
 import { provinceList } from './NewDicProvinceList.js';
@@ -1119,7 +1120,19 @@ module.exports = {
       }
     }
   },
+  //获取分配状态名称
+  getTransferType:function (id){
+    if (!isNaN(parseInt(id))) {
+      let typeName = '';
+      transferType.map(function (item) {
+        if (item.value == id) {
+          typeName = item.label
+        }
+      });
+      return typeName;
+    }
 
+  },
   //行业
   getIndustry: function (e) {
     if (e) {

+ 3 - 18
js/component/zhuanjiaoDetail.jsx

@@ -1,6 +1,7 @@
 import React from "react";
 import {Spin, Button, Tabs, Table, message, Modal, Tooltip} from "antd";
 import $ from "jquery/src/ajax";
+import {getTransferType} from '@/tools.js';
 const ZhuanjiaoDetail = React.createClass({
   getInitialState() {
     return {
@@ -26,7 +27,7 @@ const ZhuanjiaoDetail = React.createClass({
           dataIndex: "newAName",
           key: "newAName",
         },
-        //  0录入 1 领取 2 转交私有客户 3转交业务 4 未跟进丢失(30) 5未签单丢失(270天)6释放  7转交签单客户  8渠道录入  9渠道客户分配  10 渠道客户转交 11渠道释放 12 回收 13离职转交
+        //  0录入 1 领取 2 转交私有客户 3转交业务 4 未跟进丢失(30) 5未签单丢失(270天)6移除  7转交签单客户  8渠道录入  9渠道客户分配  10 渠道客户转交 11渠道释放 12 回收 13离职转交 14 离职签单业务转交
         {
           title: "转交类型",
           dataIndex: "type",
@@ -34,23 +35,7 @@ const ZhuanjiaoDetail = React.createClass({
           render: text => {
             return (
                 <span>
-                  {
-                    text === 0 ? "录入":
-                        text === 1 ? "领取":
-                            text === 2 ? "转交私有客户":
-                                text === 3 ? "转交业务":
-                                    text === 4 ? "未跟进丢失(30天)":
-                                        text === 5 ? "未签单丢失(270天)" :
-                                            text === 6 ? "移除" :
-                                                text === 7 ? "转交签单客户" :
-                                                    text === 8 ? "渠道录入" :
-                                                        text === 9 ? "渠道客户总监分配" :
-                                                            text === 10 ? "渠道客户经理分配" :
-                                                                text === 11 ? "渠道释放" :
-                                                                    text === 12 ? '回收' :
-                                                                        text === 13 ? '离职转交' :""
-
-                  }
+                  {getTransferType(text)}
                 </span>
             )
           }