HW 4 vuotta sitten
vanhempi
commit
4647761226
20 muutettua tiedostoa jossa 79 lisäystä ja 9526 poistoa
  1. 16 16
      js/component/manageCenter/financialManage/content.jsx
  2. 0 17
      js/component/manageCenter/financialManage/distribute/contractChangeCwjl.jsx
  3. 0 17
      js/component/manageCenter/financialManage/distribute/contractChangeCwzy.jsx
  4. 36 36
      js/component/manageCenter/order/content.jsx
  5. 0 461
      js/component/manageCenter/order/orderManagement/approveOrder/approveOrder.jsx
  6. 0 579
      js/component/manageCenter/order/orderManagement/approveOrder/approveOrderDetaile.jsx
  7. 0 539
      js/component/manageCenter/order/orderManagement/publicOrder/publicOrder.jsx
  8. 0 526
      js/component/manageCenter/order/orderManagement/publicOrder/publicOrderDetaile.jsx
  9. 0 17
      js/component/manageCenter/order/orderNew/contractChangeDsz.jsx
  10. 0 19
      js/component/manageCenter/order/orderNew/contractChangeYxgly.jsx
  11. 0 17
      js/component/manageCenter/order/orderNew/contractChangeYxy.jsx
  12. 0 1644
      js/component/manageCenter/order/orderNew/contractCwzy.js
  13. 0 1395
      js/component/manageCenter/order/orderNew/contractJsjl.js
  14. 0 1334
      js/component/manageCenter/order/orderNew/contractJsy.js
  15. 0 1389
      js/component/manageCenter/order/orderNew/contractJszj.js
  16. 0 1442
      js/component/manageCenter/order/orderNew/contractYxy.js
  17. 27 27
      js/component/manageCenter/project/content.jsx
  18. 0 17
      js/component/manageCenter/project/task/contractChangeJsjl.jsx
  19. 0 17
      js/component/manageCenter/project/task/contractChangeJsy.jsx
  20. 0 17
      js/component/manageCenter/project/task/contractChangeJszj.jsx

+ 16 - 16
js/component/manageCenter/financialManage/content.jsx

@@ -119,14 +119,14 @@ class Content extends Component {
           });
         });
         break;
-      case "contractChangeCwzy": //订单变更审核列表
-        require.ensure([], () => {
-          let Module = require("./distribute/contractChangeCwzy").default;
-          this.setState({
-            component: <Module />,
-          });
-        });
-        break;
+      // case "contractChangeCwzy": //订单变更审核列表
+      //   require.ensure([], () => {
+      //     let Module = require("./distribute/contractChangeCwzy").default;
+      //     this.setState({
+      //       component: <Module />,
+      //     });
+      //   });
+      //   break;
       // case "contractChangeCwzj": //订单变更审核列表
       //   require.ensure([], () => {
       //     let Module = require("./distribute/contractChangeCwzj").default;
@@ -135,14 +135,14 @@ class Content extends Component {
       //     });
       //   });
       //   break;
-      case "contractChangeCwjl": //订单变更审核列表
-        require.ensure([], () => {
-          let Module = require("./distribute/contractChangeCwjl").default;
-          this.setState({
-            component: <Module />,
-          });
-        });
-        break;
+      // case "contractChangeCwjl": //订单变更审核列表
+      //   require.ensure([], () => {
+      //     let Module = require("./distribute/contractChangeCwjl").default;
+      //     this.setState({
+      //       component: <Module />,
+      //     });
+      //   });
+      //   break;
       case "tuiDan": //退单管理
         require.ensure([], () => {
           let Module = require("./distribute/tuiDan").default;

+ 0 - 17
js/component/manageCenter/financialManage/distribute/contractChangeCwjl.jsx

@@ -1,17 +0,0 @@
-import React, { Component } from "react";
-import ContractChange from "../../order/orderNew/contractCwjl.js";
-
-class ContractChangeCwjl extends Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      processState: 5
-    };
-  }
-
-  render() {
-    return <ContractChange processState={this.state.processState} />;
-  }
-}
-
-export default ContractChangeCwjl;

+ 0 - 17
js/component/manageCenter/financialManage/distribute/contractChangeCwzy.jsx

@@ -1,17 +0,0 @@
-import React, { Component } from "react";
-import ContractChange from "../../order/orderNew/contractCwzy.js";
-
-class ContractChangeCwzy extends Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      processState: 5
-    };
-  }
-
-  render() {
-    return <ContractChange processState={this.state.processState} />;
-  }
-}
-
-export default ContractChangeCwzy;

+ 36 - 36
js/component/manageCenter/order/content.jsx

@@ -125,25 +125,25 @@ class Content extends Component {
         });
         break;
       //合同变更审核
-      case "contractChangeYxy":
-        require.ensure([], () => {
-          const ContractChangeYxy = require("./orderNew/contractChangeYxy")
-            .default;
-          this.setState({
-            component: <ContractChangeYxy />,
-          });
-        });
-        break;
+      // case "contractChangeYxy":
+      //   require.ensure([], () => {
+      //     const ContractChangeYxy = require("./orderNew/contractChangeYxy")
+      //       .default;
+      //     this.setState({
+      //       component: <ContractChangeYxy />,
+      //     });
+      //   });
+      //   break;
       //合同变更审核
-      case "contractChangeYxgly":
-        require.ensure([], () => {
-          const ContractChangeYxgly = require("./orderNew/contractChangeYxgly")
-            .default;
-          this.setState({
-            component: <ContractChangeYxgly />,
-          });
-        });
-        break;
+      // case "contractChangeYxgly":
+      //   require.ensure([], () => {
+      //     const ContractChangeYxgly = require("./orderNew/contractChangeYxgly")
+      //       .default;
+      //     this.setState({
+      //       component: <ContractChangeYxgly />,
+      //     });
+      //   });
+      //   break;
       //合同变更审核
       // case "contractChangeZc":
       //   require.ensure([], () => {
@@ -155,15 +155,15 @@ class Content extends Component {
       //   });
       //   break;
       //合同变更审核
-      case "contractChangeDsz":
-        require.ensure([], () => {
-          const ContractChangeDsz = require("./orderNew/contractChangeDsz")
-            .default;
-          this.setState({
-            component: <ContractChangeDsz />,
-          });
-        });
-        break;
+      // case "contractChangeDsz":
+      //   require.ensure([], () => {
+      //     const ContractChangeDsz = require("./orderNew/contractChangeDsz")
+      //       .default;
+      //     this.setState({
+      //       component: <ContractChangeDsz />,
+      //     });
+      //   });
+      //   break;
       //订单查询新
       case "inquiry":
         require.ensure([], () => {
@@ -217,15 +217,15 @@ class Content extends Component {
           });
         });
         break;
