build

src/components/newResultInfo/company.vue

@@ -40,24 +40,42 @@
 
         <el-table-column label="业绩类型" prop="type" align="center" width="100px"></el-table-column>
         
-        <el-table-column label="当月销售" prop="monthSale" align="center" width="100px">
+        <el-table-column label="当月销售" prop="monthSale" align="center" min-width="100px">
           <template slot-scope="scope">
             {{unit2TenThousand(scope.row.monthSale,isTenThound)}}
           </template>
         </el-table-column>
 
-        <el-table-column label="销售退货" prop="monthReturn" align="center" width="100px">
+        <el-table-column label="销售退货" prop="monthReturn" align="center" min-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">
+        <el-table-column label="销售合计" prop="monthSaleAmount" align="center" min-width="100px">
           <template slot-scope="scope">
             {{unit2TenThousand(scope.row.monthSaleAmount,isTenThound)}}
           </template>
         </el-table-column>
+
+        <el-table-column label="当月成本" prop="monthCost" align="center" min-width="100px">
+          <template slot-scope="scope">
+            {{unit2TenThousand(scope.row.monthCost,isTenThound)}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="当月成本退货" prop="monthCost" align="center" min-width="100px">
+          <template slot-scope="scope">
+            {{unit2TenThousand(scope.row.monthCostReturn,isTenThound)}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="成本合计" prop="monthCost" align="center" min-width="100px">
+          <template slot-scope="scope">
+            {{unit2TenThousand(scope.row.monthCostAmount,isTenThound)}}
+          </template>
+        </el-table-column>
       </el-table>
     </el-row>
 
@@ -261,10 +279,26 @@ export default {
       if (res.code === 0 && res.data && res.data.length > 0) {
         const list = [];
 
+        let i = ["北京万宇恒通国际科贸有限公司","北京百辰荣达国际科贸有限公司","北京泓源广诚国际商贸有限公司",'北京普润心堂商贸有限公司'];
+        const l = res.data.map(item => item.companyName);
+        i = i.filter(item => l.includes(item));
+        res.data = i.map(item => res.data.find(l => l.companyName === item));
+
         res.data.forEach(i => {
-          (i.monthinfo || []).forEach(month => {
+          let totalItem = {
+              companyName:i.companyName,
+              type: '合计',
+              monthSale:'--',
+              monthReturn:'--',
+              monthSaleAmount:0,
+              monthCost:'--',
+              monthCostReturn:'--',
+              monthCostAmount:0
+          };
+
+          (i.monthinfo || []).forEach((month,index) => {
             const monthSaleAmount = Number(subtraction(month.msale_total,month.mth_total)).toFixed(2);
-            const monthCost = Number()
+            const monthCostAmount = Number(subtraction(month.mcgd_total,month.mcgd_th_total)).toFixed(2);
 
             const item = {
               companyName:i.companyName,
@@ -272,19 +306,20 @@ export default {
               monthSale:month.msale_total,
               monthReturn:month.mth_total,
               monthSaleAmount,
-              monthCost
+              monthCost:month.mcgd_total,
+              monthCostReturn:month.mcgd_th_total,
+              monthCostAmount
             }
 
+            totalItem.monthSaleAmount = Number(addition(item.monthSaleAmount,totalItem.monthSaleAmount)).toFixed(2);
+            totalItem.monthCostAmount = Number(addition(item.monthCostAmount,totalItem.monthCostAmount)).toFixed(2);
             list.push(item);
+            if(index === 2){  list.push(totalItem);}
           })
         })
 
         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));
+        // console.log(list);
       } else {
         this.tableData = [];
       }

src/components/newResultInfo/department.vue

@@ -327,7 +327,7 @@ export default {
         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))
+          monthCost:Number(addition(Number(addition(prev.monthCost,current[0].monthCost)).toFixed(2),current[1].monthCost)).toFixed(2)
         }), {
             depart:'合计',
             type:'--',
@@ -338,6 +338,8 @@ export default {
             monthCost:0
         });
 
+        console.log('🚀~',totalItem);
+
         const list_copy = [];
         list.forEach(item => Array.isArray(item) && item.forEach(i => list_copy.push(i)));
         this.list = [...list_copy,totalItem];

src/pages/newResultsInfo.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="new-results" v-loading="state.loading" style="min-height:300px">
-    <div v-if="!state.error && isShow">
+    <div v-if="!state.error && isShow && hasPermission">
       <div
         style="
         color:red;
@@ -61,6 +61,7 @@ export default {
       costField: false,
       zxTotal: 0,
       daytime: "",
+      hasPermission:false,
       isDisplay: false,
       isTenThound: true,
       state: { message: '', error: false, loading: false }
@@ -97,7 +98,8 @@ export default {
       const openid = getOpenid()
       const code = getParameterByName('code')
       const result = await userRequest.userinfo({ ...(openid ? { openid } : { code }) })
-        //  const result = {
+
+//  const result = {
         //   "code": 0,
         //   "message": "获取成功",
         //   "data": {
@@ -124,6 +126,9 @@ export default {
         // 	}
         // }
 
+        const permissions = ['1','2','3','17'];
+        this.hasPermission = permissions.includes(result.data.id);
+
       this.companies = result.data.companyArr.reduce((prev, current) => {
         return current.info.includes(6) || current.info.includes('6') ? [...prev, {
           value: current.companyNo,