yee 7 years ago
parent
commit
07ba8e568e

+ 10 - 17
js/component/account/achievement/techAchievementDesc.jsx

@@ -534,23 +534,15 @@ const AchievementDetailShow = Form.create()(React.createClass({
                         </FormItem>
                     </div>
                     <div className="clearfix">
-                        <FormItem className="half-item"
-                            {...formItemLayout}
-                            label="议价方式" >
-                            {(() => {
-                                switch (theData.bargainingMode) {
-                                    case "0":
-                                        return <span>面议</span>;
-                                    case "1":
-                                        return <span>定价</span>;
-                                }
-                            })()}
-                        </FormItem>
-                        <FormItem className="half-item"
+                        {theData.bargainingMode == 1 ? <FormItem className="half-item"
                             {...formItemLayout}
                             label="转让价格" >
                             <span>{theData.transferPrice} 万元</span>
-                        </FormItem>
+                        </FormItem> : <FormItem className="half-item"
+                            {...formItemLayout}
+                            label="转让价格" >
+                                <span>面议</span>
+                            </FormItem>}
                     </div>
                     <FormItem
                         labelCol={{ span: 4 }}
@@ -654,6 +646,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
                 this.setState({
                     data: thisData,
                     orgDisplay: thisData.ownerType,
+                    transferPriceDis: thisData.transferMode == 1 ? true : false,
                     tags: thisData.keyword ? thisData.keyword.split(",") : [],
                     technicalPictureUrl: thisData.technicalPictureUrl ? splitUrl(thisData.technicalPictureUrl, ',', globalConfig.avatarHost + '/upload') : [],
                     maturityPictureUrl: thisData.maturityPictureUrl ? splitUrl(thisData.maturityPictureUrl, ',', globalConfig.avatarHost + '/upload') : []
@@ -1045,13 +1038,13 @@ const AchievementDetailForm = Form.create()(React.createClass({
                             {getFieldDecorator('bargainingMode', {
                                 initialValue: theData.bargainingMode
                             })(
-                                <Radio.Group>
+                                <Radio.Group onChange={((e) => { this.setState({ transferPriceDis: (e.target.value == 1 ? true : false) }) })}>
                                     <Radio value="0">面议</Radio>
                                     <Radio value="1">定价</Radio>
                                 </Radio.Group>
                                 )}
                         </FormItem>
-                        <FormItem className="half-item"
+                        {this.state.transferPriceDis ? <FormItem className="half-item"
                             {...formItemLayout}
                             label="转让价格" >
                             {getFieldDecorator('transferPrice', {
@@ -1060,7 +1053,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
                                 <InputNumber min={0} max={999999} step={0.01} />
                                 )}
                             <span style={{ marginLeft: '20px' }}>万元</span>
-                        </FormItem>
+                        </FormItem> : <div></div>}
                     </div>
                     <FormItem
                         labelCol={{ span: 4 }}

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

@@ -687,6 +687,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
                     data: thisData,
                     orgDisplay: thisData.ownerType,
                     switchValue: Boolean(!thisData.ownerId),
+                    transferPriceDis: thisData.transferMode == 1 ? true : false,
                     tags: thisData.keyword ? (thisData.keyword.replace(/(,|、)/g, ",")).split(',') : [],
                     technicalPictureUrl: thisData.technicalPictureUrl ? splitUrl(thisData.technicalPictureUrl, ',', globalConfig.avatarHost + '/upload') : [],
                     maturityPictureUrl: thisData.maturityPictureUrl ? splitUrl(thisData.maturityPictureUrl, ',', globalConfig.avatarHost + '/upload') : []
@@ -1252,7 +1253,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
                             })(
                                 <Radio.Group onChange={(e) => {
                                     this.setState({
-                                        transferPriceDis: (e.target.value == 0 ? false : true)
+                                        transferPriceDis: (e.target.value == 1 ? true : false)
                                     })
                                 }}>
                                     <Radio value="0">面议</Radio>

+ 2 - 2
js/component/manageCenter/userManage/customerList.jsx

@@ -209,9 +209,9 @@ const CustomerList = React.createClass({
                             theName: thisdata.type == 0 ? thisdata.username : thisdata.unitName
                         });
                     };
+                    this.state.pagination.current = data.data.pageNo;
+                    this.state.pagination.total = data.data.totalCount;
                 };
-                this.state.pagination.current = data.data.pageNo;
-                this.state.pagination.total = data.data.totalCount;
                 this.setState({
                     dataSource: this.state.data,
                     pagination: this.state.pagination

+ 2 - 2
js/component/manageCenter/userManage/orgList.jsx

@@ -127,9 +127,9 @@ const OrgList = React.createClass({
                         adminName: thisdata.adminName,
                         unitName: thisdata.unitName
                     });
+                    this.state.pagination.current = data.data.pageNo;
+                    this.state.pagination.total = data.data.totalCount;
                 };
-                this.state.pagination.current = data.data.pageNo;
-                this.state.pagination.total = data.data.totalCount;
                 this.setState({
                     dataSource: this.state.data,
                     pagination: this.state.pagination

+ 2 - 2
js/component/manageCenter/userManage/userList.jsx

@@ -128,9 +128,9 @@ const UserList = React.createClass({
                             adminName: thisdata.adminName
                         });
                     };
+                    this.state.pagination.current = data.data.pageNo;
+                    this.state.pagination.total = data.data.totalCount;
                 };
-                this.state.pagination.current = data.data.pageNo;
-                this.state.pagination.total = data.data.totalCount;
                 this.setState({
                     dataSource: this.state.data,
                     pagination: this.state.pagination