-      case "approved":
-        require.ensure([], () => {
-          const ApproveOrder = require("./orderManagement/approveOrder/approveOrder")
-            .default;
-          this.setState({
-            component: <ApproveOrder />,
-          });
-        });
-        break;
+      // case "approved":
+      //   require.ensure([], () => {
+      //     const ApproveOrder = require("./orderManagement/approveOrder/approveOrder")
+      //       .default;
+      //     this.setState({
+      //       component: <ApproveOrder />,
+      //     });
+      //   });
+      //   break;
       case "mySettlement":
         require.ensure([], () => {
           const MySettlement = require("./settlementOrder/mySettlement/mySettlement")

+ 0 - 461
js/component/manageCenter/order/orderManagement/approveOrder/approveOrder.jsx

@@ -1,461 +0,0 @@
-import React from 'react';
-import ReactDom from 'react-dom';
-import ajax from 'jquery/src/ajax/xhr.js';
-import $ from 'jquery/src/ajax';
-import { Form,Radio, Icon, Button, Input, Select, Spin, Table, Switch, message, DatePicker, Modal, Upload ,Popconfirm,Checkbox,Tabs} from 'antd';
-import ApproveOrderDetaile from "./approveOrderDetaile.jsx";
-import moment from 'moment';
-import '../../userMangagement.less';
-import {orderState,paymentState,orderChannel} from '../../../../dataDic.js';
-import {getOrderState,getPaymentState,getOrderChannel,getProjectState,getApprovedState,getOrderType } from '../../../../tools.js';
-import {ChooseList} from "../../orderNew/chooseList";
-
-
-const {TabPane} = Tabs
-const ApproveOrder=Form.create()(React.createClass({
-	loadData(pageNo) {
-        this.state.data = [];
-        this.setState({
-            loading: true
-        });
-        $.ajax({
-            method: "post",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context + '/api/admin/order/listApprovalServiceOrder',
-            data: {
-                pageNo: pageNo || 1,
-                pageSize: this.state.pagination.pageSize,
-                buyerName:this.state.customerName,
-                startDate: this.state.releaseDate[0],
-				endDate: this.state.releaseDate[1],
-				depIds:this.state.departmentSearch , //部门
-				salesmanName:this.state.orderLeader, //负责人
-				orderStatus:this.state.orderStateSearch , //订单状态
-				liquidationStatus:this.state.paymentStateSearch , //结算状态
-				orderChannel:this.state.orderChannelSearch, //订单渠道
-				approvalHistory:this.state.approvalHistorySearch?1:0    //特批历史
-            },
-            success: function (data) {
-                let theArr = [];
-                if (!data.data) {
-                    if (data.error && data.error.length) {
-                        message.warning(data.error[0].message);
-                    };
-                } else {
-                    for (let i = 0; i < data.data.list.length; i++) {
-                        let thisdata = data.data.list[i];
-                        theArr.push({
-                            key: i,
-	                        id: thisdata.id,
-	                        orderNo: thisdata.orderNo,
-	                        orderType:thisdata.orderType,
-	                        orderStatus:thisdata.orderStatus,
-	                        liquidationStatus:thisdata.liquidationStatus,
-	                        createTime:thisdata.createTime,
-	                        buyerName:thisdata.buyerName,
-	                        signTotalAmount:thisdata.signTotalAmount,
-	                        projectStage:thisdata.projectStage,
-	                        approval:thisdata.approval,
-	                        salesmanName:thisdata.salesmanName,
-		                    orderChannel:thisdata.orderChannel,
-		                    financeName:thisdata.financeName,
-		                    departmentName:thisdata.departmentName
-                        });
-                    };
-                    this.state.pagination.current = data.data.pageNo;
-                    this.state.pagination.total = data.data.totalCount;
-                };
-                if(!data.data.list.length){
-					this.state.pagination.current=0
-					this.state.pagination.total=0
-				}
-                this.setState({
-                	pageNo:pageNo,
-                    dataSource: theArr,
-                    pagination: this.state.pagination,
-                    selectedRowKeys:[]
-                });
-            }.bind(this),
-        }).always(function () {
-            this.setState({
-                loading: false
-            });
-        }.bind(this));
-    },
-    departmentList() {
-		this.setState({
-			loading: true
-		});
-		$.ajax({
-			method: "get",
-			dataType: "json",
-			crossDomain: false,
-			url: globalConfig.context + "/api/admin/organization/selectSuperId",
-			data: {
-				
-			},
-			success: function(data) {
-				let thedata = data.data;
-				let theArr=[];
-				if(!thedata) {
-					if(data.error && data.error.length) {
-						message.warning(data.error[0].message);
-					};
-					thedata = {};
-				}else{
-					thedata.map(function(item,index){
-						theArr.push({
-							key:index,
-							name:item.name,
-							id:item.id,
-							depNo:item.depNo
-						})
-					})
-				}
-				this.setState({
-					departmentArr:theArr,
-				})
-			}.bind(this),
-			}).always(function() {
-				this.setState({
-					loading: false
-				});
-			}.bind(this));
-	},
-    getInitialState() {
-        return {
-        	datauser:{},
-            selectedRowKeys: [],
-            releaseDate: [],
-            selectedRows: [],
-            approvalHistorySearch:true,
-            searchMore: true,
-            loading: false,
-            distributionVisible:false,
-            intentOrder:false,
-            visible:false,
-            showDesc:false,
-            pagination: {
-                defaultCurrent: 1,
-                defaultPageSize: 10,
-                showQuickJumper: true,
-                pageSize: 10,
-                onChange: function (page) {
-                    this.loadData(page);
-                }.bind(this),
-                showTotal: function (total) {
-                    return '共' + total + '条数据';
-                }
-            },
-            distributionPagination: {
-                defaultCurrent: 1,
-                defaultPageSize: 10,
-                showQuickJumper: true,
-                pageSize: 10,
-                onChange: function (page) {
-                    this.contactList(page);
-                }.bind(this),
-                showTotal: function (total) {
-                    return '共' + total + '条数据';
-                }
-            },
-            columns: [
-                {
-                    title: '订单编号',
-                    dataIndex: 'orderNo',
-                    key: 'orderNo'
-                }, {
-                    title: '订单类型',
-                    dataIndex: 'orderType',
-                    key: 'orderType',
-                    render:(text)=>{return getOrderType(text)}
-                }, {
-                    title: '下单时间',
-                    dataIndex: 'createTime',
-                    key: 'createTime'
-                },{
-                    title: '订单客户',
-                    dataIndex: 'buyerName',
-                    key: 'buyerName',
-                    render:(text)=>{return (text&&text.length>8)?(text).substr(0,8)+'…':text}
-                },
-                {
-                    title: '实际下单金额(万元)',
-                    dataIndex: 'signTotalAmount',
-                    key: 'signTotalAmount'
-                }, {
-                    title: '结算状态',
-                    dataIndex: 'liquidationStatus',
-                    key: 'liquidationStatus',
-                    render:(text)=>{return getPaymentState(text) }
-                }, {
-                    title: '订单状态',
-                    dataIndex: 'orderStatus',
-                    key: 'orderStatus',
-                    render:(text)=>{return getOrderState(text) }
-                }, {
-                    title: '项目状态',
-                    dataIndex: 'projectStage',
-                    key: 'projectStage',
-                    render:(text)=>{return getProjectState(text) }
-                },{
-                    title: '是否特批',
-                    dataIndex: 'approval',
-                    key: 'approval',
-                    render:text=>{return getApprovedState(text)}
-                },{
-                    title: '订单渠道',
-                    dataIndex: 'orderChannel',
-                    key: 'orderChannel',
-                    render:(text)=>{return getOrderChannel(text) }
-                },{
-                    title: '部门机构',
-                    dataIndex: 'departmentName',
-                    key: 'departmentName',
-                },{
-                    title: '订单跟进人',
-                    dataIndex: 'salesmanName',
-                    key: 'salesmanName',
-                },{
-                    title: '财务跟进人',
-                    dataIndex: 'financeName',
-                    key: 'financeName',
-                },{
-                    title: '操作',
-                    dataIndex: 'operation',
-                    key: 'operation',
-                    render: (text, record, index) => {
-						return <div>
-									{record.approval==1&&<div>
-										<Popconfirm title={'您确认驳回 【'+ record.salesmanName +'】的特批申请?'} onConfirm={(e)=>{this.reject(record)}} okText="确认" cancelText="取消">
-										    <Button style={{marginRight:'5px'}} type="danger" onClick={(e) =>{ e.stopPropagation()}}>驳回</Button>                 
-										</Popconfirm>
-										<Popconfirm title={'您确定同意 【'+ record.salesmanName +'】的特批申请?'} onConfirm={(e)=>{this.confirm(record)}} okText="确认" cancelText="取消">
-										    <Button style={{marginRight:'5px'}} type="primary" onClick={(e) =>{ e.stopPropagation()}}>同意</Button>                 
-										</Popconfirm>
-									</div>}
-                        	   </div>
-					}
-                }
-            ],
-            dataSource: [],
-        };
-    },
-    //操作分配
-    confirmDelet(index){
-    	this.setState({
-    		userDetaile:false,
-    	});
-    	this.contactList(1,index.id)
-    },
-    //驳回
-    reject(record){
-    	this.confirmSelect(0,record)
-    },
-    //确认
-    confirm(record){
-    	this.confirmSelect(1,record)
-    },
-    confirmSelect(nub,record){
-    	this.setState({
-            loading: true
-        });
-        $.ajax({
-            method: "get",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context + '/api/admin/order/approvalServiceOrder',
-            data: {
-            	orderNo:record.orderNo,
-            	confirm:nub
-            }
-        }).done(function (data) {
-            if (!data.error.length) {
-                message.success('操作成功');
-                this.setState({
-                    loading: false,
-                });
-                 this.loadData(this.state.pageNo);
-            } else {
-                message.warning(data.error[0].message);
-            };
-        }.bind(this));
-    },
-    componentWillMount() {
-        this.loadData();
-        this.departmentList()
-    },
-    tableRowClick(record, index) {
-    	this.state.userDetaile=true;
-        this.state.datauser = record;
-        this.setState({
-            showDesc: true
-        });
-    },
-    closeDesc(e, s) {
-    	this.state.userDetaile=false;
-        this.state.showDesc = e;
-        if (s) {
-            this.loadData(this.state.pageNo);
-        };
-    },
-    searchSwitch() {
-		this.setState({
-			searchMore: !this.state.searchMore
-		});
-	},
-    search() {
-        this.loadData();
-    },
-    //分配时搜索
-    searchOrder() {
-        this.contactList();
-    },
-    //分配时重置
-    resetOrder() {
-        this.contactList();
-    },
-    reset() {
-    	this.state.customerName='';
-    	this.state.releaseDate[0] = undefined;
-		this.state.releaseDate[1] = undefined;
-		this.state.orderLeader = '';
-		this.state.departmentSearch=undefined;
-		this.state.approvalHistorySearch=true;
-		this.state.orderStateSearch  = undefined;
-		this.state.paymentStateSearch  = undefined;
-        this.loadData();       
-    },
-    changeList(arr) {
-        const newArr = [];
-        this.state.columns.forEach(item => {
-            arr.forEach(val => {
-                if (val === item.title) {
-                    newArr.push(item);
-                }
-            });
-        });
-        this.setState({
-            changeList: newArr
-        });
-    },
-    render() {
-        const rowSelection = {
-            selectedRowKeys: this.state.selectedRowKeys,
-            onChange: (selectedRowKeys, selectedRows) => {
-	                this.setState({
-	                    selectedRows: selectedRows.slice(-1),
-	                    selectedRowKeys: selectedRowKeys.slice(-1)
-	                }); 
-            },
-            onSelectAll: (selected, selectedRows, changeRows) => {
-			   this.setState({
-			   		selectedRowKeys:[]
-			   })
-			},
-        };
-        let departmentArr = this.state.departmentArr || [];
-        const hasSelected = this.state.selectedRowKeys.length > 0;
-        const { RangePicker } = DatePicker;
-        return (
-            <div className="user-content" >
-                <div className="content-title">
-                    <span style={{fontSize:'16px'}}>特批订单</span>	
-                    <Tabs
-                        defaultActiveKey="1"
-                        onChange={this.callback}
-                        className="test">
-                        <TabPane tab="搜索" key="1">
-	                <div className="user-search">
-	                    <Input placeholder="客户名称" style={{width:'150px',marginLeft:10}}
-	                        value={this.state.customerName}
-	                        onChange={(e) => { this.setState({ customerName: e.target.value }); }} />
-	                    <RangePicker
-		                        value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
-		                        this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
-		                        onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} /> 
-                        <Select placeholder="部门机构"
-	                        style={{ width: 150 ,marginRight:'10px',marginLeft:'10px'}}
-	                        value={this.state.departmentSearch}
-	                        onChange={(e) => { this.setState({ departmentSearch: e }) }}>
-	                        {
-	                            departmentArr.map(function (item) {
-	                                    return <Select.Option key={item.id} >{item.name}</Select.Option>
-	                            })
-	                        }
-                  		</Select>
-                  		<Input placeholder="订单负责人" style={{width:'150px'}}
-	                        value={this.state.orderLeader}
-	                        onChange={(e) => { this.setState({ orderLeader: e.target.value }); }} />
-	                    <Button type="primary" onClick={this.search} style={{marginLeft:'10px'}}>搜索</Button>
-	                    <Button onClick={this.reset}>重置</Button>
-	                    <span style={{marginLeft:'10px',marginRight:'20px'}}>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>    
-	                </div>
-	                <div className='clearfix' style={{marginTop:'5px'}}>
-	                  <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}> 
-	                  		<Checkbox checked={this.state.approvalHistorySearch} style={{marginLeft:10}} onChange={(e)=>{this.setState({approvalHistorySearch:!this.state.approvalHistorySearch})}}>特批历史订单</Checkbox>
-	                        <Select placeholder="订单状态"
-	                            style={{ width: 150 ,marginRight:'10px',marginBottom:'10px'}}
-	                            value={this.state.orderStateSearch}
-	                            onChange={(e) => { this.setState({ orderStateSearch: e }) }}>
-	                            {
-                                    orderState.map(function (item) {
-                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
-                                    })
-                                }
-	                        </Select>
-	                        <Select placeholder="结算状态"
-	                            style={{ width: 150 ,marginRight:'10px'}}
-	                            value={this.state.paymentStateSearch}
-	                            onChange={(e) => { this.setState({ paymentStateSearch: e }) }}>
-	                            {
-                                    paymentState.map(function (item) {
-                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
-                                    })
-                                }
-	                        </Select>
-	                    </div>
-	                </div>
-                   </TabPane>
-                        <TabPane tab="更改表格显示数据" key="2">
-                            <div style={{ marginLeft: 10 }}>
-                                <ChooseList
-                                    columns={this.state.columns}
-                                    changeFn={this.changeList}
-                                    changeList={this.state.changeList}
-                                    top={55}
-                                    margin={11}
-                                />
-                            </div>
-                        </TabPane>
-                   </Tabs>
-                    <div className="patent-table">
-	                    <Spin spinning={this.state.loading}>
-	                        <Table columns={
-                                this.state.changeList
-                                    ? this.state.changeList
-                                    : this.state.columns
-                                }
-	                            dataSource={this.state.dataSource}
-	                            rowSelection={rowSelection}
-	                            pagination={this.state.pagination}
-                                onRowClick={this.tableRowClick}
-                                bordered
-                                size="small" />
-	                    </Spin>
-	                </div>
-	                <ApproveOrderDetaile
-	                	confirmDelet={this.confirmDelet}
-	                    userDetaile={this.state.userDetaile}
-	                    datauser={this.state.datauser}
-	                    showDesc={this.state.showDesc}
-	                    closeDesc={this.closeDesc} />
-	            </div >
-            </div>
-        );
-    }
-}));
-
-export default ApproveOrder;
-

+ 0 - 579
js/component/manageCenter/order/orderManagement/approveOrder/approveOrderDetaile.jsx

@@ -1,579 +0,0 @@
-import React from 'react';
-import { Icon, Table, Modal, message, Spin, Input, Select, Button, Form ,Upload,Popconfirm,AutoComplete} from 'antd';
-import ajax from 'jquery/src/ajax/xhr.js';
-import $ from 'jquery/src/ajax';
-import '../../userMangagement.less';
-import {getApprovedState,getPaymentState,getOrderState,getProjectState,getOrderChannel,getOrderType,getTransactionChannel ,getTransactionProject } from '../../../../tools.js';
-
-//图片组件
-const PicturesWall = React.createClass({
-    getInitialState() {
-        return {
-            previewVisible: false,
-            previewImage: '',
-            fileList: [],
-        }
-    },
-    handleCancel() {
-        this.setState({ previewVisible: false })
-    },
-    handlePreview(file) {
-        this.setState({
-            previewImage: file.url || file.thumbUrl,
-            previewVisible: true,
-        });
-    },
-    handleChange(info) {
-        let fileList = info.fileList;
-        this.setState({ fileList });
-        this.props.fileList(fileList);
-    },
-    componentWillReceiveProps(nextProps) {
-        this.state.fileList = nextProps.pictureUrl; 
-    },
-    render() {
-        const { previewVisible, previewImage, fileList } = this.state;
-        const uploadButton = (
-            <div>
-                <Icon type="plus" />
-                <div className="ant-upload-text">点击上传</div>
-            </div>
-        );
-        return (
-            <div style={{display:"inline-block"}}>
-                <Upload
-                    action={globalConfig.context + "/api/admin/superviser/uploadAdminImg"}
-                    data={{ 'sign': this.props.pictureSign }}
-                    listType="picture-card"
-                    fileList={fileList}
-                    onPreview={this.handlePreview}
-                    onChange={this.handleChange} >
-                    {fileList.length >= 4 ? null : uploadButton}
-                </Upload>
-                <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel}>
-                    <img alt="example" style={{ width: '100%' }} src={previewImage} />
-                </Modal>
-            </div>
-        );
-    }
-});
-
-const ApproveOrderDetaile = Form.create()(React.createClass({
-	loadData(record) {
-        this.state.data = [];
-        this.setState({
-            loading: true
-        });
-        $.ajax({
-            method: "get",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context + '/api/admin/order/getOrderCommodity',
-            data: {
-            	orderNo:record?record.orderNo:this.props.datauser.orderNo
-            },
-            success: function (data) {
-                let theArr = [];
-                if (!data.data) {
-                    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];
-                        theArr.push({
-                             key: i,
-                             id:thisdata.id,
-                             orderNo:thisdata.orderNo,
-                             commodityName:thisdata.commodityName,
-                             commodityType:thisdata.commodityType,
-                             commodityMode:thisdata.commodityMode,
-                             commodityQuantity:thisdata.commodityQuantity,
-                             commodityPrice:thisdata.commodityPrice,
-                             discountPrice:thisdata.discountPrice,
-                             commodityFirstPayment:thisdata.commodityFirstPayment,
-                             createTimes:thisdata.createTimes,
-                             discountFirstPayment:thisdata.discountFirstPayment,
-                             remarks:thisdata.remarks,
-                        });
-                    };
-                   }
-                this.setState({
-                    dataSource: theArr,
-                });
-            }.bind(this),
-        }).always(function () {
-            this.setState({
-                loading: false
-            });
-        }.bind(this));
-    },
-	getInitialState() {
-		return {
-			loading: false,
-			visible: false,
-			lookState:true,
-			orgCodeUrl:[],
-			lookflowList:[],
-			checkedKeys: [],
-			columns: [
-				{
-                    title: '业务项目名称',
-                    dataIndex: 'commodityName',
-                    key: 'commodityName'
-                }, {
-                    title: '项目类别',
-                    dataIndex: 'commodityType',
-                    key: 'commodityType',
-                    render:(text)=>{
-                    	return (getOrderType(text))
-                    }
-                },{
-                    title: '项目数量',
-                    dataIndex: 'commodityQuantity',
-                    key: 'commodityQuantity'
-                }, {
-                    title: '服务市价(万元)',
-                    dataIndex: 'commodityPrice',
-                    key: 'commodityPrice'
-                }, {
-                    title: '实签价格(万元)',
-                    dataIndex: 'discountPrice',
-                    key: 'discountPrice'
-                }, {
-                    title: '下单时间',
-                    dataIndex: 'createTimes',
-                    key: 'createTimes'
-                }, {
-                    title: '项目说明',
-                    dataIndex: 'remarks',
-                    key: 'remarks',
-					render:(text)=>{
-						return (text&&text.length>8?text.substr(0,8)+'…':text)
-					}
-                }
-			],
-			flowList:[
-				{
-                    title: '平台流水号',
-                    dataIndex: 'billNo',
-                    key: 'billNo',
-                }, {
-                    title: '平台流水时间',
-                    dataIndex: 'createTime',
-                    key: 'createTime'
-                }, {
-                    title: '流水金额(万元)',
-                    dataIndex: 'transactionAmount',
-                    key: 'transactionAmount'
-                },{
-                    title: '付款人名称',
-                    dataIndex: 'payerName',
-                    key: 'payerName'
-                }, {
-                    title: '收款人名称',
-                    dataIndex: 'payeeName',
-                    key: 'payeeName'
-                },
-                {
-                    title: '流水科目',
-                    dataIndex: 'transactionSubject',
-                    key: 'transactionSubject',
-                    render:(text)=>{return getTransactionProject(text) }
-                }, {
-                    title: '流水渠道',
-                    dataIndex: 'transactionChannel',
-                    key: 'transactionChannel',
-                    render:(text)=>{return getTransactionChannel(text) }
-                },{
-                    title: '财务流水号',
-                    dataIndex: 'financialPayNo',
-                    key: 'financialPayNo',
-                }, {
-                    title: '财务流水时间',
-                    dataIndex: 'financialPayTime',
-                    key: 'financialPayTime',
-                }, {
-                    title: '流水确认',
-                    dataIndex: 'confirmSign',
-                    key: 'confirmSign',
-                    render:(text)=>{return text?'已确认':'待确认' }
-                },{
-                    title: '确认时间',
-                    dataIndex: 'confirmTime',
-                    key: 'confirmTime',
-                }
-			]
-		};
-	},
-	//查看基本详情基本信息
-    loaduser(record){
-    	if(record){
-    	this.state.orderList=[]
-    	$.ajax({
-            method: "get",
-			dataType: "json",
-			crossDomain: false,
-			url: globalConfig.context + '/api/admin/order/getServiceOrderDetail',
-            data: {
-              orderNo: record.orderNo
-            },
-            success: function (data) {
-                let thisData = data.data;                
-                if (!thisData) {
-                    if (data.error && data.error.length) {
-                        message.warning(data.error[0].message);
-                    };
-                    thisData = {};
-                };
-                this.setState({
-					id:thisData.id,
-					orderList:thisData,
-					orderAmount:thisData.orderAmount,
-					firstPayment:thisData.firstPayment,
-					signTotalAmount:thisData.signTotalAmount,
-					signFirstPayment:thisData.signFirstPayment,
-					approval:thisData.approval==0?thisData.approval.toString():thisData.approval,
-					orderRemarks:thisData.orderRemarks,
-                    orgCodeUrl: thisData.orgCodeUrl ? splitUrl(thisData.orgCodeUrl, ',', globalConfig.avatarHost + '/upload') : [],
-               		//签单
-               		orderNo:thisData.orderNo,//订单编号
-               		buyerName:thisData.buyerName,
-                });
-            }.bind(this),
-       }).always(function () {
-            this.setState({            	
-                loading: false
-            });
-        }.bind(this));  
-       }
-    },
-	handleOk(e) {
-		this.setState({
-			visible: false,
-		});
-		this.props.closeDesc(false, true);
-	},
-	handleCancel(e) {
-		this.setState({
-			visible: false,
-		});
-		this.props.closeDesc(false);
-	},
-	nextCancel() {
-		this.setState({
-			addnextVisible: false
-		})
-	},
-	lookflow(){
-		this.setState({
-			loading: true,
-			lookVisible:true,
-		})
-		this.state.lookSource=[];
-        $.ajax({
-            method: "get",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context +'/api/admin/order/getBillByOrderNo',
-            data: {
-            	orderNo:this.props.datauser.orderNo,
-            },
-            success: function (data) {
-                let theArr = [];
-                if (!data.data) {
-                    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];
-                        theArr.push({
-                             key: i,
-	                         billNo: thisdata.billNo,
-	                         transactionAmount:thisdata.transactionAmount,
-	                         createTime:thisdata.createTime, 
-	                         transactionAmount:thisdata.transactionAmount,
-	                         payerName:thisdata.payerName,
-	                         payeeName:thisdata.payeeName,
-	                         transactionSubject:thisdata.transactionSubject,
-	                         transactionChannel:thisdata.transactionChannel,
-	                         financialPayNo:thisdata.financialPayNo,
-	                         financialPayTime:thisdata.financialPayTime,
-	                         orderNo:thisdata.orderNo,
-	                         departmentName:thisdata.departmentName,
-	                         salesmanName:thisdata.salesmanName,
-	                         financeName:thisdata.financeName,
-	                         confirmSign:thisdata.confirmSign,
-	                         deleteSign:thisdata.deleteSign,
-	                         confirmTime:thisdata.confirmTime
-                        });
-                    };
-                };
-                this.setState({
-                    lookflowList: theArr,
-                });
-            }.bind(this),
-        }).always(function () {
-            this.setState({
-                loading: false
-            });
-        }.bind(this));
-	},
-	lookCancel(){
-		this.setState({
-			lookVisible:false
-		})
-	},
-	tableRowClick(record, index) {
-       this.setState({
-        	editFw:record,
-        	addnextVisible:true,
-        });
-    },
-	componentWillMount() {
-		
-	},
-	componentWillReceiveProps(nextProps) { //props改变时触发
-		this.state.visible = nextProps.showDesc;
-		if(nextProps.userDetaile && nextProps.showDesc ) {
-			this.loaduser(nextProps.datauser);
-			this.loadData(nextProps.datauser);
-		}
-	},
-	render() {
-		const FormItem = Form.Item
-		const formItemLayout = {
-			labelCol: { span: 8 },
-			wrapperCol: { span: 14 },
-		};
-		const editFws=this.state.editFw || [];
-		const orderDetaiel=this.state.orderList || [];
-		return(
-			<div>
-            <Modal maskClosable={false} visible={this.state.visible}
-                        onOk={this.handleOk} onCancel={this.handleCancel}
-                        width='1000px'
-                        title='订单详情'                     
-                        footer=''
-                        className="admin-desc-content">
-			            <Form layout="horizontal" id="demand-form" style={{paddingBottom:'40px'}}  >
-			                <Spin spinning={this.state.loading}>
-		                        <div className="clearfix">
-		                            <div className="clearfix">
-			                       		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="订单编号" >
-				                            <span>{orderDetaiel.orderNo}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="下单时间" >  
-				                            <span>{orderDetaiel.createTime}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="客户名称" >  
-				                            <span>{orderDetaiel.buyerName}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="订单类型" >  
-				                            <span>{getOrderType(orderDetaiel.orderType)}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="订单渠道" >  
-				                            <span>{getOrderChannel(orderDetaiel.orderChannel)}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="订单状态" >  
-				                            <span>{getOrderState(orderDetaiel.orderStatus)}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="已收款项" >  
-				                            <span>{orderDetaiel.actuallyTotalAmount+'万元'}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="结算状态" >  
-				                            <span>{getPaymentState(orderDetaiel.liquidationStatus)}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="市价订单金额" >    
-			                            	<span>{orderDetaiel.orderAmount+'万元'}</span>
-					                    </FormItem>
-					                    <FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="市价首款金额" >   
-				                            <span>{orderDetaiel.firstPayment+'万元'}</span>
-					                    </FormItem>
-					                    <div className='clearfix'>
-								        	<FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="实签订单金额" >   
-					                            <span>{orderDetaiel.signTotalAmount+'万元'}</span>
-				                    		</FormItem>
-				                    		<FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="实签首款金额" >   
-					                            <span>{orderDetaiel.signFirstPayment+'万元'}</span>
-				                    		</FormItem>
-				                    		<FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="特批立项" >   
-					                            <span>{getApprovedState(orderDetaiel.approval)}</span>
-				                    		</FormItem>
-				                    		<FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="合同编号" >   
-					                            <span>{orderDetaiel.contractNo}</span>
-				                    		</FormItem>
-					                        <div className='clearfix'>
-									        	<FormItem
-										            labelCol={{ span: 4 }}
-										            wrapperCol={{ span: 16 }}
-										            label="订单留言" >
-									        		<span>{orderDetaiel.orderRemarks}</span>
-										        </FormItem>
-									        </div>
-								        </div>
-			                        </div>
-			                        <div className='clearfix'>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="订单负责人" >  
-				                            <span>{orderDetaiel.salesmanName}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="业务品类" >  
-				                            <span>{orderDetaiel.projectType}</span>
-			                    		</FormItem>
-			                    	</div>
-			                    	<div className='clearfix'>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="意向时间" >  
-				                            <span>{orderDetaiel.createTime}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="签单时间" >  
-				                            <span>{orderDetaiel.signTime}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="财务负责人" >  
-						                    <span>{orderDetaiel.financeName}</span>
-						                    <Button onClick={this.lookflow} style={{float:'right'}}>查看流水</Button>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="项目负责人" >  
-				                            <span>{orderDetaiel.technicianName}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="立项时间" >  
-				                            <span>{orderDetaiel.setUpTime}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="项目状态" >  
-				                            <span>{getProjectState(orderDetaiel.projectStage)}</span>
-			                    		</FormItem>
-		                    		</div>
-					                <div>
-					                	<span style={{marginLeft:'50px',fontSize:'20px'}}>业务项目</span>
-					                </div>
-					                <div className="patent-table">
-					                    <Spin spinning={this.state.loading}>
-					                        <Table size="middle" columns={this.state.columns}
-					                            dataSource={this.state.dataSource}
-					                            pagination={false}
-					                            onRowClick={this.tableRowClick} 
-					                            />
-					                    </Spin>
-						            </div>
-			                    </div>
-			                </Spin>
-			            </Form >
-			        </Modal> 
-			        <Modal maskClosable={false} visible={this.state.addnextVisible}
-                        onOk={this.nextCancel} onCancel={this.nextCancel}
-                        width='550px'
-                        title='查看项目详细'                     
-                        footer=''
-                        className="admin-desc-content">
-			            <Form layout="horizontal" id="demand-form">
-			                <Spin spinning={this.state.loading}>
-		                        <div className="clearfix">
-	                        	   <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="业务项目名称" >
-		                    			<span>{editFws.commodityName}</span>
-			                    	</FormItem>
-			                    	<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="服务市价" >
-		                    			<span>{editFws.commodityPrice+'万元'}</span>
-			                    	</FormItem>
-			                    	<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="实签价格" >
-		                    			<span>{editFws.discountPrice+'万元'}</span>
-			                    	</FormItem>
-			                    	<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="服务数量" >
-		                    			<span>{editFws.commodityQuantity}</span>
-			                    	</FormItem>
-				                    <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="市场首付金额" >   
-		                                <span>{editFws.commodityFirstPayment+'万元'}</span>    
-				                    </FormItem>
-				                    <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="签单首付金额" >   
-		                                <span>{editFws.discountFirstPayment+'万元'}</span>    
-				                    </FormItem>
-				                    <div className='clearfix'>
-				                    	<FormItem 
-				                            labelCol={{ span: 4 }}
-								            wrapperCol={{ span: 16 }}
-				                            label="项目说明" >
-			                    			<span>{editFws.remarks}</span>
-				                    	</FormItem>
-			                    	</div>
-		                        </div>
-			                </Spin>
-			            </Form >
-			        </Modal>
-			        <Modal maskClosable={false} visible={this.state.lookVisible}
-                        onOk={this.lookCancel} onCancel={this.lookCancel}
-                        width='1300px'
-                        title= '查看流水'                   
-                        footer=''
-                        className="admin-desc-content">
-			            <Form layout="horizontal" id="demand-form">
-			                <Spin spinning={this.state.loading}>
-		                        <div className="clearfix">
-                        	   			<Table size="middle" columns={this.state.flowList}
-					                           dataSource={this.state.lookflowList}
-					                           pagination={false}
-			                             />
-		                        </div>
-			                </Spin>
-			            </Form >
-			        </Modal>
-    	    </div>
-		)
-	}
-}));
-
-export default ApproveOrderDetaile;

