Browse Source

企业用户企业类型下拉添加

liting2017 7 years ago
parent
commit
8a60f96158

+ 45 - 1
js/component/account/set/company.jsx

@@ -6,7 +6,7 @@ import $ from 'jquery/src/ajax';
 
 import { areaSelect } from '../../NewDicProvinceList';
 import { splitUrl, getBase64, beforeUpload } from '../../tools.js';
-import { eduLevelList, zizhiArr, schoolArr } from '../../dataDic.js';
+import { eduLevelList, zizhiArr, schoolArr ,mechanism} from '../../dataDic.js';
 
 class Avatar extends React.Component {
     constructor(props) {
@@ -119,11 +119,22 @@ const PersonFrom = Form.create()(React.createClass({
             success: function (data) {
                 if (data.data && data.data.info && data.data.pro) {
                     let theArr = splitUrl(data.data.info.publicityPictureUrl, ',', globalConfig.avatarHost + '/upload');
+                    let comp=data.data.info.companyType;
+                    let pantt;
+                    switch(comp){
+							case 0:
+								pantt='待定';
+								break;
+							case 1:
+								pantt='投资机构';			
+								break;							
+					};
                     this.setState({
                         iid: data.data.info.id,
                         pid: data.data.pro.id,
                         province: [data.data.info.locationProvince, data.data.info.locationCity, data.data.info.locationArea],
                         idttType: data.data.info.identityType,
+                        companyt: pantt,
                         unitName: data.data.info.companyName,
                         unitNumber: data.data.info.unitSize,
                         unitIntro: data.data.info.companyIntroduction,
@@ -156,6 +167,7 @@ const PersonFrom = Form.create()(React.createClass({
         return {
             loading: false,
             idttType: '企业',
+            companyt:'待定',
             companyDis: 'block',
             schoolDis: 'none',
             resDis: 'none',
@@ -183,6 +195,16 @@ const PersonFrom = Form.create()(React.createClass({
             };
             if (!err) {
                 this.props.spinState(true);
+                let ktt=values.companyType;
+                let sktt;
+                switch(ktt){
+					case '待定':
+						sktt='0';
+						break;
+					case '投资机构':
+						sktt='1';			
+						break;							
+				};
                 $.ajax({
                     method: "POST",
                     dataType: "json",
@@ -192,6 +214,7 @@ const PersonFrom = Form.create()(React.createClass({
                         "iid": this.state.iid,
                         "pid": this.state.pid,
                         "identityType": values.identityType,
+                        "companyType":sktt,
                         "companyName": values.unitName,
                         "locationProvince": values.province[0],
                         "locationCity": values.province[1],
@@ -233,24 +256,28 @@ const PersonFrom = Form.create()(React.createClass({
             this.setState({
                 companyDis: 'block',
                 schoolDis: 'none',
+                companys:'block',
                 resDis: 'none'
             });
         } else if (e === '院校') {
             this.setState({
                 companyDis: 'none',
                 schoolDis: 'block',
+                companys:'none',
                 resDis: 'none'
             });
         } else if (e === '研究机构') {
             this.setState({
                 companyDis: 'none',
                 schoolDis: 'none',
+                companys:'none',
                 resDis: 'block'
             });
         } else {
             this.setState({
                 companyDis: 'none',
                 schoolDis: 'none',
+                companys:'none',
                 resDis: 'none'
             });
         }
@@ -295,6 +322,23 @@ const PersonFrom = Form.create()(React.createClass({
                         </Select>
                         )}
                 </FormItem>
+                 <FormItem style={{ 'display': this.state.companys}}
+                    labelCol={{ span: 3 }}
+                    wrapperCol={{ span: 8 }}
+                    label="企业类型"
+                >
+                    {getFieldDecorator('companyType', {
+                        initialValue: this.state.companyt
+                    })(
+                        <Select className="acc-edu-lvl">
+                            {
+                                mechanism.map(function (item) {
+                                    return <Option key={item.key} >{item.key}</Option>
+                                })
+                            }
+                        </Select>
+                        )}
+                </FormItem>
                 <FormItem
                     {...formItemLayout}
                     label="单位名称"

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

@@ -19,7 +19,7 @@ const TopTab = React.createClass({
             dataType: "json",
             url: globalConfig.context + "/login",
         }).done(function (data) {
-            window.location.href = globalConfig.context + "/user/login.html"
+            window.location.href = globalConfig.context + "/portal/index.html"
         });
     },
     render() {

+ 7 - 0
js/component/dataDic.js

@@ -18,6 +18,13 @@ module.exports = {
             value: "4",
             key: "非法人团体"
         }],
+    mechanism: [{
+	        value: "0",
+	        key: "待定"
+	    },{
+	        value: "1",
+	        key: "投资机构"
+	    }],
     zizhiArr: ["高新技术型企业", "创新型企业", "双软企业", "小心微利企业", "科技部认定示范企业", "其他"],
     schoolArr: ["普通本科院校", "高职专科院校", "独立学院", "中央部署院校", "地方所属院校", "211工程院校", "985工程院校"],
     //

+ 1 - 1
package.json

@@ -6,7 +6,7 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "dlldev": "webpack --progress --colors --config ./webpack-dll.config.js --env.deploy dev --env.host 'http://127.0.0.1'",
-    "dlltest": "webpack --progress --colors --config ./webpack-dll.config.js --env.deploy test --env.host 'http://afts.hnzhiming.com'",
+    "dlltest": "webpack --progress --colors --config ./webpack-dll.config.js --env.deploy test --env.host 'http://static.jishutao.com'",
     "dllstage": "webpack --progress --colors --config ./webpack-dll.config.js --env.deploy stage --env.host 'http://aftts.hnzhiming.com'",
     "dllpro": "webpack --progress --colors --config ./webpack-dll.config.js --env.deploy prod --env.host 'http://static.goafanti.com'",
     "build": "node bin/clean.js && webpack --progress --colors --env.deploy dev",

+ 2 - 2
webpack.config.js

@@ -236,8 +236,8 @@ module.exports = (function () {
             }
         }));
     }
-    let staticHost = 'http://afts.hnzhiming.com';
-    //let staticHost = 'http://127.0.0.1';    
+    //let staticHost = 'http://afts.hnzhiming.com';
+    let staticHost = 'http://127.0.0.1';    
     switch (argv.env.deploy) {
         case 'stage':
             staticHost = 'http://aftts.hnzhiming.com';