mentoswzq пре 4 година
родитељ
комит
a5a5a078d2

+ 23 - 3
js/component/manageCenter/components/checkProject/applyPaymentModal.js

@@ -1,5 +1,5 @@
 import React,{Component} from 'react';
-import {Button, Form, Input, message, Modal, Spin} from "antd";
+import {Button, Form, Input, message, Modal, Radio, Spin} from "antd";
 import propType from 'prop-types';
 import $ from "jquery";
 
@@ -48,8 +48,8 @@ class ApplyPaymentModal extends Component{
                 loading: true
             })
             values.tid = this.props.tid;
-            if(this.props.nodeId){                      //催款
-                values.nodeId = this.props.nodeId;
+            if(this.props.previewPayInfor.nodeId){                      //催款
+                values.nodeId = this.props.previewPayInfor.nodeId;
                 values.chooseType = 1;                          //支付选择 0第三方 1催款
                 values.tcpid = this.props.previewPayInfor.cid;  //第三方机构id
             }else{
@@ -235,6 +235,26 @@ class ApplyPaymentModal extends Component{
                                     <Input style={{ width: '200px' }} placeholder="请输入备注" type={'textarea'}/>
                                 )}
                             </Form.Item>
+                            {/* 0正常 1专利 2软著 3审计 */}
+                            {
+                                this.props.projectType === 3 && this.props.patentType === 3 ?
+                                    <Form.Item
+                                        {...formItemLayout}
+                                        style={{
+                                            display:'flex'
+                                        }}
+                                        label="支付状态:"
+                                    >
+                                        {getFieldDecorator('paymentStatus', {
+                                            rules: [{ required: true, message: '请选择支付状态!' }],
+                                        })(
+                                            <Radio.Group>
+                                                <Radio value={0}>半款</Radio>
+                                                <Radio value={1}>全款</Radio>
+                                            </Radio.Group>
+                                        )}
+                                    </Form.Item> : <div/>
+                            }
                             <Form.Item>
                                 <Button type="primary" htmlType="submit">
                                     确定申请支付

+ 7 - 4
js/component/manageCenter/components/checkProject/index.jsx

@@ -453,7 +453,7 @@ class CheckProject extends Component {
                       }}>
                         申请付款
                       </Button>
-                      <Button
+                      {record.officialCost == 1? <Button
                           type="primary"
                           style={{
                             marginLeft: '10px',
@@ -467,7 +467,7 @@ class CheckProject extends Component {
                             })
                           }}>
                         付官费
