Browse Source

修改项目发起修改

HW 3 years ago
parent
commit
954801eeea

+ 9 - 9
js/component/common/initiateOrder/paymentRecord.jsx

@@ -24,13 +24,12 @@ class PaymentRecord extends Component {
                     key: 'companyName',
                     render: (text, record) => {
                         return <span>
-                                  {
-                                      record.chooseType === 2 ? text : (text + '-' + record.tpcId)
-                                  }
-                                  {
-                                    text !== record.tpcName && record.tpcName ?
-                                        '(' + record.tpcName + ')' : ''
-                                  }
+                                    {
+                                        record.status === 4 ? text : (
+                                            record.chooseType === 2 ? text : (text + '-' + record.tpcId) +
+                                            (text !== record.tpcName && record.tpcName ? '(' + record.tpcName + ')' : '')
+                                        )
+                                    }
                                 </span>
                     },
                 },
@@ -81,7 +80,8 @@ class PaymentRecord extends Component {
                                     text === 0 ? '审核中' :
                                         text === 1 ? '审核通过' :
                                             text === 2 ? '已驳回' :
-                                                text === 3 ? '支付完成' : '已取消'
+                                                text === 3 ? '支付完成' :
+                                                    text === 4 ? '已取消' : ''
                                 }
                             </div>
                             <Button type="primary" size='small' onClick={() => {
@@ -164,7 +164,7 @@ class PaymentRecord extends Component {
     render() {
         return (
             this.state.selectOrderPayments.length > 0 ? <div>
-                <div className="title">支付记录(已修改)</div>
+                <div className="title">支付记录</div>
                 <Spin spinning={this.state.payRecordsLoading}>
                     <Form layout="horizontal">
                         <Table

+ 5 - 5
js/component/common/patentCheck/index.jsx

@@ -131,7 +131,7 @@ class PatentCheck extends Component{
                         }
                     </span>
                     {
-                        this.props.checkStatus === 0 || this.props.checkStatus === 2 ?
+                        (this.props.checkStatus === 0 || this.props.checkStatus === 2) && !this.props.isAuditPayment && !this.props.isAuditPaymentGLY ?
                             <Popconfirm
                                 title="您确认是否发起核对?发起核对后已发布的官费支付申请将被取消."
                                 onConfirm={() => {
@@ -156,7 +156,7 @@ class PatentCheck extends Component{
                                 </Button>
                             </Popconfirm> : null
                     }
-                    <Button
+                    {!this.props.isAuditPayment && !this.props.isAuditPaymentGLY ? <Button
                         loading={this.state.loading}
                         onClick={(e) => {
                             this.setState({
@@ -173,7 +173,7 @@ class PatentCheck extends Component{
                         }}
                     >
                         核对日志
-                    </Button>
+                    </Button> : null}
                 </div> : null}
                 {this.state.visible ? <Modal
                     title="核对日志"
@@ -196,7 +196,7 @@ class PatentCheck extends Component{
                         />
                     </Spin>
                 </Modal> : null}
-                <Button
+                {!this.props.isAuditPayment && !this.props.isAuditPaymentGLY ? <Button
                     type="primary"
                     style={{
                         marginLeft: '10px',
@@ -210,7 +210,7 @@ class PatentCheck extends Component{
                         }
                     }}>
                     付官费
-                </Button>
+                </Button> : null}
             </div> : null
         )
     }

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

@@ -44,7 +44,7 @@ class ProjectDetailsReadOnly extends Component{
                     onOk={this.props.onCancel}
                     onCancel={this.props.onCancel}
                     width="800px"
-                    title="项目任务详情(已修改)"
+                    title="项目任务详情"
                     footer=""
                     className="admin-desc-content"
                 >

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

@@ -330,7 +330,7 @@ class ProjectOperation extends Component{
                 onOk={this.props.onCancel}
                 onCancel={this.props.onCancel}
                 width="800px"
-                title={readOnly ? "项目任务详情(已修改)" : "添加项目任务(已修改)" }
+                title={readOnly ? "项目任务详情" : "添加项目任务" }
                 footer=""
                 className="admin-desc-content"
             >

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

@@ -998,6 +998,8 @@ class CheckProject extends Component {
                                     alignItems:'center',
                                   }}
                                   id={this.props.tid}
+                                  isAuditPayment={this.props.isAuditPayment}
+                                  isAuditPaymentGLY={this.props.isAuditPaymentGLY}
                                   patentTypeName={this.props.patentTypeName}
                                   checkStatus={this.props.checkStatus}  //核对状态
                                   projectType={this.props.projectType}  //项目类型

+ 1 - 2
js/component/manageCenter/components/checkProject/index.less

@@ -62,7 +62,6 @@
 }
 .payRecordComponent{
   .payStateList{
-    border-top: 1px #000 dashed;
     .listTitle{
       font-weight: bolder;
     }
@@ -82,4 +81,4 @@
 
 #components-form-demo-normal-login .login-form-forgot {
   float: left;
-}
+}

+ 127 - 123
js/component/manageCenter/components/checkProject/payRecord.js

@@ -150,7 +150,7 @@ class PayRecord extends Component{
                 console.log(err)
                 return;
             }
-            if(isNaN(parseFloat(values.quantity)) || values.quantity<=0){
+            if(values.quantity !== undefined && (isNaN(parseFloat(values.quantity)) || values.quantity<=0)){
                 message.warning('申请支付数量不能小于等于零');
                 return;
             }
@@ -386,6 +386,7 @@ class PayRecord extends Component{
         const { paymentLogs,paymentDetails,financialPaymentList } = this.state;
         return(
             <Modal
+                title={paymentDetails.status !== 4 ? (paymentDetails.chooseType === 2 ? '申请支付官费' : '申请支付外包费用') : '支付详情'}
                 className='payRecordComponent'
                 width={700}
                 maskClosable={false}
@@ -398,7 +399,6 @@ class PayRecord extends Component{
                 <Spin spinning={this.state.loading}>
                     <div>
                         {/*0第三方 1催款 2官费*/}
-                        <div>{paymentDetails.chooseType === 2 ? '申请支付官费' : '申请支付外包费用'}</div>
                         <Form
                             {...layout}
                             name="basic"
@@ -409,130 +409,133 @@ class PayRecord extends Component{
                                 this.handleSubmit(e)
                             }}
                         >
-                            <Form.Item
-                                {...formItemLayout}
-                                className='formItemStyle'
-                                label="付款单位/个人:"
-                            >
-                                <div>{paymentDetails.companyName}</div>
-                            </Form.Item>
-                            {/*0第三方 1催款 2官费*/}
-                            {paymentDetails.chooseType !== 2 ? <Form.Item
-                                {...formItemLayout}
-                                className='formItemStyle'
-                                label={'单价(万元):'}
-                            >
+                            {paymentDetails.status !== 4 ?
                                 <div>
+                                    <Form.Item
+                                        {...formItemLayout}
+                                        className='formItemStyle'
+                                        label="付款单位/个人:"
+                                    >
+                                        <div>{paymentDetails.companyName}</div>
+                                    </Form.Item>
+                                    {/*0第三方 1催款 2官费*/}
+                                    {paymentDetails.chooseType !== 2 ? <Form.Item
+                                        {...formItemLayout}
+                                        className='formItemStyle'
+                                        label={'单价(万元):'}
+                                    >
+                                        <div>
+                                            {/* projectType 0正常 1专利 2软著 3审计*/}
+                                            {/* isAuditPayment 是否为财务*/}
+                                            {/* isAuditPaymentGLY 是否为财务经理或者为财务管理员*/}
+                                            {/* chooseType 0第三方 1催款 2官费*/}
+                                            {/*{*/}
+                                            {/*    (paymentDetails.chooseType === 2 || this.props.projectType === 2 || (this.props.projectType === 3 && this.props.patentType === 0) ) && !this.props.isAuditPayment?*/}
+                                            {/*    '***':*/}
+                                            {/*    paymentDetails.initialUnitPrice*/}
+                                            {/*}*/}
+                                            {isNaN(parseFloat(paymentDetails.initialUnitPrice)) ? paymentDetails.initialUnitPrice : parseFloat(paymentDetails.initialUnitPrice)}
+                                        </div>
+                                    </Form.Item> : null}
+                                    <Form.Item
+                                        {...formItemLayout}
+                                        className='formItemStyle'
+                                        label="数量:"
+                                    >
+                                        {getFieldDecorator('initialQuantity', {
+                                            initialValue: parseInt(paymentDetails.initialQuantity),
+                                            rules: [{ required: false, message: '请输入數量!' }],
+                                        })(
+                                            <Input disabled={true} style={{ width: '200px' }} placeholder="请输入數量" type={'number'}/>
+                                        )}
+                                    </Form.Item>
+                                    <Form.Item
+                                        {...formItemLayout}
+                                        className='formItemStyle'
+                                        label="总价(万元):"
+                                    >
+                                        <div>{isNaN(parseFloat(paymentDetails.initialTotalAmount)) ? paymentDetails.initialTotalAmount : parseFloat(paymentDetails.initialTotalAmount)}</div>
+                                    </Form.Item>
+                                    {/*官费不显示已付*/}
+                                    {paymentDetails.chooseType !== 2 ? <Form.Item
+                                        {...formItemLayout}
+                                        className='formItemStyle'
+                                        label="已付(万元):"
+                                    >
+                                        <div>{isNaN(parseFloat(paymentDetails.initialPaymentAmount)) ? paymentDetails.initialPaymentAmount : parseFloat(paymentDetails.initialPaymentAmount)}</div>
+                                    </Form.Item> : <div/>}
+                                    {/*0第三方 1催款 2官费*/}
                                     {/* projectType 0正常 1专利 2软著 3审计*/}
-                                    {/* isAuditPayment 是否为财务*/}
-                                    {/* isAuditPaymentGLY 是否为财务经理或者为财务管理员*/}
-                                    {/* chooseType 0第三方 1催款 2官费*/}
-                                    {/*{*/}
-                                    {/*    (paymentDetails.chooseType === 2 || this.props.projectType === 2 || (this.props.projectType === 3 && this.props.patentType === 0) ) && !this.props.isAuditPayment?*/}
-                                    {/*    '***':*/}
-                                    {/*    paymentDetails.initialUnitPrice*/}
-                                    {/*}*/}
-                                    {isNaN(parseFloat(paymentDetails.initialUnitPrice)) ? paymentDetails.initialUnitPrice : parseFloat(paymentDetails.initialUnitPrice)}
-                                </div>
-                            </Form.Item> : null}
-                            <Form.Item
-                                {...formItemLayout}
-                                className='formItemStyle'
-                                label="数量:"
-                            >
-                                {getFieldDecorator('initialQuantity', {
-                                    initialValue: parseInt(paymentDetails.initialQuantity),
-                                    rules: [{ required: false, message: '请输入數量!' }],
-                                })(
-                                    <Input disabled={true} style={{ width: '200px' }} placeholder="请输入數量" type={'number'}/>
-                                )}
-                            </Form.Item>
-                            <Form.Item
-                                {...formItemLayout}
-                                className='formItemStyle'
-                                label="总价(万元):"
-                            >
-                                <div>{isNaN(parseFloat(paymentDetails.initialTotalAmount)) ? paymentDetails.initialTotalAmount : parseFloat(paymentDetails.initialTotalAmount)}</div>
-                            </Form.Item>
-                            {/*官费不显示已付*/}
-                            {paymentDetails.chooseType !== 2 ? <Form.Item
-                                {...formItemLayout}
-                                className='formItemStyle'
-                                label="已付(万元):"
-                            >
-                                <div>{isNaN(parseFloat(paymentDetails.initialPaymentAmount)) ? paymentDetails.initialPaymentAmount : parseFloat(paymentDetails.initialPaymentAmount)}</div>
-                            </Form.Item> : <div/>}
-                            {/*0第三方 1催款 2官费*/}
-                            {/* projectType 0正常 1专利 2软著 3审计*/}
-                            {
-                                paymentDetails.chooseType === 2 || this.props.projectType === 1 || this.props.projectType === 2 ?
-                                    <div style={{
-                                        marginBottom:'8px',
-                                        marginTop:'8px'
-                                    }}>
-                                        <Form.Item
-                                            {...formItemLayout}
-                                            className='formItemStyle'
-                                            label="本次申请支付数量:"
-                                        >
-                                            {getFieldDecorator('quantity', {
-                                                initialValue: paymentDetails.quantity,
-                                                rules: [{ required: true, message: '请输入本次申请支付数量!' }],
-                                            })(
-                                                <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)}
-                                                    placeholder="请输入本次申请支付数量"
-                                                    onChange={(e)=>{
-                                                        if(!isNaN(parseFloat(paymentDetails.initialUnitPrice))){
-                                                            this.props.form.setFieldsValue({
-                                                                applicationAmount: ((parseFloat(paymentDetails.initialUnitPrice) * 1000000) * e.target.value) / 1000000,
-                                                            })
-                                                        }
-                                                    }}
-                                                />
-                                            )}
-                                        </Form.Item>
-                                    </div> : <div/>
-                            }
-                            <Form.Item
-                                {...formItemLayout}
-                                className='formItemStyle'
-                                label="本次申请支付金额(万元):"
-                            >
-                                {getFieldDecorator('applicationAmount', {
-                                    initialValue: parseFloat(paymentDetails.applicationAmount),
-                                    rules: [
+                                    {
+                                        paymentDetails.chooseType === 2 || this.props.projectType === 1 || this.props.projectType === 2 ?
+                                            <div style={{
+                                                marginBottom:'8px',
+                                                marginTop:'8px'
+                                            }}>
+                                                <Form.Item
+                                                    {...formItemLayout}
+                                                    className='formItemStyle'
+                                                    label="本次申请支付数量:"
+                                                >
+                                                    {getFieldDecorator('quantity', {
+                                                        initialValue: paymentDetails.quantity,
+                                                        rules: [{ required: true, message: '请输入本次申请支付数量!' }],
+                                                    })(
+                                                        <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)}
+                                                            placeholder="请输入本次申请支付数量"
+                                                            onChange={(e)=>{
+                                                                if(!isNaN(parseFloat(paymentDetails.initialUnitPrice))){
+                                                                    this.props.form.setFieldsValue({
+                                                                        applicationAmount: ((parseFloat(paymentDetails.initialUnitPrice) * 1000000) * e.target.value) / 1000000,
+                                                                    })
+                                                                }
+                                                            }}
+                                                        />
+                                                    )}
+                                                </Form.Item>
+                                            </div> : <div/>
+                                    }
+                                    <Form.Item
+                                        {...formItemLayout}
+                                        className='formItemStyle'
+                                        label="本次申请支付金额(万元):"
+                                    >
+                                        {getFieldDecorator('applicationAmount', {
+                                            initialValue: parseFloat(paymentDetails.applicationAmount),
+                                            rules: [
+                                                {
+                                                    required: !(this.props.isAuditPayment ? this.state.paymentDetails.status !== 0 : this.state.paymentDetails.status !== 2),
+                                                    message: '请输入本次申请支付金额!'
+                                                }
+                                            ],
+                                        })(
+                                            <Input
+                                                type={'number'}
+                                                style={{ width: '200px' }}
+                                                disabled={this.props.isAuditPaymentGLY ? this.props.isAuditPaymentGLY : paymentDetails.chooseType === 2 || (this.props.isAuditPayment ? this.state.paymentDetails.status !== 0 : this.state.paymentDetails.status !== 2)}
+                                                placeholder="请输入本次申请支付金额"/>
+                                        )}
+                                    </Form.Item>
+                                    <Form.Item
+                                        {...formItemLayout}
+                                        className='formItemStyle'
+                                        label="备注:"
+                                    >
                                         {
-                                            required: !(this.props.isAuditPayment ? this.state.paymentDetails.status !== 0 : this.state.paymentDetails.status !== 2),
-                                            message: '请输入本次申请支付金额!'
+                                            (!this.props.isAuditPaymentGLY && !this.props.isAuditPayment && this.state.paymentDetails.status === 2) ?
+                                                getFieldDecorator('remarks', {
+                                                    initialValue: paymentDetails.remarks,
+                                                    rules: [{ required: true, message: '请输入备注!' }],
+                                                })(
+                                                    <Input style={{ width: '200px' }} placeholder="请输入备注" type={'textarea'}/>
+                                                ) : <div>{paymentDetails.remarks}</div>
                                         }
-                                    ],
-                                })(
-                                    <Input
-                                        type={'number'}
-                                        style={{ width: '200px' }}
-                                        disabled={this.props.isAuditPaymentGLY ? this.props.isAuditPaymentGLY : paymentDetails.chooseType === 2 || (this.props.isAuditPayment ? this.state.paymentDetails.status !== 0 : this.state.paymentDetails.status !== 2)}
-                                        placeholder="请输入本次申请支付金额"/>
-                                )}
-                            </Form.Item>
-                            <Form.Item
-                                {...formItemLayout}
-                                className='formItemStyle'
-                                label="备注:"
-                            >
-                                {
-                                    (!this.props.isAuditPaymentGLY && !this.props.isAuditPayment && this.state.paymentDetails.status === 2) ?
-                                        getFieldDecorator('remarks', {
-                                            initialValue: paymentDetails.remarks,
-                                            rules: [{ required: true, message: '请输入备注!' }],
-                                        })(
-                                            <Input style={{ width: '200px' }} placeholder="请输入备注" type={'textarea'}/>
-                                        ) : <div>{paymentDetails.remarks}</div>
-                                }
-                            </Form.Item>
-                            <div className='payStateList'>
+                                    </Form.Item>
+                                </div> : null}
+                            <div className='payStateList' style={{borderTop:paymentDetails.status !== 4? '1px #000 dashed' : '0'}}>
                                 <div className='listTitle' style={{color:'#F00'}}>
                                     支付状态:
                                     <span style={{paddingLeft:'20px'}}>
@@ -561,7 +564,8 @@ class PayRecord extends Component{
                                                         value.status === 0 ? '(发起)' :
                                                             value.status === 1 ? '(通过)':
                                                                 value.status === 2 ? '(驳回)' :
-                                                                    value.status === 3 ? '(完成)' : ''
+                                                                    value.status === 3 ? '(完成)' :
+                                                                        value.status === 4 ? '(取消)' :''
                                                     }
                                                     {value.remarks}
                                                 </span>

+ 10 - 10
js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx

@@ -285,15 +285,6 @@ const approvedOutsourcing = React.createClass({
           className: "title-table",
         },
         {
-          title: "外包成本",
-          dataIndex: "outsourceAmount",
-          key: "outsourceAmount",
-          className: "title-table",
-          render: (text) => {
-            return isNaN(parseFloat(text)) ? text : parseFloat(text);
-          }
-        },
-        {
           title: "签单日期",
           dataIndex: "signTime",
           key: "signTime",
@@ -360,6 +351,15 @@ const approvedOutsourcing = React.createClass({
           }
         },
         {
+          title: "外包成本",
+          dataIndex: "outsourceAmount",
+          key: "outsourceAmount",
+          className: "title-table",
+          render: (text) => {
+            return isNaN(parseFloat(text)) ? text : parseFloat(text);
+          }
+        },
+        {
           title: "最近收款时间",
           dataIndex: "finalReceivablesTime",
           key: "finalReceivablesTime",
@@ -1227,7 +1227,7 @@ const approvedOutsourcing = React.createClass({
         },
       ],
       dataSource: [],
-      searchTime: [,],
+      searchTime: [],
       printColumns: [
         {
           title: "合同编号",

+ 6 - 4
js/component/manageCenter/order/orderNew/costAuditList/component/orderPaymentModal.js

@@ -24,10 +24,11 @@ class OrderPaymentModal extends Component{
                     render: (text, record) => {
                         return (
                             <div>
-                                {record.chooseType === 2 ? text : text+'-'+record.tpcId}
                                 {
-                                    text !== record.tpcName && record.chooseType!==2 ?
-                                        '('+record.tpcName+')' : ''
+                                    record.status === 4 ? text : (
+                                        record.chooseType === 2 ? text : (text + '-' + record.tpcId) +
+                                            (text !== record.tpcName && record.tpcName ? '(' + record.tpcName + ')' : '')
+                                    )
                                 }
                             </div>
                         )
@@ -101,7 +102,8 @@ class OrderPaymentModal extends Component{
                                         text === 0 ? '审核中' :
                                             text === 1 ? '审核通过' :
                                                 text === 2 ? '已驳回' :
-                                                    text === 3 ? '支付完成' : '已取消'
+                                                    text === 3 ? '支付完成' :
+                                                        text === 4 ? '已取消' : ''
                                     }
                                 </div>
                                 <Button type="primary" size='small' style={{marginLeft:'10px'}} onClick={()=>{

+ 6 - 4
js/component/manageCenter/order/orderNew/glCostAuditList/component/orderPaymentModal.js

@@ -24,10 +24,11 @@ class OrderPaymentModal extends Component{
                     render: (text, record) => {
                         return (
                             <div>
-                                {text+'-'+record.tpcId}
                                 {
-                                    text !== record.tpcName ?
-                                        '('+record.tpcName+')' : ''
+                                    record.status === 4 ? text : (
+                                        record.chooseType === 2 ? text : (text + '-' + record.tpcId) +
+                                            (text !== record.tpcName && record.tpcName ? '(' + record.tpcName + ')' : '')
+                                    )
                                 }
                             </div>
                         )
@@ -101,7 +102,8 @@ class OrderPaymentModal extends Component{
                                         text === 0 ? '审核中' :
                                             text === 1 ? '审核通过' :
                                                 text === 2 ? '已驳回' :
-                                                    text === 3 ? '支付完成' : '已取消'
+                                                    text === 3 ? '支付完成' :
+                                                        text === 4 ? '已取消' : ''
                                     }
                                 </div>
                                 <Button type="primary" size='small' style={{marginLeft:'10px'}} onClick={()=>{

+ 5 - 1
js/component/manageCenter/project/task/businessManagement/checkInfor.jsx

@@ -35,6 +35,10 @@ class checkInfor extends Component{
         this.setState({
             loading: true,
         });
+        if((this.state.patentType === 0 || this.state.patentType === 2) && isNaN(parseInt(this.state.costReduction)) && this.state.officialCost === 1){
+            message.warning('请选择是否有费减')
+            return;
+        }
         $.ajax({
             method: "POST",
             dataType: "json",
@@ -43,7 +47,7 @@ class checkInfor extends Component{
             data: {
                 id: this.props.infor.id, //项目ID
                 officialCost: this.state.officialCost, //是否有官费
-                costReduction: this.state.patentType === 0 || this.state.patentType === 2 ?this.state.costReduction : '', //是否有费减
+                costReduction: (this.state.patentType === 0 || this.state.patentType === 2) && this.state.officialCost === 1 ?this.state.costReduction : 0, //是否有费减
                 patentType: this.state.patentType, //专利类型
             },
         }).done(

+ 10 - 23
js/component/manageCenter/project/task/myTask.jsx

@@ -3423,7 +3423,8 @@ const Task = React.createClass({
                         _this.paymentRecordRef.refresh();
                     }else{
                         if(data.data.code === 0){
-                            _this.detectDeletion(1,fn)
+                            message.success('切换成功!');
+                            fn();
                         }else{
                             confirm({
                                 title: '确定要删除此供应商信息吗?',
@@ -4416,6 +4417,7 @@ const Task = React.createClass({
                                                                 <Radio.Group
                                                                     value={this.state.setUpStatus}
                                                                     onChange={(e) => {
+
                                                                         this.setState({setUpStatus: e.target.value})
                                                                     }}
                                                                 >
@@ -4618,10 +4620,7 @@ const Task = React.createClass({
                                                     labelCol={{span: 3}}
                                                     wrapperCol={{span: 14}}
                                                     label={
-                                                        <span>
-                            <strong style={{color: '#f00'}}>*</strong>
-                            类型
-                          </span>
+                                                        <span><strong style={{color: '#f00'}}>*</strong>类型</span>
                                                     }
                                                 >
                                                     <Radio.Group
@@ -4652,10 +4651,7 @@ const Task = React.createClass({
                                                     labelCol={{span: 4}}
                                                     wrapperCol={{span: 14}}
                                                     label={
-                                                        <span>
-                            <strong style={{color: '#f00'}}>*</strong>
-                            专利类型
-                          </span>
+                                                        <span><strong style={{color: '#f00'}}>*</strong>专利类型</span>
                                                     }
                                                 >
                                                     <Radio.Group
@@ -4683,12 +4679,9 @@ const Task = React.createClass({
                                                 <FormItem
                                                     className="half-item"
                                                     labelCol={{span: 4}}
-                                                    wrapperCol={{span: 14}}
+                                                    wrapperCol={{span: 18}}
                                                     label={
-                                                        <span>
-                            <strong style={{color: '#f00'}}>*</strong>
-                            专利名称
-                          </span>
+                                                        <span><strong style={{color: '#f00'}}>*</strong>专利名称</span>
                                                     }
                                                 >
                                                     <Radio.Group
@@ -5980,10 +5973,7 @@ const Task = React.createClass({
                                                     labelCol={{span: 4}}
                                                     wrapperCol={{span: 14}}
                                                     label={
-                                                        <span>
-                          <strong style={{color: '#f00'}}>*</strong>
-                          专利类型
-                        </span>
+                                                        <span><strong style={{color: '#f00'}}>*</strong>专利类型</span>
                                                     }
                                                 >
                                                     <Radio.Group
@@ -6011,12 +6001,9 @@ const Task = React.createClass({
                                                 <FormItem
                                                     className="half-item"
                                                     labelCol={{span: 3}}
-                                                    wrapperCol={{span: 14}}
+                                                    wrapperCol={{span: 18}}
                                                     label={
-                                                        <span>
-                          <strong style={{color: '#f00'}}>*</strong>
-                          专利名称
-                        </span>
+                                                        <span><strong style={{color: '#f00'}}>*</strong>专利名称</span>
                                                     }
                                                 >
                                                     <Radio.Group

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

@@ -2421,22 +2421,22 @@ const MyTaskOutsource = React.createClass({
                 }
               },
             },
-            {
-              title: "官费",
-              dataIndex: "officialCost",
-              key: "officialCost",
-              render: (text) => {
-                return text === 1 ? '有官费' : '无官费'
-              },
-            },
-            {
-              title: "费减",
-              dataIndex: "costReduction",
-              key: "costReduction",
-              render: (text) => {
-                return text === 1 ? '有费减' : '无费减'
-              },
-            },
+            // {
+            //   title: "官费",
+            //   dataIndex: "officialCost",
+            //   key: "officialCost",
+            //   render: (text) => {
+            //     return text === 1 ? '有官费' : '无官费'
+            //   },
+            // },
+            // {
+            //   title: "费减",
+            //   dataIndex: "costReduction",
+            //   key: "costReduction",
+            //   render: (text) => {
+            //     return text === 1 ? '有费减' : '无费减'
+            //   },
+            // },
             {
               title: '总价(万元)',
               dataIndex: 'totalAmount',

+ 6 - 4
js/component/manageCenter/project/task/payApplyReject/component/orderPaymentModal.js

@@ -24,10 +24,11 @@ class OrderPaymentModal extends Component{
                     render: (text, record) => {
                         return (
                             <div>
-                                {text+'-'+record.tpcId}
                                 {
-                                    text !== record.tpcName ?
-                                        '('+record.tpcName+')' : ''
+                                    record.status === 4 ? text : (
+                                        record.chooseType === 2 ? text : (text + '-' + record.tpcId) +
+                                            (text !== record.tpcName && record.tpcName ? '(' + record.tpcName + ')' : '')
+                                    )
                                 }
                             </div>
                         )
@@ -101,7 +102,8 @@ class OrderPaymentModal extends Component{
                                         text === 0 ? '审核中' :
                                             text === 1 ? '审核通过' :
                                                 text === 2 ? '已驳回' :
-                                                    text === 3 ? '支付完成' : '已取消'
+                                                    text === 3 ? '支付完成' :
+                                                        text === 4 ? '已取消' : ''
                                     }
                                 </div>
                                 <Button type="primary" size='small' style={{marginLeft:'10px'}} onClick={()=>{