liting2017 7 years ago
parent
commit
da4e7a3902

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

@@ -50,7 +50,7 @@ const PicturesWall = React.createClass({
                     fileList={fileList}
                     onPreview={this.handlePreview}
                     onChange={this.handleChange} >
-                    {fileList.length >= 5 ? null : uploadButton}
+                    {fileList.length >= 8 ? null : uploadButton}
                 </Upload>
                 <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel}>
                     <img alt="example" style={{ width: '100%' }} src={previewImage} />

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

@@ -189,7 +189,7 @@ const ServiceManage=Form.create()(React.createClass({
                     dataIndex: 'buyerName',
                     key: 'buyerName',
                     render:(text)=>{
-                    	return (text&&text.length>9?text.substr(0,9)+'...':text)
+                    	return (text&&text.length>8?text.substr(0,8)+'...':text)
                     }
                 }, {
                     title: '实际下单金额(万元)',

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

@@ -50,7 +50,7 @@ const PicturesWall = React.createClass({
                     fileList={fileList}
                     onPreview={this.handlePreview}
                     onChange={this.handleChange} >
-                    {fileList.length >= 5 ? null : uploadButton}
+                    {fileList.length >= 8 ? null : uploadButton}
                 </Upload>
                 <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel}>
                     <img alt="example" style={{ width: '100%' }} src={previewImage} />

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

@@ -125,7 +125,10 @@ const MyService=Form.create()(React.createClass({
                 },{
                     title: '订单客户',
                     dataIndex: 'buyerName',
-                    key: 'buyerName'
+                    key: 'buyerName',
+                    render:(text)=>{
+                    	return (text&&text.length>8?text.substr(0,8)+'...':text)
+                    }
                 }, {
                     title: '实际下单金额(万元)',
                     dataIndex: 'signTotalAmount',

+ 43 - 1
js/component/manageCenter/servicesManage/projectOrder/projectManagement/projectManage.jsx

@@ -92,6 +92,7 @@ const ProjectOrder=Form.create()(React.createClass({
             searchMore: true,
             releaseDate: [],
             releaseDateOrder:[],
+            categoryArr:[],
             projectState:false,
             newProject:false,
             loading: false,
@@ -133,7 +134,6 @@ const ProjectOrder=Form.create()(React.createClass({
                     title: '业务品类',
                     dataIndex: 'projectType',
                     key: 'projectType',
-                    render:(text)=>{return getOrderType(text) }
                 },{
                     title: '项目状态',
                     dataIndex: 'projectStatus',
@@ -336,7 +336,48 @@ const ProjectOrder=Form.create()(React.createClass({
             showDesc: false
         });
     },
+    //品类数据获取
+    category(){
+    	this.setState({
+			loading: true
+		});
+		$.ajax({
+			method: "get",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + "/api/admin/Varieties/getSuperList",
+			data: {
+				
+			},
+			success: function(data) {
+				let thedata = data.data;
+				let theArr=[];
+				if(!thedata) {
+					if(data.error && data.error.length) {
+						message.warning(data.error[0].message);
+					};
+					thedata = {};
+				}else{
+					thedata.map(function(item,index){
+						theArr.push({
+							key:index,
+							name:item.cname,
+							id:item.id,
+						})
+					})
+				}
+				this.setState({
+					categoryArr:theArr,
+				})
+			}.bind(this),
+			}).always(function() {
+				this.setState({
+					loading: false
+				});
+			}.bind(this));
+    },
     componentWillMount() {
+    	this.category();
         this.loadData();
         this.departmentList()
     },
@@ -507,6 +548,7 @@ const ProjectOrder=Form.create()(React.createClass({
 	                    </Spin>
 	                </div>
 	                <MySettlementDetaile
+	                	categoryArr={this.state.categoryArr}
 	                    queryProject={this.props.queryProject}
 	                    departmentArr={this.state.departmentArr}
 	                	projectState={this.state.projectState}

+ 2 - 44
js/component/manageCenter/servicesManage/projectOrder/projectManagement/projectManageDetaile.jsx

@@ -281,7 +281,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 					id:record.id,
 					orderNok:thisData.orderNo,
 					orderList:thisData,
-					technicianName:thisData.technicianName, //项目负责人
+					technicianName:thisData.technicianName, //任务负责人
                 });                  
             }.bind(this),
        }).always(function () {
@@ -724,47 +724,6 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			}
 		}.bind(this));
 	},
-	//品类数据获取
-    category(){
-    	this.setState({
-			loading: true
-		});
-		$.ajax({
-			method: "get",
-			dataType: "json",
-			crossDomain: false,
-			url: globalConfig.context + "/api/admin/Varieties/getSuperList",
-			data: {
-				
-			},
-			success: function(data) {
-				let thedata = data.data;
-				let theArr=[];
-				if(!thedata) {
-					if(data.error && data.error.length) {
-						message.warning(data.error[0].message);
-					};
-					thedata = {};
-				}else{
-					thedata.map(function(item,index){
-						theArr.push({
-							key:index,
-							name:item.cname,
-							id:item.id,
-						})
-					})
-				}
-				this.setState({
-					contractType:undefined,
-					categoryArr:theArr,
-				})
-			}.bind(this),
-			}).always(function() {
-				this.setState({
-					loading: false
-				});
-			}.bind(this));
-    },
 	tableRowClick(record, index) {
         this.setState({
         	addTaskState:false,
@@ -781,7 +740,6 @@ const MySettlementDetaile = Form.create()(React.createClass({
 				this.loadData(nextProps.datauser);
 			}
 		}else{
-			this.category();
 			this.setState({
 				customerArr:[],
 				customerName:'',
@@ -813,7 +771,7 @@ const MySettlementDetaile = Form.create()(React.createClass({
 			   })
 			},
         };
-        const categoryList=this.state.categoryArr ||[];
+        const categoryList=this.props.categoryArr ||[];
         let departmentArr = this.props.departmentArr || [];
         const hasSelected = this.state.selectedRowKey.length > 0;
 		const orderDetaiel=this.state.orderList || [];