yumeng há 1 ano atrás
pai
commit
38d3a804ff

+ 17 - 1
src/views/bytedance/bytedanceChannelList.vue

@@ -182,7 +182,7 @@
       </el-table-column>
 
       <el-table-column
-        label="预估服务费"
+        label="预估服务费收入"
         align="center"
         prop="regimentalPromotionAmount"
         width="150px"
@@ -196,6 +196,22 @@
         </template>
       </el-table-column>
 
+
+      <el-table-column
+        label="预估服务费支出"
+        align="center"
+        prop="secondEstimatedCommission"
+        width="150px"
+      >
+        <template slot-scope="scope">
+          {{
+            scope.row.secondEstimatedCommission
+              ? allMoney(scope.row.secondEstimatedCommission)
+              : "-"
+          }}
+        </template>
+      </el-table-column>
+
       <el-table-column
         label="结算服务费"
         align="center"

+ 15 - 0
src/views/bytedance/bytedanceInvestment.vue

@@ -135,6 +135,21 @@
         </template>
       </el-table-column>
       <el-table-column
+        label="预估服务费支出"
+        align="center"
+        prop="secondEstimatedCommission"
+        width="150px"
+      >
+        <template slot-scope="scope">
+          {{
+            scope.row.secondEstimatedCommission
+              ? allMoney(scope.row.secondEstimatedCommission)
+              : "-"
+          }}
+        </template>
+      </el-table-column>
+
+      <el-table-column
         label="结算服务费收入"
         align="center"
         prop="totalRegimentalSettleAmount"

+ 2 - 1
src/views/index.vue

@@ -564,7 +564,8 @@ export default {
         this.$store.getters.roles[0] == "jy_bd" ||
         this.$store.getters.roles[0] == "jy_scissors_manage" ||
         this.$store.getters.roles[0] == "jy_admnin" ||
-        this.$store.getters.roles[0] == "jy_scissors"
+        this.$store.getters.roles[0] == "jy_scissors" || this.$store.getters.roles[0] == "jy_out_operation"
+
           ? 4
         : 1;
   },

+ 2 - 2
src/views/jiaoyang/jyHome.vue

@@ -256,14 +256,14 @@
 
 
 
-    <el-row class="top-sum" :gutter="24" style="margin-top: 24px">
+    <el-row class="top-sum" :gutter="24" style="margin-top: 24px" v-if="this.$store.getters.roles[0] != 'jy_out_operation'">
       <el-col :span="12">
         <el-card
           shadow="never"
           class="card-show"
           style="width: 100%; min-height: 700px"
         >
-          <div slot="header" class="clearfix">
+          <div slot="header" class="clearfix" >
               <span style="font-size: 16px; font-weight: bold; float: left"
               >商品排行榜</span
               >

+ 39 - 3
src/views/jiaoyang/jyPromoterReport.vue

@@ -50,7 +50,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="选择日期" v-if="this.$store.getters.roles[0] == 'jy_admnin' || this.$store.getters.roles[0] == 'admnin'">
+      <el-form-item label="选择日期" >
         <el-date-picker
           v-model="uploadDate"
           style="width: 240px"
@@ -76,7 +76,7 @@
         >重置
         </el-button
         >
-        <!-- <el-button
+         <el-button
            type="warning"
            plain
            icon="el-icon-download"
@@ -85,7 +85,7 @@
            :loading="downLoadLoading"
          >导出
          </el-button
-         >-->
+         >
       </el-form-item>
     </el-form>
     <div class="tableBox">
@@ -263,6 +263,7 @@
     refreshCache,
   } from "@/api/system/dict/type";
   import {promoterReport} from "@/api/jiaoyang/report";
+  import {downFile} from "@/api/bytedance/bytedance";
 
   export default {
     name: "Index",
@@ -355,6 +356,41 @@
 
     },
     methods: {
+      /** 导出按钮操作 */
+      handleExport() {
+        this.downLoadLoading = true;
+        downFile(
+          "/jy/report/exportPromoter",
+          this.addDateRange(
+            {
+              ...this.queryParams,
+              collectSampleId: !!this.$route.query.id
+                ? this.$route.query.id
+                : this.$store.getters.remark == "管理员"
+                  ? null
+                  : this.$store.getters.userId,
+            },
+            this.uploadDate,
+            "orderStartDate",
+            "orderEndDate"
+          )
+        ).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 = `达人报表${this.uploadDate[0]}-${this.uploadDate[1]}.xlsx`; //下载后文件名
+          document.body.appendChild(downloadElement);
+          downloadElement.click(); //点击下载
+          document.body.removeChild(downloadElement); //下载完成移除元素
+          window.URL.revokeObjectURL(href); //释放掉blob对象
+          this.downLoadLoading = false;
+        });
+      },
+
+
       toPromoterDetail(item) {
         this.$router.replace({
           path: "/jiaoyang/jyPromoterDetailsReport",