liting2017 7 years ago
parent
commit
58ce42e9f3

+ 20 - 3
js/component/manageCenter/achievement/techAchievement.jsx

@@ -12,7 +12,12 @@ import BatchImport from './batchImport';
 const AchievementList = React.createClass({
     loadData(pageNo, apiUrl) {
         this.state.data = [];
-        this.setState({
+       
+      if(this.state.serialNumber&&isNaN(this.state.serialNumber)){
+     	message.warning('请输入正确的编号格式');
+      	return false;
+      }
+         this.setState({
             loading: true
         });
         $.ajax({
@@ -63,7 +68,10 @@ const AchievementList = React.createClass({
                             releaseDateFormattedDate: thisdata.releaseDateFormattedDate,
                             auditStatus: thisdata.auditStatus,
                             boutique: thisdata.boutique,
-                            hot: thisdata.hot
+                            hot: thisdata.hot,
+                            techBrokerId:thisdata.techBrokerId,
+                            createTimeFormattedDate: thisdata.createTimeFormattedDate,
+                            remark:thisdata.remark
                         });
                     };
                     this.state.pagination.current = data.data.pageNo;
@@ -124,6 +132,10 @@ const AchievementList = React.createClass({
                     dataIndex: 'theName',
                     key: 'theName',
                 }, {
+                    title: '录入人',
+                    dataIndex: 'techBrokerId',
+                    key: 'techBrokerId',
+                },{
                     title: '审核状态',
                     dataIndex: 'auditStatus',
                     key: 'auditStatus',
@@ -145,7 +157,12 @@ const AchievementList = React.createClass({
                     title: '发布时间',
                     dataIndex: 'releaseDateFormattedDate',
                     key: 'releaseDateFormattedDate',
-                }
+                },{
+                    title: '录入时间',
+                    dataIndex: 'createTimeFormattedDate',
+                    key: 'createTimeFormattedDate',
+                },
+                
             ],
             dataSource: [],
             searchTime: [,]

+ 17 - 0
js/component/manageCenter/achievement/techAchievementDesc.jsx

@@ -503,6 +503,12 @@ const AchievementDetailShow = Form.create()(React.createClass({
                     <FormItem
                         labelCol={{ span: 4 }}
                         wrapperCol={{ span: 18 }}
+                        label="备注" >
+                        <span>{theData.remark}</span>
+                    </FormItem>
+                    <FormItem
+                        labelCol={{ span: 4 }}
+                        wrapperCol={{ span: 18 }}
                         label="技术图片" >
                         <div className="clearfix">
                             <Upload className="demandDetailShow-upload"
@@ -1002,6 +1008,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
                         category: values.category,
                         summary: values.summary,
                         introduction: values.introduction,
+                        remark: values.remark,
                         technicalPictureUrl: theTechnicalPictureUrl,
                         coverImg: thecoverImg,
                         fieldA: values.field ? values.field[0] : undefined,
@@ -1240,6 +1247,16 @@ const AchievementDetailForm = Form.create()(React.createClass({
                     <FormItem
                         labelCol={{ span: 4 }}
                         wrapperCol={{ span: 18 }}
+                        label="备注" >
+                        {getFieldDecorator('remark', {
+                            initialValue: theData.remark
+                        })(
+                            <Input type="textarea" rows={4} placeholder="此处输入备注" />
+                            )}
+                    </FormItem>
+                    <FormItem
+                        labelCol={{ span: 4 }}
+                        wrapperCol={{ span: 18 }}
                         label="技术图片" >
                         <PicturesWall
                             pictureSign="achievement_technical_picture"

+ 17 - 2
js/component/manageCenter/demand/techDemand.jsx

@@ -12,6 +12,10 @@ import BatchImport from './batchImport';
 const DemandList = React.createClass({
     loadData(pageNo, apiUrl) {
         this.state.data = [];
+        if(this.state.serialNumber&&isNaN(this.state.serialNumber)){
+        	message.warning('请输入正确的编号格式');
+        	return false;
+        }
         this.setState({
             loading: true
         });
@@ -74,7 +78,9 @@ const DemandList = React.createClass({
                             releaseDateFormattedDate: thisdata.releaseDateFormattedDate,
                             auditStatus: thisdata.auditStatus,
                             boutique: thisdata.boutique,
-                            hot: thisdata.hot
+                            hot: thisdata.hot,
+                            techBrokerId:thisdata.techBrokerId,
+                            CreateTimeFormattedDate: thisdata.CreateTimeFormattedDate,
                         });
                     };
                     this.state.pagination.current = data.data.pageNo;
@@ -121,7 +127,12 @@ const DemandList = React.createClass({
                     title: '需求名称',
                     dataIndex: 'name',
                     key: 'name',
-                }, 
+                },
+                 {
+                    title: '录入人',
+                    dataIndex: 'techBrokerId',
+                    key: 'techBrokerId',
+                },
               	{
                     title: '是否精品',
                     dataIndex: 'boutique',
@@ -203,6 +214,10 @@ const DemandList = React.createClass({
                     title: '发布时间',
                     dataIndex: 'releaseDateFormattedDate',
                     key: 'releaseDateFormattedDate',
+                },{
+                    title: '录入时间',
+                    dataIndex: 'createTimeFormattedDate',
+                    key: 'createTimeFormattedDate',
                 }
             ],
             dataSource: [],

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

@@ -573,6 +573,12 @@ const DemandDetailShow = Form.create()(React.createClass({
                     <FormItem
                         labelCol={{ span: 3 }}
                         wrapperCol={{ span: 18 }}
+                        label="备注" >
+                        <span>{theData.remark}</span>
+                    </FormItem>
+                    <FormItem
+                        labelCol={{ span: 3 }}
+                        wrapperCol={{ span: 18 }}
                         label="技术指标要求" >
                         <span>{theData.technicalRequirements}</span>
                     </FormItem>
@@ -862,6 +868,7 @@ const DemandDetailForm = Form.create()(React.createClass({
                         industryCategoryB: values.industryCategory ? values.industryCategory[1] : undefined,
                         demandType: values.demandType,
                         problemDes: values.problemDes,
+                        remark: values.remark,
                         technicalRequirements: values.technicalRequirements,
                         pictureUrl: thePictureUrl,
                         coverImg: thecoverImg,
@@ -1224,6 +1231,17 @@ const DemandDetailForm = Form.create()(React.createClass({
                     <FormItem
                         labelCol={{ span: 3 }}
                         wrapperCol={{ span: 18 }}
+                        label="备注" >
+                        {getFieldDecorator('remark', {
+                            rules: [{ required: true, message: '此项为必填项!' }],
+                            initialValue: theData.remark
+                        })(
+                            <Input type="textarea" rows={4} />
+                            )}
+                    </FormItem>
+                    <FormItem
+                        labelCol={{ span: 3 }}
+                        wrapperCol={{ span: 18 }}
                         label="技术指标要求" >
                         {getFieldDecorator('technicalRequirements', {
                             initialValue: theData.technicalRequirements

+ 5 - 1
js/component/manageCenter/set/userManagementS/newRole.jsx

@@ -55,6 +55,9 @@ const Newrole = Form.create()(React.createClass({
 				this.setState({
 					loading: true
 				});
+				if(selectAllId[0]==null){	
+					selectAllId=[]
+				};
 				$.ajax({
 					method: "POST",
 					dataType: "json",
@@ -145,7 +148,8 @@ const Newrole = Form.create()(React.createClass({
 			this.setState({
 				checkedKeys: [],
 				datauser: {},
-				roleName:''
+				roleName:'',
+				ids:'',
 			})
 		}
 	},