dengzhiguo 7 år sedan
förälder
incheckning
af047131df

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

@@ -832,7 +832,6 @@ const AchievementDetailForm = Form.create()(React.createClass({
                 };
                 this.setState({
                     data: thisData,
-                   
                     orgDisplay: thisData.ownerType,
                     switchValue: Boolean(!thisData.ownerId),
                     radios: thisData.hot == '1' ? true : false,
@@ -1031,7 +1030,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
                         //
                         ownerId: !this.state.switchValue ? (this.state.dataSourceObj ? this.state.dataSourceObj[values.iOwnerName] : this.state.data.ownerId) : undefined,
                         contacts: !this.state.switchValue ? values.contacts : undefined,
-                        ownerType: this.state.ownerType,//this.props.detailApiUrl.indexOf('org') != -1 ? 1 : 0,
+                        ownerType: this.state.orgDisplay,//this.props.detailApiUrl.indexOf('org') != -1 ? 1 : 0,
                         //自定义
                         ownerName: this.state.switchValue ? values.ownerName : undefined,
                         ownerIdNumber: this.state.switchValue ? values.ownerIdNumber : undefined,
@@ -1095,6 +1094,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
             this.state.techPlanFileList = [];
             this.state.businessPlanFileList = [];
             this.props.form.resetFields();
+            this.state.orgDisplay=undefined;
         };
     },
     render() {
@@ -1105,6 +1105,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
             labelCol: { span: 8 },
             wrapperCol: { span: 14 },
         };
+        console.log(this.state.orgDisplay)
         return (
             <Form horizontal onSubmit={this.handleSubmit} id="demand-form">
                 <Spin spinning={this.state.loading}>
@@ -1237,8 +1238,8 @@ const AchievementDetailForm = Form.create()(React.createClass({
                         wrapperCol={{ span: 18 }}
                         label="成果类别" >
                         <Select placeholder="选择成果类别" style={{ width: 120 }}
-                            value={this.state.ownerType}
-                            onChange={(e) => { this.setState({ ownerType: e }) }}>
+                            value={this.state.orgDisplay}
+                            onChange={(e) => { this.setState({ orgDisplay: e }) }}>
                             <Select.Option value="0" >个人</Select.Option>
                             <Select.Option value="1" >组织</Select.Option>
                         </Select>

+ 5 - 5
js/component/manageCenter/demand/techDemand.jsx

@@ -190,15 +190,15 @@ const DemandList = React.createClass({
                     key: 'auditStatus',
                     render: text => {
                         switch (text) {
-                            case "0":
+                            case 0:
                                 return <span>未提交审核(草稿)</span>;
-                            case "1":
+                            case 1:
                                 return <span>提交审核</span>;
-                            case "2":
+                            case 2:
                                 return <span>审核中</span>;
-                            case "3":
+                            case 3:
                                 return <span>审核通过</span>;
-                            case "4":
+                            case 4:
                                 return <span>审核未通过</span>;
                         }
                     }

+ 8 - 20
js/component/manageCenter/demand/techDemandDesc.jsx

@@ -519,15 +519,15 @@ const DemandDetailShow = Form.create()(React.createClass({
                             label="审核状态" >
                             {(() => {
                                 switch (theData.auditStatus) {
-                                    case "0":
+                                    case 0:
                                         return <span>未提交审核(草稿)</span>;
-                                    case "1":
+                                    case 1:
                                         return <span>提交审核</span>;
-                                    case "2":
+                                    case 2:
                                         return <span>审核中</span>;
-                                    case "3":
+                                    case 3:
                                         return <span>审核通过</span>;
-                                    case "4":
+                                    case 4:
                                         return <span>审核未通过</span>;
                                 }
                             })()}
@@ -810,6 +810,7 @@ const DemandDetailForm = Form.create()(React.createClass({
                 };
                 this.setState({
                     data: thisData,
+                    dataCategory:(thisData.dataCategory>-1)?thisData.dataCategory.toString():'',
                     switchValue: Boolean(!thisData.employerId),
                     radios: thisData.hot == '1' ? true : false,
                     tags: thisData.keyword ? (thisData.keyword.replace(/(,|、)/g, ",")).split(',') : [],
@@ -1008,6 +1009,7 @@ const DemandDetailForm = Form.create()(React.createClass({
             this.state.videoFileList = [];
             this.state.textFileUrl = undefined;
             this.props.form.resetFields();
+            this.state.dataCategory = undefined;
         };
     },
     render() {
@@ -1029,7 +1031,7 @@ const DemandDetailForm = Form.create()(React.createClass({
                         </FormItem>
                         <FormItem className="half-item"
                             {...formItemLayout}
-                            label="需求名称111" >
+                            label="需求名称" >
                             {getFieldDecorator('name', {
                                 rules: [{ required: true, message: '此项为必填项!' }],
                                 initialValue: theData.name
@@ -1461,20 +1463,6 @@ const DemandDetail = React.createClass({
                     dataIndex: 'serialNumber',
                     key: 'serialNumber',
                 }, {
-                    title: '数据类型',
-                    dataIndex: 'dataCategory',
-                    key: 'dataCategory',
-                    render: text => {
-                        switch (text) {
-                            case "0":
-                                return <span>成果</span>;
-                            case "1":
-                                return <span>技术</span>;
-                            case "2":
-                                return <span>项目</span>;
-                        }
-                    }
-                }, {
                     title: '名称',
                     dataIndex: 'name',
                     key: 'name',

+ 3 - 2
js/component/tools.js

@@ -572,10 +572,11 @@ module.exports = {
     },
     //获取需求和成果审核状态
     getTechAuditStatus: function (e) {
-        if (e) {
+        if (e||e>=0) {
+        	let tt=e.toString()
             let theType = '';
             techAuditStatusList.map(function (item) {
-                if (item.value == e) {
+                if (item.value == tt) {
                     theType = item.key;
                 };
             });