Bläddra i källkod

Merge branch 'master' of http://git.jishutao.com/jishutao/kede-client

liting2017 6 år sedan
förälder
incheckning
0683fdbf98

+ 16 - 7
js/component/manageCenter/order/orderNew/addService.jsx

@@ -6,7 +6,7 @@ import '../userMangagement.less';
 import moment from 'moment';
 import Picture from '@/manageCenter/publicComponent/picture';
 import {orderTypes,customerType,jiedian,tepi,boutique} from '../../../dataDic.js';  
-import {splitUrl,getTransactionProject,getChangeState,getTransactionChannel,beforeUploadFile,getProcessStatus,getLiquidationStatus,getboutique,getApprovedState} from '../../../tools.js';
+import {splitUrl,getTransactionProject,getChangeState,getTransactionChannel,beforeUploadFile,getProcessStatus,getLiquidationStatus,getboutique,getApprovedState,getjiedian} from '../../../tools.js';
 const Option = AutoComplete.Option;
 //图片组件
 const PicturesWall = React.createClass({
@@ -236,14 +236,16 @@ const NewService = Form.create()(React.createClass({
 					dataIndex: 'dunSubject',
 					key: 'dunSubject',
 					render: (text, record, index) => {
-						return <Select placeholder="请选择催款科目"  value={record.dunSubject}  style={{width:'150px'}}
+						return <div>
+						{this.state.processStatus==0?<Select placeholder="请选择催款科目"  value={record.dunSubject}  style={{width:'150px'}}
 						    		onChange={(e) => { record.dunSubject = e; this.setState({ contactList: this.state.contactList }); }}> 
                                  {
                                     jiedian.map(function (item) {
                                         return <Select.Option key={item.value} >{item.key}</Select.Option>
                                     })
                                 }
-                            </Select>  
+                            </Select>:getjiedian(text)}
+						</div>
 				                               
 					}
 				},{
@@ -251,9 +253,11 @@ const NewService = Form.create()(React.createClass({
 					dataIndex: 'money',
 					key: 'money',
 					render: (text, record, index) => {
-						return <Input value={record.money} placeholder="请输入金额(必填项)" key={record.id} required="required"
-	                  onChange={(e) => { record.money = e.target.value; this.setState({ contactList: this.state.contactList }); }} style={{width:'120px'}}/>
-					}
+						return <div>
+						{this.state.processStatus==0?<Input value={record.money} placeholder="请输入金额(必填项)" key={record.id} required="required"
+	                  onChange={(e) => { record.money = e.target.value; this.setState({ contactList: this.state.contactList }); }} style={{width:'120px'}}/>:<span>{text}</span>}
+						</div>
+						}
 				}, {
 					title: '催款状态',
 					dataIndex: 'dunStatus',
@@ -319,6 +323,11 @@ const NewService = Form.create()(React.createClass({
 	        	this.refs.signFirstPayment.focus()
 	        	return false;
 	        };
+	        if(!this.state.signDate){
+	        	message.warning('签单日期不能为空');
+	        	this.refs.signFirstPayment.focus()
+	        	return false;
+	        };
         }else{
         	if(this.state.orderType==undefined){
 	        	message.warning('请选择订单类型');
@@ -593,7 +602,7 @@ const NewService = Form.create()(React.createClass({
                 this.setState({
                     loading: false,
                 });
-                this.loaduser()
+                //this.loaduser()
             	this.loadData();
             } else {
                 message.warning(data.error[0].message);

+ 14 - 20
js/component/manageCenter/order/orderNew/chargeback.jsx

@@ -189,18 +189,18 @@ const IntentionCustomer = Form.create()(React.createClass({
                     title: '退单状态',
                     dataIndex: 'refundStatus',
                     key: 'refundStatus',
-                    render:text=>{return getLiquidationStatus(text)}
+                    render:text=>{return getRefundStatus(text)}
                 },{
                     title: '退单原因',
                     dataIndex: 'reason',
                     key: 'reason'
                 }, {
-					title: '修改操作',
+					title: '操作',
 					dataIndex: 'abc',
 					key: 'abc',
 					render: (text, record, index) => {
 						return <div>
-                            <Button onClick={(e) =>{ e.stopPropagation(), this.visit(record)}} type="primary">修改退款申请</Button>                            							    
+                            <Button onClick={(e) =>{ e.stopPropagation(), this.visit(record)}} type="primary">{this.state.refundStatus==2?'修改退款申请':'查看退款申请'}</Button>
                         </div>
 					}
 				}
@@ -376,25 +376,13 @@ const IntentionCustomer = Form.create()(React.createClass({
 		this.xiangmu(record.orderNo);
 		this.jiedian(record.orderNo);
 	},	
-	//点击打卡项目详情
-	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,
-        });
-    },
-    //项目详情关闭
+	
+    //详情关闭
     nextCancel() {
 		this.setState({
 			addnextVisible: false
 		})
+		this.resets();
 	},
     //订单详情
 	xiangqing(orderNos) {
@@ -544,7 +532,13 @@ const IntentionCustomer = Form.create()(React.createClass({
     	this.state.releaseDate[0] = undefined;
 		this.state.releaseDate[1] = undefined;
     },
-    
+    reset(){
+    	this.state.orderNo='';
+    	this.state.customerName='';
+    	this.state.releaseDate[0] = undefined;
+		this.state.releaseDate[1] = undefined;
+		this.loadData();
+    },
 	
 	//搜索
 	search() {
@@ -794,7 +788,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 			         <Modal maskClosable={false} visible={this.state.addnextVisible}
                         onOk={this.nextCancel} onCancel={this.nextCancel}
                         width='800px'
-                        title={'修改退单申请'}                     
+                        title={this.state.refundStatus==2?'修改退单申请':'退单详情'}                     
                         footer=''
                         className="admin-desc-content">
 			            <Form layout="horizontal"  id="demand-form">

+ 17 - 15
js/component/manageCenter/project/project/projectAssignment.jsx

@@ -19,15 +19,16 @@ const PaiDan = React.createClass({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/api/admin/newOrder/orderNewList",
+            url: globalConfig.context + "/api/admin/orderProject/orderTaskList",
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
-                buyerName: this.state.nameSearch,//客户名称
-                orderNo:this.state.orderNoSearch,
-                distribution:this.state.distribution, //是否分配
-                startTime: this.state.releaseDate[0],
-                endTime: this.state.releaseDate[1],
+                name: this.state.nameSearch,//项目名称
+                orderNo:this.state.orderNo,//订单编号
+                taskId:this.state.taskId, //任务编号
+                taskStatus:this.state.taskStatus, //任务状态
+                adminName:this.state.adminName, //任务受理人
+                specially:this.state.specially, //个人/经理
             },
             success: function (data) {
                 let theArr = [];
@@ -40,15 +41,16 @@ const PaiDan = React.createClass({
                         let thisdata = data.data.list[i];
                         theArr.push({
                             key: i,
-                            orderNo: thisdata.orderNo,
-                            approval:thisdata.approval,
-		                    orderType:thisdata.orderType,
-		                    processStatus:thisdata.processStatus,
-                            signTotalAmount:thisdata.signTotalAmount,
-                            userName:thisdata.userName,
-                            salesmanName:thisdata.salesmanName,
-                            sellerName:thisdata.sellerName,
-                            signDate:thisdata.signDate
+                            id:thisdata.id,//任务ID
+                            orderNo: thisdata.orderNo,//订单编号
+                            taskName:thisdata.taskName,//名称
+		                    cname:thisdata.cname,//项目品类
+		                    receiverName:thisdata.receiverName,//受理人
+                            projectStatus:thisdata.projectStatus,//项目状态
+                            taskStatus:thisdata.taskStatus,//任务状态
+                            taskDate:thisdata.taskDate,//分配时间
+                            commodityQuantity:thisdata.commodityQuantity,//数量
+                            userName:thisdata.userName,//用户名
                         });
                     };
                 }