dev01 2 years ago
parent
commit
00a995425c
30 changed files with 582 additions and 866 deletions
  1. 2 2
      js/component/common/projectOperation/index.jsx
  2. 2 2
      js/component/common/projectOperation/vip.jsx
  3. 1 1
      js/component/manageCenter/customer/NEW/crm/crmAll.jsx
  4. 3 3
      js/component/manageCenter/customer/NEW/crm/crmCount.jsx
  5. 46 44
      js/component/manageCenter/customer/operationalData/reexamine/details.jsx
  6. 65 63
      js/component/manageCenter/customerService/administration/followUpDetails.jsx
  7. 3 1
      js/component/manageCenter/customerService/administration/order.jsx
  8. 3 1
      js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx
  9. 3 1
      js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx
  10. 5 0
      js/component/manageCenter/financialManage/distribute/projectvip.jsx
  11. 4 0
      js/component/manageCenter/financialManage/distribute/projectvipall.jsx
  12. 2 1
      js/component/manageCenter/financialManage/distribute/shouKuanAll.jsx
  13. 4 3
      js/component/manageCenter/financialManage/distribute/shouKuang.jsx
  14. 30 287
      js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx
  15. 150 79
      js/component/manageCenter/order/orderNew/addService.jsx
  16. 72 38
      js/component/manageCenter/order/orderNew/addorders.js
  17. 3 1
      js/component/manageCenter/order/orderNew/approveds.jsx
  18. 74 39
      js/component/manageCenter/order/orderNew/changeComponent/changeApply.js
  19. 3 1
      js/component/manageCenter/order/orderNew/changeComponent/orderDetail.js
  20. 3 1
      js/component/manageCenter/order/orderNew/changeComponent/proAndCuiList.jsx
  21. 3 1
      js/component/manageCenter/order/orderNew/chargeback.jsx
  22. 3 1
      js/component/manageCenter/order/orderNew/checkOutsourcing.jsx
  23. 1 2
      js/component/manageCenter/order/orderNew/contentUrl.jsx
  24. 3 1
      js/component/manageCenter/order/orderNew/examine.jsx
  25. 3 1
      js/component/manageCenter/order/orderNew/inquiry.jsx
  26. 3 1
      js/component/manageCenter/order/orderNew/outsourcingList.jsx
  27. 3 1
      js/component/manageCenter/order/orderNew/outsourcingPro.jsx
  28. 72 38
      js/component/manageCenter/order/orderNew/reject.jsx
  29. 12 251
      js/component/manageCenter/order/source/order.jsx
  30. 1 1
      package.json

+ 2 - 2
js/component/common/projectOperation/index.jsx

