Ver código fonte

分时同比

yumeng 6 meses atrás
pai
commit
7edff87086

+ 12 - 0
src/api/goodsManagement/financeData.js

@@ -50,6 +50,16 @@ export function getTotalAmount(query) {
   })
 }
 
+
+export function updateStatus(data) {
+  return request({
+    url: '/finance/reward/updateStatus',
+    method: 'post',
+    data: data
+  })
+}
+
+
 export function getTotal(query) {
   return request({
     url: '/finance/reward/getTotal',
@@ -92,6 +102,8 @@ export function delInfo(id) {
   })
 }
 
+
+
 export function importData(query) {
   return request({
     url: '/isv/supply_chain/insertRewardBaseInfoByExcel',

+ 35 - 12
src/views/goodsManagement/addFinanceData.vue

@@ -15,14 +15,6 @@
           placeholder="请输入日期"
         ></el-date-picker>
       </el-form-item>
-      <el-form-item label="商品id:" prop="itemId">
-        <el-input v-model="form.itemId" placeholder="请输入商品id" @change="changeShowItemName"/>
-      </el-form-item>
-      <el-form-item label="商品名称:" prop="itemName">
-        <template>
-          <el-input v-model="itemName"/>
-        </template>
-      </el-form-item>
       <el-form-item label="达人ID:" prop="promoterId">
         <el-input v-model="form.promoterId" placeholder="请输入达人ID" @change="changeShowPromoterName"/>
       </el-form-item>
@@ -31,7 +23,14 @@
           <el-input v-model="promoterName"/>
         </template>
       </el-form-item>
-
+      <el-form-item label="商品id:" prop="itemId">
+        <el-input v-model="form.itemId" placeholder="请输入商品id" @change="changeShowItemName"/>
+      </el-form-item>
+      <el-form-item label="商品名称:" prop="itemName">
+        <template>
+          <el-input v-model="itemName"/>
+        </template>
+      </el-form-item>
       <el-form-item label="本次结算单量:" prop="currentSettlementNum">
         <el-input v-model="form.currentSettlementNum" placeholder="请输入本次结算单量" @change="getTotalSettlementNum"/>
       </el-form-item>
@@ -41,10 +40,15 @@
         </template>
       </el-form-item>
       <el-form-item label="结算单价:" prop="settlementPrice">
-        <el-input v-model="form.settlementPrice" placeholder="请输入结算单价"/>
+        <el-input v-model="form.settlementPrice" placeholder="请输入结算单价" @change="getAnchorAmount"/>
       </el-form-item>
       <el-form-item label="主播金额:" prop="anchorAmount">
-        <el-input v-model="form.anchorAmount" placeholder="请输入主播奖励金额" @change="getTotalAmount"/>
+        <!--        <el-input v-model="anchorAmount" placeholder="请输入主播奖励金额" @change="getTotalAmount"/>-->
+
+        <template>
+          <el-input v-model="anchorAmount"/>
+        </template>
+
       </el-form-item>
       <el-form-item label="推荐人金额:" prop="referenceAmount">
         <el-input v-model="form.referenceAmount" placeholder="请输入推荐人奖励金额" @change="getTotalAmount"/>
@@ -85,8 +89,10 @@ import {
 
 export default {
   name: "AddFinanceData",
+  dicts: ["sys_normal_disable"],
   data() {
     return {
+      anchorAmount: null,
       confirmLoading: false,
       totalSettlementNum: null,
       itemName: null,
@@ -111,6 +117,16 @@ export default {
     let dd = date.getDate();
     dd = dd < 10 ? "0" + dd : dd;
     this.uploadDate = `${y}-${MM}-${dd}`;
+
+    if (this.$route.query.promoterId) {
+      this.form.promoterId = this.$route.query.promoterId
+      this.changeShowPromoterName();
+    }
+    if (this.$route.query.itemId) {
+      this.form.itemId = this.$route.query.itemId
+      this.changeShowItemName();
+    }
+
   },
 
   methods: {
@@ -145,13 +161,20 @@ export default {
       });
     },
 
+    getAnchorAmount() {
+      const result = this.form.currentSettlementNum * this.form.settlementPrice
+      this.anchorAmount = parseFloat(result.toFixed(2));
+      this.getTotalAmount();
+    },
+
+
     getTotalAmount() {
       getTotalAmount(
         {
           promoterId: this.form.promoterId,
           itemId: this.form.itemId,
           currentSettlementNum: this.form.currentSettlementNum,
-          anchorAmount: this.form.anchorAmount,
+          anchorAmount: this.anchorAmount,
           referenceAmount: this.form.referenceAmount,
         }
       ).then(response => {

+ 54 - 11
src/views/goodsManagement/financeData.vue

@@ -37,6 +37,16 @@
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+
+        <el-button
+          type="primary"
+          plain
+          size="mini"
+          @click="upload"
+          style="margin-bottom: 15px"
+        >导出</el-button
+        >
+
       </el-form-item>
     </el-form>
 
@@ -49,7 +59,7 @@
           size="mini"
           @click="toAdd()"
 
-        >新增
+        >新增激励
         </el-button>
       </el-col>
 
@@ -75,7 +85,7 @@
 
     <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
 
-      <el-table-column label="达人名称" align="center" prop="promoterName" width="140px">
+      <el-table-column label="达人名称" align="center" prop="promoterName">
         <template slot-scope="scope">
           <div style="display: flex; width: 100%">
             <div style="width: 100%" class="item-name-calss">
@@ -87,6 +97,7 @@
                       width: 100%;
                     "
                 :title="scope.row.promoterName"
+
               >
                 {{ scope.row.promoterName }}
               </a>
@@ -96,13 +107,14 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="达人ID" align="center" prop="promoterId" width="180px">
+      <el-table-column label="达人ID" align="center" prop="promoterId">
         <template slot-scope="scope">
           <div style="display: flex; width: 100%">
             <div style="width: 100%">
               <a
                 style="color: #00afff"
                 :title="scope.row.promoterId"
+                @click="toDetails(scope.row)"
               >
                 {{ scope.row.promoterId }}
               </a>
@@ -111,9 +123,7 @@
           </div>
         </template>
       </el-table-column>
-
-      <el-table-column label="渠道" align="center" prop="promoterCreateName"/>
-      <el-table-column label="商品名称" align="center" prop="itemTitle" width="280px" v-if="showItem">
+      <el-table-column label="商品名称" align="center" prop="itemTitle">
         <template slot-scope="scope">
           <div style="display: flex; width: 100%">
             <div style="width: 100%" class="item-name-calss">
@@ -134,23 +144,24 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="商品id" align="center" prop="promoterId" width="140px">
+      <el-table-column label="商品id" align="center" prop="promoterId">
         <template slot-scope="scope">
           <div style="display: flex; width: 100%">
             <div style="width: 100%">
               <a
                 style="color: #00afff"
                 :title="scope.row.itemId"
+                @click="toDetails(scope.row)"
               >
                 {{ scope.row.itemId }}
+
               </a>
 
             </div>
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="招商" align="center" prop="itemCreateName" width="100px"/>
-      <el-table-column label="最近结算日期" align="center" prop="maxDate" width="100px"/>
+      <el-table-column label="最近结算日期" align="center" prop="maxDate"/>
       <el-table-column label="累计结算单量" align="center" prop="totalSettlementNum"/>
     </el-table>
 
@@ -257,6 +268,7 @@ import {
   importData,
   totalListInfo
 } from "@/api/goodsManagement/financeData";
+import {downFilePost} from "@/api/supplyChain/supplyChain";
 
 
 export default {
@@ -323,6 +335,38 @@ export default {
     downloadTem() {
       window.location.href = `https://live-1301855440.cos.ap-chongqing.myqcloud.com/excle/%E5%A4%A7%E4%BD%AC%E7%BB%93%E7%AE%97%E6%A8%A1%E6%9D%BF.xlsx`
     },
+
+    upload() {
+      downFilePost("/finance/reward/exportTotal", {
+        statDate: this.uploadDate,
+        ...this.queryParams,
+      }).then((res) => {
+        let blob = new Blob([res], {
+          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+        });
+        let downloadElement = document.createElement("a");
+        let href = window.URL.createObjectURL(blob); //创建下载的链接
+        downloadElement.href = href;
+        downloadElement.download = "激励结算汇总.xlsx"; //下载后文件名
+        document.body.appendChild(downloadElement);
+        downloadElement.click(); //点击下载
+        document.body.removeChild(downloadElement); //下载完成移除元素
+        window.URL.revokeObjectURL(href); //释放掉blob对象
+      });
+    },
+
+
+    toDetails(item) {
+      let query = {};
+      query.itemId = item.itemId;
+      query.promoterId = item.promoterId;
+      this.$router.replace({
+        path: "/goodsManagement/FinanceDataDetail",
+        query: query
+      });
+    },
+
+
     toAdd() {
       this.$router.replace({
         path: "/goodsManagement/addFinanceData",
@@ -473,8 +517,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.showItem = true;
-      this.showPromoter = true;
+
       this.resetForm("queryForm");
       this.handleQuery();
     },

+ 219 - 35
src/views/goodsManagement/financeDataDetail.vue

@@ -1,6 +1,23 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+
+      <el-form-item label="是否结算" prop="categoryId">
+        <el-select
+          filterable
+          v-model="queryParams.status"
+          placeholder="选择媒体"
+          clearable
+          style="width: 240px"
+        >
+          <el-option
+            v-for="item in queryParamsList.statusList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="达人名称" prop="promoterName">
         <el-input
           style="width: 240px"
@@ -41,7 +58,7 @@
 
       <el-form-item label="选择日期">
         <el-date-picker
-          v-model="requestUploadDate"
+          v-model="uploadDate"
           style="width: 240px"
           value-format="yyyy-MM-dd"
           format="yyyy-MM-dd"
@@ -56,6 +73,14 @@
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="toAdd()"
+        >新增激励
+        </el-button>
 
         <el-button
           type="primary"
@@ -73,24 +98,40 @@
           @click="downloadTem"
         >下载模版
         </el-button>
+        <el-button
+          type="primary"
+          plain
+          size="mini"
+          @click="upload"
+          style="margin-bottom: 15px"
+        >导出
+        </el-button
+        >
+
       </el-form-item>
-    </el-form>
 
 
-    <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
+    </el-form>
 
-      <el-table-column
-        label="结算类型"
-        align="center"
-        prop="activityItemStatus" width="100px"
-      >
-        <template slot-scope="scope">
-          <div v-if="!!scope.row.promoterType">
-            {{ scope.row.promoterType | promoterTypeName }}
-          </div>
-          <div v-else>-</div>
-        </template>
-      </el-table-column>
+
+    <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange"
+              :row-style="TableRowStyle"
+    >
+
+      <!--      <el-table-column
+              label="结算类型"
+              align="center"
+              prop="activityItemStatus" width="100px"
+            >
+              <template slot-scope="scope">
+                <div v-if="!!scope.row.promoterType">
+                  {{ scope.row.promoterType | promoterTypeName }}
+                </div>
+                <div v-else>-</div>
+              </template>
+            </el-table-column>-->
+      <el-table-column label="渠道" align="center" prop="promoterCreateName"/>
+      <el-table-column label="招商" align="center" prop="itemCreateName"/>
       <el-table-column label="日期" align="center" prop="statDate" width="100px"/>
       <el-table-column label="达人名称" align="center" prop="promoterName" width="120px">
         <template slot-scope="scope">
@@ -113,7 +154,7 @@
         </template>
       </el-table-column>
       <el-table-column label="达人ID" align="center" prop="promoterId" width="100px"/>
-      <el-table-column label="渠道" align="center" prop="promoterCreateName" width="100px"/>
+
       <el-table-column label="商品名称" align="center" prop="itemTitle" width="280px">
         <template slot-scope="scope">
           <div style="display: flex; width: 100%">
@@ -135,7 +176,7 @@
         </template>
       </el-table-column>
       <el-table-column label="商品id" align="center" prop="itemId" width="140px"/>
-      <el-table-column label="招商" align="center" prop="itemCreateName" width="100px"/>
+
       <el-table-column label="累计结算单量" align="center" prop="totalSettlementNum" width="100px"/>
       <el-table-column label="本次结算单量" align="center" prop="currentSettlementNum" width="100px"/>
       <el-table-column label="结算单价" align="center" prop="settlementPrice" width="100px"/>
@@ -151,8 +192,13 @@
           </el-input>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120px">
+
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160px">
+
         <template slot-scope="scope">
+          <el-button size="mini" :disabled="scope.row.status  == 2" type="text" @click="jiesuan(scope.row)">结算
+          </el-button>
+
           <el-button
             size="mini"
             type="text"
@@ -266,23 +312,33 @@
 </template>
 
 <script>
-import {listInfo, getInfo, delInfo, addInfo, updateInfo, getTotal, importData} from "@/api/goodsManagement/financeData";
-import item from "@/layout/components/Sidebar/Item.vue";
+import {
+  listInfo,
+  getInfo,
+  delInfo,
+  addInfo,
+  updateInfo,
+  getTotal,
+  importData,
+  updateStatus
+} from "@/api/goodsManagement/financeData";
+import {downFilePost} from "@/api/supplyChain/supplyChain";
 
 
 export default {
-  name: "FinanceDataDetail",
+  name: "financeDataDetail",
+  dicts: ["sys_normal_disable"],
   data() {
     return {
       importTitle: null,
+      title: null,
       showItemSech: true,
       showPromoterSech: true,
       confirmLoading: false,
       dateFile: null,
       fileList: [],
       importOpen: false,
-      uploadDate: new Date(),
-      requestUploadDate: [],
+      uploadDate: [new Date(), new Date()],
       userId: null,
       // 遮罩层
       loading: false,
@@ -310,8 +366,16 @@ export default {
         itemTitle: null,
         promoterId: null,
         promoterName: null,
+        status: null,
         statDate: null
       },
+      queryParamsList: {
+
+        statusList: [
+          {value: 1, label: "未结算"},
+          {value: 2, label: "已结算"},
+        ],
+      },
       // 表单参数
       form: {},
       // 表单校验
@@ -328,9 +392,9 @@ export default {
     MM = MM < 10 ? "0" + MM : MM;
     let dd = date.getDate();
     dd = dd < 10 ? "0" + dd : dd;
-    this.uploadDate = `${y}-${MM}-${dd}`;
-
+    this.uploadDate = [`${y}-${MM}-${dd}`, `${y}-${MM}-${dd}`];
     this.getList();
+    this.getListTotal();
   },
 
   filters: {
@@ -345,6 +409,100 @@ export default {
   },
   methods: {
 
+    upload() {
+      if (this.$route.query.promoterId) {
+        this.queryParams.promoterId = this.$route.query.promoterId
+        this.uploadDate = []
+      }
+
+      if (this.$route.query.itemId) {
+        this.queryParams.itemId = this.$route.query.itemId
+        this.uploadDate = []
+      }
+
+
+      downFilePost("/finance/reward/exportDetail",
+        this.addDateRange(
+          this.queryParams,
+          this.uploadDate,
+          "startDate",
+          "endDate"
+        )
+      ).then((res) => {
+        let blob = new Blob([res], {
+          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+        });
+        let downloadElement = document.createElement("a");
+        let href = window.URL.createObjectURL(blob); //创建下载的链接
+        downloadElement.href = href;
+        downloadElement.download = "激励结算详情.xlsx"; //下载后文件名
+        document.body.appendChild(downloadElement);
+        downloadElement.click(); //点击下载
+        document.body.removeChild(downloadElement); //下载完成移除元素
+        window.URL.revokeObjectURL(href); //释放掉blob对象
+      });
+    },
+
+
+    getListTotal() {
+      if (this.$route.query.promoterId) {
+        this.queryParams.promoterId = this.$route.query.promoterId
+        this.uploadDate = []
+      }
+
+      if (this.$route.query.itemId) {
+        this.queryParams.itemId = this.$route.query.itemId
+        this.uploadDate = []
+      }
+      getTotal(
+        this.addDateRange(
+          {
+            ...this.queryParams
+          },
+          this.uploadDate,
+          "startDate",
+          "endDate"
+        )
+      ).then((res) => {
+        this.itemSummary = [res].map((item) => {
+          return {
+            ...item,
+            itemTitle: "总计",
+            userName: "总计"
+          };
+        });
+      });
+    },
+
+    jiesuan(item) {
+      this.$modal
+        .confirm(`请确认是否结算此数据?`)
+        .then(() => {
+          var params = {};
+          params.id = item.id;
+          updateStatus(params)
+            .then((res) => {
+              this.getList();
+              this.$modal.msgSuccess("结算成功");
+            })
+            .catch(() => {
+            });
+        })
+        .catch(() => {
+        });
+    },
+
+    TableRowStyle({row, rowIndex}) {
+      // 注意,这里返回的是一个对象
+      let rowBackground = {};
+      if (row.status == 2) {
+        rowBackground.background = "lightBlue";
+      } else {
+        rowBackground.background = "";
+      }
+      return rowBackground;
+    },
+
     submitFile() {
       console.log(this.dateFile)
       this.$refs["importForm"].validate((valid) => {
@@ -366,7 +524,6 @@ export default {
           } else {
             this.$message.error("请上传文件");
           }
-
         }
       });
     },
@@ -400,7 +557,6 @@ export default {
       const fileName = file.name;
       const fileStrArr = fileName.split(".");
       const suffix = fileStrArr[fileStrArr.length - 1];
-
       let result = fileSuffix.some((item) => {
         return item === suffix;
       });
@@ -418,18 +574,23 @@ export default {
       this.reset();
       this.importOpen = true;
       this.importTitle = "导入激励";
-
     },
 
-
     downloadTem() {
       window.location.href = `https://live-1301855440.cos.ap-chongqing.myqcloud.com/excle/%E5%A4%A7%E4%BD%AC%E7%BB%93%E7%AE%97%E6%A8%A1%E6%9D%BF.xlsx`
     },
 
-
     toAdd(item) {
+      let query = {};
+      if (this.$route.query.promoterId) {
+        query.promoterId = this.$route.query.promoterId
+      }
+      if (this.$route.query.itemId) {
+        query.itemId = this.$route.query.itemId
+      }
       this.$router.replace({
         path: "/goodsManagement/addFinanceData",
+        query: query
       });
     },
 
@@ -437,16 +598,25 @@ export default {
     /** 查询【请填写功能名称】列表 */
     getList() {
       this.loading = true;
+      if (this.$route.query.promoterId) {
+        this.queryParams.promoterId = this.$route.query.promoterId
+        this.uploadDate = []
+      }
+
+      if (this.$route.query.itemId) {
+        this.queryParams.itemId = this.$route.query.itemId
+        this.uploadDate = []
+      }
       listInfo(
         this.addDateRange(
           {
             ...this.queryParams
           },
-          this.requestUploadDate,
+          this.uploadDate,
           "startDate",
           "endDate"
         )).then(response => {
-        this.infoList = response.rows;
+        this.infoList = this.itemSummary.concat(response.rows);
         this.total = response.total;
         this.loading = false;
       }).catch((err) => {
@@ -464,7 +634,7 @@ export default {
       MM = MM < 10 ? "0" + MM : MM;
       let dd = date.getDate();
       dd = dd < 10 ? "0" + dd : dd;
-      this.uploadDate = `${y}-${MM}-${dd}`;
+      this.uploadDate = [`${y}-${MM}-${dd}`, `${y}-${MM}-${dd}`];
     },
 
 
@@ -505,10 +675,23 @@ export default {
     handleQuery() {
       this.queryParams.pageNum = 1;
       this.getList();
+      this.getListTotal();
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.requestUploadDate = [];
+
+      this.dateRange = [];
+      let start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 1);
+      let date = new Date(start);
+      let y = date.getFullYear();
+      let MM = date.getMonth() + 1;
+      MM = MM < 10 ? "0" + MM : MM;
+      let dd = date.getDate();
+      dd = dd < 10 ? "0" + dd : dd;
+      this.uploadDate = [`${y}-${MM}-${dd}`, `${y}-${MM}-${dd}`];
+      this.queryParams.status = null;
+      console.log(this.routeItemId)
       this.resetForm("queryForm");
       this.handleQuery();
 
@@ -579,6 +762,7 @@ export default {
       }, `info_${new Date().getTime()}.xlsx`)
     }
   }
-};
+}
+;
 
 </script>

+ 89 - 33
src/views/industry/industryHome.vue

@@ -316,8 +316,6 @@
                     {{ analysis.itemCount }}
                   </p>
                 </div>
-
-
               </div>
             </div>
           </div>
@@ -336,6 +334,16 @@
         >
           <div slot="header" class="clearfix">
             <span style="font-size: 16px; font-weight: bold; float: left">分时数据</span>
+            <el-select
+              v-model="hourType"
+              placeholder="请选择类型"
+              clearable
+              style="width: 240px; float: right; padding: 3px 0"
+              @change="changeHourType"
+            >
+              <el-option label="环比" value="1"/>
+              <el-option label="同比" value="2"/>
+            </el-select>
           </div>
           <div
             id="hourEchart"
@@ -435,6 +443,18 @@
         </el-table-column>
 
         <el-table-column
+          label="有效单量"
+          align="center"
+          prop="validOrderNum"
+
+        >
+          <template slot-scope="scope">
+            {{ scope.row.validOrderNum }}
+          </template>
+        </el-table-column>
+
+
+        <el-table-column
           label="有效率"
           align="center"
           prop="teamMember"
@@ -450,6 +470,16 @@
         </el-table-column>
 
         <el-table-column
+          label="退单数"
+          align="center"
+          prop="effOrderNum"
+        >
+          <template slot-scope="scope">
+            {{ scope.row.effOrderNum }}
+          </template>
+        </el-table-column>
+
+        <el-table-column
           label="gmv"
           align="center"
           prop="totalFee"
@@ -515,16 +545,6 @@
           </template>
         </el-table-column>
 
-        <el-table-column
-          label="退单数"
-          align="center"
-          prop="effOrderNum"
-        >
-          <template slot-scope="scope">
-            {{ scope.row.effOrderNum }}
-          </template>
-        </el-table-column>
-
 
         <el-table-column
           label="商品数"
@@ -656,6 +676,18 @@
         </el-table-column>
 
         <el-table-column
+          label="有效单量"
+          align="center"
+          prop="validOrderNum"
+
+        >
+          <template slot-scope="scope">
+            {{ scope.row.validOrderNum }}
+          </template>
+        </el-table-column>
+
+
+        <el-table-column
           label="有效率"
           align="center"
           prop="teamMember"
@@ -671,6 +703,17 @@
         </el-table-column>
 
         <el-table-column
+          label="退单数"
+          align="center"
+          prop="effOrderNum"
+        >
+          <template slot-scope="scope">
+            {{ scope.row.effOrderNum }}
+          </template>
+        </el-table-column>
+
+
+        <el-table-column
           label="gmv"
           align="center"
           prop="totalFee"
@@ -735,16 +778,6 @@
           </template>
         </el-table-column>
 
-        <el-table-column
-          label="退单数"
-          align="center"
-          prop="effOrderNum"
-        >
-          <template slot-scope="scope">
-            {{ scope.row.effOrderNum }}
-          </template>
-        </el-table-column>
-
 
         <el-table-column
           label="商品数"
@@ -872,6 +905,7 @@
           align="center"
           prop="validOrderNum"
         />
+
         <el-table-column
           label="有效率"
           align="center"
@@ -1026,6 +1060,20 @@
         </el-table-column>
 
         <el-table-column
+          label="有效单量"
+          align="center"
+          prop="teamMember"
+
+        >
+          <template slot-scope="scope">
+            {{
+              scope.row.validOrderNum
+            }}
+          </template>
+        </el-table-column>
+
+
+        <el-table-column
           label="有效率"
           align="center"
           prop="teamMember"
@@ -1040,6 +1088,17 @@
           </template>
         </el-table-column>
 
+
+        <el-table-column
+          label="退单数"
+          align="center"
+          prop="effOrderNum"
+        >
+          <template slot-scope="scope">
+            {{ scope.row.effOrderNum }}
+          </template>
+        </el-table-column>
+
         <el-table-column
           label="gmv"
           align="center"
@@ -1092,16 +1151,6 @@
           </template>
         </el-table-column>
 
-        <el-table-column
-          label="退单数"
-          align="center"
-          prop="effOrderNum"
-        >
-          <template slot-scope="scope">
-            {{ scope.row.effOrderNum }}
-          </template>
-        </el-table-column>
-
 
         <el-table-column
           label="商品数"
@@ -1136,6 +1185,7 @@ export default {
   name: "IndustryHome",
   data() {
     return {
+      hourType: "1",
       companyId: undefined,
       companyList: [],
       shopDataParams: {
@@ -1294,6 +1344,12 @@ export default {
 
   methods: {
 
+
+    changeHourType(e) {
+      this.hourType = e;
+      this.getGmvHours();
+    },
+
     getCompanyList() {
       getCompanyList().then((res) => {
         this.companyList = res.data.map((item) => {
@@ -1362,7 +1418,7 @@ export default {
       this.hourEchartsLoading = true;
       getGmvHours(
         this.addDateRange(
-          {userId: this.userId, companyId: this.companyId},
+          {userId: this.userId, companyId: this.companyId, hourType: this.hourType},
           this.uploadDate,
           "startDate",
           "endDate"

+ 2 - 0
src/views/staging.vue

@@ -450,6 +450,7 @@
             @pagination="getIndexOrderRank"
             layout="total, prev, pager, next, jumper"
             :small="true"
+            :auto-scroll="false"
           />
         </el-card>
       </el-col>
@@ -517,6 +518,7 @@
             layout="total, prev, pager, next, jumper"
             @pagination="getIndexPromoterRank"
             :small="true"
+            :auto-scroll="false"
           />
         </el-card>
       </el-col>

+ 2 - 2
src/views/supplyChain/goodsDetails.vue

@@ -102,7 +102,7 @@
       ref="multipleTable"
     >
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
-
+      <el-table-column label="绑定人" align="center" prop="userName"/>
       <el-table-column label="达人名称" align="center" prop="promoterNickName">
         <template slot-scope="scope">
           <a @click="toIndexDetail(scope.row)">
@@ -111,7 +111,7 @@
         </template>
       </el-table-column>
       <el-table-column label="达人Id" align="center" prop="promoterId"/>
-      <el-table-column label="绑定人" align="center" prop="userName"/>
+
       <el-table-column label="订单数" align="center" prop="orderNum"></el-table-column>
       <el-table-column label="有效订单数" align="center" prop="validOrderNUm"/>
       <el-table-column label="有效率" align="center" prop="validRadio">