build

src/ccomponents/reports/src/WanyuCompletion.vue

@@ -136,7 +136,8 @@ export default {
       this.loading = true;
       this.tableData = [];
       const res = await asyncRequest.companyReport({
-        daytime: this.date
+        daytime: this.date,
+        companyNo: "GS2203161855277894"
       });
 
       const result = await asyncRequest.departmentReport({

src/components/newResults/company-month.vue

@@ -130,6 +130,7 @@ export default {
             const pure_profit = subtraction(pure_sale,pure_purch)
             /*  毛利率 = (本月毛利润 / 本月销售净额) * 100 **/
             const pure_interest_rate = multiplication(division(pure_profit,pure_sale) || 0,100)
+
             return {
               pure_sale,
               pure_purch,

src/components/newResults/company.vue

@@ -277,6 +277,7 @@ export default {
 
 
           const gross_completion = Number(subtraction(prev_msale_total, prev_mcost_total)).toFixed(2) //当月毛利完成 = 月营收 - 月成本
+
           this.tableData = [
             ...this.tableData,
             { 
@@ -295,6 +296,8 @@ export default {
               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 = [];

src/components/newResults/department.vue

@@ -60,6 +60,7 @@
         </el-table-column>
 
         <el-table-column label="成本" align="center" min-width="400px">
+
           <!-- <el-table-column align="center" label="直营/自营">
             <template slot-scope="scope">{{unit2TenThousand(scope.row.zy_cost,isTenThound)}}</template>
           </el-table-column>
@@ -73,7 +74,7 @@
               <p style="text-align: center;">{{ unit2TenThousand(Number(addition(scope.row.zy_cost,scope.row.qd_cost)).toFixed(2),isTenThound) }}</p>
               <div class="table-size">
                 <p>直营/自营: {{ unit2TenThousand(scope.row.zy_cost,isTenThound) }}</p>
-                <p>渠道: {{unit2TenThousand(scope.row.qd_cost,isTenThound)}}</p>
+                <p>渠道: {{ unit2TenThousand(scope.row.qd_cost,isTenThound)}}</p>
               </div>
             </div>
           </template>
@@ -185,7 +186,7 @@ export default {
 	  },
     setCellClassName({ column }) {
       const { label } = column; 
-      return label === "当月营业收入(净)" || label=== "成本" || label === "毛利" ? "pure__cell" : "";
+      return label === "当月营业收入(净)" || label=== "成本" || label === "毛利" ? "pure_cell" : "";
     },
     async requestData() {
       this.loading = true;
@@ -206,7 +207,11 @@ export default {
             const { total_tips = 0, day = 0, month = 0 } = current;
             return {  total_tips: addition(total_tips,prev.total_tips), month: addition(month,prev.month), day: addition(day, prev.day) }
           },
-          { total_tips: 0, month: 0, day: 0}
+          { 
+            total_tips: 0, 
+            month: 0, 
+            day: 0
+          }
         )
 
 

src/components/reports/src/GrossMargin.vue

@@ -90,8 +90,8 @@ export default {
     division,
     async searchList() {
       this.loading = true;
-      const result = await asyncRequest.departDay({daytime:this.daytime})
-      const res = await asyncRequest.companyEveryMonth({ daytime: this.date });
+      const result = await asyncRequest.departDay({daytime:this.daytime, companyNo: "GS2203161855277894"})
+      const res = await asyncRequest.companyEveryMonth({ daytime: this.date, companyNo: "GS2203161855277894" });
 
       // 拿到普润、百辰、锦兴、泓源的供应商端月净销售
       const mapCompanySupplierSale = res.data.reduce((prev, current) => ({

src/components/reports/src/MonthGrossMargin.vue

@@ -79,7 +79,7 @@ export default {
     division,
     async searchList() {
       this.loading = true;
-      const result = await asyncRequest.departMonth({year:(this.daytime.split('-'))[0]})
+      const result = await asyncRequest.departMonth({year:(this.daytime.split('-'))[0], companyNo: "GS2203161855277894"})
       switch(Number(result.code)){
         case 0:
           const tableData = (result.data || []).map(tableItem => {

src/pages/report.vue

@@ -45,6 +45,47 @@ export default {
         ...( openid ? { openid } :  { code })
       })
 
+    // const result ={
+    //   "code": 0,
+    //   "message": "获取成功",
+    //   "data": {
+		//       "id": "1",
+		//       "openid": "oOpc26KiZFBKIm7SB8knFGvov1qg",
+		//       "mobile": "",
+		//       "gender": "0",
+		//       "nickname": "雪寒",
+		//       "avatar": "",
+		//       "subscribe_time": "2022-12-21 15:52:14",
+		//       "addr": "\/\/",
+		//       "status": "1",
+		//       "is_show": ["1", "2", "4"],
+		//       "companyArr": [{
+		//       	"companyNo": "GS2302231125079621",
+		//       	"companyName": "北京百辰荣达国际科贸有限公司",
+		//       	"info": [1,2]
+		//       }, {
+		//       	"companyNo": "GS2302231323386950",
+		//       	"companyName": "北京泓源广诚国际商贸有限公司",
+		//       	"info": [1,2]
+		//       }, {
+		//       	"companyNo": "GS2304031312553746",
+		//       	"companyName": "北京锦兴弘昌科技有限公司",
+		//       	"info": [1, 2]
+		//       }, {
+		//       	"companyNo": "GS2302231124114965",
+		//       	"companyName": "北京普润心堂商贸有限公司",
+		//       	"info": [1, 2]
+		//       }, {
+		//       	"companyNo": "GS2203161855277894",
+		//       	"companyName": "北京万宇恒通国际科贸有限公司",
+		//       	"info": [1, 2]
+		//       }],
+		//       "addtime": "2023-04-10 18:11:07",
+		//       "updatetime": "2023-05-09 16:22:33"
+    //   	}
+    //   }
+
+
       this.state.loading = false
       switch(Number(result.code)){
         case 0: