Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/views/statisticalReport/autoSettlementList.vue

@@ -401,13 +401,13 @@
       :append-to-body="true"
     >
       <el-table :data="tranPriceApproveList">
+        <el-table-column prop="result" label="车牌号"> </el-table-column>
         <el-table-column prop="tranPrice" label="单价（元）">
         </el-table-column>
-        <el-table-column prop="result" label="车牌号"> </el-table-column>
         <el-table-column prop="beforeModification" label="修改前重量(吨)"> </el-table-column>
         <el-table-column prop="afterModification" label="修改后重量(吨)"> </el-table-column>
         <el-table-column prop="reviewer" label="修改人"> </el-table-column>
-        <el-table-column prop="createDate" label="修改日期"> </el-table-column>
+        <el-table-column prop="createDate" label="修改日期" width="200px"> </el-table-column>
       </el-table>
     </el-dialog>
     <!-- 付款 -->
@@ -1217,9 +1217,8 @@ export default {
       }
     },
     //查看修改结算重量记录
-    editRecord(item) {
+    editRecord() {
       this.dialogFormVisible16 = true
-      this.tranPriceApproveList = item.tranPriceApproveList
     },
     handlepass() {
       var that = this
@@ -1301,12 +1300,11 @@ export default {
             response.records[i].settlementWeightchange = false
             response.records[i].deductionAmountchange = false
             response.records[i].amountNotPayable=response.records[i].amountIngPayable-response.records[i].amountEdPayable
-            //     response.records[i].settlementPrice =
-            //       response.records[i].unitPrice -
-            //       Math.abs(response.records[i].basisPrice) -
-            //       Math.abs(response.records[i].unloadingCharge) -
-            //       Math.abs(response.records[i].invoiceFee) -
-            //       Math.abs(response.records[i].deductionAmount)
+            if(response.records[i].tranPriceApproveList){
+              for(var j=0;j<response.records[i].tranPriceApproveList.length;j++){
+                  this.tranPriceApproveList.push(response.records[i].tranPriceApproveList[j])
+              }
+            }
           }
           this.deptBudgetTotal = response.total
           this.warehouseList = response