build

src/components/newResults/company-month.vue

@@ -2,22 +2,23 @@
   <div v-loading="loading">
     <div class="search clear" style="align-items: center;">
       <el-switch
+      :disabled="isEmpty"
         style="margin-right: 10px;"
         v-model="isTenThound"
         active-text="万元"
         inactive-text="元" 
         />
 
-      <el-select size="small" style="margin-right:10px" v-model="companyNo" @change="requestData">
-        <el-option v-for="depart in companies" :key="depart.id" :value="depart.value" :label="depart.label" />
+      <el-select size="small" style="margin-right:10px" v-model="companyNo" @change="requestData" :disabled="isEmpty">
+        <el-option v-for="depart in cp_companies" :key="depart.id" :value="depart.value" :label="depart.label" />
       </el-select>
 
-      <el-date-picker class="fr picker" v-model="daytime" style=";width:100px" value-format="yyyy" :editable="false"
+      <el-date-picker class="fr picker" v-model="daytime" style=";width:100px" value-format="yyyy" :editable="false" :disabled="isEmpty"
         :clearable="false" :size="'small'" type="year" format="yyyy" align="right" placeholder="选择日期"
         :picker-options="{ disabledDate(time) { return time.getTime() > Date.now(); } }" @change="requestData" />
     </div>
 
-    <el-row style="margin-top:10px">
+    <el-row style="margin-top:10px" v-if="!isEmpty">
       <el-table border size="mini" :data="tableData" :cell-class-name="setCellClassName">
         <el-table-column fixed="left" label="月度" prop="month" align="center" width="60px" />
         <el-table-column label="当月营收目标" align="center" min-width="140px">
@@ -40,18 +41,25 @@
             {{Number(scope.row.cost_rate).toFixed(2) + "%"}}
           </template>
         </el-table-column>
-        <el-table-column label="当月毛利指标" align="center" min-width="140px">
-          <template slot-scope="scope">
-            {{unit2TenThousand(scope.row.cost_tips,isTenThound)}}
-          </template>
-        </el-table-column>
-        <el-table-column label="当月毛利完成" align="center" min-width="140px">
-          <template slot-scope="scope">
-            {{unit2TenThousand(scope.row.pure_profit,isTenThound)}}
-          </template>
-        </el-table-column>
+        
+        <template v-if="costField">
+          <el-table-column label="当月毛利指标" align="center" min-width="140px">
+           <template slot-scope="scope">
+             {{unit2TenThousand(scope.row.cost_tips,isTenThound)}}
+           </template>
+          </el-table-column>
+          <el-table-column label="当月毛利完成" align="center" min-width="140px">
+            <template slot-scope="scope">
+             {{unit2TenThousand(scope.row.pure_profit,isTenThound)}}
+            </template>
+          </el-table-column>
+        </template>
       </el-table>
     </el-row>
+
+    <template v-else>
+      <div style="text-align:center;line-height:60px;user-select:none">当前账号没有访问权限</div>
+    </template>
   </div>
 </template>
 