+ 0 - 539
js/component/manageCenter/order/orderManagement/publicOrder/publicOrder.jsx

@@ -1,539 +0,0 @@
-import React from 'react';
-import ReactDom from 'react-dom';
-import ajax from 'jquery/src/ajax/xhr.js';
-import $ from 'jquery/src/ajax';
-import { Form,Radio, Icon, Button, Input, Select, Spin, Table, Switch, message, DatePicker, Modal, Upload ,Popconfirm,Tabs} from 'antd';
-import PublicOrderDetaile from "./publicOrderDetaile.jsx";
-import moment from 'moment';
-import '../../userMangagement.less';
-import {orderState,orderChannel,orderType} from '../../../../dataDic.js';
-import {getOrderState,getOrderChannel,getPaymentState,getOrderType} from '../../../../tools.js';
-import {ChooseList} from "../../orderNew/chooseList";
-
-const {TabPane} = Tabs
-const PublicOrder=Form.create()(React.createClass({
-	loadData(pageNo) {
-        this.state.data = [];
-        this.setState({
-            loading: true
-        });
-        $.ajax({
-            method: "post",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context + '/api/admin/order/listPublicOrder',
-            data: {
-                pageNo: pageNo || 1,
-                pageSize: this.state.pagination.pageSize,
-                buyerName:this.state.customerNameSearch, //名称
-                startDate: this.state.releaseDate[0],
-				endDate: this.state.releaseDate[1],
-				orderStatus:this.state.orderStatusSearch, //状态
-				orderChannel:this.state.orderChannelSearch, //渠道
-				orderType:this.state.orderTypeSearch,  //类型
-				settlementState:this.state.settlementState,
-				approved:this.state.approvedSearch,  //特批
-            },
-            success: function (data) {
-                let theArr = [];
-                if (!data.data) {
-                    if (data.error && data.error.length) {
-                        message.warning(data.error[0].message);
-                    };
-                } else {
-                    for (let i = 0; i < data.data.list.length; i++) {
-                        let thisdata = data.data.list[i];
-                        theArr.push({
-                            key: i,
-	                        id: thisdata.id,
-		                    orderNo: thisdata.orderNo,
-		                    orderType:thisdata.orderType,
-		                    orderStatus:thisdata.orderStatus,
-		                    liquidationStatus:thisdata.liquidationStatus,
-		                    createTime:thisdata.createTime,
-		                    buyerName:thisdata.buyerName,
-		                    signTotalAmount:thisdata.signTotalAmount,
-		                    projectStage:thisdata.projectStage,
-		                    approval:thisdata.approval,
-		                    orderChannel:thisdata.orderChannel,
-		                    salesmanName:thisdata.salesmanName,
-                        });
-                    };
-                    this.state.pagination.current = data.data.pageNo;
-                    this.state.pagination.total = data.data.totalCount;
-                };
-                if(!data.data.list.length){
-					this.state.pagination.current=0
-					this.state.pagination.total=0
-				}
-                this.setState({
-                	pageNos:pageNo,
-                    dataSource: theArr,
-                    pagination: this.state.pagination,
-                    selectedRowKeys:[]
-                });
-            }.bind(this),
-        }).always(function () {
-            this.setState({
-                loading: false
-            });
-        }.bind(this));
-    },
-    departmentList() {
-		this.setState({
-			loading: true
-		});
-		$.ajax({
-			method: "get",
-			dataType: "json",
-			crossDomain: false,
-			url: globalConfig.context + "/api/admin/organization/selectSuperId",
-			data: {
-				
-			},
-			success: function(data) {
-				let thedata = data.data;
-				let theArr=[];
-				if(!thedata) {
-					if(data.error && data.error.length) {
-						message.warning(data.error[0].message);
-					};
-					thedata = {};
-				}else{
-					thedata.map(function(item,index){
-						theArr.push({
-							key:index,
-							name:item.name,
-							id:item.id,
-						})
-					})
-				}
-				this.setState({
-					departmentArr:theArr,
-				})
-			}.bind(this),
-			}).always(function() {
-				this.setState({
-					loading: false
-				});
-			}.bind(this));
-	},
-    getInitialState() {
-        return {
-        	datauser:{},
-            selectedRowKeys: [],
-            releaseDate: [],
-            selectedRows: [],
-            searchMore: true,
-            loading: false,
-            distributionVisible:false,
-            visible:false,
-            showDesc:false,
-            pagination: {
-                defaultCurrent: 1,
-                defaultPageSize: 10,
-                showQuickJumper: true,
-                pageSize: 10,
-                onChange: function (page) {
-                    this.loadData(page);
-                }.bind(this),
-                showTotal: function (total) {
-                    return '共' + total + '条数据';
-                }
-            },
-            distributionPagination: {
-                defaultCurrent: 1,
-                defaultPageSize: 10,
-                showQuickJumper: true,
-                pageSize: 10,
-                onChange: function (page) {
-                    this.contactList(page);
-                }.bind(this),
-                showTotal: function (total) {
-                    return '共' + total + '条数据';
-                }
-            },
-            columns: [
-                {
-                    title: '订单编号',
-                    dataIndex: 'orderNo',
-                    key: 'orderNo'
-                }, {
-                    title: '订单类型',
-                    dataIndex: 'orderType',
-                    key: 'orderType',
-                    render:(text)=>{return getOrderType(text) }
-                }, {
-                    title: '下单时间',
-                    dataIndex: 'createTime',
-                    key: 'createTime'
-                },{
-                    title: '订单客户',
-                    dataIndex: 'buyerName',
-                    key: 'buyerName'
-                }, 
-                {
-                    title: '订单金额(万元)',
-                    dataIndex: 'signTotalAmount',
-                    key: 'signTotalAmount'
-                }, {
-                    title: '结算状态',
-                    dataIndex: 'liquidationStatus',
-                    key: 'liquidationStatus',
-                    render:(text)=>{return getPaymentState(text) }
-                }, {
-                    title: '订单状态',
-                    dataIndex: 'orderStatus',
-                    key: 'orderStatus',
-                    render:(text)=>{return getOrderState(text) }
-                },{
-                    title: '订单渠道',
-                    dataIndex: 'orderChannel',
-                    key: 'orderChannel',
-                    render:(text)=>{return getOrderChannel(text) }
-                },{
-                    title: '操作',
-                    dataIndex: 'operation',
-                    key: 'operation',
-                    render: (text, record, index) => {
-						return <div>
-							    	<Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation(),this.confirmDelet(record)}} type="primary">派单</Button>               
-                        	   </div>
-					}
-                }
-            ],
-            userList:[
-            	{
-                    title: '用户编号',
-                    dataIndex: 'userNo',
-                    key: 'userNo'
-                }, {
-                    title: '用户姓名',
-                    dataIndex: 'name',
-                    key: 'name'
-                },{
-                    title: '部门机构',
-                    dataIndex: 'departmentName',
-                    key: 'departmentName'
-                }, {
-                    title: '职务',
-                    dataIndex: 'position',
-                    key: 'position'
-                },{
-                    title: '联系手机',
-                    dataIndex: 'mobile',
-                    key: 'mobile'
-                }, {
-                    title: '操作',
-                    dataIndex: 'abc',
-                    key: 'abc',
-                    render:(text,record,index)=>{
-                    	return (
-                    	    <Popconfirm title={'您确认将订单 【'+this.state.orderNos+'】 分配给【'+record.departmentName+'-'+record.name+'】?'} onConfirm={(e)=>{this.confirmSelect(record)}} okText="确认" cancelText="取消">
-							    <Button style={{marginRight:'5px'}} type="primary">选定</Button>                 
-							</Popconfirm>
-							)
-                    }
-                }
-            ],
-            dataSource: [],
-        };
-    },
-    //操作分配
-    confirmDelet(index){
-    	this.setState({
-    		orderNos:index.orderNo,
-    		userDetaile:false,
-    		distributionVisible:true
-    	});
-    	this.departmentList()
-    },
-    distributionCancel(){
-    	this.setState({
-    		distributionVisible:false
-    	})
-    },
-    //分配对象列表
-    contactList(){
-        $.ajax({
-            method: "get",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context + '/api/admin/superviser/adminList',
-            data: {
-                pageNo: 1,
-                pageSize: 99,
-                departmentId:this.state.departmenttList,
-                name:this.state.financeNameSearch,
-            },
-            success: function (data) {
-                let theArr = [];
-                if (!data.data) {
-                    if (data.error && data.error.length) {
-                        message.warning(data.error[0].message);
-                    };
-                } else {
-                    for (let i = 0; i < data.data.list.length; i++) {
-                        let thisdata = data.data.list[i];
-                        theArr.push({
-                             key: i,
-	                         id: thisdata.id,
-	                         userNo: thisdata.userNo,
-	                         name:thisdata.name,
-	                         departmentName:thisdata.departmentName,
-	                         departmentId:thisdata.departmentId,
-	                         position:thisdata.position,
-	                         mobile:thisdata.mobile,
-                        });
-                    };
-                };
-                this.setState({
-                    distributionList: theArr,
-                });
-            }.bind(this),
-        }).always(function () {
-            this.setState({
-                loading: false
-            });
-        }.bind(this));
-    },
-    //选定对象
-    confirmSelect(record){
-    	this.setState({
-            loading: true
-        });
-        $.ajax({
-            method: "get",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context + "/api/admin/order/appointSalesman",
-            data: {
-            	orderNo:this.state.orderNos,
-            	salesmanId:record.id
-            }
-        }).done(function (data) {
-            if (!data.error.length) {
-                message.success('派单成功');
-                this.setState({
-                    loading: false,
-                });
-                this.distributionCancel();
-            } else {
-                message.warning(data.error[0].message);
-            };
-            this.loadData(this.state.pageNos);
-        }.bind(this));
-    },
-    componentWillMount() {
-        this.loadData();
-    },
-    tableRowClick(record, index) {
-    	this.state.userDetaile=true;
-        this.state.datauser = record;
-        this.setState({
-            showDesc: true
-        });
-    },
-    closeDesc(e, s) {
-    	this.state.userDetaile=false;
-        this.state.showDesc = e;
-        if (s) {
-            this.loadData(this.state.pageNos);
-        };
-    },
-    searchSwitch() {
-		this.setState({
-			searchMore: !this.state.searchMore
-		});
-	},
-    search() {
-        this.loadData();
-    },
-    searchOrder(){
-    	this.contactList();
-    },
-    resetOrder(){
-    	this.state.departmenttList=undefined;
-    	this.state.financeNameSearch='';
-    	this.setState({
-    		distributionList:[]
-    	});
-    },
-    reset() {
-    	this.state.customerNameSearch='';
-    	this.state.releaseDate[0] = undefined;
-		this.state.releaseDate[1] = undefined;
-		this.state.contractProgressSearch = undefined;
-		this.state.projectProgressSearch = undefined;
-		this.state.settlementStateSearch = undefined;
-		this.state.orderStatusSearch = undefined;
-		this.state.approvedSearch = undefined;
-		this.state.orderChannelSearch = undefined;
-		this.state.orderTypeSearch=undefined;
-        this.loadData();       
-    },
-    changeList(arr) {
-        const newArr = [];
-        this.state.columns.forEach(item => {
-            arr.forEach(val => {
-                if (val === item.title) {
-                    newArr.push(item);
-                }
-            });
-        });
-        this.setState({
-            changeList: newArr
-        });
-    },
-    render() {
-        const rowSelection = {
-            selectedRowKeys: this.state.selectedRowKeys,
-            onChange: (selectedRowKeys, selectedRows) => {
-	                this.setState({
-	                    selectedRows: selectedRows.slice(-1),
-	                    selectedRowKeys: selectedRowKeys.slice(-1)
-	                }); 
-            },
-            onSelectAll: (selected, selectedRows, changeRows) => {
-			   this.setState({
-			   		selectedRowKeys:[]
-			   })
-			},
-        };
-        let departmentArr = this.state.departmentArr || [];
-        const hasSelected = this.state.selectedRowKeys.length > 0;
-        const { RangePicker } = DatePicker;
-        return (
-            <div className="user-content" >
-                <div className="content-title">
-                    <span style={{fontSize:'16px'}}>公共订单</span>	
-                            <Tabs
-          defaultActiveKey="1"
-          onChange={this.callback}
-          className="test">
-             <TabPane tab="搜索" key="1">
-	                <div className="user-search">
-	                    <Input placeholder="客户名称" style={{width:'150px',marginLeft:10}}
-	                        value={this.state.customerNameSearch}
-	                        onChange={(e) => { this.setState({ customerNameSearch: e.target.value }); }} />
-	                    <RangePicker
-		                        value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
-		                        this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
-		                        onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />     
-	                    <Button type="primary" onClick={this.search} style={{marginLeft:'10px'}}>搜索</Button>
-	                    <Button onClick={this.reset}>重置</Button>
-	                    <span style={{marginLeft:'10px',marginRight:'20px'}}>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>    
-	                </div>
-	                <div className='clearfix' style={{marginTop:'5px'}}>
-	                  <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>                    			                  
-	                        <Select placeholder="订单状态"
-	                            style={{ width: 150 ,marginRight:'10px',marginBottom:'10px',marginLeft:10}}
-	                            value={this.state.orderStatusSearch}
-	                            onChange={(e) => { this.setState({ orderStatusSearch: e }) }}>
-	                            {
-                                    orderState.map(function (item) {
-                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
-                                    })
-                                }
-	                        </Select>
-	                        <Select placeholder="订单渠道"
-	                            style={{ width: 150,marginRight:'10px' }}
-	                            value={this.state.orderChannelSearch}
-	                            onChange={(e) => { this.setState({ orderChannelSearch: e }) }}>
-	                            {
-                                    orderChannel.map(function (item) {
-                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
-                                    })
-                                }
-	                        </Select>
-	                        <Select placeholder="订单类型"
-	                            style={{ width: 150 }}
-	                            value={this.state.orderTypeSearch}
-	                            onChange={(e) => { this.setState({ orderTypeSearch: e }) }}>
-	                            {
-                                    orderType.map(function (item) {
-                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
-                                    })
-                                }
-	                        </Select>
-	                    </div>
-	                </div>
-            </TabPane>
-            <TabPane tab="更改表格显示数据" key="2">
-                <div style={{ marginLeft: 10 }}>
-                    <ChooseList
-                        columns={this.state.columns}
-                        changeFn={this.changeList}
-                        changeList={this.state.changeList}
-                        top={55}
-                        margin={11}
-                    />
-                </div>
-            </TabPane>
-            </Tabs>
-                    <div className="patent-table">
-	                    <Spin spinning={this.state.loading}>
-	                        <Table columns={
-                                this.state.changeList
-                                    ? this.state.changeList
-                                    : this.state.columns
-                            }
-	                            dataSource={this.state.dataSource}
-	                            rowSelection={rowSelection}
-	                            pagination={this.state.pagination}
-                                onRowClick={this.tableRowClick}
-                                bordered
-                                size="small"
-                                 />
-	                    </Spin>
-	                </div>
-	                <PublicOrderDetaile
-	                	confirmDelet={this.confirmDelet}
-	                    userDetaile={this.state.userDetaile}
-	                    datauser={this.state.datauser}
-	                    showDesc={this.state.showDesc}
-	                    closeDesc={this.closeDesc} />
-	            </div >
-	            <Modal maskClosable={false} visible={this.state.distributionVisible}
-                        onOk={this.distributionCancel} onCancel={this.distributionCancel}
-                        width='800px'
-                        title='派单'                     
-                        footer=''
-                        className="admin-desc-content">
-			            <Form layout="horizontal" onSubmit={this.handleSubmit} id="demand-form" style={{paddingBottom:'40px'}} >
-			                <Spin spinning={this.state.loading}>
-			                	<div>
-			                		<Select placeholder="订单部门"
-				                            style={{ width: 150 ,marginRight:'10px',marginLeft:'10px'}}
-				                            value={this.state.departmenttList}
-				                            onChange={(e) => { this.setState({ departmenttList: e }) }}>
-				                            {
-			                                    departmentArr.map(function (item) {
-			                                            return <Select.Option key={item.id} >{item.name}</Select.Option>
-			                                    })
-			                                }
-				                    </Select>
-				                    <Input placeholder="任务负责人" style={{width:'150px',marginLeft:'10px'}}
-				                        value={this.state.financeNameSearch}
-				                        onChange={(e) => { this.setState({ financeNameSearch: e.target.value }); }} />  
-				                    <Button type="primary" onClick={this.searchOrder} style={{marginLeft:'10px',marginRight:'10px'}}>搜索</Button>
-	                    			<Button onClick={this.resetOrder}>重置</Button>
-			                	</div>
-			                	 <div className="patent-table" style={{marginTop:'10px'}}>
-				                    <Spin spinning={this.state.loading}>
-				                        <Table size="middle" columns={this.state.userList}
-				                            dataSource={this.state.distributionList}
-				                            pagination={false}
-				                             />
-				                    </Spin>
-				                </div>
-			                </Spin>
-			            </Form>
-			    </Modal>
-            </div>
-        );
-    }
-}));
-
-export default PublicOrder;
-

