snow vor 1 Jahr
Ursprung
Commit
15d329b04e

Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
dist/index.html


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
dist/static/js/app.2903b93e.js


BIN
dist/static/js/app.2903b93e.js.gz


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
dist/static/js/app.ec6418d6.js


BIN
dist/static/js/app.ec6418d6.js.gz


+ 5 - 2
src/components/reports/src/CompanyGrossMargin.vue

@@ -9,7 +9,7 @@
       style="width: 100%"
       :row-style="({row}) => row.field === '合计' ? {background:'#f5f7fa'} : {}"
     >
-      <el-table-column label="业绩类型" prop="depart" align="center">
+      <el-table-column label="业绩类型" prop="depart" align="center" fixed="left">
         <template slot-scope="scope">{{scope.row.field}}</template>
       </el-table-column>
       <el-table-column label="本日销售净额" prop="pure_day_sale">
@@ -98,7 +98,6 @@ export default {
           const companies = ['百辰','普润','泓源']
           const fields = ['自营','渠道','小计','供应商端','合计']
           let tableData = (result.data || []).filter(({companyName}) => companies.some(company => companyName.indexOf(company) !== -1))
-
           //合计自营、渠道、供应商端数据
           const total = tableData.reduce((prev,current) => ({
             supplierSaleDay:addition(prev.supplierSaleDay,subtraction(current.dayinfo[2].sale_total,current.dayinfo[2].th_total)),
@@ -222,6 +221,10 @@ export default {
           lastItem.pure_day_interest_rate = multiplication(division(totalItem.pure_day_profit,totalItem.pure_day_sale),100)
 
           tableData[4] = lastItem
+
+          if(this.companyNo === 'GS2304031312553746'){
+            console.log(this.tableData)
+          }
           this.tableData = tableData
           break
         default:

+ 1 - 1
src/components/reports/src/GrossMargin.vue

@@ -8,7 +8,7 @@
       style="width: 100%"
       :row-style="({row}) => row.depart === '合计' ? {background:'#f5f7fa'} : {}"
     >
-      <el-table-column label="部门" width="80" prop="depart" align="center">
+      <el-table-column label="部门" width="80" prop="depart" align="center" fixed="left">
         <template slot-scope="scope">{{mapResponseCompletionCompanyName[scope.row.depart]|| scope.row.depart}}</template>
       </el-table-column>
       <el-table-column label="本日销售净额" prop="pure_day_sale">

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.