build

src/components/newReport/src/_utils.js

@@ -1,4 +1,4 @@
-export const mapReponseType = {
+export const mapResponseType = {
   '1':'自营',
   '2':'渠道',
   '3':'供应商端'
@@ -18,7 +18,7 @@ export const mapResponseCompletionCompanyName = {
   '平台':'平台部'
 }
 
-export const getTypeLabel = value => mapReponseType[String(value)]
+export const getTypeLabel = value => mapResponseType[String(value)]
 export const getCompanyCompletionLabel = value => mapResponseCompletionCompanyName[String(value)]
 export const getCompanyLabel = value => mapResponseCompanyName[String(value)]
 
@@ -89,6 +89,7 @@ export function subtraction(arg1, arg2) {
 }
 
 export function unit2TenThousand(value,isTenThound = true){
+  if(value === '--') return '--'
   if(value === NaN || value === "NaN" || Number(value) === 0 || value === undefined) return '0'
   if(!isTenThound) return value;
   if(value < 1000 && value > 0 || value < 0 && value > -1000) return value

src/components/newResultInfo/company.vue

@@ -20,7 +20,7 @@
 
     <el-row style="margin-top:10px;margin-top:10px" v-if="!isEmpty">
       <el-table border size="mini" :data="tableData" :header-cell-class-name="setHeaderClassName"
-        :cell-class-name="setCellClassName">
+        :cell-class-name="setCellClassName" :span-method="spanMethod">
         <el-table-column fixed="left" label="公司" prop="companyName" align="center" width="65px">
           <template slot-scope="scope">
             <div v-if="scope.row.companyName.indexOf('普润') === -1">
@@ -37,98 +37,27 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="当日营业收入" align="center" width="95px">
+
+        <el-table-column label="业绩类型" prop="type" align="center" width="100px"></el-table-column>
+        
+        <el-table-column label="当月销售" prop="monthSale" align="center" width="100px">
           <template slot-scope="scope">
-            {{ unit2TenThousand(scope.row.sale_total, isTenThound) }}
+            {{unit2TenThousand(scope.row.monthSale,isTenThound)}}
           </template>
         </el-table-column>
 
-          <el-table-column label="营收目标" align="center" min-width="95px">
-            <template slot-scope="scope">
-              {{ unit2TenThousand(scope.row.total_tips, isTenThound) }}
-            </template>
-          </el-table-column>
-
-          <el-table-column label="营业收入(净)" align="center" min-width="115px">
-            <template slot-scope="scope">
-              <div style="display:flex;flex-direction: column;">
-                <el-popover placement="top" :width="200" trigger="hover">
-                  <div class="table-size">
-                    <p>直营/自营: {{ unit2TenThousand(scope.row.info[0][0].monthinfo.msale_total, isTenThound) }}</p>
-                    <p>支付渠道: {{ unit2TenThousand(scope.row.info[0][1].monthinfo.msale_total, isTenThound) }}</p>
-                    <p>供应商端: {{ unit2TenThousand(scope.row.info[0][2].monthinfo.msale_total, isTenThound) }}</p>
-                  </div>
-
-                  <template #reference>
-                    <div :style="`${getCurrentValueStyle(scope.row.msale_total, scope.row.total_tips)}`">
-                      <i class="el-icon-warning-outline" style="font-size:16px;cursor:pointer"></i>
-                      {{ unit2TenThousand(scope.row.msale_total, isTenThound) }}
-                    </div>
-                  </template>
-                </el-popover>
-              </div>
-            </template>
-          </el-table-column>
-
-          <el-table-column label="营收完成%" align="center" min-width="85px">
-            <template slot-scope="scope">
-              <div :style="`${getCurrentRateStyle(scope.row.completion_rate)}`">{{ scope.row.completion_rate + "%" }}
-              </div>
-            </template>
-          </el-table-column>
-
-
-          <template v-if="costField">
-            <el-table-column label="毛利目标" align="center" min-width="90px">
-              <template slot-scope="scope">
-                {{ unit2TenThousand(scope.row.cost_tips, isTenThound) }}
-              </template>
-            </el-table-column>
-
-            <el-table-column label="毛利完成" align="center" min-width="90px">
-              <template slot-scope="scope">
-                <div :style="`${getCurrentValueStyle(scope.row.gross_completion, scope.row.cost_tips)}`">
-                  {{ unit2TenThousand(scope.row.gross_completion, isTenThound) }}
-                </div>
-              </template>
-            </el-table-column>
-
-
-            <el-table-column label="毛利完成%" align="center" min-width="85px">
-              <template slot-scope="scope">
-                <div :style="getCurrentRateStyle(scope.row.gross_completion_rate)">
-                  {{ scope.row.gross_completion_rate + '%' }}
-                </div>
-              </template>
-            </el-table-column>
-
-            <el-table-column label="成本合计" align="center" min-width="125px">
-              <template slot-scope="scope">
-                <div style="display:flex;flex-direction: column;">
-                  <el-popover placement="top" :width="200" trigger="hover">
-                    <div class="table-size">
-                      <p>直营/自营: {{ unit2TenThousand(scope.row.info[0][0].monthinfo.mcost_total, isTenThound) }}</p>
-                      <p>支付渠道: {{ unit2TenThousand(scope.row.info[0][1].monthinfo.mcost_total, isTenThound) }}</p>
-                      <p>供应商端: {{ unit2TenThousand(scope.row.info[0][2].monthinfo.mcost_total, isTenThound) }}</p>
-                    </div>
-
-                    <template #reference>
-                      <i class="el-icon-warning-outline" style="font-size:16px;cursor:pointer"></i>
-                      {{ unit2TenThousand(scope.row.mcost_total, isTenThound) }}
-                    </template>
-                  </el-popover>
-                </div>
-              </template>
-            </el-table-column>
-
-            <el-table-column label="实际毛利率" align="center" width="85px">
-              <template slot-scope="scope">
-                <!-- <div :style="`${getCurrentRateStyle(scope.row.gross_sale_completion_rate)}`"> -->
-                {{ unit2TenThousand(scope.row.gross_sale_completion_rate) + "%" }}
-                <!-- </div> -->
-              </template>
-            </el-table-column>
+        <el-table-column label="销售退货" prop="monthReturn" align="center" width="100px">
+          <template slot-scope="scope">
+            {{unit2TenThousand(scope.row.monthReturn,isTenThound)}}
           </template>
+        </el-table-column>
+
+
+        <el-table-column label="销售合计" prop="monthSaleAmount" align="center" width="100px">
+          <template slot-scope="scope">
+            {{unit2TenThousand(scope.row.monthSaleAmount,isTenThound)}}
+          </template>
+        </el-table-column>
       </el-table>
     </el-row>
 
@@ -275,6 +204,38 @@ export default {
       }
 
       return base
+    },
+        /* 表格合并列和行 */
+    spanMethod({ rowIndex, columnIndex }) {
+      if (columnIndex === 0) {
+        const _row = this.flitterData(this.tableData).one[rowIndex];
+        const _col = _row > 0 ? 1 : 0;
+        return { rowspan: _row, colspan: _col };
+      }
+    },
+    /**合并表格的第一列，处理表格数据 */
+    flitterData(arr) {
+      let spanOneArr = [];
+      let concatOne = 0;
+
+      arr.forEach((item, index) => {
+        if (index === 0) {
+          spanOneArr.push(1);
+        } else {
+          //注意这里的quarterly是表格绑定的字段，根据自己的需求来改
+          if (
+            (item.companyName === arr[index - 1].companyName)) {
+            //第一列需合并相同内容的判断条件
+            spanOneArr[concatOne] += 1;
+            spanOneArr.push(0);
+          } else {
+            spanOneArr.push(1);
+            concatOne = index;
+          }
+        }
+      });
+
+      return { one: spanOneArr };
     },
     setHeaderClassName({ column }) {
       const { label } = column;
@@ -294,133 +255,36 @@ export default {
     async requestData() {
       this.loading = true;
       this.tableData = [];
-
       const res = await asyncRequest.companyEveryMonth({ daytime: this.daytime, companyNo: this.companyNo });
-
-      // const jxIndex = res.data.findIndex((item) => item.companyName === "北京锦兴弘昌科技有限公司");
-      // let prIndex = res.data.findIndex((item) => item.companyName === "北京普润心堂商贸有限公司");
-      // let zsIndex = res.data.findIndex((item) => item.companyName === "北京知事文化产业发展有限公司")
-      // if (jxIndex >= 0 && prIndex >= 0) {
-      //   const jxItem = res.data[jxIndex];
-      //   res.data[prIndex] = this.addDataToCompany(jxItem, res.data[prIndex]);
-      //   res.data.splice(jxIndex, 1);
-      // }
-      // prIndex = res.data.findIndex((item) => item.companyName === "北京普润心堂商贸有限公司");
-      // zsIndex = res.data.findIndex((item) => item.companyName === "北京知事文化产业发展有限公司")
-      // if (zsIndex >= 0 && prIndex >= 0) {
-      //   const zsItem = res.data[zsIndex];
-      //   res.data[prIndex] = this.addDataToCompany(zsItem, res.data[prIndex]);
-      //   res.data.splice(zsIndex, 1);
-      // }
-      // if (this.companyNo === "GS2302231124114965") {
-      //   const jxResult = await asyncRequest.companyEveryMonth({ daytime: this.daytime, companyNo: "GS2304031312553746" });
-      //   const zsResult = await asyncRequest.companyEveryMonth({ daytime: this.daytime, companyNo: "GS2401181650538135" });
-      //   res.data[prIndex] = this.addDataToCompany(jxResult.data[0], res.data[prIndex]);
-      //   if(zsResult.data.length !== 0) {
-      //     res.data[prIndex] = this.addDataToCompany(zsResult.data[0], res.data[prIndex]);
-      //   }
-      // }
-      // const isBeforeDate = this.getDiffDay() < 0 && this.companyNo === "GS2302231323386950"
+      const mapResponseType = {  '1':'自营',  '2':'渠道',  '3':'供应商端'}
 
       if (res.code === 0 && res.data && res.data.length > 0) {
-        res.data.forEach(({ companyName, monthinfo, dayinfo, total_tips, cost_tips }) => {
-          // monthinfo[1] = {
-          //   ...(isBeforeDate ? {
-          //     msale_total:addition(monthinfo[1].msale_total,monthinfo[2].msale_total),
-          //     mth_total:addition(monthinfo[1].mth_total,monthinfo[2].mth_total),
-          //     type:'2'
-          //   } : monthinfo[1])
-          // }
-
-          // monthinfo[0] = {
-          //   ...(isBeforeDate ? {
-          //     msale_total:0,
-          //     mth_total:0,
-          //     type:'1'
-          //   } : monthinfo[0])
-          // }
-
-          // monthinfo[2] = {
-          //   ...(isBeforeDate ? {
-          //     msale_total:0,
-          //     mth_total:0,
-          //     type:'3'
-          //   } : monthinfo[2])
-          // }
-
-
-          // this.companyName = companyName
-
-
-          const mapResponseType = { '1': '自营', '2': '渠道', '3': '供应商端' }
-
-          const types = Object.keys(mapResponseType)
-
-          let prev_sale_total = 0;
-          let prev_msale_total = 0;
-          let prev_cost_total = 0;
-          let prev_mcost_total = 0;
-
-          const item = types.map(type => {
-            const _monthinfo = monthinfo.find(month => String(month.type) === type) || {}
-            const _dayinfo = dayinfo.find(day => String(day.type) === type) || {}
-
-            /** 月营业收入 = 月销售额 - 月退货额  */
-            const msale_total = subtraction(_monthinfo.msale_total, _monthinfo.mth_total) || 0
-            /** 日营业收入 = 日销售额 - 日退货额 */
-            const sale_total = subtraction(_dayinfo.sale_total, _dayinfo.th_total) || 0;
-            /** 日成本 = 日采购额 - 日退货额 */
-            const cost_total = subtraction(_dayinfo.cgd_total, _dayinfo.cgd_th_total) || 0;
-            /** 月成本 = 月采购额 - 月退货额 */
-            const mcost_total = subtraction(_monthinfo.mcgd_total, _monthinfo.mcgd_th_total) || 0;
-
-
-            prev_sale_total = Number(addition(prev_sale_total, sale_total)).toFixed(2);
-            prev_msale_total = Number(addition(prev_msale_total, msale_total)).toFixed(2);
-            prev_cost_total = Number(addition(prev_cost_total, cost_total)).toFixed(2);
-            prev_mcost_total = Number(addition(prev_mcost_total, mcost_total)).toFixed(2);
-
-            return {
-              type: mapResponseType[type],
-              dayinfo: { ..._dayinfo, sale_total },
-              monthinfo: { ...monthinfo, msale_total, mcost_total }
-            }
-          })
-
-          const gross_completion = Number(subtraction(prev_msale_total, prev_mcost_total)).toFixed(2) //当月毛利完成 = 月营收 - 月成本
-
-          this.tableData = [
-            ...this.tableData,
-            {
-              companyName,  // 公司名称
-              cost_tips, // 当月成本指标
-              total_tips, // 当月营收目标
-              info: [{ ...item }], // 直营..渠道 销售
-              sale_total: prev_sale_total, // 当日营业收入
-              cost_total: prev_cost_total, // 当日成本总额
-              msale_total: prev_msale_total, // 当月营业收入
-              mcost_total: prev_mcost_total,// 当月成本总额
-              gross_completion, //当月毛利完成 = 月营收 - 月成本
-              completion_rate: multiplication(division(prev_msale_total, total_tips), 100).toFixed(2), // 当月应收完成率
-              gross_completion_rate: Number(cost_tips) === 0 ? 0 : multiplication(division(gross_completion, cost_tips) || 0, 100).toFixed(2), // 当月毛利完成率
-              gross_sale_completion_rate: Number(multiplication(division(gross_completion, prev_msale_total) || 0, 100)).toFixed(2), // 本月毛利率 =  当月毛利完成 / 当月营业收入
+        const list = [];
+
+        res.data.forEach(i => {
+          (i.monthinfo || []).forEach(month => {
+            const monthSaleAmount = Number(subtraction(month.msale_total,month.mth_total)).toFixed(2);
+            const monthCost = Number()
+
+            const item = {
+              companyName:i.companyName,
+              type: mapResponseType[month.type],
+              monthSale:month.msale_total,
+              monthReturn:month.mth_total,
+              monthSaleAmount,
+              monthCost
             }
-          ]
-
-          // const wanyuIndex = this.tableData.findIndex(item => item.companyName === "北京万宇恒通国际科贸有限公司")
-          // if(wanyuIndex !== -1) {
-          //   const item = this.tableData.splice(wanyuIndex, 1);
-          //   this.tableData = [...item,...this.tableData]
-          // }
 
+            list.push(item);
+          })
         })
 
-        let i = ["北京万宇恒通国际科贸有限公司","北京百辰荣达国际科贸有限公司","北京泓源广诚国际商贸有限公司",'北京普润心堂商贸有限公司'];
-        const l = this.tableData.map(item => item.companyName);
-        i = i.filter(item => l.includes(item));
-        this.tableData = i.map(item => this.tableData.find(l => l.companyName === item));
-
-        console.log(this.tableData);
+        this.tableData = list;
+        console.log(list);
+        // let i = ["北京万宇恒通国际科贸有限公司","北京百辰荣达国际科贸有限公司","北京泓源广诚国际商贸有限公司",'北京普润心堂商贸有限公司'];
+        // const l = this.tableData.map(item => item.companyName);
+        // i = i.filter(item => l.includes(item));
+        // this.tableData = i.map(item => this.tableData.find(l => l.companyName === item));
       } else {
         this.tableData = [];
       }

src/components/newResultInfo/department.vue

@@ -71,13 +71,25 @@
           <template slot-scope="scope">{{ scope.row.type }}</template>
         </el-table-column>
 
-        <el-table-column label="当月销售" align="center" min-width="105px">
+        <el-table-column label="当月销售(净)" align="center" min-width="105px">
           <template slot-scope="scope">{{ unit2TenThousand(scope.row.monthSale,isTenThound) }}</template>
         </el-table-column>
+         
+         <el-table-column label="当月销售" align="center" min-width="105px">
+          <template slot-scope="scope">{{ unit2TenThousand(scope.row.monthSaleNotReturn,isTenThound) }}</template>
+        </el-table-column>
 
         <el-table-column label="销售退货" align="center" min-width="105px">
           <template slot-scope="scope">{{ unit2TenThousand(scope.row.monthReturn,isTenThound) }}</template>
         </el-table-column>
+
+        <el-table-column label="销售合计(净)" align="center" min-width="105px">
+          <template slot-scope="scope">{{ unit2TenThousand(scope.row.monthSaleAmount,isTenThound) }}</template>
+        </el-table-column>
+
+        <el-table-column label="当月成本" align="center" min-width="105px">
+          <template slot-scope="scope">{{ unit2TenThousand(scope.row.monthCost,isTenThound) }}</template>
+        </el-table-column>
       </el-table>
     </el-row>
 
@@ -160,21 +172,17 @@ export default {
     setCellClassName({ column, row }) {
       const { label } = column;
 
-      let base = "";
+      if(!label) return;
 
-      if (row.depart.indexOf("万宇") !== -1) {
-        base += "font-bold ";
-      }
+      let base = "";
+      if (row.depart.indexOf("万宇") !== -1) base += "font-bold "
 
       if (label === "当月营收目标") {
         base += "bg__success";
         return base;
       }
 
-      if (
-        (label.indexOf("营业") !== -1 || label.indexOf("营收") !== -1) &&
-        label !== "当日营业收入"
-      ) {
+      if ((label.indexOf("营业") !== -1 || label.indexOf("营收") !== -1) && label !== "当日营业收入") {
         base += "bg__success_1";
         return base;
       }
@@ -234,7 +242,7 @@ export default {
     },
     /* 表格合并列和行 */
     spanMethod({ rowIndex, columnIndex }) {
-      if (columnIndex === 0) {
+      if (columnIndex === 0 || columnIndex === 3 || columnIndex === 4 || columnIndex === 5) {
         const _row = this.flitterData(this.list).one[rowIndex];
         const _col = _row > 0 ? 1 : 0;
         return { rowspan: _row, colspan: _col };
@@ -271,10 +279,10 @@ export default {
         companyNo: this.companyNo
       });
 
-      if (res.code === 0 && res.data && res.data.length > 0) {
 
-        let list = res.data;
 
+      if (res.code === 0 && res.data && res.data.length > 0) {
+        let list = res.data;
         const mapToDepartment = {
           百辰: "客服部@百辰",
           泓源: "网络部@泓源",
@@ -282,31 +290,57 @@ export default {
           平台: "平台部@万宇"
         };
 
+        list = list.filter(item => Number(item.msale_total) !== 0);
+        let mapList = ["平台", "百辰", "泓源", "普润"];
+        const cl = list.map(item => item.depart);
+        mapList = mapList.filter(item => cl.findIndex(i => i.indexOf(item)) !== -1);
+        list = mapList.map(item => list.find(i => i.depart.indexOf(item) !== -1));
+        list = list.filter(item => item)
         list  = list.map(item => {
-
           const depart = mapToDepartment[item.depart] || '--'
+          const monthSaleAmount = Number(subtraction(item.msale_total,item.mth_total)).toFixed(2)
 
           const zy = {
             depart,
             type:'直营/自营',
             monthSale:item.mzy_sale_total,
-            monthReturn:item.th_total
+            monthSaleNotReturn:item.msale_total,
+            monthReturn:item.mth_total,
+            monthSaleAmount,
+            monthCost:item.mzy_cost_total
           };
 
           const qd = {
             depart,
             type:'支付渠道',
             monthSale:item.mchannel_sale_total,
-            monthReturn:item.th_total
+            monthSaleNotReturn:item.msale_total,
+            monthReturn:item.mth_total,
+            monthSaleAmount,
+            monthCost:item.mchannel_cost_total
           };
 
           return [zy, qd]
         })
-          
-        this.list = [];
-        list.forEach(item => Array.isArray(item) && item.forEach(i => this.list.push(i)));
 
-        console.log(this.list);
+
+        const totalItem = list.reduce((prev,current) => ({
+          ...prev,
+          monthSaleNotReturn:Number(addition(prev.monthSaleNotReturn,current[0].monthSaleNotReturn)).toFixed(2),
+          monthCost:Number(addition(prev.monthCost,current[0].monthCost))
+        }), {
+            depart:'合计',
+            type:'--',
+            monthSale:'--',
+            monthSaleNotReturn:0,
+            monthReturn:'--',
+            monthSaleAmount:'--',
+            monthCost:0
+        });
+
+        const list_copy = [];
+        list.forEach(item => Array.isArray(item) && item.forEach(i => list_copy.push(i)));
+        this.list = [...list_copy,totalItem];
       } else {
         this.list = [];
       }

src/components/newResults/department.vue

@@ -477,7 +477,6 @@ export default {
 
         let l = ["万宇", "百辰", "泓源", "普润"];
         const cl = this.list.map(item => item.depart);
-
         l = l.filter(item => {
           return cl.findIndex(i => i.indexOf(item)) !== -1;
         });

src/pages/index.vue

@@ -10,16 +10,18 @@
   </div>
 </template>
 <script>
+
+// http://stat.caixiao365.com/#/?path=newResults
 export default {
   data(){
     return {
       routes:[
-        {label:'1.业绩报表', link: '/?path=results'},
+        {label:'业绩报表(2024版)', link: '/?path=newResults'},
         {label:'2.利润看板', link: '/?path=report'},
         {label:'3.应收账款', link: '/?path=accountsReceivable'},
         {label:'4.订单情况', link: '/?path=newReport'},
         {label:'5.发货情况', link: '/?path=stock'},
-        {label:'2024业绩报表', link: '/?path=newResults'},
+        {label:'1.业绩报表', link: '/?path=results'},
       ]
     }
   },

src/pages/newResults.vue

@@ -98,33 +98,32 @@ export default {
       const openid = getOpenid()
       const code = getParameterByName('code')
       const result = await userRequest.userinfo({ ...(openid ? { openid } : { code }) })
-
-        //  const result = {
-        //   "code": 0,
-        //   "message": "获取成功",
-        //   "data": {
-        //     "openid": "oOpc26KiZFBKIm7SB8knFGvov1qg",
-        //     "subscribe_time": "2022-12-21 15:52:14",
-        //     "updatetime": "2023-05-09 16:22:33",
-        //     "addtime": "2023-04-10 18:11:17",
-        //     "is_show": ["1", "2", "4", "6", "cost_field"],
-        //     "nickname": "雪寒",
-        //     "addr": "\/\/",
-        //     "gender": "0",
-        //     "mobile": "",
-        //     "avatar": "",
-        //     "status": "1",
-        //     "id": "1",
-        //     "companyArr": [
-        //       {"companyNo": "GS2302231125079621", "companyName": "北京百辰荣达国际科贸有限公司", "info": [1, 2, 6]}, 
-        //       {"companyNo": "GS2302231323386950","companyName": "北京泓源广诚国际商贸有限公司", "info": [1, 2, 6]}, 
-        //       {"companyNo": "GS2203161855277894","companyName": "北京万宇恒通国际科贸有限公司", "info": [1, 2, 6]},
-        //       {"companyNo": "GS2304031312553746","companyName": "北京锦兴弘昌科技有限公司",  "info": [1, 2, 6]}, 
-        //       {"companyNo": "GS2302231124114965","companyName": "北京普润心堂商贸有限公司", "info": [1, 2, 6]},
-        //       {"companyNo": "GS2401181650538135","companyName": "北京知事文化产业发展有限公司", "info": [1, 2, 6]}
-        //     ]
-        // 	}
-        // }
+      //  const result = {
+      //   "code": 0,
+      //   "message": "获取成功",
+      //   "data": {
+      //     "openid": "oOpc26KiZFBKIm7SB8knFGvov1qg",
+      //     "subscribe_time": "2022-12-21 15:52:14",
+      //     "updatetime": "2023-05-09 16:22:33",
+      //     "addtime": "2023-04-10 18:11:17",
+      //     "is_show": ["1", "2", "4", "6", "cost_field"],
+      //     "nickname": "雪寒",
+      //     "addr": "\/\/",
+      //     "gender": "0",
+      //     "mobile": "",
+      //     "avatar": "",
+      //     "status": "1",
+      //     "id": "1",
+      //     "companyArr": [
+      //       {"companyNo": "GS2302231125079621", "companyName": "北京百辰荣达国际科贸有限公司", "info": [1, 2, 6]}, 
+      //       {"companyNo": "GS2302231323386950","companyName": "北京泓源广诚国际商贸有限公司", "info": [1, 2, 6]}, 
+      //       {"companyNo": "GS2203161855277894","companyName": "北京万宇恒通国际科贸有限公司", "info": [1, 2, 6]},
+      //       {"companyNo": "GS2304031312553746","companyName": "北京锦兴弘昌科技有限公司",  "info": [1, 2, 6]}, 
+      //       {"companyNo": "GS2302231124114965","companyName": "北京普润心堂商贸有限公司", "info": [1, 2, 6]},
+      //       {"companyNo": "GS2401181650538135","companyName": "北京知事文化产业发展有限公司", "info": [1, 2, 6]}
+      //     ]
+      // 	}
+      // }
 
       this.companies = result.data.companyArr.reduce((prev, current) => {
         return current.info.includes(6) || current.info.includes('6') ? [...prev, {

src/pages/newResultsInfo.vue

@@ -25,7 +25,7 @@
 
 
       <div class="container">
-        <!-- <result-company :companies="companies" :isTenThound="isTenThound" :costField="costField" /> -->
+        <result-company :companies="companies" :isTenThound="isTenThound" :costField="costField" />
         <result-department :companies="companies" :isTenThound="isTenThound" :costField="costField" />
         <!-- <result-company-month :companies="companies" :isTenThound="isTenThound" :costField="costField" /> -->
       </div>
@@ -38,7 +38,6 @@
 </template>
 
 <script>
-// 1w - 7k - 4k
 import PeriodDatePicker from "../components/period-date-picker";
 import UnusualState from "@/components/unusual/index.vue";
 import ResultCompany from "@/components/newResultInfo/company.vue"