ソースを参照

申请支付金额修改

HW 3 年 前
コミット
a57a7cc9da

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

@@ -249,7 +249,33 @@ class ApplyPaymentModal extends Component{
                                 )}
                             </Form.Item>
                             {/*0正常 1专利 2软著 3审计    只有专利里面的专利申请没有本次申请支付金额*/}
-                            {!(this.props.projectType === 1 && this.props.patentType === 0) ? <Form.Item
+                            {/*专利的官费申请   本次申请支付金额(万元) 不需要*/}
+                            {/*startType 1供应商 0外包*/}
+                            {/*
+                                申请官费
+                                    本次申请支付数量  都可以修改
+                                    本次申请支付金额  都不显示
+
+
+                                申请付款
+                                    供应商
+                                        第三方信息
+                                            本次申请支付数量  都可以修改
+                                            本次申请支付金额  专利申请类型不显示,专利买卖类型可以修改申请支付金额,其他类型也能修改
+                                        付款节点(专利申请无付款节点)
+                                            本次申请支付数量  都可以修改
+                                            本次申请支付金额  都可以修改
+
+
+                                外包
+                                    第三方信息
+                                        本次申请支付数量  都可以修改
+                                        本次申请支付金额  专利申请不可以修改但显示,其他类型可以修改
+                                    付款节点
+                                        本次申请支付数量  都可以修改
+                                        本次申请支付金额  专利申请不可以修改但显示,其他类型可以修改
+                            */}
+                            {this.props.type !== 2 && !(this.props.startType === 1 ? (this.props.projectType === 1 && this.props.patentType === 0) : false) ? <Form.Item
                                 {...formItemLayout}
                                 style={{
                                     display:'flex'
@@ -275,7 +301,7 @@ class ApplyPaymentModal extends Component{
                                 })(
                                     <InputNumber
                                         min={0}
-                                        disabled={this.state.paymentStatus !== 0}
+                                        disabled={this.state.paymentStatus !== 0 || (this.props.projectType === 1 && this.props.patentType === 0)}
                                         style={{ width: '200px' }}
                                         placeholder="请输入本次申请支付金额"/>
                                 )}

+ 1 - 0
js/component/manageCenter/components/checkProject/index.jsx

@@ -1222,6 +1222,7 @@ class CheckProject extends Component {
                     previewPayInfor={this.state.previewPayInfor}
                     visible={this.state.previewPayVisible}
                     commodityQuantity={this.props.commodityQuantity}
+                    startType={this.props.startType}   //1供应商 0外包
                     onRefresh={()=>{
                       this.props.onRefresh();
                       this.paymentRecordRef.refresh();

+ 33 - 7
js/component/manageCenter/project/patent/list.jsx

@@ -4,7 +4,9 @@ import {ChooseList} from "../../order/orderNew/chooseList";
 import $ from "jquery/src/ajax";
 import { patentTypeList} from '@/dataDic.js';
 
-import {getPatentType} from "@/tools.js";
+import {getPatentType,ShowModal} from "@/tools.js";
+
+import ShowModalDiv from "@/showModal.jsx";
 
 import './patent.less';
 
@@ -23,16 +25,22 @@ class List extends Component{
                     title: "序号",
                     dataIndex: "id",
                     key: "id",
+                    width:80,
+                    fixed: 'left'
                 },
                 {
                     title: "专利号",
                     dataIndex: "patentNo",
                     key: "patentNo",
+                    width:140,
+                    fixed: 'left'
                 },
                 {
                     title: "专利名称",
                     dataIndex: "name",
                     key: "name",
+                    width:140,
+                    fixed: 'left'
                 },
                 {
                     title: "专利类型",
@@ -167,6 +175,8 @@ class List extends Component{
                     title: "操作",
                     dataIndex: "id",
                     key: "caozuo",
+                    width:200,
+                    fixed: 'right',
                     render: (text,record) => {
                         return (
                             <div>
@@ -217,7 +227,7 @@ class List extends Component{
             annualFeeStatus:undefined,
             userName:undefined,
             salesmanRemind:undefined,
-            isFollow:undefined,
+            isFollow:1,
             aname:undefined,
             patentNo:undefined,
 
@@ -250,7 +260,10 @@ class List extends Component{
                             }
                         }.bind(this)
                     ).always(
-                        function () {
+                        function (err) {
+                            if(err.status === 404){
+                                message.warning('表格数据错误');
+                            }
                             this.loadData();
                             this.setState({
                                 upLoadFileLoading: false,
@@ -283,7 +296,17 @@ class List extends Component{
             this.setState({
                 status:prevProps.status
             },()=>{
-                this.loadData();
+                this.setState({
+                    name:undefined,
+                    type:undefined,
+                    depName:undefined,
+                    annualFeeStatus:undefined,
+                    userName:undefined,
+                    salesmanRemind:undefined,
+                    isFollow:1,
+                    aname:undefined,
+                    patentNo:undefined,
+                },()=>{this.loadData();})
                 this.departmentList();
             })
         }
@@ -329,6 +352,7 @@ class List extends Component{
         }
         if(this.state.status){
             data.status=this.state.status;
+            data.isFollow = 1 ;
         }
         for(let i in data){
             if(data[i] === undefined){delete data[i]}
@@ -340,6 +364,7 @@ class List extends Component{
             url: globalConfig.context + "/api/admin/patentNew/selectPatentNew",
             data,
             success: function (data) {
+                ShowModal(this);
                 if(data.error.length === 0){
                     this.state.pagination.current = data.data.pageNo;
                     this.state.pagination.total = data.data.totalCount;
@@ -570,6 +595,7 @@ class List extends Component{
     render() {
         return (
             <div className="user-content">
+                <ShowModalDiv ShowModal={this.state.showModal} />
                 <div className="content-title">
                     <span>专利列表</span>
                 </div>
@@ -580,7 +606,7 @@ class List extends Component{
                                 layout="inline"
                                 name="basic"
                             >
-                                <div style={{display:'flex',alignItems:'center'}}>
+                                <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>
@@ -633,7 +659,7 @@ class List extends Component{
                                             <Select.Option value={1} >已通知</Select.Option>
                                         </Select>
                                     </Form.Item>
-                                    <Form.Item>
+                                    {!this.state.status ? <Form.Item>
                                         <Select placeholder="请选择关系" value={this.state.isFollow} onSelect={(e)=>{
                                             this.setState({
                                                 isFollow:e
@@ -642,7 +668,7 @@ class List extends Component{
                                             <Select.Option value={0} >我录入</Select.Option>
                                             <Select.Option value={1} >我跟进</Select.Option>
                                         </Select>
-                                    </Form.Item>
+                                    </Form.Item> : null}
                                     <Form.Item>
                                         <Select placeholder="请选择派单部门" value={this.state.depName} onSelect={e=>{this.setState({depName:e})}} style={{ width: "240px" }}>
                                             {

+ 175 - 47
js/component/manageCenter/project/patent/patentDetails.jsx

@@ -1,11 +1,27 @@
 import React,{Component} from "react";
-import {Modal, Form, Row, Col, Tabs, Table, Spin, message, Button, Input, Select, DatePicker, Popconfirm} from "antd";
+import {
+    Modal,
+    Form,
+    Row,
+    Col,
+    Table,
+    Spin,
+    message,
+    Button,
+    Input,
+    Select,
+    DatePicker,
+    Popconfirm,
+    Tooltip
+} from "antd";
 import $ from "jquery/src/ajax";
 import moment from 'moment';
 import ReminderLog from "../../customer/NEW/crm/reminderLog";
 
 import {getPatentType} from "@/tools.js";
 
+import { patentTypeList} from '@/dataDic.js';
+
 const FormItem = Form.Item;
 
 const formItemLayout = {
@@ -68,8 +84,12 @@ class PatentDetails extends Component{
         if (!readOnly) {
             this.setState({
                 patentNo: detailsInfor.patentNo,
+                tid: detailsInfor.tid,
                 email:detailsInfor.email,
                 name: detailsInfor.name,
+                type: detailsInfor.type,
+                holders: detailsInfor.holders,
+                inventor: detailsInfor.inventor,
                 applyDates: detailsInfor.applyDates,
                 authorizationDates: detailsInfor.authorizationDates,
                 annualFeeStatus: detailsInfor.annualFeeStatus,
@@ -122,28 +142,44 @@ class PatentDetails extends Component{
             message.warning('请输入专利名称')
             return;
         }
-        if(!this.state.applyDates){
-            message.warning('请选择申请日期')
+        if(isNaN(parseInt(this.state.type))){
+            message.warning('请选择专利类型')
             return;
         }
-        if(!this.state.authorizationDates){
-            message.warning('请选择授权日期')
+        if(!this.state.tid){
+            message.warning('请输入项目编号')
             return;
         }
-        if(!this.state.email){
-            message.warning('请输入邮箱')
-            return;
-        }
-        if(isNaN(parseInt(this.state.annualFeeStatus))){
-            message.warning('请选择年费状态')
+        if(!this.state.applyDates){
+            message.warning('请选择申请日期')
             return;
         }
-        if(isNaN(parseInt(this.state.delayingAmount))){
-            message.warning('请输入滞纳金')
+        // if(!this.state.authorizationDates){
+        //     message.warning('请选择授权日期')
+        //     return;
+        // }
+        // if(!this.state.email){
+        //     message.warning('请输入邮箱')
+        //     return;
+        // }
+        // if(isNaN(parseInt(this.state.annualFeeStatus))){
+        //     message.warning('请选择年费状态')
+        //     return;
+        // }
+        // if(!this.state.holders){
+        //     message.warning('请输入权利人')
+        //     return;
+        // }
+        // if(!this.state.inventor){
+        //     message.warning('请输入发明人')
+        //     return;
+        // }
+        if(!isNaN(parseInt(this.state.delayingAmount)) && this.state.delayingAmount < 0){
+            message.warning('滞纳金不能小于零')
             return;
         }
-        if(isNaN(parseInt(this.state.recoveryAmount))){
-            message.warning('请输入权利恢复费')
+        if(!isNaN(parseInt(this.state.recoveryAmount))  && this.state.recoveryAmount < 0){
+            message.warning('权利恢复费不能小于零')
             return;
         }
         this.setState({
@@ -158,19 +194,24 @@ class PatentDetails extends Component{
             data: {
                 id:detailsInfor.id,
                 patentNo: this.state.patentNo,
-                email: this.state.email,
                 name: this.state.name,
+                type: this.state.type,
                 applyDates: this.state.applyDates,
-                authorizationDates: this.state.authorizationDates,
-                annualFeeStatus: this.state.annualFeeStatus,
-                delayingAmount: this.state.delayingAmount,
-                recoveryAmount: this.state.recoveryAmount,
+                tid: this.state.tid,
+
+                email: this.state.email || undefined,
+                holders: this.state.holders || undefined,
+                inventor: this.state.inventor || undefined,
+                authorizationDates: this.state.authorizationDates || undefined,
+                annualFeeStatus: this.state.annualFeeStatus || undefined,
+                delayingAmount: isNaN(parseInt(this.state.delayingAmount)) ? undefined : this.state.delayingAmount,
+                recoveryAmount: isNaN(parseInt(this.state.recoveryAmount)) ? undefined : this.state.recoveryAmount,
             },
             success: function (data) {
                 if(data.error.length === 0){
                     message.success('修改成功');
-                    this.payLoadData();
                     this.props.onRefresh();
+                    this.props.onCancel();
                 }else{
                     message.warning(data.error[0].message);
                 }
@@ -200,6 +241,7 @@ class PatentDetails extends Component{
                     <Row gutter={40}>
                         <Col span={8}>
                             <FormItem
+                                required
                                 {...formItemLayout}
                                 label='专利号'
                             >
@@ -220,6 +262,7 @@ class PatentDetails extends Component{
                             <FormItem
                                 {...formItemLayout}
                                 label='专利名称'
+                                required
                             >
                                 {
                                     readOnly ? detailsInfor.name :
@@ -238,9 +281,46 @@ class PatentDetails extends Component{
                             <FormItem
                                 {...formItemLayout}
                                 label='专利类型'
+                                required
                             >
                                 {
-                                    getPatentType(detailsInfor.type)
+                                    readOnly ?
+                                    getPatentType(detailsInfor.type) :
+                                    <Select
+                                        placeholder="请选择专利类型"
+                                        style={{paddingTop: '5px'}}
+                                        value={getPatentType(this.state.type)}
+                                        onChange={e => {
+                                            this.setState({ type: e });
+                                        }}
+                                    >
+                                        {patentTypeList.map(function(item) {
+                                            return (
+                                                <Select.Option key={item.value}>
+                                                    {item.key}
+                                                </Select.Option>
+                                            );
+                                        })}
+                                    </Select>
+                                }
+                            </FormItem>
+                        </Col>
+                        <Col span={8}>
+                            <FormItem
+                                {...formItemLayout}
+                                label='项目编号'
+                                required
+                            >
+                                {
+                                    readOnly ? detailsInfor.tid :
+                                        <Input
+                                            value={this.state.tid}
+                                            onChange={(e)=>{
+                                                this.setState({
+                                                    tid:e.target.value
+                                                })
+                                            }}
+                                        />
                                 }
                             </FormItem>
                         </Col>
@@ -248,6 +328,7 @@ class PatentDetails extends Component{
                             <FormItem
                                 {...formItemLayout}
                                 label='申请日期'
+                                required
                             >
                                 {
                                     readOnly ? detailsInfor.applyDates:
@@ -255,7 +336,6 @@ class PatentDetails extends Component{
                                             value={this.state.applyDates ? moment(this.state.applyDates) : ''}
                                             format='YYYY-MM-DD'
                                             onChange={(date)=>{
-                                                console.log(date,'date')
                                                 this.setState({
                                                     applyDates:date ? moment(date).format('YYYY-MM-DD') : '',
                                                 })
@@ -275,7 +355,6 @@ class PatentDetails extends Component{
                                             value={this.state.authorizationDates ? moment(this.state.authorizationDates) : ''}
                                             format='YYYY-MM-DD'
                                             onChange={(date)=>{
-                                                console.log(date,'date')
                                                 this.setState({
                                                     authorizationDates:date ? moment(date).format('YYYY-MM-DD') : '',
                                                 })
@@ -290,7 +369,17 @@ class PatentDetails extends Component{
                                 label='Email'
                             >
                                 {
-                                    readOnly ? detailsInfor.email:
+                                    readOnly ?
+                                        <Tooltip placement="topLeft" title={detailsInfor.email}>
+                                            <div style={{
+                                                width:'100%',
+                                                overflow: 'hidden',
+                                                whiteSpace: 'nowrap',
+                                                textOverflow: 'ellipsis',
+                                            }}>
+                                                {detailsInfor.email}
+                                            </div>
+                                        </Tooltip>:
                                         <Input
                                             value={this.state.email}
                                             onChange={(e)=>{
@@ -302,14 +391,14 @@ class PatentDetails extends Component{
                                 }
                             </FormItem>
                         </Col>
-                        {readOnly ? <Col span={8}>
+                        <Col span={8}>
                             <FormItem
                                 {...formItemLayout}
                                 label='年费'
                             >
                                 {detailsInfor.patentAmount}
                             </FormItem>
-                        </Col> : null }
+                        </Col>
                         <Col span={8}>
                             <FormItem
                                 {...formItemLayout}
@@ -367,30 +456,69 @@ class PatentDetails extends Component{
                                 }
                             </FormItem>
                         </Col>
-                        <Col span={16}>
+                        <Col span={8}>
+                            <FormItem
+                                {...formItemLayout}
+                                label='权利人'
+                            >
+                                {
+                                    readOnly ? detailsInfor.holders :
+                                        <Input
+                                            value={this.state.holders}
+                                            onChange={(e)=>{
+                                                this.setState({
+                                                    holders:e.target.value
+                                                })
+                                            }}
+                                        />
+                                }
+                            </FormItem>
+                        </Col>
+                        <Col span={8}>
                             <FormItem
-                                labelCol={{span: 5}}
-                                wrapperCol={{span: 19}}
+                                {...formItemLayout}
+                                label='发明人'
+                            >
+                                {
+                                    readOnly ? detailsInfor.inventor :
+                                        <Input
+                                            value={this.state.inventor}
+                                            onChange={(e)=>{
+                                                this.setState({
+                                                    inventor:e.target.value
+                                                })
+                                            }}
+                                        />
+                                }
+                            </FormItem>
+                        </Col>
+                        <Col span={8}>
+                            <FormItem
+                                {...formItemLayout}
                                 label='通知'
                             >
-                               <div style={{display:'flex',alignItems:'center'}}>
-                                   {
-                                       detailsInfor.salesmanRemind === 0 ? '未通知' :
-                                           detailsInfor.salesmanRemind === 1 ? '已通知' : ''
-                                   }
-                                   <Button
-                                       onClick={()=>{
-                                           this.setState({
-                                               visible:true,
-                                               id:detailsInfor.id
-                                           })
-                                       }}
-                                       style={{marginLeft:"15px"}}
-                                       type='primary'>
-                                       查看专利日志
-                                   </Button>
-                               </div>
+                                <div style={{display:'flex',alignItems:'center'}}>
+                                    {
+                                        detailsInfor.salesmanRemind === 0 ? '未通知' :
+                                            detailsInfor.salesmanRemind === 1 ? '已通知' : ''
+                                    }
+                                </div>
                             </FormItem>
+                            <Button
+                                onClick={()=>{
+                                    this.setState({
+                                        visible:true,
+                                        id:detailsInfor.id
+                                    })
+                                }}
+                                style={{
+                                    position: 'absolute',
+                                    top: 0,
+                                    right: 0,
+                                }}
+                                type='primary'>
+                                查看专利日志
+                            </Button>
                         </Col>
                     </Row>
                     {!readOnly ?