HW 4 vuotta sitten
vanhempi
commit
30d6dd5217

+ 1 - 1
js/component/manageCenter/order/orderNew/reject.jsx

@@ -2112,7 +2112,7 @@ const IntentionCustomer = Form.create()(
                         : this.state.columns
                   }
                   dataSource={this.state.dataSource}
-                  rowSelection={rowSelection}
+                  // rowSelection={rowSelection}
                   pagination={this.state.pagination}
                   onRowClick={this.tableRowClick}
                   bordered

+ 1 - 1
js/component/manageCenter/project/task/myTask.jsx

@@ -5074,7 +5074,7 @@ const Task = React.createClass({
                   <Input
                       placeholder="请输入工作时长"
                       value={this.state.hours}
-                      style={{ width: '200px' }}
+                      style={{ width: '200px',marginBottom:"5px" }}
                       onChange={(e) => {
                         this.setState({ hours: e.target.value })
                       }}

+ 21 - 11
js/component/manageCenter/set/business/businessQuery.jsx

@@ -1283,7 +1283,7 @@ const BusinessProject=Form.create()(React.createClass({
 					                            labelCol={{ span: 7 }}
 					                        	wrapperCol={{ span: 12 }}
 					                            label="规格名称" >
-				                    	     <Input placeholder="规格名称" value={this.state.formatPname} style={{width:'94%'}}
+				                    	     <Input size='default' placeholder="规格名称" value={this.state.formatPname} style={{width:'94%',marginBottom:'5px'}}
 				                                onChange={(e)=>{this.setState({formatPname:e.target.value})}} required="required"/>
 				                           		<span className="mandatory" style={{color:'red',marginLeft:'5px'}}>*</span>
 					                    </FormItem>
@@ -1294,14 +1294,14 @@ const BusinessProject=Form.create()(React.createClass({
 						                    wrapperCol={{ span: 12 }}
 						                    label="创建人"
 					                        >
-					                        <span style={{width:'94%'}}>{this.state.editCreateId}</span>
+					                        <span style={{width:'94%',marginBottom:'5px'}}>{this.state.editCreateId}</span>
 					                      </FormItem>
 							             <FormItem
 					                    	labelCol={{ span: 7 }}
 					                        wrapperCol={{ span: 12 }}
 					                         label="市场价"
 				                            >
-			                                <Input placeholder="市场价" value={this.state.formatPrice} style={{width:'94%'}}
+			                                <Input size='default' placeholder="市场价" value={this.state.formatPrice} style={{width:'94%',marginBottom:'5px'}}
 						    				onChange={(e)=>{this.setState({formatPrice:e.target.value})}}/>
 						                 </FormItem>
 						                 <FormItem
@@ -1309,7 +1309,7 @@ const BusinessProject=Form.create()(React.createClass({
 					                        wrapperCol={{ span: 12 }}
 					                         label="活动价"
 				                            >
-			                                <Input placeholder="活动价" value={this.state.formatActivityPrice} style={{width:'94%'}}
+			                                <Input size='default' placeholder="活动价" value={this.state.formatActivityPrice} style={{width:'94%',marginBottom:'5px'}}
 						    				onChange={(e)=>{this.setState({formatActivityPrice:e.target.value})}}/>
 						                 </FormItem>
 						                 <FormItem
@@ -1317,7 +1317,7 @@ const BusinessProject=Form.create()(React.createClass({
 					                        wrapperCol={{ span: 12 }}
 					                         label="最低折扣"
 				                            >
-			                                <Input placeholder="最低折扣" value={this.state.formatOffset} style={{width:'94%'}}
+			                                <Input size='default' placeholder="最低折扣" value={this.state.formatOffset} style={{width:'94%',marginBottom:'5px'}}
 						    				onChange={(e)=>{this.setState({formatOffset:e.target.value})}}/>
 						                 </FormItem>
 						                 <FormItem
@@ -1325,7 +1325,7 @@ const BusinessProject=Form.create()(React.createClass({
 					                        wrapperCol={{ span: 12 }}
 					                         label="会员价"
 				                            >
-			                                <Input placeholder="会员价" value={this.state.formatMemberPrice} style={{width:'94%'}}
+			                                <Input size='default' placeholder="会员价" value={this.state.formatMemberPrice} style={{width:'94%',marginBottom:'5px'}}
 						    				onChange={(e)=>{this.setState({formatMemberPrice:e.target.value})}}/>
 						                 </FormItem>
 						                 <FormItem
@@ -1333,7 +1333,7 @@ const BusinessProject=Form.create()(React.createClass({
 						                        wrapperCol={{ span: 12 }}
 					                           	label="活动生效"
 					                         >
-					                          <Select placeholder="活动生效" value={this.state.formatActivityFlag} style={{width:'94%'}}
+					                          <Select size='default' placeholder="活动生效" value={this.state.formatActivityFlag} style={{width:'94%',marginBottom:'5px'}}
 				                                onChange={(e)=>{this.setState({formatActivityFlag:e})}}>
 				                                {
 				                                    gameState.map(function (item) {
@@ -1347,7 +1347,7 @@ const BusinessProject=Form.create()(React.createClass({
 						                        wrapperCol={{ span: 12 }}
 					                           	label="项目状态"
 					                         >
-					                          <Select placeholder="项目状态" value={this.state.formatStatus} style={{width:'94%'}}
+					                          <Select size='default' placeholder="项目状态" value={this.state.formatStatus} style={{width:'94%',marginBottom:'5px'}}
 				                                onChange={(e)=>{this.setState({formatStatus:e})}}>
 				                                {
 				                                    conditionOrganization.map(function (item) {
@@ -1583,9 +1583,19 @@ const BusinessProject=Form.create()(React.createClass({
 					        <div className="clearfix" >
 
 								<Popconfirm title="是否停用?" onConfirm={this.blockRowSize} okText="是" cancelText="否" >
-								     <Button style={{ background: "#ea0862", border: "none", color: "#fff",marginRight:'10px' ,marginLeft:'10px',display:'none'}}
+								     <Button
+                                         style={{
+                                             background: "#ea0862",
+                                             border: "none",
+                                             color: "#fff",
+                                             marginRight:'10px' ,
+                                             marginLeft:'10px',
+                                             display:'none'
+                                         }}
 			                   			 disabled={!hasSelected}
-			                    		 >停用<Icon type="minus" />
+                                     >
+                                         停用
+                                         <Icon type="minus" />
 			           			     </Button>
 								</Popconfirm>
 						    </div>
@@ -1596,7 +1606,7 @@ const BusinessProject=Form.create()(React.createClass({
 					            	 pagination={this.state.formatPagination}
 					            	 columns={this.state.ContactsLists}
 					            	 dataSource={this.state.formatDataSource}
-					            	 rowSelection={rowSelection}
+					            	 // rowSelection={rowSelection}
 					            	 onRowClick={this.formatTableRowClick}
 					            	 />
 					            </Form>