liting2017 il y a 7 ans
Parent
commit
ac01eba965

+ 5 - 99
js/component/manageCenter/order/departmentOrder/servicesOrder/addService.jsx

@@ -7,58 +7,6 @@ import {orderType} from '../../../../dataDic.js';
 import {splitUrl,getOrderType,getOrderStage,getOrderState,getTransactionProject,getPaymentState,getOrderChannel,getApprovedState,getLock,getPaymentMethod,getTransactionChannel} from '../../../../tools.js';
 const Option = AutoComplete.Option;
 
-//图片组件
-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 NewService = Form.create()(React.createClass({
 	loadData(record) {
         this.state.data = [];
@@ -225,16 +173,6 @@ const NewService = Form.create()(React.createClass({
 	//新建订单、编辑订单保存
 	handleSubmit(e) {
 		e.preventDefault();
-		let theorgCodeUrl = [];
-        if (this.state.orgCodeUrl.length) {
-            let picArr = [];
-            this.state.orgCodeUrl.map(function (item) {
-				if ( item.response && item.response.data && item.response.data.length ){
-					picArr.push(item.response.data);
-				}
-            });
-            theorgCodeUrl = picArr.join(",");
-        };
         if(this.props.userDetaile){
 	        if(!this.state.signTotalAmount){
 	        	message.warning('请输入实签订单金额!');
@@ -278,7 +216,6 @@ const NewService = Form.create()(React.createClass({
 						signFirstPayment:this.state.signFirstPayment,
 						orderRemarks:this.state.orderRemarks,
 						contractNo:this.state.contractNo
-						//headPortraitUrl:theorgCodeUrl.length?theorgCodeUrl:'',
 					}
 				}).done(function(data) {
 					this.setState({
@@ -323,7 +260,7 @@ const NewService = Form.create()(React.createClass({
 					signFirstPayment:thisData.signFirstPayment,
 					approval:thisData.approval==0?thisData.approval.toString():thisData.approval,
 					orderRemarks:thisData.orderRemarks,
-                    orgCodeUrl: thisData.orgCodeUrl ? splitUrl(thisData.orgCodeUrl, ',', globalConfig.avatarHost + '/upload') : [],
+                    orgCodeUrl: thisData.contractPictureUrl ? splitUrl(thisData.contractPictureUrl, ',', globalConfig.avatarHost + '/upload') : [],
                		//签单
                		orderNo:thisData.orderNo,//订单编号
                		buyerName:thisData.buyerName,
@@ -403,9 +340,6 @@ const NewService = Form.create()(React.createClass({
         	addState:0,
         });
     },
-	getOrgCodeUrl(e) {
-        this.setState({ orgCodeUrl: e });
-    },
 	componentWillMount() {
 		
 	},
@@ -442,14 +376,10 @@ const NewService = Form.create()(React.createClass({
     },
     //签单
     signBitt(){
-    	if(this.state.contractNo){
-    		this.setState({
-    			contractNo:this.state.contractNo,
-    			signVisible:true
-    		})
-    	}else{
-    		message.warning("请输入合同编号!")
-    	}
+		this.setState({
+			contractNo:this.state.contractNo,
+			signVisible:true
+		})
     },
     signBittOk(){
     	this.setState({
@@ -861,18 +791,6 @@ const NewService = Form.create()(React.createClass({
 								                                    <Input placeholder="请输入合同编号" value={this.state.contractNo}
 								                                    	onChange={(e)=>{this.setState({contractNo:e.target.value})}} style={{width:'240px'}} />
 									                    </FormItem>
-							                    		<div className='clearfix'>
-												            <FormItem
-												                labelCol={{ span: 4 }}
-												                wrapperCol={{ span: 18 }}
-												                label="合同扫描件" >
-												                <PicturesWall
-												                    pictureSign="customer_sys_file"
-												                    fileList={this.getOrgCodeUrl}
-												                    pictureUrl={this.state.orgCodeUrl} />
-												                    <p>图片建议:要清晰。</p>
-												            </FormItem>
-												        </div>
 												        <div className='clearfix'>
 												        	<FormItem
 													            labelCol={{ span: 4 }}
@@ -1204,18 +1122,6 @@ const NewService = Form.create()(React.createClass({
 										    				onChange={(e)=>{this.setState({orderRemarks:e.target.value})}}/>			                      
 									        </FormItem>
 								        </div>
-								        <div className='clearfix'>
-								            <FormItem
-								                labelCol={{ span: 4 }}
-								                wrapperCol={{ span: 18 }}
-								                label="合同扫描件" >
-								                <PicturesWall
-								                    pictureSign="customer_sys_file"
-								                    fileList={this.getOrgCodeUrl}
-								                    pictureUrl={this.state.orgCodeUrl} />
-								                    <p>图片建议:要清晰。</p>
-								            </FormItem>
-								        </div>
 				                    </div>
 			                    <FormItem wrapperCol={{ span: 12, offset: 4 }} className="half-middle">
 			                       {/*<Button className="submitSave" type="primary" onClick={this.temporary}>暂存信息</Button>*/} 

+ 1 - 1
js/component/manageCenter/order/departmentOrder/servicesOrder/serviceManage.jsx

@@ -238,7 +238,7 @@ const ServiceManage=Form.create()(React.createClass({
 							{text.confirmIntention&&<Popconfirm title={'请确认您是否受理来自【'+record.buyerName+'】发起的服务意向订单?'} onConfirm={(e)=>{this.admissibleOrderOk(record)}} onCancel={(e)=>{this.admissibleOrderCancel(record)}} okText="同意" cancelText="拒绝">
 							    <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="primary">受理意向</Button>                 
 							</Popconfirm>}
-							{text.applySign&&<Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation(),this.signBill(record)}} type="primary">签单</Button> }                
+							{/*{text.applySign&&<Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation(),this.signBill(record)}} type="primary">签单</Button> } */}              
 							{text.applyForCancel&&<Popconfirm title={'请确认您是否取消客户【'+record.buyerName+'】的服务订单,订单取消将导致业务终止!'} onConfirm={(e)=>{this.cancelOrder(record)}} okText="确认" cancelText="取消">
 								<Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="danger">取消订单</Button>                 
 							</Popconfirm>}

+ 0 - 22
js/component/manageCenter/order/flowSettlement/billManage/myBillDetaile.jsx

@@ -392,28 +392,6 @@ const MyBillDetaile = Form.create()(React.createClass({
 					                            label="特批立项" >   
 					                            <span>{getApprovedState(seeOrderDetaiel.approval)}</span>
 				                    		</FormItem>
-											<div className="clearfix">
-												<FormItem
-							                        labelCol={{ span: 4 }}
-							                        wrapperCol={{ span: 18 }}
-							                        label="合同扫描件" >
-						                            <Upload className="demandDetailShow-upload"
-						                                listType="customer_sys_file"
-						                                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>
-						                        </FormItem>    
-					                        </div>
 					                        <div className='clearfix'>
 									        	<FormItem
 										            labelCol={{ span: 4 }}

+ 0 - 22
js/component/manageCenter/order/flowSettlement/billManagement/myBillDetaile.jsx

@@ -391,28 +391,6 @@ const MyBillDetaile = Form.create()(React.createClass({
 					                            label="特批立项" >   
 					                            <span>{getApprovedState(seeOrderDetaiel.approval)}</span>
 				                    		</FormItem>
-											<div className="clearfix">
-												<FormItem
-							                        labelCol={{ span: 4 }}
-							                        wrapperCol={{ span: 18 }}
-							                        label="合同扫描件" >
-						                            <Upload className="demandDetailShow-upload"
-						                                listType="customer_sys_file"
-						                                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>
-						                        </FormItem>    
-					                        </div>
 					                        <div className='clearfix'>
 									        	<FormItem
 										            labelCol={{ span: 4 }}

+ 0 - 22
js/component/manageCenter/order/flowSettlement/billQuery/myBillDetaile.jsx

@@ -392,28 +392,6 @@ const MyBillDetaile = Form.create()(React.createClass({
 					                            label="特批立项" >   
 					                            <span>{getApprovedState(seeOrderDetaiel.approval)}</span>
 				                    		</FormItem>
-											<div className="clearfix">
-												<FormItem
-							                        labelCol={{ span: 4 }}
-							                        wrapperCol={{ span: 18 }}
-							                        label="合同扫描件" >
-						                            <Upload className="demandDetailShow-upload"
-						                                listType="customer_sys_file"
-						                                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>
-						                        </FormItem>    
-					                        </div>
 					                        <div className='clearfix'>
 									        	<FormItem
 										            labelCol={{ span: 4 }}

+ 0 - 22
js/component/manageCenter/order/flowSettlement/myBill/myBillDetaile.jsx

@@ -395,28 +395,6 @@ const MyBillDetaile = Form.create()(React.createClass({
 					                            label="特批立项" >   
 					                            <span>{getApprovedState(seeOrderDetaiel.approval)}</span>
 				                    		</FormItem>
-											<div className="clearfix">
-												<FormItem
-							                        labelCol={{ span: 4 }}
-							                        wrapperCol={{ span: 18 }}
-							                        label="合同扫描件" >
-						                            <Upload className="demandDetailShow-upload"
-						                                listType="customer_sys_file"
-						                                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>
-						                        </FormItem>    
-					                        </div>
 					                        <div className='clearfix'>
 									        	<FormItem
 										            labelCol={{ span: 4 }}

+ 27 - 17
js/component/manageCenter/order/myOrder/servicesOrder/addService.jsx

@@ -43,13 +43,13 @@ const PicturesWall = React.createClass({
         return (
             <div style={{display:"inline-block"}}>
                 <Upload
-                    action={globalConfig.context + "/api/admin/superviser/uploadAdminImg"}
-                    data={{ 'sign': this.props.pictureSign }}
+                    action={globalConfig.context + "/api/admin/order/uploadOrderImg"}
+                    data={{ 'sign': '' }}
                     listType="picture-card"
                     fileList={fileList}
                     onPreview={this.handlePreview}
                     onChange={this.handleChange} >
-                    {fileList.length >= 4 ? null : uploadButton}
+                    {fileList.length >= 5 ? null : uploadButton}
                 </Upload>
                 <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel}>
                     <img alt="example" style={{ width: '100%' }} src={previewImage} />
@@ -285,8 +285,8 @@ const NewService = Form.create()(React.createClass({
 						signTotalAmount:this.state.signTotalAmount,
 						signFirstPayment:this.state.signFirstPayment,
 						orderRemarks:this.state.orderRemarks,
-						contractNo:this.state.contractNo
-						//headPortraitUrl:theorgCodeUrl.length?theorgCodeUrl:'',
+						contractNo:this.state.contractNo,
+						contractPictureUrl:theorgCodeUrl.length?theorgCodeUrl:'',
 					}
 				}).done(function(data) {
 					this.setState({
@@ -330,7 +330,7 @@ const NewService = Form.create()(React.createClass({
 					signFirstPayment:thisData.signFirstPayment,
 					approval:thisData.approval==0?thisData.approval.toString():thisData.approval,
 					orderRemarks:thisData.orderRemarks,
-                    orgCodeUrl: thisData.orgCodeUrl ? splitUrl(thisData.orgCodeUrl, ',', globalConfig.avatarHost + '/upload') : [],
+                    orgCodeUrl: thisData.contractPictureUrl ? splitUrl(thisData.contractPictureUrl, ',', globalConfig.avatarHost + '/upload') : [],
                		//签单
                		orderNo:thisData.orderNo,//订单编号
                		buyerName:thisData.buyerName,
@@ -454,14 +454,15 @@ const NewService = Form.create()(React.createClass({
     },
     //签单
     signBitt(){
-    	if(this.state.contractNo){
-    		this.setState({
-    			contractNo:this.state.contractNo,
-    			signVisible:true
-    		})
-    	}else{
-    		message.warning("请输入合同编号!")
-    	}
+    	this.setState({
+			contractNo:this.state.contractNo,
+			signVisible:true
+    	})
+//  	if(this.state.contractNo){
+//  		
+//  	}else{
+//  		message.warning("请输入合同编号!")
+//  	}
     },
     signBittOk(){
     	this.setState({
@@ -728,6 +729,16 @@ const NewService = Form.create()(React.createClass({
 		this.setState({
 			loading: true
 		});
+		let theorgCodeUrl = [];
+        if (this.state.orgCodeUrl.length) {
+            let picArr = [];
+            this.state.orgCodeUrl.map(function (item) {
+				if ( item.response && item.response.data && item.response.data.length ){
+					picArr.push(item.response.data);
+				}
+            });
+            theorgCodeUrl = picArr.join(",");
+        };
 		let api=e?'/api/admin/order/updateServiceOrder':'/api/admin/order/signServiceOrder';
 		$.ajax({
 			method: "POST",
@@ -740,7 +751,8 @@ const NewService = Form.create()(React.createClass({
 				signFirstPayment:this.state.signFirstPayment,
 				approval:this.state.approval,
 				orderRemarks:this.state.orderRemarks,
-				contractNo:this.state.contractNo
+				contractNo:this.state.contractNo,
+				contractPictureUrl:theorgCodeUrl.length?theorgCodeUrl:'',
 			}
 		}).done(function(data) {
 			this.setState({
@@ -1110,7 +1122,6 @@ const NewService = Form.create()(React.createClass({
 												                wrapperCol={{ span: 18 }}
 												                label="合同扫描件" >
 												                <PicturesWall
-												                    pictureSign="customer_sys_file"
 												                    fileList={this.getOrgCodeUrl}
 												                    pictureUrl={this.state.orgCodeUrl} />
 												                    <p>图片建议:要清晰。</p>
@@ -1460,7 +1471,6 @@ const NewService = Form.create()(React.createClass({
 								                wrapperCol={{ span: 18 }}
 								                label="合同扫描件" >
 								                <PicturesWall
-								                    pictureSign="customer_sys_file"
 								                    fileList={this.getOrgCodeUrl}
 								                    pictureUrl={this.state.orgCodeUrl} />
 								                    <p>图片建议:要清晰。</p>

+ 1 - 1
js/component/manageCenter/order/myOrder/servicesOrder/myService.jsx

@@ -164,7 +164,7 @@ const MyService=Form.create()(React.createClass({
 							{text.confirmIntention&&<Popconfirm title={'请确认您是否受理来自【'+record.buyerName+'】发起的服务意向订单?'} onConfirm={(e)=>{this.admissibleOrderOk(record)}} onCancel={(e)=>{this.admissibleOrderCancel(record)}} okText="同意" cancelText="拒绝">
 							    <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="primary">受理意向</Button>                 
 							</Popconfirm>}
-							{text.applySign&&<Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation(),this.signBill(record)}} type="primary">签单</Button> }                
+							{/*{text.applySign&&<Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation(),this.signBill(record)}} type="primary">签单</Button> }  */}              
 							{text.applyForCancel&&<Popconfirm title={'请确认您是否取消客户【'+record.buyerName+'】的服务订单,订单取消将导致业务终止!'} onConfirm={(e)=>{this.cancelOrder(record)}} okText="确认" cancelText="取消">
 								<Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="danger">取消订单</Button>                 
 							</Popconfirm>}

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

@@ -432,28 +432,6 @@ const ApproveOrderDetaile = Form.create()(React.createClass({
 					                            label="合同编号" >   
 					                            <span>{orderDetaiel.contractNo}</span>
 				                    		</FormItem>
-											<div className="clearfix">
-												<FormItem
-							                        labelCol={{ span: 4 }}
-							                        wrapperCol={{ span: 18 }}
-							                        label="合同扫描件" >
-						                            <Upload className="demandDetailShow-upload"
-						                                listType="customer_sys_file"
-						                                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>
-						                        </FormItem>    
-					                        </div>
 					                        <div className='clearfix'>
 									        	<FormItem
 										            labelCol={{ span: 4 }}

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

@@ -4,58 +4,6 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import '../../userMangagement.less';
 import {getApprovedState,getPaymentState,getOrderState,getOrderChannel,getOrderType,getTransactionProject,getTransactionChannel} 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 ApproveDetaile = Form.create()(React.createClass({
 	loadData(record) {
@@ -431,28 +379,6 @@ const ApproveDetaile = Form.create()(React.createClass({
 					                            label="合同编号" >   
 					                            <span>{orderDetaiel.contractNo}</span>
 				                    		</FormItem>
-											<div className="clearfix">
-												<FormItem
-							                        labelCol={{ span: 4 }}
-							                        wrapperCol={{ span: 18 }}
-							                        label="合同扫描件" >
-						                            <Upload className="demandDetailShow-upload"
-						                                listType="customer_sys_file"
-						                                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>
-						                        </FormItem>    
-					                        </div>
 					                        <div className='clearfix'>
 									        	<FormItem
 										            labelCol={{ span: 4 }}

+ 0 - 74
js/component/manageCenter/order/settlementOrder/mySettlement/mySettlementDetaile.jsx

@@ -4,58 +4,6 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import '../../userMangagement.less';
 import {getApprovedState,getPaymentState,getOrderState,getOrderChannel,getOrderType,getTransactionProject,getTransactionChannel} 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 MySettlementDetaile = Form.create()(React.createClass({
 	loadData(record) {
@@ -431,28 +379,6 @@ const MySettlementDetaile = Form.create()(React.createClass({
 					                            label="合同编号" >   
 					                            <span>{orderDetaiel.contractNo}</span>
 				                    		</FormItem>
-											<div className="clearfix">
-												<FormItem
-							                        labelCol={{ span: 4 }}
-							                        wrapperCol={{ span: 18 }}
-							                        label="合同扫描件" >
-						                            <Upload className="demandDetailShow-upload"
-						                                listType="customer_sys_file"
-						                                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>
-						                        </FormItem>    
-					                        </div>
 					                        <div className='clearfix'>
 									        	<FormItem
 										            labelCol={{ span: 4 }}

+ 0 - 75
js/component/manageCenter/order/settlementOrder/settlementManage/managementDetaile.jsx

@@ -5,59 +5,6 @@ import $ from 'jquery/src/ajax';
 import '../../userMangagement.less';
 import {getApprovedState,getPaymentState,getOrderState,getOrderChannel,getOrderType,getTransactionProject,getTransactionChannel} 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 ManagementDetaile = Form.create()(React.createClass({
 	loadData(record) {
         this.state.data = [];
@@ -432,28 +379,6 @@ const ManagementDetaile = Form.create()(React.createClass({
 					                            label="合同编号" >   
 					                            <span>{orderDetaiel.contractNo}</span>
 				                    		</FormItem>
-											<div className="clearfix">
-												<FormItem
-							                        labelCol={{ span: 4 }}
-							                        wrapperCol={{ span: 18 }}
-							                        label="合同扫描件" >
-						                            <Upload className="demandDetailShow-upload"
-						                                listType="customer_sys_file"
-						                                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>
-						                        </FormItem>    
-					                        </div>
 					                        <div className='clearfix'>
 									        	<FormItem
 										            labelCol={{ span: 4 }}

+ 0 - 27
js/component/manageCenter/servicesManage/projectOrder/orderOrder/projectOrderDetaile.jsx

@@ -379,33 +379,6 @@ const MySettlementDetaile = Form.create()(React.createClass({
 					                            label="合同编号" >   
 					                            <span>{orderDetaiel.contractNo}</span>
 				                    		</FormItem>
-				                    		<FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="合同编号" >   
-					                            <span>{orderDetaiel.contractNo}</span>
-				                    		</FormItem>
-											<div className="clearfix">
-												<FormItem
-							                        labelCol={{ span: 4 }}
-							                        wrapperCol={{ span: 18 }}
-							                        label="合同扫描件" >
-						                            <Upload className="demandDetailShow-upload"
-						                                listType="customer_sys_file"
-						                                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>
-						                        </FormItem>    
-					                        </div>
 					                        <div className='clearfix'>
 									        	<FormItem
 										            labelCol={{ span: 4 }}

+ 0 - 22
js/component/manageCenter/servicesManage/projectOrder/projectManagement/projectManageDetaile.jsx

@@ -1260,28 +1260,6 @@ const MySettlementDetaile = Form.create()(React.createClass({
 							                            label="特批立项" >   
 							                            <span>{getApprovedState(orderArr.approval)}</span>
 						                    		</FormItem>
-													<div className="clearfix">
-														<FormItem
-									                        labelCol={{ span: 4 }}
-									                        wrapperCol={{ span: 18 }}
-									                        label="合同扫描件" >
-								                            <Upload className="demandDetailShow-upload"
-								                                listType="customer_sys_file"
-								                                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>
-								                        </FormItem>    
-							                        </div>
 							                        <div className='clearfix'>
 											        	<FormItem
 												            labelCol={{ span: 4 }}

+ 41 - 38
js/component/manageCenter/set/organization/organization.jsx

@@ -14,9 +14,6 @@ const Organization=Form.create()(React.createClass({
             loading: true,
             ispage:pageNo,
         });
-        let nameText=this.state.SuperArr;
-		let superText=(this.state.superId)?nameText[parseInt(this.state.superId)].name:"";
-       
         $.ajax({
             method: "post",
             dataType: "json",
@@ -26,7 +23,7 @@ const Organization=Form.create()(React.createClass({
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
                 name: this.state.name, //组织名称
-                superId:superText,//上级组织
+                superId:this.state.superId,//上级组织
                 type:this.state.type,//组织类型
                 depNo:this.state.depNo,//组织编号
             },
@@ -45,8 +42,8 @@ const Organization=Form.create()(React.createClass({
                             depNo:thisdata.depNo,//组织编号
                             name:thisdata.name,//组织名称
                             type:thisdata.type,//组织类型
-                            managerId:thisdata.managerId,//负责人
-                            superId:thisdata.superId,//上级组织
+                            managerId:thisdata.managerName,//负责人
+                            superId:thisdata.superName,//上级组织
                             status:thisdata.status,//组织状态
                         });
                     };
@@ -145,7 +142,7 @@ const Organization=Form.create()(React.createClass({
 				        	for(var i=0;i<data.data.length;i++){
 		                    let theData = data.data[i];
 		                    theArr.push(
-		                        <Select.Option value={i.toString()} key={theData.name}>{theData.name}</Select.Option>
+		                        <Select.Option value={theData.id} key={theData.id}>{theData.name}</Select.Option>
 		                    );
 		                };
 						this.setState({	
@@ -175,7 +172,6 @@ const Organization=Form.create()(React.createClass({
     	if(isStatus==1){
     		if(confirm('是否要解散该部门?')){
     			if(!(superOne==superText)){
-		    		let changeSuper=nameText[parseInt(this.state.editSuperId)].name;
 		    		if(confirm('上级组织已修改,是否保存?')){
 			        $.ajax({
 			            method: "post",
@@ -185,8 +181,8 @@ const Organization=Form.create()(React.createClass({
 			            data:{
 			            	name:this.state.editName,//组织名称
 			            	type:this.state.editType, //组织类型
-			            	managerId:this.state.managerIdOrganization,//负责人ID
-			                superId:changeSuper,//上级组织
+			            	managerId:this.state.theTypes?this.state.theTypes:this.state.managerIdOrganizationId,//负责人ID
+			                superId:this.state.editSuperId,//上级组织
 			                status:this.state.editStatus,//组织状态
 			                remarks:remarksText,//组织职能说明
 			                id:this.state.editId,//组织ID
@@ -214,8 +210,8 @@ const Organization=Form.create()(React.createClass({
 			            data:{
 			            	name:this.state.editName,//组织名称
 			            	type:this.state.editType, //组织类型
-			            	managerId:this.state.managerIdOrganization,//负责人ID
-			                superId:superText,//上级组织
+			            	managerId:this.state.theTypes?this.state.theTypes:this.state.managerIdOrganizationId,//负责人ID
+			                superId:this.state.editSuperId,//上级组织
 			                status:this.state.editStatus,//组织状态
 			                remarks:remarksText,//组织职能说明
 			                id:this.state.editId,//组织ID
@@ -236,7 +232,6 @@ const Organization=Form.create()(React.createClass({
     		}
     	}else{
     		if(!(superOne==superText)){
-		    		let changeSuper=nameText[parseInt(this.state.editSuperId)].name;
 		    		if(confirm('上级组织已修改,是否保存?')){
 			        $.ajax({
 			            method: "post",
@@ -246,8 +241,8 @@ const Organization=Form.create()(React.createClass({
 			            data:{
 			            	name:this.state.editName,//组织名称
 			            	type:this.state.editType, //组织类型
-			            	managerId:this.state.managerIdOrganization,//负责人ID
-			                superId:changeSuper,//上级组织
+			            	managerId:this.state.theTypes?this.state.theTypes:this.state.managerIdOrganizationId,//负责人ID
+			                superId:this.state.editSuperId,//上级组织
 			                status:this.state.editStatus,//组织状态
 			                remarks:remarksText,//组织职能说明
 			                id:this.state.editId,//组织ID
@@ -275,8 +270,8 @@ const Organization=Form.create()(React.createClass({
 			            data:{
 			            	name:this.state.editName,//组织名称
 			            	type:this.state.editType, //组织类型
-			            	managerId:this.state.managerIdOrganization,//负责人ID
-			                superId:superText,//上级组织
+			            	managerId:this.state.theTypes?this.state.theTypes:this.state.managerIdOrganizationId,//负责人ID
+			                superId:this.state.editSuperId,//上级组织
 			                status:this.state.editStatus,//组织状态
 			                remarks:remarksText,//组织职能说明
 			                id:this.state.editId,//组织ID
@@ -338,7 +333,8 @@ const Organization=Form.create()(React.createClass({
                 this.setState({
                 	 editId: thisdata.id,//每一条记录的ID
                 	 editName:thisdata.name,//组织名称
-                     managerIdOrganization:thisdata.managerId,//负责人
+                	 managerIdOrganization:thisdata.managerName,//负责人名字
+                     managerIdOrganizationId:thisdata.managerId,//负责人idmanagerName
                      editType:thisdata.type,//组织类型
                      editStatus:thisdata.status,//组织状态 
                      editSuperId:thisdata.superId,//上级组织
@@ -349,7 +345,10 @@ const Organization=Form.create()(React.createClass({
                      editDataSource: theArr,
                 });
             }.bind(this),
-        }).always(function () {
+        }).always(function (data) {
+        	if (data.error.length) {
+        		message.warn(data.error[0].message);
+        	};
             this.setState({
                 loading: false
             });
@@ -408,9 +407,6 @@ const Organization=Form.create()(React.createClass({
                 this.setState({
                     loading: true
                 }); 
-                //上级组织字典
-                let nameText=this.state.SuperArr
-                let superText=nameText[parseInt(this.state.upOrganization)].name
                 $.ajax({
                     method: "post",
                     dataType: "json",
@@ -420,7 +416,7 @@ const Organization=Form.create()(React.createClass({
                     	name:this.state.nameOrganization,//组织名称
                     	managerId:this.state.theTypes,//负责人ID
                         type:this.state.typeOrganization, //组织类型
-                        superId:superText,//上级组织
+                        superId:this.state.upOrganization,//上级组织
                         remarks:this.state.remarksOrganization,//组织职能说明
                     	}
                 }).done(function (data) { 
@@ -472,21 +468,22 @@ const Organization=Form.create()(React.createClass({
 		this.setState({
 			managerIdOrganization:value
 		})
+		let theType='';
+		let contactLists=this.state.customerArr||[];
+			if (value) {
+            contactLists.map(function (item) {
+                if (item.name == value.toString()) {
+                    theType = item.id;
+                }
+           });     
+   	    }
+		this.setState({
+			theTypes:theType
+		})
 	},
 	//失去焦点时
 	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:e
-		})
+
 	},
 	//值改变时请求客户名称
 	httpChange(e){
@@ -498,6 +495,7 @@ const Organization=Form.create()(React.createClass({
 		})
 	},
     addClick() {
+    	this.state.theTypes='';
     	this.state.nameOrganization='';//组织名称清零
     	this.state.managerIdOrganization= '';//负责人ID清零
         this.state.typeOrganization= undefined; //组织类型清零
@@ -679,8 +677,11 @@ const Organization=Form.create()(React.createClass({
 					                        wrapperCol={{ span: 12 }}
 				                           label="上级组织"
 			                               > 
-					                        <Select placeholder="请选择上级组织" value={this.state.upOrganization} onChange={(e)=>{this.setState({upOrganization:e})}}
-				                                notFoundContent="未获取到上级组织列表" style={{width:'95%'}} required="required">
+					                        <Select placeholder="请选择上级组织" 
+					                        	value={this.state.upOrganization} 
+					                        	onChange={(e)=>{this.setState({upOrganization:e})}}
+				                                notFoundContent="未获取到上级组织列表" 
+				                                style={{width:'95%'}} required="required">
 				                                {this.state.contactsOption}
 				                            </Select> 
 				                            <span className="mandatory" style={{color:'red',marginLeft:'5px'}}>*</span>
@@ -785,7 +786,9 @@ const Organization=Form.create()(React.createClass({
 					                        wrapperCol={{ span: 12 }}
 				                           label="上级组织"
 			                               > 
-			                              <Select placeholder="请选择上级组织" value={this.state.editSuperId} onChange={(e)=>{this.setState({editSuperId:e})}}
+			                              <Select placeholder="请选择上级组织" 
+			                              		value={this.state.editSuperId} 
+			                              		onChange={(e)=>{this.setState({editSuperId:e})}}
 				                                notFoundContent="未获取到上级组织列表">
 				                                {this.state.contactsOption}
 				                            </Select>