build

src/pages/invData.vue

@@ -138,7 +138,7 @@
           </div>
         </div>
         <el-table size="small" border :data="monthCompany">
-          <el-table-column label="月份" width="80px" show-overflow-tooltip prop="month" fixed="left" />
+          <el-table-column label="月份" width="50px" show-overflow-tooltip prop="month" fixed="left" />
           <el-table-column label="开票收入目标" min-width="100px" show-overflow-tooltip prop="inv_tips">
             <template slot-scope="scope">
               {{ unit2TenThousand(scope.row.inv_tips, isTenThound) }}
@@ -180,7 +180,7 @@
         </div>
 
         <el-table size="small" border :data="monthAccount">
-          <el-table-column label="月份" width="80px" show-overflow-tooltip prop="month" fixed="left" />
+          <el-table-column label="月份" width="60px" show-overflow-tooltip prop="month" fixed="left" />
 
           <el-table-column label="开票收入目标" min-width="110px" show-overflow-tooltip prop="inv_tips">
             <template slot-scope="scope">
@@ -322,7 +322,7 @@ export default {
           const costMonthRate = this.calcBl(costMonth, cost_tips)
 
           list.push({
-            month: `${year}-${String(month).length === 1 ? '0' + month : month}`,
+            month: month,
             invMonth,
             cost_tips,
             inv_tips,
@@ -366,15 +366,19 @@ export default {
 
       const list = []
       if (code === 1) {
-        for (const item of data) {
+        for (const index in data) {
+          const item = data[index]
           const { cost_tips, inv_tips, month } = item
+
+
+
           const invMonth = subtraction(item.month_inv_fee, item.month_return_inv_fee)
           const costMonth = subtraction(invMonth, subtraction(item.month_cost_fee, item.month_return_cost_fee))
           const monthInvRate = this.calcBl(invMonth, inv_tips)
           const costMonthRate = this.calcBl(costMonth, cost_tips)
 
           list.push({
-            month,
+            month: Number(index) + 1,
             invMonth,
             cost_tips,
             inv_tips,
@@ -402,9 +406,10 @@ export default {
       totalItem.costMonthRate = this.calcBl(totalItem.costMonth, totalItem.cost_tips)
 
 
-      this.monthAccount = list
 
       list.push(totalItem)
+
+      console.log(list, '--')
       this.monthAccount = list
     },
 
@@ -421,6 +426,7 @@ export default {
         "结算单E企购": "结算单E企购",
       }
 
+
       this.companyDayLoading = true
       const { data, code } = await asyncRequest.everyCompanyDay({ daytime: this.companyDayDate })
       this.companyDayLoading = false
@@ -451,8 +457,23 @@ export default {
         }
 
 
-        list.filter(item => !['预订单E企购', '结算单E企购'].includes(item.companyName))
-        this.dayCompany = list
+        const _list = list.filter(item => !['预订单E企购', '结算单E企购'].includes(item.companyName))
+
+
+        const cclist = ['百辰', '泓源', '普润', '锦兴', '知事', '万宇', '泰文创']
+
+        const _cp_list = []
+        for (const _item of cclist) {
+          const index = _list.findIndex(item => item.companyName === _item)
+
+          if (index >= 0) {
+            _cp_list.push(_list[index])
+          }
+        }
+
+
+
+        this.dayCompany = _cp_list
       }
     },
     async requestAccountDay(){
@@ -631,13 +652,15 @@ export default {
         "北京元隆雅图文化传播股份有限公司": "预订单E企购",
         "结算单E企购": "结算单E企购",
       }
+
+      const list = ['百辰', '泓源', '普润', '锦兴', '知事', '万宇', '泰文创']
       
         this.state.loading = false
         switch(Number(result.code)){
           case 0:
            this.isShow =  (result.data.is_show || []).includes(10) || (result.data.is_show || []).includes('10')
 
-            this.companies = result.data.companyArr.reduce((prev, current) => {
+            const companies = result.data.companyArr.reduce((prev, current) => {
               return current.info.includes(10) || current.info.includes('10') ? [...prev, {
                 companyNo: current.companyNo,
                 companyName: current.companyName
@@ -647,7 +670,20 @@ export default {
               companyName: mapCompany[item.companyName]
             })).filter(item => !['预订单E企购', '结算单E企购'].includes(item.companyName))
 
-          //  this.companies = result.data.companyArr.map(item => ({ companyNo: item.companyNo, companyName: item.companyName }))
+
+
+
+            const _cp_list = []
+            for(const _item of list){
+              const index = companies.findIndex(item => item.companyName === _item)
+
+              if(index >= 0){
+                _cp_list.push(companies[index])
+              }
+            }
+
+
+            this.companies = _cp_list
            this.monthCompanyNo = this.companies[0].companyNo
            this.requestData()
            break
@@ -672,7 +708,7 @@ export default {
 <style lang="scss" scoped>
 .new-report {
     width: calc(100vw - 20px);
-    height: 100vh;
+    height: calc(100vh - 30px);
     left: 0px;
     position: fixed;
     overflow: auto;