@@ -539,7 +539,7 @@ class ProjectOperation extends Component {
                                     {readOnly ? this.state.taskComment : 
                                     <Input
                                         type="textarea"
-                                        placeholder="如:派2023年会员服务,总会员服务三年,客户付款情况说明"
+                                        placeholder="如:派2022年会员服务,总会员服务三年,客户付款情况说明"
                                         autosize={{ minRows: 4 }}
                                         value={this.state.taskComment}
                                         onChange={(e) => {
@@ -548,7 +548,7 @@ class ProjectOperation extends Component {
                                     />}
                                 </FormItem>
                                 <div style={{ color: "red", marginLeft: 144 }}>
-                                    请详细说明项目服务时间,总服务时间及付款情况,如:<span style={{ color: "#333" }}>派2023年会员服务,总会员服务三年,客户付款情况说明</span>
+                                    请详细说明项目服务时间,总服务时间及付款情况,如:<span style={{ color: "#333" }}>派2022年会员服务,总会员服务三年,客户付款情况说明</span>
                                     <p>未付款时,需进行特批审核,请详细说明预计付款时间等详细情况</p>
                                 </div>
                             </div>

+ 2 - 2
js/component/common/projectOperation/vip.jsx

@@ -314,7 +314,7 @@ class ProjectOperationVip extends Component {
                   {readOnly ? this.state.taskComment :
                     <Input
                       type="textarea"
-                      placeholder="如:派2023年会员服务,总会员服务三年,客户付款情况说明"
+                      placeholder="如:派2022年会员服务,总会员服务三年,客户付款情况说明"
                       autosize={{ minRows: 4 }}
                       value={this.state.taskComment}
                       onChange={(e) => {
@@ -323,7 +323,7 @@ class ProjectOperationVip extends Component {
                     />}
                 </FormItem>
                 <div style={{ color: "red", marginLeft: 144 }}>
-                  请详细说明项目服务时间,总服务时间及付款情况,如:<span style={{ color: "#333" }}>派2023年会员服务,总会员服务三年,客户付款情况说明</span>
+                  请详细说明项目服务时间,总服务时间及付款情况,如:<span style={{ color: "#333" }}>派2022年会员服务,总会员服务三年,客户付款情况说明</span>
                   <p>未付款时,需进行特批审核,请详细说明预计付款时间等详细情况</p>
                 </div>
               </div>

+ 1 - 1
js/component/manageCenter/customer/NEW/crm/crmAll.jsx

@@ -990,7 +990,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 		return (
 			<div className="user-content" >
 				<div className="content-title">
-					<span>客户资料管理</span>
+					<span style={{ fontWeight: 900, fontSize: 16 }}>客户资料管理</span>
 				</div>
 				<Tabs
 					defaultActiveKey="1"

+ 3 - 3
js/component/manageCenter/customer/NEW/crm/crmCount.jsx

@@ -294,7 +294,7 @@ const DiurnalStatisticsOne = React.createClass({
 					}
 				}, {
 					title: '姓名',
-					fixed:false,
+					fixed: false,
 					dataIndex: 'name',
 					key: 'name',
 					render: (text, record) => {
@@ -538,7 +538,7 @@ const DiurnalStatisticsOne = React.createClass({
 		let departmentArr = this.state.departmentArr || [];
 		return (
 			<div className='set-content'>
-				<p style={{ fontSize: '20px', marginBottom: '10px' }}>客户资料填写统计</p>
+				<span style={{ fontWeight: 900, fontSize: 16 }}>客户资料填写统计</span>
 				<Tabs
 					defaultActiveKey="1"
 					className="test">
@@ -571,7 +571,7 @@ const DiurnalStatisticsOne = React.createClass({
 				</Tabs>
 				<div id='daochu1'>
 					<div className="surfaceTitle">
-						<span>客户资料填写统计表</span>
+						<span style={{ fontWeight: 900, fontSize: 16 }}>客户资料填写统计表</span>
 					</div>
 					<div className="patent-table">
 						<div className="scroll">

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

@@ -1,5 +1,5 @@
-import React,{Component} from "react";
-import {Button, Form, message, Modal, Spin, Table, Tag} from "antd";
+import React, { Component } from "react";
+import { Button, Form, message, Modal, Spin, Table, Tag } from "antd";
 import OrderItemStatus from "../../../../common/orderItemStatus";
 import EnterpriseNameChange from "../../../../common/enterpriseNameChange";
 import {
@@ -23,11 +23,11 @@ const formItemLayout = {
     wrapperCol: { span: 14 },
 };
 
-class Details extends Component{
+class Details extends Component {
     constructor(props) {
         super(props);
-        this.state={
-            loading:false,
+        this.state = {
+            loading: false,
             columnsX: [
                 {
                     title: "业务项目名称",
@@ -35,7 +35,7 @@ class Details extends Component{
                     key: "commodityName",
                     render: (text, record) => {
                         return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
-                      }
+                    }
                 },
                 {
                     title: "项目类别",
@@ -50,7 +50,7 @@ class Details extends Component{
                         if (record.splitStatus == 1) {
                             return (
                                 <span>
-                    {text}{" "}
+                                    {text}{" "}
                                     <Tag
                                         color="#108ee9"
                                         onClick={(e) => {
@@ -58,9 +58,9 @@ class Details extends Component{
                                             this.showRes(record);
                                         }}
                                     >
-                      已拆
-                    </Tag>
-                  </span>
+                                        已拆
+                                    </Tag>
+                                </span>
                             );
                         } else {
                             return text;
@@ -154,7 +154,9 @@ class Details extends Component{
                     render: (text, record) => {
                         if (record.dunTypeName) {
                             if (record.appropriationRatio) {
-                                return <span>{record.appropriationRatio}(拨款比例)</span>;
+                                let percent = Number(record.appropriationRatio * 100);
+                                percent += "%";
+                                return <span>{percent}(拨款比例)</span>;
                             } else {
                                 return <span>{text}</span>;
                             }
@@ -203,15 +205,15 @@ class Details extends Component{
                     },
                 },
             ],
-            dataSourceX:[],
+            dataSourceX: [],
 
-            contactList:[],
+            contactList: [],
 
-            dataInfor:{},
+            dataInfor: {},
 
-            totalCui:'',
+            totalCui: '',
 
-            dataSourcerizhi:[]
+            dataSourcerizhi: []
         }
         this.xiangqing = this.xiangqing.bind(this);
         this.xiangmu = this.xiangmu.bind(this);
@@ -245,9 +247,9 @@ class Details extends Component{
                 orderNo: this.props.orderNo,
             },
             success: function (data) {
-                if(data.error.length){
+                if (data.error.length) {
                     message.warning(data.error[0].message);
-                }else{
+                } else {
                     let thisdata = data.data;
                     this.setState({
                         orderUid: thisdata.uid,
@@ -280,12 +282,12 @@ class Details extends Component{
                                 globalConfig.avatarHost + "/upload"
                             )
                             : [], //图片地址
-                        contentUrl:thisdata.serviceContent
+                        contentUrl: thisdata.serviceContent
                             ? splitUrl(
                                 thisdata.serviceContent,
                                 ",",
                                 globalConfig.avatarHost + "/upload"
-                              )
+                            )
                             : [], //图片地址
                         salesmanName: thisdata.salesmanName, //营销员名称
                         salesmanMobile: thisdata.salesmanMobile, //营销员电话
@@ -297,7 +299,7 @@ class Details extends Component{
                         nowFinanceMobile: thisdata.nowFinanceMobile, //财务电话
                         depName: thisdata.depName,
                         outsource: thisdata.outsource == 0 ? "否" : "是",
-                        deleteSign:thisdata.deleteSign,
+                        deleteSign: thisdata.deleteSign,
                     });
                 }
             }.bind(this),
@@ -354,7 +356,7 @@ class Details extends Component{
     tableRowClickX(record) {
         this.setState({
             addnextVisible: true,
-            dataInfor:record,
+            dataInfor: record,
         });
     }
 
@@ -362,7 +364,7 @@ class Details extends Component{
     nextCancel() {
         this.setState({
             addnextVisible: false,
-            dataInfor:{},
+            dataInfor: {},
         });
     }
 
@@ -490,7 +492,7 @@ class Details extends Component{
     closeOrderLog() {
         this.setState({
             rizhivisible: false,
-            dataSourcerizhi:[]
+            dataSourcerizhi: []
         });
     }
 
@@ -551,8 +553,8 @@ class Details extends Component{
                 <Form layout="horizontal" id="demand-form" style={{ paddingBottom: "40px" }}>
                     <Spin spinning={this.state.loading}>
                         <div className="clearfix">
-                            <div style={{position:"absolute",top:'-52px',left:'81px',zIndex:10000}}>
-                                <OrderItemStatus deleteSign={this.state.deleteSign}/>
+                            <div style={{ position: "absolute", top: '-52px', left: '81px', zIndex: 10000 }}>
+                                <OrderItemStatus deleteSign={this.state.deleteSign} />
                             </div>
                             <FormItem
                                 className="half-item"
@@ -577,7 +579,7 @@ class Details extends Component{
                                 <EnterpriseNameChange
                                     type='journal'
                                     style={{ marginLeft: 10 }}
-                                    enterpriseId={this.state.orderUid}/>
+                                    enterpriseId={this.state.orderUid} />
                             </FormItem>
                             <FormItem
                                 className="half-item"
@@ -598,9 +600,9 @@ class Details extends Component{
                                 {...formItemLayout}
                                 label="结算状态"
                             >
-                      <span>
-                        {getLiquidationStatus(this.state.liquidationStatus)}
-                      </span>
+                                <span>
+                                    {getLiquidationStatus(this.state.liquidationStatus)}
+                                </span>
                             </FormItem>
                             <FormItem
                                 className="half-item"
@@ -687,8 +689,8 @@ class Details extends Component{
                                     wrapperCol={{ span: 18 }}
                                     label={"合同扫描件"}
                                 >
-                                    <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-                                        {this.props.visible && this.state.orgCodeUrl ? <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'}/> : <div/>}
+                                    <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+                                        {this.props.visible && this.state.orgCodeUrl ? <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'} /> : <div />}
                                     </div>
                                     <Button
                                         style={{
@@ -706,16 +708,16 @@ class Details extends Component{
                                     wrapperCol={{ span: 18 }}
                                     label="补充协议"
                                 >
-                                    <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-                                        {this.props.visible && this.state.replenishUrl ? <ImgList domId={'inquiry1'} fileList={this.state.replenishUrl} ItemWidth={'96px'}/> : <div/>}
+                                    <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+                                        {this.props.visible && this.state.replenishUrl ? <ImgList domId={'inquiry1'} fileList={this.state.replenishUrl} ItemWidth={'96px'} /> : <div />}
                                     </div>
                                 </FormItem>
                             </div>
                             <ContentUrl
-                             processStatus={1}
-                             domId = {"detailContent"}
-                             contentUrl = {this.state.contentUrl}
-                             imgId = {"detailContentImg"}
+                                processStatus={1}
+                                domId={"detailContent"}
+                                contentUrl={this.state.contentUrl}
+                                imgId={"detailContentImg"}
                             />
                             <div className="clearfix">
                                 <FormItem
@@ -786,11 +788,11 @@ class Details extends Component{
                                 </FormItem>
                             </div>
                             {/*  */}
-                            <OrderCoor orderNo={this.props.orderNo}/>
+                            <OrderCoor orderNo={this.props.orderNo} />
                             <div>
-                            <span style={{ marginLeft: "50px", fontSize: "20px" }}>
-                              项目业务
-                            </span>
+                                <span style={{ marginLeft: "50px", fontSize: "20px" }}>
+                                    项目业务
+                                </span>
                             </div>
                             <div className="patent-table">
                                 <Spin spinning={this.state.xiangmuLoading}>
@@ -806,7 +808,7 @@ class Details extends Component{
                             </div>
                             <div>
                                 <span style={{ marginLeft: "50px", fontSize: "20px" }}>
-                                  催款节点
+                                    催款节点
                                 </span>
                                 <span
                                     style={{
@@ -815,7 +817,7 @@ class Details extends Component{
                                         color: "red",
                                     }}
                                 >
-                                 金额总计(万元): {this.state.totalCui}
+                                    金额总计(万元): {this.state.totalCui}
                                 </span>
                             </div>
                             <div className="clearfix">

+ 65 - 63
js/component/manageCenter/customerService/administration/followUpDetails.jsx

@@ -1,5 +1,5 @@
-import React,{Component} from "react";
-import {Button, Col, Form, message, Modal, Spin, Table, Tabs, Tag} from "antd";
+import React, { Component } from "react";
+import { Button, Col, Form, message, Modal, Spin, Table, Tabs, Tag } from "antd";
 import {
     getApprovedState,
     getCuikuan,
@@ -24,11 +24,11 @@ const formItemLayout = {
     wrapperCol: { span: 14 },
 };
 
-class FollowUpDetails extends Component{
+class FollowUpDetails extends Component {
     constructor(props) {
         super(props);
-        this.state={
-            loading:false,
+        this.state = {
+            loading: false,
             columnsX: [
                 {
                     title: "业务项目名称",
@@ -36,7 +36,7 @@ class FollowUpDetails extends Component{
                     key: "commodityName",
                     render: (text, record) => {
                         return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
-                      }
+                    }
                 },
                 {
                     title: "项目类别",
@@ -51,7 +51,7 @@ class FollowUpDetails extends Component{
                         if (record.splitStatus == 1) {
                             return (
                                 <span>
-                    {text}{" "}
+                                    {text}{" "}
                                     <Tag
                                         color="#108ee9"
                                         onClick={(e) => {
@@ -59,9 +59,9 @@ class FollowUpDetails extends Component{
                                             this.showRes(record);
                                         }}
                                     >
-                      已拆
-                    </Tag>
-                  </span>
+                                        已拆
+                                    </Tag>
+                                </span>
                             );
                         } else {
                             return text;
@@ -100,8 +100,8 @@ class FollowUpDetails extends Component{
                     },
                 },
             ],
-            dataSourceX:[],
-            contactList:[],
+            dataSourceX: [],
+            contactList: [],
             ContactsListsNew: [
                 {
                     title: "项目名称",
@@ -157,7 +157,9 @@ class FollowUpDetails extends Component{
                     render: (text, record) => {
                         if (record.dunTypeName) {
                             if (record.appropriationRatio) {
-                                return <span>{record.appropriationRatio}(拨款比例)</span>;
+                                let percent = Number(record.appropriationRatio * 100);
+                                percent += "%";
+                                return <span>{percent}(拨款比例)</span>;
                             } else {
                                 return <span>{text}</span>;
                             }
@@ -206,19 +208,19 @@ class FollowUpDetails extends Component{
                     },
                 },
             ],
-            tabsKey:'1',
-            dataSourcerizhi:[],
+            tabsKey: '1',
+            dataSourcerizhi: [],
         }
-        this.jiedian =this.jiedian.bind(this);
-        this.jiedianNew =this.jiedianNew.bind(this);
-        this.xiangqing =this.xiangqing.bind(this);
-        this.rizhi =this.rizhi.bind(this);
-        this.closeOrderLog =this.closeOrderLog.bind(this);
-        this.tableRowClickX =this.tableRowClickX.bind(this);
-        this.nextCancel =this.nextCancel.bind(this);
-        this.rizhi =this.rizhi.bind(this);
-        this.getOrderLog =this.getOrderLog.bind(this);
-        this.xiangmu =this.xiangmu.bind(this);
+        this.jiedian = this.jiedian.bind(this);
+        this.jiedianNew = this.jiedianNew.bind(this);
+        this.xiangqing = this.xiangqing.bind(this);
+        this.rizhi = this.rizhi.bind(this);
+        this.closeOrderLog = this.closeOrderLog.bind(this);
+        this.tableRowClickX = this.tableRowClickX.bind(this);
+        this.nextCancel = this.nextCancel.bind(this);
+        this.rizhi = this.rizhi.bind(this);
+        this.getOrderLog = this.getOrderLog.bind(this);
+        this.xiangmu = this.xiangmu.bind(this);
     }
 
     componentDidMount() {
@@ -238,21 +240,21 @@ class FollowUpDetails extends Component{
     closeOrderLog() {
         this.setState({
             rizhivisible: false,
-            dataSourcerizhi:[],
+            dataSourcerizhi: [],
         });
     }
 
     tableRowClickX(record) {
         this.setState({
             addnextVisible: true,
-            dataInfor:record,
+            dataInfor: record,
         });
     }
 
     nextCancel() {
         this.setState({
             addnextVisible: false,
-            dataInfor:{}
+            dataInfor: {}
         });
     }
 
@@ -455,12 +457,12 @@ class FollowUpDetails extends Component{
                                 globalConfig.avatarHost + "/upload"
                             )
                             : [], //图片地址
-                        contentUrl:thisdata.serviceContent
+                        contentUrl: thisdata.serviceContent
                             ? splitUrl(
                                 thisdata.serviceContent,
                                 ",",
                                 globalConfig.avatarHost + "/upload"
-                              )
+                            )
                             : [], //图片地址
                         salesmanName: thisdata.salesmanName, //营销员名称
                         salesmanMobile: thisdata.salesmanMobile, //营销员电话
@@ -472,7 +474,7 @@ class FollowUpDetails extends Component{
                         nowFinanceMobile: thisdata.nowFinanceMobile, //财务电话
                         depName: thisdata.depName,
                         outsource: thisdata.outsource == 0 ? "否" : "是",
-                        deleteSign:thisdata.deleteSign,
+                        deleteSign: thisdata.deleteSign,
                     });
                 }
             }.bind(this),
@@ -487,7 +489,7 @@ class FollowUpDetails extends Component{
 
     xiangmu() {
         this.setState({
-            orderTaskLoading:true
+            orderTaskLoading: true
         })
         $.ajax({
             method: "get",
@@ -541,10 +543,10 @@ class FollowUpDetails extends Component{
                         defaultActiveKey="1"
                         className="test"
                         activeKey={this.state.tabsKey}
-                        onChange={(e)=>{this.setState({tabsKey:e})}}
+                        onChange={(e) => { this.setState({ tabsKey: e }) }}
                         tabBarExtraContent={
-                            <div style={{fontWeight:'bold',paddingRight:'15px'}}>
-                                <OrderItemStatus deleteSign={this.state.deleteSign}/>
+                            <div style={{ fontWeight: 'bold', paddingRight: '15px' }}>
+                                <OrderItemStatus deleteSign={this.state.deleteSign} />
                             </div>
                         }
                     >
@@ -579,7 +581,7 @@ class FollowUpDetails extends Component{
                                             <EnterpriseNameChange
                                                 type='journal'
                                                 style={{ marginLeft: 10 }}
-                                                enterpriseId={this.state.orderUid}/>
+                                                enterpriseId={this.state.orderUid} />
                                         </FormItem>
                                         <FormItem
                                             className="half-item"
@@ -600,9 +602,9 @@ class FollowUpDetails extends Component{
                                             {...formItemLayout}
                                             label="结算状态"
                                         >
-                                          <span>
-                                            {getLiquidationStatus(this.state.liquidationStatus)}
-                                          </span>
+                                            <span>
+                                                {getLiquidationStatus(this.state.liquidationStatus)}
+                                            </span>
                                         </FormItem>
                                         <FormItem
                                             className="half-item"
@@ -689,8 +691,8 @@ class FollowUpDetails extends Component{
                                                 wrapperCol={{ span: 18 }}
                                                 label={"合同扫描件"}
                                             >
-                                                <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-                                                    {this.props.visible && this.state.orgCodeUrl ? <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'}/> : <div/>}
+                                                <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+                                                    {this.props.visible && this.state.orgCodeUrl ? <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'} /> : <div />}
                                                 </div>
                                                 <Button
                                                     style={{
@@ -708,16 +710,16 @@ class FollowUpDetails extends Component{
                                                 wrapperCol={{ span: 18 }}
                                                 label="补充协议"
                                             >
-                                                <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-                                                    {this.props.visible && this.state.replenishUrl ? <ImgList domId={'inquiry1'} fileList={this.state.replenishUrl} ItemWidth={'96px'}/> : <div/>}
+                                                <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+                                                    {this.props.visible && this.state.replenishUrl ? <ImgList domId={'inquiry1'} fileList={this.state.replenishUrl} ItemWidth={'96px'} /> : <div />}
                                                 </div>
                                             </FormItem>
                                         </div>
                                         <ContentUrl
-                                        processStatus={1}
-                                        domId = {"followContent"}
-                                        contentUrl = {this.state.contentUrl}
-                                        imgId = {"followContentImg"}
+                                            processStatus={1}
+                                            domId={"followContent"}
+                                            contentUrl={this.state.contentUrl}
+                                            imgId={"followContentImg"}
                                         />
                                         <div className="clearfix">
                                             <FormItem
@@ -788,11 +790,11 @@ class FollowUpDetails extends Component{
                                             </FormItem>
                                         </div>
                                         {/* 协作人员 */}
-                                        <OrderCoor orderNo={this.props.orderNo}/>
+                                        <OrderCoor orderNo={this.props.orderNo} />
                                         <div>
-                                          <span style={{ marginLeft: "50px", fontSize: "20px" }}>
-                                            项目业务
-                                          </span>
+                                            <span style={{ marginLeft: "50px", fontSize: "20px" }}>
+                                                项目业务
+                                            </span>
                                         </div>
                                         <div className="patent-table">
                                             <Spin spinning={this.state.orderTaskLoading}>
@@ -807,18 +809,18 @@ class FollowUpDetails extends Component{
                                             </Spin>
                                         </div>
                                         <div>
-                                          <span style={{ marginLeft: "50px", fontSize: "20px" }}>
-                                            催款节点
-                                          </span>
-                                          <span
-                                            style={{
-                                                display: this.state.contactList.length ? "none" : "inline-block",
-                                                marginLeft: 10,
-                                                color: "red",
-                                            }}
-                                          >
-                                            金额总计(万元): {this.state.totalCui}
-                                          </span>
+                                            <span style={{ marginLeft: "50px", fontSize: "20px" }}>
+                                                催款节点
+                                            </span>
+                                            <span
+                                                style={{
+                                                    display: this.state.contactList.length ? "none" : "inline-block",
+                                                    marginLeft: 10,
+                                                    color: "red",
+                                                }}
+                                            >
+                                                金额总计(万元): {this.state.totalCui}
+                                            </span>
                                         </div>
                                         <div className="clearfix">
                                             <Spin spinning={this.state.newOrderDunLoading}>

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

@@ -383,7 +383,9 @@ const Order = Form.create()(
             render: (text, record) => {
               if (record.dunTypeName) {
                 if (record.appropriationRatio) {
-                  return <span>{record.appropriationRatio}(拨款比例)</span>;
+                  let percent = Number(record.appropriationRatio * 100);
+                  percent += "%";
+                  return <span>{percent}(拨款比例)</span>;
                 } else {
                   return <span>{text}</span>;
                 }

+ 3 - 1
js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx

@@ -815,7 +815,9 @@ const approvedOutsourcing = React.createClass({
           render: (text, record) => {
             if (record.dunTypeName) {
               if (record.appropriationRatio) {
-                return <span>{record.appropriationRatio}(拨款比例)</span>;
+                let percent = Number(record.appropriationRatio * 100);
+                percent += "%";
+                return <span>{percent}(拨款比例)</span>;
               } else {
                 return <span>{text}</span>;
               }

+ 3 - 1
js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx

@@ -526,7 +526,9 @@ const approvedOutsourcing = React.createClass({
           render: (text, record) => {
             if (record.dunTypeName) {
               if (record.appropriationRatio) {
-                return <span>{record.appropriationRatio}(拨款比例)</span>;
+                let percent = Number(record.appropriationRatio * 100);
+                percent += "%";
+                return <span>{percent}(拨款比例)</span>;
               } else {
                 return <span>{text}</span>;
               }

+ 5 - 0
js/component/manageCenter/financialManage/distribute/projectvip.jsx

@@ -47,6 +47,7 @@ const ProjectVip = React.createClass({
           title: "销售类型",
           dataIndex: "salesType",
           key: "salesType",
+          className: "title-table",
           render: (text, record) => {
             return (
               <Tooltip
@@ -63,6 +64,7 @@ const ProjectVip = React.createClass({
           title: "合同编号",
           dataIndex: "contractNo",
           key: "contractNo",
+          className: "title-table",
           width: 160,
           render: (text, record) => {
             return (
@@ -102,6 +104,7 @@ const ProjectVip = React.createClass({
           title: "客户名称",
           dataIndex: "userName",
           key: "userName",
+          className: "title-table",
           width: 200,
           render: text => {
             return (
@@ -115,6 +118,7 @@ const ProjectVip = React.createClass({
           title: "订单编号",
           dataIndex: "orderNo",
           key: "orderNo",
+          className: "title-table",
           width: 140,
           render: (text, record) => {
             return (
@@ -203,6 +207,7 @@ const ProjectVip = React.createClass({
           title: "操作",
           dataIndex: "caozuo",
           key: "caouzo",
+          className: "title-table",
           width: 216,
           render: (text, recard) => {
             return (

+ 4 - 0
js/component/manageCenter/financialManage/distribute/projectvipall.jsx

@@ -46,6 +46,7 @@ const ProjectVipAll = React.createClass({
           title: "销售类型",
           dataIndex: "salesType",
           key: "salesType",
+          className: "title-table",
           render: (text, record) => {
             return (
               <Tooltip
@@ -62,6 +63,7 @@ const ProjectVipAll = React.createClass({
           title: "合同编号",
           dataIndex: "contractNo",
           key: "contractNo",
+          className: "title-table",
           width: 160,
           render: (text, record) => {
             return (
@@ -101,6 +103,7 @@ const ProjectVipAll = React.createClass({
           title: "客户名称",
           dataIndex: "userName",
           key: "userName",
+          className: "title-table",
           width: 200,
           render: text => {
             return (
@@ -114,6 +117,7 @@ const ProjectVipAll = React.createClass({
           title: "订单编号",
           dataIndex: "orderNo",
           key: "orderNo",
+          className: "title-table",
           width: 140,
           render: (text, record) => {
             return (

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

@@ -1014,6 +1014,7 @@ const ShouKuang = React.createClass({
           title: "销售类型",
           dataIndex: "salesType",
           key: "salesType",
+          className: "title-table",
           fixed: "left",
           render: (text, record) => {
             return (
@@ -1096,7 +1097,7 @@ const ShouKuang = React.createClass({
           title: "订单编号",
           dataIndex: "orderNo",
           key: "orderNo",
-          // className: "title-table",
+          className: "title-table",
           fixed: "left",
           width: 140,
           render: (text, record) => {

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

@@ -1025,6 +1025,7 @@ const ShouKuang = React.createClass({
           title: "销售类型",
           dataIndex: "salesType",
           key: "salesType",
+          className: "title-table",
           fixed: "left",
           render: (text, record) => {
             return (
@@ -1042,7 +1043,7 @@ const ShouKuang = React.createClass({
           title: "合同编号",
           dataIndex: "contractNo",
           key: "contractNo",
-          // className: "title-table",
+          className: "title-table",
           fixed: "left",
           render: (text, record) => {
             return (
@@ -1082,7 +1083,7 @@ const ShouKuang = React.createClass({
           title: "客户名称",
           dataIndex: "buyerName",
           key: "buyerName",
-          // className: "title-table",
+          className: "title-table",
           fixed: "left",
           width: 150,
           render: text => {
@@ -1102,7 +1103,7 @@ const ShouKuang = React.createClass({
           title: "订单编号",
           dataIndex: "orderNo",
           key: "orderNo",
-          // className: "title-table",
+          className: "title-table",
           fixed: "left",
           width: 140,
           render: (text, record) => {

+ 30 - 287
js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx

@@ -258,7 +258,9 @@ const OrderDetail = Form.create()(
             render: (text, record) => {
               if (record.dunTypeName) {
                 if (record.appropriationRatio) {
-                  return <span>{record.appropriationRatio}(拨款比例)</span>;
+                  let percent = Number(record.appropriationRatio * 100);
+                  percent += "%";
+                  return <span>{percent}(拨款比例)</span>;
                 } else {
                   return <span>{text}</span>;
                 }
@@ -420,36 +422,6 @@ const OrderDetail = Form.create()(
         }.bind(this)
       );
     },
-    jdDate(record) {
-      $.ajax({
-        method: "get",
-        dataType: "json",
-        crossDomain: false,
-        url: globalConfig.context + "/api/admin/newOrder/selectOrderDun",
-        data: {
-          orderNo: record ? record.orderNo : this.props.data.orderNo,
-        },
-        success: function (data) {
-          let thisData = data.data;
-          if (!thisData.length) {
-            if (data.error && data.error.length) {
-              message.warning(data.error[0].message);
-            }
-            thisData = {};
-          } else {
-            this.setState({
-              jsDate: thisData,
-            });
-          }
-        }.bind(this),
-      }).always(
-        function () {
-          this.setState({
-            loading: false,
-          });
-        }.bind(this)
-      );
-    },
 
     rizhi() {
       this.setState({
@@ -517,7 +489,6 @@ const OrderDetail = Form.create()(
         })
         this.loadData();
         this.loadXmu();
-        this.jdDate();
         this.jiedian(this.props.data.orderNo);
         this.jiedianNew(this.props.data.orderNo);
       } else {
@@ -534,7 +505,6 @@ const OrderDetail = Form.create()(
           })
           this.loadData(nextProps.data);
           this.loadXmu(nextProps.data);
-          this.jdDate(nextProps.data);
           this.jiedian(nextProps.data.orderNo);
           this.jiedianNew(nextProps.data.orderNo);
         } else {
@@ -734,7 +704,6 @@ const OrderDetail = Form.create()(
         labelCol: { span: 10 },
         wrapperCol: { span: 12 },
       };
-      const jsDate = this.state.jsDate || [];
       const cuiDataList = this.state.contactList || [];
       return (
         <div className="login">
@@ -762,9 +731,9 @@ const OrderDetail = Form.create()(
                 <FormItem
                   className="half-item"
                   {...formItemLayout}
-                  label="签单时间"
+                  label="合同编号"
                 >
-                  <span>{theData.signDate}</span>
+                  <span>{theData.contractNo}</span>
                 </FormItem>
                 <FormItem
                   className="half-item"
@@ -799,6 +768,13 @@ const OrderDetail = Form.create()(
                 <FormItem
                   className="half-item"
                   {...formItemLayout}
+                  label="签单时间"
+                >
+                  <span>{theData.signDate}</span>
+                </FormItem>
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
                   label="流程状态"
                 >
                   <span>{getProcessStatus(theData.processStatus)}</span>
@@ -861,6 +837,24 @@ const OrderDetail = Form.create()(
                     <span>{this.props.data.refundAmount}</span>
                   </FormItem>
                 )}
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="订单部门"
+                >
+                  <span>{theData.depName}</span>
+                </FormItem>
+              </div>
+              <div className="clearfix">
+                <FormItem
+                  labelCol={{ span: 5 }}
+                  wrapperCol={{ span: 18 }}
+                  label="订单留言"
+                >
+                  <p style={{ maxWidth: 500, wordWrap: "break-word" }}>
+                    {this.state.orderRemarks}
+                  </p>
+                </FormItem>
               </div>
               <div className="clearfix">
                 <FormItem
@@ -868,17 +862,6 @@ const OrderDetail = Form.create()(
                   wrapperCol={{ span: 18 }}
                   label="合同扫描件"
                 >
-                  {/*<Upload*/}
-                  {/*  className="demandDetailShow-upload"*/}
-                  {/*  listType="picture-card"*/}
-                  {/*  fileList={this.state.orgCodeUrl}*/}
-                  {/*  onPreview={(file) => {*/}
-                  {/*    this.setState({*/}
-                  {/*      previewImage: file.url || file.thumbUrl,*/}
-                  {/*      previewVisible: true,*/}
-                  {/*    });*/}
-                  {/*  }}*/}
-                  {/*/>*/}
                   <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
                     {this.state.orgCodeUrl ? <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'} /> : <div />}
                   </div>
@@ -891,90 +874,6 @@ const OrderDetail = Form.create()(
                       this.setState({ previewVisible: false, rotateDeg: 0 });
                     }}
                   >
-                    {/* <div
-                      onClick={this.upImg}
-                      className="up-btn"
-                      style={{
-                        cursor: "pointer",
-                        transition: "all .5s",
-                        opacity: ".2",
-                        width: "41px",
-                        height: "69px",
-                        backgroundColor: "rgba(0,0,0,.5)",
-                        position: "absolute",
-                        top: "50%",
-                        left: 16,
-                        transform: "translateY(-50%)",
-                        zIndex: 1
-                      }}
-                    >
-                      <span
-                        style={{
-                          position: "absolute",
-                          border: "1px solid #fff",
-                          width: "20px",
-                          height: "20px",
-                          left: "60%",
-                          top: "50%",
-                          transform: "translate(-50%, -50%) rotate(45deg)",
-                          borderTop: "none",
-                          borderRight: "none"
-                        }}
-                      ></span>
-                    </div>
-                    <div
-                      onClick={this.rotate}
-                      style={{
-                        textAlign: "center",
-                        lineHeight: "30px",
-                        color: "#000",
-                        cursor: "pointer",
-                        transition: "all .5s",
-                        width: "50px",
-                        height: "30px",
-                        backgroundColor: "white",
-                        position: "absolute",
-                        bottom: "-30",
-                        left: "50%",
-                        transform: "translateX(-50%)",
-                        zIndex: 1,
-                        borderRadius: "5px",
-                        border: "1px solid #ccc"
-                      }}
-                    >
-                      旋转
-                    </div>
-                    <div
-                      onClick={this.downImg}
-                      className="up-btn"
-                      style={{
-                        cursor: "pointer",
-                        transition: "all .5s",
-                        opacity: ".2",
-                        width: "41px",
-                        height: "69px",
-                        backgroundColor: "rgba(0,0,0,.5)",
-                        position: "absolute",
-                        top: "50%",
-                        right: 16,
-                        transform: "translateY(-50%)",
-                        zIndex: 1
-                      }}
-                    >
-                      <span
-                        style={{
-                          position: "absolute",
-                          border: "1px solid #fff",
-                          width: "20px",
-                          height: "20px",
-                          left: "40%",
-                          top: "50%",
-                          transform: "translate(-50%, -50%) rotate(225deg)",
-                          borderTop: "none",
-                          borderRight: "none"
-                        }}
-                      ></span>
-                    </div> */}
                     <img
                       alt=""
                       style={{
@@ -1032,17 +931,6 @@ const OrderDetail = Form.create()(
                   wrapperCol={{ span: 18 }}
                   label="补充协议"
                 >
-                  {/*<Upload*/}
-                  {/*  className="demandDetailShow-upload"*/}
-                  {/*  listType="picture-card"*/}
-                  {/*  fileList={this.state.replenishUrl}*/}
-                  {/*  onPreview={(file) => {*/}
-                  {/*    this.setState({*/}
-                  {/*      previewImage: file.url || file.thumbUrl,*/}
-                  {/*      previewVisibles: true,*/}
-                  {/*    });*/}
-                  {/*  }}*/}
-                  {/*/>*/}
                   <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
                     {this.state.replenishUrl ? <ImgList domId={'orderDetail1'} fileList={this.state.replenishUrl} /> : <div />}
                   </div>
@@ -1055,90 +943,6 @@ const OrderDetail = Form.create()(
                       this.setState({ previewVisibles: false, rotateDeg: 0 });
                     }}
                   >
-                    {/* <div
-                      onClick={this.upImg}
-                      className="up-btn"
-                      style={{
-                        cursor: "pointer",
-                        transition: "all .5s",
-                        opacity: ".2",
-                        width: "41px",
-                        height: "69px",
-                        backgroundColor: "rgba(0,0,0,.5)",
-                        position: "absolute",
-                        top: "50%",
-                        left: 16,
-                        transform: "translateY(-50%)",
-                        zIndex: 1
-                      }}
-                    >
-                      <span
-                        style={{
-                          position: "absolute",
-                          border: "1px solid #fff",
-                          width: "20px",
-                          height: "20px",
-                          left: "60%",
-                          top: "50%",
-                          transform: "translate(-50%, -50%) rotate(45deg)",
-                          borderTop: "none",
-                          borderRight: "none"
-                        }}
-                      ></span>
-                    </div>
-                    <div
-                      onClick={this.rotate}
-                      style={{
-                        textAlign: "center",
-                        lineHeight: "30px",
-                        color: "#000",
-                        cursor: "pointer",
-                        transition: "all .5s",
-                        width: "50px",
-                        height: "30px",
-                        backgroundColor: "white",
-                        position: "absolute",
-                        bottom: "-30",
-                        left: "50%",
-                        transform: "translateX(-50%)",
-                        zIndex: 1,
-                        borderRadius: "5px",
-                        border: "1px solid #ccc"
-                      }}
-                    >
-                      旋转
-                    </div>
-                    <div
-                      onClick={this.downImg}
-                      className="up-btn"
-                      style={{
-                        cursor: "pointer",
-                        transition: "all .5s",
-                        opacity: ".2",
-                        width: "41px",
-                        height: "69px",
-                        backgroundColor: "rgba(0,0,0,.5)",
-                        position: "absolute",
-                        top: "50%",
-                        right: 16,
-                        transform: "translateY(-50%)",
-                        zIndex: 1
-                      }}
-                    >
-                      <span
-                        style={{
-                          position: "absolute",
-                          border: "1px solid #fff",
-                          width: "20px",
-                          height: "20px",
-                          left: "40%",
-                          top: "50%",
-                          transform: "translate(-50%, -50%) rotate(225deg)",
-                          borderTop: "none",
-                          borderRight: "none"
-                        }}
-                      ></span>
-                    </div> */}
                     <img
                       alt=""
                       style={{
@@ -1194,48 +998,6 @@ const OrderDetail = Form.create()(
                 <FormItem
                   className="half-item"
                   {...formItemLayout}
-                  label="合同编号"
-                >
-                  <span>{theData.contractNo}</span>
-                </FormItem>
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="订单部门"
-                >
-                  <span>{theData.depName}</span>
-                </FormItem>
-              </div>
-              <div className="clearfix">
-                <FormItem
-                  labelCol={{ span: 5 }}
-                  wrapperCol={{ span: 18 }}
-                  label="订单留言"
-                >
-                  <p style={{ maxWidth: 500, wordWrap: "break-word" }}>
-                    {this.state.orderRemarks}
-                  </p>
-                </FormItem>
-              </div>
-              {/* <div className="clearfix">
-                <FormItem
-                  labelCol={{ span: 5 }}
-                  wrapperCol={{ span: 18 }}
-                  label="收款节点"
-                >
-                  {jsDate.map(item => {
-                    return (
-                      <p>
-                        {getjiedian(item.dunSubject)} -- {item.money} 万元
-                      </p>
-                    );
-                  })}
-                </FormItem>
-              </div> */}
-              <div className="clearfix">
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
                   label="订单负责人"
                 >
                   <span>{theData.salesmanName}</span>
@@ -1294,25 +1056,6 @@ const OrderDetail = Form.create()(
                   <span>{theData.financeMobile}</span>
                 </FormItem>
               </div>
-              {/* <Modal
-                  visible={this.state.avisible}
-                  className="admin-desc-content"
-                  width="800px"
-                  maskClosable={false}
-                  title="订单日志"
-                  footer={null}
-                  onCancel={this.closeOrderLog}
-                >
-                  <div className="patent-table">
-                    <Spin spinning={this.state.loading}>
-                      <Table
-                        columns={this.state.columnsX}
-                        dataSource={this.state.dataSourceX}
-                        pagination={false}
-                      />
-                    </Spin>
-                  </div>
-                </Modal> */}
               <OrderRiZi
                 dataSourcerizhi={this.state.dataSourceX}
                 closeOrderLog={this.closeOrderLog}

+ 150 - 79
js/component/manageCenter/order/orderNew/addService.jsx

@@ -754,7 +754,9 @@ const NewService = Form.create()(
             render: (text, record) => {
               if (record.dunTypeName) {
                 if (record.appropriationRatio) {
-                  return <span>{record.appropriationRatio}(拨款比例)</span>;
+                  let percent = Number(record.appropriationRatio * 100);
+                  percent += "%";
+                  return <span>{percent}(拨款比例)</span>;
                 } else {
                   if (this.props.isZxs) {
                     return <span>***</span>;
@@ -1181,61 +1183,95 @@ const NewService = Form.create()(
             render: (text, record) => {
               if (record.dunTypeName) {
                 if (record.appropriationRatio) {
-                  return <span>{record.appropriationRatio}(拨款比例)</span>;
+                  let percent = Number(record.appropriationRatio * 100);
+                  percent += "%";
+                  return <span>{percent}(拨款比例)</span>;
                 } else {
                   return <span>{text}</span>;
                 }
               }
-              if (this.state.boFlag) {
-                return (
-                  <div>
-                    <div style={{ width: 70, float: "left", marginRight: 5 }}>
-                      <Select
-                        placeholder="选择"
-                        defaultValue={"金额"}
-                        onChange={(e) => {
-                          record.boStatus = e;
-                        }}
-                      >
-                        <Select.Option key={true}>比例</Select.Option>
-                        <Select.Option key={false}>金额</Select.Option>
-                      </Select>
-                    </div>
-                    <div style={{ float: "right" }}>
-                      <Input
-                        type="number"
-                        value={record.money}
-                        key={record.id}
-                        required="required"
-                        onChange={(e) => {
-                          record.money = e.target.value;
-                          this.setState({
-                            contactList: this.state.contactList,
-                          });
-                        }}
-                        style={{ width: "120px" }}
-                      />
-                    </div>
+              return (
+                <div>
+                  <div style={{ width: 70, float: "left", marginRight: 5 }}>
+                    <Select
+                      placeholder="选择"
+                      defaultValue={"金额"}
+                      onChange={(e) => {
+                        record.boStatus = e;
+                      }}
+                    >
+                      <Select.Option key={true}>比例</Select.Option>
+                      <Select.Option key={false}>金额</Select.Option>
+                    </Select>
                   </div>
-                );
-              } else {
-                return (
-                  <div>
+                  <div style={{ float: "right" }}>
                     <Input
                       type="number"
                       value={record.money}
-                      placeholder="请输入金额(必填项)"
                       key={record.id}
                       required="required"
                       onChange={(e) => {
                         record.money = e.target.value;
-                        this.setState({ contactList: this.state.contactList });
+                        this.setState({
+                          contactList: this.state.contactList,
+                        });
                       }}
                       style={{ width: "120px" }}
                     />
                   </div>
-                );
-              }
+                </div>
+              )
+
+              // if (this.state.boFlag) {
+              //   return (
+              //     <div>
+              //       <div style={{ width: 70, float: "left", marginRight: 5 }}>
+              //         <Select
+              //           placeholder="选择"
+              //           defaultValue={"金额"}
+              //           onChange={(e) => {
+              //             record.boStatus = e;
+              //           }}
+              //         >
+              //           <Select.Option key={true}>比例</Select.Option>
+              //           <Select.Option key={false}>金额</Select.Option>
+              //         </Select>
+              //       </div>
+              //       <div style={{ float: "right" }}>
+              //         <Input
+              //           type="number"
+              //           value={record.money}
+              //           key={record.id}
+              //           required="required"
+              //           onChange={(e) => {
+              //             record.money = e.target.value;
+              //             this.setState({
+              //               contactList: this.state.contactList,
+              //             });
+              //           }}
+              //           style={{ width: "120px" }}
+              //         />
+              //       </div>
+              //     </div>
+              //   );
+              // } else {
+              //   return (
+              //     <div>
+              //       <Input
+              //         type="number"
+              //         value={record.money}
+              //         placeholder="请输入金额(必填项)"
+              //         key={record.id}
+              //         required="required"
+              //         onChange={(e) => {
+              //           record.money = e.target.value;
+              //           this.setState({ contactList: this.state.contactList });
+              //         }}
+              //         style={{ width: "120px" }}
+              //       />
+              //     </div>
+              //   );
+              // }
             },
           },
           {
@@ -1617,61 +1653,96 @@ const NewService = Form.create()(
             render: (text, record) => {
               if (record.dunTypeName) {
                 if (record.appropriationRatio) {
-                  return <span>{record.appropriationRatio}(拨款比例)</span>;
+                  let percent = Number(record.appropriationRatio * 100);
+                  percent += "%";
+                  return <span>{percent}(拨款比例)</span>;
                 } else {
                   return <span>{text}</span>;
                 }
               }
-              if (this.state.boFlag) {
-                return (
-                  <div>
-                    <div style={{ width: 70, float: "left", marginRight: 5 }}>
-                      <Select
-                        placeholder="选择"
-                        defaultValue={"金额"}
-                        onChange={(e) => {
-                          record.boStatus = e;
-                        }}
-                      >
-                        <Select.Option key={true}>比例</Select.Option>
-                        <Select.Option key={false}>金额</Select.Option>
-                      </Select>
-                    </div>
-                    <div style={{ float: "right" }}>
-                      <Input
-                        type="number"
-                        value={record.money}
-                        key={record.id}
-                        required="required"
-                        onChange={(e) => {
-                          record.money = e.target.value;
-                          this.setState({
-                            contactList: this.state.contactList,
-                          });
-                        }}
-                        style={{ width: "120px" }}
-                      />
-                    </div>
+
+              return (
+                <div>
+                  <div style={{ width: 70, float: "left", marginRight: 5 }}>
+                    <Select
+                      placeholder="选择"
+                      defaultValue={"金额"}
+                      onChange={(e) => {
+                        record.boStatus = e;
+                      }}
+                    >
+                      <Select.Option key={true}>比例</Select.Option>
+                      <Select.Option key={false}>金额</Select.Option>
+                    </Select>
                   </div>
-                );
-              } else {
-                return (
-                  <div>
+                  <div style={{ float: "right" }}>
                     <Input
                       type="number"
                       value={record.money}
-                      placeholder="请输入金额(必填项)"
                       key={record.id}
                       required="required"
                       onChange={(e) => {
                         record.money = e.target.value;
-                        this.setState({ contactList: this.state.contactList });
+                        this.setState({
+                          contactList: this.state.contactList,
+                        });
                       }}
                       style={{ width: "120px" }}
                     />
                   </div>
-                );
-              }
+                </div>
+              );
+
+              // if (this.state.boFlag) {
+              //   return (
+              //     <div>
+              //       <div style={{ width: 70, float: "left", marginRight: 5 }}>
+              //         <Select
+              //           placeholder="选择"
+              //           defaultValue={"金额"}
+              //           onChange={(e) => {
+              //             record.boStatus = e;
+              //           }}
+              //         >
+              //           <Select.Option key={true}>比例</Select.Option>
+              //           <Select.Option key={false}>金额</Select.Option>
+              //         </Select>
+              //       </div>
+              //       <div style={{ float: "right" }}>
+              //         <Input
+              //           type="number"
+              //           value={record.money}
+              //           key={record.id}
+              //           required="required"
+              //           onChange={(e) => {
+              //             record.money = e.target.value;
+              //             this.setState({
+              //               contactList: this.state.contactList,
+              //             });
+              //           }}
+              //           style={{ width: "120px" }}
+              //         />
+              //       </div>
+              //     </div>
+              //   );
+              // } else {
+              //   return (
+              //     <div>
+              //       <Input
+              //         type="number"
+              //         value={record.money}
+              //         placeholder="请输入金额(必填项)"
+              //         key={record.id}
+              //         required="required"
+              //         onChange={(e) => {
+              //           record.money = e.target.value;
+              //           this.setState({ contactList: this.state.contactList });
+              //         }}
+              //         style={{ width: "120px" }}
+              //       />
+              //     </div>
+              //   );
+              // }
             },
           },
           {

+ 72 - 38
js/component/manageCenter/order/orderNew/addorders.js

@@ -630,59 +630,93 @@ const Addorders = Form.create()(
             render: (text, record) => {
               if (record.dunTypeName) {
                 if (record.appropriationRatio) {
-                  return <span>{record.appropriationRatio}(拨款比例)</span>;
+                  let percent = Number(record.appropriationRatio * 100);
+                  percent += "%";
+                  return <span>{percent}(拨款比例)</span>;
                 } else {
                   return <span>{text}</span>;
                 }
               }
-              if (this.state.boFlag) {
-                return (
-                  <div>
-                    <div style={{ width: 70, float: "left", marginRight: 5 }}>
-                      <Select
-                        placeholder="选择"
-                        defaultValue={"金额"}
-                        onChange={(e) => {
-                          record.boStatus = e;
-                        }}
-                      >
-                        <Select.Option key={true}>比例</Select.Option>
-                        <Select.Option key={false}>金额</Select.Option>
-                      </Select>
-                    </div>
-                    <div style={{ float: "right" }}>
-                      <Input
-                        value={record.money}
-                        key={record.id}
-                        required="required"
-                        onChange={(e) => {
-                          record.money = e.target.value;
-                          this.setState({
-                            contactList: this.state.contactList,
-                          });
-                        }}
-                        style={{ width: "120px" }}
-                      />
-                    </div>
+
+              return (
+                <div>
+                  <div style={{ width: 70, float: "left", marginRight: 5 }}>
+                    <Select
+                      placeholder="选择"
+                      defaultValue={"金额"}
+                      onChange={(e) => {
+                        record.boStatus = e;
+                      }}
+                    >
+                      <Select.Option key={true}>比例</Select.Option>
+                      <Select.Option key={false}>金额</Select.Option>
+                    </Select>
                   </div>
-                );
-              } else {
-                return (
-                  <div>
+                  <div style={{ float: "right" }}>
                     <Input
                       value={record.money}
-                      placeholder="请输入金额(必填项)"
                       key={record.id}
                       required="required"
                       onChange={(e) => {
                         record.money = e.target.value;
-                        this.setState({ contactList: this.state.contactList });
+                        this.setState({
+                          contactList: this.state.contactList,
+                        });
                       }}
                       style={{ width: "120px" }}
                     />
                   </div>
-                );
-              }
+                </div>
+              );
+
+              // if (this.state.boFlag) {
+              //   return (
+              //     <div>
+              //       <div style={{ width: 70, float: "left", marginRight: 5 }}>
+              //         <Select
+              //           placeholder="选择"
+              //           defaultValue={"金额"}
+              //           onChange={(e) => {
+              //             record.boStatus = e;
+              //           }}
+              //         >
+              //           <Select.Option key={true}>比例</Select.Option>
+              //           <Select.Option key={false}>金额</Select.Option>
+              //         </Select>
+              //       </div>
+              //       <div style={{ float: "right" }}>
+              //         <Input
+              //           value={record.money}
+              //           key={record.id}
+              //           required="required"
+              //           onChange={(e) => {
+              //             record.money = e.target.value;
+              //             this.setState({
+              //               contactList: this.state.contactList,
+              //             });
+              //           }}
+              //           style={{ width: "120px" }}
+              //         />
+              //       </div>
+              //     </div>
+              //   );
+              // } else {
+              //   return (
+              //     <div>
+              //       <Input
+              //         value={record.money}
+              //         placeholder="请输入金额(必填项)"
+              //         key={record.id}
+              //         required="required"
+              //         onChange={(e) => {
+              //           record.money = e.target.value;
+              //           this.setState({ contactList: this.state.contactList });
+              //         }}
+              //         style={{ width: "120px" }}
+              //       />
+              //     </div>
+              //   );
+              // }
             },
           },
           {

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

@@ -492,7 +492,9 @@ const IntentionCustomer = Form.create()(
             render: (text, record) => {
               if (record.dunTypeName) {
                 if (record.appropriationRatio) {
-                  return <span>{record.appropriationRatio}(拨款比例)</span>;
+                  let percent = Number(record.appropriationRatio * 100);
+                  percent += "%";
+                  return <span>{percent}(拨款比例)</span>;
                 } else {
                   return <span>{text}</span>;
                 }

+ 74 - 39
js/component/manageCenter/order/orderNew/changeComponent/changeApply.js

@@ -355,61 +355,96 @@ class ChangeApply extends Component {
           render: (text, record) => {
             if (record.dunTypeName) {
               if (record.appropriationRatio) {
-                return <span>{record.appropriationRatio}(拨款比例)</span>;
+                let percent = Number(record.appropriationRatio * 100);
+                percent += "%";
+                return <span>{percent}(拨款比例)</span>;
               } else {
                 return <span>{text}</span>;
               }
             }
-            if (this.state.boFlag) {
-              return (
-                <div>
-                  <div style={{ width: 70, float: "left", marginRight: 5 }}>
-                    <Select
-                      placeholder="选择"
-                      defaultValue={"金额"}
-                      onChange={(e) => {
-                        record.boStatus = e;
-                      }}
-                    >
-                      <Select.Option key={true}>比例</Select.Option>
-                      <Select.Option key={false}>金额</Select.Option>
-                    </Select>
-                  </div>
-                  <div style={{ float: "right" }}>
-                    <Input
-                      type='number'
-                      value={record.money}
-                      key={record.id}
-                      required="required"
-                      onChange={(e) => {
-                        record.money = e.target.value;
-                        this.setState({
-                          contactList: this.state.contactList,
-                        });
-                      }}
-                      style={{ width: "120px" }}
-                    />
-                  </div>
+
+            return (
+              <div>
+                <div style={{ width: 70, float: "left", marginRight: 5 }}>
+                  <Select
+                    placeholder="选择"
+                    defaultValue={"金额"}
+                    onChange={(e) => {
+                      record.boStatus = e;
+                    }}
+                  >
+                    <Select.Option key={true}>比例</Select.Option>
+                    <Select.Option key={false}>金额</Select.Option>
+                  </Select>
                 </div>
-              );
-            } else {
-              return (
-                <div>
+                <div style={{ float: "right" }}>
                   <Input
                     type='number'
                     value={record.money}
-                    placeholder="请输入金额(必填项)"
                     key={record.id}
                     required="required"
                     onChange={(e) => {
                       record.money = e.target.value;
-                      this.setState({ contactList: this.state.contactList });
+                      this.setState({
+                        contactList: this.state.contactList,
+                      });
                     }}
                     style={{ width: "120px" }}
                   />
                 </div>
-              );
-            }
+              </div>
+            );
+
+            // if (this.state.boFlag) {
+            //   return (
+            //     <div>
+            //       <div style={{ width: 70, float: "left", marginRight: 5 }}>
+            //         <Select
+            //           placeholder="选择"
+            //           defaultValue={"金额"}
+            //           onChange={(e) => {
+            //             record.boStatus = e;
+            //           }}
+            //         >
+            //           <Select.Option key={true}>比例</Select.Option>
+            //           <Select.Option key={false}>金额</Select.Option>
+            //         </Select>
+            //       </div>
+            //       <div style={{ float: "right" }}>
+            //         <Input
+            //           type='number'
+            //           value={record.money}
+            //           key={record.id}
+            //           required="required"
+            //           onChange={(e) => {
+            //             record.money = e.target.value;
+            //             this.setState({
+            //               contactList: this.state.contactList,
+            //             });
+            //           }}
+            //           style={{ width: "120px" }}
+            //         />
+            //       </div>
+            //     </div>
+            //   );
+            // } else {
+            //   return (
+            //     <div>
+            //       <Input
+            //         type='number'
+            //         value={record.money}
+            //         placeholder="请输入金额(必填项)"
+            //         key={record.id}
+            //         required="required"
+            //         onChange={(e) => {
+            //           record.money = e.target.value;
+            //           this.setState({ contactList: this.state.contactList });
+            //         }}
+            //         style={{ width: "120px" }}
+            //       />
+            //     </div>
+            //   );
+            // }
           },
         },
         {

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

@@ -84,7 +84,9 @@ class OrderDetail extends Component {
           render: (text, record) => {
             if (record.dunTypeName) {
               if (record.appropriationRatio) {
-                return <span>{record.appropriationRatio}(拨款比例)</span>;
+                let percent = Number(record.appropriationRatio * 100);
+                percent += "%";
+                return <span>{percent}(拨款比例)</span>;
               } else {
                 return <span>{text}</span>;
               }

+ 3 - 1
js/component/manageCenter/order/orderNew/changeComponent/proAndCuiList.jsx

@@ -208,7 +208,9 @@ const ProAndCuiList = React.createClass({
           render: (text, record) => {
             if (record.dunTypeName) {
               if (record.appropriationRatio) {
-                return <span>{record.appropriationRatio}(拨款比例)</span>;
+                let percent = Number(record.appropriationRatio * 100);
+                percent += "%";
+                return <span>{percent}(拨款比例)</span>;
               } else {
                 if (this.props.isZxs) {
                   return <span>***</span>;

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

@@ -347,7 +347,9 @@ const IntentionCustomer = Form.create()(
             render: (text, record) => {
               if (record.dunTypeName) {
                 if (record.appropriationRatio) {
-                  return <span>{record.appropriationRatio}(拨款比例)</span>;
+                  let percent = Number(record.appropriationRatio * 100);
+                  percent += "%";
+                  return <span>{percent}(拨款比例)</span>;
                 } else {
                   return <span>{text}</span>;
                 }

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

@@ -362,7 +362,9 @@ const checkOutsourcing = Form.create()(
             render: (text, record) => {
               if (record.dunTypeName) {
                 if (record.appropriationRatio) {
-                  return <span>{record.appropriationRatio}(拨款比例)</span>;
+                  let percent = Number(record.appropriationRatio * 100);
+                  percent += "%";
+                  return <span>{percent}(拨款比例)</span>;
                 } else {
                   return <span>{text}</span>;
                 }

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

@@ -134,8 +134,7 @@ class contentUrl extends Component {
                   </Button>
                 </Modal>
               </div>
-              : "暂无附件!"}
-          {/* <div style={{color:"red"}}>(请将合同中的服务内容,截图上传!含服务年限,时间节点等)</div> */}
+              : ""}
         </div>
       </div>
     );

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

@@ -560,7 +560,9 @@ const IntentionCustomer = Form.create()(
             render: (text, record) => {
               if (record.dunTypeName) {
                 if (record.appropriationRatio) {
-                  return <span>{record.appropriationRatio}(拨款比例)</span>;
+                  let percent = Number(record.appropriationRatio * 100);
+                  percent += "%";
+                  return <span>{percent}(拨款比例)</span>;
                 } else {
                   return <span>{text}</span>;
                 }

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

@@ -394,7 +394,9 @@ const IntentionCustomer = Form.create()(
             render: (text, record) => {
               if (record.dunTypeName) {
                 if (record.appropriationRatio) {
-                  return <span>{record.appropriationRatio}(拨款比例)</span>;
+                  let percent = Number(record.appropriationRatio * 100);
+                  percent += "%";
+                  return <span>{percent}(拨款比例)</span>;
                 } else {
                   return <span>{text}</span>;
                 }

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

@@ -391,7 +391,9 @@ const outsourcingList = Form.create()(
             render: (text, record) => {
               if (record.dunTypeName) {
                 if (record.appropriationRatio) {
-                  return <span>{record.appropriationRatio}(拨款比例)</span>;
+                  let percent = Number(record.appropriationRatio * 100);
+                  percent += "%";
+                  return <span>{percent}(拨款比例)</span>;
                 } else {
                   return <span>{text}</span>;
                 }

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

@@ -469,7 +469,9 @@ const outsourcingPro = Form.create()(
             render: (text, record) => {
               if (record.dunTypeName) {
                 if (record.appropriationRatio) {
-                  return <span>{record.appropriationRatio}(拨款比例)</span>;
+                  let percent = Number(record.appropriationRatio * 100);
+                  percent += "%";
+                  return <span>{percent}(拨款比例)</span>;
                 } else {
                   return <span>{text}</span>;
                 }

+ 72 - 38
js/component/manageCenter/order/orderNew/reject.jsx

@@ -613,59 +613,93 @@ const IntentionCustomer = Form.create()(
             render: (text, record) => {
               if (record.dunTypeName) {
                 if (record.appropriationRatio) {
-                  return <span>{record.appropriationRatio}(拨款比例)</span>;
+                  let percent = Number(record.appropriationRatio * 100);
+                  percent += "%";
+                  return <span>{percent}(拨款比例)</span>;
                 } else {
                   return <span>{text}</span>;
                 }
               }
-              if (this.state.boFlag) {
-                return (
-                  <div>
-                    <div style={{ width: 70, float: "left", marginRight: 5 }}>
-                      <Select
-                        placeholder="选择"
-                        defaultValue={"金额"}
-                        onChange={(e) => {
-                          record.boStatus = e;
-                        }}
-                      >
-                        <Select.Option key={true}>比例</Select.Option>
-                        <Select.Option key={false}>金额</Select.Option>
-                      </Select>
-                    </div>
-                    <div style={{ float: "right" }}>
-                      <Input
-                        value={record.money}
-                        key={record.id}
-                        required="required"
-                        onChange={(e) => {
-                          record.money = e.target.value;
-                          this.setState({
-                            contactList: this.state.contactList,
-                          });
-                        }}
-                        style={{ width: "120px" }}
-                      />
-                    </div>
+
+              return (
+                <div>
+                  <div style={{ width: 70, float: "left", marginRight: 5 }}>
+                    <Select
+                      placeholder="选择"
+                      defaultValue={"金额"}
+                      onChange={(e) => {
+                        record.boStatus = e;
+                      }}
+                    >
+                      <Select.Option key={true}>比例</Select.Option>
+                      <Select.Option key={false}>金额</Select.Option>
+                    </Select>
                   </div>
-                );
-              } else {
-                return (
-                  <div>
+                  <div style={{ float: "right" }}>
                     <Input
                       value={record.money}
-                      placeholder="请输入金额(必填项)"
                       key={record.id}
                       required="required"
                       onChange={(e) => {
                         record.money = e.target.value;
-                        this.setState({ contactList: this.state.contactList });
+                        this.setState({
+                          contactList: this.state.contactList,
+                        });
                       }}
                       style={{ width: "120px" }}
                     />
                   </div>
-                );
-              }
+                </div>
+              );
+
+              // if (this.state.boFlag) {
+              //   return (
+              //     <div>
+              //       <div style={{ width: 70, float: "left", marginRight: 5 }}>
+              //         <Select
+              //           placeholder="选择"
+              //           defaultValue={"金额"}
+              //           onChange={(e) => {
+              //             record.boStatus = e;
+              //           }}
+              //         >
+              //           <Select.Option key={true}>比例</Select.Option>
+              //           <Select.Option key={false}>金额</Select.Option>
+              //         </Select>
+              //       </div>
+              //       <div style={{ float: "right" }}>
+              //         <Input
+              //           value={record.money}
+              //           key={record.id}
+              //           required="required"
+              //           onChange={(e) => {
+              //             record.money = e.target.value;
+              //             this.setState({
+              //               contactList: this.state.contactList,
+              //             });
+              //           }}
+              //           style={{ width: "120px" }}
+              //         />
+              //       </div>
+              //     </div>
+              //   );
+              // } else {
+              //   return (
+              //     <div>
+              //       <Input
+              //         value={record.money}
+              //         placeholder="请输入金额(必填项)"
+              //         key={record.id}
+              //         required="required"
+              //         onChange={(e) => {
+              //           record.money = e.target.value;
+              //           this.setState({ contactList: this.state.contactList });
+              //         }}
+              //         style={{ width: "120px" }}
+              //       />
+              //     </div>
+              //   );
+              // }
             },
           },
           {

+ 12 - 251
js/component/manageCenter/order/source/order.jsx

@@ -13,7 +13,8 @@ import {
 } from "antd";
 import $ from "jquery/src/ajax";
 import { ChooseList } from "../../../manageCenter/order/orderNew/chooseList";
-import OrderDetail from "../orderNew/changeComponent/orderDetail";
+// import OrderDetail from "../orderNew/changeComponent/orderDetail";
+import OrderDesc from "../../financialManage/orderDetail/orderDesc";
 import OrderRiZi from "@/orderRiZi.jsx";
 import { salesList } from "@/dataDic.js";
 import {
@@ -291,236 +292,20 @@ class OrderList extends Component {
       }.bind(this)
     );
   }
-  // 订单详情
-  xiangqing(orderNos) {
-    this.setState({
-      loading: true
-    })
-    $.ajax({
-      method: "get",
-      dataType: "json",
-      crossDomain: false,
-      url: globalConfig.context + "/api/admin/newOrder/getOrderNewDetail",
-      data: {
-        orderNo: orderNos
-      },
-      success: function (data) {
-        this.setState({
-          loading: false
-        })
-        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(
-            {
-              orderUid: thisdata.uid,
-              userName: thisdata.userName,
-              primaryOrderNo: thisdata.primaryOrder,
-              additionalOrder: thisdata.additionalOrder,
-              contractNo: thisdata.contractNo,
-              // arrears: thisdata.arrears,
-              orderData: thisdata,
-              isAddition: thisdata.additionalOrder ? true : false,
-            },
-            () => {
-              if (this.state.orderData.deleteSign !== 3) {
-                this.jiedianNew(this.state.orderNo);
-              }
-            }
-          );
-        }
-      }.bind(this)
-    }).always(
-      function () {
-        this.setState({
-          loading: false,
-        });
-      }.bind(this)
-    );
-  }
-  // 
-  createTabs(orderNos) {
-    $.ajax({
-      url: globalConfig.context + "/api/admin/orderChange/getOrderChange",
-      method: "get",
-      data: {
-        orderNo: orderNos
-      },
-      success: (data) => {
-        if (data.error && data.error.length) {
-          message.warning(data.error[0].message)
-        } else {
-          this.setState({
-            tabList: data.data
-          })
-        }
-      }
-    });
-  }
   // 整行点击
   tableRowClick(record) {
-    this.setState(
-      {
-        details: true,
-        orderNo: record.orderNo
-      },
-      () => {
-        this.xiangqing(record.orderNo)
-        this.createTabs(record.orderNo)
-        this.xiangmu(record.orderNo)
-      }
-    );
-  }
-  //
-  jiedianNew(orderNos) {
-    $.ajax({
-      method: "get",
-      dataType: "json",
-      crossDomain: false,
-      url:
-        globalConfig.context + "/api/admin/newOrderDun/selectListNewOrderDun",
-      data: {
-        orderNo: orderNos
-      },
-      success: function (data) {
-        if (data.error && data.error.length) {
-          message.warning(data.error[0].message);
-        } else {
-          let theArr = [];
-          let thisData = [];
-          let arr = data.data || [];
-          let totalCui = 0;
-          for (let i = 0; i < arr.length; i++) {
-            thisData = arr[i];
-            totalCui += +thisData.money;
-            theArr.push({
-              key: i,
-              dunSubject: thisData.dunSubject
-                ? thisData.dunSubject.toString()
-                : "", //催款科目
-              id: thisData.id, //节点Id
-              money: thisData.money, //催款金额
-              commodityName: thisData.commodityName,
-              projectType: thisData.projectType,
-              dunTypeName: thisData.dunTypeName,
-              status: thisData.status,
-              waitDay: thisData.waitDay,
-              effectiveCount: thisData.effectiveCount,
-              startDate: thisData.startDate,
-              dunType: thisData.dunType,
-              appropriationRatio: thisData.appropriationRatio,
-              customizeName: thisData.customizeName,
-              customizeTimes: thisData.customizeTimes,
-              tid: thisData.tid,
-            });
-          }
-          if (!totalCui) {
-            totalCui = 0;
-          }
-          totalCui = (Math.round(totalCui * 1000000) / 1000000).toFixed(6);
-          this.setState({
-            contactListNew: theArr,
-            totalCui
-          });
-        }
-      }.bind(this)
-    }).always(
-      function () {
-        this.setState({
-          loading: false
-        });
-      }.bind(this)
-    );
+    this.state.orderData = record;
+    this.setState({
+      details: true,
+    });
   }
-  // 
+  // 详情弹窗
   closeDesc() {
     this.setState({
       details: false
     })
     this.loadData(this.state.pageNo);
   }
-  //查看订单日志
-  getOrderLog() {
-    this.setState({
-      rizhivisible: true,
-    });
-    this.rizhi();
-  }
-  // 
-  closeOrderLog() {
-    this.setState({
-      rizhivisible: false
-    });
-  }
-  // 日志
-  rizhi() {
-    $.ajax({
-      method: "get",
-      dataType: "json",
-      crossDomain: false,
-      url: "/api/admin/newOrder/selectOrderLog",
-      data: {
-        orderNo: this.state.orderNo,
-      },
-      success: function (data) {
-        let theArr = [];
-        let thisData = data.data;
-        if (!thisData.length) {
-          if (data.error && data.error.length) {
-            message.warning(data.error[0].message);
-          }
-          thisData = {};
-        } else {
-          for (let i = 0; i < data.data.length; i++) {
-            let thisdata = data.data[i];
-            theArr.push({
-              processName: thisdata.processName,
-              adminName: thisdata.adminName,
-              createDate: thisdata.createDate,
-              remarks: thisdata.remarks
-            });
-          }
-        }
-        this.setState({
-          dataSourcerizhi: theArr
-        });
-      }.bind(this)
-    });
-  }
-  // 项目列表
-  xiangmu(orderNos) {
-    $.ajax({
-      method: "get",
-      dataType: "json",
-      crossDomain: false,
-      url: globalConfig.context + "/api/admin/newOrder/getOrderTask",
-      data: {
-        orderNo: orderNos
-      },
-      success: function (data) {
-        let theArr = [];
-
-        if (data.error.length || data.data.list == "") {
-          if (data.error && data.error.length) {
-            message.warning(data.error[0].message);
-          }
-        } else {
-          for (let i = 0; i < data.data.length; i++) {
-            let thisdata = data.data[i];
-            thisdata.key = i;
-            thisdata.sort = thisdata.cSort;
-            theArr.push(thisdata);
-          }
-        }
-        this.setState({
-          dataSourceX: theArr
-        });
-      }.bind(this)
-    });
-  }
 
   componentWillMount() {
     this.loadData();
@@ -667,35 +452,11 @@ class OrderList extends Component {
             />
           </Spin>
         </div>
-        {
-          details &&
-          <Modal
-            footer={null}
-            width="900px"
-            title="订单详情"
-            visible={details}
-            onCancel={this.closeDesc.bind(this)}
-          >
-            <Spin spinning={this.state.loading}>
-              <OrderDetail
-                domId='dindanxiangqing'
-                orderUid={this.state.orderUid}
-                orderData={this.state.orderData}
-                getOrderLog={this.getOrderLog.bind(this)}
-                totalCui={parseFloat(this.state.totalCui)}
-                dataSourceX={this.state.dataSourceX}
-                contactList={this.state.contactList}
-                contactListNew={this.state.contactListNew}
-                orderNo={this.state.orderNo}
-              />
-            </Spin>
-          </Modal>
-        }
-        <OrderRiZi
-          dataSourcerizhi={this.state.dataSourcerizhi}
-          closeOrderLog={this.closeOrderLog.bind(this)}
-          visible={this.state.rizhivisible}
-          loading={this.state.loading}
+        {/* 订单详情 */}
+        <OrderDesc
+          data={this.state.orderData}
+          showDesc={details}
+          closeDesc={this.closeDesc.bind(this)}
         />
       </div>
     );

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "afanti",
-  "version": "1.2.21",
+  "version": "1.2.22",
   "description": "",
   "main": "index.js",
   "scripts": {