+ 0 - 526
js/component/manageCenter/order/orderManagement/publicOrder/publicOrderDetaile.jsx

@@ -1,526 +0,0 @@
-import React from 'react';
-import { Icon, Table, Modal, message, Spin, Input, Select, Button, Form ,Upload,Popconfirm,AutoComplete} from 'antd';
-import ajax from 'jquery/src/ajax/xhr.js';
-import $ from 'jquery/src/ajax';
-import '../../userMangagement.less';
-import {getApprovedState,getPaymentState,getOrderState,getProjectState,getOrderChannel,getOrderType,getTransactionProject,getTransactionChannel} from '../../../../tools.js';
-
-const ApproveDetaile = Form.create()(React.createClass({
-	loadData(record) {
-        this.state.data = [];
-        this.setState({
-            loading: true
-        });
-        $.ajax({
-            method: "get",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context + '/api/admin/order/getOrderCommodity',
-            data: {
-            	orderNo:record?record.orderNo:this.props.datauser.orderNo
-            },
-            success: function (data) {
-                let theArr = [];
-                if (!data.data) {
-                    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];
-                        theArr.push({
-                             key: i,
-                             id:thisdata.id,
-                             orderNo:thisdata.orderNo,
-                             commodityName:thisdata.commodityName,
-                             commodityType:thisdata.commodityType,
-                             commodityMode:thisdata.commodityMode,
-                             commodityQuantity:thisdata.commodityQuantity,
-                             commodityPrice:thisdata.commodityPrice,
-                             discountPrice:thisdata.discountPrice,
-                             commodityFirstPayment:thisdata.commodityFirstPayment,
-                             createTimes:thisdata.createTimes,
-                             discountFirstPayment:thisdata.discountFirstPayment,
-                             remarks:thisdata.remarks,
-                        });
-                    };
-                   }
-                this.setState({
-                    dataSource: theArr,
-                });
-            }.bind(this),
-        }).always(function () {
-            this.setState({
-                loading: false
-            });
-        }.bind(this));
-    },
-	getInitialState() {
-		return {
-			loading: false,
-			visible: false,
-			lookState:true,
-			orgCodeUrl:[],
-			lookflowList:[],
-			checkedKeys: [],
-			columns: [
-				{
-                    title: '业务项目名称',
-                    dataIndex: 'commodityName',
-                    key: 'commodityName'
-                }, {
-                    title: '项目类别',
-                    dataIndex: 'commodityType',
-                    key: 'commodityType',
-                    render:(text)=>{
-                    	return (getOrderType(text))
-                    }
-                },{
-                    title: '项目数量',
-                    dataIndex: 'commodityQuantity',
-                    key: 'commodityQuantity'
-                }, {
-                    title: '服务市价(万元)',
-                    dataIndex: 'commodityPrice',
-                    key: 'commodityPrice'
-                }, {
-                    title: '实签价格(万元)',
-                    dataIndex: 'discountPrice',
-                    key: 'discountPrice'
-                }, {
-                    title: '下单时间',
-                    dataIndex: 'createTimes',
-                    key: 'createTimes'
-                }, {
-                    title: '项目说明',
-                    dataIndex: 'remarks',
-                    key: 'remarks',
-					render:(text)=>{
-						return (text&&text.length>8?text.substr(0,8)+'…':text)
-					}
-                }
-			],
-			flowList:[
-				{
-                    title: '平台流水号',
-                    dataIndex: 'billNo',
-                    key: 'billNo',
-                }, {
-                    title: '平台流水时间',
-                    dataIndex: 'createTime',
-                    key: 'createTime'
-                }, {
-                    title: '流水金额(万元)',
-                    dataIndex: 'transactionAmount',
-                    key: 'transactionAmount'
-                },{
-                    title: '付款人名称',
-                    dataIndex: 'payerName',
-                    key: 'payerName'
-                }, {
-                    title: '收款人名称',
-                    dataIndex: 'payeeName',
-                    key: 'payeeName'
-                },
-                {
-                    title: '流水科目',
-                    dataIndex: 'transactionSubject',
-                    key: 'transactionSubject',
-                    render:(text)=>{return getTransactionProject(text) }
-                }, {
-                    title: '流水渠道',
-                    dataIndex: 'transactionChannel',
-                    key: 'transactionChannel',
-                    render:(text)=>{return getTransactionChannel(text) }
-                },{
-                    title: '财务流水号',
-                    dataIndex: 'financialPayNo',
-                    key: 'financialPayNo',
-                }, {
-                    title: '财务流水时间',
-                    dataIndex: 'financialPayTime',
-                    key: 'financialPayTime',
-                }, {
-                    title: '流水确认',
-                    dataIndex: 'confirmSign',
-                    key: 'confirmSign',
-                    render:(text)=>{return text?'已确认':'待确认' }
-                },{
-                    title: '确认时间',
-                    dataIndex: 'confirmTime',
-                    key: 'confirmTime',
-                }
-			]
-		};
-	},
-	//查看基本详情基本信息
-    loaduser(record){
-    	if(record){
-    	this.state.orderList=[]
-    	$.ajax({
-            method: "get",
-			dataType: "json",
-			crossDomain: false,
-			url: globalConfig.context + '/api/admin/order/getServiceOrderDetail',
-            data: {
-              orderNo: record.orderNo
-            },
-            success: function (data) {
-                let thisData = data.data;                
-                if (!thisData) {
-                    if (data.error && data.error.length) {
-                        message.warning(data.error[0].message);
-                    };
-                    thisData = {};
-                };
-                this.setState({
-					id:thisData.id,
-					orderList:thisData,
-					orderAmount:thisData.orderAmount,
-					firstPayment:thisData.firstPayment,
-					signTotalAmount:thisData.signTotalAmount,
-					signFirstPayment:thisData.signFirstPayment,
-					approval:thisData.approval==0?thisData.approval.toString():thisData.approval,
-					orderRemarks:thisData.orderRemarks,
-                    orgCodeUrl: thisData.orgCodeUrl ? splitUrl(thisData.orgCodeUrl, ',', globalConfig.avatarHost + '/upload') : [],
-               		//签单
-               		orderNo:thisData.orderNo,//订单编号
-               		buyerName:thisData.buyerName,
-                });
-            }.bind(this),
-       }).always(function () {
-            this.setState({            	
-                loading: false
-            });
-        }.bind(this));  
-       }
-    },
-	handleOk(e) {
-		this.setState({
-			visible: false,
-		});
-		this.props.closeDesc(false, true);
-	},
-	handleCancel(e) {
-		this.setState({
-			visible: false,
-		});
-		this.props.closeDesc(false);
-	},
-	nextCancel() {
-		this.setState({
-			addnextVisible: false
-		})
-	},
-	lookflow(){
-		this.setState({
-			loading: true,
-			lookVisible:true,
-		})
-		this.state.lookSource=[];
-        $.ajax({
-            method: "get",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context +'/api/admin/order/getBillByOrderNo',
-            data: {
-            	orderNo:this.props.datauser.orderNo,
-            },
-            success: function (data) {
-                let theArr = [];
-                if (!data.data) {
-                    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];
-                        theArr.push({
-                             key: i,
-	                         billNo: thisdata.billNo,
-	                         transactionAmount:thisdata.transactionAmount,
-	                         createTime:thisdata.createTime, 
-	                         transactionAmount:thisdata.transactionAmount,
-	                         payerName:thisdata.payerName,
-	                         payeeName:thisdata.payeeName,
-	                         transactionSubject:thisdata.transactionSubject,
-	                         transactionChannel:thisdata.transactionChannel,
-	                         financialPayNo:thisdata.financialPayNo,
-	                         financialPayTime:thisdata.financialPayTime,
-	                         orderNo:thisdata.orderNo,
-	                         departmentName:thisdata.departmentName,
-	                         salesmanName:thisdata.salesmanName,
-	                         financeName:thisdata.financeName,
-	                         confirmSign:thisdata.confirmSign,
-	                         deleteSign:thisdata.deleteSign,
-	                         confirmTime:thisdata.confirmTime
-                        });
-                    };
-                };
-                this.setState({
-                    lookflowList: theArr,
-                });
-            }.bind(this),
-        }).always(function () {
-            this.setState({
-                loading: false
-            });
-        }.bind(this));
-	},
-	lookCancel(){
-		this.setState({
-			lookVisible:false
-		})
-	},
-	tableRowClick(record, index) {
-       this.setState({
-        	editFw:record,
-        	addnextVisible:true,
-        });
-    },
-	componentWillMount() {
-		
-	},
-	componentWillReceiveProps(nextProps) { //props改变时触发
-		this.state.visible = nextProps.showDesc;
-		if(nextProps.userDetaile && nextProps.showDesc ) {
-			this.loaduser(nextProps.datauser);
-			this.loadData(nextProps.datauser);
-		}
-	},
-	render() {
-		const FormItem = Form.Item
-		const formItemLayout = {
-			labelCol: { span: 8 },
-			wrapperCol: { span: 14 },
-		};
-		const editFws=this.state.editFw || [];
-		const orderDetaiel=this.state.orderList || [];
-		return(
-			<div>
-            <Modal maskClosable={false} visible={this.state.visible}
-                        onOk={this.handleOk} onCancel={this.handleCancel}
-                        width='1000px'
-                        title='订单详情'                     
-                        footer=''
-                        className="admin-desc-content">
-			            <Form layout="horizontal" id="demand-form" style={{paddingBottom:'40px'}}  >
-			                <Spin spinning={this.state.loading}>
-		                        <div className="clearfix">
-		                            <div className="clearfix">
-			                       		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="订单编号" >
-				                            <span>{orderDetaiel.orderNo}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="下单时间" >  
-				                            <span>{orderDetaiel.createTime}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="客户名称" >  
-				                            <span>{orderDetaiel.buyerName}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="订单类型" >  
-				                            <span>{getOrderType(orderDetaiel.orderType)}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="订单渠道" >  
-				                            <span>{getOrderChannel(orderDetaiel.orderChannel)}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="订单状态" >  
-				                            <span>{getOrderState(orderDetaiel.orderStatus)}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="已收款项" >  
-				                            <span>{orderDetaiel.actuallyTotalAmount+'万元'}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="结算状态" >  
-				                            <span>{getPaymentState(orderDetaiel.liquidationStatus)}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="市价订单金额" >    
-			                            	<span>{orderDetaiel.orderAmount+'万元'}</span>
-					                    </FormItem>
-					                    <FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="市价首款金额" >   
-				                            <span>{orderDetaiel.firstPayment+'万元'}</span>
-					                    </FormItem>
-					                    <div className='clearfix'>
-								        	<FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="实签订单金额" >   
-					                            <span>{orderDetaiel.signTotalAmount+'万元'}</span>
-				                    		</FormItem>
-				                    		<FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="实签首款金额" >   
-					                            <span>{orderDetaiel.signFirstPayment+'万元'}</span>
-				                    		</FormItem>
-				                    		<FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="特批立项" >   
-					                            <span>{getApprovedState(orderDetaiel.approval)}</span>
-				                    		</FormItem>
-				                    		<FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="合同编号" >   
-					                            <span>{orderDetaiel.contractNo}</span>
-				                    		</FormItem>
-					                        <div className='clearfix'>
-									        	<FormItem
-										            labelCol={{ span: 4 }}
-										            wrapperCol={{ span: 16 }}
-										            label="订单留言" >
-									        		<span>{orderDetaiel.orderRemarks}</span>
-										        </FormItem>
-									        </div>
-								        </div>
-			                        </div>
-			                        <div className='clearfix'>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="订单负责人" >  
-				                            <span>{orderDetaiel.salesmanName}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="业务品类" >  
-				                            <span>{orderDetaiel.projectType}</span>
-			                    		</FormItem>
-			                    	</div>
-			                    	<div className='clearfix'>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="意向时间" >  
-				                            <span>{orderDetaiel.createTime}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="签单时间" >  
-				                            <span>{orderDetaiel.signTime}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="财务负责人" >  
-						                    <span>{orderDetaiel.financeName}</span>
-						                    <Button onClick={this.lookflow} style={{float:'right'}}>查看流水</Button>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="项目负责人" >  
-				                            <span>{orderDetaiel.technicianName}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="立项时间" >  
-				                            <span>{orderDetaiel.setUpTime}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="项目状态" >  
-				                            <span>{getProjectState(orderDetaiel.projectStage)}</span>
-			                    		</FormItem>
-		                    		</div>
-					                <div>
-					                	<span style={{marginLeft:'50px',fontSize:'20px'}}>业务项目</span>
-					                </div>
-					                <div className="patent-table">
-					                    <Spin spinning={this.state.loading}>
-					                        <Table size="middle" columns={this.state.columns}
-					                            dataSource={this.state.dataSource}
-					                            pagination={false}
-					                            onRowClick={this.tableRowClick} 
-					                            />
-					                    </Spin>
-						            </div>
-			                    </div>
-			                </Spin>
-			            </Form >
-			        </Modal> 
-			        <Modal maskClosable={false} visible={this.state.addnextVisible}
-                        onOk={this.nextCancel} onCancel={this.nextCancel}
-                        width='550px'
-                        title='查看项目详细'                     
-                        footer=''
-                        className="admin-desc-content">
-			            <Form layout="horizontal" id="demand-form">
-			                <Spin spinning={this.state.loading}>
-		                        <div className="clearfix">
-	                        	   <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="业务项目名称" >
-		                    			<span>{editFws.commodityName}</span>
-			                    	</FormItem>
-			                    	<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="服务市价" >
-		                    			<span>{editFws.commodityPrice+'万元'}</span>
-			                    	</FormItem>
-			                    	<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="实签价格" >
-		                    			<span>{editFws.discountPrice+'万元'}</span>
-			                    	</FormItem>
-			                    	<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="服务数量" >
-		                    			<span>{editFws.commodityQuantity}</span>
-			                    	</FormItem>
-				                    <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="市场首付金额" >   
-		                                <span>{editFws.commodityFirstPayment+'万元'}</span>    
-				                    </FormItem>
-				                    <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="签单首付金额" >   
-		                                <span>{editFws.discountFirstPayment+'万元'}</span>    
-				                    </FormItem>
-				                    <div className='clearfix'>
-				                    	<FormItem 
-				                            labelCol={{ span: 4 }}
-								            wrapperCol={{ span: 16 }}
-				                            label="项目说明" >
-			                    			<span>{editFws.remarks}</span>
-				                    	</FormItem>
-			                    	</div>
-		                        </div>
-			                </Spin>
-			            </Form >
-			        </Modal>
-			        <Modal maskClosable={false} visible={this.state.lookVisible}
-                        onOk={this.lookCancel} onCancel={this.lookCancel}
-                        width='1300px'
-                        title= '查看流水'                   
-                        footer=''
-                        className="admin-desc-content">
-			            <Form layout="horizontal" id="demand-form">
-			                <Spin spinning={this.state.loading}>
-		                        <div className="clearfix">
-                    	   			<Table columns={this.state.flowList}
-				                           dataSource={this.state.lookflowList}
-				                           pagination={false}
-		                             />
-		                        </div>
-			                </Spin>
-			            </Form >
-			        </Modal>
-    	    </div>
-		)
-	}
-}));
-
-export default ApproveDetaile;