@@ -60,6 +68,7 @@
 import asyncRequest from "@/api/newResults";
 import { unit2TenThousand, subtraction, multiplication, division, addition } from "../newReport/src/_utils";
 export default {
+  props:['companies','costField'],
   data(){
     return {
       loading: false,
@@ -67,16 +76,24 @@ export default {
       daytime: "",
       tableData: [],
       companyNo: "",
-      companies:[
-        { value:"",label: "所有公司"},
-        { value:"GS2302231125079621",label: "北京百辰荣达国际科贸有限公司"},
-        { value:"GS2302231323386950",label: "北京泓源广诚国际商贸有限公司"},
-        { value:"GS2203161855277894 ",label: "北京万宇恒通国际科贸有限公司"},
-        { value:"GS2302231124114965",label: "普润&锦兴&知事"}
-      ]
+      cp_companies:[],
+      isEmpty:false
     }
   },
   mounted() {
+    const hasCompose = false;
+    const jxIndex = this.companies.findIndex((item) => item.label === "北京锦兴弘昌科技有限公司");
+    const prIndex = this.companies.findIndex((item) => item.label === "北京普润心堂商贸有限公司");
+
+    if(jxIndex !== -1 || prIndex !== -1) this.hasCompose = true;
+    this.cp_companies = this.companies.filter((item) => item.label !== "北京锦兴弘昌科技有限公司" && item.label !== "北京普润心堂商贸有限公司")
+    if(this.hasCompose) this.cp_companies = [...this.cp_companies,{ value:"GS2302231124114965",label: "普润&锦兴&知事"}]
+    if(this.cp_companies.length === 4) this.cp_companies = [{ value:"",label: "所有公司"},...this.cp_companies];
+
+    this.isEmpty = this.cp_companies.length === 0;
+    if(this.isEmpty) return;
+
+    this.companyNo = this.cp_companies[0].value;
     this.daytime = this.transformTime();
     this.requestData();
   },
@@ -112,8 +129,6 @@ export default {
             total_tips:Number(addition(prItem['total_tips'],jxItem['total_tips'])).toFixed(2),
           }
         })
-        
-        console.log(result);
       };
 
       
@@ -144,8 +159,6 @@ export default {
             }
           })
 
-          console.log(this.tableData);
-
           // const totalItem = createTotalItem(tableData)
           // totalItem.month = "年度合计"
           // /* 年度指标达成率 = (年度销售净额 / 年度销售指标) **/

src/components/newResults/company.vue

@@ -1,48 +1,43 @@
 <template>
   <div v-loading="loading">
     <div class="search clear" style="align-items: center;;">
-      <el-switch
-        style="margin-right: 10px;"
-        v-model="isTenThound"
-        active-text="万元"
-        inactive-text="元" 
-        />
-
-      <el-select size="small" style="margin-right:10px" v-model="companyNo" @change="requestData">
-        <el-option label="所有公司" v-for="company in companies" :key="company.value" :value="company.value" :label="company.label" />
+      <el-switch style="margin-right: 10px;" v-model="isTenThound" active-text="万元" inactive-text="元" :disabled="isEmpty" />
+
+      <el-select size="small" style="margin-right:10px" v-model="companyNo" @change="requestData" :disabled="isEmpty">
+        <el-option v-for="company in cp_companies" :key="company.value" :value="company.value" :label="company.label" />
       </el-select>
 
-      <el-date-picker class="fr picker" v-model="daytime" style=";width:150px" value-format="yyyy-MM-dd" :editable="false"
+      <el-date-picker class="fr picker" v-model="daytime" style=";width:150px" value-format="yyyy-MM-dd" :editable="false" :disabled="isEmpty"
         :clearable="false" :size="'small'" format="yyyy-MM-dd" type="date" align="right" placeholder="选择日期"
         :picker-options="{ disabledDate(time) { return time.getTime() > Date.now(); } }" @change="requestData" />
     </div>
 
-    <el-row style="margin-top:10px">
+    <el-row style="margin-top:10px" v-if="!isEmpty">
       <el-table border size="mini" :data="tableData" :cell-class-name="setCellClassName">
         <el-table-column fixed="left" label="业务公司" prop="companyName" align="center" width="190px" />
         <el-table-column label="当日营业收入" align="center" width="120px">
           <template slot-scope="scope">
-            {{unit2TenThousand(scope.row.sale_total, isTenThound)}}
+            {{ unit2TenThousand(scope.row.sale_total, isTenThound) }}
           </template>
         </el-table-column>
         <el-table-column label="当月营收目标" align="center" width="120px">
           <template slot-scope="scope">
-            {{unit2TenThousand(scope.row.total_tips, isTenThound)}}
+            {{ unit2TenThousand(scope.row.total_tips, isTenThound) }}
           </template>
         </el-table-column>
 
