Browse Source

Merge branch 'master' of https://git.coding.net/aft/AFT-WEB

wubb 8 years ago
parent
commit
fab7e2c67d

+ 32 - 7
js/component/manageCenter/servicesManage/copyright/comPatentChange.jsx

@@ -39,13 +39,38 @@ const CopyrightDescForm = Form.create()(React.createClass({
         };
     },
     componentWillMount() {
-        let _me = this;
-        copyrightStateList.map(function (item) {
-            _me.state.stateOption.push(
-                <Select.Option value={item.value} key={item.key}>{item.key}</Select.Option>
-            )
-        });
         this.loadData();
+        this.getOptionList();
+    },
+    getOptionList() {
+        this.setState({
+            loading: true
+        });
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/copyright/status",
+            success: function (data) {
+                let _me = this;
+                if (!data.data) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                        return;
+                    };
+                };
+                _me.state.stateOption = [];
+                for (var item in data.data) {
+                    _me.state.stateOption.push(
+                        <Select.Option value={item} key={item}>{data.data[item]}</Select.Option>
+                    )
+                };
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
     },
     loadData(uid, id) {
         this.setState({
@@ -61,7 +86,7 @@ const CopyrightDescForm = Form.create()(React.createClass({
                 id: id || this.props.data.id
             }
         }), $.ajax({
-            method: "post",
+            method: "get",
             dataType: "json",
             crossDomain: false,
             cache: false,

+ 32 - 7
js/component/manageCenter/servicesManage/highTech/highTechApply.jsx

@@ -93,7 +93,7 @@ const CognizanceDescFrom = Form.create()(React.createClass({
     },
     getContactsList(uid) {
         $.ajax({
-            method: "post",
+            method: "get",
             dataType: "json",
             crossDomain: false,
             url: globalConfig.context + "/api/admin/getContacts",
@@ -117,6 +117,36 @@ const CognizanceDescFrom = Form.create()(React.createClass({
             }.bind(this),
         });
     },
+    getOptionList() {
+        this.setState({
+            loading: true
+        });
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/cognizanceStatus",
+            success: function (data) {
+                let _me = this;
+                if (!data.data) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                        return;
+                    };
+                };
+                _me.state.stateOption = [];
+                for (var item in data.data) {
+                    _me.state.stateOption.push(
+                        <Select.Option value={item} key={item}>{data.data[item]}</Select.Option>
+                    )
+                };
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+    },
     getInitialState() {
         return {
             loading: false,
@@ -163,13 +193,8 @@ const CognizanceDescFrom = Form.create()(React.createClass({
         };
     },
     componentWillMount() {
-        let _me = this;
-        cognizanceStateList.map(function (item) {
-            _me.state.stateOption.push(
-                <Select.Option value={item.value} key={item.key}>{item.key}</Select.Option>
-            )
-        });
         this.loadData();
+        this.getOptionList();
         this.getStateData();
         this.getContactsList();
     },

+ 1 - 1
js/component/manageCenter/servicesManage/patent/comPatentAdd.jsx

@@ -158,7 +158,7 @@ const PatentAddFrom = Form.create()(React.createClass({
                 <Select placeholder="选择公司"
                     showSearch
                     filterOption={companySearch}
-                    onChange={(e) => { this.state.companyName = e; }}
+                    onChange={(e) => { this.setState({ companyName: e }); }}
                     showSearch={true} style={{ width: 200 }} >{this.state.companyOption}</Select>
                 <FormItem
                     labelCol={{ span: 24 }}

+ 20 - 9
js/component/manageCenter/servicesManage/patent/comPatentDesc.jsx

@@ -99,8 +99,13 @@ const PatentDesc = React.createClass({
             dataType: "json",
             crossDomain: false,
             url: globalConfig.context + "/techservice/patent/getAdmin"
-        })).done((data1, data2, data3) => {
-
+        }), $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/patent/patentStatus"
+        })).done((data1, data2, data3, data4) => {
+            let _me = this;
             if (data1[0].error.length || !data1[0].data) {
                 message.warning(data1[0].error[0].message);
                 return;
@@ -111,7 +116,7 @@ const PatentDesc = React.createClass({
                 message.warning(data2[0].error[0].message);
                 return;
             };
-            let _me = this;
+            _me.state.stateTable = [];
             data2[0].data.map(function (item) {
                 _me.state.stateTable.push({
                     comment: item.comment,
@@ -133,6 +138,18 @@ const PatentDesc = React.createClass({
                     <Select.Option value={item} key={item}>{data3[0].data[item]}</Select.Option>
                 )
             };
+            if (!data4[0].data) {
+                if (data4[0].error && data4[0].error.length) {
+                    message.warning(data4[0].error[0].message);
+                    return;
+                };
+            };
+            _me.state.patentStateOption = [];
+            for (var item in data4[0].data) {
+                _me.state.patentStateOption.push(
+                    <Select.Option value={item} key={item}>{data4[0].data[item]}</Select.Option>
+                )
+            };
         }).always(function () {
             this.setState({
                 loading: false
@@ -143,7 +160,6 @@ const PatentDesc = React.createClass({
         let _me = this;
         _me.state.patentTypeOption = [];
         _me.state.patentFieldOption = [];
-        _me.state.patentStateOption = [];
         patentTypeList.map(function (item) {
             _me.state.patentTypeOption.push(
                 <Select.Option value={item.value} key={item.key}>{item.key}</Select.Option>
@@ -154,11 +170,6 @@ const PatentDesc = React.createClass({
                 <Select.Option value={item.value} key={item.key}>{item.key}</Select.Option>
             )
         });
-        patentStateList.map(function (item) {
-            _me.state.patentStateOption.push(
-                <Select.Option value={item.value} key={item.key}>{item.key}</Select.Option>
-            )
-        });
     },
     showModal() {
         this.setState({

+ 104 - 79
js/component/manageCenter/servicesManage/technology/applyChange.jsx

@@ -19,7 +19,7 @@ const ApplyChangeFrom = Form.create()(React.createClass({
                 pid: id || this.props.data.pid
             },
             success: function (data) {
- 
+
                 if (data.error.length || !data.data) {
                     message.warning(data.error[0].message);
                     return;
@@ -27,11 +27,11 @@ const ApplyChangeFrom = Form.create()(React.createClass({
                 this.state.data = data.data;
                 if (data.data.projectMode == 1) {
                     this.state.projectMode = data.data.projectMode;
-                    this.setState({projectModeState:true});
+                    this.setState({ projectModeState: true });
                 }
                 if (data.data.subsidy == 1) {
                     this.state.subsidy = data.data.subsidy;
-                    this.setState({subsidyState:true});
+                    this.setState({ subsidyState: true });
                 }
                 this.getDepartmentList();
                 this.getContactsList();
@@ -77,7 +77,7 @@ const ApplyChangeFrom = Form.create()(React.createClass({
             });
         }.bind(this));
     },
-    getDepartmentList () {
+    getDepartmentList() {
         this.setState({
             loading: true
         });
@@ -97,7 +97,7 @@ const ApplyChangeFrom = Form.create()(React.createClass({
                         <Select.Option value={item} key={item}>{data.data[item]}</Select.Option>
                     )
                 };
-                this.setState({department:data.data[this.state.data.department]});
+                this.setState({ department: data.data[this.state.data.department] });
             }.bind(this),
         }).always(function () {
             this.setState({
@@ -129,12 +129,42 @@ const ApplyChangeFrom = Form.create()(React.createClass({
             }.bind(this),
         });
     },
+    getOptionList() {
+        this.setState({
+            loading: true
+        });
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/techproject/status",
+            success: function (data) {
+                let _me = this;
+                if (!data.data) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                        return;
+                    };
+                };
+                _me.state.stateOption = [];
+                for (var item in data.data) {
+                    _me.state.stateOption.push(
+                        <Select.Option value={item} key={item}>{data.data[item]}</Select.Option>
+                    )
+                };
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+    },
     getInitialState() {
         return {
             loading: false,
             stateOption: [],
             departmentOption: [],
-            projectDes:'',
+            projectDes: '',
             projectMode: 0,
             subsidy: 0,
             projectModeState: false,
@@ -161,15 +191,10 @@ const ApplyChangeFrom = Form.create()(React.createClass({
         };
     },
     componentWillMount() {
-        let _me = this;
-        technologyStateList.map(function (item) {
-            _me.state.stateOption.push(
-                <Select.Option value={item.value} key={item.key}>{item.key}</Select.Option>
-            )
-        });
         this.loadData();
+        this.getOptionList();
         this.getStateData();
-        
+
     },
     handleSubmit(e) {
         e.preventDefault();
@@ -201,7 +226,7 @@ const ApplyChangeFrom = Form.create()(React.createClass({
                         projectApproval: values.projectApproval,
                         subsidy: this.state.subsidy,
                         approvalUrl: this.state.approvalUrl,
-                        
+
                         recordTimeFormattedDate: values.recordTime ? values.recordTime.format("YYYY-MM-DD") : undefined,
                         state: values.state,
                         principal: values.principal,
@@ -229,19 +254,19 @@ const ApplyChangeFrom = Form.create()(React.createClass({
     },
     projectEstablishmentCheck(e) {
         if (e.target.checked == true) {
-            this.setState({projectModeState:true})
+            this.setState({ projectModeState: true })
             this.state.projectMode = 1;
         } else if (e.target.checked == false) {
-            this.setState({projectModeState:false})
+            this.setState({ projectModeState: false })
             this.state.projectMode = 0;
         };
     },
     subsidyCheck(e) {
         if (e.target.checked == true) {
-            this.setState({subsidyState:true})
+            this.setState({ subsidyState: true })
             this.state.subsidy = 1;
         } else if (e.target.checked == false) {
-            this.setState({subsidyState:false})
+            this.setState({ subsidyState: false })
             this.state.subsidy = 0;
         };
     },
@@ -268,33 +293,33 @@ const ApplyChangeFrom = Form.create()(React.createClass({
                         </div>
                         <div className="half-item">
                             <span className="item-title">公司地址: </span>
-                            <span>{theData.province+' '+theData.city+' '+theData.area}</span>
+                            <span>{theData.province + ' ' + theData.city + ' ' + theData.area}</span>
                         </div>
                         <div className="half-item">
-                            <FormItem 
+                            <FormItem
                                 labelCol={{ span: 4 }}
                                 wrapperCol={{ span: 10 }}
                                 label="联系人:"
                             >
                                 {getFieldDecorator('contacts', {
                                     initialValue: this.state.contacts
-                                    })(
-                                        <Select>{this.state.contactsOption}</Select>
-                                    )}      
+                                })(
+                                    <Select>{this.state.contactsOption}</Select>
+                                    )}
                             </FormItem>
                         </div>
                     </div>
                     <div className="clearfix">
                         <FormItem className="third-item"
                             {...formItemLayout}
-	                            label="科技部门"
-	                        >
-                                {getFieldDecorator('department', {
-                                    initialValue: this.state.department
-                                    })(
-                                        <Select>{this.state.departmentOption}</Select>
-                                    )}
-	                 	</FormItem>
+                            label="科技部门"
+                        >
+                            {getFieldDecorator('department', {
+                                initialValue: this.state.department
+                            })(
+                                <Select>{this.state.departmentOption}</Select>
+                                )}
+                        </FormItem>
                     </div>
                     <div className="clearfix">
                         <div className="half-item">
@@ -303,90 +328,90 @@ const ApplyChangeFrom = Form.create()(React.createClass({
                         </div>
                     </div>
                     <div className="clearfix">
-                    	<div className="half-item">
-	                        <FormItem
-		                        labelCol={{ span: 4 }}
-                        		wrapperCol={{ span: 12 }}
-		                        label="项目名称"
-		                    >
+                        <div className="half-item">
+                            <FormItem
+                                labelCol={{ span: 4 }}
+                                wrapperCol={{ span: 12 }}
+                                label="项目名称"
+                            >
                                 {getFieldDecorator('projectName', {
                                     initialValue: theData.projectName
-                                    })(
-                                        <Input />
+                                })(
+                                    <Input />
                                     )}
-		                    </FormItem>
-	                    </div>
+                            </FormItem>
+                        </div>
                     </div>
                     <div className="clearfix">
-                    	<div className="half-item">
-	                        <FormItem
-		                        labelCol={{ span: 4 }}
-	                        	wrapperCol={{ span: 12 }}
-		                        label="项目类型"
-		                    >
+                        <div className="half-item">
+                            <FormItem
+                                labelCol={{ span: 4 }}
+                                wrapperCol={{ span: 12 }}
+                                label="项目类型"
+                            >
                                 {getFieldDecorator('projectCatagory', {
                                     initialValue: theData.projectCatagory
-                                    })(
-                                        <Input />
+                                })(
+                                    <Input />
                                     )}
-		                    </FormItem>
-	                    </div>
+                            </FormItem>
+                        </div>
                     </div>
                     <div className="clearfix">
-                    	<div className="half-item">
-	                        <FormItem
-		                        labelCol={{ span: 4 }}
-	                        	wrapperCol={{ span: 12 }}
-		                        label="技术领域"
-		                    >
+                        <div className="half-item">
+                            <FormItem
+                                labelCol={{ span: 4 }}
+                                wrapperCol={{ span: 12 }}
+                                label="技术领域"
+                            >
                                 {getFieldDecorator('techField', {
                                     initialValue: theData.techField
-                                    })(
-                                        <Input />
+                                })(
+                                    <Input />
                                     )}
-		                    </FormItem>
-		                </div>
+                            </FormItem>
+                        </div>
                     </div>
                     <div className="clearfix">
-                     	<span className="item-title">项目简介: </span>
-                            {getFieldDecorator('projectDes', {
-                                initialValue: theData.projectDes
-                                })(
-                                    <Input type="textarea"
-                          	            placeholder="多行输入"
-                                        rows={6} />
-                                )}
+                        <span className="item-title">项目简介: </span>
+                        {getFieldDecorator('projectDes', {
+                            initialValue: theData.projectDes
+                        })(
+                            <Input type="textarea"
+                                placeholder="多行输入"
+                                rows={6} />
+                            )}
                     </div>
                     <div className="clearfix">
                         <div className="half-item">
                             <span className="item-title">是否立项: </span>
-                            <Checkbox 
+                            <Checkbox
                                 onChange={this.projectEstablishmentCheck}
                                 checked={this.state.projectModeState}
-                                >
+                            >
                             </Checkbox>
                         </div>
                         <div className="half-item">
                             <FormItem
-			                    {...formItemLayout}
-			                    label="立项金额"
-			                >
+                                {...formItemLayout}
+                                label="立项金额"
+                            >
                                 {getFieldDecorator('projectApproval', {
                                     initialValue: theData.projectApproval
                                 })(
-                                    <Input style={{ width:150,marginRight:10 }}/>
-                                )}
+                                    <Input style={{ width: 150, marginRight: 10 }} />
+                                    )}
                                 <span>万元</span>
-			                </FormItem>
+                            </FormItem>
                         </div>
                     </div>
                     <div className="clearfix">
                         <div className="half-item">
                             <span className="item-title">是否后补助: </span>
-                            <Checkbox 
+                            <Checkbox
                                 onChange={this.subsidyCheck}
                                 checked={this.state.subsidyState}
-                                >
+                            >
                             </Checkbox>
                         </div>
                     </div>

+ 1 - 1
js/component/manageCenter/topTab.jsx

@@ -38,7 +38,7 @@ const TopTab = React.createClass({
                 </div>
                 <div className="acc-top-tab">
                     <Row>
-                        <Col style={{ display: window.showUserMeManage ? 'block' : 'none' }} className={this.props.active === 'userManage' ? 'active' : ''} span={3}><a href={globalConfig.context + "/admin/userManage.html"}>用户管理</a></Col>
+                        <Col style={{ display: window.showUserManage ? 'block' : 'none' }} className={this.props.active === 'userManage' ? 'active' : ''} span={3}><a href={globalConfig.context + "/admin/userManage.html"}>用户管理</a></Col>
                         <Col style={{ display: window.showServices ? 'block' : 'none' }} className={this.props.active === 'services' ? 'active' : ''} span={3}><a href={globalConfig.context + "/admin/servicesManage/patent.html"}>科技服务管理</a></Col>
                         <Col style={{ display: window.showAchievement ? 'block' : 'none' }} className={this.props.active === 'achievement' ? 'active' : ''} span={3}><a href="">科技成果管理</a></Col>
                         <Col style={{ display: window.showDemand ? 'block' : 'none' }} className={this.props.active === 'demand' ? 'active' : ''} span={3}><a href="">科技需求管理</a></Col>