build

src/api/newResults/index.js

@@ -7,4 +7,5 @@ export default {
   departmentEveryDay: (data, params) => http(onlineReportApi + "departEveryDay", data, "post", params),
   departmentEveryMonth: (data, params) => http(onlineReportApi + "departEveryMonth", data, "post", params),
   companyEveryMonth: (data, params) => http(onlineReportApi + "companyEveryMonth", data, "post", params),
+  companyEvery: (data, params) => http(onlineReportApi + "companyEvery", data, "post", params),
 };

src/ccomponents/reports/src/WanyuCompletion.vue

@@ -203,13 +203,13 @@ export default {
 
 
 
-          if(supplierSalekey === '北京普润心堂商贸有限公司'){
-            monthNetSales = addition(monthNetSales,mapCompanySupplierSale['北京锦兴弘昌科技有限公司'])
-          }
+          // if(supplierSalekey === '北京普润心堂商贸有限公司'){
+          //   monthNetSales = addition(monthNetSales,mapCompanySupplierSale['北京锦兴弘昌科技有限公司'])
+          // }
 
-          if(supplierSaleDaykey === '北京普润心堂商贸有限公司'){
-            dayNetSale = addition(dayNetSale,mapCompanySupplierSaleDay['北京锦兴弘昌科技有限公司'])
-          }
+          // if(supplierSaleDaykey === '北京普润心堂商贸有限公司'){
+          //   dayNetSale = addition(dayNetSale,mapCompanySupplierSaleDay['北京锦兴弘昌科技有限公司'])
+          // }
 
           /* 月经销售完成率 = 月净销售 / 销售指标 **/
           const monthProportion = multiplication(division(monthNetSales,total_tips),100).toFixed(2)

src/components/newReport/src/PurchaseBack.vue

@@ -80,7 +80,6 @@ export default {
         end:this.date[1] || ""
       });
 
-      console.log(res.data)
 
       if (res.code === 0 && res.data && res.data.length > 0) {
         this.tableData = res.data.reduce((prev,curr = { name:"", result: {}}) => {
@@ -91,8 +90,6 @@ export default {
             })]
         },[])
 
-        console.log()
-
         const { num } = this.tableData.pop()
         this.$emit('getZXTotal', num)
         this.zxTotal = num;

src/components/newReport/src/consult.vue

@@ -52,7 +52,6 @@ export default {
           num:this.tableData.reduce((prev, {  num }) => addition(prev, num),0)
         })
 
-        console.log(this.tableData)        
       } else {
         this.tableData = [];
       }

src/components/newReport/src/notDeliverGood.vue

@@ -268,7 +268,6 @@ export default {
           }
         }),{})
 
