Bläddra i källkod

支付记录 增加供应商名称显示

mentoswzq 4 år sedan
förälder
incheckning
6d207a913a

+ 18 - 14
js/component/manageCenter/components/checkProject/index.jsx

@@ -1022,22 +1022,22 @@ class CheckProject extends Component {
                   编号
                 </div>
               </Col>
-              {/*<Col className="gutter-row" span={5}>*/}
-              {/*  <div className="gutter-box">*/}
-              {/*    订单编号*/}
-              {/*  </div>*/}
-              {/*</Col>*/}
               <Col className="gutter-row" span={5}>
                 <div className="gutter-box">
+                  供应商名称
+                </div>
+              </Col>
+              <Col className="gutter-row" span={3}>
+                <div className="gutter-box">
                   支付类型
                 </div>
               </Col>
-              <Col className="gutter-row" span={5}>
+              <Col className="gutter-row" span={4}>
                 <div className="gutter-box">
                   申请支付金额(万元)
                 </div>
               </Col>
-              <Col className="gutter-row" span={6}>
+              <Col className="gutter-row" span={4}>
                 <div className="gutter-box">
                   申请时间
                 </div>
@@ -1064,23 +1064,27 @@ class CheckProject extends Component {
                           {value.id}
                         </div>
                       </Col>
-                      {/*<Col className="gutter-row" span={5}>*/}
-                      {/*  <div className="gutter-box">*/}
-                      {/*    订单编号*/}
-                      {/*  </div>*/}
-                      {/*</Col>*/}
                       <Col className="gutter-row" span={5}>
                         <div className="gutter-box">
+                          {value.companyName+'-'+value.tpcId}
+                          {
+                            value.companyName !== value.tpcName ?
+                                '('+value.tpcName+')' : ''
+                          }
+                        </div>
+                      </Col>
+                      <Col className="gutter-row" span={3}>
+                        <div className="gutter-box">
                           {/*0第三方 1催款 2官费*/}
                           {value.chooseType === 0 ? '第三方' : value.chooseType === 1 ? '催款' : '官费'}
                         </div>
                       </Col>
-                      <Col className="gutter-row" span={5}>
+                      <Col className="gutter-row" span={4}>
                         <div className="gutter-box">
                           {value.applicationAmount}
                         </div>
                       </Col>
-                      <Col className="gutter-row" span={6}>
+                      <Col className="gutter-row" span={4}>
                         <div className="gutter-box">
                           {value.createTimes}
                         </div>

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

@@ -125,11 +125,18 @@ class DetailsModal extends Component{
                             cid: thisData.cid, //机构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,
+                        // }
+                    }
+
                     if (!allTotalAmount) {
                         allTotalAmount = 0
                     }
-                    console.log(theArr)
-                    console.log(companyNameArr)
 
                     this.setState({
                         thirdInfoList: theArr,
@@ -191,6 +198,11 @@ class DetailsModal extends Component{
                             cid: thisData.cid, //机构id
                         })
                     }
+
+                    for(let d=0;d<payNodeArr.length;d++){
+                        payNodeArr[d].companyName = payNodeArr[d].companyName+ '-' + payNodeArr[d].cid;
+                    }
+
                     this.setState({
                         payNodeList: payNodeArr,
                     })