yee 7 years ago
parent
commit
d4126570d4

+ 10 - 10
js/component/account/services/companyDetail.jsx

@@ -34,8 +34,8 @@ const CompanyDetail = Form.create()(React.createClass({
                 unitName: thisdata.unitName,
                 postalAddress: thisdata.postalAddress,
                 postcode: thisdata.postcode,
-                contacts: thisdata.contacts,
-                contactMobile: thisdata.contactMobile,
+                firstMobile: thisdata.firstMobile,
+                firstContacts: thisdata.firstContacts,
                 contactsFixedTel: thisdata.contactsFixedTel,
                 contactsFax: thisdata.contactsFax,
                 legalPersonTel: thisdata.legalPersonTel,
@@ -64,7 +64,7 @@ const CompanyDetail = Form.create()(React.createClass({
                 techTotal: thisdata.techTotal,
                 listedDateFormattedDate: thisdata.listedDateFormattedDate,
                 registrationTimeFormattedDate: thisdata.registrationTimeFormattedDate,
-                address: [thisdata.province, thisdata.city, thisdata.area],
+                address: [thisdata.licenceProvince, thisdata.licenceCity, thisdata.licenceArea],
                 field: thisdata.field ? thisdata.field.split(',') : [],
                 registerType: thisdata.registerType ? thisdata.registerType.split(',') : []
             });
@@ -246,13 +246,13 @@ const CompanyDetail = Form.create()(React.createClass({
                         uid: this.state.data.uid,
                         hid: this.state.data.hid,
                         unitName: values.unitName,
-                        province: values.address[0],
-                        city: values.address[1],
-                        area: values.address[2],
+                        licenceProvince: values.address[0],
+                        licenceCity: values.address[1],
+                        licenceArea: values.address[2],
                         postalAddress: values.postalAddress,
                         postcode: values.postcode,
-                        contacts: values.contacts,
-                        contactMobile: values.contactMobile,
+                        firstMobile: values.firstMobile,
+                        firstContacts: values.firstContacts,
                         contactsFixedTel: values.contactsFixedTel,
                         contactsFax: values.contactsFax,
                         legalPersonTel: values.legalPersonTel,
@@ -551,7 +551,7 @@ const CompanyDetail = Form.create()(React.createClass({
                         >
                             {getFieldDecorator('contacts', {
                                 rules: [{ required: true, message: '此项为必填项!' }],
-                                initialValue: theData.contacts
+                                initialValue: theData.firstContacts
                             })(
                                 <Input />
                                 )}
@@ -562,7 +562,7 @@ const CompanyDetail = Form.create()(React.createClass({
                         >
                             {getFieldDecorator('contactMobile', {
                                 rules: [{ required: true, message: '此项为必填项!' }],
-                                initialValue: theData.contactMobile
+                                initialValue: theData.firstMobile
                             })(
                                 <Input />
                                 )}

+ 4 - 0
js/component/account/services/technology.jsx

@@ -21,6 +21,10 @@ const Technology = React.createClass({
             dataType: "json",
             crossDomain: false,
             url: globalConfig.context + "/api/user/techproject/listClientTechProject",
+            data: {
+                pageNo: pageNo || 1,
+                pageSize: this.state.pagination.pageSize,
+            },
             success: function (data) {
                 if (data.error.length || !data.data || !data.data.list) {
                     message.warning(data.error[0].message);

+ 5 - 2
js/component/manageCenter/achievement/techAchievementDesc.jsx

@@ -759,6 +759,10 @@ const AchievementDetailForm = Form.create()(React.createClass({
             if (values.iOwnerName && this.state.dataSourceObj && !this.state.dataSourceObj[values.iOwnerName]) {
                 message.warning('请选择一个有效的公司!');
                 return;
+            };
+            if (values.bargainingMode == 1 && !values.transferPrice) {
+                message.warning('议价方式为[ 定价 ]时, [ 转让价格 ]不能为空!');
+                return;
             }
             //url转化
             let theTechnicalPictureUrl = [];
@@ -930,7 +934,6 @@ const AchievementDetailForm = Form.create()(React.createClass({
                                 label="审核状态" >
                                 <span>{getTechAuditStatus(theData.auditStatus)}</span>
                             </FormItem>
-
                         </div>
                     </div>
                     <FormItem
@@ -1082,7 +1085,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
                                     onSearch={this.state.therottleSearch}
                                     placeholder="输入成果所有人"
                                     onSelect={(e) => {
-                                        this.props.getContactsList(this.state.dataSourceObj[e]);
+                                        this.getContactsList(this.state.dataSourceObj[e]);
                                     }} />
                                 )}
                         </FormItem>

+ 1 - 0
js/component/manageCenter/demand/techDemandDesc.jsx

@@ -221,6 +221,7 @@ const DemandDetailShow = Form.create()(React.createClass({
                     this.state.auditStatus = 0;
                     if (!data.error.length) {
                         message.success('保存成功!');
+                        this.setState({ formSubmitVisible: false });
                         this.props.handleOk();
                     } else {
                         message.warning(data.error[0].message);

+ 6 - 8
js/component/manageCenter/servicesManage/highTech/fosterDesc/companyDetail.jsx

@@ -37,8 +37,6 @@ const CompanyDetail = Form.create()(React.createClass({
                 unitName: thisdata.unitName,
                 postalAddress: thisdata.postalAddress,
                 postcode: thisdata.postcode,
-                contacts: thisdata.contacts,
-                contactMobile: thisdata.contactMobile,
                 firstContacts: thisdata.firstContacts,
                 firstMobile: thisdata.firstMobile,
                 contactsFixedTel: thisdata.contactsFixedTel,
@@ -69,7 +67,7 @@ const CompanyDetail = Form.create()(React.createClass({
                 techTotal: thisdata.techTotal,
                 listedDateFormattedDate: thisdata.listedDateFormattedDate,
                 registrationTimeFormattedDate: thisdata.registrationTimeFormattedDate,
-                address: [thisdata.province, thisdata.city, thisdata.area],
+                address: [thisdata.licenceProvince, thisdata.licenceCity, thisdata.licenceArea],
                 field: thisdata.field ? thisdata.field.split(',') : [],
                 registerType: thisdata.registerType ? thisdata.registerType.split(',') : []
             });
@@ -257,13 +255,13 @@ const CompanyDetail = Form.create()(React.createClass({
                         uid: this.props.data.uid || this.state.data.uid,
                         hid: this.state.data.hid,
                         unitName: values.unitName,
-                        province: values.address[0],
-                        city: values.address[1],
-                        area: values.address[2],
+                        licenceProvince: values.address[0],
+                        licenceCity: values.address[1],
+                        licenceArea: values.address[2],
                         postalAddress: values.postalAddress,
                         postcode: values.postcode,
-                        contacts: values.contacts,
-                        contactMobile: values.contactMobile,
+                        firstContacts: values.firstContacts,
+                        firstMobile: values.firstMobile,
                         contactsFixedTel: values.contactsFixedTel,
                         contactsFax: values.contactsFax,
                         legalPersonTel: values.legalPersonTel,

+ 1 - 0
js/component/portal/search/achievement.jsx

@@ -55,6 +55,7 @@ const Content = React.createClass({
             case 999:
                 this.state.transferPriceLower = null;
                 this.state.transferPriceUpper = null;
+                this.state.bargainingMode = null;
                 break;
         }
         $.ajax({

+ 15 - 5
js/component/portal/search/demand.jsx

@@ -47,9 +47,15 @@ const Content = React.createClass({
                 this.state.budgetCostLower = 500;
                 this.state.budgetCostUpper = 1000;
                 break;
+            case 6:
+                this.state.budgetCostLower = null;
+                this.state.budgetCostUpper = null;
+                this.state.sign = 1;
+                break;
             case 999:
                 this.state.budgetCostLower = null;
                 this.state.budgetCostUpper = null;
+                this.state.sign = 0;
                 break;
         }
         $.ajax({
@@ -65,6 +71,7 @@ const Content = React.createClass({
                 budgetCostUpper: this.state.budgetCostUpper, //交易金额上限
                 industryCategoryA: this.state.fieldA, //技术领域(行业类别A)
                 industryCategoryB: this.state.fieldB == 999 ? null : this.state.fieldB, //技术领域(行业类别B)
+                sign: this.state.sign
             },
             success: function (data) {
                 let theArr = [];
@@ -103,6 +110,7 @@ const Content = React.createClass({
                 });
             }.bind(this),
         }).done(function (data) {
+            this.state.sign = 0;
             if (data.error && data.error.length) {
                 message.warning(data.error[0].message);
             };
@@ -168,6 +176,7 @@ const Content = React.createClass({
             this.state.fieldA = e.target.value;
         } else {
             this.state.fieldA = null;
+            this.state.fieldB = null;
         };
         this.loadData();
         this.setState({ industryRadioB: theArr });
@@ -232,7 +241,7 @@ const Content = React.createClass({
                         <Col className="search-title" span={2}>
                             <span>预算价格</span>
                         </Col>
-                        <Col className="search-select" span={12}>
+                        <Col className="search-select" span={14}>
                             <Radio.Group value={this.state.budgetCost}
                                 onChange={(e) => {
                                     this.setState({
@@ -247,13 +256,14 @@ const Content = React.createClass({
                                 <Radio.Button value={3}>50-100万元</Radio.Button>
                                 <Radio.Button value={4}>100-500万元</Radio.Button>
                                 <Radio.Button value={5}>500-1000万元</Radio.Button>
+                                <Radio.Button value={6}>面议</Radio.Button>
                             </Radio.Group>
                         </Col>
-                        <Col span={10}>
+                        <Col span={8}>
                             <Checkbox checked={!this.state.budgetCost} onChange={(e) => { if (e.target.checked) { this.setState({ budgetCost: null }) } }}>自定义金额</Checkbox>
-                            <InputNumber style={{ width: 80 }} disabled={Boolean(this.state.budgetCost)} onChange={(e) => { this.state.budgetCostLower = e.target.value; }} />
+                            <InputNumber style={{ width: 80 }} disabled={Boolean(this.state.budgetCost)} onChange={(e) => { this.state.budgetCostLower = e; }} />
                             <span> 到 </span>
-                            <InputNumber style={{ width: 80 }} disabled={Boolean(this.state.budgetCost)} onChange={(e) => { this.state.budgetCostUpper = e.target.value; }} />
+                            <InputNumber style={{ width: 80 }} disabled={Boolean(this.state.budgetCost)} onChange={(e) => { this.state.budgetCostUpper = e; }} />
                             <span> 万元</span>
                             <Button style={{ marginLeft: '20px' }} disabled={Boolean(this.state.budgetCost)} onClick={this.loadData}>确定</Button>
                         </Col>
@@ -301,7 +311,7 @@ const Content = React.createClass({
                                             <img src={demand_ico_3} alt="预算" />
                                         </span>
                                         <span className="detial_sub_title">预算: </span>
-                                        <span className="money_text">{item.budgetCost ? item.budgetCost + ' 元' : '价格面议'}</span>
+                                        <span className="money_text">{item.budgetCost ? item.budgetCost + ' 元' : '价格面议'}</span>
                                     </div>
                                     <div className="detial_sub">
                                         <span className="detial_sub_icon">