前端

public/static/payprint1.html

@@ -1186,7 +1186,7 @@
             if (cwprint == 'true') {
                 if (this.selectPrint) {
                     for (let i = 0; i < this.customerList1.length; i++) {
-                        let _url1 = this.customerList1[i].cardAddressUrl.split(',')
+                        let _url1 = this.customerList1[i].identityAuthenticationInfo.cardAddressUrl.split(',')
                             // let _url2 = this.customerList1[i].payeeAddressUrl.split(',')
                         this.customerList1[i].imgURl = {
                             imageUrl1: _url1[0],

src/views/houseSelfCollect/paymentManagement.vue

@@ -994,23 +994,23 @@
           let index1 = 0
           let index2 = 0
           for (let i = 0; i < this.modification.length; i++) {
-            await getCustomerLook({  
-                id: this.modification[i].identityId,
-                authenticationStatusKey: 7,
-              })
-              .toPromise()
-              .then((response) => {
-                this.selectCustomerList.push(response)
-                index2++
-                if (
-                  index1 == this.modification.length &&
-                  index2 == this.modification.length
-                ) {
-                  this.printData.compName = ''
-                  // this.isShowPrint = true
-                  this.printBig()
-                }
-                getpaymentexamine({
+            //  getCustomerLook({  
+            //     id: this.modification[i].identityId,
+            //     authenticationStatusKey: 7,
+            //   })
+            //   .toPromise()
+            //   .then((response) => {
+            //     this.selectCustomerList.push(response)
+            //     index2++
+            //     if (
+            //       index1 == this.modification.length &&
+            //       index2 == this.modification.length
+            //     ) {
+            //       this.printData.compName = ''
+            //       // this.isShowPrint = true
+            //       this.printBig()
+            //     }
+                await getpaymentexamine({
                     id: this.modification[i].id,
                   })
                   .toPromise()
@@ -1027,17 +1027,17 @@
                       '月' +
                       date.getDate() +
                       '日'
+                    this.selectCustomerList.push(response)
                     this.selectPrintList.push(response)
                     if (
-                      index1 == this.modification.length &&
-                      index2 == this.modification.length
+                      index1 == this.modification.length 
                     ) {
                       this.printData.compName = ''
                       // this.isShowPrint = true
                       this.printBig()
                     }
                   })
-              })
+              // })
           }
         } else {
           let _url1 = process.env.VUE_APP_BASE_API + '/identityAuthenticationInfo/api/getIdentityAuthenticationInfo'

src/views/profitable/cashoutaduit.vue

@@ -133,58 +133,63 @@
           </el-table>
 
       </div> -->
-      <div v-if='(deptBudgetList.expensesPurpose==2)'>
-        <div class="wenzi">车辆详情</div>
-        <el-table :data="deptBudgetList.tranSettlementReportList" style="width: 90%; margin: 20px auto; " ref="warehouseList"  >
-        <el-table-column type="index" label="序号" width="50"></el-table-column>
-        <el-table-column class="table_td" prop="contractNo" width="120" label="合同编号"></el-table-column>
-        <el-table-column class="table_td" prop="startAddress" width="120" label="发货库"></el-table-column>
-        <el-table-column class="table_td" prop="createDate" width="120" label="发货时间"></el-table-column>
-        <el-table-column class="table_td" prop="carNo" label="车牌号" width="140"></el-table-column>
-        <el-table-column width="100" class="table_td" prop="loadingWeight" label="装车净重(吨)">
-        </el-table-column>
-        <el-table-column width="100" class="table_td" prop="unloadingWeight" label="卸车净重(吨)">
-        </el-table-column>
-        <el-table-column width="120" class="table_td" prop="transportDamage" label="公司承担运损">
-        </el-table-column>
-        <el-table-column width="100" class="table_td" prop="lossWeight" label="损耗(吨)">
-        </el-table-column>
-        <el-table-column width="120" class="table_td" prop="actualLoss" label="实际损耗">
-        </el-table-column>
-        <el-table-column width="120" class="table_td" prop="transportPrice" label="预计单价(元/吨)"></el-table-column>
-        <el-table-column width="120" class="table_td" prop="settlementPrice" label="结算单价(元/吨)">
-        </el-table-column>
-        <el-table-column width="120" class="table_td" prop="settlementWeight" label="结算重量(吨)"></el-table-column>
-        <el-table-column width="120" class="table_td" prop="cargoDamage" label="货损">
-        </el-table-column>
-        <el-table-column width="120" class="table_td" prop="deductionAmount" label="扣款(元)"></el-table-column>
-        <el-table-column width="100" class="table_td" label="服务费(元)" prop="serviceCharge">
-        </el-table-column>
-        <el-table-column width="100" class="table_td" label="实付金额(元)" prop="amountActuallyPaid"></el-table-column>
-        <el-table-column width="100" class="table_td" label="税点(元)" prop="taxPoint"></el-table-column>
-        <el-table-column width="100" class="table_td" label="合计应付(元)" prop="totalPayable"></el-table-column>
-        <el-table-column width="100" class="table_td" label="已付金额(元)" prop="amountEdPayable">
-        </el-table-column>
-        <el-table-column width="100" class="table_td" label="未付金额(元)" prop="amountNotPayable"></el-table-column>
-        <el-table-column width="100" class="table_td" label="已开发票(元)" prop="alreadyInvoice">
-        </el-table-column>
-        <el-table-column width="150" class="table_td" label="付款日期" prop="paymentDate"></el-table-column>
-          <el-table-column width="150" class="table_td" label="司机/车队" prop="name">
-            <template
-              slot-scope="scope">
-              {{ scope.row.name }}
-              <span v-if="scope.row.fleetFlag==1">(队)</span>
-            </template>
-            </el-table-column>
-          </el-table>
-        <div style='width:90%;margin:10px auto;text-align:right;'>
-          <el-button class="bg-bottom" type="primary" size="small" @click="reject()">驳回
-        </el-button>
-        <el-button class="bg-bottom" type="primary" size="small" @click="pass()">通过
-        </el-button>
+      <div v-if='deptBudgetList.expensesPurpose==2'>
+          <div v-for="item in deptBudgetList.tranTaskInfoList">
+            <el-form label-position="left">
+              <el-form-item label-width='100px' label="运输编号" span="1" prop="payee">
+                {{item.taskNo}}
+              </el-form-item>
+              <el-form-item label-width='100px' label="发货地" span="1" prop="accountNumber">
+              {{item.startPrivate}}{{item.startCity}}{{item.startArea}}{{item.startDetailedAddress}}
+              </el-form-item>
+              <el-form-item label-width='100px' label="收货地" span="1" prop="bank">
+                {{item.endPrivate}}{{item.endCity}}{{item.endArea}}{{item.endDetailedAddress}}
+              </el-form-item>
+            </el-form>
+            <el-table :data="item.tranSettlementReportList" style="width: 90%; margin: 20px auto; " ref="warehouseList" v-if='deptBudgetList.expensesPurpose==2' >
+          <el-table-column type="index" label="序号" width="50"></el-table-column>
+          <el-table-column class="table_td" prop="contractNo" width="120" label="合同编号"></el-table-column>
+          <el-table-column class="table_td" prop="startAddress" width="120" label="发货库"></el-table-column>
+          <el-table-column class="table_td" prop="createDate" width="120" label="发货时间"></el-table-column>
+          <el-table-column class="table_td" prop="carNo" label="车牌号" width="140"></el-table-column>
+          <el-table-column width="100" class="table_td" prop="loadingWeight" label="装车净重(吨)">
+          </el-table-column>
+          <el-table-column width="100" class="table_td" prop="unloadingWeight" label="卸车净重(吨)">
+          </el-table-column>
+          <el-table-column width="120" class="table_td" prop="transportDamage" label="公司承担运损">
+          </el-table-column>
+          <el-table-column width="100" class="table_td" prop="lossWeight" label="损耗(吨)">
+          </el-table-column>
+          <el-table-column width="120" class="table_td" prop="actualLoss" label="实际损耗">
+          </el-table-column>
+          <el-table-column width="120" class="table_td" prop="transportPrice" label="预计单价(元/吨)"></el-table-column>
+          <el-table-column width="120" class="table_td" prop="settlementPrice" label="结算单价(元/吨)">
+          </el-table-column>
+          <el-table-column width="120" class="table_td" prop="settlementWeight" label="结算重量(吨)"></el-table-column>
+          <el-table-column width="120" class="table_td" prop="cargoDamage" label="货损">
+          </el-table-column>
+          <el-table-column width="120" class="table_td" prop="deductionAmount" label="扣款(元)"></el-table-column>
+          <el-table-column width="100" class="table_td" label="服务费(元)" prop="serviceCharge">
+          </el-table-column>
+          <el-table-column width="100" class="table_td" label="实付金额(元)" prop="amountActuallyPaid"></el-table-column>
+          <el-table-column width="100" class="table_td" label="税点(元)" prop="taxPoint"></el-table-column>
+          <el-table-column width="100" class="table_td" label="合计应付(元)" prop="totalPayable"></el-table-column>
+          <el-table-column width="100" class="table_td" label="已付金额(元)" prop="amountEdPayable">
+          </el-table-column>
+          <el-table-column width="100" class="table_td" label="未付金额(元)" prop="amountNotPayable"></el-table-column>
+          <el-table-column width="100" class="table_td" label="已开发票(元)" prop="alreadyInvoice">
+          </el-table-column>
+          <el-table-column width="150" class="table_td" label="付款日期" prop="paymentDate"></el-table-column>
+            <el-table-column width="150" class="table_td" label="司机/车队" prop="name">
+              <template
+                slot-scope="scope">
+                {{ scope.row.name }}
+                <span v-if="scope.row.fleetFlag==1">(队)</span>
+              </template>
+              </el-table-column>
+            </el-table>
+          </div>
         </div>
-      
-    </div>
     <el-dialog
       :title="title"
       :visible.sync="rejectshow"

src/views/profitable/cashoutaduitNQ.vue

@@ -75,49 +75,63 @@
             <el-input disabled class='input50 input_css' placeholder="输入开户支行" v-model="deptBudgetList.bankBranch"></el-input>
           </el-form-item>
         </el-form>
-        <div class="wenzi" v-if='(deptBudgetList.expensesPurpose==2)'>车辆详情</div>
-        <el-table :data="deptBudgetList.tranSettlementReportList" v-if='(deptBudgetList.expensesPurpose==2)' style="width: 90%; margin: 20px auto; " ref="warehouseList"  >
-        <el-table-column type="index" label="序号" width="50"></el-table-column>
-        <el-table-column class="table_td" prop="contractNo" width="120" label="合同编号"></el-table-column>
-        <el-table-column class="table_td" prop="startAddress" width="120" label="发货库"></el-table-column>
-        <el-table-column class="table_td" prop="createDate" width="120" label="发货时间"></el-table-column>
-        <el-table-column class="table_td" prop="carNo" label="车牌号" width="140"></el-table-column>
-        <el-table-column width="100" class="table_td" prop="loadingWeight" label="装车净重(吨)">
-        </el-table-column>
-        <el-table-column width="100" class="table_td" prop="unloadingWeight" label="卸车净重(吨)">
-        </el-table-column>
-        <el-table-column width="120" class="table_td" prop="transportDamage" label="公司承担运损">
-        </el-table-column>
-        <el-table-column width="100" class="table_td" prop="lossWeight" label="损耗(吨)">
-        </el-table-column>
-        <el-table-column width="120" class="table_td" prop="actualLoss" label="实际损耗">
-        </el-table-column>
-        <el-table-column width="120" class="table_td" prop="transportPrice" label="预计单价(元/吨)"></el-table-column>
-        <el-table-column width="120" class="table_td" prop="settlementPrice" label="结算单价(元/吨)">
-        </el-table-column>
-        <el-table-column width="120" class="table_td" prop="settlementWeight" label="结算重量(吨)"></el-table-column>
-        <el-table-column width="120" class="table_td" prop="cargoDamage" label="货损">
-        </el-table-column>
-        <el-table-column width="120" class="table_td" prop="deductionAmount" label="扣款(元)"></el-table-column>
-        <el-table-column width="100" class="table_td" label="服务费(元)" prop="serviceCharge">
-        </el-table-column>
-        <el-table-column width="100" class="table_td" label="实付金额(元)" prop="amountActuallyPaid"></el-table-column>
-        <el-table-column width="100" class="table_td" label="税点(元)" prop="taxPoint"></el-table-column>
-        <el-table-column width="100" class="table_td" label="合计应付(元)" prop="totalPayable"></el-table-column>
-        <el-table-column width="100" class="table_td" label="已付金额(元)" prop="amountEdPayable">
-        </el-table-column>
-        <el-table-column width="100" class="table_td" label="未付金额(元)" prop="amountNotPayable"></el-table-column>
-        <el-table-column width="100" class="table_td" label="已开发票(元)" prop="alreadyInvoice">
-        </el-table-column>
-        <el-table-column width="150" class="table_td" label="付款日期" prop="paymentDate"></el-table-column>
-          <el-table-column width="150" class="table_td" label="司机/车队" prop="name">
-            <template
-              slot-scope="scope">
-              {{ scope.row.name }}
-              <span v-if="scope.row.fleetFlag==1">(队)</span>
-            </template>
-            </el-table-column>
-          </el-table>
+        <div v-if='deptBudgetList.expensesPurpose==2'>
+          <div v-for="item in deptBudgetList.tranTaskInfoList">
+            <el-form label-position="left">
+              <el-form-item label-width='100px' label="运输编号" span="1" prop="payee">
+                {{item.taskNo}}
+              </el-form-item>
+              <el-form-item label-width='100px' label="发货地" span="1" prop="accountNumber">
+              {{item.startPrivate}}{{item.startCity}}{{item.startArea}}{{item.startDetailedAddress}}
+              </el-form-item>
+              <el-form-item label-width='100px' label="收货地" span="1" prop="bank">
+                {{item.endPrivate}}{{item.endCity}}{{item.endArea}}{{item.endDetailedAddress}}
+              </el-form-item>
+            </el-form>
+            <el-table :data="item.tranSettlementReportList" style="width: 90%; margin: 20px auto; " ref="warehouseList" v-if='deptBudgetList.expensesPurpose==2' >
+          <el-table-column type="index" label="序号" width="50"></el-table-column>
+          <el-table-column class="table_td" prop="contractNo" width="120" label="合同编号"></el-table-column>
+          <el-table-column class="table_td" prop="startAddress" width="120" label="发货库"></el-table-column>
+          <el-table-column class="table_td" prop="createDate" width="120" label="发货时间"></el-table-column>
+          <el-table-column class="table_td" prop="carNo" label="车牌号" width="140"></el-table-column>
+          <el-table-column width="100" class="table_td" prop="loadingWeight" label="装车净重(吨)">
+          </el-table-column>
+          <el-table-column width="100" class="table_td" prop="unloadingWeight" label="卸车净重(吨)">
+          </el-table-column>
+          <el-table-column width="120" class="table_td" prop="transportDamage" label="公司承担运损">
+          </el-table-column>
+          <el-table-column width="100" class="table_td" prop="lossWeight" label="损耗(吨)">
+          </el-table-column>
+          <el-table-column width="120" class="table_td" prop="actualLoss" label="实际损耗">
+          </el-table-column>
+          <el-table-column width="120" class="table_td" prop="transportPrice" label="预计单价(元/吨)"></el-table-column>
+          <el-table-column width="120" class="table_td" prop="settlementPrice" label="结算单价(元/吨)">
+          </el-table-column>
+          <el-table-column width="120" class="table_td" prop="settlementWeight" label="结算重量(吨)"></el-table-column>
+          <el-table-column width="120" class="table_td" prop="cargoDamage" label="货损">
+          </el-table-column>
+          <el-table-column width="120" class="table_td" prop="deductionAmount" label="扣款(元)"></el-table-column>
+          <el-table-column width="100" class="table_td" label="服务费(元)" prop="serviceCharge">
+          </el-table-column>
+          <el-table-column width="100" class="table_td" label="实付金额(元)" prop="amountActuallyPaid"></el-table-column>
+          <el-table-column width="100" class="table_td" label="税点(元)" prop="taxPoint"></el-table-column>
+          <el-table-column width="100" class="table_td" label="合计应付(元)" prop="totalPayable"></el-table-column>
+          <el-table-column width="100" class="table_td" label="已付金额(元)" prop="amountEdPayable">
+          </el-table-column>
+          <el-table-column width="100" class="table_td" label="未付金额(元)" prop="amountNotPayable"></el-table-column>
+          <el-table-column width="100" class="table_td" label="已开发票(元)" prop="alreadyInvoice">
+          </el-table-column>
+          <el-table-column width="150" class="table_td" label="付款日期" prop="paymentDate"></el-table-column>
+            <el-table-column width="150" class="table_td" label="司机/车队" prop="name">
+              <template
+                slot-scope="scope">
+                {{ scope.row.name }}
+                <span v-if="scope.row.fleetFlag==1">(队)</span>
+              </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </div>
         <!-- 经营性费用不分配 -->
         <div v-if='deptBudgetList.expensesPurpose!=5'>
           <div style="display:flex">

src/views/profitable/cashoutedit.vue

@@ -78,6 +78,63 @@
             <el-input class='input50 input_css' placeholder="输入开户支行" v-model="deptBudgetList.bankBranch"></el-input>
           </el-form-item>
         </el-form>
+        <div v-if='deptBudgetList.expensesPurpose==2'>
+          <div v-for="item in deptBudgetList.tranTaskInfoList">
+            <el-form label-position="left">
+              <el-form-item label-width='100px' label="运输编号" span="1" prop="payee">
+                {{item.taskNo}}
+              </el-form-item>
+              <el-form-item label-width='100px' label="发货地" span="1" prop="accountNumber">
+              {{item.startPrivate}}{{item.startCity}}{{item.startArea}}{{item.startDetailedAddress}}
+              </el-form-item>
+              <el-form-item label-width='100px' label="收货地" span="1" prop="bank">
+                {{item.endPrivate}}{{item.endCity}}{{item.endArea}}{{item.endDetailedAddress}}
+              </el-form-item>
+            </el-form>
+            <el-table :data="item.tranSettlementReportList" style="width: 90%; margin: 20px auto; " ref="warehouseList" v-if='deptBudgetList.expensesPurpose==2' >
+          <el-table-column type="index" label="序号" width="50"></el-table-column>
+          <el-table-column class="table_td" prop="contractNo" width="120" label="合同编号"></el-table-column>
+          <el-table-column class="table_td" prop="startAddress" width="120" label="发货库"></el-table-column>
+          <el-table-column class="table_td" prop="createDate" width="120" label="发货时间"></el-table-column>
+          <el-table-column class="table_td" prop="carNo" label="车牌号" width="140"></el-table-column>
+          <el-table-column width="100" class="table_td" prop="loadingWeight" label="装车净重(吨)">
+          </el-table-column>
+          <el-table-column width="100" class="table_td" prop="unloadingWeight" label="卸车净重(吨)">
+          </el-table-column>
+          <el-table-column width="120" class="table_td" prop="transportDamage" label="公司承担运损">
+          </el-table-column>
+          <el-table-column width="100" class="table_td" prop="lossWeight" label="损耗(吨)">
+          </el-table-column>
+          <el-table-column width="120" class="table_td" prop="actualLoss" label="实际损耗">
+          </el-table-column>
+          <el-table-column width="120" class="table_td" prop="transportPrice" label="预计单价(元/吨)"></el-table-column>
+          <el-table-column width="120" class="table_td" prop="settlementPrice" label="结算单价(元/吨)">
+          </el-table-column>
+          <el-table-column width="120" class="table_td" prop="settlementWeight" label="结算重量(吨)"></el-table-column>
+          <el-table-column width="120" class="table_td" prop="cargoDamage" label="货损">
+          </el-table-column>
+          <el-table-column width="120" class="table_td" prop="deductionAmount" label="扣款(元)"></el-table-column>
+          <el-table-column width="100" class="table_td" label="服务费(元)" prop="serviceCharge">
+          </el-table-column>
+          <el-table-column width="100" class="table_td" label="实付金额(元)" prop="amountActuallyPaid"></el-table-column>
+          <el-table-column width="100" class="table_td" label="税点(元)" prop="taxPoint"></el-table-column>
+          <el-table-column width="100" class="table_td" label="合计应付(元)" prop="totalPayable"></el-table-column>
+          <el-table-column width="100" class="table_td" label="已付金额(元)" prop="amountEdPayable">
+          </el-table-column>
+          <el-table-column width="100" class="table_td" label="未付金额(元)" prop="amountNotPayable"></el-table-column>
+          <el-table-column width="100" class="table_td" label="已开发票(元)" prop="alreadyInvoice">
+          </el-table-column>
+          <el-table-column width="150" class="table_td" label="付款日期" prop="paymentDate"></el-table-column>
+            <el-table-column width="150" class="table_td" label="司机/车队" prop="name">
+              <template
+                slot-scope="scope">
+                {{ scope.row.name }}
+                <span v-if="scope.row.fleetFlag==1">(队)</span>
+              </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </div>
        <div style='text-align:right;margin-right:30px;'>
         <el-button class="bg-bottom" type="primary" size="small" @click="submit()">提交
         </el-button>

src/views/profitable/contractprofitsdetails.vue

@@ -270,16 +270,16 @@
         this.tableData.buyer=row.buyer
         this.tableData.seller=row.seller
         this.tableData.settlementPrice=row.settlementPrice
-        this.tableData.profit=row.profit*10000
+        this.tableData.profit=(row.profit*10000).toFixed(2)
         getrelationcontract({
           agreementType:row.agreementType,contractNo:row.contractNo,compId:this.compId})
           .toPromise()
           .then(response => {
             for (let q = 0; q < response.length; q++) {
               if(row.agreementType=='收购合同'||row.agreementType=='采购合同'){
-                response[q].profit=response[q].weight*(response[q].settlementPrice-row.settlementPrice)
+                response[q].profit=(response[q].weight*(response[q].settlementPrice-row.settlementPrice)).toFixed(2)
               }else if(row.agreementType=='销售合同'){
-                response[q].profit=response[q].weight*(row.settlementPrice-response[q].settlementPrice)
+                response[q].profit=(response[q].weight*(row.settlementPrice-response[q].settlementPrice)).toFixed(2)
               }
               
             }

src/views/profitable/expenseallot.vue

@@ -64,6 +64,63 @@
           <div v-else>暂无附件</div>
         </el-form-item>
         </el-form>
+        <div v-if='deptBudgetList.expensesPurpose==2'>
+          <div v-for="item in deptBudgetList.tranTaskInfoList">
+            <el-form label-position="left">
+              <el-form-item label-width='100px' label="运输编号" span="1" prop="payee">
+                {{item.taskNo}}
+              </el-form-item>
+              <el-form-item label-width='100px' label="发货地" span="1" prop="accountNumber">
+              {{item.startPrivate}}{{item.startCity}}{{item.startArea}}{{item.startDetailedAddress}}
+              </el-form-item>
+              <el-form-item label-width='100px' label="收货地" span="1" prop="bank">
+                {{item.endPrivate}}{{item.endCity}}{{item.endArea}}{{item.endDetailedAddress}}
+              </el-form-item>
+            </el-form>
+            <el-table :data="item.tranSettlementReportList" style="width: 90%; margin: 20px auto; " ref="warehouseList" v-if='deptBudgetList.expensesPurpose==2' >
+          <el-table-column type="index" label="序号" width="50"></el-table-column>
+          <el-table-column class="table_td" prop="contractNo" width="120" label="合同编号"></el-table-column>
+          <el-table-column class="table_td" prop="startAddress" width="120" label="发货库"></el-table-column>
+          <el-table-column class="table_td" prop="createDate" width="120" label="发货时间"></el-table-column>
+          <el-table-column class="table_td" prop="carNo" label="车牌号" width="140"></el-table-column>
+          <el-table-column width="100" class="table_td" prop="loadingWeight" label="装车净重(吨)">
+          </el-table-column>
+          <el-table-column width="100" class="table_td" prop="unloadingWeight" label="卸车净重(吨)">
+          </el-table-column>
+          <el-table-column width="120" class="table_td" prop="transportDamage" label="公司承担运损">
+          </el-table-column>
+          <el-table-column width="100" class="table_td" prop="lossWeight" label="损耗(吨)">
+          </el-table-column>
+          <el-table-column width="120" class="table_td" prop="actualLoss" label="实际损耗">
+          </el-table-column>
+          <el-table-column width="120" class="table_td" prop="transportPrice" label="预计单价(元/吨)"></el-table-column>
+          <el-table-column width="120" class="table_td" prop="settlementPrice" label="结算单价(元/吨)">
+          </el-table-column>
+          <el-table-column width="120" class="table_td" prop="settlementWeight" label="结算重量(吨)"></el-table-column>
+          <el-table-column width="120" class="table_td" prop="cargoDamage" label="货损">
+          </el-table-column>
+          <el-table-column width="120" class="table_td" prop="deductionAmount" label="扣款(元)"></el-table-column>
+          <el-table-column width="100" class="table_td" label="服务费(元)" prop="serviceCharge">
+          </el-table-column>
+          <el-table-column width="100" class="table_td" label="实付金额(元)" prop="amountActuallyPaid"></el-table-column>
+          <el-table-column width="100" class="table_td" label="税点(元)" prop="taxPoint"></el-table-column>
+          <el-table-column width="100" class="table_td" label="合计应付(元)" prop="totalPayable"></el-table-column>
+          <el-table-column width="100" class="table_td" label="已付金额(元)" prop="amountEdPayable">
+          </el-table-column>
+          <el-table-column width="100" class="table_td" label="未付金额(元)" prop="amountNotPayable"></el-table-column>
+          <el-table-column width="100" class="table_td" label="已开发票(元)" prop="alreadyInvoice">
+          </el-table-column>
+          <el-table-column width="150" class="table_td" label="付款日期" prop="paymentDate"></el-table-column>
+            <el-table-column width="150" class="table_td" label="司机/车队" prop="name">
+              <template
+                slot-scope="scope">
+                {{ scope.row.name }}
+                <span v-if="scope.row.fleetFlag==1">(队)</span>
+              </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </div>
         <div style="display:flex;">
           <div style='margin:0 50px 10px;font-weight:bold'>费用分配</div>
           <div>可分配金额{{deptBudgetList.unallocatedAmount}}元</div>

src/views/profitable/expenseallotaduit.vue

@@ -82,6 +82,63 @@
               <el-input disabled class='input50 input_css' placeholder="输入开户支行" v-model="deptBudgetList.bankBranch"></el-input>
             </el-form-item>
         </el-form>
+        <div v-if='deptBudgetList.expensesPurpose==2'>
+          <div v-for="item in deptBudgetList.tranTaskInfoList">
+            <el-form label-position="left">
+              <el-form-item label-width='100px' label="运输编号" span="1" prop="payee">
+                {{item.taskNo}}
+              </el-form-item>
+              <el-form-item label-width='100px' label="发货地" span="1" prop="accountNumber">
+              {{item.startPrivate}}{{item.startCity}}{{item.startArea}}{{item.startDetailedAddress}}
+              </el-form-item>
+              <el-form-item label-width='100px' label="收货地" span="1" prop="bank">
+                {{item.endPrivate}}{{item.endCity}}{{item.endArea}}{{item.endDetailedAddress}}
+              </el-form-item>
+            </el-form>
+            <el-table :data="item.tranSettlementReportList" style="width: 90%; margin: 20px auto; " ref="warehouseList" v-if='deptBudgetList.expensesPurpose==2' >
+          <el-table-column type="index" label="序号" width="50"></el-table-column>
+          <el-table-column class="table_td" prop="contractNo" width="120" label="合同编号"></el-table-column>
+          <el-table-column class="table_td" prop="startAddress" width="120" label="发货库"></el-table-column>
+          <el-table-column class="table_td" prop="createDate" width="120" label="发货时间"></el-table-column>
+          <el-table-column class="table_td" prop="carNo" label="车牌号" width="140"></el-table-column>
+          <el-table-column width="100" class="table_td" prop="loadingWeight" label="装车净重(吨)">
+          </el-table-column>
+          <el-table-column width="100" class="table_td" prop="unloadingWeight" label="卸车净重(吨)">
+          </el-table-column>
+          <el-table-column width="120" class="table_td" prop="transportDamage" label="公司承担运损">
+          </el-table-column>
+          <el-table-column width="100" class="table_td" prop="lossWeight" label="损耗(吨)">
+          </el-table-column>
+          <el-table-column width="120" class="table_td" prop="actualLoss" label="实际损耗">
+          </el-table-column>
+          <el-table-column width="120" class="table_td" prop="transportPrice" label="预计单价(元/吨)"></el-table-column>
+          <el-table-column width="120" class="table_td" prop="settlementPrice" label="结算单价(元/吨)">
+          </el-table-column>
+          <el-table-column width="120" class="table_td" prop="settlementWeight" label="结算重量(吨)"></el-table-column>
+          <el-table-column width="120" class="table_td" prop="cargoDamage" label="货损">
+          </el-table-column>
+          <el-table-column width="120" class="table_td" prop="deductionAmount" label="扣款(元)"></el-table-column>
+          <el-table-column width="100" class="table_td" label="服务费(元)" prop="serviceCharge">
+          </el-table-column>
+          <el-table-column width="100" class="table_td" label="实付金额(元)" prop="amountActuallyPaid"></el-table-column>
+          <el-table-column width="100" class="table_td" label="税点(元)" prop="taxPoint"></el-table-column>
+          <el-table-column width="100" class="table_td" label="合计应付(元)" prop="totalPayable"></el-table-column>
+          <el-table-column width="100" class="table_td" label="已付金额(元)" prop="amountEdPayable">
+          </el-table-column>
+          <el-table-column width="100" class="table_td" label="未付金额(元)" prop="amountNotPayable"></el-table-column>
+          <el-table-column width="100" class="table_td" label="已开发票(元)" prop="alreadyInvoice">
+          </el-table-column>
+          <el-table-column width="150" class="table_td" label="付款日期" prop="paymentDate"></el-table-column>
+            <el-table-column width="150" class="table_td" label="司机/车队" prop="name">
+              <template
+                slot-scope="scope">
+                {{ scope.row.name }}
+                <span v-if="scope.row.fleetFlag==1">(队)</span>
+              </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </div>
         <div v-if='deptBudgetList.expensesPurpose==1&&deptBudgetList.costType==3||deptBudgetList.expensesPurpose==3||deptBudgetList.expensesPurpose==2' style='width:90%;margin:10px auto;'>
           <div style='margin-bottom:20px;display:flex;justify-content: space-between;'>
             <div>费用分配</div><span>合计分配：{{amount}}元</span>  </div>

src/views/profitable/expensemanagentedit.vue

@@ -90,6 +90,63 @@
               <el-input disabled class='input50 input_css' placeholder="输入开户支行" v-model="deptBudgetList.bankBranch"></el-input>
             </el-form-item>
         </el-form>
+        <div v-if='deptBudgetList.expensesPurpose==2'>
+          <div v-for="item in deptBudgetList.tranTaskInfoList">
+            <el-form label-position="left">
+              <el-form-item label-width='100px' label="运输编号" span="1" prop="payee">
+                {{item.taskNo}}
+              </el-form-item>
+              <el-form-item label-width='100px' label="发货地" span="1" prop="accountNumber">
+              {{item.startPrivate}}{{item.startCity}}{{item.startArea}}{{item.startDetailedAddress}}
+              </el-form-item>
+              <el-form-item label-width='100px' label="收货地" span="1" prop="bank">
+                {{item.endPrivate}}{{item.endCity}}{{item.endArea}}{{item.endDetailedAddress}}
+              </el-form-item>
+            </el-form>
+            <el-table :data="item.tranSettlementReportList" style="width: 90%; margin: 20px auto; " ref="warehouseList" v-if='deptBudgetList.expensesPurpose==2' >
+              <el-table-column type="index" label="序号" width="50"></el-table-column>
+              <el-table-column class="table_td" prop="contractNo" width="120" label="合同编号"></el-table-column>
+              <el-table-column class="table_td" prop="startAddress" width="120" label="发货库"></el-table-column>
+              <el-table-column class="table_td" prop="createDate" width="120" label="发货时间"></el-table-column>
+              <el-table-column class="table_td" prop="carNo" label="车牌号" width="140"></el-table-column>
+              <el-table-column width="100" class="table_td" prop="loadingWeight" label="装车净重(吨)">
+              </el-table-column>
+              <el-table-column width="100" class="table_td" prop="unloadingWeight" label="卸车净重(吨)">
+              </el-table-column>
+              <el-table-column width="120" class="table_td" prop="transportDamage" label="公司承担运损">
+              </el-table-column>
+              <el-table-column width="100" class="table_td" prop="lossWeight" label="损耗(吨)">
+              </el-table-column>
+              <el-table-column width="120" class="table_td" prop="actualLoss" label="实际损耗">
+              </el-table-column>
+              <el-table-column width="120" class="table_td" prop="transportPrice" label="预计单价(元/吨)"></el-table-column>
+              <el-table-column width="120" class="table_td" prop="settlementPrice" label="结算单价(元/吨)">
+              </el-table-column>
+              <el-table-column width="120" class="table_td" prop="settlementWeight" label="结算重量(吨)"></el-table-column>
+              <el-table-column width="120" class="table_td" prop="cargoDamage" label="货损">
+              </el-table-column>
+              <el-table-column width="120" class="table_td" prop="deductionAmount" label="扣款(元)"></el-table-column>
+              <el-table-column width="100" class="table_td" label="服务费(元)" prop="serviceCharge">
+              </el-table-column>
+              <el-table-column width="100" class="table_td" label="实付金额(元)" prop="amountActuallyPaid"></el-table-column>
+              <el-table-column width="100" class="table_td" label="税点(元)" prop="taxPoint"></el-table-column>
+              <el-table-column width="100" class="table_td" label="合计应付(元)" prop="totalPayable"></el-table-column>
+              <el-table-column width="100" class="table_td" label="已付金额(元)" prop="amountEdPayable">
+              </el-table-column>
+              <el-table-column width="100" class="table_td" label="未付金额(元)" prop="amountNotPayable"></el-table-column>
+              <el-table-column width="100" class="table_td" label="已开发票(元)" prop="alreadyInvoice">
+              </el-table-column>
+              <el-table-column width="150" class="table_td" label="付款日期" prop="paymentDate"></el-table-column>
+              <el-table-column width="150" class="table_td" label="司机/车队" prop="name">
+                  <template
+                    slot-scope="scope">
+                    {{ scope.row.name }}
+                    <span v-if="scope.row.fleetFlag==1">(队)</span>
+                  </template>
+                </el-table-column>
+            </el-table>
+          </div>
+        </div>
         <div style="display:flex" v-if='(deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"||deptBudgetList.purpose=="库点费用"&&deptBudgetList.storageFeeFlag==0||deptBudgetList.expensesPurpose==2&&deptBudgetList.storageFeeFlag==0)' class='expensetitle'>费用分配
           <div style="margin-left:15px">可分配金额{{deptBudgetList.unallocatedAmount}}元</div></div>
         <div v-if='(deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"||deptBudgetList.purpose=="库点费用"&&deptBudgetList.storageFeeFlag==0||deptBudgetList.expensesPurpose==2&&deptBudgetList.storageFeeFlag==0)' style='margin:0  auto 10px;width:90%;display: flex;'>

src/views/profitable/expensemanagentlook.vue

@@ -85,48 +85,65 @@
           </el-form>
         </div>
         <div class="wenzi" v-if='deptBudgetList.expensesPurpose==2'>车辆详情</div>
-        <el-table :data="deptBudgetList.tranSettlementReportList" style="width: 90%; margin: 20px auto; " ref="warehouseList" v-if='deptBudgetList.expensesPurpose==2' >
-        <el-table-column type="index" label="序号" width="50"></el-table-column>
-        <el-table-column class="table_td" prop="contractNo" width="120" label="合同编号"></el-table-column>
-        <el-table-column class="table_td" prop="startAddress" width="120" label="发货库"></el-table-column>
-        <el-table-column class="table_td" prop="createDate" width="120" label="发货时间"></el-table-column>
-        <el-table-column class="table_td" prop="carNo" label="车牌号" width="140"></el-table-column>
-        <el-table-column width="100" class="table_td" prop="loadingWeight" label="装车净重(吨)">
-        </el-table-column>
-        <el-table-column width="100" class="table_td" prop="unloadingWeight" label="卸车净重(吨)">
-        </el-table-column>
-        <el-table-column width="120" class="table_td" prop="transportDamage" label="公司承担运损">
-        </el-table-column>
-        <el-table-column width="100" class="table_td" prop="lossWeight" label="损耗(吨)">
-        </el-table-column>
-        <el-table-column width="120" class="table_td" prop="actualLoss" label="实际损耗">
-        </el-table-column>
-        <el-table-column width="120" class="table_td" prop="transportPrice" label="预计单价(元/吨)"></el-table-column>
-        <el-table-column width="120" class="table_td" prop="settlementPrice" label="结算单价(元/吨)">
-        </el-table-column>
-        <el-table-column width="120" class="table_td" prop="settlementWeight" label="结算重量(吨)"></el-table-column>
-        <el-table-column width="120" class="table_td" prop="cargoDamage" label="货损">
-        </el-table-column>
-        <el-table-column width="120" class="table_td" prop="deductionAmount" label="扣款(元)"></el-table-column>
-        <el-table-column width="100" class="table_td" label="服务费(元)" prop="serviceCharge">
-        </el-table-column>
-        <el-table-column width="100" class="table_td" label="实付金额(元)" prop="amountActuallyPaid"></el-table-column>
-        <el-table-column width="100" class="table_td" label="税点(元)" prop="taxPoint"></el-table-column>
-        <el-table-column width="100" class="table_td" label="合计应付(元)" prop="totalPayable"></el-table-column>
-        <el-table-column width="100" class="table_td" label="已付金额(元)" prop="amountEdPayable">
-        </el-table-column>
-        <el-table-column width="100" class="table_td" label="未付金额(元)" prop="amountNotPayable"></el-table-column>
-        <el-table-column width="100" class="table_td" label="已开发票(元)" prop="alreadyInvoice">
-        </el-table-column>
-        <el-table-column width="150" class="table_td" label="付款日期" prop="paymentDate"></el-table-column>
-          <el-table-column width="150" class="table_td" label="司机/车队" prop="name">
-            <template
-              slot-scope="scope">
-              {{ scope.row.name }}
-              <span v-if="scope.row.fleetFlag==1">(队)</span>
-            </template>
-            </el-table-column>
-          </el-table>
+        <div v-if='deptBudgetList.expensesPurpose==2'>
+          <div v-for="item in deptBudgetList.tranTaskInfoList">
+            <el-form label-position="left">
+              <el-form-item label-width='100px' label="运输编号" span="1" prop="payee">
+                {{item.taskNo}}
+              </el-form-item>
+              <el-form-item label-width='100px' label="发货地" span="1" prop="accountNumber">
+              {{item.startPrivate}}{{item.startCity}}{{item.startArea}}{{item.startDetailedAddress}}
+              </el-form-item>
+              <el-form-item label-width='100px' label="收货地" span="1" prop="bank">
+                {{item.endPrivate}}{{item.endCity}}{{item.endArea}}{{item.endDetailedAddress}}
+              </el-form-item>
+            </el-form>
+            <el-table :data="item.tranSettlementReportList" style="width: 90%; margin: 20px auto; " ref="warehouseList" v-if='deptBudgetList.expensesPurpose==2' >
+          <el-table-column type="index" label="序号" width="50"></el-table-column>
+          <el-table-column class="table_td" prop="contractNo" width="120" label="合同编号"></el-table-column>
+          <el-table-column class="table_td" prop="startAddress" width="120" label="发货库"></el-table-column>
+          <el-table-column class="table_td" prop="createDate" width="120" label="发货时间"></el-table-column>
+          <el-table-column class="table_td" prop="carNo" label="车牌号" width="140"></el-table-column>
+          <el-table-column width="100" class="table_td" prop="loadingWeight" label="装车净重(吨)">
+          </el-table-column>
+          <el-table-column width="100" class="table_td" prop="unloadingWeight" label="卸车净重(吨)">
+          </el-table-column>
+          <el-table-column width="120" class="table_td" prop="transportDamage" label="公司承担运损">
+          </el-table-column>
+          <el-table-column width="100" class="table_td" prop="lossWeight" label="损耗(吨)">
+          </el-table-column>
+          <el-table-column width="120" class="table_td" prop="actualLoss" label="实际损耗">
+          </el-table-column>
+          <el-table-column width="120" class="table_td" prop="transportPrice" label="预计单价(元/吨)"></el-table-column>
+          <el-table-column width="120" class="table_td" prop="settlementPrice" label="结算单价(元/吨)">
+          </el-table-column>
+          <el-table-column width="120" class="table_td" prop="settlementWeight" label="结算重量(吨)"></el-table-column>
+          <el-table-column width="120" class="table_td" prop="cargoDamage" label="货损">
+          </el-table-column>
+          <el-table-column width="120" class="table_td" prop="deductionAmount" label="扣款(元)"></el-table-column>
+          <el-table-column width="100" class="table_td" label="服务费(元)" prop="serviceCharge">
+          </el-table-column>
+          <el-table-column width="100" class="table_td" label="实付金额(元)" prop="amountActuallyPaid"></el-table-column>
+          <el-table-column width="100" class="table_td" label="税点(元)" prop="taxPoint"></el-table-column>
+          <el-table-column width="100" class="table_td" label="合计应付(元)" prop="totalPayable"></el-table-column>
+          <el-table-column width="100" class="table_td" label="已付金额(元)" prop="amountEdPayable">
+          </el-table-column>
+          <el-table-column width="100" class="table_td" label="未付金额(元)" prop="amountNotPayable"></el-table-column>
+          <el-table-column width="100" class="table_td" label="已开发票(元)" prop="alreadyInvoice">
+          </el-table-column>
+          <el-table-column width="150" class="table_td" label="付款日期" prop="paymentDate"></el-table-column>
+            <el-table-column width="150" class="table_td" label="司机/车队" prop="name">
+              <template
+                slot-scope="scope">
+                {{ scope.row.name }}
+                <span v-if="scope.row.fleetFlag==1">(队)</span>
+              </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </div>
+        
+        
         <div v-if='deptBudgetList.expensesPurpose==1&&deptBudgetList.costType==3||deptBudgetList.expensesPurpose==3||deptBudgetList.expensesPurpose==2' style='width:90%;margin:10px auto;'>
           <div style='margin-bottom:20px;'>费用分配</div>
           <!-- <div> -->

src/views/statisticalReport/autoSettlementList.vue

@@ -1673,8 +1673,8 @@ export default {
             response.records[i].deductionAmountchange = false
             response.records[i].amountIngPayable = response.records[i].amountIngPayable.toFixed(2)
             response.records[i].amountEdPayable = response.records[i].amountEdPayable.toFixed(2)
-            response.records[i].amountNotPayable = (response.records[i].totalPayable - response.records[i]
-              .amountEdPayable).toFixed(2)
+            response.records[i].amountNotPayable =((response.records[i].totalPayable - response.records[i]
+              .amountEdPayable)*100)/100
             if (response.records[i].tranPriceApproveList) {
               for (var j = 0; j < response.records[i].tranPriceApproveList.length; j++) {
                 this.tranPriceApproveList.push(response.records[i].tranPriceApproveList[j])

src/views/warehousenew/warehousingOrder.vue

@@ -1978,6 +1978,7 @@ export default {
             message: '驳回成功',
             type: 'success'
           });
+          this.rejectshow=false
           this.getList()
         }
       }