yee 7 years ago
parent
commit
e66b056b8d

+ 1 - 13
js/component/manageCenter/achievement/techAchievement.jsx

@@ -144,18 +144,6 @@ const AchievementList = React.createClass({
                         }
                     }
                 }, {
-                    title: '是否发布',
-                    dataIndex: 'releaseStatus',
-                    key: 'releaseStatus',
-                    render: text => {
-                        switch (text) {
-                            case "0":
-                                return <span>未发布</span>;
-                            case "1":
-                                return <span>发布</span>
-                        }
-                    }
-                }, {
                     title: '发布时间',
                     dataIndex: 'releaseDateFormattedDate',
                     key: 'releaseDateFormattedDate',
@@ -197,7 +185,7 @@ const AchievementList = React.createClass({
             method: "POST",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/api/admin/demand/delete",
+            url: globalConfig.context + "/api/admin/achievement/delete",
             data: {
                 ids: deletedIds
             }

+ 24 - 25
js/component/manageCenter/achievement/techAchievementDesc.jsx

@@ -114,8 +114,8 @@ const PicturesWall = React.createClass({
         return (
             <div className="clearfix">
                 <Upload
-                    action={globalConfig.context + "/api/admin/demand/uploadPicture"}
-                    data={{ 'sign': 'demand_picture', 'uid': this.props.uid }}
+                    action={globalConfig.context + "/api/admin/achievement/uploadPicture"}
+                    data={{ 'sign': this.props.pictureSign }}
                     listType="picture-card"
                     fileList={fileList}
                     onPreview={this.handlePreview}
@@ -143,7 +143,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
             tags: []
         };
     },
-    loadData(id, detailApiUrl) {
+    loadData(id) {
         this.setState({
             loading: true
         });
@@ -151,7 +151,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
             method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + detailApiUrl,
+            url: globalConfig.context + "/api/admin/achievement/detail",
             data: {
                 id: id
             },
@@ -170,8 +170,10 @@ const AchievementDetailForm = Form.create()(React.createClass({
                 };
                 this.setState({
                     data: thisData,
+                    orgDisplay: thisData.ownerType,
                     tags: thisData.keyword ? thisData.keyword.split(",") : [],
-                    pictureUrl: thisData.pictureUrl ? splitUrl(thisData.pictureUrl, ',', globalConfig.avatarHost + '/upload') : []
+                    technicalPictureUrl: thisData.technicalPictureUrl ? splitUrl(thisData.technicalPictureUrl, ',', globalConfig.avatarHost + '/upload') : [],
+                    maturityPictureUrl: thisData.maturityPictureUrl ? splitUrl(thisData.maturityPictureUrl, ',', globalConfig.avatarHost + '/upload') : []
                 });
             }.bind(this),
         }).always(function () {
@@ -227,6 +229,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
             //keyword长度判断
             if (this.state.tags.length < 3) {
                 message.warning('关键词数量不能小于3个!');
+                return;
             };
             //url转化
             let theTechnicalPictureUrl = [];
@@ -325,17 +328,14 @@ const AchievementDetailForm = Form.create()(React.createClass({
             this.state.techPlanFileList = [];
             this.state.businessPlanFileList = [];
             if (nextProps.data.id) {
-                this.loadData(nextProps.data.id, nextProps.detailApiUrl);
-                if (nextProps.data.employerId && nextProps.detailApiUrl.indexOf('org') >= 0) {
-                    this.getContactsList(nextProps.data.employerId)
-                };
+                this.loadData(nextProps.data.id);
             } else {
                 this.state.data = {};
                 this.state.tags = [];
-                this.state.pictureUrl = [];
+                this.state.maturityPictureUrl = [];
                 this.state.technicalPictureUrl = [];
-                this.props.form.resetFields();
             };
+            this.props.form.resetFields();
         };
     },
     render() {
@@ -442,7 +442,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
                     wrapperCol={{ span: 18 }}
                     label="技术图片" >
                     <PicturesWall
-                        uid={theData.uid}
+                        pictureSign="achievement_technical_picture"
                         fileList={this.getTechnicalPictureUrl}
                         pictureUrl={this.state.technicalPictureUrl} />
                     <p>图片建议:专利证书或专利申请书图片、技术图纸、样品图片、技术相关网络图片;成熟度处于非研发阶段的项目,必须上传样品图片,如未上传,成熟度将视为处在研发阶段。</p>
@@ -496,7 +496,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
                     wrapperCol={{ span: 18 }}
                     label="成熟度证明材料(图片)" >
                     <PicturesWall
-                        uid={theData.uid}
+                        pictureSign="achievement_maturity_picture"
                         fileList={this.getMaturityPictureUrl}
                         pictureUrl={this.state.maturityPictureUrl} />
                 </FormItem>
@@ -506,8 +506,8 @@ const AchievementDetailForm = Form.create()(React.createClass({
                     label="成熟度证明材料(文本)" >
                     <Upload
                         name="ratepay"
-                        action={globalConfig.context + "/api/admin/demand/uploadTextFile"}
-                        data={{ 'sign': 'demand_text_file', 'uid': theData.uid }}
+                        action={globalConfig.context + "/api/admin/achievement/uploadTextFile"}
+                        data={{ 'sign': 'achievement_maturity_text_file' }}
                         beforeUpload={beforeUploadFile}
                         fileList={this.state.textFileList}
                         onChange={(info) => {
@@ -521,8 +521,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
                                     message.warning(info.file.response.error[0].message);
                                     return;
                                 };
-                                this.state.maturityTextFileUrl,
-                                    maturity_video_url = info.file.response.data;
+                                this.state.maturityTextFileUrl = info.file.response.data;
                             } else if (info.file.status === 'error') {
                                 message.error(`${info.file.name} 文件上传失败。`);
                             };
@@ -532,7 +531,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
                     </Upload>
                     <p style={{ marginTop: '10px' }}>{theData.maturityTextFileUrl ?
                         <span className="download-file">
-                            <a onClick={() => { window.open(globalConfig.context + '/api/admin/demand/download?id=' + this.props.data.id) }}>成熟度证明材料(文本文件)</a>
+                            <a onClick={() => { window.open(globalConfig.context + '/api/admin/achievement/download?id=' + this.props.data.id) }}>成熟度证明材料(文本文件)</a>
                         </span>
                         : <span><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />未上传!</span>}</p>
                 </FormItem>
@@ -778,8 +777,8 @@ const AchievementDetailForm = Form.create()(React.createClass({
                     label="技术方案" >
                     <Upload
                         name="ratepay"
-                        action={globalConfig.context + "/api/admin/demand/uploadTextFile"}
-                        data={{ 'sign': 'tech_plan', 'uid': theData.uid }}
+                        action={globalConfig.context + "/api/admin/achievement/uploadTextFile"}
+                        data={{ 'sign': 'achievement_tech_plan' }}
                         beforeUpload={beforeUploadFile}
                         fileList={this.state.techPlanFileList}
                         onChange={(info) => {
@@ -803,7 +802,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
                     </Upload>
                     <p style={{ marginTop: '10px' }}>{theData.techPlanUrl ?
                         <span className="download-file">
-                            <a onClick={() => { window.open(globalConfig.context + '/api/admin/demand/download?id=' + this.props.data.id) }}>技术方案</a>
+                            <a onClick={() => { window.open(globalConfig.context + '/api/admin/achievement/download?id=' + this.props.data.id + '&sign=achievement_tech_plan') }}>技术方案</a>
                         </span>
                         : <span><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />未上传!</span>}</p>
                 </FormItem>
@@ -813,8 +812,8 @@ const AchievementDetailForm = Form.create()(React.createClass({
                     label="商业计划书" >
                     <Upload
                         name="ratepay"
-                        action={globalConfig.context + "/api/admin/demand/uploadTextFile"}
-                        data={{ 'sign': 'business_plan_url', 'uid': theData.uid }}
+                        action={globalConfig.context + "/api/admin/achievement/uploadTextFile"}
+                        data={{ 'sign': 'achievement_business_plan' }}
                         beforeUpload={beforeUploadFile}
                         fileList={this.state.businessPlanFileList}
                         onChange={(info) => {
@@ -834,11 +833,11 @@ const AchievementDetailForm = Form.create()(React.createClass({
                             };
                             this.setState({ businessPlanFileList: info.fileList.slice(-1) });
                         }} >
-                        <Button><Icon type="upload" /> 上传需求文本文件 </Button>
+                        <Button><Icon type="upload" /> 上传商业计划书文件 </Button>
                     </Upload>
                     <p style={{ marginTop: '10px' }}>{theData.businessPlanUrl ?
                         <span className="download-file">
-                            <a onClick={() => { window.open(globalConfig.context + '/api/admin/demand/download?id=' + this.props.data.id) }}>商业计划书</a>
+                            <a onClick={() => { window.open(globalConfig.context + '/api/admin/achievement/download?id=' + this.props.data.id + '&sign=achievement_business_plan') }}>商业计划书</a>
                         </span>
                         : <span><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />未上传!</span>}</p>
                 </FormItem>

+ 4 - 16
js/component/manageCenter/demand/techDemand.jsx

@@ -29,7 +29,7 @@ const DemandList = React.createClass({
                 demandType: this.state.demandType ? Number(this.state.demandType) : undefined,
                 //username: this.state.username,
                 status: this.state.status ? Number(this.state.status) : undefined,
-                release: this.state.release ? Number(this.state.release) : undefined,
+                releaseStatus: this.state.releaseStatus ? Number(this.state.releaseStatus) : undefined,
                 validityPeriodStartDate: this.state.validityPeriodDate[0],
                 validityPeriodEndDate: this.state.validityPeriodDate[1],
                 releaseDateStartDate: this.state.releaseDate[0],
@@ -149,18 +149,6 @@ const DemandList = React.createClass({
                         }
                     }
                 }, {
-                    title: '是否发布',
-                    dataIndex: 'release',
-                    key: 'release',
-                    render: text => {
-                        switch (text) {
-                            case "0":
-                                return <span>未发布</span>;
-                            case "1":
-                                return <span>发布</span>
-                        }
-                    }
-                }, {
                     title: '有效期限',
                     dataIndex: 'validityPeriodFormattedDate',
                     key: 'validityPeriodFormattedDate',
@@ -322,7 +310,7 @@ const DemandList = React.createClass({
         this.state.demandType = undefined;
         this.state.username = undefined;
         this.state.status = undefined;
-        this.state.release = undefined;
+        this.state.releaseStatus = undefined;
         this.state.validityPeriodDate = [];
         this.state.releaseDate = [];
         this.loadData();
@@ -382,8 +370,8 @@ const DemandList = React.createClass({
                         <Select.Option value="2" >已解决</Select.Option>
                     </Select>
                     <Select placeholder="选择是否发布" style={{ width: 120 }}
-                        value={this.state.release}
-                        onChange={(e) => { this.setState({ release: e }) }}>
+                        value={this.state.releaseStatus}
+                        onChange={(e) => { this.setState({ releaseStatus: e }) }}>
                         <Select.Option value="0" >未发布</Select.Option>
                         <Select.Option value="1" >已发布</Select.Option>
                     </Select>

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

@@ -337,8 +337,8 @@ const DemandDetailForm = Form.create()(React.createClass({
                 this.state.data = {};
                 this.state.tags = [];
                 this.state.pictureUrl = [];
-                this.props.form.resetFields();
             };
+            this.props.form.resetFields();
         };
     },
     render() {

+ 1 - 1
js/component/manageCenter/index/content.less

@@ -101,7 +101,7 @@
             .activity-list {
                 li {
                     border-bottom: 1px dashed #eee;
-                    padding:10px 0;
+                    padding: 10px 0;
                     .list-type {
                         color: #666
                     }