Browse Source

Merge branch 'master' of https://git.coding.net/aft/AFT-WEB

dengzhiguo 7 years ago
parent
commit
9707c01089

+ 1 - 1
js/component/manageCenter/servicesManage/projectOrder/orderOrder/projectOrder.jsx

@@ -336,7 +336,7 @@ const ProjectOrder=Form.create()(React.createClass({
 	                        <Input placeholder="订单负责人" style={{width:'150px',marginRight:'10px'}}
 		                        value={this.state.salesmanNameSearch }
 		                        onChange={(e) => { this.setState({ salesmanNameSearch : e.target.value }); }} />
-	                        <Input placeholder="财负责人" style={{width:'150px'}}
+	                        <Input placeholder="财负责人" style={{width:'150px'}}
 		                        value={this.state.financeNameSearch}
 		                        onChange={(e) => { this.setState({ financeNameSearch: e.target.value }); }} />
 	                    </div>

+ 3 - 3
js/component/manageCenter/set/userManagementS/newRole.jsx

@@ -55,9 +55,9 @@ const Newrole = Form.create()(React.createClass({
 				this.setState({
 					loading: true
 				});
-				if(selectAllId.checked){
-					if(selectAllId.checked[0]==null){
-						selectAllId.checked.splice(0,1)
+				if(selectAllId){
+					if(selectAllId[0]==null){
+						selectAllId.splice(0,1)
 					}
 				}
 				$.ajax({