+ 0 - 17
js/component/manageCenter/order/orderNew/contractChangeDsz.jsx

@@ -1,17 +0,0 @@
-import React, { Component } from "react";
-import ContractChange from "./contractCwzj.js";
-
-class ContractChangeDsz extends Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      processState: 8
-    };
-  }
-
-  render() {
-    return <ContractChange processState={this.state.processState} />;
-  }
-}
-
-export default ContractChangeDsz;

+ 0 - 19
js/component/manageCenter/order/orderNew/contractChangeYxgly.jsx

@@ -1,19 +0,0 @@
-import React, { Component } from "react";
-import ContractChange from "./contractYxgly.js";
-
-class ContractChangeYxgly extends Component {
-    constructor(props) {
-        super(props);
-        this.state = {
-          processState:1
-        };
-    }
-
-    render() {
-        return (
-            <ContractChange processState={this.state.processState}/>
-        )
-    }
-}
-
-export default ContractChangeYxgly;

+ 0 - 17
js/component/manageCenter/order/orderNew/contractChangeYxy.jsx

@@ -1,17 +0,0 @@
-import React, { Component } from "react";
-import ContractChange from "./contractYxy.js";
-
-class ContractChangeYxy extends Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      processState: 0
-    };
-  }
-
-  render() {
-    return <ContractChange processState={this.state.processState} />;
-  }
-}
-
-export default ContractChangeYxy;

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 1644
js/component/manageCenter/order/orderNew/contractCwzy.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 1395
js/component/manageCenter/order/orderNew/contractJsjl.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 1334
js/component/manageCenter/order/orderNew/contractJsy.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 1389
js/component/manageCenter/order/orderNew/contractJszj.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 1442
js/component/manageCenter/order/orderNew/contractYxy.js


