yumeng 2 年之前
父节点
当前提交
5eb3841b1c
共有 3 个文件被更改,包括 63 次插入18 次删除
  1. 33 0
      src/views/staging.vue
  2. 6 1
      src/views/supplyChain/channelList.vue
  3. 24 17
      src/views/supplyChain/goods.vue

+ 33 - 0
src/views/staging.vue

@@ -304,12 +304,25 @@
             <el-table-column label="商品名称" align="center" prop="itemTitle">
               <template slot-scope="scope">
                 <a
+                  v-if="
+                  $store.getters.roles[0] != 'bdManager' &&
+                  $store.getters.roles[0] != 'bd'"
                   :title="scope.row.itemTitle"
                   @click="toOrderDetail(scope.row)"
                   style="text-overflow: ellipsis; white-space: nowrap; overflow: hidden"
                 >
                   {{ scope.row.itemTitle }}
                 </a>
+
+                <a
+                  v-if="
+                  $store.getters.roles[0] == 'bdManager'  ||
+                  $store.getters.roles[0] == 'bd'"
+                  :title="scope.row.itemTitle"
+                  style="text-overflow: ellipsis; white-space: nowrap; overflow: hidden"
+                >
+                  {{ scope.row.itemTitle }}
+                </a>
               </template>
             </el-table-column>
             <el-table-column label="订单数" align="center" prop="orderNum">
@@ -376,6 +389,9 @@
             <el-table-column label="达人名称" align="center" prop="promoterNickName">
               <template slot-scope="scope">
                 <a
+                  v-if="
+                  $store.getters.roles[0] != 'bdManager' &&
+                  $store.getters.roles[0] != 'bd'"
                   :title="scope.row.promoterNickName"
                   @click="toPersonDetail(scope.row)"
                   style="
@@ -388,6 +404,23 @@
                 >
                   {{ scope.row.promoterNickName }}
                 </a>
+
+                <a
+                  v-if="
+                  $store.getters.roles[0] == 'bdManager' ||
+                  $store.getters.roles[0] == 'bd'"
+                  :title="scope.row.promoterNickName"
+                  style="
+                    width: 200px;
+                    text-overflow: ellipsis;
+                    white-space: nowrap;
+                    overflow: hidden;
+                    text-align: left;
+                  "
+                >
+                  {{ scope.row.promoterNickName }}
+                </a>
+
               </template>
             </el-table-column>
             <el-table-column label="订单数" align="center" prop="orderNum">

+ 6 - 1
src/views/supplyChain/channelList.vue

@@ -14,7 +14,7 @@
       v-show="showSearch"
       label-width="100px"
     >
-      <el-form-item label="渠道" prop="collectSampleId">
+      <el-form-item label="渠道" prop="collectSampleId" v-if="$store.getters.roles[0] != 'bd'">
         <el-select
           filterable
           v-model="queryParams.collectSampleId"
@@ -296,6 +296,7 @@ export default {
       saleId: undefined,
       // 获取用户id
       userId: undefined,
+      roleId:undefined,
       // 销售列表
       saleList: [],
       // 分配销售确定loading
@@ -319,6 +320,7 @@ export default {
   },
   created() {
     this.userId = this.$store.getters.userId;
+    this.roleId = this.$store.getters.roles[0];
     let date = new Date();
     let y = date.getFullYear();
     let MM = date.getMonth() + 1;
@@ -378,6 +380,9 @@ export default {
     /** 查询字典类型列表 */
     getList() {
       this.loading = true;
+     if(this.roleId == 'bd' ){
+       this.queryParams.collectSampleId = this.userId
+      }
       getBdReportList(
         this.addDateRange(
           this.queryParams,

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

@@ -124,21 +124,6 @@
         @sort-change="sortChange"
         height="calc(100vh - 100px);"
       >
-        <!-- <el-table-column type="selection" width="55" align="center" /> -->
-        <!-- <el-table-column
-        label="商品图片"
-        align="center"
-        prop="imageUrl"
-        width="150"
-      >
-        <template slot-scope="scope">
-          <img
-            :src="scope.row.imageUrl"
-            alt=""
-            style="width: 100px; height: auto"
-          />
-        </template>
-      </el-table-column> -->
         <el-table-column
           label="商品名称"
           align="center"
@@ -155,7 +140,9 @@
                 />
               </div>
               <div style="width: 60%" class="item-name-calss">
-                <a
+                <a  v-if="
+                  $store.getters.roles[0] != 'bdManager' &&
+                  $store.getters.roles[0] != 'bd'"
                   @click="toIndexDetail(scope.row)"
                   style="
                     text-overflow: ellipsis;
@@ -167,9 +154,23 @@
                 >
                   {{ scope.row.itemTitle }}
                 </a>
+
+                <a  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.itemTitle"
+                >
+                  {{ scope.row.itemTitle }}
+                </a>
+
                 <p>商品Id: {{ scope.row.itemId }}</p>
                 <p>商品单价: {{ scope.row.reservePrice / 100 }}元</p>
-
                 <p>
                   佣金率:
                   {{
@@ -182,6 +183,12 @@
             </div>
           </template>
         </el-table-column>
+
+
+
+
+
+
         <el-table-column
           label="订单数"
           align="center"