HW il y a 3 ans
Parent
commit
126aa2b2ed

+ 1 - 1
js/component/common/initiateOrder/index.jsx

@@ -257,7 +257,7 @@ class InitiateOrder extends Component {
                                     marginBottom: '15px',
                                 }}
                             >
-                                +新增供应商名称
+                                +新增第三方信息
                             </Button>
                         </div>
                         <div

+ 31 - 52
js/component/manageCenter/components/checkProject/applyPaymentModal.js

@@ -241,65 +241,44 @@ class ApplyPaymentModal extends Component{
                                     rules: [{ required: false, message: '请输入本次申请支付数量!' }],
                                 })(
                                     <InputNumber
-                                        // disabled={previewPayInfor.quantity <= 1 || this.state.paymentStatus !== 0}
-                                        disabled={this.props.type !== 2}
                                         style={{ width: '200px' }}
                                         precision={0}
                                         placeholder="请输入本次申请支付数量"
-                                        onChange={(e)=>{
-                                            //0正常 1专利 2软著 3审计
-                                            //软著 专利申请不需要计算,因为单价未知
-                                            // if(!(this.props.projectType === 2 || (this.props.projectType === 1 && this.props.patentType === 0))){
-                                            //     //官费
-                                            //     if(this.props.type === 2){
-                                            //         this.props.form.setFieldsValue({
-                                            //             applicationAmount: (previewPayInfor.costReduction === 1 ?
-                                            //                 previewPayInfor.reductionAmount :
-                                            //                 previewPayInfor.officialUnitPrice) * 1000000 * e / 1000000,
-                                            //         });
-                                            //     }else {
-                                            //         let num = previewPayInfor.unitPrice * 1000000 * e / 1000000;
-                                            //         this.props.form.setFieldsValue({
-                                            //             applicationAmount: num,
-                                            //         });
-                                            //     }
-                                            // }
-                                        }}
                                     />
                                 )}
                             </Form.Item>
                             {/* 0正常 1专利 2软著 3审计 */}
