liting2017 пре 7 година
родитељ
комит
f8272845a3

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

@@ -431,7 +431,8 @@ const NewService = Form.create()(React.createClass({
 		this.setState({
 			contractNo:this.state.contractNo,
 			signVisible:true,
-			entryTime:undefined
+			entryTime:undefined,
+			selTime:undefined
 		})
     },
     signBittOk(){
@@ -595,6 +596,10 @@ const NewService = Form.create()(React.createClass({
     },
 	signSub(e){
 		e.preventDefault();
+		if(!this.state.selTime){
+			message.warning("请选择签单时间!");
+			return false;
+		};
 		this.setState({
 			loading: true
 		});
@@ -1233,7 +1238,7 @@ const NewService = Form.create()(React.createClass({
 										      placeholder="选择签单时间"
 										      value={this.state.entryTime}
 										      onChange={(e,time)=>{this.selTime(e,time)}}
-										    />
+										    /><span className="mandatory">*</span>
 			                    		</FormItem>
 			                    	</div>
 			                    <FormItem wrapperCol={{ span: 12, offset: 4 }} className="half-middle">

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

@@ -458,7 +458,8 @@ const NewService = Form.create()(React.createClass({
     	this.setState({
 			contractNo:this.state.contractNo,
 			signVisible:true,
-			entryTime:undefined
+			entryTime:undefined,
+			selTime:undefined
     	})
     },
     signBittOk(){
@@ -684,6 +685,10 @@ const NewService = Form.create()(React.createClass({
     },
 	signSub(e){
 		e.preventDefault();
+		if(!this.state.selTime){
+			message.warning("请选择签单时间!");
+			return false;
+		};
 		this.setState({
 			loading: true
 		});
@@ -1530,6 +1535,7 @@ const NewService = Form.create()(React.createClass({
 										      value={this.state.entryTime}
 										      onChange={(e,time)=>{this.selTime(e,time)}}
 										    />
+										    <span className="mandatory">*</span>
 			                    		</FormItem>
 			                    	</div>	
 			                    <FormItem wrapperCol={{ span: 12, offset: 4 }} className="half-middle">

+ 1 - 1
js/component/manageCenter/order/orderManagement/approveOrder/approveOrder.jsx

@@ -273,7 +273,7 @@ const ApproveOrder=Form.create()(React.createClass({
                 this.setState({
                     loading: false,
                 });
-                 this.loadData();
+                 this.loadData(this.state.pageNo);
             } else {
                 message.warning(data.error[0].message);
             };