dengzhiguo 6 years ago
parent
commit
388ed7bd64

+ 7 - 2
js/component/account/business/businessDetails.jsx

@@ -273,11 +273,16 @@ const DemandDetail = Form.create()(
 								</FormItem>
 								</FormItem>
 							</div>
 							</div>
 							<div className="clearfix">
 							<div className="clearfix">
+								<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 12 }} label="项目简介">
+									<span>{theData.summary}</span>
+								</FormItem>
+							</div>
+							<div className="clearfix">
 								<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 12 }} label="项目营销说明">
 								<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 12 }} label="项目营销说明">
 									<span>{theData.advertisement}</span>
 									<span>{theData.advertisement}</span>
 								</FormItem>
 								</FormItem>
 							</div>
 							</div>
-							
+							{/*
 							<div className="clearfix">
 							<div className="clearfix">
 								<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 12 }} label="业务项目价值及作用">
 								<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 12 }} label="业务项目价值及作用">
 									<span>{theData.value}</span>
 									<span>{theData.value}</span>
@@ -287,7 +292,7 @@ const DemandDetail = Form.create()(
 								<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 12 }} label="业务项目客户基本条件">
 								<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 12 }} label="业务项目客户基本条件">
 									<span>{theData.applyConditions}</span>
 									<span>{theData.applyConditions}</span>
 								</FormItem>
 								</FormItem>
-							</div>
+							</div>*/}
 							<div className="clearfix">
 							<div className="clearfix">
 								<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 18 }} label="业务项目服务内容">
 								<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 18 }} label="业务项目服务内容">
 									<div className="ql-editor">
 									<div className="ql-editor">

+ 28 - 4
js/component/account/business/businessForm.jsx

@@ -129,6 +129,10 @@ const DemandDetailForm = Form.create()(
 				message.warning('请输入关键字');
 				message.warning('请输入关键字');
 				return;
 				return;
 			}
 			}
+			if(this.state.summary&&(this.state.summary).length>40){
+				message.warning('项目营销说明字数不得超过40个字。');
+				return;
+			}
 			if(this.state.advertisement&&(this.state.advertisement).length>30){
 			if(this.state.advertisement&&(this.state.advertisement).length>30){
 				message.warning('项目营销说明字数不得超过30个字。');
 				message.warning('项目营销说明字数不得超过30个字。');
 				return;
 				return;
@@ -173,6 +177,7 @@ const DemandDetailForm = Form.create()(
 					categoryId: this.state.categoryId[1], //业务品类
 					categoryId: this.state.categoryId[1], //业务品类
 					price: this.state.price, //市场价
 					price: this.state.price, //市场价
 					advertisement:this.state.advertisement,//项目营销说明
 					advertisement:this.state.advertisement,//项目营销说明
+					summary:this.state.summary,//项目简介
 					activityPrice: this.state.activityPrice ? this.state.activityPrice : '0', //最低折扣
 					activityPrice: this.state.activityPrice ? this.state.activityPrice : '0', //最低折扣
 					memberPrice: this.state.memberPrice ? this.state.memberPrice : '0', //会员价
 					memberPrice: this.state.memberPrice ? this.state.memberPrice : '0', //会员价
 					offset: this.state.offset ? this.state.offset : '0',
 					offset: this.state.offset ? this.state.offset : '0',
@@ -249,7 +254,8 @@ const DemandDetailForm = Form.create()(
 							number: thisdata.number,
 							number: thisdata.number,
 							auditInfo:thisdata.auditInfo,
 							auditInfo:thisdata.auditInfo,
 							price: thisdata.price, //市场价
 							price: thisdata.price, //市场价
-							advertisement:thisdata.advertisement,
+							advertisement:thisdata.advertisement,//项目营销说明
+							summary:thisdata.summary,//项目简介
 							activityPrice: thisdata.activityPrice ? thisdata.activityPrice : '', //最低折扣
 							activityPrice: thisdata.activityPrice ? thisdata.activityPrice : '', //最低折扣
 							memberPrice: thisdata.memberPrice ? thisdata.memberPrice : '', //会员价
 							memberPrice: thisdata.memberPrice ? thisdata.memberPrice : '', //会员价
 							offset: thisdata.offset ? thisdata.offset : '',
 							offset: thisdata.offset ? thisdata.offset : '',
@@ -371,6 +377,10 @@ const DemandDetailForm = Form.create()(
 				message.warning('请输入正确的市场价');
 				message.warning('请输入正确的市场价');
 				return;
 				return;
 			}
 			}
+			if(this.state.summary&&(this.state.summary).length>40){
+				message.warning('项目营销说明字数不得超过40个字。');
+				return;
+			}
 			if(this.state.advertisement&&(this.state.advertisement).length>30){
 			if(this.state.advertisement&&(this.state.advertisement).length>30){
 				message.warning('项目营销说明字数不得超过30个字.');
 				message.warning('项目营销说明字数不得超过30个字.');
 				return;
 				return;
@@ -410,6 +420,7 @@ const DemandDetailForm = Form.create()(
 					categoryId: this.state.categoryId[1], //业务品类
 					categoryId: this.state.categoryId[1], //业务品类
 					price: this.state.price, //市场价
 					price: this.state.price, //市场价
 					advertisement:this.state.advertisement,//项目营销说明
 					advertisement:this.state.advertisement,//项目营销说明
+					summary:this.state.summary,//项目简介
 					activityPrice: this.state.activityPrice ? this.state.activityPrice : '0', //最低折扣
 					activityPrice: this.state.activityPrice ? this.state.activityPrice : '0', //最低折扣
 					memberPrice: this.state.memberPrice ? this.state.memberPrice : '0', //会员价
 					memberPrice: this.state.memberPrice ? this.state.memberPrice : '0', //会员价
 					offset: this.state.offset ? this.state.offset : '0',
 					offset: this.state.offset ? this.state.offset : '0',
@@ -693,6 +704,19 @@ const DemandDetailForm = Form.create()(
 								</FormItem>:''}
 								</FormItem>:''}
 							</div>
 							</div>
 							<div className="clearfix">
 							<div className="clearfix">
+								<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 12 }} label="项目简介">
+									<Input
+										type="textarea"
+										rows={4}
+										placeholder="请输入项目简介"
+										value={this.state.summary}
+										onChange={(e) => {
+											this.setState({ summary: e.target.value });
+										}}
+									/>
+								</FormItem>
+							</div>
+							<div className="clearfix">
 								<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 12 }} label="项目营销说明">
 								<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 12 }} label="项目营销说明">
 									<Input
 									<Input
 										type="textarea"
 										type="textarea"
