yumeng 7 mesiacov pred
rodič
commit
497a437d1b

+ 2 - 2
src/views/bytedance/bytedancePromoterList.vue

@@ -97,7 +97,7 @@
         prop="orderNum"
         width="80"
       >
-
+      </el-table-column>
         <el-table-column
           label="环比"
           align="center"
@@ -111,7 +111,7 @@
           </template>
         </el-table-column>
 
-      </el-table-column>
+
       <el-table-column
         label="有效单数"
         align="center"

+ 14 - 0
src/views/jiaoyang/jyDingPan.vue

@@ -1059,7 +1059,21 @@
           label="类型"
           align="center"
           prop="promoterType">
+        </el-table-column>
 
+        <el-table-column
+          v-if=" this.$store.getters.roles[0] == 'jy_admnin' || this.$store.getters.roles[0] == 'admin'"
+          label="毛利"
+          align="center"
+          prop="teamMember"
+        >
+          <template slot-scope="scope">
+            {{
+              scope.row.grossMargin
+                ? (scope.row.grossMargin).toFixed(2) + "%"
+                : "-"
+            }}
+          </template>
         </el-table-column>
 
         <el-table-column

+ 23 - 3
src/views/staging.vue

@@ -359,8 +359,17 @@
         >
           <div slot="header" class="clearfix">
               <span style="font-size: 16px; font-weight: bold; float: left"
-              >分时数据</span
-              >
+              >分时数据</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"
@@ -534,6 +543,7 @@ export default {
     return {
       hourEchartsLoading: false,
       mediaId: 2,
+      hourType: "1",
       echartsType: "orderAmount",
       echartsTwoType: "validOrderAmount",
       // 遮罩层
@@ -597,6 +607,7 @@ export default {
               const end = new Date();
               const start = new Date();
               start.setTime(start.getTime() - 3600 * 1000 * 24 * 3);
+              end.setTime(end.getTime() - 3600 * 1000 * 24 * 1);
               picker.$emit("pick", [start, end]);
             },
           },
@@ -606,6 +617,7 @@ export default {
               const end = new Date();
               const start = new Date();
               start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              end.setTime(end.getTime() - 3600 * 1000 * 24 * 1);
               picker.$emit("pick", [start, end]);
             },
           },
@@ -615,6 +627,7 @@ export default {
               const end = new Date();
               const start = new Date();
               start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              end.setTime(end.getTime() - 3600 * 1000 * 24 * 1);
               picker.$emit("pick", [start, end]);
             },
           },
@@ -624,6 +637,7 @@ export default {
               const end = new Date();
               const start = new Date();
               start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              end.setTime(end.getTime() - 3600 * 1000 * 24 * 1);
               picker.$emit("pick", [start, end]);
             },
           },
@@ -707,7 +721,7 @@ export default {
       this.hourEchartsLoading = true
       getGmvHour(
         this.addDateRange({
-            userId: this.userId, mediaId: this.mediaId, type: this.type
+            userId: this.userId, mediaId: this.mediaId, type: this.type, hourType: this.hourType
           },
           this.uploadDate,
           "statDate",
@@ -889,6 +903,12 @@ export default {
       this.title = "上传报表";
     },
 
+    changeHourType(e) {
+      this.hourType = e;
+      this.getGmvHour();
+    },
+
+
     changeEchartsType(e) {
       if (!!e) {
         if (e == 'orderAmount') {

+ 17 - 5
src/views/supplyChain/goods.vue

@@ -182,7 +182,14 @@
                       : "-"
                   }}
                 </p>
-
+                <p v-if="showInvestmentPromotionRate">
+                  服务费率:
+                  {{
+                    scope.row.investmentPromotionRate
+                      ? scope.row.investmentPromotionRate + "%"
+                      : "-"
+                  }}
+                </p>
                 <p>
                   是否预售:
                   {{
@@ -215,12 +222,11 @@
           label="小店信息"
           align="center"
           width="120"
+          prop="storeScore"
+          sortable="custom"
         >
           <template slot-scope="scope">
-            评分:{{ scope.row.shopScore }}<br/>
-            服务:{{ scope.row.mallServiceScore }}<br/>
-            质量:{{ scope.row.mallQualityScore }}<br/>
-            物流:{{ scope.row.mallLogisticsScore }}
+            体验分:{{ scope.row.storeScore }}
           </template>
         </el-table-column>
 
@@ -379,6 +385,7 @@ export default {
   dicts: ["sys_normal_disable"],
   data() {
     return {
+      showInvestmentPromotionRate: false,
       downLoadLoading: false,
       dialogTableVisible: false,
       logPage: {
@@ -443,6 +450,11 @@ export default {
   },
   created() {
     this.userId = this.$store.getters.userId;
+    console.log(this.userId)
+    if (this.userId == 1 || this.userId == 510127) {
+      this.showInvestmentPromotionRate = true;
+
+    }
     let date = new Date();
     let y = date.getFullYear();
     let MM = date.getMonth() + 1;

+ 3 - 0
src/views/supplyChain/queryProduct.vue

@@ -306,6 +306,7 @@ export default {
               const end = new Date();
               const start = new Date();
               start.setTime(start.getTime() - 3600 * 1000 * 24 * 3);
+              end.setTime(end.getTime() - 3600 * 1000 * 24 * 1);
               picker.$emit("pick", [start, end]);
             },
           },
@@ -315,6 +316,7 @@ export default {
               const end = new Date();
               const start = new Date();
               start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              end.setTime(end.getTime() - 3600 * 1000 * 24 * 1);
               picker.$emit("pick", [start, end]);
             },
           },
@@ -324,6 +326,7 @@ export default {
               const end = new Date();
               const start = new Date();
               start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              end.setTime(end.getTime() - 3600 * 1000 * 24 * 1);
               picker.$emit("pick", [start, end]);
             },
           },