mentoswzq 4 lat temu
rodzic
commit
9b5dcb2a7b

+ 55 - 11
js/component/manageCenter/components/checkProject/index.jsx

@@ -186,7 +186,11 @@ class CheckProject extends Component {
           dataIndex: 'totalAmount',
           key: 'totalAmount',
           render: (text, record) => {
-            return <span>{text}</span>
+            return <span>
+                {
+                  isNaN(text) ? text : parseFloat(text)
+                }
+              </span>
           },
         },
         {
@@ -269,7 +273,11 @@ class CheckProject extends Component {
             key: 'unitPrice',
             render: (text, record) => {
               if (text) {
-                return <span>{text}</span>
+                return <span>
+                  {
+                    isNaN(text) ? text : parseFloat(text)
+                  }
+                </span>
               }
             },
           },
@@ -289,7 +297,11 @@ class CheckProject extends Component {
             key: 'totalAmount',
             render: (text, record) => {
               if (text) {
-                return <span>{text}</span>
+                return <span>
+                  {
+                    isNaN(text) ? text : parseFloat(text)
+                  }
+                </span>
               }
             },
           },
@@ -367,7 +379,11 @@ class CheckProject extends Component {
             key: 'unitPrice',
             render: (text, record) => {
               if (text) {
-                return <span>{text}</span>
+                return <span>
+                  {
+                    isNaN(text) ? text : parseFloat(text)
+                  }
+                </span>
               }
             },
           },
@@ -387,7 +403,11 @@ class CheckProject extends Component {
             key: 'totalAmount',
             render: (text, record) => {
               if (text) {
-                return <span>{text}</span>
+                return <span>
+                  {
+                    isNaN(text) ? text : parseFloat(text)
+                  }
+                </span>
               }
             },
           },
@@ -478,7 +498,11 @@ class CheckProject extends Component {
               key: 'unitPrice',
               render: (text, record) => {
                 if (text) {
-                  return <span>{text}</span>
+                  return <span>
+                  {
+                    isNaN(text) ? text : parseFloat(text)
+                  }
+                </span>
                 }
               },
             },
@@ -514,7 +538,11 @@ class CheckProject extends Component {
               key: 'totalAmount',
               render: (text, record) => {
                 if (text) {
-                  return <span>{text}</span>
+                  return <span>
+                  {
+                    isNaN(text) ? text : parseFloat(text)
+                  }
+                </span>
                 }
               },
             },
@@ -606,7 +634,11 @@ class CheckProject extends Component {
               key: 'unitPrice',
               render: (text, record) => {
                 if (text) {
-                  return <span>{text}</span>
+                  return <span>
+                  {
+                    isNaN(text) ? text : parseFloat(text)
+                  }
+                </span>
                 }
               },
             },
@@ -626,7 +658,11 @@ class CheckProject extends Component {
               key: 'totalAmount',
               render: (text, record) => {
                 if (text) {
-                  return <span>{text}</span>
+                  return <span>
+                  {
+                    isNaN(text) ? text : parseFloat(text)
+                  }
+                </span>
                 }
               },
             },
@@ -706,7 +742,11 @@ class CheckProject extends Component {
             key: 'unitPrice',
             render: (text, record) => {
               if (text) {
-                return <span>{text}</span>
+                return <span>
+                  {
+                    isNaN(text) ? text : parseFloat(text)
+                  }
+                </span>
               }
             },
           },
@@ -726,7 +766,11 @@ class CheckProject extends Component {
             key: 'totalAmount',
             render: (text, record) => {
               if (text) {
-                return <span>{text}</span>
+                return <span>
+                  {
+                    isNaN(text) ? text : parseFloat(text)
+                  }
+                </span>
               }
             },
           },

+ 12 - 0
js/component/manageCenter/order/orderNew/costAuditList/detailsModal/index.js

@@ -232,6 +232,18 @@ class DetailsModal extends Component{
                             this.payNodeTable(this.props.tid);
                         }
                     }}
+                    tabBarExtraContent={
+                        <div style={{fontWeight:'bold',paddingRight:'15px'}}>
+                          <span>
+                            项目名称:
+                          <span style={{color:'#F00',paddingRight:'5px'}}>{this.props.taskName}</span>
+                          </span>
+                          <span style={{marginLeft:'15px'}}>
+                            项目编号:
+                          <span style={{color:'#F00',paddingRight:'5px'}}>{this.props.taskID}</span>
+                          </span>
+                        </div>
+                    }
                 >
                     <TabPane tab="项目概况" key="1">
                         <ProjectOverview projectStatus={this.props.projectStatus} tid={this.props.tid}/>

+ 1 - 3
js/component/manageCenter/order/orderNew/costAuditList/filterColumn.js

@@ -5,9 +5,7 @@ import $ from "jquery/src/ajax";
 class FilterColumn extends Component{
     constructor(props) {
         super(props);
-        this.state={
-
-        };
+        this.handleReset = this.handleReset.bind(this);
     }
 
     handleReset(){

+ 21 - 19
js/component/manageCenter/order/orderNew/costAuditList/index.js

@@ -24,11 +24,29 @@ class CostAuditList extends Component{
             loading: true,
             columns: [
                 {
-                    title: "号",
+                    title: "项目编号",
                     dataIndex: "key",
                     key: "key",
                 },
                 {
+                    title: "项目名称",
+                    dataIndex: "pname",
+                    key: "pname",
+                },
+                {
+                    title: "项目状态",
+                    dataIndex: "projectStatus",
+                    key: "projectStatus",
+                    render: (text) => {
+                        return getProjectStatus(text);
+                    },
+                },
+                {
+                    title: "分类名称",
+                    dataIndex: "cname",
+                    key: "cname",
+                },
+                {
                     title: "合同编号",
                     dataIndex: "contractNo",
                     key: "contractNo",
@@ -97,24 +115,6 @@ class CostAuditList extends Component{
                     key: "financeName",
                 },
                 {
-                    title: "分类名称",
-                    dataIndex: "cname",
-                    key: "cname",
-                },
-                {
-                    title: "项目名称",
-                    dataIndex: "pname",
-                    key: "pname",
-                },
-                {
-                    title: "项目状态",
-                    dataIndex: "projectStatus",
-                    key: "projectStatus",
-                    render: (text) => {
-                        return getProjectStatus(text);
-                    },
-                },
-                {
                     title: "状态",
                     dataIndex: "status",
                     key: "status",
@@ -377,6 +377,8 @@ class CostAuditList extends Component{
                           orderNo={this.state.selectInfor.orderNo}
                           projectType={this.state.selectInfor.projectType}
                           projectStatus={this.state.selectInfor.projectStatus}
+                          taskName={this.state.selectInfor.pname}
+                          taskID={this.state.selectInfor.id}
                           visible={this.state.visible}
                           refreshList={()=>{
                               this.loadData();

+ 123 - 188
js/component/manageCenter/project/task/myTask.jsx

@@ -6,8 +6,7 @@ import '@/manageCenter/financialManage/distribute/public.less'
 import '@/manageCenter/financialManage/distribute/shouKuan.less'
 import OrderDetail from '../../order/orderNew/changeComponent/orderDetail'
 import ResolutionDetail from '@/resolutionDetail'
-import {
-  Button,
+import {Button,
   Form,
   Input,
   Select,
@@ -32,8 +31,7 @@ import { areaSelect } from '@/NewDicProvinceList'
 import { ChooseList } from '../../order/orderNew/chooseList'
 import OrderRiZi from '@/orderRiZi.jsx'
 import './table.less'
-import {
-  getMaterialStatus,
+import {getMaterialStatus,
   getUrgentStatus,
   getProcessStatus,
   getApproval,
@@ -43,8 +41,7 @@ import {
   splitUrl,
   getboutique,
   ShowModal,
-  getRefundStatus,
-} from '@/tools'
+  getRefundStatus,} from '@/tools'
 import { taskStatus, projectStatus, cuiJieDian } from '@/dataDic.js'
 import ShowModalDiv from '@/showModal.jsx'
 
@@ -52,7 +49,7 @@ import CheckProject from '../../components/checkProject'
 import NewSupplier from './newSupplier';
 import ImgList from "../../../common/imgList";
 import OperationPayNode from "./operationPayNode";
-
+import {object} from "prop-types";
 const confirm = Modal.confirm
 const FormItem = Form.Item
 const { TabPane } = Tabs
@@ -218,6 +215,7 @@ const Task = React.createClass({
   },
   getInitialState() {
     return {
+      audit: 1,
       projectType: '', //项目分类
       paySubject: [],
       paySubjectName: '', //付款科目名称
@@ -695,7 +693,11 @@ const Task = React.createClass({
             key: 'unitPrice',
             render: (text, record) => {
               if (text) {
-                return <span>{text}</span>
+                return <span>
+                  {
+                    isNaN(text) ? text : parseFloat(text)
+                  }
+                </span>
               }
             },
           },
@@ -714,9 +716,11 @@ const Task = React.createClass({
             dataIndex: 'totalAmount',
             key: 'totalAmount',
             render: (text, record) => {
-              if (text) {
-                return <span>{text}</span>
-              }
+              return <span>
+                {
+                  isNaN(text) ? text : parseFloat(text)
+                }
+              </span>
             },
           },
           {
@@ -793,7 +797,11 @@ const Task = React.createClass({
             key: 'unitPrice',
             render: (text, record) => {
               if (text) {
-                return <span>{text}</span>
+                return <span>
+                  {
+                    isNaN(text) ? text : parseFloat(text)
+                  }
+                </span>
               }
             },
           },
@@ -812,9 +820,11 @@ const Task = React.createClass({
             dataIndex: 'totalAmount',
             key: 'totalAmount',
             render: (text, record) => {
-              if (text) {
-                return <span>{text}</span>
-              }
+              return <span>
+                {
+                  isNaN(text) ? text : parseFloat(text)
+                }
+              </span>
             },
           },
           {
@@ -903,7 +913,11 @@ const Task = React.createClass({
               key: 'unitPrice',
               render: (text, record) => {
                 if (text) {
-                  return <span>{text}</span>
+                  return <span>
+                  {
+                    isNaN(text) ? text : parseFloat(text)
+                  }
+                </span>
                 }
               },
             },
@@ -938,9 +952,11 @@ const Task = React.createClass({
               dataIndex: 'totalAmount',
               key: 'totalAmount',
               render: (text, record) => {
-                if (text) {
-                  return <span>{text}</span>
+                return <span>
+                {
+                  isNaN(text) ? text : parseFloat(text)
                 }
+              </span>
               },
             },
             {
@@ -1033,7 +1049,11 @@ const Task = React.createClass({
               key: 'unitPrice',
               render: (text, record) => {
                 if (text) {
-                  return <span>{text}</span>
+                  return <span>
+                  {
+                    isNaN(text) ? text : parseFloat(text)
+                  }
+                </span>
                 }
               },
             },
@@ -1052,9 +1072,11 @@ const Task = React.createClass({
               dataIndex: 'totalAmount',
               key: 'totalAmount',
               render: (text, record) => {
-                if (text) {
-                  return <span>{text}</span>
+                return <span>
+                {
+                  isNaN(text) ? text : parseFloat(text)
                 }
+              </span>
               },
             },
             {
@@ -1132,7 +1154,11 @@ const Task = React.createClass({
             key: 'unitPrice',
             render: (text, record) => {
               if (text) {
-                return <span>{text}</span>
+                return <span>
+                  {
+                    isNaN(text) ? text : parseFloat(text)
+                  }
+                </span>
               }
             },
           },
@@ -1151,9 +1177,11 @@ const Task = React.createClass({
             dataIndex: 'totalAmount',
             key: 'totalAmount',
             render: (text, record) => {
-              if (text) {
-                return <span>{text}</span>
-              }
+              return <span>
+                {
+                  isNaN(text) ? text : parseFloat(text)
+                }
+              </span>
             },
           },
           {
@@ -1181,9 +1209,11 @@ const Task = React.createClass({
             dataIndex: 'income',
             key: 'income',
             render: (text, record) => {
-              if (text) {
-                return <span>{text}</span>
-              }
+              return <span>
+                  {
+                    isNaN(text) ? text : parseFloat(text)
+                  }
+                </span>
             },
           },
           {
@@ -1283,7 +1313,11 @@ const Task = React.createClass({
           dataIndex: 'totalAmount',
           key: 'totalAmount',
           render: (text, record) => {
-            return <span>{text}</span>
+            return <span>
+                {
+                  isNaN(text) ? text : parseFloat(text)
+                }
+              </span>
           },
         },
         {
@@ -3055,8 +3089,17 @@ const Task = React.createClass({
       currentTotalPrice: record.totalAmount, //总价
       partyTimes: record.partyTimes,
       paySubjectName: record.dunType,
-      payNodeInfor: record,            //付款节点详情
-    })
+    });
+    let obj = JSON.parse(JSON.stringify(record));
+    this.state.paySubject.some((value)=>{
+      if(value.key === obj.dunType){
+        obj.dunType = value.value;
+        return true;
+      }
+    });
+    this.setState({
+      payNodeInfor: obj,            //付款节点详情
+    });
   },
   render() {
     const formItemLayout = {
@@ -3316,6 +3359,18 @@ const Task = React.createClass({
           onCancel={this.visitCancel}
         >
           <Tabs
+              tabBarExtraContent={
+                <div style={{fontWeight:'bold',paddingRight:'15px'}}>
+                  <span>
+                    项目名称:
+                  <span style={{color:'#F00',paddingRight:'5px'}}>{this.state.taskName}</span>
+                  </span>
+                  <span style={{marginLeft:'15px'}}>
+                    项目编号:
+                  <span style={{color:'#F00',paddingRight:'5px'}}>{this.state.id}</span>
+                  </span>
+                </div>
+              }
             activeKey={this.state.activeKey}
             onChange={(e) => {
               this.callback(e)
@@ -4400,7 +4455,7 @@ const Task = React.createClass({
                           span={24}
                           offset={9}
                           style={{ marginTop: '15px' }}
-                        ></Col>
+                        />
                       </Form>
                     </Spin>
                   </div>
@@ -4832,7 +4887,22 @@ const Task = React.createClass({
           footer=""
           className="admin-desc-content"
         >
-          <Tabs activeKey={this.state.activeKey} onChange={this.orderChange}>
+          <Tabs
+              tabBarExtraContent={
+                <div style={{fontWeight:'bold',paddingRight:'15px'}}>
+                  <span>
+                    项目名称:
+                  <span style={{color:'#F00',paddingRight:'5px'}}>{this.state.taskName}</span>
+                  </span>
+                  <span style={{marginLeft:'15px'}}>
+                    项目编号:
+                  <span style={{color:'#F00',paddingRight:'5px'}}>{this.state.id}</span>
+                  </span>
+                </div>
+              }
+              activeKey={this.state.activeKey}
+              onChange={this.orderChange}
+          >
             <TabPane tab="项目概况" key="1">
               <div className="clearfix">
                 <FormItem
@@ -5758,7 +5828,7 @@ const Task = React.createClass({
                 thirdMaterial: 0, //有无材料
                 thirdUrgent: 0, //加急情况
                 thirdRemarks: '',
-                audit: 0,
+                audit: 1,
                 assets: '',
                 income: '',
               })
@@ -5771,160 +5841,25 @@ const Task = React.createClass({
                 thirdCompanyName: data.thirdCompanyName
               })
             }}/> : <div/>}
-        {this.state.PayNodeVisible ? <Modal
-          visible={this.state.PayNodeVisible}
-          onCancel={this.handleCancelclose}
-          width={800}
-          title={this.state.ThirdId ? "修改付款节点" : "新增付款节点"}
-          footer=""
-          // width={1300}
-          className="admin-desc-content"
-        >
-          <Form
-            layout="horizontal"
-            // onSubmit={this.handleSubmit1}
-            // id="demand-form"
-            style={{ paddingBottom: '40px' }}
-          >
-            <Spin spinning={this.state.loading}>
-              <div className="clearfix">
-                <div className="clearfix">
-                  <FormItem {...formItemLayout} label="供应商名称">
-                    <Select
-                      value={this.state.thirdCompanyName}
-                      onChange={(val) => {
-                        this.setState(
-                          {
-                            thirdCompanyName: val,
-                          },
-                          () => this.payNodeCalculatedAmount()
-                        ) //更新完state调用
-                      }}
-                      defaultValue="请选择供应商"
-                      style={{ width: 220 }}
-                    >
-                      {this.state.PayNodeCompany.map((item, index) => (
-                        <Select.Option value={item.companyName} key={index}>
-                          {item.companyName}
-                        </Select.Option>
-                      ))}
-                    </Select>
-                    <span className="mandatory">*</span>
-                  </FormItem>
-                </div>
-
-                <div className="clearfix">
-                  <FormItem {...formItemLayout} label="付款科目">
-                    <Select
-                      value={this.state.paySubjectName}
-                      onChange={(val) => {
-                        this.setState({
-                          paySubjectName: val,
-                          dunType: val,
-                        })
-                      }}
-                      defaultValue="请选择付款科目"
-                      style={{ width: 220 }}
-                    >
-                      {this.state.paySubject.map((item, index) => (
-                        <Select.Option value={item.value} key={index}>
-                          {item.key}
-                        </Select.Option>
-                      ))}
-                      <Select.Option key={0} value={0}>
-                        自定义
-                      </Select.Option>
-                    </Select>
-                    <span className="mandatory">*</span>
-                  </FormItem>
-                </div>
-                <div className="clearfix">
-                  {parseInt(this.state.paySubjectName) === 0 ? <FormItem {...formItemLayout} label="付款时间">
-                    <DatePicker
-                      value={
-                        this.state.partyTimes
-                          ? moment(this.state.partyTimes)
-                          : null
-                      }
-                      onChange={(data, dataString) => {
-                        this.setState({ partyTimes: dataString })
-                      }}
-                      style={{ width: '220px' }}
-                    />
-                    <span className="mandatory">*</span>
-                  </FormItem> : <div/>}
-                </div>
-                <div className="clearfix">
-                  <FormItem {...formItemLayout} label="数量">
-                    <Input
-                      value={this.state.payNodeQuantity}
-                      placeholder="请输入数量(必填项)"
-                      required="required"
-                      type={'number'}
-                      onChange={(e) => {
-                        //TODO 数量为1时不可修改,需要将次块分成组件
-                        let num = e.target.value ? (e.target.value < 1 ? 1 : e.target.value) : 1
-                        this.setState(
-                          {
-                            payNodeQuantity: num,
-                          }, () => this.payNodeCalculatedAmount(num))
-                      }}
-                      style={{ width: '220px' }}
-                    />
-                    <span className="mandatory">*</span>
-                  </FormItem>
-                </div>
-                {this.state.projectType !== 2 ? <div className="clearfix">
-                  <FormItem {...formItemLayout} label="总价(万元)">
-                    <Input
-                      type={'number'}
-                      value={this.state.currentTotalPrice}
-                      placeholder="请输入总价"
-                      // required="required"
-                      // onBlur={this.payNodeCalculatedAmount}
-                      onChange={(e) =>
-                        this.setState({
-                          currentTotalPrice: e.target.value,
-                        })
-                      }
-                      style={{ width: '220px' }}
-                    />
-                    <span className="mandatory">*</span>
-                  </FormItem>
-                </div> : <div/>}
-                <div className="clearfix">
-                  <div className="addSave" style={{ marginTop: '15px' }}>
-                    <Button
-                      className="cancel"
-                      type="primary"
-                      onClick={this.savePayNode}
-                      style={{ marginLeft: '300px' }}
-                      htmlType="submit"
-                    >
-                      保存
-                    </Button>
-                    <Button
-                      className="cancel"
-                      type="ghost"
-                      onClick={this.handleCancelclose}
-                      style={{ marginLeft: '50px' }}
-                    >
-                      取消
-                    </Button>
-                  </div>
-                </div>
-              </div>
-            </Spin>
-          </Form>
-        </Modal> : <div/>}
-        {/*<OperationPayNode*/}
-        {/*    visible={this.state.PayNodeVisible}*/}
-        {/*    onCancel={this.handleCancelclose}*/}
-        {/*    thirdId={this.state.ThirdId}*/}
-        {/*    thirdInfoList={this.state.thirdInfoList}*/}
-        {/*    supplierList={this.state.PayNodeCompany}*/}
-        {/*    payNodeInfor={this.state.payNodeInfor}*/}
-        {/*/>*/}
+        {this.state.PayNodeVisible ? <OperationPayNode
+            tid={this.state.tid}
+            cSort={this.state.cSort}
+            visible={this.state.PayNodeVisible}
+            thirdId={this.state.ThirdId}
+            thirdInfoList={this.state.thirdInfoList}
+            supplierList={this.state.PayNodeCompany}
+            payNodeInfor={this.state.payNodeInfor}
+            thirdUnitPrice={this.state.thirdUnitPrice}
+            onCancel={()=>{
+              this.setState({
+                PayNodeVisible: false,
+                payNodeInfor: {},
+                ThirdId: '',
+                thirdUnitPrice: '',
+              })
+              this.payNodeTable(this.state.tid)
+            }}
+        /> : <div/>}
       </div>
     )
   },

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

@@ -67,7 +67,10 @@ class NewSupplier extends Component{
             url: globalConfig.context + '/api/admin/company/selectVague',
             data: {
                 name: e,
-                type: this.props.projectType === 2 || (this.props.projectType === 1 && this.props.patentType === 1) ? 0 :
+                //0软著用 1其他用 2专利申请用
+                type:
+                    this.props.projectType === 2 ?
+                        0 :
                     (this.props.projectType === 1 && this.props.patentType === 0) ? 2 : 1     //this.props.projectType 0正常 1专利 2软著 3审计    this.props.patentType 0:专利申请/变更/转让  1:专利买卖
             },
             success: function (data) {

+ 96 - 98
js/component/manageCenter/project/task/operationPayNode.js

@@ -1,9 +1,9 @@
 import React,{Component} from 'react';
 import {Button, DatePicker, Form, Input, message, Modal, Select, Spin, InputNumber} from "antd";
 import { cuiJieDian } from '@/dataDic.js'
-import moment from "moment";
 import PropTypes from 'prop-types';
 import $ from "jquery";
+import moment from "moment";
 
 const formItemLayout = {
     labelCol: { span: 8 },
@@ -15,10 +15,13 @@ class OperationPayNode extends Component{
         super(props);
         this.state={
             loading: false,
-            thirdCompanyName: '',   //供应商名称
+            thirdCompanyName: props.payNodeInfor.companyName,   //供应商名称
             paySubject: [],
-            paySubjectName: '',     //可简化
+            paySubjectName: props.payNodeInfor.dunType,     //可简化
+            thirdUnitPrice: props.thirdUnitPrice,      //单价
         }
+        this.savePayNode = this.savePayNode.bind(this);
+        this.payNodeCalculatedAmount = this.payNodeCalculatedAmount.bind(this);
     }
 
     componentDidMount() {
@@ -26,77 +29,83 @@ class OperationPayNode extends Component{
     }
 
     //保存付款节点
-    savePayNode() {
-        let api
-        if (this.props.thirdId) {
-            //修改
-            api = '/api/admin/company/updatePaymentNode'
-        } else {
-            //新增
-            api = '/api/admin/company/addPaymentNode'
-        }
+    savePayNode(e) {
+        e.preventDefault();
+        this.props.form.validateFields((err, values) => {
+            if (err) {
+                return;
+            }
+            let api
+            if (this.props.thirdId) {
+                //修改
+                api = '/api/admin/company/updatePaymentNode'
+            } else {
+                //新增
+                api = '/api/admin/company/addPaymentNode'
+            }
 
-        let customerId=0;
-        this.props.supplierList.some((value)=>{
-            if(value.companyName === this.state.thirdCompanyName){
-                customerId = value.id
-                return true;
+            let customerId=0;
+            this.props.supplierList.some((value)=>{
+                if(value.companyName === values.companyName){
+                    customerId = value.id
+                    return true;
+                }
+            });
+            if(!values.companyName){
+                message.error('请选择供应商名称');
+                return;
             }
-        });
-        if(!this.state.thirdCompanyName){
-            message.error('请选择供应商名称');
-            return;
-        }
-        if(!this.state.paySubjectName){
-            message.error('请选择付款科目');
-            return;
-        }
-        if(!this.state.payNodeQuantity){
-            message.error('请输入数量');
-            return;
-        }
-        let data = {
-            id: this.props.thirdId, //id
-            tid: this.state.tid, //订单编号
-            cid: customerId,//对应的第三方信息
-            companyName: this.state.thirdCompanyName.split('-')[0], //第三方名称
-            quantity: this.state.payNodeQuantity, //数量
-            dunType: this.state.dunType, //催款节点
-            projectType: this.state.cSort, //项目分类
-        }
-        if(this.state.paySubjectName === '0'){
-            if(!this.state.partyTimes){
-                message.error('请选择付款时间');
+            if(!values.dunType){
+                message.error('请选择付款科目');
                 return;
             }
-            data.partyTimes = this.state.partyTimes //付款时间
-        }
-        if(this.props.projectType !== 2){                   //其他类型   0正常 1专利 2软著 3审计
-            data.totalAmount = this.state.currentTotalPrice   //总价
-            data.unitPrice = this.state.thirdUnitPrice        //单价
-        }
-        this.setState({
-            loading: true,
-        })
-        $.ajax({
-            url: globalConfig.context + api,
-            method: 'post',
-            dataType: 'json',
-            crossDomain: false,
-            data: data,
-        }).done(
-            function (data) {
-                this.setState({
-                    loading: false,
-                })
-                if (!data.error.length) {
-                    message.success('保存成功!');
-                    this.props.onCancel();
-                } else {
-                    message.warning(data.error[0].message)
+            if(!values.quantity){
+                message.error('请输入数量');
+                return;
+            }
+            let data = {
+                id: this.props.thirdId, //id
+                tid: this.props.tid, //订单编号
+                cid: customerId,//对应的第三方信息
+                companyName: values.companyName.split('-')[0], //第三方名称
+                quantity: values.quantity, //数量
+                dunType: values.dunType, //催款节点
+                projectType: this.props.cSort, //项目分类
+            }
+            if(values.dunType === '0'){
+                if(!values.partyTimes.format('YYYY-MM-DD HH:mm:ss')){
+                    message.error('请选择付款时间');
+                    return;
                 }
-            }.bind(this)
-        )
+                data.partyTimes = values.partyTimes.format('YYYY-MM-DD') //付款时间
+            }
+            if(this.props.projectType !== 2){                   //其他类型   0正常 1专利 2软著 3审计
+                data.totalAmount = values.totalAmount           //总价
+                data.unitPrice = this.state.thirdUnitPrice      //单价
+            }
+            this.setState({
+                loading: true,
+            })
+            $.ajax({
+                url: globalConfig.context + api,
+                method: 'post',
+                dataType: 'json',
+                crossDomain: false,
+                data: data,
+            }).done(
+                function (data) {
+                    this.setState({
+                        loading: false,
+                    })
+                    if (!data.error.length) {
+                        message.success('保存成功!');
+                        this.props.onCancel();
+                    } else {
+                        message.warning(data.error[0].message)
+                    }
+                }.bind(this)
+            )
+        })
     }
 
     // 付款节点自动计算总金额
@@ -111,12 +120,14 @@ class OperationPayNode extends Component{
                 unitPrice = item.unitPrice;
             }
         })
-        this.props.from.setFieldsValue({
+        this.props.form.setFieldsValue({
             quantity :num ? num : quantity
         })
         if(this.props.projectType !== 2){
+            this.props.form.setFieldsValue({
+                totalAmount: currentTotalPrice
+            })
             this.setState({
-                currentTotalPrice: currentTotalPrice,
                 thirdUnitPrice: unitPrice
             })
         }
@@ -147,6 +158,7 @@ class OperationPayNode extends Component{
             >
                 <Form
                     layout="horizontal"
+                    onSubmit={this.savePayNode}
                     style={{ paddingBottom: '40px' }}
                 >
                     <Spin spinning={this.state.loading}>
@@ -178,7 +190,6 @@ class OperationPayNode extends Component{
                                     )}
                                 </Form.Item>
                             </div>
-
                             <div className="clearfix">
                                 <Form.Item {...formItemLayout} label="付款科目">
                                     {getFieldDecorator('dunType', {
@@ -187,6 +198,7 @@ class OperationPayNode extends Component{
                                     })(
                                     <Select
                                         onChange={(val) => {
+                                            console.log(val)
                                             this.setState({
                                                 paySubjectName: val,
                                                 dunType: val,
@@ -200,29 +212,19 @@ class OperationPayNode extends Component{
                                                 {item.key}
                                             </Select.Option>
                                         ))}
-                                        <Select.Option key={0} value={0}>
+                                        <Select.Option key={0} value={'0'}>
                                             自定义
                                         </Select.Option>
                                     </Select>)}
                                 </Form.Item>
                             </div>
                             <div className="clearfix">
-                                {parseInt(this.state.paySubjectName) === 0 ? <Form.Item {...formItemLayout} label="付款时间">
+                                {this.state.paySubjectName === '0'? <Form.Item {...formItemLayout} label="付款时间">
                                     {getFieldDecorator('partyTimes', {
-                                        initialValue: payNodeInfor.partyTimes,
+                                        initialValue: payNodeInfor.partyTimes ?  moment(payNodeInfor.partyTimes) : moment(),
                                         rules: [{ required: true, message: '请选择付款时间' }],
                                     })(
-                                        <DatePicker
-                                            // value={
-                                            //     this.state.partyTimes
-                                            //         ? moment(this.state.partyTimes)
-                                            //         : null
-                                            // }
-                                            // onChange={(data, dataString) => {
-                                            //     this.setState({ partyTimes: dataString })
-                                            // }}
-                                            style={{ width: '220px' }}
-                                        />
+                                        <DatePicker showTime format="YYYY-MM-DD" style={{ width: '220px' }}/>
                                     )}
                                 </Form.Item> : <div/>}
                             </div>
@@ -235,7 +237,7 @@ class OperationPayNode extends Component{
                                         <InputNumber
                                             min={1}
                                             precision={0}
-                                            disabled={payNodeInfor.quantity <= 1}
+                                            // disabled={payNodeInfor.quantity <= 1}
                                             placeholder="请输入数量"
                                             onChange={(e) => {
                                                 this.payNodeCalculatedAmount(e)
@@ -247,19 +249,13 @@ class OperationPayNode extends Component{
                             </div>
                             {this.props.projectType !== 2 ? <div className="clearfix">
                                 <Form.Item {...formItemLayout} label="总价(万元)">
-                                    {getFieldDecorator('quantity', {
-                                        initialValue: payNodeInfor.quantity,
-                                        rules: [{ required: true, message: '请输入数量' }],
+                                    {getFieldDecorator('totalAmount', {
+                                        initialValue: payNodeInfor.totalAmount,
+                                        rules: [{ required: true, message: '请输入总价' }],
                                     })(
                                         <Input
                                             type={'number'}
-                                            value={this.state.currentTotalPrice}
                                             placeholder="请输入总价"
-                                            onChange={(e) =>
-                                                this.setState({
-                                                    currentTotalPrice: e.target.value,
-                                                })
-                                            }
                                             style={{ width: '220px' }}
                                         />
                                     )}
@@ -270,7 +266,6 @@ class OperationPayNode extends Component{
                                     <Button
                                         className="cancel"
                                         type="primary"
-                                        onClick={this.savePayNode}
                                         style={{ marginLeft: '300px' }}
                                         htmlType="submit"
                                     >
@@ -279,7 +274,7 @@ class OperationPayNode extends Component{
                                     <Button
                                         className="cancel"
                                         type="ghost"
-                                        onClick={this.handleCancelclose}
+                                        onClick={this.props.onCancel}
                                         style={{ marginLeft: '50px' }}
                                     >
                                         取消
@@ -302,6 +297,9 @@ OperationPayNode.propTypes = {
     supplierList: PropTypes.array.isRequired,                       //第三方信息列表已存在的供应商名字和id信息  用于添加付款节点时的选择对应供应商
     payNodeInfor: PropTypes.object.isRequired,                      //选择的支付节点信息(来自支付节点列表)
     projectType: PropTypes.number.isRequired,                       //项目类型  0正常 1专利 2软著 3审计
+    tid: PropTypes.number.isRequired,                               //订单编号
+    cSort: PropTypes.number.isRequired,                             //项目分类
+    thirdUnitPrice: PropTypes.number.thirdUnitPrice                 //所选信息单价
 }
 
 OperationPayNode.defaultProps = {