-                      </Button>
+                      </Button> : <div/>}
                       {this.props.status === 2 ? <Popconfirm
                           title="是否删除?"
                           onConfirm={() => {
@@ -984,7 +984,7 @@ class CheckProject extends Component {
             }
           </div>
         </div> : <div/>}
-        <div className="outsourceLogConent">
+        {this.state.selectOrderPayments.length !== 0 ? <div className="outsourceLogConent">
           <div className="title">支付记录</div>
           <div className="outsourceLogItem" style={{
             fontWeight: 'bold',
@@ -1075,7 +1075,7 @@ class CheckProject extends Component {
               ))
             }
           </div>
-        </div>
+        </div> : <div/>}
         {/*
             申请付款
             tid:项目id
@@ -1087,6 +1087,8 @@ class CheckProject extends Component {
             tid={this.props.tid}
             type={this.state.type}
             nodeId={this.state.nodeId}
+            projectType={this.props.projectType}
+            patentType={this.props.patentType}
             previewPayInfor={this.state.previewPayInfor}
             visible={this.state.previewPayVisible}
             onRefresh={()=>{
@@ -1114,6 +1116,7 @@ class CheckProject extends Component {
                 }}
                 changeVisible={()=>{
                     this.getSelectOrderPayment();
+                    this.props.onRefresh && this.props.onRefresh();
                     this.setState({
                         payRecordVisible: false,
                     })

+ 11 - 2
js/component/manageCenter/components/checkProject/payRecord.js

@@ -17,6 +17,8 @@ const formItemLayout = {
     wrapperCol: { span: 14 },
 };
 
+const confirm = Modal.confirm;
+
 class PayRecord extends Component{
     constructor(props) {
         super(props);
@@ -275,7 +277,14 @@ class PayRecord extends Component{
                     重新发起申请
                 </Button>
                 <Button type="danger" style={{float:'right'}} onClick={(e)=>{
-                    this.handleSubmit(e,4);
+                    confirm({
+                        title: '删除提醒?',
+                        content: '您确定要删除它吗?',
+                        onOk() {
+                            this.handleSubmit(e,4);
+                        },
+                        onCancel() {},
+                    });
                 }}>
                     删除
                 </Button>
@@ -475,7 +484,7 @@ class PayRecord extends Component{
                                             paymentDetails.status === 0 ? '待'+paymentDetails.financeName+'审核' :
                                                 paymentDetails.status === 1 ? '待'+paymentDetails.financeName+'支付' :
                                                     paymentDetails.status === 2 ? '待重新提交' :
-                                                        paymentDetails.status === 3 ? '待'+paymentDetails.financeName+'审核' : '已取消'
+                                                        paymentDetails.status === 3 ? '已完成支付' : '已取消'
                                         }
                                     </span>
                                 </div>

+ 20 - 19
js/component/manageCenter/project/task/myTask.jsx

@@ -2175,23 +2175,23 @@ const Task = React.createClass({
     this.setState({
       loading: true,
     })
-    setTimeout(() => {
-      this.setState({
-        loading: true,
-      })
-      /* this.setState(
-        {
-          ContactsListsNew: this.state.ContactsListsNew.map((item) => {
-            if (item.title != '操作') {
-              this.state.ContactsListsNew.push(item)
-            } 
-          }),
-        },
-        () => {
-          console.log('this.state.contactListNew', this.state.contactListNew)
-        }
-      ) */
-    }, 3000)
+    // setTimeout(() => {
+    //   this.setState({
+    //     loading: true,
+    //   })
+    //   /* this.setState(
+    //     {
+    //       ContactsListsNew: this.state.ContactsListsNew.map((item) => {
+    //         if (item.title != '操作') {
+    //           this.state.ContactsListsNew.push(item)
+    //         }
+    //       }),
+    //     },
+    //     () => {
+    //       console.log('this.state.contactListNew', this.state.contactListNew)
+    //     }
+    //   ) */
+    // }, 3000)
 
     let data = {
       tid: this.state.id,
@@ -2653,6 +2653,7 @@ const Task = React.createClass({
             payNodeArr.push({
               key: i,
               id: thisData.id, //付款节点Id
+              nodeId:  thisData.id, //付款节点Id
               tid: thisData.tid,
               companyName: thisData.companyName, //供应商名称
               projectType: thisData.projectType, //项目分类
@@ -4458,9 +4459,9 @@ const Task = React.createClass({
                     }
                   </div>
               )}
-              {this.state.refundStatus == 1 ||
+              {(this.state.refundStatus == 1 ||
               this.state.refundStatus == 0 ||
-              this.state.refundStatus == 2 ? (
+              this.state.refundStatus == 2) && this.state.startType !== 1 ? (
                 <div className="clearfix">
                   <hr className="division" />
                   <div

+ 6 - 5
js/component/manageCenter/project/task/myTaskOutsource.jsx

@@ -305,11 +305,11 @@ const MyTaskOutsource = React.createClass({
           key: "userName",
           className: "userName",
         },
-        {
-          title: "外包公司",
-          dataIndex: "outsourceName",
-          key: "outsourceName",
-        },
+        // {
+        //   title: "外包公司",
+        //   dataIndex: "outsourceName",
+        //   key: "outsourceName",
+        // },
         {
           title: "分配状态",
           dataIndex: "taskStatus",
@@ -1922,6 +1922,7 @@ const MyTaskOutsource = React.createClass({
               key: i,
               id: thisData.id, //付款节点Id
               tid: thisData.tid,
+              nodeId:  thisData.id, //付款节点Id
               companyName: thisData.companyName, //供应商名称
               projectType: thisData.projectType, //项目分类
               dunType: thisData.dunType, //催款分类