ソースを参照

修改支付供应商

mentoswzq 4 年 前
コミット
6d2facf8e3

+ 2 - 2
js/component/manageCenter/components/checkProject/applyPaymentModal.js

@@ -277,7 +277,7 @@ class ApplyPaymentModal extends Component{
                                     initialValue:this.props.type === 2 ?(
                                         ((previewPayInfor.costReduction === 1 ? previewPayInfor.reductionAmount : previewPayInfor.officialUnitPrice) * 1000000 * parseInt(previewPayInfor.quantity)) / 1000000
                                     ): (
-                                        typeof previewPayInfor.totalAmount === 'number' && typeof previewPayInfor.partyAmount === 'number'?
+                                        !isNaN(parseFloat(previewPayInfor.totalAmount)) && !isNaN(parseFloat(previewPayInfor.partyAmount))?
                                         (
                                             this.state.paymentStatus === 1 ?
                                             (previewPayInfor.partyAmount ?
@@ -286,7 +286,7 @@ class ApplyPaymentModal extends Component{
                                             previewPayInfor.partyAmount ?
                                                 ((parseFloat(previewPayInfor.totalAmount) * 1000000) - (parseFloat(previewPayInfor.partyAmount) * 1000000)) / 1000000 :
                                             parseFloat(previewPayInfor.totalAmount)
-                                        ) : 0
+                                        ) : null
                                     ),
                                     rules: [{ required: true, message: '请输入本次申请支付金额!' }],
                                 })(

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

@@ -24,11 +24,16 @@ class CostAuditList extends Component{
             loading: true,
             columns: [
                 {
-                    title: "项目编号",
+                    title: "支付编号",
                     dataIndex: "key",
                     key: "key",
                 },
                 {
+                    title: "项目编号",
+                    dataIndex: "tid",
+                    key: "tid",
+                },
+                {
                     title: "项目名称",
                     dataIndex: "pname",
                     key: "pname",
@@ -378,7 +383,7 @@ class CostAuditList extends Component{
                           projectType={this.state.selectInfor.projectType}
                           projectStatus={this.state.selectInfor.projectStatus}
                           taskName={this.state.selectInfor.pname}
-                          taskID={this.state.selectInfor.id}
+                          taskID={this.state.selectInfor.tid}
                           visible={this.state.visible}
                           refreshList={()=>{
                               this.loadData();

+ 28 - 12
js/component/manageCenter/order/orderNew/outsourcingPro.jsx

@@ -209,6 +209,16 @@ const outsourcingPro = Form.create()(
         },
         columns: [
           {
+            title: "项目编号",
+            dataIndex: "tid",
+            key: "tid",
+          },
+          {
+            title: "项目名称",
+            dataIndex: "bname",
+            key: "bname",
+          },
+          {
             title: "订单编号",
             dataIndex: "orderNo",
             key: "orderNo",
@@ -239,16 +249,6 @@ const outsourcingPro = Form.create()(
             key: "cname",
           },
           {
-            title: "项目编号",
-            dataIndex: "tid",
-            key: "tid",
-          },
-          {
-            title: "项目名称",
-            dataIndex: "bname",
-            key: "bname",
-          },
-          {
             title: "项目负责人",
             dataIndex: "pname",
             key: "pname",
@@ -985,9 +985,10 @@ const outsourcingPro = Form.create()(
           loading: true,
           refundStatus: record.refundStatus,
           tid: record.tid,
+          taskName: record.bname,
         },
         () => {
-          console.log(this.state.tid);
+          console.log(record);
         }
       );
       this.xiangqing(record.orderNo);
@@ -1418,7 +1419,22 @@ const outsourcingPro = Form.create()(
               className="admin-desc-content"
               confirmLoading={this.state.confirmLoading}
             >
-              <Tabs activeKey={this.state.activeKey} onChange={this.callback}>
+              <Tabs
+                  activeKey={this.state.activeKey}
+                  onChange={this.callback}
+                  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.tid}</span>
+                      </span>
+                    </div>
+                  }
+              >
                 <TabPane tab="订单详情" key="1">
                   <Form
                     layout="horizontal"

+ 1 - 1
js/component/manageCenter/project/task/operationPayNode.js

@@ -299,7 +299,7 @@ OperationPayNode.propTypes = {
     projectType: PropTypes.number.isRequired,                       //项目类型  0正常 1专利 2软著 3审计
     tid: PropTypes.number.isRequired,                               //订单编号
     cSort: PropTypes.number.isRequired,                             //项目分类
-    thirdUnitPrice: PropTypes.number.thirdUnitPrice                 //所选信息单价
+    thirdUnitPrice: PropTypes.number.isRequired                     //所选信息单价
 }
 
 OperationPayNode.defaultProps = {