-        console.log(this.tableData)
         noAddr.result.status = "--"
         this.tableData.push(noAddr)
       } else {

src/components/newReport/src/sendExp.vue

@@ -18,16 +18,16 @@
       <el-table-column width="90px" label="商品类型"  prop="0">
         <template slot-scope="scope">{{getType(scope.row["0"])}}</template>
       </el-table-column>
-      <el-table-column label="时效" align="center">
-        <el-table-column label="A24小时" prop="1" />
-        <el-table-column label="B48小时" prop="2" />
+      <el-table-column   label="时效" align="center">
+        <el-table-column label="A24小时"  prop="1" />
+        <el-table-column label="B48小时"  prop="2" />
         <el-table-column label="C3-7天内" prop="3" />
-        <el-table-column label="D14天内" prop="4" />
-        <el-table-column label="E30天内" prop="5" />
-        <el-table-column label="F超30天" prop="6" />
+        <el-table-column label="D14天内"  prop="4" />
+        <el-table-column label="E30天内"  prop="5" />
+        <el-table-column label="F超30天"  prop="6" />
       </el-table-column>
 
-      <el-table-column label="总计">
+      <el-table-column   label="总计">
         <template slot-scope="scope">
           {{getTotal(scope.row)}}
         </template>
@@ -160,7 +160,6 @@ export default {
         const list = []
         Object.keys(res.data).forEach(key => {
           const { name , result = {}} = res.data[key]
-          console.log(result)
           if(result.length === 0){
             list.push({name, 0: '--',  1:0, 2:0, 3:0,  4:0, 5:0, 6:0 })
           }else{
@@ -190,8 +189,6 @@ export default {
         list.push(totalItem)
 
         this.tableData = list
-
-        console.log(list)
       } else {
         this.tableData = [];
       }

src/components/newResults/company-month.vue

@@ -8,7 +8,7 @@
         inactive-text="元" 
         />
 
-      <el-select size="small" style="margin-right:10px" v-model="depart_id" @change="requestData">
+      <el-select size="small" style="margin-right:10px" v-model="companyNo" @change="requestData">
         <el-option v-for="depart in departItems" :key="depart.id" :value="depart.value" :label="depart.label" />
       </el-select>
 
@@ -66,13 +66,20 @@ export default {
       isTenThound:true,
       daytime: "",
       tableData: [],
-      depart_id: "",
+      companyNo: "",
       departItems:[
-        {value:'',label:'所有平台'},
-        {value:'52',label:'百辰荣达'},
-        {value:'53',label:'普润心堂&锦兴弘昌'},
-        {value:'56',label:'泓源广诚'},
-        {value:'57',label:'万宇恒通'}
+        { value: "", label: "所有公司"},
+        { value: "GS2302231125079621", label: "北京百辰荣达国际科贸有限公司"},
+        { value: "GS2302231323386950", label: "北京泓源广诚国际商贸有限公司"},
+        // { value: "GS2304031312553746", label: "北京锦兴弘昌科技有限公司"},
+        // { value: "GS2302231124114965", label: "北京普润心堂商贸有限公司"},
+        { value: "GS2203161855277894", label: "北京万宇恒通国际科贸有限公司"},
+        { value: "GS2302231124114965", label:"普润&锦兴&知事" },
+        // {value:'',label:'所有平台'},
+        // {value:'52',label:'百辰荣达'},
+        // {value:'53',label:'普润心堂&锦兴弘昌'},
+        // {value:'56',label:'泓源广诚'},
+        // {value:'57',label:'万宇恒通'}
       ]
     }
   },
@@ -91,11 +98,17 @@ export default {
     },
     async requestData() {
       this.loading = true;
-      
-      const result = await asyncRequest.departmentEveryMonth({
-        year: (this.daytime.split('-'))[0], 
-        depart_id: this.depart_id
-      })
+
+
+      let jxResult = null;
+      if(this.companyNo === "GS2302231124114965"){
+        // console.log(1);
+        jxResult = await asyncRequest.companyEvery({ year: (this.daytime.split('-'))[0], companyNo: "GS2304031312553746" })
+      };
+
+      console.log(jxResult)
+
+      const result = await asyncRequest.companyEvery({ year: (this.daytime.split('-'))[0], companyNo: this.companyNo })
       
       switch(Number(result.code)){
         case 0:
@@ -104,21 +117,19 @@ export default {
             const pure_sale = subtraction(tableItem.sale_total,tableItem.th_total)
             /* 指标达成率 = 销售净额 / 销售指标 **/
             const completion_rate = multiplication(division(pure_sale,tableItem.total_tips),100)
-
             /* 采购净额 = 采购额 - 采购退货额 **/
             const pure_purch = subtraction(tableItem.cgd_total,tableItem.cgd_th_total)
             /* 毛利润 = (本月销售净额 - 本月采购净额) **/
             const pure_profit = subtraction(pure_sale,pure_purch)
             /*  毛利率 = (本月毛利润 / 本月销售净额) * 100 **/
             const pure_interest_rate = multiplication(division(pure_profit,pure_sale) || 0,100)
-
             return {
-              month:tableItem.month,
-              completion_rate,
-              pure_interest_rate,
-              pure_profit,
               pure_sale,
               pure_purch,
+              pure_profit,
+              completion_rate,
+              pure_interest_rate,
+              month:tableItem.month,
               cost_tips:tableItem.cost_tips,
               total_tips:tableItem.total_tips,
               cost_rate: Number(tableItem.cost_tips) === 0 ? 0 : multiplication(division(pure_profit, tableItem.cost_tips) || 0, 100).toFixed(2)

src/components/newResults/company.vue

@@ -35,7 +35,10 @@
           <template slot-scope="scope">
             <div style="display:flex;flex-direction: column;">
               <p style="text-align: center;">{{unit2TenThousand(scope.row.msale_total, isTenThound)}}</p>
-              <el-table border size="mini" :data="scope.row.info">
+              <div>
+                <p>直营/</p>
+              </div>
+              <!-- <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)}}
@@ -52,7 +55,7 @@
                     {{ unit2TenThousand(scope.row[2].monthinfo.msale_total,isTenThound)}}
                   </template>
                 </el-table-column>
-              </el-table>
+              </el-table> -->
             </div>
           </template>
         </el-table-column>

src/components/newResults/department.vue

@@ -20,7 +20,9 @@
       <el-date-picker 
         class="fr picker" 
         v-model="daytime" 
-        :picker-options="{disabledData(time) { return time.getTime() > Date.now(); } }" 
+        :picker-options="{
+          disbaledData(time) { return time.getTime() > Date.now(); } 
+          }" 
         placeholder="选择日期"
         style=";width:150px" 
         value-format="yyyy-MM-dd" 
@@ -209,8 +211,6 @@ export default {
 
 
         list = mapDepart.map(d => list.find(({ depart }) => depart === d))
-
-        console.log(list)
         const mapToDepartment = { 百辰:"百辰荣达", 泓源:"泓源广诚", 普润:"普润心堂&锦兴弘昌", 平台:"万宇恒通" }
         this.list = list.map(({depart,total_tips,dayinfo,monthinfo,mchannel_sale_total,mzy_sale_total,zy_cost_total,channel_cost_total}) => {
           /* 月净销售 = 月销售 - 月退货 **/

src/pages/results.vue

@@ -39,49 +39,49 @@ export default {
       const openid = getOpenid()
       const code = getParameterByName('code')
 
-      const result = await asyncRequest.userinfo({
-        ...( openid ? { openid } :  { code })
-      })
+      // const result = await asyncRequest.userinfo({
+      //   ...( 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"
-      // 	}
-      // }
+      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)){