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

src/views/statisticalReport/autoSettlementList.vue

@@ -1280,6 +1280,10 @@ export default {
           sums[index] = '--'
         }
       })
+      sums[sums.length-4]=sums[sums.length-4].toFixed(2)
+			sums[sums.length-5]=sums[sums.length-5].toFixed(2)
+      sums[sums.length-6]=sums[sums.length-6].toFixed(2)
+      sums[sums.length-7]=sums[sums.length-7].toFixed(2)
       return sums
     },
     //列表

src/views/statisticalReport/purchaseClosingCashierList.vue

@@ -107,7 +107,6 @@
         <el-table-column
           class="table_td"
           prop="closePositionDate"
-          width="100"
           label="平仓日期"
         ></el-table-column>
         <el-table-column
@@ -129,7 +128,7 @@
           label="平仓价格(元/吨)"
         ></el-table-column>
         <el-table-column
-          width="100"
+          width="90"
           class="table_td"
           prop="basisPrice"
           label="基差(元/吨)"
@@ -183,11 +182,13 @@
         <el-table-column
           class="table_td"
           prop="customerName"
+          width="60"
           label="客户"
         ></el-table-column>
         <el-table-column
           class="table_td"
           prop="warehouseName"
+          width="60"
           label="库点"
         ></el-table-column>
         <el-table-column prop="status" label="状态">
@@ -572,9 +573,9 @@ export default {
           sums[index] = '合计'
         } else if (
           index === 4 ||
-          index === 10 ||
           index === 8 ||
           index === 9 ||
+          index === 10 ||
           index === 12 ||
           index === 13 ||
           index === 14
@@ -596,6 +597,13 @@ export default {
           sums[index] = '--'
         }
       })
+			sums[sums.length-5]=sums[sums.length-5].toFixed(2)
+      sums[sums.length-6]=sums[sums.length-6].toFixed(2)
+      sums[sums.length-7]=sums[sums.length-7].toFixed(2)
+			sums[sums.length-9]=sums[sums.length-9].toFixed(2)
+      sums[sums.length-10]=sums[sums.length-10].toFixed(2)
+      sums[sums.length-11]=sums[sums.length-11].toFixed(2)
+      sums[sums.length-15]=sums[sums.length-15].toFixed(2)
       return sums
     },
     //付款

src/views/statisticalReport/purchaseReceiptStatisticsList.vue

@@ -1129,9 +1129,9 @@ export default {
           sums[index] = '合计'
         } else if (
           index === 15 ||
+          index === 16 ||
           index === 17 ||
           index === 18 ||
-          index === 16 ||
           index === 25
         ) {
           const values = data.map((item) => Number(item[column.property]))
@@ -1151,6 +1151,11 @@ export default {
           sums[index] = '--'
         }
       })
+      sums[sums.length-2]=sums[sums.length-2].toFixed(2)
+      sums[sums.length-9]=sums[sums.length-9].toFixed(2)
+			sums[sums.length-10]=sums[sums.length-10].toFixed(2)
+      sums[sums.length-11]=sums[sums.length-11].toFixed(2)
+			sums[sums.length-12]=sums[sums.length-12].toFixed(2)
       return sums
     },
     //成交

src/views/statisticalReport/salesClosingCashierList.vue

@@ -691,9 +691,9 @@ export default {
           sums[index] = '合计'
         } else if (
           index === 4 ||
-          index === 10 ||
           index === 8 ||
           index === 9 ||
+          index === 10 ||
           index === 12 ||
           index === 13 ||
           index === 14
@@ -715,6 +715,13 @@ export default {
           sums[index] = '--'
         }
       })
+      sums[sums.length-5]=sums[sums.length-5].toFixed(2)
+      sums[sums.length-6]=sums[sums.length-6].toFixed(2)
+      sums[sums.length-7]=sums[sums.length-7].toFixed(2)
+			sums[sums.length-9]=sums[sums.length-9].toFixed(2)
+      sums[sums.length-10]=sums[sums.length-10].toFixed(2)
+      sums[sums.length-11]=sums[sums.length-11].toFixed(2)
+      sums[sums.length-15]=sums[sums.length-15].toFixed(2)
       return sums
     },
     //成交

src/views/statisticalReport/salesDeliveryReportList.vue

@@ -725,6 +725,11 @@ export default {
           sums[index] = '--'
         }
       })
+      sums[sums.length-2]=sums[sums.length-2].toFixed(2)
+      sums[sums.length-7]=sums[sums.length-7].toFixed(2)
+			sums[sums.length-8]=sums[sums.length-8].toFixed(2)
+      sums[sums.length-9]=sums[sums.length-9].toFixed(2)
+			sums[sums.length-10]=sums[sums.length-10].toFixed(2)
       return sums
     },
     handlecollect() {

src/views/statisticalReport/stockPurchaseReceiptReportList.vue

@@ -953,6 +953,10 @@ export default {
           sums[index] = '--'
         }
       })
+      sums[sums.length-3]=sums[sums.length-3].toFixed(2)
+      sums[sums.length-4]=sums[sums.length-4].toFixed(2)
+			sums[sums.length-5]=sums[sums.length-5].toFixed(2)
+      sums[sums.length-6]=sums[sums.length-6].toFixed(2)
       return sums
     },
     getList() {

src/views/statisticalReport/stockSaleOutReportList.vue

@@ -453,6 +453,8 @@
 						sums[index] = '--'
 					}
 				})
+				sums[sums.length-1]=sums[sums.length-1].toFixed(2)
+				sums[sums.length-2]=sums[sums.length-2].toFixed(2)
 				return sums
 			},
 			//定金