516退款

src/App.vue

@@ -22,7 +22,7 @@
               </el-select>
             </div>
             <el-date-picker
-              v-if="value === '1'||value === '3'"
+              v-if="value === '1' || value === '3' || value === '4'"
               class="fr"
               style="width: 112px"
               v-model="dadataTime"
@@ -46,9 +46,12 @@
             <!-- <li class="myli" v-if="value === '2'">
               <sales-report-rejected />
             </li> -->
-               <li class="myli" v-if="value === '3'">
+            <li class="myli" v-if="value === '3'">
               <sales-report-rejected-new :date="dadataTime" />
-            </li> 
+            </li>
+            <li class="myli" v-else-if="value === '4'">
+              <return-report :date="dadataTime" />
+            </li>
             <!-- <li class="myli" v-else-if="value === '2'">
               <sales-report />
             </li>
@@ -69,10 +72,10 @@ export default {
   data() {
     return {
       options: [
-        {
-          value: "1",
-          label: "业绩达成报表(含退货)-产品确认单",
-        },
+        // {
+        //   value: "1",
+        //   label: "业绩达成报表(含退货)-产品确认单",
+        // },
         // {
         //   value: "2",
         //   label: "业绩达成报表(含退货)",
@@ -81,18 +84,21 @@ export default {
           value: "3",
           label: "采销平台业绩达成报表",
         },
+        {
+          value: "4",
+          label: "516退货报表",
+        },
         // {
         //   value: "3",
         //   label: "销售退货报表",
         // },
-        
       ],
       pickerOptions: {
         disabledDate(time) {
           return time.getTime() > Date.now();
         },
       },
-      value: "3",
+      value: "4",
       dadataTime: "",
     };
   },
@@ -108,7 +114,7 @@ export default {
       return y + "-" + (M < 10 ? "0" + M : M) + "-" + (d < 10 ? "0" + d : d);
     },
     selectChange() {
-      if (this.value !== 2) {
+      if (this.value+"" !== '2') {
         this.dadataTime = this.transformTime();
       }
     },

src/api/index.js

@@ -15,5 +15,7 @@ export default {
     departtj: (data, params) => http(baseApi + api + 'departtj', data, 'post', params),
     // 部门合并后的指标(新)
     statlist: (data, params) => http(cxApi + 'admin/statlist', data, 'post', params),
+    // 516退货
+    thlist: (data, params) => http(baseApi + api + 'departth', data, 'post', params),
 
 }

src/components/index.js

@@ -5,6 +5,7 @@ import SalesReportRejectedSettlement from "./SalesReportRejectedSettlement";
 import SalesReportM from "./SalesReportM";
 import SalesReportRejectedSettlementNew from "./SalesReportRejectedSettlementNew";
 import SalesReportRejectedNew from "./SalesReportRejectedNew"
+import returnReport from "./returnReport"
 export default {
   install(Vue) {
     // 全局注册组件
@@ -14,6 +15,8 @@ export default {
     Vue.component(SalesReportRejectedSettlement.name, SalesReportRejectedSettlement);
     Vue.component(SalesReportRejectedSettlementNew.name, SalesReportRejectedSettlementNew);
     Vue.component(SalesReportRejectedNew.name, SalesReportRejectedNew)
+    Vue.component(returnReport.name, returnReport)
+    
 
   }
 };

src/components/returnReport.vue

@@ -0,0 +1,151 @@
+<template>
+  <div class="returnReport">
+    <!-- <div class="title">业绩达成报表(含退货)-产品确认单</div> -->
+    <!-- stripe -->
+    <el-table
+      :data="tableData"
+      v-loading="loading"
+      border
+      :max-height="maxHeight"
+      :size="'mini'"
+      style="width: 100%"
+      row-key="id"
+      default-expand-all
+      :row-class-name="tableRowClassName"
+      :tree-props="{ children: 'child', hasChildren: 'hasChildren' }"
+    >
+      <el-table-column
+        prop="rows_name"
+        label="业绩类型"
+        fixed="left"
+        min-width="120"
+      >
+      </el-table-column>
+      <!-- <el-table-column label="本日金额" min-width="120" align="center">
+        <el-table-column show-overflow-tooltip label="销售" min-width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.dtotal | toThousandFilter }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column show-overflow-tooltip label="退款" min-width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.thfee | toThousandFilter }}</span>
+          </template>
+        </el-table-column>
+      </el-table-column>
+
+      <el-table-column label="本周金额" min-width="120" align="center">
+        <el-table-column show-overflow-tooltip label="销售" min-width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.wtotal | toThousandFilter }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column show-overflow-tooltip label="退款" min-width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.wthfee | toThousandFilter }}</span>
+          </template>
+        </el-table-column>
+      </el-table-column> -->
+
+      <!-- <el-table-column label="本月金额" min-width="120" align="center"> -->
+
+      <el-table-column show-overflow-tooltip label="今日退款" min-width="120">
+        <template slot-scope="scope">
+          <span>{{ scope.row.dth_fee | toThousandFilter }}</span>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column show-overflow-tooltip label="本周退款" min-width="120">
+        <template slot-scope="scope">
+          <span>{{ scope.row.wth_fee | toThousandFilter }}</span>
+        </template>
+      </el-table-column> -->
+
+      <el-table-column show-overflow-tooltip label="本月退款" min-width="120">
+        <template slot-scope="scope">
+          <span>{{ scope.row.mth_fee | toThousandFilter }}</span>
+        </template>
+      </el-table-column>
+
+      <!-- </el-table-column> -->
+    </el-table>
+  </div>
+</template>
+
+<script>
+import asyncRequest from "@/api/index";
+import setHeight from "@/mixins/index";
+export default {
+  name: "returnReport",
+  props: ["date"],
+  mixins: [setHeight],
+  watch: {
+    date: function (val) {
+      this.dataTime = val;
+      if (val) {
+        this.searchList();
+      }
+    },
+  },
+  data() {
+    return {
+      dataTime: this.date,
+      loading: false,
+      maxHeight: "0",
+      tableData: [],
+    };
+  },
+  async created() {
+    window.onresize = () => {
+      this.getHeight();
+    };
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.getHeight();
+    });
+    this.searchList();
+  },
+  methods: {
+    tableRowClassName({ row, rowIndex }) {
+      if ((row && row.child && row.child.length > 0) || rowIndex === 0) {
+        return "warning-row";
+      } else {
+        return "";
+      }
+    },
+    async searchList() {
+      this.loading = true;
+      this.tableData = [];
+      const res = await asyncRequest.thlist({
+        endtime: this.date ? this.date : "",
+      });
+      if (res.code === 0 && res.data && res.data.length > 0) {
+        this.tableData = res.data;
+        this.tableData.map((v1, i1) => {
+          v1.child = v1.children;
+          delete v1["children"];
+          v1.id = i1 + "";
+          // v1.p = v1.p ? v1.p : v1.depart;
+          if (v1.child && v1.child.length > 0) {
+            v1.child.map((v2, i2) => {
+              v2.rows_name = v2.suppitem;
+              v2.id = "" + v1 + i2;
+              return v2;
+            });
+          }
+          return v1;
+        });
+      } else {
+        this.tableData = [];
+      }
+      this.getHeight();
+      this.loading = false;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.returnReport {
+}
+</style>

src/config/env.development.js

@@ -2,8 +2,8 @@
 module.exports = {
   title: '业绩报表',
   baseApi: 'http://inv.sitw.wanyuhengtong.com/',
-  cxApi: 'http://stock.test241.wanyuhengtong.com/',
-  fileURL: `https://api2.edusit.zretchome.com`,
+  cxApi: 'http://stock.api.wanyuhengtong.com/',
+  fileURL: `https://api2.edu.futurelab.tv`,
   appId: 'wx5ac3a2c2d72b6f26',
   ding: {
     //企业id