@@ -705,7 +729,7 @@ const DemandDetailForm = Form.create()(
 									/>
 									/>
 								</FormItem>
 								</FormItem>
 							</div>
 							</div>
-							<div className="clearfix">
+							{/*<div className="clearfix">
 								<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 12 }} label="业务项目价值及作用">
 								<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 12 }} label="业务项目价值及作用">
 									<Input
 									<Input
 										type="textarea"
 										type="textarea"
@@ -730,10 +754,10 @@ const DemandDetailForm = Form.create()(
 										}}
 										}}
 									/>
 									/>
 								</FormItem>
 								</FormItem>
-							</div>
+							</div>*/}
 							<div className="clearfix">
 							<div className="clearfix">
 								<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 16 }} label='业务项目服务内容'>
 								<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 16 }} label='业务项目服务内容'>
-									<Editors textContent={this.state.introduce}
+									<Editors textContent={this.state.introduce} placeholder="业务项目客户基本条件"
 										uploadUrl={'/api/user/demand/uploadPicture'}
 										uploadUrl={'/api/user/demand/uploadPicture'}
 										uploadSign={'demand_picture'}
 										uploadSign={'demand_picture'}
 										handleRichText={(value) => { this.state.introduce = value;  }}
 										handleRichText={(value) => { this.state.introduce = value;  }}

+ 1 - 1
js/component/account/setAccount/expert.jsx