-                            {this.props.type !== 2 ? <Form.Item
-                                {...formItemLayout}
-                                style={{
-                                    display:'flex'
-                                }}
-                                label="本次申请支付金额(万元):"
-                            >
-                                {getFieldDecorator('applicationAmount', {
-                                    initialValue:this.props.type === 2 ?(
-                                        ((previewPayInfor.costReduction === 1 ? previewPayInfor.reductionAmount : previewPayInfor.officialUnitPrice) * 1000000 * parseInt(previewPayInfor.quantity)) / 1000000
-                                    ): (
-                                        !isNaN(parseFloat(previewPayInfor.totalAmount)) && !isNaN(parseFloat(previewPayInfor.partyAmount))?
-                                        (
-                                            this.state.paymentStatus === 1 ?
-                                            (previewPayInfor.partyAmount ?
-                                                ((parseFloat(previewPayInfor.totalAmount) * 1000000) - (parseFloat(previewPayInfor.partyAmount) * 1000000)) / 1000000 :
-                                            parseFloat(previewPayInfor.totalAmount)) / 2 :
-                                            previewPayInfor.partyAmount ?
-                                                ((parseFloat(previewPayInfor.totalAmount) * 1000000) - (parseFloat(previewPayInfor.partyAmount) * 1000000)) / 1000000 :
-                                            parseFloat(previewPayInfor.totalAmount)
-                                        ) : null
-                                    ),
-                                    rules: [{ required: true, message: '请输入本次申请支付金额!' }],
-                                })(
-                                    <InputNumber
-                                        min={0}
-                                        disabled={this.state.paymentStatus !== 0}
-                                        style={{ width: '200px' }}
-                                        placeholder="请输入本次申请支付金额"/>
-                                )}
-                            </Form.Item> : null}
+                            {/*{this.props.type !== 2 ? <Form.Item*/}
+                            {/*    {...formItemLayout}*/}
+                            {/*    style={{*/}
+                            {/*        display:'flex'*/}
+                            {/*    }}*/}
+                            {/*    label="本次申请支付金额(万元):"*/}
+                            {/*>*/}
+                            {/*    {getFieldDecorator('applicationAmount', {*/}
+                            {/*        initialValue:this.props.type === 2 ?(*/}
+                            {/*            ((previewPayInfor.costReduction === 1 ? previewPayInfor.reductionAmount : previewPayInfor.officialUnitPrice) * 1000000 * parseInt(previewPayInfor.quantity)) / 1000000*/}
+                            {/*        ): (*/}
+                            {/*            !isNaN(parseFloat(previewPayInfor.totalAmount)) && !isNaN(parseFloat(previewPayInfor.partyAmount))?*/}
+                            {/*            (*/}
+                            {/*                this.state.paymentStatus === 1 ?*/}
+                            {/*                (previewPayInfor.partyAmount ?*/}
+                            {/*                    ((parseFloat(previewPayInfor.totalAmount) * 1000000) - (parseFloat(previewPayInfor.partyAmount) * 1000000)) / 1000000 :*/}
+                            {/*                parseFloat(previewPayInfor.totalAmount)) / 2 :*/}
+                            {/*                previewPayInfor.partyAmount ?*/}
+                            {/*                    ((parseFloat(previewPayInfor.totalAmount) * 1000000) - (parseFloat(previewPayInfor.partyAmount) * 1000000)) / 1000000 :*/}
+                            {/*                parseFloat(previewPayInfor.totalAmount)*/}
+                            {/*            ) : null*/}
+                            {/*        ),*/}
+                            {/*        rules: [{ required: true, message: '请输入本次申请支付金额!' }],*/}
+                            {/*    })(*/}
+                            {/*        <InputNumber*/}
+                            {/*            min={0}*/}
+                            {/*            disabled={this.state.paymentStatus !== 0}*/}
+                            {/*            style={{ width: '200px' }}*/}
+                            {/*            placeholder="请输入本次申请支付金额"/>*/}
+                            {/*    )}*/}
+                            {/*</Form.Item> : null}*/}
                             <Form.Item
                                 {...formItemLayout}
                                 style={{

+ 2 - 2
js/component/manageCenter/components/checkProject/index.jsx

@@ -64,7 +64,7 @@ class CheckProject extends Component {
   }
 
   getPayNodeCompany(){
-    let arr = this.props.thirdInfoList || [];
+    let arr = this.props.thirdInfoList ? JSON.parse(JSON.stringify(this.props.thirdInfoList)) : [];
     let companyNameArr = [];
     for (let d = 0; d < arr.length; d++) {
       arr[d].companyName = arr[d].companyName + '-' + arr[d].id;
@@ -1038,7 +1038,7 @@ class CheckProject extends Component {
                           marginBottom: '15px',
                         }}
                     >
-                      +新增供应商名称
+                      +新增第三方信息
                     </Button> : null}
                   </div>
                   <div

+ 4 - 3
js/component/manageCenter/components/checkProject/payRecord.js

@@ -386,7 +386,7 @@ class PayRecord extends Component{
         const { paymentLogs,paymentDetails,financialPaymentList } = this.state;
         return(
             <Modal
-                title={paymentDetails.status !== 4 ? (paymentDetails.chooseType === 2 ? '申请支付官费' : '申请支付外包费用') : '支付详情'}
+                title={paymentDetails.status !== 4 ? (paymentDetails.chooseType === 0 ? '申请支付第三方' : paymentDetails.chooseType === 1 ? '申请支付催款' : paymentDetails.chooseType === 2 ? '申请支付官费' : '') : '支付详情'}
                 className='payRecordComponent'
                 width={700}
                 maskClosable={false}
@@ -484,7 +484,7 @@ class PayRecord extends Component{
                                                         <Input
                                                             type={'number'}
                                                             style={{ width: '200px' }}
-                                                            disabled={this.props.isAuditPaymentGLY ? this.props.isAuditPaymentGLY : ( this.props.isAuditPayment ? this.state.paymentDetails.status !== 0 : this.state.paymentDetails.status !== 2)}
+                                                            disabled={this.props.isAuditPaymentGLY ? this.props.isAuditPaymentGLY : ( this.props.isAuditPayment ? true : this.state.paymentDetails.status !== 2)}
                                                             placeholder="请输入本次申请支付数量"
                                                             onChange={(e)=>{
                                                                 if(!isNaN(parseFloat(paymentDetails.initialUnitPrice))){
@@ -544,7 +544,8 @@ class PayRecord extends Component{
                                             paymentDetails.status === 0 ? '待'+paymentDetails.financeName+'审核' :
                                                 paymentDetails.status === 1 ? '待'+paymentDetails.financeName+'支付' :
                                                     paymentDetails.status === 2 ? '待重新提交' :
-                                                        paymentDetails.status === 3 ? '已完成支付' : '已取消'
+                                                        paymentDetails.status === 3 ? '已完成支付' :
+                                                            paymentDetails.status === 4 ?'已取消' : ''
                                         }
                                     </span>
                                 </div>

+ 5 - 7
js/component/manageCenter/customer/publicStatistics/detailedList.jsx

@@ -404,17 +404,15 @@ class DetailedList extends Component{
             aid:this.state.theTypes,
             uid:this.state.theCustomerTypes,
             status:this.state.status,
-            clockIn:this.state.clockIn+'',
+            clockIn:this.state.clockIn,
         };
         for(let i of Object.keys(data)){
-            if(i === 'status'){
+            if(i === 'status' || i === 'clockIn'){
                 if(isNaN(parseInt(data[i]))){
                     delete data[i]
                 }
-            }else{
-                if(!data[i]){
-                    delete data[i]
-                }
+            }else if(!data[i]){
+                delete data[i]
             }
 
         }
@@ -516,7 +514,7 @@ class DetailedList extends Component{
                                             </AutoComplete>
                                         </span>
                                     <span style={{ marginRight: "10px" }}>
-                                            <span style={{marginRight:'10px',marginBottom:'10px'}}>公出时间 :</span>
+                                            <span style={{marginRight:'5px',marginBottom:'10px'}}>公出时间 :</span>
                                             <RangePicker
                                                 style={{marginRight:'10px',marginBottom:'10px'}}
                                                 value={[

+ 20 - 2
js/component/manageCenter/customer/statistics/departmentStatistics/index.jsx

@@ -36,6 +36,7 @@ class DepartmentStatistics extends Component{
                     dataIndex: "userCount",
                     key: "userCount",
                     className: 'tableRowStyle',
+                    width: 120,
                     render: (text, record) => {
                         return (
                             <div
@@ -60,6 +61,7 @@ class DepartmentStatistics extends Component{
                     dataIndex: "channelCount",
                     key: "channelCount",
                     className: 'tableRowStyle',
+                    width: 120,
                     render: (text, record) => {
                         return (
                             <div
@@ -84,6 +86,7 @@ class DepartmentStatistics extends Component{
                     dataIndex: "signCount",
                     key: "signCount",
                     className: 'tableRowStyle',
+                    width: 120,
                     render: (text, record) => {
                         return (
                             <div
@@ -108,6 +111,7 @@ class DepartmentStatistics extends Component{
                     dataIndex: "newCount",
                     key: "newCount",
                     className: 'tableRowStyle',
+                    width: 120,
                     render: (text, record) => {
                         return (
                             <div
@@ -132,6 +136,7 @@ class DepartmentStatistics extends Component{
                     dataIndex: "channelNewCount",
                     key: "channelNewCount",
                     className: 'tableRowStyle',
+                    width: 120,
                     render: (text, record) => {
                         return (
                             <div
@@ -156,6 +161,7 @@ class DepartmentStatistics extends Component{
                     dataIndex: "completeCount",
                     key: "completeCount",
                     className: 'tableRowStyle',
+                    width: 120,
                     render: (text, record) => {
                         return (
                             <div
@@ -180,6 +186,7 @@ class DepartmentStatistics extends Component{
                     dataIndex: "channelCompleteCount",
                     key: "channelCompleteCount",
                     className: 'tableRowStyle',
+                    width: 120,
                     render: (text, record) => {
                         return (
                             <div
@@ -204,6 +211,7 @@ class DepartmentStatistics extends Component{
                     dataIndex: "receiveCount",
                     key: "receiveCount",
                     className: 'tableRowStyle',
+                    width: 120,
                     render: (text, record) => {
                         return (
                             <div
@@ -239,11 +247,14 @@ class DepartmentStatistics extends Component{
     }
 
     componentDidMount() {
-        // this.loadData();
         this.selectSuperId();
     }
 
     loadData() {
+        if(!this.state.superId){
+            message.warning('请选择部门后再搜索')
+            return;
+        }
         this.setState({
             loading: true,
         });
@@ -322,7 +333,6 @@ class DepartmentStatistics extends Component{
 
     reset(){
         this.setState({
-            superId:undefined,
             nameSearch: '',
             releaseDate: [],
         },()=>{
@@ -364,6 +374,13 @@ class DepartmentStatistics extends Component{
                     theId: theId,
                     orderStatusOptions:data.data,
                 });
+                if(!this.state.superId){
+                    this.setState({
+                        superId:data.data[0].id
+                    },()=>{
+                        this.loadData();
+                    })
+                }
 
             }.bind(this),
         }).always(function () {
@@ -461,6 +478,7 @@ class DepartmentStatistics extends Component{
                     <Spin spinning={this.state.loading}>
                         <Table
                             size="middle"
+                            scroll={{ y: 550 }}
                             columns={
                                 this.state.changeList
                                     ? this.state.changeList

+ 1 - 7
js/component/manageCenter/order/orderNew/glCostAuditList/detailsModal/projectOverview.js

@@ -521,13 +521,7 @@ class projectOverview extends Component{
                             >
                                 <span>
                                     {
-                                        this.state.status === 0 ? '未开始':
-                                            this.state.status === 1 ? '进行中':
-                                                this.state.status === 2 ? '已暂停':
-                                                    this.state.status === 3 ? '已驳回(专利、软著项目编写)':
-                                                        this.state.status === 4 ? '已完成':
-                                                            this.state.status === 5 ? '项目已完成 已退单':
-                                                                this.state.status === 6 ? '项目未完成 已退单': ''
+                                        getProjectName(this.state.status)
                                     }
                                 </span>
                                 <Button

+ 10 - 0
js/component/manageCenter/project/content.jsx

@@ -136,6 +136,16 @@ class Content extends Component {
               });
             });
             break;
+            //专利列表
+            case "patentList":
+                require.ensure([], () => {
+                    const PatentList = require("./patent/list")
+                        .default;
+                    this.setState({
+                        component: <PatentList />
+                    });
+                });
+                break;
         //专利成本审核列表(专利管理员查看)
         case "patentCostList":
             require.ensure([], () => {

+ 269 - 0
js/component/manageCenter/project/patent/list.jsx

@@ -0,0 +1,269 @@
+import React,{Component} from "react";
+import {Button, message, Spin, Table, Tabs} from "antd";
+import {ChooseList} from "../../order/orderNew/chooseList";
+import $ from "jquery/src/ajax";
+
+import PatentDetails from './patentDetails';
+
+const { TabPane } = Tabs;
+
+class List extends Component{
+    constructor(props) {
+        super(props);
+        this.state={
+            loading:false,
+            columns:[
+                {
+                    title: "序号",
+                    dataIndex: "companyName",
+                    key: "companyName",
+                },
+                {
+                    title: "专利名称",
+                    dataIndex: "companyName",
+                    key: "companyName",
+                },
+                {
+                    title: "专利类型",
+                    dataIndex: "companyName",
+                    key: "companyName",
+                },
+                {
+                    title: "申请日",
+                    dataIndex: "companyName",
+                    key: "companyName",
+                },
+                {
+                    title: "权利人",
+                    dataIndex: "companyName",
+                    key: "companyName",
+                },
+                {
+                    title: "发明人",
+                    dataIndex: "companyName",
+                    key: "companyName",
+                },
+                {
+                    title: "收费截止日",
+                    dataIndex: "companyName",
+                    key: "companyName",
+                },
+                {
+                    title: "年费状态",
+                    dataIndex: "companyName",
+                    key: "companyName",
+                },
+                {
+                    title: "营销员是否提醒",
+                    dataIndex: "companyName",
+                    key: "companyName",
+                },
+                {
+                    title: "年费/滞纳金/恢复",
+                    dataIndex: "companyName",
+                    key: "companyName",
+                },
+                {
+                    title: "操作",
+                    dataIndex: "companyName",
+                    key: "companyName",
+                },
+                {
+                    title: "客户名称",
+                    dataIndex: "companyName",
+                    key: "companyName",
+                },
+                {
+                    title: "项目名称",
+                    dataIndex: "companyName",
+                    key: "companyName",
+                },
+                {
+                    title: "项目编号",
+                    dataIndex: "companyName",
+                    key: "companyName",
+                },
+            ],
+            dataSource:[],
+            pagination: {
+                defaultCurrent: 1,
+                defaultPageSize: 10,
+                showQuickJumper: true,
+                pageSize: 10,
+                onChange: function (page) {
+                    this.loadData(page,this.state.searchInfor);
+                }.bind(this),
+                showTotal: function (total) {
+                    return "共" + total + "条数据";
+                },
+            },
+            detailsVisible:true,
+            detailsInfor:{}
+        }
+        this.changeList = this.changeList.bind(this);
+        this.loadData = this.loadData.bind(this);
+        this.download = this.download.bind(this);
+    }
+
+    componentDidMount() {
+        this.loadData();
+    }
+
+    changeList(arr) {
+        const newArr = [];
+        this.state.columns.forEach(item => {
+            arr.forEach(val => {
+                if (val === item.title) {
+                    newArr.push(item);
+                }
+            });
+        });
+        this.setState({
+            changeList: newArr
+        });
+    }
+
+    loadData(pageNo) {
+        this.setState({
+            loading: true,
+        });
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/company/selectPaymentList",
+            data: {
+                pageNo:pageNo || 1,
+                pageSize:10,
+            },
+            success: function (data) {
+                if(data.error.length === 0){
+                    this.state.pagination.current = data.data.pageNo;
+                    this.state.pagination.total = data.data.totalCount;
+                    if (data.data && data.data.list && !data.data.list.length) {
+                        this.state.pagination.current = 0;
+                        this.state.pagination.total = 0;
+                    }
+                    this.setState({
+                        page: data.data.pageNo,
+                        dataSource: data.data.list,
+                        pagination: this.state.pagination,
+                    });
+                }else{
+                    message.warning(data.error[0].message);
+                }
+            }.bind(this),
+        }).always(
+            function () {
+                this.setState({
+                    loading: false,
+                });
+            }.bind(this)
+        );
+    }
+
+    download() {
+        window.location.href =
+            globalConfig.context +
+            "/api/user/channel/downloadTemplate?" +
+            "sign=user_channel";
+    }
+
+    render() {
+        return (
+            <div className="user-content">
+                <div className="content-title">
+                    <span>专利列表</span>
+                </div>
+                <Tabs defaultActiveKey="1" className="test">
+                    <TabPane tab="搜索" key="1">
+                        <div style={{paddingTop:'10px'}}>
+
+                        </div>
+                    </TabPane>
+                    <TabPane tab="操作" key="2">
+                        <Button
+                            type="primary"
+                            onClick={this.exportExec}
+                            style={{ margin: "11px 0px 10px 10px" }}
+                        >
+                            标识为已通知
+                        </Button>
+                        <Button
+                            type="primary"
+                            onClick={this.exportExec}
+                            style={{ margin: "11px 0px 10px 10px" }}
+                        >
+                            批量导入
+                        </Button>
+                        <Button
+                            type="primary"
+                            onClick={(e) => {
+                                e.stopPropagation();
+                                this.download();
+                            }}
+                            style={{ margin: "11px 0px 10px 10px" }}
+                        >
+                            下载专利模板
+                        </Button>
+                    </TabPane>
+                    <TabPane tab="更改表格显示数据" key="3">
+                        <div style={{ marginLeft: 10 }}>
+                            <ChooseList
+                                columns={this.state.columns}
+                                changeFn={this.changeList}
+                                changeList={this.state.changeList}
+                                top={55}
+                                margin={11}
+                            />
+                        </div>
+                    </TabPane>
+                </Tabs>
+                <div className="patent-table">
+                    <Spin spinning={this.state.loading}>
+                        <Table
+                            columns={
+                                this.state.changeList
+                                    ? this.state.changeList
+                                    : this.state.columns
+                            }
+                            dataSource={this.state.dataSource}
+                            pagination={this.state.pagination}
+                            style={{
+                                cursor: 'pointer',
+                            }}
+                            onRowClick={(record)=>{
+                                this.setState({
+                                    detailsVisible:true,
+                                    detailsInfor:record
+                                })
+                            }}
+                            rowSelection={{
+                                selectedRowKeys:this.state.selectedRowKeys,
+                                onChange: (selectedRowKeys)=>{
+                                    this.setState({ selectedRowKeys });
+                                },
+                            }}
+                            scroll={{ x: "max-content", y: 0 }}
+                            bordered
+                            size="small"
+                        />
+                    </Spin>
+                </div>
+                {this.state.detailsVisible ? <PatentDetails
+                    visible={this.state.detailsVisible}
+                    detailsInfor={this.state.detailsInfor}
+                    onCancel={()=>{
+                        this.setState({
+                            detailsVisible:false,
+                            detailsInfor:{}
+                        })
+                    }}
+                /> : null}
+            </div>
+        )
+    }
+}
+
+
+export default List;

+ 231 - 0
js/component/manageCenter/project/patent/patentDetails.jsx

@@ -0,0 +1,231 @@
+import React,{Component} from "react";
+import {Modal, Form, Row, Col, Tabs, Table, Spin, message} from "antd";
+import $ from "jquery/src/ajax";
+
+const FormItem = Form.Item;
+const TabPane  = Tabs.TabPane;
+
+const formItemLayout = {
+    labelCol: { span: 10 },
+    wrapperCol: { span: 14 },
+};
+
+class PatentDetails extends Component{
+    constructor(props) {
+        super(props);
+        this.state={
+            payDataSource :[],
+            payColumns:[
+                {
+                    title: "序号",
+                    dataIndex: "companyName",
+                    key: "companyName",
+                },
+                {
+                    title: "费用种类",
+                    dataIndex: "companyName",
+                    key: "companyName",
+                },
+                {
+                    title: "金额",
+                    dataIndex: "companyName",
+                    key: "companyName",
+                },
+                {
+                    title: "缴费日",
+                    dataIndex: "companyName",
+                    key: "companyName",
+                },
+            ],
+            unPayDataSource:[],
+            unPayColumns:[
+                {
+                    title: "序号",
+                    dataIndex: "companyName",
+                    key: "companyName",
+                },
+                {
+                    title: "费用种类",
+                    dataIndex: "companyName",
+                    key: "companyName",
+                },
+                {
+                    title: "金额",
+                    dataIndex: "companyName",
+                    key: "companyName",
+                },
+                {
+                    title: "缴费日",
+                    dataIndex: "companyName",
+                    key: "companyName",
+                },
+            ],
+            unPayLoading:false,
+            payLoading:false,
+        }
+        this.payLoadData = this.payLoadData.bind(this);
+        this.unPayLoadData = this.unPayLoadData.bind(this);
+    }
+
+    componentDidMount() {
+        this.payLoadData();
+        this.unPayLoadData();
+    }
+
+    payLoadData() {
+        this.setState({
+            payLoading: true,
+        });
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/company/selectPaymentList",
+            data: {},
+            success: function (data) {
+                if(data.error.length === 0){
+                    this.setState({
+                        payDataSource: [],
+                    });
+                }else{
+                    message.warning(data.error[0].message);
+                }
+            }.bind(this),
+        }).always(
+            function () {
+                this.setState({
+                    payLoading: false,
+                });
+            }.bind(this)
+        );
+    }
+
+    unPayLoadData() {
+        this.setState({
+            unPayLoading: true,
+        });
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/company/selectPaymentList",
+            data: {},
+            success: function (data) {
+                if(data.error.length === 0){
+                    this.setState({
+                        unPayDataSource: [],
+                    });
+                }else{
+                    message.warning(data.error[0].message);
+                }
+            }.bind(this),
+        }).always(
+            function () {
+                this.setState({
+                    unPayLoading: false,
+                });
+            }.bind(this)
+        );
+    }
+
+    render() {
+        return (
+            <Modal
+                title='年费数据'
+                className='payRecordComponent'
+                width={800}
+                maskClosable={false}
+                footer={null}
+                visible={this.props.visible}
+                onCancel={this.props.onCancel}
+            >
+                <Form layout="horizontal">
+                    <Row gutter={40}>
+                        <Col span={12}>
+                            <FormItem
+                                {...formItemLayout}
+                                label='申请日'
+                            >
+                                2020-06-19
+                            </FormItem>
+                        </Col>
+                        <Col span={12}>
+                            <FormItem
+                                {...formItemLayout}
+                                label='上回缴费年度'
+                            >
+                                发明专利第2年年费,2021-03-30
+                            </FormItem>
+                        </Col>
+                        <Col span={12}>
+                            <FormItem
+                                {...formItemLayout}
+                                label='状态'
+                            >
+                                待缴
+                            </FormItem>
+                        </Col>
+                        <Col span={12}>
+                            <FormItem
+                                {...formItemLayout}
+                                label='滞纳金'
+                            >
+                                0
+                            </FormItem>
+                        </Col>
+                        <Col span={12}>
+                            <FormItem
+                                {...formItemLayout}
+                                label='权利恢复费'
+                            >
+                               0
+                            </FormItem>
+                        </Col>
+                        <Col span={12}>
+                            <FormItem
+                                {...formItemLayout}
+                                label='截止日'
+                            >
+                                2022-07-19
+                            </FormItem>
+                        </Col>
+                        <Col span={12}>
+                            <FormItem
+                                {...formItemLayout}
+                                label='年费'
+                            >
+                                900.00
+                            </FormItem>
+                        </Col>
+                    </Row>
+                </Form>
+                <Tabs defaultActiveKey="1">
+                    <TabPane tab="应缴费信息" key="1">
+                        <Spin spinning={this.state.unPayLoading}>
+                            <Table
+                                columns={this.state.unPayColumns}
+                                dataSource={this.state.unPayDataSource}
+                                pagination={false}
+                                bordered
+                                size="small"
+                            />
+                        </Spin>
+                    </TabPane>
+                    <TabPane tab="已缴费信息" key="2">
+                        <Spin spinning={this.state.payLoading}>
+                            <Table
+                                columns={this.state.payColumns}
+                                dataSource={this.state.payDataSource}
+                                pagination={false}
+                                bordered
+                                size="small"
+                            />
+                        </Spin>
+                    </TabPane>
+                </Tabs>
+            </Modal>
+        )
+    }
+}
+
+export default PatentDetails;

+ 4 - 2
js/component/manageCenter/project/summary/highTech.jsx

@@ -277,8 +277,10 @@ class HighTech extends Component{
 
     componentWillMount() {
         this.loadData();
-        this.departmentList();
-        this.selectSuperId();
+        if(!this.props.introduce){
+            this.departmentList();
+            this.selectSuperId();
+        }
         if(this.props.searchData){
             let e = this.props.searchData.projectType;
             this.setState({

+ 6 - 35
js/component/manageCenter/project/summary/highTechConfig.jsx

@@ -1,5 +1,6 @@
 import { Tooltip } from 'antd';
 import React from 'react';
+import {getProjectName} from '@/tools';
 // 高新
 const highTechColumns =[
     {
@@ -114,13 +115,7 @@ const highTechColumns =[
         dataIndex: "projectStatus",
         key: "projectStatus",
         render:(value)=>(
-            value === 0 ? '未开始':
-                value === 1 ? '进行中':
-                    value === 2 ? '已暂停':
-                        value === 3 ? '已驳回(专利、软著项目编写)':
-                            value === 4 ? '已完成':
-                                value === 5 ? '项目已完成 已退单':
-                                    value === 6 ? '项目未完成 已退单': ''
+            getProjectName(value)
         )
     },
     {
@@ -228,13 +223,7 @@ const doubleSoft = [
         dataIndex: "projectStatus",
         key: "projectStatus",
         render:(value)=>(
-            value === 0 ? '未开始':
-                value === 1 ? '进行中':
-                    value === 2 ? '已暂停':
-                        value === 3 ? '已驳回(专利、软著项目编写)':
-                            value === 4 ? '已完成':
-                                value === 5 ? '项目已完成 已退单':
-                                    value === 6 ? '项目未完成 已退单': ''
+            getProjectName(value)
         )
     },
     {
@@ -376,13 +365,7 @@ const softWriting = [
         dataIndex: "projectStatus",
         key: "projectStatus",
         render:(value)=>(
-            value === 0 ? '未开始':
-                value === 1 ? '进行中':
-                    value === 2 ? '已暂停':
-                        value === 3 ? '已驳回(专利、软著项目编写)':
-                            value === 4 ? '已完成':
-                                value === 5 ? '项目已完成 已退单':
-                                    value === 6 ? '项目未完成 已退单': ''
+            getProjectName(value)
         )
     },
     {
@@ -536,13 +519,7 @@ const patent =[
         dataIndex: "projectStatus",
         key: "projectStatus",
         render:(value)=>(
-            value === 0 ? '未开始':
-                value === 1 ? '进行中':
-                    value === 2 ? '已暂停':
-                        value === 3 ? '已驳回(专利、软著项目编写)':
-                            value === 4 ? '已完成':
-                                value === 5 ? '项目已完成 已退单':
-                                    value === 6 ? '项目未完成 已退单': ''
+            getProjectName(value)
         )
     },
     {
@@ -637,13 +614,7 @@ const currency = [
         dataIndex: "projectStatus",
         key: "projectStatus",
         render:(value)=>(
-            value === 0 ? '未开始':
-                value === 1 ? '进行中':
-                    value === 2 ? '已暂停':
-                        value === 3 ? '已驳回(专利、软著项目编写)':
-                            value === 4 ? '已完成':
-                                value === 5 ? '项目已完成 已退单':
-                                    value === 6 ? '项目未完成 已退单': ''
+            getProjectName(value)
         )
     },
     {

+ 2 - 2
js/component/manageCenter/project/task/myTask.jsx

@@ -4793,7 +4793,7 @@ const Task = React.createClass({
                                                         marginBottom: '15px',
                                                     }}
                                                 >
-                                                    +新增供应商名称
+                                                    +新增第三方信息
                                                 </Button>
                                             </div>
                                             <div
@@ -6118,7 +6118,7 @@ const Task = React.createClass({
                                                         marginRight: '50px',
                                                         marginBottom: '15px',
                                                     }}>
-                                                    +新增供应商名称
+                                                    +新增第三方信息
                                                 </Button>
                                             </div>
                                             <div

+ 1 - 1
js/component/manageCenter/project/task/myTaskOutsource.jsx

@@ -4446,7 +4446,7 @@ const MyTaskOutsource = React.createClass({
                                       marginBottom: '15px',
                                     }}
                                 >
-                                  +新增供应商名称
+                                  +新增第三方信息
                                 </Button>
                               </div>
                               <div

+ 1 - 1
js/component/manageCenter/project/task/newSupplier.js

@@ -256,7 +256,7 @@ class NewSupplier extends Component{
                 visible={this.props.visible}
                 onCancel={this.props.onCancel}
                 width={800}
-                title={this.props.ThirdId ? "修改供应商" : "新增供应商"}
+                title={this.props.ThirdId ? "修改第三方信息" : "新增第三方信息"}
                 footer=""
                 className="admin-desc-content"
             >

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "afanti",
-  "version": "1.1.78",
+  "version": "1.1.80",
   "description": "",
   "main": "index.js",
   "scripts": {