dengzhiguo 6 years ago
parent
commit
5624a35127

+ 2 - 2
js/component/manageCenter/order/orderNew/examine.jsx

@@ -682,12 +682,12 @@ const IntentionCustomer = Form.create()(React.createClass({
 				                    <FormItem className="half-item"
 			                            {...formItemLayout}
 			                            label="签单金额(万元)" >                             
-		                                 <span>{this.state.firstAmount}</span>
+		                                 <span>{this.state.totalAmount}</span>
 				                    </FormItem>
 				                    <FormItem className="half-item"
 			                            {...formItemLayout}
 			                            label="首付金额(万元)" >                             
-		                                <span>{this.state.totalAmount}</span>
+		                                <span>{this.state.firstAmount}</span>
 				                    </FormItem>
 		                    		<FormItem className="half-item"
 			                            {...formItemLayout}

+ 2 - 2
js/component/manageCenter/order/orderNew/inquiry.jsx

@@ -679,12 +679,12 @@ const IntentionCustomer = Form.create()(React.createClass({
 				                    <FormItem className="half-item"
 			                            {...formItemLayout}
 			                            label="签单金额(万元)" >                             
-		                                 <span>{this.state.firstAmount}</span>
+		                                 <span>{this.state.totalAmount}</span>
 				                    </FormItem>
 				                    <FormItem className="half-item"
 			                            {...formItemLayout}
 			                            label="首付金额(万元)" >                             
-		                                <span>{this.state.totalAmount}</span>
+		                                <span>{this.state.firstAmount}</span>
 				                    </FormItem>
 		                    		<FormItem className="half-item"
 			                            {...formItemLayout}

+ 60 - 0
js/component/manageCenter/project/project/projectAssignment.jsx

@@ -458,6 +458,25 @@ const PaiDan = React.createClass({
         this.state.distribution=undefined;
         this.loadData(this.state.page);
     },
+    nextCancel() {
+		this.setState({
+			addnextVisible: false
+		})
+	},
+	//点击打卡项目详情
+	tableRowClickX(record, index) {
+        this.setState({
+        	jid:record.id,//项目ID
+        	kid:record.commodityId,//商品ID
+        	commodityName:record.commodityName,//金额
+        	commodityPrice:record.commodityPrice,//金额
+        	commodityQuantity:record.commodityQuantity,//数量
+        	taskComment:record.taskComment,//备注
+        	main:record.main.toString(),//是否为主要
+        	addnextVisible:true,
+        	addState:0,
+        });
+    },
     searchSwitch() {
         this.setState({
             searchMore: !this.state.searchMore
@@ -732,6 +751,47 @@ const PaiDan = React.createClass({
 				            </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 maskClosable={false} visible={this.state.noVisible}
                         onOk={this.noCancel} onCancel={this.noCancel}
                         width='400px'

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

@@ -362,6 +362,25 @@ const PaiDan = React.createClass({
 		})
 		this.reset();
 	},
+	nextCancel() {
+		this.setState({
+			addnextVisible: false
+		})
+	},
+	//点击打卡项目详情
+	tableRowClickX(record, index) {
+        this.setState({
+        	jid:record.id,//项目ID
+        	kid:record.commodityId,//商品ID
+        	commodityName:record.commodityName,//金额
+        	commodityPrice:record.commodityPrice,//金额
+        	commodityQuantity:record.commodityQuantity,//数量
+        	taskComment:record.taskComment,//备注
+        	main:record.main.toString(),//是否为主要
+        	addnextVisible:true,
+        	addState:0,
+        });
+    },
 	resets(){
     	this.state.orderNo='';
     	this.state.customerName='';
@@ -637,6 +656,47 @@ const PaiDan = React.createClass({
 				            </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>
         </div> )
     }
 })

+ 64 - 3
js/component/manageCenter/project/task/myTask.jsx

@@ -7,7 +7,7 @@ import '@/manageCenter/financialManage/distribute/public.less';
 import { Icon, Button,Form, Input, Select, Upload,Col,Spin, Table, Switch, message, DatePicker, Modal } from 'antd';
 import OrderDesc from '@/manageCenter/financialManage/orderDetail/orderDesc'
 import Assign from '@/manageCenter/publicComponent/assign';
-import {getProcessStatus,getApproval,getTaskStatus,getLiquidationStatus,getApprovedState,getProjectStatus,splitUrl,getjiedian} from '@/tools';
+import {getProcessStatus,getApproval,getTaskStatus,getLiquidationStatus,getApprovedState,getProjectStatus,splitUrl,getjiedian,getboutique} from '@/tools';
 import {projectStates,taskStatus ,projectStatus} from '@/dataDic.js';
 const FormItem =Form.Item;
 
@@ -151,6 +151,7 @@ const Task = React.createClass({
                     key: 'caouzo',
                     render:(text,record)=>{
                         return <div>
+                        	<Button type="primary" style={{margin:'0 10px'}} onClick={(e)=>{e.stopPropagation(),this.evaluate(record,'咨询师')}}>转交</Button>
                             <Button type="primary" style={{margin:'0 10px'}} onClick={(e)=>{e.stopPropagation(),this.okCancel(record)}}>添加工时</Button>
                         </div>
                     }
@@ -494,6 +495,25 @@ const Task = React.createClass({
 			taskId:record.id
 		})
 	},
+	nextCancel() {
+		this.setState({
+			addnextVisible: false
+		})
+	},
+	//点击打卡项目详情
+	tableRowClickX(record, index) {
+        this.setState({
+        	jid:record.id,//项目ID
+        	kid:record.commodityId,//商品ID
+        	commodityName:record.commodityName,//金额
+        	commodityPrice:record.commodityPrice,//金额
+        	commodityQuantity:record.commodityQuantity,//数量
+        	taskComment:record.taskComment,//备注
+        	main:record.main.toString(),//是否为主要
+        	addnextVisible:true,
+        	addState:0,
+        });
+    },
 	//关闭添加工时
 	noCancel(){
 		this.setState({
@@ -861,7 +881,7 @@ const Task = React.createClass({
 					                    </Spin>
 						            </div>
 				                    <div className='clearfix'>
-						                   <Button className="cancel" type="primary" onClick={this.tijiaoOk} style={{marginLeft:"200px"}} htmlType="submit">保存</Button>
+						                   <Button className="cancel" type="primary" onClick={this.tijiaoOk} style={{marginLeft:"200px",marginTop:'10px'}} htmlType="submit">保存</Button>
 			                               <Button className="cancel" type="ghost" onClick={this.visitCancel} style={{marginLeft:"50px"}}>取消</Button>
 	                            	</div>
 				                </div>
@@ -904,12 +924,53 @@ const Task = React.createClass({
 								        </FormItem>
 				                    </div>	
 				                    <div className='clearfix'>
-						                   <Button className="cancel" type="primary" onClick={this.tianjiaOk} style={{marginLeft:"100px"}} htmlType="submit">确定</Button>
+						                   <Button className="cancel" type="primary" onClick={this.tianjiaOk} style={{marginLeft:"100px",marginTop:'10px'}} htmlType="submit">确定</Button>
 			                               <Button className="cancel" type="ghost" onClick={this.noCancel} style={{marginLeft:"50px"}}>取消</Button>
 	                            	</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: 3 }}
+								            wrapperCol={{ span: 18 }}
+				                            label="服务说明" >
+			                    			<span>{this.state.taskComment}</span>
+				                    	</FormItem>
+			                    	</div>
+			                    </div>	
+			                </Spin>
+			            </Form >
+			        </Modal>
         </div> )
     }
 })

+ 61 - 1
js/component/manageCenter/project/task/taskAssignment.jsx

@@ -6,7 +6,7 @@ import '@/manageCenter/financialManage/distribute/public.less';
 import { Icon, Button,Form, Input, Select, Upload,Col,Spin, Table, Switch, message, DatePicker, Modal } from 'antd';
 import OrderDesc from '@/manageCenter/financialManage/orderDetail/orderDesc'
 import Assign from '@/manageCenter/publicComponent/assign';
-import {getProcessStatus,getApproval,getTaskStatus,getLiquidationStatus,getApprovedState,getProjectState,splitUrl,getProjectStatus} from '@/tools';
+import {getProcessStatus,getApproval,getTaskStatus,getLiquidationStatus,getApprovedState,getProjectState,splitUrl,getProjectStatus,getboutique} from '@/tools';
 const FormItem =Form.Item;
 
 const Task = React.createClass({
@@ -345,6 +345,25 @@ const Task = React.createClass({
             this.loadData(this.state.page);
         };
     },
+    nextCancel() {
+		this.setState({
+			addnextVisible: false
+		})
+	},
+	//点击打卡项目详情
+	tableRowClickX(record, index) {
+        this.setState({
+        	jid:record.id,//项目ID
+        	kid:record.commodityId,//商品ID
+        	commodityName:record.commodityName,//金额
+        	commodityPrice:record.commodityPrice,//金额
+        	commodityQuantity:record.commodityQuantity,//数量
+        	taskComment:record.taskComment,//备注
+        	main:record.main.toString(),//是否为主要
+        	addnextVisible:true,
+        	addState:0,
+        });
+    },
     search() {
         this.loadData();
     },
@@ -604,6 +623,47 @@ const Task = React.createClass({
 				            </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>
         </div> )
     }
 })

+ 67 - 1
js/component/manageCenter/project/task/taskQuery.jsx

@@ -6,7 +6,7 @@ import '@/manageCenter/financialManage/distribute/public.less';
 import { Icon, Button,Form, Input, Select, Upload,Col,Spin, Table, Switch, message, DatePicker, Modal } from 'antd';
 import OrderDesc from '@/manageCenter/financialManage/orderDetail/orderDesc'
 import Assign from '@/manageCenter/publicComponent/assign';
-import {getProcessStatus,getApproval,getTaskStatus,getLiquidationStatus,getApprovedState,getProjectState,splitUrl,getProjectStatus} from '@/tools';
+import {getProcessStatus,getApproval,getTaskStatus,getLiquidationStatus,getApprovedState,getProjectState,splitUrl,getProjectStatus,getboutique} from '@/tools';
 const FormItem =Form.Item;
 
 const Task = React.createClass({
@@ -54,6 +54,7 @@ const Task = React.createClass({
                             commodityQuantity:thisdata.commodityQuantity,//数量
                             userName:thisdata.userName,//用户名
                             depName:thisdata.depName,//部门名称
+                            receiverName:thisdata.receiverName,//任务责任人
                         });
                     };
                 }
@@ -143,6 +144,11 @@ const Task = React.createClass({
                     title: '任务数量',
                     dataIndex: 'commodityQuantity',
                     key: 'commodityQuantity'
+                },
+                {
+                    title: '任务责任人',
+                    dataIndex: 'receiverName',
+                    key: 'receiverName'
                 },{
                     title: '订单部门',
                     dataIndex: 'depName',
@@ -340,6 +346,25 @@ const Task = React.createClass({
             this.loadData(this.state.page);
         };
     },
+    nextCancel() {
+		this.setState({
+			addnextVisible: false
+		})
+	},
+	//点击打卡项目详情
+	tableRowClickX(record, index) {
+        this.setState({
+        	jid:record.id,//项目ID
+        	kid:record.commodityId,//商品ID
+        	commodityName:record.commodityName,//金额
+        	commodityPrice:record.commodityPrice,//金额
+        	commodityQuantity:record.commodityQuantity,//数量
+        	taskComment:record.taskComment,//备注
+        	main:record.main.toString(),//是否为主要
+        	addnextVisible:true,
+        	addState:0,
+        });
+    },
     search() {
         this.loadData();
     },
@@ -598,6 +623,47 @@ const Task = React.createClass({
 				            </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>
         </div> )
     }
 })