@@ -483,7 +483,7 @@ const Expert = React.createClass({
 							>
 							>
 								{getFieldDecorator('introduction', {
 								{getFieldDecorator('introduction', {
 									initialValue: theData.introduction
 									initialValue: theData.introduction
-								})(<Input type="textarea" rows={4} maxLength={512} placeholder="输入个人简介"/>)}
+								})(<Input type="textarea" rows={4} maxLength={512} placeholder="输入个人简介,比如案例、简介、从业时间、服务企业等"/>)}
 							</FormItem>
 							</FormItem>
 						</div>
 						</div>
 						{(this.state.expert=='0'||this.state.auditStatus=='0'||this.state.expert==null||this.state.auditStatus=='3')&&this.state.type!=null?
 						{(this.state.expert=='0'||this.state.auditStatus=='0'||this.state.expert==null||this.state.auditStatus=='3')&&this.state.type!=null?

+ 7 - 3
js/component/administration/business/businessLibrary.jsx

@@ -545,13 +545,17 @@ const BusinessProject = Form.create()(
 												<span>{this.state.createTime}</span>
 												<span>{this.state.createTime}</span>
 											</FormItem>
 											</FormItem>
 										</div>
 										</div>
-										
+										<div className="clearfix">
+											<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 12 }} label="项目简介">
+												<span>{theData.summary}</span>
+											</FormItem>
+										</div>
 										<div className="clearfix">
 										<div className="clearfix">
 											<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 12 }} label="项目营销说明">
 											<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 12 }} label="项目营销说明">
 												<span>{theData.advertisement}</span>
 												<span>{theData.advertisement}</span>
 											</FormItem>
 											</FormItem>
 										</div>
 										</div>
-										<div className="clearfix">
+										{/*<div className="clearfix">
 											<FormItem
 											<FormItem
 												labelCol={{ span: 4 }}
 												labelCol={{ span: 4 }}
 												wrapperCol={{ span: 12 }}
 												wrapperCol={{ span: 12 }}
@@ -568,7 +572,7 @@ const BusinessProject = Form.create()(
 											>
 											>
 												<span>{theData.applyConditions}</span>
 												<span>{theData.applyConditions}</span>
 											</FormItem>
 											</FormItem>
-										</div>
+										</div>*/}
 										<div className="clearfix">
 										<div className="clearfix">
 											<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 18 }} label="业务项目服务内容">
 											<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 18 }} label="业务项目服务内容">
 												<div className="ql-editor">
 												<div className="ql-editor">

+ 7 - 2
js/component/administration/business/businessProject.jsx

@@ -591,12 +591,17 @@ const BusinessProject = Form.create()(
 											</FormItem>
 											</FormItem>
 										</div>
 										</div>
 										<div className="clearfix">
 										<div className="clearfix">
+											<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 12 }} label="项目简介">
+												<span>{theData.summary}</span>
+											</FormItem>
+										</div>
+										<div className="clearfix">
 											<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 12 }} label="项目营销说明">
 											<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 12 }} label="项目营销说明">
 												<span>{theData.advertisement}</span>
 												<span>{theData.advertisement}</span>
 											</FormItem>
 											</FormItem>
 										</div>
 										</div>
 										
 										
-										<div className="clearfix">
+										{/*<div className="clearfix">
 											<FormItem
 											<FormItem
 												labelCol={{ span: 4 }}
 												labelCol={{ span: 4 }}
 												wrapperCol={{ span: 12 }}
 												wrapperCol={{ span: 12 }}
@@ -613,7 +618,7 @@ const BusinessProject = Form.create()(
 											>
 											>
 												<span>{theData.applyConditions}</span>
 												<span>{theData.applyConditions}</span>
 											</FormItem>
 											</FormItem>
-										</div>
+										</div>*/}
 										<div className="clearfix">
 										<div className="clearfix">
 											<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 18 }} label="业务项目服务内容">
 											<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 18 }} label="业务项目服务内容">
 												<div className="ql-editor">
 												<div className="ql-editor">

+ 2 - 1
js/component/richTextEditors.jsx

@@ -101,11 +101,12 @@ const Editors = React.createClass({
                     value={this.state.value}
                     value={this.state.value}
                     modules={modules}
                     modules={modules}
                     formats={formats}
                     formats={formats}
+                    placeholder='填写的内容可包括服务介绍、项目价值、申办要求、申办流程'
                     onChange={this.handleRichText} />
                     onChange={this.handleRichText} />
                 <input type="file" 
                 <input type="file" 
                     name="fileToUpload"
                     name="fileToUpload"
                     id="fileToUpload"
                     id="fileToUpload"
-                    placeholder='正文'
+                    placeholder='填写的内容可包括服务介绍、项目价值、申办要求、申办流程'
                     style={{ "display": "none" }} />
                     style={{ "display": "none" }} />
             </div>
             </div>
         )
         )