-        <el-table-column label="当月营业收入(净)" align="center" width="450px">
+        <el-table-column label="当月营业收入(净)" align="center" min-width="450px">
           <template slot-scope="scope">
             <div style="display:flex;flex-direction: column;">
-              <p style="text-align: center;">{{unit2TenThousand(scope.row.msale_total, isTenThound)}}</p>
+              <p style="text-align: center;">{{ unit2TenThousand(scope.row.msale_total, isTenThound) }}</p>
               <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>
+                <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>
             </div>
 
-              <!-- <el-table border size="mini" :data="scope.row.info">
+            <!-- <el-table border size="mini" :data="scope.row.info">
                 <el-table-column align="center" label="直营/自营">
                   <template slot-scope="scope">
                     {{unit2TenThousand(scope.row[0].monthinfo.msale_total, isTenThound)}}
@@ -63,45 +58,48 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="当月营收完成%" align="center" width="120px">
-          <template slot-scope="scope">
-            {{scope.row.completion_rate + "%"}}
-          </template>
-        </el-table-column>
-        <el-table-column label="当月毛利完成%" align="center" width="120px">
-          <template slot-scope="scope">
-            {{scope.row.gross_completion_rate + '%'}}
-          </template>
-        </el-table-column>
-        <el-table-column label="当月毛利指标" align="center" width="120px">
-          <template slot-scope="scope">
-            {{unit2TenThousand(scope.row.cost_tips,isTenThound)}}
-          </template>
-        </el-table-column>
-        <el-table-column label="当月毛利完成" align="center" width="120px">
+        <el-table-column label="当月营收完成%" align="center" min-width="120px">
           <template slot-scope="scope">
-            {{unit2TenThousand(scope.row.gross_completion,isTenThound)}}
+            {{ scope.row.completion_rate + "%" }}
           </template>
         </el-table-column>
-        <el-table-column label="当月实际毛利率" align="center" width="120px">
+        <el-table-column label="当月毛利完成%" align="center" min-width="120px">
           <template slot-scope="scope">
-            {{unit2TenThousand(scope.row.gross_sale_completion_rate) + "%"}}
+            {{ scope.row.gross_completion_rate + '%' }}
           </template>
         </el-table-column>
 
