hujie123456 5 years ago
parent
commit
699b65830a

+ 206 - 17
js/component/manageCenter/customer/NEW/signCustomer/intentionDetail/detail/business.jsx

@@ -1,5 +1,16 @@
 import React from 'react';
-import {Form,Button,Spin,message,Table,Popconfirm} from 'antd';
+import {
+  Form,
+  Button,
+  Spin,
+  message,
+  Table,
+  Popconfirm,
+  Modal,
+  AutoComplete,
+  Input,
+  Select
+} from "antd";
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import {getfllowSituation,getcustomerStatue} from '@/tools.js';
@@ -8,6 +19,8 @@ import BusinessDetail from './businessDetail.jsx';
 const Business = React.createClass({
 	getInitialState(){
 		return{
+			selectedRowKeys:[],
+			bVisible: false,
 			loading:false,
 			dataBusiness:[],
 			followData:{},
@@ -53,10 +66,139 @@ const Business = React.createClass({
 				title: '操作',
 				dataIndex: 'ooo',
 				key: 'ooo',
-				render: (text, record) => { return(<Button onClick={(e)=>{this.businessIntentionDetails(record)}}>查看</Button>) }
+				render: (text, record) => { 
+					const dataSources = this.state.customerArr || [];
+					console.log(this.state.customerArr);
+					const options = dataSources.map(group => (
+						<Select.Option key={group.id} value={group.name}>
+						{group.name}
+						</Select.Option>
+					));
+					return (
+						<div className="control">
+						<Button
+							onClick={e => {
+							this.businessIntentionDetails(record);
+							}}
+						>
+							查看
+						</Button>
+						<AutoComplete
+							className="certain-category-search"
+							dropdownClassName="certain-category-search-dropdown"
+							dropdownMatchSelectWidth={false}
+							dropdownStyle={{ width: 120 }}
+							style={{
+							width: "120px",
+							marginLeft: 10,
+							visibility:
+								this.state.selectedRowKeys[0] == record.businessProjectId &&
+								record.followSituation == 5
+								? "visible"
+								: "hidden"
+							}}
+							dataSource={options}
+							placeholder="输入转交人姓名"
+							onChange={this.httpChange}
+							filterOption={true}
+							onBlur={this.blurChange}
+							onSelect={this.selectAuto}
+						>
+							<Input />
+						</AutoComplete>
+						<Button
+							style={{ marginLeft: 10 }}
+							onClick={e => {
+							this.changeBusiness(record);
+							}}
+							style={{
+							marginLeft: 10,
+							visibility:
+								this.state.selectedRowKeys[0] == record.businessProjectId &&
+								record.followSituation == 5
+								? "visible"
+								: "hidden"
+							}}
+						>
+							转交业务
+						</Button>
+						</div>
+          ); }
 			}],
 		}
 	},
+	componentDidMount() {
+		// console.log(document.querySelectorAll(".control"));
+		window.setTimeout(() => {
+			let dom = document.querySelectorAll(".control")
+			for(let i = 0; i < dom.length; i++) {
+				document.querySelectorAll(".control")[i].parentNode.style.width = "300px"
+			}
+		},100)
+		
+	},
+	//指定转交人自动补全
+	supervisor(e){ 
+		$.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/customer/listAdminByName",
+            data:{
+            	adminName:e
+            },
+            success: function (data) {                	  
+				       let thedata=data.data;
+				    if (!thedata) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    };	
+                    thedata = {}; 
+              }; 
+					this.setState({
+						customerArr:thedata,	
+                    });
+				}.bind(this),
+			}).always(function () {
+				console.log(this.state.customerArr);
+            this.setState({
+                loading: false
+            });
+        }.bind(this));  
+	},
+	//输入转交人输入框失去焦点是判断客户是否存在
+	selectAuto(value,options){
+		this.setState({
+			auto:value
+		})
+		console.log(this.state.auto);
+		
+	},
+	blurChange(e){
+		let theType='';
+		let contactLists=this.state.customerArr||[];
+			if (e) {
+            contactLists.map(function (item) {
+                if (item.name == e.toString()) {
+                    theType = item.id;
+                }
+           });     
+   	    }
+		this.setState({
+			theTypes:theType
+		})
+		console.log(this.state.theTypes);
+		
+	},
+	//值改变时请求客户名称
+	httpChange(e){
+		if(e.length>=1){
+			this.supervisor(e); 
+		}	
+		this.setState({
+			auto:e
+		})
+	},
 	businessIntentionDetails(record){
 		this.setState({
 			followData: record,
@@ -88,7 +230,7 @@ const Business = React.createClass({
 					for(let i = 0; i < data.data.list.length; i++) {
 						let thisdata = data.data.list[i];
 						theArr.push({
-							key: i,
+							key: thisdata.businessProjectId,
 							businessId: thisdata.businessId,
 							businessProjectId:thisdata.businessProjectId,
 							businessName: thisdata.businessName,
@@ -131,23 +273,70 @@ const Business = React.createClass({
 			businessModul:false
 		})
 	},
+	changeBusiness(e) {
+		console.log(e);
+		this.setState({
+			loading: true
+		});
+		$.ajax({
+			method: "post",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + '/api/admin/customer/privateBusinessTransfer',
+			data: {
+				inputId: this.state.theTypes,
+				pid: e.businessProjectId,
+				uid: this.props.data.id
+			},
+			success: function(data) {
+				if(data.error.length || data.data.list == "") {
+					if(data.error && data.error.length) {
+						message.warning(data.error[0].message);
+					};
+				} else {
+						message.success("转交成功!")
+						this.BusinessList()
+						this.setState({
+							selectedRowKeys: []
+						})
+				}
+			}.bind(this),
+		}).always(function() {
+			this.setState({
+				loading: false
+			});
+		}.bind(this));
+	},
+	onSelectChange(selectedRowKeys) {
+		console.log(selectedRowKeys);
+		this.setState({
+			selectedRowKeys
+		})
+	},
 	render(){
-		return(
+		const { selectedRowKeys } = this.state;
+		const rowSelection = {
+			selectedRowKeys,
+			onChange: this.onSelectChange,
+			type: "radio"
+		};
+		return (
 			<div className="clearfix">
-			    <Spin spinning={this.state.loading}>
-			      <Table 
-	            	 pagination={this.state.paginationt}
-	            	 columns={this.state.businessIntentionList} 
-	            	 dataSource={this.state.dataBusiness}
-	            	 />
-			    </Spin> 
-			    <BusinessDetail 
-			    	ids={this.props.data.id}
-			    	data={this.state.followData}
-			    	businessModul={this.state.businessModul}
-			    />
+				<Spin spinning={this.state.loading}>
+				<Table
+					pagination={this.state.paginationt}
+					columns={this.state.businessIntentionList}
+					dataSource={this.state.dataBusiness}
+					rowSelection={rowSelection}
+				/>
+				</Spin>
+				<BusinessDetail
+					ids={this.props.data.id}
+					data={this.state.followData}
+					businessModul={this.state.businessModul}
+				/>
 			</div>
-		)
+    	);
 	}
 })
 

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

@@ -1567,7 +1567,7 @@ const approvedOutsourcing = React.createClass({
               详情收款流水
             </Button>
           </TabPane>
-          <TabPane tab="批量操作" key="6">
+          {/* <TabPane tab="批量操作" key="6">
             <Button
               type="primary"
               disabled={this.state.selectedRowKeys.length == 0}
@@ -1579,7 +1579,7 @@ const approvedOutsourcing = React.createClass({
             >
               转交
             </Button>
-          </TabPane>
+          </TabPane> */}
         </Tabs>
 
         <div className="patent-table">

+ 27 - 18
js/component/manageCenter/financialManage/distribute/huiKuan.jsx

@@ -167,6 +167,7 @@ const HuiKuan = React.createClass({
 
   getInitialState() {
     return {
+      mergeModal: false,
       visible: false,
       selectedRowKeys: [], // Check here to configure the default column
       loading: false,
@@ -849,22 +850,18 @@ const HuiKuan = React.createClass({
                 删除全部
               </Button>
             </Popconfirm>
-
-            <Popconfirm
-              placement="top"
-              title={"您确定要合并全部的回款信息吗?合并后,不可以修改!"}
-              onConfirm={this.mergeAll}
-              okText="确定"
-              cancelText="取消"
+            <Button
+              type="danger"
+              style={{ marginBottom: 20, marginLeft: 15 }}
+              disabled={this.state.dataSource.length == 0}
+              onClick={e => {
+                this.setState({
+                  mergeModal: true
+                });
+              }}
             >
-              <Button
-                type="danger"
-                style={{ marginBottom: 20, marginLeft: 15 }}
-                disabled={this.state.dataSource.length == 0}
-              >
-                确认合并回款
-              </Button>
-            </Popconfirm>
+              确认合并回款
+            </Button>
           </TabPane>
         </Tabs>
 
@@ -889,9 +886,7 @@ const HuiKuan = React.createClass({
           >
             {
               <span style={{ marginRight: 10 }}>
-                {`回款金额总计(万元):${
-                  this.state.hui ? this.state.hui : "0"
-                }`}
+                {`回款金额总计(万元):${this.state.hui ? this.state.hui : "0"}`}
               </span>
             }
             {
@@ -1088,6 +1083,20 @@ const HuiKuan = React.createClass({
             />
           </p>
         </Modal>
+        <Modal
+          title="确认合并列表"
+          visible={this.state.mergeModal}
+          onOk={this.handleOk}
+          onCancel={() => {
+            this.setState({
+              mergeModal: false
+            })
+          }}
+        >
+          <p>Some contents...</p>
+          <p>Some contents...</p>
+          <p>Some contents...</p>
+        </Modal>
       </div>
     );
   }

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

@@ -1093,7 +1093,7 @@ const ShouKuang = React.createClass({
               详情收款流水
             </Button>
           </TabPane>
-          <TabPane tab="批量操作" key="6">
+          {/* <TabPane tab="批量操作" key="6">
             <Button
               type="primary"
               disabled={this.state.selectedRowKeys.length == 0}
@@ -1105,7 +1105,7 @@ const ShouKuang = React.createClass({
             >
               转交
             </Button>
-          </TabPane>
+          </TabPane> */}
         </Tabs>
 
         <div className="patent-table">

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

@@ -308,6 +308,10 @@ const OutsourceTaskAssignment = React.createClass({
             salesmanMobile: thisdata.salesmanMobile, //营销员电话
             financeName: thisdata.financeName, //财务名称
             financeMobile: thisdata.financeMobile, //财务电话
+            oldSalesmanName: thisdata.oldSalesmanName, //营销员名称
+            oldSalesmanMobile: thisdata.oldSalesmanMobile, //营销员电话
+            nowFinance: thisdata.nowFinance, //财务名称
+            nowFinanceMobile: thisdata.nowFinanceMobile, //财务电话
             depName: thisdata.depName //订单部门
           });
         }
@@ -715,14 +719,50 @@ const OutsourceTaskAssignment = React.createClass({
                   <FormItem
                     className="half-item"
                     {...formItemLayout}
-                    label="财务负责人"
+                    label="当前财务负责人"
+                  >
+                    <span>{this.state.nowFinance}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="当前财务负责人电话"
+                  >
+                    <span>{this.state.nowFinanceMobile}</span>
+                  </FormItem>
+                </div>
+                <div className="clearfix">
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    style={{ opacity: ".5" }}
+                    label="原订单负责人"
+                  >
+                    <span>{this.state.oldSalesmanName}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    style={{ opacity: ".5" }}
+                    label="原订单负责人电话"
+                  >
+                    <span>{this.state.oldSalesmanMobile}</span>
+                  </FormItem>
+                </div>
+                <div className="clearfix">
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    style={{ opacity: ".5" }}
+                    label="实际财务操作人"
                   >
                     <span>{this.state.financeName}</span>
                   </FormItem>
                   <FormItem
                     className="half-item"
                     {...formItemLayout}
-                    label="财务负责人电话"
+                    style={{ opacity: ".5" }}
+                    label="实际财务操作人电话"
                   >
                     <span>{this.state.financeMobile}</span>
                   </FormItem>

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

@@ -417,7 +417,11 @@ const PaiDan = React.createClass({
             salesmanName: thisdata.salesmanName, //营销员名称
             salesmanMobile: thisdata.salesmanMobile, //营销员电话
             financeName: thisdata.financeName, //财务名称
-            financeMobile: thisdata.financeMobile //财务电话
+            financeMobile: thisdata.financeMobile, //财务电话
+            oldSalesmanName: thisdata.oldSalesmanName, //营销员名称
+            oldSalesmanMobile: thisdata.oldSalesmanMobile, //营销员电话
+            nowFinance: thisdata.nowFinance, //财务名称
+            nowFinanceMobile: thisdata.nowFinanceMobile, //财务电话
           });
         }
       }.bind(this)
@@ -1161,14 +1165,50 @@ const PaiDan = React.createClass({
                   <FormItem
                     className="half-item"
                     {...formItemLayout}
-                    label="财务负责人"
+                    label="当前财务负责人"
+                  >
+                    <span>{this.state.nowFinance}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="当前财务负责人电话"
+                  >
+                    <span>{this.state.nowFinanceMobile}</span>
+                  </FormItem>
+                </div>
+                <div className="clearfix">
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    style={{ opacity: ".5" }}
+                    label="原订单负责人"
+                  >
+                    <span>{this.state.oldSalesmanName}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    style={{ opacity: ".5" }}
+                    label="原订单负责人电话"
+                  >
+                    <span>{this.state.oldSalesmanMobile}</span>
+                  </FormItem>
+                </div>
+                <div className="clearfix">
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    style={{ opacity: ".5" }}
+                    label="实际财务操作人"
                   >
                     <span>{this.state.financeName}</span>
                   </FormItem>
                   <FormItem
                     className="half-item"
                     {...formItemLayout}
-                    label="财务负责人电话"
+                    style={{ opacity: ".5" }}
+                    label="实际财务操作人电话"
                   >
                     <span>{this.state.financeMobile}</span>
                   </FormItem>

+ 458 - 276
js/component/manageCenter/project/project/projectQuery.jsx

@@ -276,7 +276,11 @@ const PaiDan = React.createClass({
 	                     salesmanName:thisdata.salesmanName,//营销员名称
 	                     salesmanMobile:thisdata.salesmanMobile,//营销员电话
 	                     financeName:thisdata.financeName,//财务名称
-	                     financeMobile:thisdata.financeMobile,//财务电话
+						 financeMobile:thisdata.financeMobile,//财务电话
+						 oldSalesmanName: thisdata.oldSalesmanName, //营销员名称
+						 oldSalesmanMobile: thisdata.oldSalesmanMobile, //营销员电话
+						 nowFinance: thisdata.nowFinance, //财务名称
+						 nowFinanceMobile: thisdata.nowFinanceMobile, //财务电话
 	                     depName:thisdata.depName,//订单部门
 					})
 				};
@@ -519,283 +523,461 @@ const PaiDan = React.createClass({
         let departmentArr = this.state.departmentArr || [];
         const hasSelected = this.state.selectedRowKeys.length > 0;
         const { RangePicker } = DatePicker;
-        return ( <div className="user-content">
+        return (
+          <div className="user-content">
             <div className="content-title">
-                    <span>项目派单管理</span>
-                </div>
-                <div className="user-search">
-                    <Input placeholder="客户名称"
-                        value={this.state.customerName}
-                        onChange={(e) => { this.setState({ customerName: e.target.value }); }} />
-                    <Input placeholder="订单编号"
-                        value={this.state.orderNoSearch}
-                        onChange={(e) => { this.setState({ orderNoSearch: e.target.value }); }} />
-                   	<Select placeholder="选择部门"
-                        style={{ width: 150 ,marginRight:'10px'}}
-                        value={this.state.departmenttSearch}
-                        onChange={(e) => { this.setState({ departmenttSearch: e }) }}>
-                        {
-                            departmentArr.map(function (item) {
-                                    return <Select.Option key={item.id} >{item.name}</Select.Option>
-                            })
-                        }
-               		 </Select> 
-                   <Select
-                        onChange={(e)=>{this.setState({distribution:e})}} 
-                        style={{width:160,marginRight:5}} 
-                        placeholder="分派状态"
-                        value={this.state.distribution}>
-                        <Option value="0">未分配</Option>
-                        <Option value="1">部分分配</Option>
-                        <Option value="2">全部分配</Option>
-                    </Select>
-                    <Button type="primary" onClick={this.search}>搜索</Button>
-                    <Button onClick={this.reset}>重置</Button>
-                    <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch.bind(this)} /></span>
-                    <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
-                        <span>订单时间 :</span>
-                        <RangePicker
-                            value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
-                            this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
-                            onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
-                    </div>
-                </div>
-                <div className="patent-table">
-                    <Spin spinning={this.state.loading}>
-                        <Table columns={this.state.columns}
-                            dataSource={this.state.dataSource}
-                            rowSelection={rowSelection}
-                            pagination={this.state.pagination}
-                            onRowClick={this.tableRowClick.bind(this)} />
-                    </Spin>
-                </div>
-                <Assign
-                    title="项目"
-                    selApi="/api/admin/orderProject/projectDistribution"
-                    data={this.state.assignData}
-                    showDesc={this.state.assignVisible}
-                    closeDesc={this.closeAssign.bind(this)}
-                    fenpaiData={8}
-                    specially={1}
-                    roleName={'咨询师经理'}
-					
+              <span>项目派单管理</span>
+            </div>
+            <div className="user-search">
+              <Input
+                placeholder="客户名称"
+                value={this.state.customerName}
+                onChange={e => {
+                  this.setState({ customerName: e.target.value });
+                }}
+              />
+              <Input
+                placeholder="订单编号"
+                value={this.state.orderNoSearch}
+                onChange={e => {
+                  this.setState({ orderNoSearch: e.target.value });
+                }}
+              />
+              <Select
+                placeholder="选择部门"
+                style={{ width: 150, marginRight: "10px" }}
+                value={this.state.departmenttSearch}
+                onChange={e => {
+                  this.setState({ departmenttSearch: e });
+                }}
+              >
+                {departmentArr.map(function(item) {
+                  return (
+                    <Select.Option key={item.id}>{item.name}</Select.Option>
+                  );
+                })}
+              </Select>
+              <Select
+                onChange={e => {
+                  this.setState({ distribution: e });
+                }}
+                style={{ width: 160, marginRight: 5 }}
+                placeholder="分派状态"
+                value={this.state.distribution}
+              >
+                <Option value="0">未分配</Option>
+                <Option value="1">部分分配</Option>
+                <Option value="2">全部分配</Option>
+              </Select>
+              <Button type="primary" onClick={this.search}>
+                搜索
+              </Button>
+              <Button onClick={this.reset}>重置</Button>
+              <span>
+                更多搜索
+                <Switch
+                  defaultChecked={false}
+                  onChange={this.searchSwitch.bind(this)}
+                />
+              </span>
+              <div
+                className="search-more"
+                style={this.state.searchMore ? { display: "none" } : {}}
+              >
+                <span>订单时间 :</span>
+                <RangePicker
+                  value={[
+                    this.state.releaseDate[0]
+                      ? moment(this.state.releaseDate[0])
+                      : null,
+                    this.state.releaseDate[1]
+                      ? moment(this.state.releaseDate[1])
+                      : null
+                  ]}
+                  onChange={(data, dataString) => {
+                    this.setState({ releaseDate: dataString });
+                  }}
+                />
+              </div>
+            </div>
+            <div className="patent-table">
+              <Spin spinning={this.state.loading}>
+                <Table
+                  columns={this.state.columns}
+                  dataSource={this.state.dataSource}
+                  rowSelection={rowSelection}
+                  pagination={this.state.pagination}
+                  onRowClick={this.tableRowClick.bind(this)}
                 />
-                <Modal	
-				      className="customeDetails"
-				      footer=''
-			          title="订单详情"
-			          width='900px'
-			          visible={this.state.visible}
-			          onOk={this.visitOk}
-					  onCancel={this.visitCancel}							          							          
-			        >	
-				        <Form layout="horizontal" onSubmit={this.handleSubmit} id="demand-form" style={{paddingBottom:'40px'}} >
-				            <Spin spinning={this.state.loading}>
-				                <div className="clearfix">
-				                	<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="订单编号" >
-			                            <span>{this.state.orderNo}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="合同编号" >  
-			                            <span>{this.state.contractNo}</span>
-				                    </FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="客户名称" >  
-			                            <span>{this.state.userName}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="合同签订时间" >   
-			                            <span>{this.state.signDate}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="流程状态" >  
-			                            <span>{getProcessStatus(this.state.processStatus)}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="结算状态" >  
-			                            <span>{getLiquidationStatus(this.state.liquidationStatus)}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="企业联系人" >                             
-		                                <span>{this.state.contacts}</span>
-				                    </FormItem>
-				                     <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="联系人电话" >                             
-		                                <span>{this.state.contactMobile}</span>
-				                    </FormItem>
-				                    <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="企业法人" >                             
-		                                <span>{this.state.legalPerson}</span>
-		                            </FormItem>
-				                     <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="法人电话" >  
-			                             <span>{this.state.legalPersonTel}</span>
-				                    </FormItem>
-				                    <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="签单金额(万元)" >                             
-		                                 <span>{this.state.totalAmount}</span>
-				                    </FormItem>
-				                    <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="首付金额(万元)" >                             
-		                                <span>{this.state.firstAmount}</span>
-				                    </FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="特批立项" >  
-			                            <span>{getApprovedState(this.state.approval)}</span>
-		                    		</FormItem>
-		                    		<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="已收款项(万元)" >  
-			                            <span>{this.state.settlementAmount}</span>
-		                    		</FormItem>
-				                    <div className='clearfix'>
-							        	<FormItem
-								            labelCol={{ span: 4 }}
-								            wrapperCol={{ span: 16 }}
-								            label="订单留言" >
-							        	 <span>{this.state.orderRemarks}</span>
-								        </FormItem>
-							        </div>
-				                    <div className='clearfix'>
-							            <FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 18 }} label="合同扫描件">
-				                            <Upload className="demandDetailShow-upload"
-				                                listType="picture-card"
-				                                fileList={this.state.orgCodeUrl}                               
-				                                onPreview={(file) => {
-				                                    this.setState({
-				                                        previewImage: file.url || file.thumbUrl,
-				                                        previewVisible: true,
-				                                    });
-				                                }} >
-				                            </Upload>
-				                            <Modal maskClosable={false} footer={null}
-				                                visible={this.state.previewVisible}
-				                                onCancel={() => { this.setState({ previewVisible: false }) }}>
-				                                <img alt="" style={{ width: '100%' }} src={this.state.previewImage || ''} />
-				                            </Modal>
-											<Button style={{ float:"right" , marginRight:'140px' , marginTop:'20px'}}
-																										onClick={this.getOrderLog}
-																	>查看订单							日志</Button>
-				                        </FormItem>
-							        </div>
-							        <div className='clearfix'>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="订单负责人" >  
-				                            <span>{this.state.salesmanName}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="订单负责人电话" >  
-                            				<span>{this.state.salesmanMobile}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="订单部门" >  
-				                            <span>{this.state.depName}</span>
-			                    		</FormItem>
-			                    	</div>
-			                    	<div className='clearfix'>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="财务负责人" >  
-				                            <span>{this.state.financeName}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="财务负责人电话" >  
-                            				<span>{this.state.financeMobile}</span>
-			                    		</FormItem>
-			                    	</div>
-						            <div>
-					                	<span style={{marginLeft:'50px',fontSize:'20px'}}>项目业务</span>
-					                	{this.state.processStatus==0?<Button type='primary' onClick={this.addDetailed} style={{float:'right',marginRight:'50px',marginBottom:'15px'}}>添加项目明细</Button>:""}
-					                </div>
-					                <div className="patent-table">
-					                    <Spin spinning={this.state.loading}>
-					                        <Table columns={this.state.columnsX}
-					                            dataSource={this.state.dataSourceX}
-					                            pagination={this.state.paginations}
-					                            onRowClick={this.tableRowClickX} 
-					                            />
-					                    </Spin>
-						            </div>
-				                </div>
-				            </Spin>
-				        </Form>
-			        </Modal>
-			        <Modal maskClosable={false} visible={this.state.addnextVisible}
-                        onOk={this.nextCancel} onCancel={this.nextCancel}
-                        width='800px'
-                        title='项目任务详情'                    
-                        footer=''
-                        className="admin-desc-content">
-			            <Form layout="horizontal" onSubmit={this.nextSubmit} id="demand-form">
-			                <Spin spinning={this.state.loading}>
-				                <div className='clearfix'>
-			                    	<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="项目名称" >
-			                    			<span>{this.state.commodityName}</span>
-			                    	</FormItem>
-			                    	<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="项目数量" >
-			                    			<span>{this.state.commodityQuantity}</span>
-			                    	</FormItem>
-			                    	<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="金额(万元)" >
-			                    			<span>{this.state.commodityPrice}</span>
-			                    	</FormItem>
-				                    <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="主要项目" >  
-			                            <span>{getboutique(this.state.main)}</span>
-		                    		</FormItem>
-				                    <div className='clearfix'>
-				                    	<FormItem 
-				                            labelCol={{ span: 4 }}
-								            wrapperCol={{ span: 16 }}
-				                            label="服务说明" >
-			                    			<span>{this.state.taskComment}</span>
-				                    	</FormItem>
-			                    	</div>
-			                    </div>	
-			                </Spin>
-			            </Form >
-			        </Modal>
-					<Modal  visible={this.state.rizhivisible}
-							className="admin-desc-content"
-							width='800px'
-							maskClosable={false}
-							title='订单日志'
-							footer={null}
-							onCancel={this.closeOrderLog}>
-							<div className="patent-table">
-							    <Spin spinning={this.state.loading}>
-							        <Table columns={this.state.columnsrizhi}
-							            dataSource={this.state.dataSourcerizhi}
-										pagination={false}
-							            />
-							    </Spin>
-							</div>
-					</Modal>
-        </div> )
+              </Spin>
+            </div>
+            <Assign
+              title="项目"
+              selApi="/api/admin/orderProject/projectDistribution"
+              data={this.state.assignData}
+              showDesc={this.state.assignVisible}
+              closeDesc={this.closeAssign.bind(this)}
+              fenpaiData={8}
+              specially={1}
+              roleName={"咨询师经理"}
+            />
+            <Modal
+              className="customeDetails"
+              footer=""
+              title="订单详情"
+              width="900px"
+              visible={this.state.visible}
+              onOk={this.visitOk}
+              onCancel={this.visitCancel}
+            >
+              <Form
+                layout="horizontal"
+                onSubmit={this.handleSubmit}
+                id="demand-form"
+                style={{ paddingBottom: "40px" }}
+              >
+                <Spin spinning={this.state.loading}>
+                  <div className="clearfix">
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      label="订单编号"
+                    >
+                      <span>{this.state.orderNo}</span>
+                    </FormItem>
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      label="合同编号"
+                    >
+                      <span>{this.state.contractNo}</span>
+                    </FormItem>
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      label="客户名称"
+                    >
+                      <span>{this.state.userName}</span>
+                    </FormItem>
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      label="合同签订时间"
+                    >
+                      <span>{this.state.signDate}</span>
+                    </FormItem>
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      label="流程状态"
+                    >
+                      <span>{getProcessStatus(this.state.processStatus)}</span>
+                    </FormItem>
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      label="结算状态"
+                    >
+                      <span>
+                        {getLiquidationStatus(this.state.liquidationStatus)}
+                      </span>
+                    </FormItem>
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      label="企业联系人"
+                    >
+                      <span>{this.state.contacts}</span>
+                    </FormItem>
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      label="联系人电话"
+                    >
+                      <span>{this.state.contactMobile}</span>
+                    </FormItem>
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      label="企业法人"
+                    >
+                      <span>{this.state.legalPerson}</span>
+                    </FormItem>
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      label="法人电话"
+                    >
+                      <span>{this.state.legalPersonTel}</span>
+                    </FormItem>
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      label="签单金额(万元)"
+                    >
+                      <span>{this.state.totalAmount}</span>
+                    </FormItem>
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      label="首付金额(万元)"
+                    >
+                      <span>{this.state.firstAmount}</span>
+                    </FormItem>
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      label="特批立项"
+                    >
+                      <span>{getApprovedState(this.state.approval)}</span>
+                    </FormItem>
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      label="已收款项(万元)"
+                    >
+                      <span>{this.state.settlementAmount}</span>
+                    </FormItem>
+                    <div className="clearfix">
+                      <FormItem
+                        labelCol={{ span: 4 }}
+                        wrapperCol={{ span: 16 }}
+                        label="订单留言"
+                      >
+                        <span>{this.state.orderRemarks}</span>
+                      </FormItem>
+                    </div>
+                    <div className="clearfix">
+                      <FormItem
+                        labelCol={{ span: 4 }}
+                        wrapperCol={{ span: 18 }}
+                        label="合同扫描件"
+                      >
+                        <Upload
+                          className="demandDetailShow-upload"
+                          listType="picture-card"
+                          fileList={this.state.orgCodeUrl}
+                          onPreview={file => {
+                            this.setState({
+                              previewImage: file.url || file.thumbUrl,
+                              previewVisible: true
+                            });
+                          }}
+                        ></Upload>
+                        <Modal
+                          maskClosable={false}
+                          footer={null}
+                          visible={this.state.previewVisible}
+                          onCancel={() => {
+                            this.setState({ previewVisible: false });
+                          }}
+                        >
+                          <img
+                            alt=""
+                            style={{ width: "100%" }}
+                            src={this.state.previewImage || ""}
+                          />
+                        </Modal>
+                        <Button
+                          style={{
+                            float: "right",
+                            marginRight: "140px",
+                            marginTop: "20px"
+                          }}
+                          onClick={this.getOrderLog}
+                        >
+                          查看订单 日志
+                        </Button>
+                      </FormItem>
+                    </div>
+                    <div className="clearfix">
+                      <FormItem
+                        className="half-item"
+                        {...formItemLayout}
+                        label="订单负责人"
+                      >
+                        <span>{this.state.salesmanName}</span>
+                      </FormItem>
+                      <FormItem
+                        className="half-item"
+                        {...formItemLayout}
+                        label="订单负责人电话"
+                      >
+                        <span>{this.state.salesmanMobile}</span>
+                      </FormItem>
+                      <FormItem
+                        className="half-item"
+                        {...formItemLayout}
+                        label="订单部门"
+                      >
+                        <span>{this.state.depName}</span>
+                      </FormItem>
+                    </div>
+                    <div className="clearfix">
+                      <FormItem
+                        className="half-item"
+                        {...formItemLayout}
+                        label="当前财务负责人"
+                      >
+                        <span>{this.state.nowFinance}</span>
+                      </FormItem>
+                      <FormItem
+                        className="half-item"
+                        {...formItemLayout}
+                        label="当前财务负责人电话"
+                      >
+                        <span>{this.state.nowFinanceMobile}</span>
+                      </FormItem>
+                    </div>
+                    <div className="clearfix">
+                      <FormItem
+                        className="half-item"
+                        {...formItemLayout}
+                        style={{ opacity: ".5" }}
+                        label="原订单负责人"
+                      >
+                        <span>{this.state.oldSalesmanName}</span>
+                      </FormItem>
+                      <FormItem
+                        className="half-item"
+                        {...formItemLayout}
+                        style={{ opacity: ".5" }}
+                        label="原订单负责人电话"
+                      >
+                        <span>{this.state.oldSalesmanMobile}</span>
+                      </FormItem>
+                    </div>
+                    <div className="clearfix">
+                      <FormItem
+                        className="half-item"
+                        {...formItemLayout}
+                        style={{ opacity: ".5" }}
+                        label="实际财务操作人"
+                      >
+                        <span>{this.state.financeName}</span>
+                      </FormItem>
+                      <FormItem
+                        className="half-item"
+                        {...formItemLayout}
+                        style={{ opacity: ".5" }}
+                        label="实际财务操作人电话"
+                      >
+                        <span>{this.state.financeMobile}</span>
+                      </FormItem>
+                    </div>
+                    <div>
+                      <span style={{ marginLeft: "50px", fontSize: "20px" }}>
+                        项目业务
+                      </span>
+                      {this.state.processStatus == 0 ? (
+                        <Button
+                          type="primary"
+                          onClick={this.addDetailed}
+                          style={{
+                            float: "right",
+                            marginRight: "50px",
+                            marginBottom: "15px"
+                          }}
+                        >
+                          添加项目明细
+                        </Button>
+                      ) : (
+                        ""
+                      )}
+                    </div>
+                    <div className="patent-table">
+                      <Spin spinning={this.state.loading}>
+                        <Table
+                          columns={this.state.columnsX}
+                          dataSource={this.state.dataSourceX}
+                          pagination={this.state.paginations}
+                          onRowClick={this.tableRowClickX}
+                        />
+                      </Spin>
+                    </div>
+                  </div>
+                </Spin>
+              </Form>
+            </Modal>
+            <Modal
+              maskClosable={false}
+              visible={this.state.addnextVisible}
+              onOk={this.nextCancel}
+              onCancel={this.nextCancel}
+              width="800px"
+              title="项目任务详情"
+              footer=""
+              className="admin-desc-content"
+            >
+              <Form
+                layout="horizontal"
+                onSubmit={this.nextSubmit}
+                id="demand-form"
+              >
+                <Spin spinning={this.state.loading}>
+                  <div className="clearfix">
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      label="项目名称"
+                    >
+                      <span>{this.state.commodityName}</span>
+                    </FormItem>
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      label="项目数量"
+                    >
+                      <span>{this.state.commodityQuantity}</span>
+                    </FormItem>
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      label="金额(万元)"
+                    >
+                      <span>{this.state.commodityPrice}</span>
+                    </FormItem>
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      label="主要项目"
+                    >
+                      <span>{getboutique(this.state.main)}</span>
+                    </FormItem>
+                    <div className="clearfix">
+                      <FormItem
+                        labelCol={{ span: 4 }}
+                        wrapperCol={{ span: 16 }}
+                        label="服务说明"
+                      >
+                        <span>{this.state.taskComment}</span>
+                      </FormItem>
+                    </div>
+                  </div>
+                </Spin>
+              </Form>
+            </Modal>
+            <Modal
+              visible={this.state.rizhivisible}
+              className="admin-desc-content"
+              width="800px"
+              maskClosable={false}
+              title="订单日志"
+              footer={null}
+              onCancel={this.closeOrderLog}
+            >
+              <div className="patent-table">
+                <Spin spinning={this.state.loading}>
+                  <Table
+                    columns={this.state.columnsrizhi}
+                    dataSource={this.state.dataSourcerizhi}
+                    pagination={false}
+                  />
+                </Spin>
+              </div>
+            </Modal>
+          </div>
+        );
     }
 })
  

File diff suppressed because it is too large
+ 638 - 377
js/component/manageCenter/project/project/zxsglyOutSourcingPaiDan.jsx


+ 72 - 4
js/component/manageCenter/project/task/myTask.jsx

@@ -657,6 +657,10 @@ const Task = React.createClass({
             salesmanMobile: thisdata.salesmanMobile, //营销员电话
             financeName: thisdata.financeName, //财务名称
             financeMobile: thisdata.financeMobile, //财务电话
+            oldSalesmanName: thisdata.oldSalesmanName, //营销员名称
+            oldSalesmanMobile: thisdata.oldSalesmanMobile, //营销员电话
+            nowFinance: thisdata.nowFinance, //财务名称
+            nowFinanceMobile: thisdata.nowFinanceMobile, //财务电话
             depName: thisdata.depName, //订单部门
             ProvinceCity: ProvinceCityArr[0] === null ? [] : ProvinceCityArr,
             postalAddress: thisdata.postalAddress //详细地址
@@ -1354,14 +1358,46 @@ const Task = React.createClass({
                   <FormItem
                     className="half-item"
                     {...formItemLayout}
-                    label="财务负责人"
+                    label="当前财务负责人"
+                  >
+                    <span>{this.state.nowFinance}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="当前财务负责人电话"
+                  >
+                    <span>{this.state.nowFinanceMobile}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    style={{ opacity: ".5" }}
+                    label="原负责人"
+                  >
+                    <span>{this.state.oldSalesmanName}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    style={{ opacity: ".5" }}
+                    label="原负责人电话"
+                  >
+                    <span>{this.state.oldSalesmanMobile}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    style={{ opacity: ".5" }}
+                    label="实际财务操作人"
                   >
                     <span>{this.state.financeName}</span>
                   </FormItem>
                   <FormItem
                     className="half-item"
                     {...formItemLayout}
-                    label="财务负责人电话"
+                    style={{ opacity: ".5" }}
+                    label="实际财务操作人电话"
                   >
                     <span>{this.state.financeMobile}</span>
                   </FormItem>
@@ -2165,14 +2201,46 @@ const Task = React.createClass({
             <FormItem
               className="half-item"
               {...formItemLayout}
-              label="财务负责人"
+              label="当前财务负责人"
+            >
+              <span>{this.state.nowFinance}</span>
+            </FormItem>
+            <FormItem
+              className="half-item"
+              {...formItemLayout}
+              label="当前财务负责人电话"
+            >
+              <span>{this.state.nowFinanceMobile}</span>
+            </FormItem>
+            <FormItem
+              className="half-item"
+              {...formItemLayout}
+              style={{ opacity: ".5" }}
+              label="原负责人"
+            >
+              <span>{this.state.oldSalesmanName}</span>
+            </FormItem>
+            <FormItem
+              className="half-item"
+              {...formItemLayout}
+              style={{ opacity: ".5" }}
+              label="原负责人电话"
+            >
+              <span>{this.state.oldSalesmanMobile}</span>
+            </FormItem>
+            <FormItem
+              className="half-item"
+              {...formItemLayout}
+              style={{ opacity: ".5" }}
+              label="实际财务操作人"
             >
               <span>{this.state.financeName}</span>
             </FormItem>
             <FormItem
               className="half-item"
               {...formItemLayout}
-              label="财务负责人电话"
+              style={{ opacity: ".5" }}
+              label="实际财务操作人电话"
             >
               <span>{this.state.financeMobile}</span>
             </FormItem>

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

@@ -307,6 +307,10 @@ const Task = React.createClass({
             salesmanMobile: thisdata.salesmanMobile, //营销员电话
             financeName: thisdata.financeName, //财务名称
             financeMobile: thisdata.financeMobile, //财务电话
+            oldSalesmanName: thisdata.oldSalesmanName, //营销员名称
+            oldSalesmanMobile: thisdata.oldSalesmanMobile, //营销员电话
+            nowFinance: thisdata.nowFinance, //财务名称
+            nowFinanceMobile: thisdata.nowFinanceMobile, //财务电话
             depName: thisdata.depName //订单部门
           });
         }
@@ -716,14 +720,50 @@ const Task = React.createClass({
                   <FormItem
                     className="half-item"
                     {...formItemLayout}
-                    label="财务负责人"
+                    label="当前财务负责人"
+                  >
+                    <span>{this.state.nowFinance}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="当前财务负责人电话"
+                  >
+                    <span>{this.state.nowFinanceMobile}</span>
+                  </FormItem>
+                </div>
+                <div className="clearfix">
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    style={{ opacity: ".5" }}
+                    label="原订单负责人"
+                  >
+                    <span>{this.state.oldSalesmanName}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    style={{ opacity: ".5" }}
+                    label="原订单负责人电话"
+                  >
+                    <span>{this.state.oldSalesmanMobile}</span>
+                  </FormItem>
+                </div>
+                <div className="clearfix">
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    style={{ opacity: ".5" }}
+                    label="实际财务操作人"
                   >
                     <span>{this.state.financeName}</span>
                   </FormItem>
                   <FormItem
                     className="half-item"
                     {...formItemLayout}
-                    label="财务负责人电话"
+                    style={{ opacity: ".5" }}
+                    label="实际财务操作人电话"
                   >
                     <span>{this.state.financeMobile}</span>
                   </FormItem>

File diff suppressed because it is too large
+ 931 - 616
js/component/manageCenter/project/task/taskCount.jsx