|
@@ -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> )
|
|
|
}
|
|
|
})
|