Browse Source

bug修复

yee 8 years ago
parent
commit
43f3f5b30a

+ 3 - 3
js/component/account/services/cognizance.jsx

@@ -732,12 +732,12 @@ const Cognizance = React.createClass({
             <div className="user-content" >
                 <div className="content-title">
                     <span>高企申请管理</span>
+                    <Button style={{ background: "#ea0862", border: "none", color: "#fff", float: "right" }}
+                        disabled={this.state.ButtonDisabled}
+                        onClick={this.addClick}>申请高企认定<Icon type="plus" /></Button>
                 </div>
                 <div className="user-search">
                     <p>
-                        <Button style={{ background: "#ea0862", border: "none", color: "#fff" }}
-                            disabled={this.state.ButtonDisabled}
-                            onClick={this.addClick}>添加<Icon type="plus" /></Button>
                         <Button style={{ background: "#3fcf9e", border: "none", color: "#fff", display: 'none' }}
                             disabled={!hasSelected}
                             onClick={this.delectRow}>删除<Icon type="minus" /></Button>

+ 10 - 10
js/component/account/services/copyright/comPatentAdd.jsx

@@ -128,7 +128,7 @@ const PatentAddFrom = Form.create()(React.createClass({
                 <FormItem
                     labelCol={{ span: 24 }}
                     wrapperCol={{ span: 18 }}
-                    label="派单信息"
+                    label="备注"
                 >
                     {getFieldDecorator('workIssue')(
                         <Input type="textarea"
@@ -144,15 +144,15 @@ const PatentAddFrom = Form.create()(React.createClass({
                     {getFieldDecorator('inUrgent')(
                         <Select
                             placeholder="请选择加急时间"
-                            style={{ width: 120 }}>
-                            <Select.Option value="0">不加急</Select.Option>
-                            <Select.Option value="3">3</Select.Option>
-                            <Select.Option value="5">5</Select.Option>
-                            <Select.Option value="10">6-10</Select.Option>
-                            <Select.Option value="15">11-15</Select.Option>
-                            <Select.Option value="20">16-20</Select.Option>
-                            <Select.Option value="25">21-25</Select.Option>
-                            <Select.Option value="30">26-30</Select.Option>
+                            style={{ width: 200 }}>
+                            <Select.Option value="0">不加急(45个工作日)</Select.Option>
+                            <Select.Option value="3">3个工作日</Select.Option>
+                            <Select.Option value="5">5个工作日</Select.Option>
+                            <Select.Option value="10">6-10个工作日</Select.Option>
+                            <Select.Option value="15">11-15个工作日</Select.Option>
+                            <Select.Option value="20">16-20个工作日</Select.Option>
+                            <Select.Option value="25">21-25个工作日</Select.Option>
+                            <Select.Option value="30">26-30个工作日</Select.Option>
                         </Select>
                     )}
                 </FormItem>

+ 8 - 8
js/component/account/services/copyright/comPatentChange.jsx

@@ -266,21 +266,21 @@ const CopyrightDescForm = Form.create()(React.createClass({
                         {(() => {
                             switch (theData.inUrgent) {
                                 case 0:
-                                    return '不加急';
+                                    return '不加急(45个工作日)';
                                 case 3:
-                                    return '3';
+                                    return '3个工作日';
                                 case 5:
-                                    return '5';
+                                    return '5个工作日';
                                 case 10:
-                                    return '6-10';
+                                    return '6-10个工作日';
                                 case 15:
-                                    return '11-15';
+                                    return '11-15个工作日';
                                 case 20:
-                                    return '16-20';
+                                    return '16-20个工作日';
                                 case 25:
-                                    return '21-25';
+                                    return '21-25个工作日';
                                 case 30:
-                                    return '26-30';
+                                    return '26-30个工作日';
                             }
                         })()}
                     </Col>

+ 8 - 8
js/component/account/services/copyright/copyright.jsx

@@ -127,21 +127,21 @@ const copyright = React.createClass({
                     render: (text) => {
                         switch (text) {
                             case 0:
-                                return '不加急';
+                                return '不加急(45个工作日)';
                             case 3:
-                                return '3';
+                                return '3个工作日';
                             case 5:
-                                return '5';
+                                return '5个工作日';
                             case 10:
-                                return '6-10';
+                                return '6-10个工作日';
                             case 15:
-                                return '11-15';
+                                return '11-15个工作日';
                             case 20:
-                                return '16-20';
+                                return '16-20个工作日';
                             case 25:
-                                return '21-25';
+                                return '21-25个工作日';
                             case 30:
-                                return '26-30';
+                                return '26-30个工作日';
                         }
                     }
                 }, {

+ 7 - 7
js/component/account/services/intellectual.jsx

@@ -187,6 +187,10 @@ const Intellectual = React.createClass({
             <div className="user-content" >
                 <div className="content-title">
                     <span>知识产权列表</span>
+                    <Button
+                        disabled={this.state.ButtonDisabled}
+                        style={{ background: "#ea0862", border: "none", color: "#fff", float: "right" }}
+                        onClick={this.tableRowClick}>添加知识产权<Icon type="plus" /></Button>
                 </div>
                 <div className="user-search">
                     <span>开始日期:</span>
@@ -199,13 +203,9 @@ const Intellectual = React.createClass({
                         onChange={(data, dataString) => { this.setState({ endDateFormattedDate: dataString }); }} />
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>
-                    <p>
-                        <Button disabled={this.state.ButtonDisabled} style={{ background: "#ea0862", border: "none", color: "#fff" }}
-                            onClick={this.tableRowClick}>添加<Icon type="plus" /></Button>
-                        <Button style={{ background: "#3fcf9e", border: "none", color: "#fff" }}
-                            disabled={!hasSelected}
-                            onClick={this.delectRow}>删除<Icon type="minus" /></Button>
-                    </p>
+                    <Button style={{ background: "#3fcf9e", border: "none", color: "#fff" }}
+                        disabled={!hasSelected}
+                        onClick={this.delectRow}>删除<Icon type="minus" /></Button>
                 </div>
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>