From b760efb84ff0132834110850f33ce4fc342b2ca9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8C=97=E6=B5=B7=E4=B8=80=E5=88=80?= <849005670@qq.com>
Date: Wed, 10 Nov 2021 16:52:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/form-item/main.js |  4 ++--
 src/pages/plan/add/add.js        | 12 ++++++++----
 src/pages/plan/add/add.less      |  6 ++++++
 src/pages/plan/add/step1.js      |  3 +--
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/components/form-item/main.js b/src/components/form-item/main.js
index c3f811d7..4248a83b 100644
--- a/src/components/form-item/main.js
+++ b/src/components/form-item/main.js
@@ -20,11 +20,11 @@ import Menu from "../menu/main.js"
 		}
 	}
  	render() {
-		const {labelname,prop,labelwidth} = this.props
+		const {labelname,prop,labelwidth,myClassName} = this.props
 		
 		console.log(labelwidth)
  	    return (
-		<div className ="form-Item">
+		<div className ={ myClassName ? myClassName + " form-Item" :"form-Item"}   >
 		<div className="form-label" style={{width: labelwidth ? labelwidth  :  "180px"     }}>
 		  {labelname}
 		</div>
diff --git a/src/pages/plan/add/add.js b/src/pages/plan/add/add.js
index 8a62c66c..4724daba 100644
--- a/src/pages/plan/add/add.js
+++ b/src/pages/plan/add/add.js
@@ -19,6 +19,10 @@ export default class add extends React.Component{
   }
 
 
+	submit(){
+		this.refs.step1.submit();
+	}
+
   render(){
     return(
       <div id="plan-add">
@@ -48,13 +52,13 @@ export default class add extends React.Component{
 		<div className="plan-title">营销计划</div>
 		<div id="step1" className="step1">
 		 <Card style={{ width:'100%' }} title={this.state.step1_pagetitle}>
-		<Step1/>
+		<Step1 ref="step1"/>
 		</Card>
 				<div className="btn-group">
-				  <Button type="primary" htmlType="submit" onClick={()=>{this.submit()}}>
-				    提交
+				  <Button type="primary" size="medium"  onClick={()=>{this.submit()}}>
+				    下一步
 				  </Button>
-				  <Button type="normal" htmlType="reset" >
+				  <Button type="normal" size="medium">
 				    取消
 				  </Button>
 				</div>
diff --git a/src/pages/plan/add/add.less b/src/pages/plan/add/add.less
index f723efb3..247be979 100644
--- a/src/pages/plan/add/add.less
+++ b/src/pages/plan/add/add.less
@@ -75,4 +75,10 @@
 
 
 
+
+
+.step1 .btn-group{
+	text-align: left;
+	justify-content: flex-start; 
+}
    
diff --git a/src/pages/plan/add/step1.js b/src/pages/plan/add/step1.js
index 5bb45f85..a20bc6c5 100644
--- a/src/pages/plan/add/step1.js
+++ b/src/pages/plan/add/step1.js
@@ -103,6 +103,7 @@ export default class acclist extends React.Component{
 					    {return_val}
 					</Tabs>
 			  </FormItem>	
+			
 			<FormItem labelname="开始~结束时间" prop="date_time" >
 					 <CombinedDateRangePicker
 					          className="zent-datepicker-plan"
@@ -114,8 +115,6 @@ export default class acclist extends React.Component{
 					          format="YYYY-MM-DD HH:mm:ss"
 					          onChange={this.onChangeCombinedDate}
 					        />
-							
-							
 			  </FormItem>	
         </Form>
       </div>