Sfoglia il codice sorgente

新专利模块修改

HW 3 anni fa
parent
commit
1d38669418

+ 9 - 2
js/component/manageCenter/components/checkProject/applyPaymentModal.js

@@ -245,6 +245,13 @@ class ApplyPaymentModal extends Component{
                                         style={{ width: '200px' }}
                                         precision={0}
                                         placeholder="请输入本次申请支付数量"
+                                        onChange={(e)=>{
+                                            if(this.props.projectType === 1 && this.props.patentType === 0){
+                                                setFieldsValue({
+                                                    applicationAmount:e*previewPayInfor.unitPrice
+                                                });
+                                            }
+                                        }}
                                     />
                                 )}
                             </Form.Item>
@@ -270,10 +277,10 @@ class ApplyPaymentModal extends Component{
                                 外包
                                     第三方信息
                                         本次申请支付数量  都可以修改
-                                        本次申请支付金额  专利申请不可以修改但显示,其他类型可以修改
+                                        本次申请支付金额  专利申请不可以修改但显示(专利申请的申请金额会随支付数量乘以单价变化),其他类型可以修改
                                     付款节点
                                         本次申请支付数量  都可以修改
-                                        本次申请支付金额  专利申请不可以修改但显示,其他类型可以修改
+                                        本次申请支付金额  专利申请不可以修改但显示(专利申请的申请金额会随支付数量乘以单价变化),其他类型可以修改
                             */}
                             {this.props.type !== 2 && !(this.props.startType === 1 ? (this.props.projectType === 1 && this.props.patentType === 0) : false) ? <Form.Item
                                 {...formItemLayout}

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

@@ -17,7 +17,19 @@
             }
         }
     }
+
+    @media (min-width:1386px) and (max-width:1581px){
+        .content-right {
+            width: 86%;
+        }
+    }
+
+    @media (max-width:1386px){
+        .content-right {
+            width: 84%;
+        }
+    }
 }
 .acc-top-user-name>a {
     color: #58a3ff !important;
-}
+}

+ 7 - 1
js/component/manageCenter/customer/NEW/crm/customer.less

@@ -22,10 +22,16 @@
     display:inline-block;
     margin-left:100px;
     font-size: 18px;
-    
+
 }
 .pager li.disabled{
     color:#ccc
 }
 .ant-upload-list{display:inline-block}
 .ant-upload-list-item{height:19px;margin-top:0px;}
+
+.tooltipContent{
+    .ant-tooltip-inner{
+        max-width: 700px;
+    }
+}

+ 14 - 5
js/component/manageCenter/customer/NEW/crm/reminderLog.jsx

@@ -3,6 +3,8 @@ import {Spin, Table, message, Modal, Tooltip} from "antd";
 import $ from "jquery/src/ajax";
 import moment from 'moment';
 
