Bladeren bron

前端修改

yumeng 1 jaar geleden
bovenliggende
commit
f375d929fb
3 gewijzigde bestanden met toevoegingen van 26 en 27 verwijderingen
  1. 17 3
      src/views/goodsManagement/samplingList.vue
  2. 4 6
      src/views/report/statistics.vue
  3. 5 18
      src/views/supplyChain/goods.vue

+ 17 - 3
src/views/goodsManagement/samplingList.vue

@@ -10,7 +10,9 @@
       v-show="showSearch"
       label-width="100px"
     >
-      <el-form-item label="领样人" prop="collectSampleId">
+      <el-form-item label="领样人" v-if="
+                  $store.getters.roles[0] != 'bdManager' &&
+                  $store.getters.roles[0] != 'bd'" prop="collectSampleId">
         <el-select
           filterable
           v-model="queryParams.collectSampleId"
@@ -390,17 +392,29 @@
                 </div>
                 <div style="width: 60%" class="item-name-calss">
                   <a
+                    v-if=" $store.getters.roles[0] != 'bdManager' &&   $store.getters.roles[0] != 'bd'"
                     style="
                       text-overflow: ellipsis;
                       white-space: nowrap;
                       overflow: hidden;
-                      width: 100%;
-                    "
+                      width: 100%;"
                     :title="scope.row.promoterNickName"
                     @click="toIndexDetails(scope.row)"
                   >
                     {{ scope.row.promoterNickName }}
                   </a>
+                  <p
+                    v-if=" $store.getters.roles[0] == 'bdManager' ||   $store.getters.roles[0] == 'bd'"
+                    style="
+                      text-overflow: ellipsis;
+                      white-space: nowrap;
+                      overflow: hidden;
+                      width: 100%;"
+                    :title="scope.row.promoterNickName"
+                  >
+                    {{ scope.row.promoterNickName }}
+                  </p>
+
                   <p>达人Id: {{ scope.row.promoterId }}</p>
                 </div>
               </div>

+ 4 - 6
src/views/report/statistics.vue

@@ -621,13 +621,11 @@ export default {
               if (res.result.length > 0) {
                 for (let i = 0; i < res.result.length; i++) {
                   dataShowAll +=
-                    res.result[i].accountName +
-                    " : " +
-                    that.allMoney(res.result[i].costTotal / 10) +
-                    "<br/>";
+                     res.result[i].accountId +
+                    "  :" + that.allMoney(res.result[i].costTotal / 10)
+                    + "  环比:" +  res.result[i].roi +
+                  "<br/>";
                 }
-
-                // return dataShow;
                 callback(ticket, dataShowAll);
               } else {
                 dataShowAll = "无账户数据";

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

@@ -246,23 +246,10 @@
         </el-table-column>
         <el-table-column label="归属人" align="center" prop="userName">
         </el-table-column>
-        <el-table-column label="top3的达人" align="center" prop="topAnchors">
+        <el-table-column label="top3的达人" align="center" prop="topAnchors"  v-if="
+                  $store.getters.roles[0] != 'bdManager' &&
+                  $store.getters.roles[0] != 'bd'">
           <template slot-scope="scope">
-            <!-- <a
-            v-for="(item, index) in scope.row.topAnchors"
-            :key="index"
-            @click="toDetail(item)"
-            style="text-align: left"
-          >
-            <img
-              :src="item.imageUrl"
-              alt=""
-              style="width: 50px; height: auto"
-            />
-            {{ item.promoterNickName }}(Id:{{ item.promoterId }};订单数量:{{
-              item.orderNum
-            }})
-          </a> -->
             <el-popover
               placement="top"
               title="top3"
@@ -270,7 +257,7 @@
               trigger="hover"
               @show="showTitle(scope.row)"
             >
-              <a
+              <asamplingList
                 v-for="(item, index) in videoTag"
                 :key="index"
                 @click="toDetail(item)"
@@ -279,7 +266,7 @@
                 {{ item.promoterNickName }}(Id:{{ item.promoterId }};订单数量:{{
                   item.orderNum
                 }})
-              </a>
+              </asamplingList>
               <a slot="reference">查看</a>
             </el-popover>
           </template>