-        <el-table-column label="当月成本合计" align="center" width="450px">
-          <template slot-scope="scope">
-            <div style="display:flex;flex-direction: column;">
-              <p style="text-align: center;"> {{unit2TenThousand(scope.row.mcost_total,isTenThound)}}</p>
-              <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>
+
+        <template v-if="costField">
+          <el-table-column label="当月毛利指标" align="center" width="120px">
+            <template slot-scope="scope">
+              {{ unit2TenThousand(scope.row.cost_tips, isTenThound) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="当月毛利完成" align="center" width="120px">
+            <template slot-scope="scope">
+              {{ unit2TenThousand(scope.row.gross_completion, isTenThound) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="当月实际毛利率" align="center" width="120px">
+            <template slot-scope="scope">
+              {{ unit2TenThousand(scope.row.gross_sale_completion_rate) + "%" }}
+            </template>
+          </el-table-column>
+          <el-table-column label="当月成本合计" align="center" width="450px">
+            <template slot-scope="scope">
+              <div style="display:flex;flex-direction: column;">
+                <p style="text-align: center;"> {{ unit2TenThousand(scope.row.mcost_total, isTenThound) }}</p>
+                <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>
               </div>
-            </div>
-          </template>
-        </el-table-column>
-        
+            </template>
+          </el-table-column>
+        </template>
+
         <!-- 
          <el-table-column label="当月成本合计" align="center" width="120px">
           <template slot-scope="scope">
@@ -126,6 +124,10 @@
         </el-table-column> -->
       </el-table>
     </el-row>
+
+    <template v-else>
+      <div style="text-align:center;line-height:60px;user-select:none">当前账号没有访问权限</div>
+    </template>
   </div>
 </template>
 
@@ -133,7 +135,9 @@
 <script>
 import asyncRequest from "@/api/newResults";
 import { addition, unit2TenThousand, subtraction, multiplication, division } from "../newReport/src/_utils";
+
 export default {
+  props: ['companies', 'costField'],
   data() {
     return {
       isTenThound: true,
@@ -141,40 +145,56 @@ export default {
       loading: false,
       tableData: [],
       companyNo: "",
-      companies:[
-        { value:"",label: "所有公司"},
-        { value:"GS2302231125079621",label: "北京百辰荣达国际科贸有限公司"},
-        { value:"GS2302231323386950",label: "北京泓源广诚国际商贸有限公司"},
-        { value:"GS2203161855277894 ",label: "北京万宇恒通国际科贸有限公司"},
-        { value:"GS2302231124114965",label: "普润&锦兴&知事"}
-      ]
+      cp_companies: [],
+      isEmpty: false
+      // companies:[
+      //   { value:"",label: "所有公司"},
+      //   { value:"GS2302231125079621",label: "北京百辰荣达国际科贸有限公司"},
+      //   { value:"GS2302231323386950",label: "北京泓源广诚国际商贸有限公司"},
+      //   { value:"GS2203161855277894 ",label: "北京万宇恒通国际科贸有限公司"},
+      //   { value:"GS2302231124114965",label: "普润&锦兴&知事"}
+      // ]
     }
   },
   mounted() {
+    const hasCompose = false;
+    const jxIndex = this.companies.findIndex((item) => item.label === "北京锦兴弘昌科技有限公司");
+    const prIndex = this.companies.findIndex((item) => item.label === "北京普润心堂商贸有限公司");
+
+    if (jxIndex !== -1 || prIndex !== -1) this.hasCompose = true;
+    this.cp_companies = this.companies.filter((item) => item.label !== "北京锦兴弘昌科技有限公司" && item.label !== "北京普润心堂商贸有限公司")
+    if (this.hasCompose) this.cp_companies = [...this.cp_companies, { value: "GS2302231124114965", label: "普润&锦兴&知事" }]
+    if (this.cp_companies.length === 4) this.cp_companies = [{ value: "", label: "所有公司" }, ...this.cp_companies];
+    
+    this.isEmpty = this.cp_companies.length === 0;
+
+    if(this.isEmpty) return;
+    
+    this.companyNo = this.cp_companies[0].value;
     this.daytime = this.transformTime();
     this.requestData();
   },
   methods: {
     unit2TenThousand,
-    addDataToCompany(c1,c2){
+    addDataToCompany(c1, c2) {
       // Number(addition(c1.total_tips,c2.total_tips)).toFixed(2)
-     return {
-        companyName:'普润&锦兴&知事',
-        cost_tips:Number(addition(c1.cost_tips,c2.cost_tips)).toFixed(2),
-        total_tips:Number(c1.total_tips).toFixed(2),
-        monthinfo:c1.monthinfo.map((item,index) => ({
-          mcgd_th_total:Number(addition(item.mcgd_th_total,c2.monthinfo[index].mcgd_th_total)).toFixed(2),
-          mcgd_total:Number(addition(item.mcgd_total,c2.monthinfo[index].mcgd_total)).toFixed(2),
-          msale_total:Number(addition(item.msale_total,c2.monthinfo[index].msale_total)).toFixed(2),
-          mth_total:Number(addition(item.mth_total,c2.monthinfo[index].mth_total)).toFixed(2),
-          type:item.type
+      return {
+        companyName: '普润&锦兴&知事',
+        cost_tips: Number(addition(c1.cost_tips, c2.cost_tips)).toFixed(2),
+        total_tips: Number(c1.total_tips).toFixed(2),
+        monthinfo: c1.monthinfo.map((item, index) => ({
+          mcgd_th_total: Number(addition(item.mcgd_th_total, c2.monthinfo[index].mcgd_th_total)).toFixed(2),
+          mcgd_total: Number(addition(item.mcgd_total, c2.monthinfo[index].mcgd_total)).toFixed(2),
+          msale_total: Number(addition(item.msale_total, c2.monthinfo[index].msale_total)).toFixed(2),
+          mth_total: Number(addition(item.mth_total, c2.monthinfo[index].mth_total)).toFixed(2),
+          type: item.type
         })),
-        dayinfo:c1.monthinfo.map((item,index) => ({
-          cgd_th_total:Number(addition(item.cgd_th_total,c2.monthinfo[index].cgd_th_total)).toFixed(2),
-          cgd_total:Number(addition(item.cgd_total,c2.monthinfo[index].cgd_total)).toFixed(2),
-          sale_total:Number(addition(item.sale_total,c2.monthinfo[index].sale_total)).toFixed(2),
-          th_total:Number(addition(item.th_total,c2.monthinfo[index].th_total)).toFixed(2),
-          type:item.type
+        dayinfo: c1.monthinfo.map((item, index) => ({
+          cgd_th_total: Number(addition(item.cgd_th_total, c2.monthinfo[index].cgd_th_total)).toFixed(2),
+          cgd_total: Number(addition(item.cgd_total, c2.monthinfo[index].cgd_total)).toFixed(2),
+          sale_total: Number(addition(item.sale_total, c2.monthinfo[index].sale_total)).toFixed(2),
+          th_total: Number(addition(item.th_total, c2.monthinfo[index].th_total)).toFixed(2),
+          type: item.type
         })),
       }
     },
@@ -193,26 +213,26 @@ export default {
       this.loading = true;
       this.tableData = [];
 
-      const res = await asyncRequest.companyEveryMonth({ daytime: this.daytime , companyNo: this.companyNo});
+      const res = await asyncRequest.companyEveryMonth({ daytime: this.daytime, companyNo: this.companyNo });
 
       const jxIndex = res.data.findIndex((item) => item.companyName === "北京锦兴弘昌科技有限公司");
       const prIndex = res.data.findIndex((item) => item.companyName === "北京普润心堂商贸有限公司");
 
-      if(jxIndex >= 0 && prIndex >= 0){
+      if (jxIndex >= 0 && prIndex >= 0) {
         const jxItem = res.data[jxIndex];
-        res.data[prIndex] = this.addDataToCompany(jxItem,res.data[prIndex]);
-        res.data.splice(jxIndex,1);
+        res.data[prIndex] = this.addDataToCompany(jxItem, res.data[prIndex]);
+        res.data.splice(jxIndex, 1);
       }
 
-      if(this.companyNo === "GS2302231124114965"){
-        const jxResult = await asyncRequest.companyEveryMonth({ daytime: this.daytime , companyNo: "GS2304031312553746"});
-        res.data[prIndex] = this.addDataToCompany(jxResult.data[0],res.data[prIndex]);
+      if (this.companyNo === "GS2302231124114965") {
+        const jxResult = await asyncRequest.companyEveryMonth({ daytime: this.daytime, companyNo: "GS2304031312553746" });
+        res.data[prIndex] = this.addDataToCompany(jxResult.data[0], res.data[prIndex]);
       }
 
       // const isBeforeDate = this.getDiffDay() < 0 && this.companyNo === "GS2302231323386950"
 
       if (res.code === 0 && res.data && res.data.length > 0) {
-        res.data.forEach(({ companyName, monthinfo, dayinfo, total_tips ,cost_tips }) => {
+        res.data.forEach(({ companyName, monthinfo, dayinfo, total_tips, cost_tips }) => {
           // monthinfo[1] = {
           //   ...(isBeforeDate ? {
           //     msale_total:addition(monthinfo[1].msale_total,monthinfo[2].msale_total),
@@ -249,30 +269,30 @@ export default {
           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 _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 }
+            }
           })
 
 
@@ -280,24 +300,22 @@ export default {
 
           this.tableData = [
             ...this.tableData,
-            { 
+            {
               companyName,  // 公司名称
               cost_tips, // 当月成本指标
               total_tips, // 当月营收目标
-              info: [{...item}], // 直营.. 渠道 销售
-              sale_total:prev_sale_total, // 当日营业收入
+              info: [{ ...item }], // 直营.. 渠道 销售
+              sale_total: prev_sale_total, // 当日营业收入
               cost_total: prev_cost_total, // 当日成本总额
-              msale_total:prev_msale_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), // 本月毛利率 =  当月毛利完成 / 当月营业收入
+              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), // 本月毛利率 =  当月毛利完成 / 当月营业收入
             }
           ]
-
-          console.log(this.tableData,gross_completion,cost_tips)
         })
       } else {
         this.tableData = [];
@@ -319,12 +337,12 @@ export default {
     margin-top: 10px
   }
 
-  .table-size{
+  .table-size {
     display: flex;
     border-top: 1px solid #ebeef5;
 
     p {
-      flex:1;
+      flex: 1;
       border-right: 1px solid #ebeef5;
       padding: 5px 10px;
       margin: 0px;

src/components/newResults/department.vue

@@ -2,13 +2,14 @@
   <div v-loading="loading">
     <div class="search clear" style="align-items: center;">
       <el-switch
+        :disabled="isEmpty"
         style="margin-right: 10px;"
         v-model="isTenThound"
         active-text="万元"
         inactive-text="元" 
         />
 
-      <el-select size="small" style="margin-right:10px" v-model="companyNo" @change="requestData">
+      <el-select size="small" style="margin-right:10px" v-model="companyNo" @change="requestData" :disabled="isEmpty">
         <el-option 
           v-for="depart in companies" 
           :key="depart.value" 
@@ -18,6 +19,7 @@
       </el-select>
 
       <el-date-picker 
+      :disabled="isEmpty"
         class="fr picker" 
         v-model="daytime" 
         :picker-options="{
@@ -35,7 +37,7 @@
         />
     </div>
 
-    <el-row style="margin-top: 10px; display: flex;">
+    <el-row style="margin-top: 10px; display: flex;" v-if="!isEmpty">
       <el-table border size="mini" :data="list" :span-method="spanMethod" :cell-class-name="setCellClassName">
         <el-table-column fixed="left" label="公司" prop="company" align="center" width="140px" />
         <el-table-column fixed="left" label="部门" prop="depart" align="center" width="140px" />
@@ -47,7 +49,7 @@
           <template slot-scope="scope">{{ unit2TenThousand(scope.row.total_tips,isTenThound) }}</template>
         </el-table-column>
 
-        <el-table-column label="当月营业收入(净)" align="center" width="400px">
+        <el-table-column label="当月营业收入(净)" align="center" min-width="400px">
           <template slot-scope="scope">
             <div style="display:flex;flex-direction: column;">
               <p style="text-align: center;">{{ unit2TenThousand(scope.row.monthinfo.monthNetSales,isTenThound)}}</p>
@@ -59,7 +61,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="成本" align="center" min-width="400px">
+        <el-table-column label="成本" align="center" min-width="400px" v-if="costField">
 
           <!-- <el-table-column align="center" label="直营/自营">
             <template slot-scope="scope">{{unit2TenThousand(scope.row.zy_cost,isTenThound)}}</template>
@@ -100,6 +102,10 @@
         </el-table-column>
       </el-table>
     </el-row>
+
+    <template v-else>
+      <div style="text-align:center;line-height:60px;user-select:none">当前账号没有访问权限</div>
+    </template>
   </div>
 </template>
 
@@ -118,20 +124,15 @@ import {
 
 export default {
   mixins: [ setHeight ],
+  props:['companies','costField'],
   data(){
     return {
       list: [],
       daytime: "",
-      companyNo: "GS2203161855277894",
+      companyNo: "",
       loading: false,
       isTenThound: true,
-      companies:[
-        { value : "GS2302231125079621", label : "北京百辰荣达国际科贸有限公司"},
-        { value : "GS2302231323386950", label : "北京泓源广诚国际商贸有限公司"},
-        { value : "GS2203161855277894", label : "北京万宇恒通国际科贸有限公司"},
-        { value : "GS2302231124114965", label : "北京普润心堂商贸有限公司"},
-        { value : "GS2304031312553746", label : "北京锦兴弘昌科技有限公司"}
-      ]
+      isEmpty: false
     }
   },
   computed:{
@@ -140,6 +141,10 @@ export default {
     }
   },
   mounted() {
+    this.isEmpty = this.companies.length === 0;
+    if(this.isEmpty) return;
+    this.companyNo = this.companies[0].value;
+
     this.daytime = this.transformTime();
     this.requestData();
   },

src/pages/newResults.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="new-results" v-loading="state.loading" style="min-height:300px">
     <div v-if="!state.error && isShow">
-      <result-company />
-      <result-company-month />
-      <result-department />
+      <result-company :companies="companies" :costField="costField" />
+      <result-company-month :companies="companies" :costField="costField" />
+      <result-department :companies="companies" :costField="costField" />
     </div>
 
     <template v-else-if="!state.loading">
@@ -19,6 +19,7 @@ import ResultCompany from "@/components/newResults/company.vue"
 import ResultDepartment from "@/components/newResults/department.vue"
 import ResultCompanyMonth from "@/components/newResults/company-month.vue"
 import { getOpenid, getParameterByName, removeOpenid, setOpenid } from "../utils/auth";
+import userRequest from "@/api/index";
 
 export default {
   name: "newReport",
@@ -31,6 +32,8 @@ export default {
   },
   data() {
     return {
+      companies:[],
+      costField: false,
       zxTotal: 0,
       daytime: "",
       isDisplay: false,
@@ -68,38 +71,47 @@ export default {
        this.state.loading = true
        const openid = getOpenid()
        const code = getParameterByName('code')
-       //  const result = await userRequest.userinfo({  ...( openid ? { openid } :  { 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]}
+      //     ]
+      // 	}
+      // }
+
+
+      this.companies = result.data.companyArr.reduce((prev,current) => {
+        return current.info.includes(6) || current.info.includes('6') ? [...prev,{
+          value:current.companyNo,
+          label:current.companyName
+        }] : prev
+      },[])
 
-       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"],
-          "nickname": "雪寒",
-		      "addr": "\/\/",
-		      "gender": "0",
-          "mobile": "",
-		      "avatar": "",
-		      "status": "1",
-		      "id": "1",
-		      "companyArr": [
-            {"companyNo": "GS2302231125079621", "companyName": "北京百辰荣达国际科贸有限公司", "info": [1, 2]}, 
-            {"companyNo": "GS2302231323386950","companyName": "北京泓源广诚国际商贸有限公司", "info": [1, 2]}, 
-            {"companyNo": "GS2203161855277894","companyName": "北京万宇恒通国际科贸有限公司", "info": [1, 2]},
-            {"companyNo": "GS2304031312553746","companyName": "北京锦兴弘昌科技有限公司",  "info": [1, 2]}, 
-            {"companyNo": "GS2302231124114965","companyName": "北京普润心堂商贸有限公司", "info": [1, 2]}
-          ]
-      	}
-      }
-      
         this.state.loading = false
         switch(Number(result.code)){
           case 0:
-           this.isShow =  (result.data.is_show || []).includes(4) || (result.data.is_show || []).includes('4')
+           this.isShow =  (result.data.is_show || []).includes(6) || (result.data.is_show || []).includes('6')
+           this.costField = (result.data.is_show || []).includes('cost_field')
            setOpenid(result.data.openid)
            break
           default: