mentoswzq hace 4 años
padre
commit
f519620876

+ 751 - 6
js/component/manageCenter/components/checkProject/index.jsx

@@ -67,9 +67,7 @@ class CheckProject extends Component {
           dataIndex: 'totalAmount',
           key: 'totalAmount',
           render: (text, record) => {
-            if (text) {
-              return <span>{text}</span>
-            }
+            return <span>{text}</span>
           },
         },
         {
@@ -192,9 +190,7 @@ class CheckProject extends Component {
           dataIndex: 'totalAmount',
           key: 'totalAmount',
           render: (text, record) => {
-            if (text) {
-              return <span>***</span>
-            }
+              return <span>{text}</span>
           },
         },
         {
@@ -246,10 +242,759 @@ class CheckProject extends Component {
       setTimeout(()=>{
         this.getSelectOutsourceLog();
         this.getSelectOrderPayment();
+        this.projectTypeTabContent(this.props.projectType);
       },500)
     }
   }
 
+  projectTypeTabContent(projectType) {
+    if(projectType === 0){       //0正常 1专利 2软著 3审计
+      this.setState({
+        ContactsListsNew: [
+          {
+            title: '供应商名称',
+            dataIndex: 'companyName',
+            key: 'companyName',
+            render: (text, record, index) => {
+              if (text) {
+                return <span>{text}</span>
+              }
+            },
+          },
+          {
+            title: '单价(万元)',
+            dataIndex: 'unitPrice',
+            key: 'unitPrice',
+            render: (text, record) => {
+              if (text) {
+                return <span>{text}</span>
+              }
+            },
+          },
+          {
+            title: '数量',
+            dataIndex: 'quantity',
+            key: 'quantity',
+            render: (text, record) => {
+              if (text) {
+                return <span>{text}</span>
+              }
+            },
+          },
+          {
+            title: '总价(万元)',
+            dataIndex: 'totalAmount',
+            key: 'totalAmount',
+            render: (text, record) => {
+              if (text) {
+                return <span>{text}</span>
+              }
+            },
+          },
+          {
+            title: '备注',
+            dataIndex: 'remarks',
+            key: 'remarks',
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            key: 'action',
+            render: (text, record) => {
+              return (
+                  <div>
+                    {/*外包审核通过后,咨询师/咨询经理可申请付款*/}
+                    {/*存在支付节点时不显示第三方的申请付款*/}
+                    {/*0-待审核 ,1-审核通过,2-审核拒绝 true [NULL]*/}
+                    {
+                      <Button disabled={
+                        !(this.props.isPreviewPay && (this.props.status === 1 || parseInt(this.props.startType) === 1) && this.props.dataSource.length === 0)
+                      } type="primary" onClick={() => {
+                        this.setState({
+                          previewPayVisible: true,
+                          previewPayInfor: record,
+                        })
+                      }}>
+                        申请付款
+                      </Button>
+                    }
+                    <Popconfirm
+                        title="是否删除?"
+                        onConfirm={() => {
+                          this.confirmDeletNew(record)
+                        }}
+                        okText="删除"
+                        cancelText="不删除"
+                    >
+                      <Button
+                          onClick={(e) => {
+                            e.stopPropagation()
+                          }}
+                          style={{
+                            marginLeft: '10px',
+                            color: '#ffffff',
+                            background: '#f00',
+                            border: 'none',
+                          }}
+                      >
+                        删除
+                      </Button>
+                    </Popconfirm>
+                  </div>
+              )
+            },
+          },
+        ],
+        //付款节点表头
+        PayNodeTableColunms: [
+          {
+            title: '供应商名称',
+            dataIndex: 'companyName',
+            key: 'companyName',
+            render: (text, record, index) => {
+              if (text) {
+                return <span>{text}</span>
+              }
+            },
+          },
+          {
+            title: '付款科目',
+            dataIndex: 'dunType',
+            key: 'dunType',
+            render: (text, record) => {
+              if (text) {
+                return <span>{text}</span>
+              }
+            },
+          },
+          {
+            title: '付款时间',
+            dataIndex: 'partyTimes',
+            key: 'partyTimes',
+            render: (text, record) => {
+              return <span>{text ? text : '/'}</span>
+            },
+          },
+          {
+            title: '数量',
+            dataIndex: 'quantity',
+            key: 'quantity',
+            render: (text, record) => {
+              if (text) {
+                return <span>{text}</span>
+              }
+            },
+          },
+          {
+            title: '总价',
+            dataIndex: 'totalAmount',
+            key: 'totalAmount',
+            render: (text, record) => {
+              return <span>{text}</span>
+            },
+          },
+          {
+            title: '已付',
+            dataIndex: 'partyAmount',
+            key: 'partyAmount',
+            render: (text, record) => {
+              if (text) {
+                return <span>{text}</span>
+              }
+            },
+          },
+          {
+            title: '操作',
+            dataIndex: 'dels',
+            key: 'dels',
+            render: (text, record, index) => {
+              return (
+                  <div>
+                    <Popconfirm
+                        title="是否删除?"
+                        onConfirm={() => {
+                          this.payNodeConfirmDeletNew(record)
+                        }}
+                        okText="删除"
+                        cancelText="不删除"
+                    >
+                      <Button
+                          onClick={(e) => {
+                            e.stopPropagation()
+                          }}
+                          style={{
+                            marginRight: '10px',
+                            color: '#ffffff',
+                            background: '#f00',
+                            border: 'none',
+                          }}
+                      >
+                        删除
+                      </Button>
+                    </Popconfirm>
+                  </div>
+              )
+            },
+          },
+        ],
+      })
+    }else if(projectType === 2){    //2软著
+      this.setState({
+        ContactsListsNew: [
+          {
+            title: '供应商名称',
+            dataIndex: 'companyName',
+            key: 'companyName',
+            render: (text, record, index) => {
+              if (text) {
+                return <span>{text}</span>
+              }
+            },
+          },
+          {
+            title: '单价(万元)',
+            dataIndex: 'unitPrice',
+            key: 'unitPrice',
+            render: (text, record) => {
+              if (text) {
+                return <span>{text}</span>
+              }
+            },
+          },
+          {
+            title: '数量',
+            dataIndex: 'quantity',
+            key: 'quantity',
+            render: (text, record) => {
+              if (text) {
+                return <span>{text}</span>
+              }
+            },
+          },
+          {
+            title: '总价(万元)',
+            dataIndex: 'totalAmount',
+            key: 'totalAmount',
+            render: (text, record) => {
+              if (text) {
+                return <span>***</span>
+              }
+            },
+          },
+          {
+            title: '材料',
+            dataIndex: 'material',
+            key: 'material',
+            render: (text, record) => {
+              return getMaterialStatus(text)
+            },
+          },
+          {
+            title: '加急',
+            dataIndex: 'urgent',
+            key: 'urgent',
+            render: (text, record) => {
+              return getUrgentStatus(text)
+            },
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            key: 'action',
+            render: (text, record) => {
+              return (
+                  <div>
+                    {/*外包审核通过后,咨询师/咨询经理可申请付款*/}
+                    {/*存在支付节点时不显示第三方的申请付款*/}
+                    {/*0-待审核 ,1-审核通过,2-审核拒绝 true [NULL]*/}
+                    {
+                      <Button disabled={
+                        !(this.props.isPreviewPay && (this.props.status === 1 || parseInt(this.props.startType) === 1) && this.props.dataSource.length === 0)
+                      } type="primary" onClick={() => {
+                        this.setState({
+                          previewPayVisible: true,
+                          previewPayInfor: record,
+                        })
+                      }}>
+                        申请付款
+                      </Button>
+                    }
+                    <Popconfirm
+                        title="是否删除?"
+                        onConfirm={() => {
+                          this.confirmDeletNew(record)
+                        }}
+                        okText="删除"
+                        cancelText="不删除"
+                    >
+                      <Button
+                          onClick={(e) => {
+                            e.stopPropagation()
+                          }}
+                          style={{
+                            marginLeft: '10px',
+                            color: '#ffffff',
+                            background: '#f00',
+                            border: 'none',
+                          }}
+                      >
+                        删除
+                      </Button>
+                    </Popconfirm>
+                  </div>
+              )
+            },
+          },
+        ],
+        //付款节点表头
+        PayNodeTableColunms: [
+          {
+            title: '供应商名称',
+            dataIndex: 'companyName',
+            key: 'companyName',
+            render: (text, record, index) => {
+              if (text) {
+                return <span>{text}</span>
+              }
+            },
+          },
+          {
+            title: '付款科目',
+            dataIndex: 'dunType',
+            key: 'dunType',
+            render: (text, record) => {
+              if (text) {
+                return <span>{text}</span>
+              }
+            },
+          },
+          {
+            title: '付款时间',
+            dataIndex: 'partyTimes',
+            key: 'partyTimes',
+            render: (text, record) => {
+              return <span>{text ? text : '/'}</span>
+            },
+          },
+          {
+            title: '数量',
+            dataIndex: 'quantity',
+            key: 'quantity',
+            render: (text, record) => {
+              if (text) {
+                return <span>{text}</span>
+              }
+            },
+          },
+          {
+            title: '总价',
+            dataIndex: 'totalAmount',
+            key: 'totalAmount',
+            render: (text, record) => {
+              return <span>***</span>
+            },
+          },
+          {
+            title: '已付',
+            dataIndex: 'partyAmount',
+            key: 'partyAmount',
+            render: (text, record) => {
+              if (text) {
+                return <span>{text}</span>
+              }
+            },
+          },
+          {
+            title: '操作',
+            dataIndex: 'dels',
+            key: 'dels',
+            render: (text, record, index) => {
+              return (
+                  <div>
+                    <Popconfirm
+                        title="是否删除?"
+                        onConfirm={() => {
+                          this.payNodeConfirmDeletNew(record)
+                        }}
+                        okText="删除"
+                        cancelText="不删除"
+                    >
+                      <Button
+                          onClick={(e) => {
+                            e.stopPropagation()
+                          }}
+                          style={{
+                            marginRight: '10px',
+                            color: '#ffffff',
+                            background: '#f00',
+                            border: 'none',
+                          }}
+                      >
+                        删除
+                      </Button>
+                    </Popconfirm>
+                  </div>
+              )
+            },
+          },
+        ],
+      })
+    }else if(projectType === 1){       //1专利
+      if(this.props.patentType === 0){      //专利申请
+        this.setState({
+          ContactsListsNew: [
+            {
+              title: '供应商名称',
+              dataIndex: 'companyName',
+              key: 'companyName',
+              render: (text, record, index) => {
+                if (text) {
+                  return <span>{text}</span>
+                }
+              },
+            },
+            {
+              title: '单价(万元)',
+              dataIndex: 'unitPrice',
+              key: 'unitPrice',
+              render: (text, record) => {
+                if (text) {
+                  return <span>{text}</span>
+                }
+              },
+            },
+            {
+              title: '数量',
+              dataIndex: 'quantity',
+              key: 'quantity',
+              render: (text, record) => {
+                if (text) {
+                  return <span>{text}</span>
+                }
+              },
+            },
+            {
+              title: "官费",
+              dataIndex: "officialCost",
+              key: "officialCost",
+              render: (text) => {
+                return text === 1 ? '含官费' : '不含官费'
+              },
+            },
+            {
+              title: "费减",
+              dataIndex: "costReduction",
+              key: "costReduction",
+              render: (text) => {
+                return text === 1 ? '有费减' : '无费减'
+              },
+            },
+            {
+              title: '总价(万元)',
+              dataIndex: 'totalAmount',
+              key: 'totalAmount',
+              render: (text, record) => {
+                if (text) {
+                  return <span>{text}</span>
+                }
+              },
+            },
+            {
+              title: '备注',
+              dataIndex: 'remarks',
+              key: 'remarks',
+            },
+            {
+              title: '操作',
+              dataIndex: 'action',
+              key: 'action',
+              render: (text, record) => {
+                return (
+                    <div>
+                      {/*外包审核通过后,咨询师/咨询经理可申请付款*/}
+                      {/*存在支付节点时不显示第三方的申请付款*/}
+                      {/*0-待审核 ,1-审核通过,2-审核拒绝 true [NULL]*/}
+                      {
+                        <Button disabled={
+                          !(this.props.isPreviewPay && (this.props.status === 1 || parseInt(this.props.startType) === 1) && this.props.dataSource.length === 0)
+                        } type="primary" onClick={() => {
+                          this.setState({
+                            previewPayVisible: true,
+                            previewPayInfor: record,
+                          })
+                        }}>
+                          申请付款
+                        </Button>
+                      }
+                      {
+                        <Button
+                            type="primary"
+                            style={{
+                              marginLeft: '10px',
+                            }}
+                            disabled={!(this.props.isPreviewPay && (this.props.status === 1 || parseInt(this.props.startType) === 1) && this.props.dataSource.length === 0)}
+                            onClick={() => {
+                              this.setState({
+                                previewPayVisible: true,
+                                previewPayInfor: record,
+                              })
+                            }}>
+                          付官费
+                        </Button>
+                      }
+                      <Popconfirm
+                          title="是否删除?"
+                          onConfirm={() => {
+                            this.confirmDeletNew(record)
+                          }}
+                          okText="删除"
+                          cancelText="不删除"
+                      >
+                        <Button
+                            onClick={(e) => {
+                              e.stopPropagation()
+                            }}
+                            style={{
+                              marginLeft: '10px',
+                              color: '#ffffff',
+                              background: '#f00',
+                              border: 'none',
+                            }}
+                        >
+                          删除
+                        </Button>
+                      </Popconfirm>
+                    </div>
+                )
+              },
+            },
+          ]
+        })
+      }else{
+        this.setState({
+          ContactsListsNew: [
+            {
+              title: '供应商名称',
+              dataIndex: 'companyName',
+              key: 'companyName',
+              render: (text, record, index) => {
+                if (text) {
+                  return <span>{text}</span>
+                }
+              },
+            },
+            {
+              title: '单价(万元)',
+              dataIndex: 'unitPrice',
+              key: 'unitPrice',
+              render: (text, record) => {
+                if (text) {
+                  return <span>{text}</span>
+                }
+              },
+            },
+            {
+              title: '数量',
+              dataIndex: 'quantity',
+              key: 'quantity',
+              render: (text, record) => {
+                if (text) {
+                  return <span>{text}</span>
+                }
+              },
+            },
+            {
+              title: '总价(万元)',
+              dataIndex: 'totalAmount',
+              key: 'totalAmount',
+              render: (text, record) => {
+                if (text) {
+                  return <span>{text}</span>
+                }
+              },
+            },
+            {
+              title: '备注',
+              dataIndex: 'remarks',
+              key: 'remarks',
+            },
+            {
+              title: '操作',
+              dataIndex: 'action',
+              key: 'action',
+              render: (text, record) => {
+                return (
+                    <div>
+                      {/*外包审核通过后,咨询师/咨询经理可申请付款*/}
+                      {/*存在支付节点时不显示第三方的申请付款*/}
+                      {/*0-待审核 ,1-审核通过,2-审核拒绝 true [NULL]*/}
+                      {
+                        <Button disabled={
+                          !(this.props.isPreviewPay && (this.props.status === 1 || parseInt(this.props.startType) === 1) && this.props.dataSource.length === 0)
+                        } type="primary" onClick={() => {
+                          this.setState({
+                            previewPayVisible: true,
+                            previewPayInfor: record,
+                          })
+                        }}>
+                          申请付款
+                        </Button>
+                      }
+                      <Popconfirm
+                          title="是否删除?"
+                          onConfirm={() => {
+                            this.confirmDeletNew(record)
+                          }}
+                          okText="删除"
+                          cancelText="不删除"
+                      >
+                        <Button
+                            onClick={(e) => {
+                              e.stopPropagation()
+                            }}
+                            style={{
+                              marginLeft: '10px',
+                              color: '#ffffff',
+                              background: '#f00',
+                              border: 'none',
+                            }}
+                        >
+                          删除
+                        </Button>
+                      </Popconfirm>
+                    </div>
+                )
+              },
+            },
+          ]
+        })
+      }
+    }else if(projectType === 3){  //3审计
+      this.setState({
+        ContactsListsNew: [
+          {
+            title: '供应商名称',
+            dataIndex: 'companyName',
+            key: 'companyName',
+            render: (text, record, index) => {
+              if (text) {
+                return <span>{text}</span>
+              }
+            },
+          },
+          {
+            title: '单价(万元)',
+            dataIndex: 'unitPrice',
+            key: 'unitPrice',
+            render: (text, record) => {
+              if (text) {
+                return <span>{text}</span>
+              }
+            },
+          },
+          {
+            title: '数量',
+            dataIndex: 'quantity',
+            key: 'quantity',
+            render: (text, record) => {
+              if (text) {
+                return <span>{text}</span>
+              }
+            },
+          },
+          {
+            title: '总价(万元)',
+            dataIndex: 'totalAmount',
+            key: 'totalAmount',
+            render: (text, record) => {
+              if (text) {
+                return <span>***</span>
+              }
+            },
+          },
+          {
+            title: '审计',
+            dataIndex: 'audit',
+            key: 'audit',
+            render: (text, record) => {
+              if (text) {
+                return <span>{text===0?'无审计':text===1?'年审':'专审'}</span>
+              }
+            },
+          },
+          {
+            title: '公司资产(万元)',
+            dataIndex: 'assets',
+            key: 'assets',
+            render: (text, record) => {
+              if (text) {
+                return <span>{text}</span>
+              }
+            },
+          },
+          {
+            title: '收入(万元)',
+            dataIndex: 'income',
+            key: 'income',
+            render: (text, record) => {
+              if (text) {
+                return <span>{text}</span>
+              }
+            },
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            key: 'action',
+            render: (text, record) => {
+              return (
+                  <div>
+                    {/*外包审核通过后,咨询师/咨询经理可申请付款*/}
+                    {/*存在支付节点时不显示第三方的申请付款*/}
+                    {/*0-待审核 ,1-审核通过,2-审核拒绝 true [NULL]*/}
+                    {
+                      <Button disabled={
+                        !(this.props.isPreviewPay && (this.props.status === 1 || parseInt(this.props.startType) === 1) && this.props.dataSource.length === 0)
+                      } type="primary" onClick={() => {
+                        this.setState({
+                          previewPayVisible: true,
+                          previewPayInfor: record,
+                        })
+                      }}>
+                        申请付款
+                      </Button>
+                    }
+                    <Popconfirm
+                        title="是否删除?"
+                        onConfirm={() => {
+                          this.confirmDeletNew(record)
+                        }}
+                        okText="删除"
+                        cancelText="不删除"
+                    >
+                      <Button
+                          onClick={(e) => {
+                            e.stopPropagation()
+                          }}
+                          style={{
+                            marginLeft: '10px',
+                            color: '#ffffff',
+                            background: '#f00',
+                            border: 'none',
+                          }}
+                      >
+                        删除
+                      </Button>
+                    </Popconfirm>
+                  </div>
+              )
+            },
+          },
+        ]
+      })
+    }
+  }
+
   onChange() {
     this.setState({
       value: e.target.value,

+ 137 - 47
js/component/manageCenter/project/task/myTask.jsx

@@ -181,7 +181,7 @@ const Task = React.createClass({
                     ')'
                   : thisdata.userName, //用户名
               depName: thisdata.depName, //部门名称
-              projectType: thisdata.projectType, //0正常 1专利 2软著
+              projectType: thisdata.projectType, //0正常 1专利 2软著 3审计
               commodityQuantity: thisdata.commodityQuantity, //项目数量
               hours: thisdata.hours,
               contractNo: thisdata.contractNo,
@@ -852,7 +852,7 @@ const Task = React.createClass({
   },
   //用于判断 第三方信息表格显示
   projectTypeTabContent(projectType) {
-    if(projectType === 0){       //0正常 1专利 2软著
+    if(projectType === 0){       //0正常 1专利 2软著 3审计
       this.setState({
         ContactsListsNew: [
           {
@@ -1244,7 +1244,6 @@ const Task = React.createClass({
         ],
       })
     }else if(projectType === 1){       //1专利
-      console.log(this.state.patentType,'asjdlkasjdlajsldjasldjlasjl')
       if(this.state.patentType === 0){      //专利申请
         this.setState({
           ContactsListsNew: [
@@ -1474,6 +1473,129 @@ const Task = React.createClass({
           ]
         })
       }
+    }else if(projectType === 3){  //3审计
+      this.setState({
+        ContactsListsNew: [
+          {
+            title: '供应商名称',
+            dataIndex: 'companyName',
+            key: 'companyName',
+            render: (text, record, index) => {
+              if (text) {
+                return <span>{text}</span>
+              }
+            },
+          },
+          {
+            title: '单价(万元)',
+            dataIndex: 'unitPrice',
+            key: 'unitPrice',
+            render: (text, record) => {
+              if (text) {
+                return <span>{text}</span>
+              }
+            },
+          },
+          {
+            title: '数量',
+            dataIndex: 'quantity',
+            key: 'quantity',
+            render: (text, record) => {
+              if (text) {
+                return <span>{text}</span>
+              }
+            },
+          },
+          {
+            title: '总价(万元)',
+            dataIndex: 'totalAmount',
+            key: 'totalAmount',
+            render: (text, record) => {
+              if (text) {
+                return <span>***</span>
+              }
+            },
+          },
+          {
+            title: '审计',
+            dataIndex: 'audit',
+            key: 'audit',
+            render: (text, record) => {
+              if (text) {
+                return <span>{text===0?'无审计':text===1?'年审':'专审'}</span>
+              }
+            },
+          },
+          {
+            title: '公司资产(万元)',
+            dataIndex: 'assets',
+            key: 'assets',
+            render: (text, record) => {
+              if (text) {
+                return <span>{text}</span>
+              }
+            },
+          },
+          {
+            title: '收入(万元)',
+            dataIndex: 'income',
+            key: 'income',
+            render: (text, record) => {
+              if (text) {
+                return <span>{text}</span>
+              }
+            },
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            key: 'action',
+            render: (text, record) => {
+              return (
+                  <div>
+                    {/*外包审核通过后,咨询师/咨询经理可申请付款*/}
+                    {/*存在支付节点时不显示第三方的申请付款*/}
+                    {/*0-待审核 ,1-审核通过,2-审核拒绝 true [NULL]*/}
+                    {
+                      <Button disabled={
+                        !(this.props.isPreviewPay && (this.props.status === 1 || parseInt(this.props.startType) === 1) && this.props.dataSource.length === 0)
+                      } type="primary" onClick={() => {
+                        this.setState({
+                          previewPayVisible: true,
+                          previewPayInfor: record,
+                        })
+                      }}>
+                        申请付款
+                      </Button>
+                    }
+                    <Popconfirm
+                        title="是否删除?"
+                        onConfirm={() => {
+                          this.confirmDeletNew(record)
+                        }}
+                        okText="删除"
+                        cancelText="不删除"
+                    >
+                      <Button
+                          onClick={(e) => {
+                            e.stopPropagation()
+                          }}
+                          style={{
+                            marginLeft: '10px',
+                            color: '#ffffff',
+                            background: '#f00',
+                            border: 'none',
+                          }}
+                      >
+                        删除
+                      </Button>
+                    </Popconfirm>
+                  </div>
+              )
+            },
+          },
+        ]
+      })
     }
   },
   setColor() {
@@ -2734,44 +2856,11 @@ const Task = React.createClass({
             allTotalAmount = 0
           }
 
-          let hash = {};
-
-          let arr1 = theArr.reduceRight((item, next) => {
-            hash[next.cid] ? '' : hash[next.cid] = true && item.push(next);
-            return item
-          }, []);
-          for(let i=0;i<arr1.length;i++){
-            let index = 0;
-            let arrIndex = 0;
-            for(let d=0;d<theArr.length;d++){
-              if(arr1[i].cid === theArr[d].cid){
-                theArr[d].companyName = theArr[d].companyName;
-                companyNameArr[d] = {
-                  companyName: theArr[d].companyName,
-                  id: theArr[d].id,
-                }
-                if(index !== 0){
-                  if(index === 1){
-                    theArr[arrIndex].companyName = theArr[arrIndex].companyName+ '-' + theArr[arrIndex].id;
-                    companyNameArr[arrIndex] = {
-                      companyName: theArr[arrIndex].companyName,
-                      id: theArr[arrIndex].id,
-                    }
-                  }
-                  theArr[d].companyName = theArr[d].companyName + '-' + theArr[d].id;
-                  companyNameArr[d]= {
-                    companyName: theArr[d].companyName,
-                    id: theArr[d].id,
-                  };
-                }
-                index++;
-                arrIndex = d;
-              }else{
-                companyNameArr[d] = {
-                  companyName: theArr[d].companyName,
-                  id: theArr[d].id,
-                }
-              }
+          for(let d=0;d<theArr.length;d++){
+            theArr[d].companyName = theArr[d].companyName+ '-' + theArr[d].id;
+            companyNameArr[d] = {
+              companyName: theArr[d].companyName,
+              id: theArr[d].id,
             }
           }
 
@@ -2841,7 +2930,7 @@ const Task = React.createClass({
           }
 
           for(let d=0;d<payNodeArr.length;d++){
-            payNodeArr[d].companyName = payNodeArr[d].companyName+ '-' + payNodeArr[arrIndex].cid;
+            payNodeArr[d].companyName = payNodeArr[d].companyName+ '-' + payNodeArr[d].cid;
           }
 
           console.log('payNodeArr:', payNodeArr)
@@ -3040,7 +3129,7 @@ const Task = React.createClass({
     if(this.state.paySubjectName === '0'){
       data.partyTimes = this.state.partyTimes //付款时间
     }
-    if(this.state.projectType !== 2){                    //其他类型   0正常 1专利 2软著
+    if(this.state.projectType !== 2){                   //其他类型   0正常 1专利 2软著 3审计
       data.totalAmount = this.state.currentTotalPrice   //总价
       data.unitPrice = this.state.thirdUnitPrice        //单价
     }
@@ -4337,7 +4426,7 @@ const Task = React.createClass({
                                     _this.projectTypeTabContent(_this.state.projectType);
                                   })
                                   _this.confirmDeletNew(-1,resolve,reject)
-                                  if(this.state.payNodeList.length > 0){
+                                  if(_this.state.payNodeList.length > 0){
                                     _this.payNodeConfirmDeletNew(-1,resolve,reject);
                                   }
                                 }).catch(() => console.log('Oops errors!'));
@@ -4625,11 +4714,12 @@ const Task = React.createClass({
               ) : (
                   <div>
                     {
-                      this.state.visible ?
+                      this.state.visible && this.state.activeKey === '2' ?
                           <CheckProject
                               {...this.props}
                               tid={this.state.tid}
-                              projectType={this.state.projectType}    //0正常 1专利 2软著
+                              projectType={this.state.projectType}    //0正常 1专利 2软著 3审计
+                              patentType={this.state.patentType}
                               status={this.state.refundStatus}
                               isPreviewPay={true}
                               thirdInfoList={this.state.thirdInfoList}
@@ -5795,7 +5885,7 @@ const Task = React.createClass({
           visible={this.state.PayNodeVisible}
           onCancel={this.handleCancelclose}
           width={800}
-          title="新增付款节点"
+          title={this.state.ThirdId ? "修改付款节点" : "新增付款节点"}
           footer=""
           // width={1300}
           className="admin-desc-content"

+ 3 - 2
js/component/manageCenter/project/task/myTaskOutsource.jsx

@@ -2929,10 +2929,11 @@ const MyTaskOutsource = React.createClass({
               </Form>
             </TabPane>
             <TabPane tab="外包接单公司信息" key="2">
-              <CheckProject
+              {this.state.visible && this.state.modKey === '2'?<CheckProject
                   {...this.props}
                   tid={this.state.tid}
                   status={this.state.refundStatus}
+                  patentType={this.state.patentType}
                   isPreviewPay={true}
                   thirdInfoList={this.state.thirdInfoList}
                   dataSource={this.state.payNodeList}
@@ -2946,7 +2947,7 @@ const MyTaskOutsource = React.createClass({
                     this.payNodeTable(this.state.tid)
                     this.loadData(this.state.page)
                   }}
-              />
+              />:<div/>}
             </TabPane>
             {!this.props.isZxs || (this.state.isHuiyuan && this.props.isZxs) ? (
               <TabPane tab="订单详情" key="3">

+ 77 - 0
js/component/manageCenter/project/task/newSupplier.js

@@ -163,6 +163,25 @@ class NewSupplier extends Component{
         //     data.costReduction = this.state.costReduction; //是否有费减
         // }
         data.type = this.props.patentType === 0 ? 1 : (this.props.patentType ? 2 : 0)   //0其他 1专利申请 2专利买卖
+        if(this.state.projectType === 3){
+            if(!this.state.assets){
+                message.warning("请选择审计!");
+                return false;
+            }
+            if(!this.state.assets){
+                message.warning("请输入公司资产!");
+                return false;
+            }
+            if(!this.state.assets){
+                message.warning("请输入收入!");
+                return false;
+            }
+        }
+        if(this.state.projectType === 3){                   //审计
+            data.assets = this.state.assets; //资产
+            data.audit = this.state.audit;   //0无审计 1年审 2专审
+            data.income = this.state.income;   //收入
+        }
         $.ajax({
             url: globalConfig.context + api,
             method: 'post',
@@ -371,6 +390,64 @@ class NewSupplier extends Component{
                             {/*        </div>*/}
                             {/*    </div> : <div/>*/}
                             {/*}*/}
+                            {
+                                this.state.projectType === 3 ? <div>
+                                    <div className="clearfix">
+                                        <Form.Item {...formItemLayout} label="审计">
+                                            <Select
+                                                value={this.state.audit}
+                                                onChange={(val) => {
+                                                    this.setState({
+                                                        audit: val,
+                                                    })
+                                                }}
+                                                style={{ width: '220px' }}
+                                                defaultValue="0"
+                                            >
+                                                {/*0无审计 1年审 2专审*/}
+                                                <Option value={0}>无审计</Option>
+                                                <Option value={1}>年审</Option>
+                                                <Option value={2}>专审</Option>
+                                            </Select>
+                                            <span className="mandatory">*</span>
+                                        </Form.Item>
+                                    </div>
+                                    <div className="clearfix">
+                                        <Form.Item {...formItemLayout} label="公司资产(万元)">
+                                            <Input
+                                                value={this.state.assets}
+                                                placeholder="请输入公司资产"
+                                                required="required"
+                                                type={'number'}
+                                                onChange={(e) => {
+                                                    this.setState({
+                                                        assets: e.target.value,
+                                                    })
+                                                }}
+                                                style={{ width: '220px' }}
+                                            />
+                                            <span className="mandatory">*</span>
+                                        </Form.Item>
+                                    </div>
+                                    <div className="clearfix">
+                                        <Form.Item {...formItemLayout} label="收入(万元)">
+                                            <Input
+                                                value={this.state.income}
+                                                placeholder="请输入收入"
+                                                required="required"
+                                                type={'number'}
+                                                onChange={(e) => {
+                                                    this.setState({
+                                                        income: e.target.value,
+                                                    })
+                                                }}
+                                                style={{ width: '220px' }}
+                                            />
+                                            <span className="mandatory">*</span>
+                                        </Form.Item>
+                                    </div>
+                                </div> : <div/>
+                            }
                             <div className="clearfix">
                                 <Form.Item
                                     style={{ height: 'auto' }}