+import './customer.less';
+
 const ReminderLog = React.createClass({
     getInitialState() {
         return {
@@ -12,17 +14,23 @@ const ReminderLog = React.createClass({
                     title: "序号",
                     dataIndex: "id",
                     key: "id",
+                    width: 50,
                 },
                 {
                     title: "内容",
                     dataIndex: "content",
                     key: "content",
-                    width:800,
-                    render: (text) => {
+                    width:700,
+                    render: (text,record) => {
+                        let arr = text.split(',');
                         return (
-                            <Tooltip placement="topLeft" title={text}>
+                            <Tooltip
+                                placement="topLeft"
+                                overlayClassName='tooltipContent'
+                                title={arr.map((v,k) => {return (<div key={k} style={{marginBottom:'10px'}}>{v}</div>)})}
+                            >
                                 <div style={{
-                                    maxWidth:'800px',
+                                    maxWidth:'700px',
                                     overflow:'hidden',
                                     textOverflow: "ellipsis",
                                     whiteSpace:'nowrap',
@@ -35,6 +43,7 @@ const ReminderLog = React.createClass({
                     title: "时间",
                     dataIndex: "createTime",
                     key: "createTime",
+                    width: 130,
                     render: (text) => (
                         moment(text).format('YYYY-MM-DD HH:mm:ss')
                     )
@@ -93,7 +102,7 @@ const ReminderLog = React.createClass({
                         columns={this.state.colunmn}
                         dataSource={this.state.dataSource}
                         pagination={false}
-                        scroll={{ x: "max-content", y: 0 }}
+                        scroll={{ x: "max-content", y: 320 }}
                         bordered
                         size="small"
                     />

+ 18 - 0
js/component/manageCenter/customer/publicStatistics/detailedList.jsx

@@ -79,6 +79,24 @@ class DetailedList extends Component{
                     )
                 },
                 {
+                    title: "公出地点",
+                    dataIndex: "userName",
+                    key: "userName",
+                    width: 120,
+                    render: (text) => {
+                        return (
+                            <Tooltip title={text}>
+                                <div style={{
+                                    maxWidth:'120px',
+                                    overflow:'hidden',
+                                    textOverflow: "ellipsis",
+                                    whiteSpace:'nowrap',
+                                }}>{text}</div>
+                            </Tooltip>
+                        )
+                    },
+                },
+                {
                     title: "公出时长(时)",
                     dataIndex: "duration",
                     key: "duration",

+ 13 - 1
js/component/manageCenter/leftTab.less

@@ -20,9 +20,21 @@
             display: none;
         }
     }
+
+    @media (min-width:1386px) and (max-width:1581px){
+        .account-left {
+            width: 14%;
+        }
+    }
+
+    @media (max-width:1386px){
+        .account-left {
+            width: 16%;
+        }
+    }
 }
 .containers{
     padding: 10px;
     background: #ffffff;
-    
+
 }

+ 14 - 8
js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzj.js

@@ -1,5 +1,5 @@
 import React, { Component } from "react";
-import { Form, Upload, Modal, Button, message, Input, Select, Table } from "antd";
+import {Form, Upload, Modal, Button, message, Input, Select, Table, Tooltip} from "antd";
 import AgreeButton from "./agreeButton.js";
 import Rizhi from "./rizhi.js";
 import { getProcessStatusNew, changeColor } from "@/tools.js";
@@ -76,13 +76,19 @@ class Itemlist extends Component {
           {...pageData.formItemLayoutA}
           className="half-item"
         >
-          <p style={{ width: 350, wordWrap: "break-word" }}>
-            {pageData.dataA}
-            {pageData.labelA === '客户名称' ? <EnterpriseNameChange
-                type='journal'
-                style={{ marginLeft: 10 }}
-                enterpriseId={this.props.orderUid}/> : null}
-          </p>
+          {pageData.labelA ===  '变更原因' ? <Tooltip placement="topLeft" title={pageData.dataA}>
+            <div style={{
+              width: '150px !important',
+              whiteSpace: 'nowrap',
+              wordBreak: 'break-all',
+              overflow: 'hidden',
+              textOverflow: 'ellipsis',
+            }}>{pageData.dataA}</div>
+          </Tooltip>: pageData.dataA}
+          {pageData.labelA === '客户名称' ? <EnterpriseNameChange
+              type='journal'
+              style={{ marginLeft: 10 }}
+              enterpriseId={this.props.orderUid}/> : null}
         </Form.Item>
         <Form.Item
           label={pageData.labelB}

+ 14 - 8
js/component/manageCenter/order/orderNew/changeComponent/changeDetailJszj.js

@@ -1,5 +1,5 @@
 import React, { Component } from "react";
-import { Form, Upload, Modal, Input, Button, message, Select, Table } from "antd";
+import {Form, Upload, Modal, Input, Button, message, Select, Table, Tooltip} from "antd";
 import AgreeButton from "./agreeButton.js";
 import Rizhi from "./rizhi.js";
 import { getProcessStatusNew, changeColor, splitUrl } from "@/tools.js";
@@ -73,13 +73,19 @@ class Itemlist extends Component {
           {...pageData.formItemLayoutA}
           className="half-item"
         >
-          <p style={{ width: 350, wordWrap: "break-word" }}>
-            {pageData.dataA}
-            {pageData.labelA === '客户名称' ? <EnterpriseNameChange
-                type='journal'
-                style={{ marginLeft: 10 }}
-                enterpriseId={this.props.orderUid}/> : null}
-          </p>
+          {pageData.labelA ===  '变更原因' ? <Tooltip placement="topLeft" title={pageData.dataA}>
+            <div style={{
+              width: '150px !important',
+              whiteSpace: 'nowrap',
+              wordBreak: 'break-all',
+              overflow: 'hidden',
+              textOverflow: 'ellipsis',
+            }}>{pageData.dataA}</div>
+          </Tooltip>: pageData.dataA}
+          {pageData.labelA === '客户名称' ? <EnterpriseNameChange
+              type='journal'
+              style={{ marginLeft: 10 }}
+              enterpriseId={this.props.orderUid}/> : null}
         </Form.Item>
         <Form.Item
           label={pageData.labelB}

+ 16 - 17
js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxgly.js

@@ -81,30 +81,29 @@ class Itemlist extends Component {
                 style={{ marginLeft: 10 }}
                 enterpriseId={this.props.orderUid}/>
           </div>
-        </Form.Item> : pageData.labelA !== '当前进度' ? <Form.Item
+        </Form.Item> : pageData.labelA === '当前进度' || pageData.labelA ===  '变更原因' ? <Form.Item
+            label={pageData.labelA}
+            {...pageData.formItemLayoutA}
+            className="half-item"
+        >
+          <Tooltip placement="topLeft" title={pageData.dataA}>
+            <div style={{
+              width: '350px !important',
+              whiteSpace: 'nowrap',
+              wordBreak: 'break-all',
+              overflow: 'hidden',
+              textOverflow: 'ellipsis',
+            }}>{pageData.dataA}</div>
+          </Tooltip>
+        </Form.Item> : <Form.Item
                 label={pageData.labelA}
                 {...pageData.formItemLayoutA}
                 className="half-item"
             >
               <div>{pageData.dataA}</div>
-            </Form.Item> :
-            <Form.Item
-                label={pageData.labelA}
-                {...pageData.formItemLayoutA}
-                className="half-item"
-            >
-              <Tooltip placement="topLeft" title={pageData.dataA}>
-                <div style={{
-                  width: '350px !important',
-                  whiteSpace: 'nowrap',
-                  wordBreak: 'break-all',
-                  overflow: 'hidden',
-                  textOverflow: 'ellipsis',
-                }}>{pageData.dataA}</div>
-              </Tooltip>
             </Form.Item>}
         <Form.Item
-          label={pageData.labelB}
+          label={pageData.labelB+2}
           {...pageData.formItemLayoutB}
           className="half-item"
         >

+ 16 - 17
js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxy.js

@@ -68,7 +68,21 @@ class Itemlist extends Component {
     let pageData = this.props.pageData;
     return (
       <div className="clearfix" style={{ height: "30px", overflow: "hidden" }}>
-        {pageData.labelA !== '当前进度' ? <Form.Item
+        {pageData.labelA === '当前进度' || pageData.labelA === '变更原因' ? <Form.Item
+            label={pageData.labelA}
+            {...pageData.formItemLayoutA}
+            className="half-item"
+        >
+          <Tooltip placement="topLeft" title={pageData.dataA}>
+            <div style={{
+              width: '350px !important',
+              whiteSpace: 'nowrap',
+              wordBreak: 'break-all',
+              overflow: 'hidden',
+              textOverflow: 'ellipsis',
+            }}>{pageData.dataA}</div>
+          </Tooltip>
+        </Form.Item> : <Form.Item
           label={pageData.labelA}
           {...pageData.formItemLayoutA}
           className="half-item"
@@ -82,22 +96,7 @@ class Itemlist extends Component {
                     enterpriseId={this.props.orderUid}/> : null
             }
           </div>
-        </Form.Item> :
-          <Form.Item
-              label={pageData.labelA}
-              {...pageData.formItemLayoutA}
-              className="half-item"
-          >
-            <Tooltip placement="topLeft" title={pageData.dataA}>
-            <div style={{
-              width: '350px !important',
-              whiteSpace: 'nowrap',
-              wordBreak: 'break-all',
-              overflow: 'hidden',
-              textOverflow: 'ellipsis',
-            }}>{pageData.dataA}</div>
-            </Tooltip>
-          </Form.Item>}
+        </Form.Item>}
         <Form.Item
           label={pageData.labelB}
           {...pageData.formItemLayoutB}

+ 117 - 14
js/component/manageCenter/project/patent/list.jsx

@@ -1,5 +1,19 @@
 import React,{Component} from "react";
-import {Button, Form, Input, message, Modal, Popconfirm, Select, Spin, Table, Tabs, Upload,AutoComplete} from "antd";
+import {
+    Button,
+    Form,
+    Input,
+    message,
+    Modal,
+    Popconfirm,
+    Select,
+    Spin,
+    Table,
+    Tabs,
+    Upload,
+    AutoComplete,
+    Tooltip
+} from "antd";
 import {ChooseList} from "../../order/orderNew/chooseList";
 import $ from "jquery/src/ajax";
 import { patentTypeList} from '@/dataDic.js';
@@ -61,6 +75,19 @@ class List extends Component{
                     title: "权利人",
                     dataIndex: "holders",
                     key: "holders",
+                    width: 120,
+                    render: (text) => {
+                        return (
+                            <Tooltip title={text}>
+                                <div style={{
+                                    maxWidth:'120px',
+                                    overflow:'hidden',
+                                    textOverflow: "ellipsis",
+                                    whiteSpace:'nowrap',
+                                }}>{text}</div>
+                            </Tooltip>
+                        )
+                    },
                 },
                 {
                     title: "授权日期",
@@ -71,6 +98,19 @@ class List extends Component{
                     title: "发明人",
                     dataIndex: "inventor",
                     key: "inventor",
+                    width: 120,
+                    render: (text) => {
+                        return (
+                            <Tooltip title={text}>
+                                <div style={{
+                                    maxWidth:'120px',
+                                    overflow:'hidden',
+                                    textOverflow: "ellipsis",
+                                    whiteSpace:'nowrap',
+                                }}>{text}</div>
+                            </Tooltip>
+                        )
+                    },
                 },
                 {
                     title: "收费截止日",
@@ -78,6 +118,16 @@ class List extends Component{
                     key: "endDates",
                 },
                 {
+                    title: "费减状态",
+                    dataIndex: "costReduction",
+                    key: "costReduction",
+                    render: (text,record) => {
+                        return (
+                            record.tid ? (text === 1 ? '有费减' : text === 0 ? '无费减' : '') : '无'
+                        )
+                    }
+                },
+                {
                     title: "年费状态",
                     dataIndex: "annualFeeStatus",
                     key: "annualFeeStatus",
@@ -160,6 +210,19 @@ class List extends Component{
                     title: "录入人",
                     dataIndex: "inputName",
                     key: "inputName",
+                    width: 120,
+                    render: (text) => {
+                        return (
+                            <Tooltip title={text}>
+                                <div style={{
+                                    maxWidth:'120px',
+                                    overflow:'hidden',
+                                    textOverflow: "ellipsis",
+                                    whiteSpace:'nowrap',
+                                }}>{text}</div>
+                            </Tooltip>
+                        )
+                    },
                 },
                 {
                     title: "录入时间",
@@ -170,6 +233,19 @@ class List extends Component{
                     title: "跟进人",
                     dataIndex: "aname",
                     key: "aname",
+                    width: 120,
+                    render: (text) => {
+                        return (
+                            <Tooltip title={text}>
+                                <div style={{
+                                    maxWidth:'120px',
+                                    overflow:'hidden',
+                                    textOverflow: "ellipsis",
+                                    whiteSpace:'nowrap',
+                                }}>{text}</div>
+                            </Tooltip>
+                        )
+                    },
                 },
                 {
                     title: "操作",
@@ -289,6 +365,7 @@ class List extends Component{
         this.onReset = this.onReset.bind(this);
         this.updateBatch = this.updateBatch.bind(this);
         this.getAdminList = this.getAdminList.bind(this);
+        this.downloadFile = this.downloadFile.bind(this);
     }
 
     componentWillReceiveProps(prevProps) {
@@ -399,6 +476,14 @@ class List extends Component{
     }
 
     downloadFile() {
+        this.setState({
+            downloadFileLoading:true
+        })
+        setTimeout(()=>{
+            this.setState({
+                downloadFileLoading:false
+            })
+        },1500)
         window.location.href =
             globalConfig.context +
             "/api/admin/patentNew/exportTemplate?" +
@@ -435,6 +520,9 @@ class List extends Component{
     }
 
     exportExec(){
+        this.setState({
+            exportExecLoading: true
+        })
         let loading = message.loading('加载中...');
         let data = {
             name:this.state.name,
@@ -457,15 +545,20 @@ class List extends Component{
             url: globalConfig.context + "/api/admin/patentNew/export",
             data,
             success: function(data) {
+                loading();
+                this.setState({
+                    exportExecLoading: false
+                })
                 if(data.error.length === 0){
-                    loading();
                     this.download(data.data.data);
                 }else{
-                    loading();
                     message.warning(data.error[0].message);
                 }
             }.bind(this),
         }).always(function() {
+            this.setState({
+                exportExecLoading: false
+            })
         }.bind(this));
     }
 
@@ -522,7 +615,7 @@ class List extends Component{
             annualFeeStatus:undefined,
             userName:undefined,
             salesmanRemind:undefined,
-            isFollow:undefined,
+            isFollow:1,
             aname:undefined,
             patentNo:undefined,
         },()=>{this.loadData();})
@@ -564,7 +657,7 @@ class List extends Component{
             success: function(data) {
                 loading();
                 if(data.error.length === 0){
-                    message.success(type === 0 ? '批量通知成功' : type === 1 ? '批量发邮件成功' : type === 2 ? '转入成功' : '');
+                    message.success(type === 0 ? '成功批量标记为已通知' : type === 1 ? '批量发邮件成功' : type === 2 ? '转入成功' : '');
                     if(type === 2){
                         this.setState({
                             adminVisible:false
@@ -608,18 +701,18 @@ class List extends Component{
                             >
                                 <div style={{display:'flex',alignItems:'center',flexFlow:'wrap'}}>
                                     <Form.Item>
-                                        <Input style={{ width: '130px' }} value={this.state.name} onChange={(e)=>{this.setState({name:e.target.value})}} placeholder="请输入专利名称"/>
-                                    </Form.Item>
-                                    <Form.Item>
                                         <Input style={{ width: '130px' }} value={this.state.patentNo} onChange={(e)=>{this.setState({patentNo:e.target.value})}} placeholder="请输入专利号"/>
                                     </Form.Item>
                                     <Form.Item>
-                                        <Input style={{ width: '130px' }} value={this.state.aname} onChange={(e)=>{this.setState({aname:e.target.value})}} placeholder="请输入跟进人名称"/>
+                                        <Input style={{ width: '130px' }} value={this.state.name} onChange={(e)=>{this.setState({name:e.target.value})}} placeholder="请输入专利名称"/>
                                     </Form.Item>
                                     <Form.Item>
                                         <Input style={{ width: '130px' }} value={this.state.userName} onChange={(e)=>{this.setState({userName:e.target.value})}} placeholder="请输入客户名称"/>
                                     </Form.Item>
                                     <Form.Item>
+                                        <Input style={{ width: '130px' }} value={this.state.aname} onChange={(e)=>{this.setState({aname:e.target.value})}} placeholder="请输入跟进人名称"/>
+                                    </Form.Item>
+                                    <Form.Item>
                                         <Select
                                             placeholder="请选择专利类型"
                                             style={{ width: "140px" }}
@@ -739,7 +832,7 @@ class List extends Component{
                                 })
                             }}
                         >
-                            转入营销管理
+                            转交专利
                         </Button>
                         <Upload {...this.state.upLoad} disabled={this.state.upLoadFileLoading}>
                             <Button
@@ -752,6 +845,7 @@ class List extends Component{
                         </Upload>
                         <Button
                             type="primary"
+                            loading={this.state.downloadFileLoading}
                             onClick={(e) => {
                                 e.stopPropagation();
                                 this.downloadFile();
@@ -763,6 +857,7 @@ class List extends Component{
                         <Button
                             type="primary"
                             style={{ margin: "11px 0px 10px 10px" }}
+                            loading={this.state.exportExecLoading}
                             onClick={()=>{
                                 this.exportExec();
                             }}
@@ -857,7 +952,7 @@ class List extends Component{
                         })
                     }}
                 >
-                    <div style={{paddingBottom:'15px'}}>下列选项不能批量发邮件,请取消后再批量发邮件</div>
+                    <div style={{paddingBottom:'15px'}}>下列专利,不在专利需缴费的90天提醒之内,不可发送邮件</div>
                     <Table
                         columns={[
                             {
@@ -877,10 +972,18 @@ class List extends Component{
                         bordered
                         size="small"
                     />
+                    <div style={{display:'flex',justifyContent:'center',paddingTop:'20px'}}>
+                        <Button type="primary" onClick={()=>{
+                            this.setState({
+                                unSelectedRowsVisible:false,
+                                unSelectedRows:[]
+                            })
+                        }}>关闭</Button>
+                    </div>
                 </Modal> : null}
 
                 {this.state.adminVisible ? <Modal
-                    title='选择营销管理员'
+                    title='请选择需转交的跟进人'
                     className='payRecordComponent'
                     width={300}
                     maskClosable={false}
@@ -894,11 +997,11 @@ class List extends Component{
                 >
                     <div style={{display:'flex',flexFlow:"column",justifyContent:'center',alignItems:'center'}}>
                         <div style={{display:'flex',alignItems:'center'}}>
-                            <span style={{paddingRight:'15px'}}>营销管理:</span>
+                            <span style={{paddingRight:'15px'}}>跟进人:</span>
                                 <Select
                                     showSearch
                                     style={{ width: 200 }}
-                                    placeholder="请选择营销管理"
+                                    placeholder="请选择跟进人"
                                     optionFilterProp="children"
                                     onSelect={(aid)=>{
                                         this.setState({

+ 48 - 26
js/component/manageCenter/project/patent/patentDetails.jsx

@@ -203,7 +203,7 @@ class PatentDetails extends Component{
                 holders: this.state.holders || undefined,
                 inventor: this.state.inventor || undefined,
                 authorizationDates: this.state.authorizationDates || undefined,
-                annualFeeStatus: this.state.annualFeeStatus || undefined,
+                annualFeeStatus: isNaN(parseInt(this.state.annualFeeStatus)) ? undefined : this.state.annualFeeStatus,
                 delayingAmount: isNaN(parseInt(this.state.delayingAmount)) ? undefined : this.state.delayingAmount,
                 recoveryAmount: isNaN(parseInt(this.state.recoveryAmount)) ? undefined : this.state.recoveryAmount,
             },
@@ -237,6 +237,21 @@ class PatentDetails extends Component{
                 visible={this.props.visible}
                 onCancel={this.props.onCancel}
             >
+                <Button
+                    onClick={()=>{
+                        this.setState({
+                            visible:true,
+                            id:detailsInfor.id
+                        })
+                    }}
+                    style={{
+                        position: 'absolute',
+                        top: '9px',
+                        right: '49px',
+                    }}
+                    type='primary'>
+                    查看专利日志
+                </Button>
                 <Form layout="horizontal">
                     <Row gutter={40}>
                         <Col span={8}>
@@ -394,14 +409,6 @@ class PatentDetails extends Component{
                         <Col span={8}>
                             <FormItem
                                 {...formItemLayout}
-                                label='年费'
-                            >
-                                {detailsInfor.patentAmount}
-                            </FormItem>
-                        </Col>
-                        <Col span={8}>
-                            <FormItem
-                                {...formItemLayout}
                                 label='滞纳金'
                             >
                                 {
@@ -462,7 +469,14 @@ class PatentDetails extends Component{
                                 label='权利人'
                             >
                                 {
-                                    readOnly ? detailsInfor.holders :
+                                    readOnly ? <Tooltip title={detailsInfor.holders}>
+                                        <div style={{
+                                            maxWidth:'120px',
+                                            overflow:'hidden',
+                                            textOverflow: "ellipsis",
+                                            whiteSpace:'nowrap',
+                                        }}>{detailsInfor.holders}</div>
+                                    </Tooltip> :
                                         <Input
                                             value={this.state.holders}
                                             onChange={(e)=>{
@@ -480,7 +494,14 @@ class PatentDetails extends Component{
                                 label='发明人'
                             >
                                 {
-                                    readOnly ? detailsInfor.inventor :
+                                    readOnly ? <Tooltip title={detailsInfor.inventor}>
+                                        <div style={{
+                                            maxWidth:'120px',
+                                            overflow:'hidden',
+                                            textOverflow: "ellipsis",
+                                            whiteSpace:'nowrap',
+                                        }}>{detailsInfor.inventor}</div>
+                                    </Tooltip> :
                                         <Input
                                             value={this.state.inventor}
                                             onChange={(e)=>{
@@ -495,6 +516,22 @@ class PatentDetails extends Component{
                         <Col span={8}>
                             <FormItem
                                 {...formItemLayout}
+                                label='年费'
+                            >
+                                {detailsInfor.patentAmount}
+                            </FormItem>
+                        </Col>
+                        <Col span={8}>
+                            <FormItem
+                                {...formItemLayout}
+                                label='费减状态'
+                            >
+                                {detailsInfor.tid ? (detailsInfor.costReduction === 1 ? '有费减' : detailsInfor.costReduction === 0 ? '无费减' : '') : '无'}
+                            </FormItem>
+                        </Col>
+                        <Col span={8}>
+                            <FormItem
+                                {...formItemLayout}
                                 label='通知'
                             >
                                 <div style={{display:'flex',alignItems:'center'}}>
@@ -504,21 +541,6 @@ class PatentDetails extends Component{
                                     }
                                 </div>
                             </FormItem>
-                            <Button
-                                onClick={()=>{
-                                    this.setState({
-                                        visible:true,
-                                        id:detailsInfor.id
-                                    })
-                                }}
-                                style={{
-                                    position: 'absolute',
-                                    top: 0,
-                                    right: 0,
-                                }}
-                                type='primary'>
-                                查看专利日志
-                            </Button>
                         </Col>
                     </Row>
                     {!readOnly ?