+ 27 - 27
js/component/manageCenter/project/content.jsx

@@ -166,35 +166,35 @@ class Content extends Component {
           //   });
           //   break;
           //合同变更审核列表
-          case "contractChangeJsy":
-            require.ensure([], () => {
-              const ContractChangeJsy = require("./task/contractChangeJsy")
-                .default;
-              this.setState({
-                component: <ContractChangeJsy ApiUrl={""} />
-              });
-            });
-            break;
+          // case "contractChangeJsy":
+          //   require.ensure([], () => {
+          //     const ContractChangeJsy = require("./task/contractChangeJsy")
+          //       .default;
+          //     this.setState({
+          //       component: <ContractChangeJsy ApiUrl={""} />
+          //     });
+          //   });
+          //   break;
           //合同变更审核列表
-          case "contractChangeJsjl":
-            require.ensure([], () => {
-              const ContractChangeJsjl = require("./task/contractChangeJsjl")
-                .default;
-              this.setState({
-                component: <ContractChangeJsjl ApiUrl={""} />
-              });
-            });
-            break;
+          // case "contractChangeJsjl":
+          //   require.ensure([], () => {
+          //     const ContractChangeJsjl = require("./task/contractChangeJsjl")
+          //       .default;
+          //     this.setState({
+          //       component: <ContractChangeJsjl ApiUrl={""} />
+          //     });
+          //   });
+          //   break;
           //合同变更审核列表
-          case "contractChangeJszj":
-            require.ensure([], () => {
-              const ContractChangeJszj = require("./task/contractChangeJszj")
-                .default;
-              this.setState({
-                component: <ContractChangeJszj ApiUrl={""} />
-              });
-            });
-            break;
+          // case "contractChangeJszj":
+          //   require.ensure([], () => {
+          //     const ContractChangeJszj = require("./task/contractChangeJszj")
+          //       .default;
+          //     this.setState({
+          //       component: <ContractChangeJszj ApiUrl={""} />
+          //     });
+          //   });
+          //   break;
             //付款申请驳回列表
             case "payApplyReject":
                 require.ensure([], () => {

+ 0 - 17
js/component/manageCenter/project/task/contractChangeJsjl.jsx

@@ -1,17 +0,0 @@
-import React, { Component } from "react";
-import ContractChange from "../../order/orderNew/contractJsjl.js";
-
-class ContractChangeJsjl extends Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      processState: 3
-    };
-  }
-
-  render() {
-    return <ContractChange processState={this.state.processState} />;
-  }
-}
-
-export default ContractChangeJsjl;

+ 0 - 17
js/component/manageCenter/project/task/contractChangeJsy.jsx

@@ -1,17 +0,0 @@
-import React, { Component } from "react";
-import ContractChange from "../../order/orderNew/contractJsy.js";
-
-class ContractChangeJsy extends Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      processState: 2
-    };
-  }
-
-  render() {
-    return <ContractChange processState={this.state.processState} />;
-  }
-}
-
-export default ContractChangeJsy;

+ 0 - 17
js/component/manageCenter/project/task/contractChangeJszj.jsx

@@ -1,17 +0,0 @@
-import React, { Component } from "react";
-import ContractChange from "../../order/orderNew/contractJszj.js";
-
-class ContractChangeJszj extends Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      processState: 4
-    };
-  }
-
-  render() {
-    return <ContractChange processState={this.state.processState} />;
-  }
-}
-
-export default ContractChangeJszj;