Browse Source

财务 成本审核列表添加 批量审核 查看支付记录

mentoswzq 4 years ago
parent
commit
684749678e

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

@@ -934,7 +934,7 @@ class CheckProject extends Component {
               {this.props.outsourceRemarks}
             </div>
           </div>
-          <div style={{paddingTop:'20px'}}>
+          {this.props.fileList && this.props.fileList.length > 0 ? <div style={{paddingTop:'20px'}}>
             <div className="title">合同/协议扫描件</div>
             <div style={{paddingBottom:'10px'}}>
                 <ImgList fileList={this.props.fileList} ItemWidth={'96px'}/>
@@ -964,7 +964,7 @@ class CheckProject extends Component {
                   src={this.state.previewImage || ''}
               />
             </Modal>
-          </div>
+          </div> : <div/>}
         </div>
         {parseInt(this.props.startType) !== 1 ? <div className="outsourceLogConent">
           <div className="title" style={{

+ 6 - 5
js/component/manageCenter/components/checkProject/payRecord.js

@@ -414,11 +414,12 @@ class PayRecord extends Component{
                                     {/* projectType 0正常 1专利 2软著 3审计*/}
                                     {/* isAuditPayment 是否为财务*/}
                                     {/* chooseType 0第三方 1催款 2官费*/}
-                                    {
-                                        (paymentDetails.chooseType === 2 || this.props.projectType === 2 || (this.props.projectType === 3 && this.props.patentType === 0) ) && !this.props.isAuditPayment?
-                                        '***':
-                                        paymentDetails.initialUnitPrice
-                                    }
+                                    {/*{*/}
+                                    {/*    (paymentDetails.chooseType === 2 || this.props.projectType === 2 || (this.props.projectType === 3 && this.props.patentType === 0) ) && !this.props.isAuditPayment?*/}
+                                    {/*    '***':*/}
+                                    {/*    paymentDetails.initialUnitPrice*/}
+                                    {/*}*/}
+                                    {paymentDetails.initialUnitPrice}
                                 </div>
                             </Form.Item>
                             <Form.Item

+ 170 - 0
js/component/manageCenter/order/orderNew/costAuditList/component/orderPaymentModal.js

@@ -0,0 +1,170 @@
+import React,{Component} from 'react';
+import {Button, message, Modal, Spin, Table} from "antd";
+import $ from "jquery";
+import PayRecord from "../../../../components/checkProject/payRecord";
+
+class OrderPaymentModal extends Component{
+    constructor(props) {
+        super(props);
+        this.state={
+            loading: false,
+            selectOrderPayments: [],
+            payRecordVisible: false,
+            orderPaymentsId: 0,
+            ContactsListsNew: [
+                {
+                    title: '编号',
+                    dataIndex: 'id',
+                    key: 'id',
+                },
+                {
+                    title: '支付类型',
+                    dataIndex: 'chooseType',
+                    key: 'chooseType',
+                    render: (text, record) => {
+                        return (
+                            <div>
+                                {text === 0 ? '第三方' : text === 1 ? '催款' : '官费'}
+                            </div>
+                        )
+                    },
+                },
+                {
+                    title: '申请支付金额(万元)',
+                    dataIndex: 'applicationAmount',
+                    key: 'applicationAmount',
+                },
+                {
+                    title: '申请时间',
+                    dataIndex: 'createTimes',
+                    key: 'createTimes',
+                },
+                {
+                    title: '状态',
+                    dataIndex: 'status',
+                    key: 'status',
+                    render: (text, record) => {
+                        return (
+                            <div className="gutter-box" style={{
+                                width: '100%',
+                                display: 'flex',
+                            }}>
+                                <div className="operation">
+                                    {
+                                        text === 0 ? '审核中' :
+                                            text === 1 ? '审核通过' :
+                                                text === 2 ? '已驳回' :
+                                                    text === 3 ? '支付完成' : '已取消'
+                                    }
+                                </div>
+                                <Button type="primary" size='small' style={{marginLeft:'10px'}} onClick={()=>{
+                                    this.setState({
+                                        payRecordVisible: true,
+                                        orderPaymentsId: record.id,
+                                    })
+                                }}>
+                                    {this.operationJudgmentName(text)}
+                                </Button>
+                            </div>
+                        )
+                    },
+                },
+            ]
+        }
+        this.getSelectOrderPayment = this.getSelectOrderPayment.bind(this);
+    }
+
+    componentDidMount() {
+        if(this.props.tid){
+            this.getSelectOrderPayment();
+        }
+    }
+
+    //0审核 1待支付 2驳回 3已支付 4取消
+    operationJudgmentName(id) {
+        if(this.props.isAuditPayment){          //财务
+            return id === 0 ? '待审核' :
+                id === 1 ? '待支付' :
+                    id === 2 ? '查看详情' : '查看详情'
+        }else{
+            return id === 0 ? '待审核' :
+                id === 1 ? '待支付' :
+                    id === 2 ? '查看详情' : '查看详情'
+        }
+    }
+
+    //支付列表
+    getSelectOrderPayment() {
+        $.ajax({
+            method: 'get',
+            dataType: 'json',
+            crossDomain: false,
+            url: globalConfig.context + '/api/admin/company/selectOrderPayment',
+            data: {
+                id: this.props.tid,
+            },
+            success: function (data) {
+                if (data.error.length) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    }
+                } else {
+                    this.setState({
+                        selectOrderPayments: data.data
+                    })
+                }
+            }.bind(this),
+        }).always(
+            function () {
+
+            }.bind(this)
+        )
+    }
+
+    render() {
+        return(
+            <Modal
+                className="customeDetails"
+                footer={false}
+                title="支付记录"
+                width="900px"
+                visible={this.props.visible}
+                onOk={()=>{
+                    this.props.onSuccess && this.props.onSuccess();
+                }}
+                onCancel={()=>{
+                    this.props.onCancer && this.props.onCancer();
+                }}
+            >
+                <Spin spinning={this.state.loading}>
+                    <Table
+                        pagination={false}
+                        columns={this.state.ContactsListsNew}
+                        dataSource={this.state.selectOrderPayments}
+                        onRowClick={this.tableRowClickOne}
+                        scroll={{ x: 'max-content', y: 0 }}
+                        bordered
+                        size="small"
+                    />
+                </Spin>
+                {this.state.payRecordVisible ? <PayRecord
+                    {...this.props}
+                    payId={this.state.orderPaymentsId}
+                    visible={this.state.payRecordVisible}
+                    tid={this.props.tid}
+                    isAuditPayment={this.props.isAuditPayment}
+                    projectType={this.props.projectType}
+                    changeVisible={()=>{
+                        this.getSelectOrderPayment();
+                        this.setState({
+                            payRecordVisible: false,
+                            orderPaymentsId: 0,
+                        })
+                    }}
+                /> : <div/>}
+            </Modal>
+        )
+    }
+}
+
+export default OrderPaymentModal;

+ 7 - 41
js/component/manageCenter/order/orderNew/costAuditList/detailsModal/index.js

@@ -12,12 +12,11 @@ class DetailsModal extends Component{
         super(props);
         this.state={
             loading: false,
-            activeKey:'1',
+            activeKey:'2',
             paySubject: [],
             orderDtails: {},
         }
         this.visitCancel = this.visitCancel.bind(this);
-        this.getOrderOutsourceDtails = this.getOrderOutsourceDtails.bind(this);
     }
 
     componentDidMount() {
@@ -58,6 +57,7 @@ class DetailsModal extends Component{
                 })
                 if (!data.error.length && data.data) {
                     this.setState({
+                        orderDtails: data.data,
                         startType: data.data.startType, //类型
                         outsourceRemarks: data.data.outsourceRemarks,
                         refundStatus: data.data.refundStatus,
@@ -205,38 +205,6 @@ class DetailsModal extends Component{
         )
     }
 
-    // 外包详情
-    getOrderOutsourceDtails(data) {
-        this.setState({
-            loading: true,
-        });
-        $.ajax({
-            method: "get",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context + "/api/admin/outsourceOrg/orderOutsourceDtails",
-            data: {
-                tid: data.tid,
-                orderNo: data.orderNo,
-            },
-            success: function (data) {
-                if (data.error && data.error.length) {
-                    message.warning(data.error[0].message);
-                } else{
-                    this.setState({
-                        orderDtails: data.data
-                    });
-                }
-            }.bind(this),
-        }).always(
-            function () {
-                this.setState({
-                    loading: false,
-                });
-            }.bind(this)
-        );
-    }
-
     render() {
         return(
             <Modal
@@ -249,6 +217,7 @@ class DetailsModal extends Component{
                 onCancel={this.visitCancel}
             >
                 <Tabs
+                    defaultActiveKey='2'
                     activeKey={this.state.activeKey}
                     onChange={(e) => {
                         this.setState({
@@ -258,10 +227,6 @@ class DetailsModal extends Component{
                             this.waiDetail();
                             this.thirdTable(this.props.tid);
                             this.payNodeTable(this.props.tid);
-                            this.getOrderOutsourceDtails({
-                                tid: this.props.tid,
-                                orderNo: this.props.orderNo,
-                            })
                         }
                     }}
                 >
@@ -269,7 +234,7 @@ class DetailsModal extends Component{
                         <ProjectOverview projectStatus={this.props.projectStatus} tid={this.props.tid}/>
                     </TabPane>
                     <TabPane tab="外包/供应商信息" key="2">
-                        <CheckProject
+                        {this.state.activeKey === '2' ? <CheckProject
                             {...this.props}
                             tid={this.props.tid}
                             isAuditPayment={true}
@@ -287,9 +252,10 @@ class DetailsModal extends Component{
                             onRefresh={()=>{
                                 this.waiDetail();
                                 this.thirdTable(this.props.tid);
-                                this.payNodeTable(this.props.tid)
+                                this.payNodeTable(this.props.tid);
+                                this.props.refreshList && this.props.refreshList();
                             }}
-                        />
+                        /> : <div/>}
                     </TabPane>
                 </Tabs>
             </Modal>

+ 21 - 21
js/component/manageCenter/order/orderNew/costAuditList/detailsModal/projectOverview.js

@@ -657,27 +657,27 @@ class projectOverview extends Component{
                                 <span>{this.state.certificateNumber}</span>
                             </FormItem>
                         </div>
-                        {this.state.outsource === 1 ? (
-                            <div className="clearfix">
-                                <h3 className="sub-title">外包信息</h3>
-                                <FormItem
-                                    className="half-item"
-                                    {...formItemLayout}
-                                    label="外包公司"
-                                >
-                                    <span>{this.state.outsourceName}</span>
-                                </FormItem>
-                                <FormItem
-                                    className="half-item"
-                                    {...formItemLayout}
-                                    label="外包成本(万元)"
-                                >
-                                    <span>{this.state.outsourcePrice}</span>
-                                </FormItem>
-                            </div>
-                        ) : (
-                            ''
-                        )}
+                        {/*{this.state.outsource === 1 ? (*/}
+                        {/*    <div className="clearfix">*/}
+                        {/*        <h3 className="sub-title">外包信息</h3>*/}
+                        {/*        <FormItem*/}
+                        {/*            className="half-item"*/}
+                        {/*            {...formItemLayout}*/}
+                        {/*            label="外包公司"*/}
+                        {/*        >*/}
+                        {/*            <span>{this.state.outsourceName}</span>*/}
+                        {/*        </FormItem>*/}
+                        {/*        <FormItem*/}
+                        {/*            className="half-item"*/}
+                        {/*            {...formItemLayout}*/}
+                        {/*            label="外包成本(万元)"*/}
+                        {/*        >*/}
+                        {/*            <span>{this.state.outsourcePrice}</span>*/}
+                        {/*        </FormItem>*/}
+                        {/*    </div>*/}
+                        {/*) : (*/}
+                        {/*    ''*/}
+                        {/*)}*/}
                         {/*<hr style={{border:'1px dashed #aaa', width:"90%",margin:'auto'}}/>*/}
                         <div className="clearfix">
                             <h3 className="sub-title">联系信息</h3>

+ 194 - 5
js/component/manageCenter/order/orderNew/costAuditList/index.js

@@ -4,14 +4,18 @@ import {
     Spin,
     Table,
     message,
-    Tooltip,
+    Tooltip, Tabs, Button,Modal
 } from "antd";
 import {ShowModal,getProjectStatus} from "@/tools";
 import FilterColumn from './filterColumn';
 import DetailsModal from './detailsModal/index';
+import OrderPaymentModal from './component/orderPaymentModal';
 import './index.less';
 import "../customer.less";
 import CheckProject from "../../../components/checkProject";
+import PayRecord from "../../../components/checkProject/payRecord";
+
+const { TabPane } = Tabs;
 
 class CostAuditList extends Component{
     constructor(props) {
@@ -125,8 +129,52 @@ class CostAuditList extends Component{
                     dataIndex: "createTime",
                     key: "createTime",
                 },
+                {
+                    title: '操作',
+                    dataIndex: 'action',
+                    key: 'action',
+                    render: (text, record) => {
+                        return (
+                            <div style={{
+                                display:'flex',
+                                alignItems:'center',
+                            }}>
+                                <Button type="primary" size="small" onClick={(e) => {
+                                    e.stopPropagation();
+                                    this.setState({
+                                        payRecordVisible: true,
+                                        orderPaymentsId: record.id,
+                                        tid: record.tid,
+                                        projectType: record.projectType,
+                                    })
+                                }}>
+                                    待审核
+                                </Button>
+                                <Button
+                                    type="primary"
+                                    style={{
+                                        marginLeft: "10px",
+                                        background: "orangered",
+                                        border: "none"
+                                    }}
+                                    size="small"
+                                    onClick={(e) => {
+                                        e.stopPropagation();
+                                        this.setState({
+                                            paymentVisible: true,
+                                            tid: record.tid,
+                                            projectType: record.projectType,
+                                        })
+                                }}>
+                                    付款记录
+                                </Button>
+                            </div>
+                        )
+                    }
+                }
             ],
             dataSource: [],
+            selectedRowKeys: [],
             pagination: {
                 defaultCurrent: 1,
                 defaultPageSize: 10,
@@ -141,7 +189,13 @@ class CostAuditList extends Component{
             },
             selectInfor: {},
             visible: false,
+            paymentVisible: false,
+            tid: 0,
+            projectType: 0,
+            payRecordVisible: false,
+            orderPaymentsId: 0,
         }
+        this.printAll = this.printAll.bind(this);
     }
 
     componentDidMount() {
@@ -171,7 +225,7 @@ class CostAuditList extends Component{
                     for (let i = 0; i < data.data.list.length; i++) {
                         let thisdata = data.data.list[i];
                         let obj = thisdata;
-                        obj.key = i + 1;
+                        obj.key = thisdata.id;
                         theArr.push(obj);
                     }
                     this.state.pagination.total = data.data.totalCount;
@@ -201,15 +255,96 @@ class CostAuditList extends Component{
         })
     }
 
+    //批量审核
+    printAll() {
+        if(this.state.selectedRowKeys.length === 0){
+            message.warning('请先选择需要批量支付的条目');
+            return;
+        }
+        let _this = this;
+        Modal.confirm({
+            title: '确定要批量支付已标记的条目吗?',
+            content: '已标记的序号为'+_this.state.selectedRowKeys.join(','),
+            okText: '确定',
+            okType: 'primary',
+            cancelText: '取消',
+            onOk() {
+                _this.setState({
+                    loading: true,
+                });
+                $.ajax({
+                    method: "POST",
+                    dataType: "json",
+                    crossDomain: false,
+                    url: globalConfig.context + "/api/admin/company/groupPayment",
+                    data: {
+                        ids: _this.state.selectedRowKeys.join(','),
+                    },
+                }).done(
+                    function (data) {
+                        _this.setState({
+                            loading: false,
+                        });
+                        if (!data.error.length) {
+                            let failLength = data.data.fail.length;
+                            let okLength = data.data.OK.length;
+                            Modal.info({
+                                title: '操作提醒',
+                                content: (
+                                    <div>
+                                        <div style={{paddingBottom:'15px'}}>
+                                            {'操作成功'+okLength+'条,'+'操作失败'+failLength+'条'}
+                                        </div>
+                                        {
+                                            failLength !== 0 ?
+                                                <div>操作失败序号为:{data.data.fail.join(',')}</div>:
+                                                <div/>
+                                        }
+                                    </div>
+                                ),
+                                onOk() {},
+                            });
+                            _this.setState({
+                                selectedRowKeys: [],
+                            });
+                            _this.loadData();
+                        } else {
+                            message.warning(data.error[0].message);
+                        }
+                    }.bind(_this)
+                );
+            },
+            onCancel() {
+                // console.log('Cancel');
+            },
+        });
+    }
+
     render() {
         return (
           <div className="user-content">
               <div className="content-title">
                   <span>成本付款申请</span>
               </div>
-              <FilterColumn {...this.props} onSearch={(data)=>{
-                  this.loadData(1,data)
-              }}/>
+              <Tabs defaultActiveKey="1" onChange={this.callback} className="test">
+                  <TabPane tab="搜索" key="1">
+                      <div style={{paddingTop:'10px'}}>
+                          <FilterColumn {...this.props} onSearch={(data)=>{
+                              this.loadData(1,data)
+                          }}/>
+                      </div>
+                  </TabPane>
+                  <TabPane tab="操作" key="2">
+                      <Button
+                          type="primary"
+                          style={{ margin: "11px 0px 10px 10px" }}
+                          onClick={this.printAll}
+                          disabled={!this.state.dataSource.length}
+                      >
+                          批量支付
+                      </Button>
+                  </TabPane>
+              </Tabs>
               <div className="patent-table">
                   <Spin spinning={this.state.loading}>
                       <Table
@@ -219,6 +354,16 @@ class CostAuditList extends Component{
                           onRowClick={(record)=>{
                               this.tableRowClick(record)
                           }}
+                          rowSelection={{
+                              selectedRowKeys:this.state.selectedRowKeys,
+                              onChange: (selectedRowKeys)=>{
+                                  this.setState({ selectedRowKeys });
+                              },
+                              getCheckboxProps: (record) => ({
+                                  // 0审核 1待支付 2驳回 3已支付   只有待支付可以勾选
+                                  disabled: record.status !== 1,
+                              })
+                          }}
                           scroll={{ x: "max-content", y: 0 }}
                           bordered
                           size="small"
@@ -233,12 +378,56 @@ class CostAuditList extends Component{
                           projectType={this.state.selectInfor.projectType}
                           projectStatus={this.state.selectInfor.projectStatus}
                           visible={this.state.visible}
+                          refreshList={()=>{
+                              this.loadData();
+                          }}
                           visitCancel={()=>{
                               this.setState({
                                   visible: false
                               })
                           }}/> : <div/>
               }
+              {this.state.paymentVisible ?
+                  <OrderPaymentModal
+                      tid={this.state.tid}
+                      visible={this.state.paymentVisible}
+                      projectType={this.state.projectType}
+                      isAuditPayment={true}
+                      onCancer={()=>{
+                          this.setState({
+                              paymentVisible: false,
+                              tid: 0,
+                              projectType: 0,
+                          });
+                          this.loadData();
+                      }}
+                      onSuccess={()=>{
+                          this.setState({
+                              paymentVisible: false,
+                              tid: 0,
+                              projectType: 0,
+                          });
+                          this.loadData();
+                  }}/> :
+                  <div/>
+              }
+              {this.state.payRecordVisible ? <PayRecord
+                  {...this.props}
+                  payId={this.state.orderPaymentsId}
+                  visible={this.state.payRecordVisible}
+                  tid={this.state.tid}
+                  isAuditPayment={true}
+                  projectType={this.state.projectType}
+                  changeVisible={()=>{
+                      this.loadData();
+                      this.setState({
+                          payRecordVisible: false,
+                          orderPaymentsId: 0,
+                          tid: 0,
+                          projectType: 0,
+                      })
+                  }}
+              /> : <div/>}
           </div>
         );
     }

+ 66 - 60
js/component/manageCenter/project/task/myTask.jsx

@@ -2207,7 +2207,7 @@ const Task = React.createClass({
             }
           }
 
-          if (this.state.pictureUrl && Array.isArray(this.state.pictureUrl) && this.state.pictureUrl.length !== 0){
+          if (_this.state.pictureUrl && Array.isArray(_this.state.pictureUrl) && _this.state.pictureUrl.length !== 0){
             data.pictureUrl = _this.getUrl(_this.state.pictureUrl).length
                 ? _this.getUrl(_this.state.pictureUrl)
                 : ''
@@ -2235,7 +2235,8 @@ const Task = React.createClass({
                 }
               }.bind(_this)
           )
-        }).catch(() => console.log('Oops errors!'));
+
+        }).catch((err) => console.log(err));
       },
       onCancel() {},
     });
@@ -2720,14 +2721,6 @@ const Task = React.createClass({
     this.setState({
       currentTotalPrice: currentTotalPrice,
     })
-    console.log(
-      'thirdUnitPrice:',
-      this.state.thirdUnitPrice,
-      'thirdQuantity:',
-      this.state.thirdQuantity,
-      'currentTotalPrice:',
-      currentTotalPrice
-    )
   },
   // 付款节点自动计算总金额
   payNodeCalculatedAmount(num) {
@@ -2939,9 +2932,13 @@ const Task = React.createClass({
     })
     let id = '';
     if(index === -1){
-      this.state.thirdInfoList.map((value,index)=>{
-        id+=value.id+',';
-      })
+      if(this.state.thirdInfoList.length === 1){
+        id = this.state.thirdInfoList[0].id
+      }else{
+        this.state.thirdInfoList.map((value,index)=>{
+          id+=value.id+',';
+        })
+      }
     }else{
       id = index.id
     }
@@ -3015,6 +3012,9 @@ const Task = React.createClass({
       thirdMaterial: record.material, //有无材料
       thirdUrgent: record.urgent, //加急情况
       thirdRemarks: record.remarks,
+      audit: record.audit,//审计
+      assets: record.assets,//公司资产
+      income: record.income,//收入
     })
   },
   //点击付款节点详情
@@ -3556,41 +3556,41 @@ const Task = React.createClass({
                         loading={this.state.loading}
                       />
                     </div>
-                    <div className="clearfix">
-                      <h3 className="sub-title">外包信息</h3>
-                      <FormItem
-                        className="half-item"
-                        {...formItemLayout}
-                        label="外包公司"
-                      >
-                        <Input
-                          value={this.state.outsourceName}
-                          onChange={(e) => {
-                            this.setState({
-                              outsourceName: e.target.value,
-                            })
-                          }}
-                          placeholder="请输入外包公司"
-                          style={{ width: '200px' }}
-                        />
-                      </FormItem>
-                      <FormItem
-                        className="half-item"
-                        {...formItemLayout}
-                        label="外包成本(万元)"
-                      >
-                        <Input
-                          value={this.state.outsourcePrice}
-                          onChange={(e) => {
-                            this.setState({
-                              outsourcePrice: e.target.value,
-                            })
-                          }}
-                          placeholder="请输入外包成本"
-                          style={{ width: '200px' }}
-                        />
-                      </FormItem>
-                    </div>
+                    {/*<div className="clearfix">*/}
+                    {/*  <h3 className="sub-title">外包信息</h3>*/}
+                    {/*  <FormItem*/}
+                    {/*    className="half-item"*/}
+                    {/*    {...formItemLayout}*/}
+                    {/*    label="外包公司"*/}
+                    {/*  >*/}
+                    {/*    <Input*/}
+                    {/*      value={this.state.outsourceName}*/}
+                    {/*      onChange={(e) => {*/}
+                    {/*        this.setState({*/}
+                    {/*          outsourceName: e.target.value,*/}
+                    {/*        })*/}
+                    {/*      }}*/}
+                    {/*      placeholder="请输入外包公司"*/}
+                    {/*      style={{ width: '200px' }}*/}
+                    {/*    />*/}
+                    {/*  </FormItem>*/}
+                    {/*  <FormItem*/}
+                    {/*    className="half-item"*/}
+                    {/*    {...formItemLayout}*/}
+                    {/*    label="外包成本(万元)"*/}
+                    {/*  >*/}
+                    {/*    <Input*/}
+                    {/*      value={this.state.outsourcePrice}*/}
+                    {/*      onChange={(e) => {*/}
+                    {/*        this.setState({*/}
+                    {/*          outsourcePrice: e.target.value,*/}
+                    {/*        })*/}
+                    {/*      }}*/}
+                    {/*      placeholder="请输入外包成本"*/}
+                    {/*      style={{ width: '200px' }}*/}
+                    {/*    />*/}
+                    {/*  </FormItem>*/}
+                    {/*</div>*/}
                     {/*<hr style={{border:'1px dashed #aaa', width:"90%",margin:'auto'}}/>*/}
                     <div className="clearfix">
                       <h3 className="sub-title">联系信息</h3>
@@ -4311,14 +4311,14 @@ const Task = React.createClass({
                           span={24}
                           offset={9}
                           style={{ marginTop: '15px' }}
-                        ></Col>
+                        />
                       </Form>
                     </Spin>
                   </div>
+                  {/*如果是软著类或者专利类,隐藏付款节点*/}
                   <div
                     style={{
-                      // display: this.state.type == 1 ? "block" : "none",
-                      display: this.state.type == 1 ? 'block' : 'block',
+                      display: this.state.projectType === 1 || this.state.projectType === 2? 'none' : 'block',  //0正常 1专利 2软著 3审计
                     }}
                   >
                     <span
@@ -4350,11 +4350,11 @@ const Task = React.createClass({
                       +新增付款节点
                     </Button>
                   </div>
+                  {/*如果是软著类或者专利类,隐藏付款节点*/}
                   <div
                     className="clearfix"
                     style={{
-                      // display: this.state.type == 1 ? "block" : "none",
-                      display: this.state.type == 1 ? 'block' : 'block',
+                      display: this.state.projectType === 1 || this.state.projectType === 2? 'none' : 'block',  //0正常 1专利 2软著 3审计
                     }}
                   >
                     <Spin spinning={this.state.loading}>
@@ -5642,6 +5642,9 @@ const Task = React.createClass({
             visible={this.state.ThirdListVisible}
             thirdMaterial={this.state.thirdMaterial}
             thirdUrgent={this.state.thirdUrgent}
+            audit={this.state.audit}
+            assets={this.state.assets}
+            income={this.state.income}
             onDetermine={this.handleCancelq}
             onCancel={()=>{
               this.thirdTable(this.state.tid);
@@ -5655,6 +5658,9 @@ const Task = React.createClass({
                 thirdMaterial: '', //有无材料
                 thirdUrgent: 0, //加急情况
                 thirdRemarks: '',
+                audit: 0,
+                assets: '',
+                income: '',
               })
             }}
             otherOperations={(data)=>{
@@ -5770,17 +5776,17 @@ const Task = React.createClass({
                 </div>
                 {this.state.projectType !== 2 ? <div className="clearfix">
                   <FormItem {...formItemLayout} label="总价(万元)">
-                    {/* <span>{this.state.currentTotalPrice}</span> */}
                     <Input
+                      type={'number'}
                       value={this.state.currentTotalPrice}
-                      placeholder=""
+                      placeholder="请输入总价"
                       // required="required"
                       // onBlur={this.payNodeCalculatedAmount}
-                      // onChange={(e) =>
-                      //   this.setState({
-                      //     toltalAmount: e.target.value,
-                      //   })
-                      // }
+                      onChange={(e) =>
+                        this.setState({
+                          currentTotalPrice: e.target.value,
+                        })
+                      }
                       style={{ width: '220px' }}
                     />
                     <span className="mandatory">*</span>

+ 22 - 22
js/component/manageCenter/project/task/myTaskCount.jsx

@@ -282,7 +282,7 @@ const MyTaskCount = Form.create()(
             key: "commodityPrice"
           },
           {
-            title: "实成本(万元)",
+            title: "实成本(万元)",
             dataIndex: "costAmount",
             key: "costAmount"
           },
@@ -1327,27 +1327,27 @@ const MyTaskCount = Form.create()(
                       <span>{this.state.certificateNumber}</span>
                     </FormItem>
                   </div>
-                  {this.state.outsource === 1 ? (
-                    <div className="clearfix">
-                      <h3 className="sub-title">外包信息</h3>
-                      <FormItem
-                        className="half-item"
-                        {...formItemLayout}
-                        label="外包公司"
-                      >
-                        <span>{this.state.outsourceName}</span>
-                      </FormItem>
-                      <FormItem
-                        className="half-item"
-                        {...formItemLayout}
-                        label="外包成本(万元)"
-                      >
-                        <span>{this.state.outsourcePrice}</span>
-                      </FormItem>
-                    </div>
-                  ) : (
-                    ""
-                  )}
+                  {/*{this.state.outsource === 1 ? (*/}
+                  {/*  <div className="clearfix">*/}
+                  {/*    <h3 className="sub-title">外包信息</h3>*/}
+                  {/*    <FormItem*/}
+                  {/*      className="half-item"*/}
+                  {/*      {...formItemLayout}*/}
+                  {/*      label="外包公司"*/}
+                  {/*    >*/}
+                  {/*      <span>{this.state.outsourceName}</span>*/}
+                  {/*    </FormItem>*/}
+                  {/*    <FormItem*/}
+                  {/*      className="half-item"*/}
+                  {/*      {...formItemLayout}*/}
+                  {/*      label="外包成本(万元)"*/}
+                  {/*    >*/}
+                  {/*      <span>{this.state.outsourcePrice}</span>*/}
+                  {/*    </FormItem>*/}
+                  {/*  </div>*/}
+                  {/*) : (*/}
+                  {/*  ""*/}
+                  {/*)}*/}
                   {/*<hr style={{border:'1px dashed #aaa', width:"90%",margin:'auto'}}/>*/}
                   <div className="clearfix">
                     <h3 className="sub-title">联系信息</h3>

+ 21 - 18
js/component/manageCenter/project/task/newSupplier.js

@@ -1,5 +1,5 @@
 import React,{Component} from 'react';
-import {AutoComplete, Button, Form, Input, message, Modal, Radio, Select, Spin} from "antd";
+import {AutoComplete, Button, Form, Input, message, Modal, InputNumber, Select, Spin} from "antd";
 import {
     getMaterialStatus,
     getUrgentStatus,
@@ -25,6 +25,9 @@ class NewSupplier extends Component{
             thirdMaterial: props.thirdMaterial,
             thirdUrgent: props.thirdUrgent,
             patentType: props.patentType,
+            audit: props.audit,
+            assets: props.assets,
+            income: props.income,
             customerArr: [],
             loading: false,
             officialCost: "", //是否有官费
@@ -271,15 +274,15 @@ class NewSupplier extends Component{
                             {/*projectType 0正常 1专利 2软著 3审计*/}
                             {this.props.projectType !== 2 && !(this.props.projectType === 1 && this.props.patentType ===0) ?<div className="clearfix">
                                 <Form.Item {...formItemLayout} label="单价(万元)">
-                                    <Input
+                                    <InputNumber
                                         value={this.state.thirdUnitPrice}
-                                        placeholder="请输入金额(必填项)"
+                                        placeholder="请输入单价(必填项)"
                                         required="required"
-                                        type={'number'}
+                                        precision={6}
                                         onBlur={this.calculatedAmount}
-                                        onChange={(e) => {
+                                        onChange={(value) => {
                                             this.setState({
-                                                thirdUnitPrice: e.target.value,
+                                                thirdUnitPrice: value,
                                             })
                                         }}
                                         style={{ width: '220px' }}
@@ -289,14 +292,14 @@ class NewSupplier extends Component{
                             </div> : <div/>}
                             <div className="clearfix">
                                 <Form.Item {...formItemLayout} label="数量">
-                                    <Input
+                                    <InputNumber
                                         value={this.state.thirdQuantity}
                                         placeholder="请输入数量(必填项)"
                                         onBlur={this.calculatedAmount}
-                                        type={'number'}
-                                        onChange={(e) => {
+                                        precision={0}
+                                        onChange={(value) => {
                                             this.setState({
-                                                thirdQuantity: e.target.value,
+                                                thirdQuantity: value,
                                             })
                                         }}
                                         style={{ width: '220px' }}
@@ -432,14 +435,14 @@ class NewSupplier extends Component{
                                     </div>
                                     <div className="clearfix">
                                         <Form.Item {...formItemLayout} label="公司资产(万元)">
-                                            <Input
+                                            <InputNumber
                                                 value={this.state.assets}
+                                                precision={6}
                                                 placeholder="请输入公司资产"
                                                 required="required"
-                                                type={'number'}
-                                                onChange={(e) => {
+                                                onChange={(value) => {
                                                     this.setState({
-                                                        assets: e.target.value,
+                                                        assets: value,
                                                     })
                                                 }}
                                                 style={{ width: '220px' }}
@@ -449,14 +452,14 @@ class NewSupplier extends Component{
                                     </div>
                                     <div className="clearfix">
                                         <Form.Item {...formItemLayout} label="收入(万元)">
-                                            <Input
+                                            <InputNumber
                                                 value={this.state.income}
+                                                precision={6}
                                                 placeholder="请输入收入"
                                                 required="required"
-                                                type={'number'}
-                                                onChange={(e) => {
+                                                onChange={(value) => {
                                                     this.setState({
-                                                        income: e.target.value,
+                                                        income: value,
                                                     })
                                                 }}
                                                 style={{ width: '220px' }}

+ 33 - 52
js/component/manageCenter/project/task/taskCount.jsx

@@ -133,31 +133,8 @@ const IntentionCustomer = Form.create()(
             } else {
               for (let i = 0; i < data.data.list.length; i++) {
                 let thisdata = data.data.list[i];
-                theArr.push({
-                  key: i,
-                  id: thisdata.id, //ID
-                  orderNo: thisdata.orderNo, //订单编号
-                  taskName: thisdata.taskName, //任务名称
-                  userName: thisdata.userName, //客户名称
-                  cname: thisdata.cname, //项目品类
-                  taskStatus: thisdata.taskStatus, //任务状态
-                  receiverName: thisdata.receiverName, //负责人
-                  hours: thisdata.hours, //任务工时
-                  depName: thisdata.depName, //派单公司
-                  contractNo: thisdata.contractNo,
-                  signTime: thisdata.signTime,
-                  creteTime: thisdata.creteTime,
-                  projectStatus: thisdata.projectStatus,
-                  commodityPrice: thisdata.commodityPrice, //价格
-                  commodityQuantity: thisdata.commodityQuantity, //数量
-                  salesmanName: thisdata.salesmanName, //订单负责人
-                  taskDistributionTime: thisdata.taskDistributionTime,
-                  taskEndTime: thisdata.taskEndTime,
-                  outsource: thisdata.outsource,
-                  splitStatus: thisdata.splitStatus,
-                  splitSuper: thisdata.splitSuper,
-                  splitId: thisdata.splitId
-                });
+                thisdata.key = i;
+                theArr.push(thisdata);
               }
               this.state.pagination.total = data.data.totalCount;
             }
@@ -264,6 +241,16 @@ const IntentionCustomer = Form.create()(
             key: "commodityPrice"
           },
           {
+            title: "实际成本(万元)",
+            dataIndex: "costAmount",
+            key: "costAmount"
+          },
+          {
+            title: "已付成本(万元)",
+            dataIndex: "partyAmount",
+            key: "partyAmount"
+          },
+          {
             title: "数量(个)",
             dataIndex: "commodityQuantity",
             key: "commodityQuantity"
@@ -834,12 +821,6 @@ const IntentionCustomer = Form.create()(
     getOrgCodeUrl(e) {
       this.setState({ orgCodeUrl: e });
     },
-    //关闭操作工时
-    visitCancelA() {
-      this.setState({
-        visibleA: false
-      });
-    },
     setColor() {
       $(".userName span").after(
         "(<span class='ruanzhu'>软著数</span>/<span class='xiazheng'>下证数</span>)"
@@ -1369,27 +1350,27 @@ const IntentionCustomer = Form.create()(
                       <span>{this.state.certificateNumber}</span>
                     </FormItem>
                   </div>
-                  {this.state.outsource === 1 ? (
-                    <div className="clearfix">
-                      <h3 className="sub-title">外包信息</h3>
-                      <FormItem
-                        className="half-item"
-                        {...formItemLayout}
-                        label="外包公司"
-                      >
-                        <span>{this.state.outsourceName}</span>
-                      </FormItem>
-                      <FormItem
-                        className="half-item"
-                        {...formItemLayout}
-                        label="外包成本(万元)"
-                      >
-                        <span>{this.state.outsourcePrice}</span>
-                      </FormItem>
-                    </div>
-                  ) : (
-                    ""
-                  )}
+                  {/*{this.state.outsource === 1 ? (*/}
+                  {/*  <div className="clearfix">*/}
+                  {/*    <h3 className="sub-title">外包信息</h3>*/}
+                  {/*    <FormItem*/}
+                  {/*      className="half-item"*/}
+                  {/*      {...formItemLayout}*/}
+                  {/*      label="外包公司"*/}
+                  {/*    >*/}
+                  {/*      <span>{this.state.outsourceName}</span>*/}
+                  {/*    </FormItem>*/}
+                  {/*    <FormItem*/}
+                  {/*      className="half-item"*/}
+                  {/*      {...formItemLayout}*/}
+                  {/*      label="外包成本(万元)"*/}
+                  {/*    >*/}
+                  {/*      <span>{this.state.outsourcePrice}</span>*/}
+                  {/*    </FormItem>*/}
+                  {/*  </div>*/}
+                  {/*) : (*/}
+                  {/*  ""*/}
+                  {/*)}*/}
                   {/*<hr style={{border:'1px dashed #aaa', width:"90%",margin:'auto'}}/>*/}
                   <div className="clearfix">
                     <h3 className="sub-title">联系信息</h3>

+ 21 - 21
js/component/manageCenter/project/task/taskQuery.jsx

@@ -1268,27 +1268,27 @@ const Task = React.createClass({
                         <span>{this.state.certificateNumber}</span>
                       </FormItem>
                     </div>
-                    {this.state.outsource === 1 ? (
-                      <div className="clearfix">
-                        <h3 className="sub-title">外包信息</h3>
-                        <FormItem
-                          className="half-item"
-                          {...formItemLayout}
-                          label="外包公司"
-                        >
-                          <span>{this.state.outsourceName}</span>
-                        </FormItem>
-                        <FormItem
-                          className="half-item"
-                          {...formItemLayout}
-                          label="外包成本(万元)"
-                        >
-                          <span>{this.state.outsourcePrice}</span>
-                        </FormItem>
-                      </div>
-                    ) : (
-                      ""
-                    )}
+                    {/*{this.state.outsource === 1 ? (*/}
+                    {/*  <div className="clearfix">*/}
+                    {/*    <h3 className="sub-title">外包信息</h3>*/}
+                    {/*    <FormItem*/}
+                    {/*      className="half-item"*/}
+                    {/*      {...formItemLayout}*/}
+                    {/*      label="外包公司"*/}
+                    {/*    >*/}
+                    {/*      <span>{this.state.outsourceName}</span>*/}
+                    {/*    </FormItem>*/}
+                    {/*    <FormItem*/}
+                    {/*      className="half-item"*/}
+                    {/*      {...formItemLayout}*/}
+                    {/*      label="外包成本(万元)"*/}
+                    {/*    >*/}
+                    {/*      <span>{this.state.outsourcePrice}</span>*/}
+                    {/*    </FormItem>*/}
+                    {/*  </div>*/}
+                    {/*) : (*/}
+                    {/*  ""*/}
+                    {/*)}*/}
                     {/*<hr style={{border:'1px dashed #aaa', width:"90%",margin:'auto'}}/>*/}
                     <div className="clearfix">
                       <h3 className="sub-title">联系信息</h3>

+ 21 - 21
js/component/project.jsx

@@ -811,27 +811,27 @@ const project = React.createClass({
                       <span>{this.state.certificateNumber}</span>
                     </FormItem>
                   </div>
-                  {this.state.outsource === 1 ? (
-                    <div className="clearfix">
-                      <h3 className="sub-title">外包信息</h3>
-                      <FormItem
-                        className="half-item"
-                        {...formItemLayout}
-                        label="外包公司"
-                      >
-                        <span>{this.state.outsourceName}</span>
-                      </FormItem>
-                      <FormItem
-                        className="half-item"
-                        {...formItemLayout}
-                        label="外包成本(万元)"
-                      >
-                        <span>{this.state.outsourcePrice}</span>
-                      </FormItem>
-                    </div>
-                  ) : (
-                    ''
-                  )}
+                  {/*{this.state.outsource === 1 ? (*/}
+                  {/*  <div className="clearfix">*/}
+                  {/*    <h3 className="sub-title">外包信息</h3>*/}
+                  {/*    <FormItem*/}
+                  {/*      className="half-item"*/}
+                  {/*      {...formItemLayout}*/}
+                  {/*      label="外包公司"*/}
+                  {/*    >*/}
+                  {/*      <span>{this.state.outsourceName}</span>*/}
+                  {/*    </FormItem>*/}
+                  {/*    <FormItem*/}
+                  {/*      className="half-item"*/}
+                  {/*      {...formItemLayout}*/}
+                  {/*      label="外包成本(万元)"*/}
+                  {/*    >*/}
+                  {/*      <span>{this.state.outsourcePrice}</span>*/}
+                  {/*    </FormItem>*/}
+                  {/*  </div>*/}
+                  {/*) : (*/}
+                  {/*  ''*/}
+                  {/*)}*/}
                   {/*<hr style={{border:'1px dashed #aaa', width:"90%",margin:'auto'}}/>*/}
                   <div className="clearfix">
                     <h3 className="sub-title">联系信息</h3>