jufubao-admin-library 1.1.99 → 1.1.101

package/library/viewModules/viewStat/schemas/product.stat.js

@@ -132,6 +132,20 @@ module.exports = {
       disabled: true,
       role: ""
     },
+    {
+      title: "统计-商品统计-已选商品折扣分布",
+      mapFn: "getSelectedProdDiscounts",
+      path: '/stat-partner/v1/product-stat/selected-prod-discounts',
+      isRule: false,
+      params: {
+        filter_site_id: ['filter_site_id', 'String', '必填'],
+        filter_business_code: ['filter_business_code', 'String', '必填'],
+      },
+      disabled: true,
+      role: "STAT-PARTNER.PRODUCT_STAT_SELECT_PROD_DISCOUNT"
+    },
+
+    
     
   ]
 }

package/library/viewModules/viewStat/viewsStat/product/components/select-discount.vue

@@ -0,0 +1,370 @@
+<template>
+  <el-card class="discount-wrap">
+    <div class="discount-wrap-header" slot="header">
+      <div class="discount-wrap-header-select">
+        <div class="mb10 fs18">
+          已选商品折扣分布
+          <!-- <el-tooltip
+            effect="light"
+            content="仅统计可售商品，包含人工添加和接口同步商品。"
+            placement="right"
+          >
+            <i class="xdicon_question-circle xd_admin_iconfont"></i>
+          </el-tooltip> -->
+          <span class="s_tit">
+            <!-- 截止到{{ last_updated_date_time }} -->
+          </span>
+        </div>
+        <div>
+          <el-form ref="form" :inline="true" :model="form" label-width="80px">
+            <!-- <el-form-item label="折扣类型">
+              <el-select
+                v-model="discount_type"
+                filterable
+                clearable
+                placeholder="请选择折扣类型"
+                style="margin-right: 10px"
+              >
+                <el-option
+                  v-for="item in discountTypeList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item> -->
+            <el-form-item label="供应商">
+              <el-select
+                v-model="channel_code"
+                filterable
+                clearable
+                placeholder="请选择供应商类别"
+                style="margin-right: 10px"
+              >
+                <el-option
+                  v-for="item in channelList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+              <el-select
+                clearable
+                v-if="channel_code && showSupplier === 'Y'"
+                v-model="supplier_ids"
+                filterable
+                remote
+                reserve-keyword
+                placeholder="请输入供应商"
+                :remote-method="remoteMethod"
+              >
+                <el-option
+                  v-for="item in supplierList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <!-- <el-form-item label="时间">
+              <xd-stat-trade-date  :isRangeMonth="true" v-model="tradeTime"></xd-stat-trade-date>
+            </el-form-item> -->
+            <el-form-item label="公共分类">
+              <el-cascader v-model="category_id" :props="categoryProps" clearable></el-cascader>
+            </el-form-item>
+            <el-form-item>
+              <el-button
+                @click="getDataList"
+                style="margin-left: 10px"
+                type="primary"
+                >搜索</el-button
+              >
+              <el-button @click="doExport" type="primary">条件导出</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+      </div>
+      <div>
+        {{
+          channel_code
+            ? channel_code !== "self"
+              ? channel_code_text
+              : supplier_text
+              ? supplier_text
+              : "全部"
+            : "全部"
+        }}已选商品-按折扣统计数量：
+      </div>
+    </div>
+    <xd-stat-table-group
+      v-if="upNewParams"
+      :params="upNewParams"
+      :key="upNewkey"
+      :getList="getSelectedProdDiscounts"
+    >
+    </xd-stat-table-group>
+    <div style="margin-top: 20px">注：自有商品折扣取货源进货价/售价折扣；非自有商品折扣取平台进货价/售价折扣。</div>
+  </el-card>
+</template>
+<script>
+import { getOptions } from "@/utils/options";
+import { mapActions } from "vuex";
+import XdStatTradeDate from "@/components/XdStatTradeDate";
+import XdStatTableGroup from "@/components/XdStatTableGroup";
+export default {
+  components: {
+    XdStatTradeDate,
+    XdStatTableGroup
+  },
+  data() {
+    return {
+      keyList: [],
+      rowTitle: [],
+      dataList: [],
+      channelList: [],
+      channel_code: null,
+      supplier_ids: null,
+      supplierList: [],
+      last_updated_date_time: "", //截止时间
+      supplier_text: "",
+      channel_code_text: "",
+      showSupplier: "N",
+      discountTypeList:[
+        {
+          label:'市场价',
+          value:'market'
+        },
+        {
+          label:'建议售价',
+          value:'sale'
+        },
+      ],
+      discount_type:'',
+      tradeTime: null,
+      category_id:[],
+      categoryProps: {
+        checkStrictly: true,
+        lazy: true,
+        lazyLoad (node, resolve) {
+          getOptions({
+            server: 'product-partner',
+            fn: "categories",
+            path: "p4",
+            params: {
+              value: node.level == 0 ? 0 : node.value,
+            },
+          }).then((res) => {
+            resolve(res["data"]["list"])
+          })
+        },
+      },
+      form:{},
+      upNewkey:'upNewkey',
+      upNewParams:null,
+    };
+  },
+  props: {
+    site_id: {
+      type: Number|String,
+      default: null
+    },
+    business_code: {
+      type: Number|String,
+      default: null
+    },
+    sub_business_code:{
+      type: Number|String,
+      default: null
+    },
+  },
+  watch: {
+    channel_code(n, o) {
+      this.channel_code_text = "";
+      this.supplier_text = "";
+      this.supplier_ids = null;
+      if (n && n !== o) {
+        this.channel_code_text = this.channelList.find(
+          (item) => item.value === n
+        ).label;
+        this.showSupplier = this.channelList.find(
+          (item) => item.value === n
+        ).has_supplier;
+      }
+    },
+    supplier_ids(n, o) {
+      this.supplier_text = "";
+      if (n && n !== o) {
+        this.supplier_text = this.supplierList.find(
+          (item) => item.value === n
+        ).label;
+      }
+    },
+    site_id(n,o) {
+      this.getDataList()
+    },
+    business_code(n,o) {
+      this.getDataList()
+    },
+    sub_business_code(n,o) {
+      this.getDataList()
+    }
+  },
+  created() {
+    getOptions({
+      server: "supplier-partner",
+      fn: "supplier-channel",
+      path: "p1",
+      params:{
+        type:'ALL'
+      }
+    }).then((res) => {
+      this.channelList = res.data.list;
+    });
+    
+  },
+  mounted(){
+    this.getDataList();
+  },
+  methods: {
+    ...mapActions("productStat", ["getSelectedProdDiscounts"]),
+    // 获取列表数据
+    async getDataList(row) {
+     
+      let params = {
+        channel_code: this.channel_code,
+        supplier_ids: this.supplier_ids,
+        channel_code_text: this.channel_code_text,
+        supplier_text: this.supplier_text,
+        discount_type:this.discount_type,
+        filter_site_id: this.site_id?this.site_id:null,
+        filter_business_code: this.business_code?this.business_code:null,
+        filter_lv2_business_code: this.sub_business_code,
+        ...this.tradeTime,
+      }
+       if (this.category_id && this.category_id.length) {
+        params['category_id'] = this.category_id[this.category_id.length - 1]
+      }
+      this.upNewParams = params;
+      this.upNewkey = Date.now();
+    },
+    doExport() {
+      this.$prompt("请输入导出文件名称", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        inputPattern: /[\S]+/,
+        inputErrorMessage: "请填写正确的名称",
+      }).then(({ value }) => {
+        let params = {
+          channel_code: this.channel_code,
+          supplier_ids: this.supplier_ids,
+          export: true,
+          file_ext: "xlsx",
+          file_name: value,
+          channel_code_text: this.channel_code_text,
+          supplier_text: this.supplier_text,
+          discount_type:this.discount_type,
+          filter_site_id: this.site_id?this.site_id:null,
+          filter_business_code: this.business_code?this.business_code:null,
+          filter_lv2_business_code: this.sub_business_code,
+          ...this.tradeTime,
+        };
+        let loading = this.$loading({});
+        this.getSelectedProdDiscounts(params)
+          .then((res) => {
+            loading.close();
+            this.$alert(
+              "导出任务已经开始执行，请去任务管理查看下载状态",
+              "提示",
+              {
+                confirmButtonText: "确定",
+              }
+            );
+          })
+          .catch((err) => {
+            this.$message.error(err.msg);
+            loading.close();
+          });
+      });
+    },
+    remoteMethod(query) {
+      if (query !== "") {
+        getOptions({
+          server: "supplier-partner",
+          fn: "channel-supplier",
+          path: "p1",
+          params: {
+            channel_code: this.channel_code,
+            keyword: query,
+          },
+        })
+          .then((res) => {
+            this.supplierList = res.data.list;
+          })
+          .catch((err) => {
+            console.log(err, "err");
+          });
+      } else {
+        this.supplierList = [];
+      }
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.discount {
+  &-wrap {
+    margin-top: 20px;
+    &-header {
+      &-select {
+        //display: flex;
+        //justify-content: space-between;
+        //align-items: center;
+        margin-bottom: 10px;
+
+        & > div:first-child {
+          display: flex;
+          align-items: center;
+          font-size: 20px;
+          i {
+            cursor: pointer;
+            margin-left: 4px;
+            color: #a1a7b3;
+          }
+        }
+
+        & > div:nth-child(2) {
+          display: flex;
+          flex-wrap: wrap;
+          align-items: center;
+        }
+      }
+    }
+  }
+}
+.s_tit{
+    font-size: 12px;
+    color: #A1A7B3;
+    margin-left: 10px;
+    vertical-align: bottom;
+  }
+.empty_data {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 100px;
+  color: #a1a7b3;
+  font-size: 14px;
+}
+.mb10{
+  margin-bottom: 10px;
+}
+.dis_f{
+  display: flex;
+}
+.fs18{
+  font-size: 18px!important;
+}
+</style>

package/library/viewModules/viewStat/viewsStat/product/index.vue

@@ -36,6 +36,12 @@
       :sub_business_code="sub_business_code"
       v-permission="[Role.totalCounts]"
     ></stat-all>
+    <select-discount 
+      v-if="site_id&&isSelectProdDis"
+      :site_id="site_id"
+      :business_code="business_code"
+      :sub_business_code="sub_business_code"
+    ></select-discount>
     <stat-all-gift
       v-if="site_id&&business_code==='gift'&&status"
       :site_id="site_id"
@@ -91,6 +97,7 @@ import tableCategory from "./components/table-category.vue";
 import XdStatTableGroup from "@/components/XdStatTableGroup.vue"
 import checkPermission from "@/utils/permission";
 import Role from "@/constant/modules/supplierStat";
+import selectDiscount from "./components/select-discount.vue";
 import { getOptions } from "@/utils/options";
 
 export default {
@@ -101,7 +108,8 @@ export default {
     tableProduct,
     tableCategory,
     statAllGift,
-    XdStatTableGroup
+    XdStatTableGroup,
+    selectDiscount
   },
   data() {
     return {
@@ -148,6 +156,9 @@ export default {
     has_tab_category() {
       return checkPermission([Role.productCategoryCycSales]);
     },
+    isSelectProdDis(){
+      return checkPermission([Role.getSelectedProdDiscounts]);
+    },
     has_tab() {
       return checkPermission([
         Role.supplierCycSales,

package/library/viewModules/viewStat/viewsStat/supplier/components/stat-product.vue

@@ -88,8 +88,11 @@ export default {
         },
         xAxis: {
           type: 'category',
-          boundaryGap: false,
           smooth: true,
+          data: xAxisData,
+          axisPointer: {
+            type: 'shadow'
+          },
           data: xAxisData
         },
         yAxis: [{

package/library/viewModules/viewStore/router/store_selection.js

@@ -34,9 +34,21 @@ const storeRouter = {
       meta: {
         title: '门店集市',
         icon: 'el-icon-sell',
-        roles:[store_selection.selectShopMarketList]
+        roles:[store_selection.selectShopMarketList],
       }
     },
+    // #ifdef partner-movie
+    // {
+    //   path: 'mc-market-list',
+    //   name: 'McMarketList',
+    //   component: () => import('@/viewStore/market/mc_list'),
+    //   meta: {
+    //     title: '在线选座门店集市',
+    //     icon: 'el-icon-sell',
+    //     roles:[store_selection.selectShopSeatList]
+    //   }
+    // },
+    // #endif
     {
       path: 'rule-list',
       name: 'StoreRuleList',
@@ -85,11 +97,21 @@ const storeRouter = {
       name: 'TasksList',
       component: () => import('@/viewStore/task/list'),
       meta: {
-        title: '选店任务管理',
+        title: '门店更新',
         icon: 'xdicon_rizhi',
         roles:[store_selection.selectShopTaskList]
       }
     },
+    // {
+    //   path: 'cache-list',
+    //   name: 'CacheList',
+    //   component: () => import('@/viewStore/cache/list'),
+    //   meta: {
+    //     title: '缓存更新',
+    //     icon: 'el-icon-files',
+    //     roles:[store_selection.updateCacheDetail]
+    //   }
+    // },
   ]
 }
 

package/library/viewModules/viewStore/schemas/store_selection.js

@@ -372,6 +372,98 @@ module.exports = {
       },
       disabled: true,
     },
+    {
+      mapFn: 'updateCacheDetail',
+      isRule: false,
+      title: '已选门店更新缓存详情',
+      path: '/supplier-partner/v1/:xsiteid/:xnamespace/select-shop/update-cache-detail',
+      params: {
+
+      },
+      disabled: true,
+      role: '@@@@.@@@.SELECT_SHOP_CACHE_LIST',
+    },
+    {
+      mapFn: 'updateCache',
+      isRule: false,
+      title: '已选门店更新缓存',
+      path: '/supplier-partner/v1/:xsiteid/:xnamespace/select-shop/update-cache',
+      params: {
+        
+      },
+      disabled: true,
+      role: '@@@@.@@@.SELECT_SHOP_CACHE_UPDATE',
+    },
+    {
+      title: "在线选座门店集市",
+      mapFn: "selectShopSeatList",
+      path: "/supplier-partner/v1/:xsiteid/:xnamespace/select-shop-market/seatlist",
+      isRule: false,
+      data: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+        fitler: ['fitler', 'String', '选填'],
+        page_token: ['第几页', 'String', '选填'],
+        page_size: ['每页展示条数', 'Number', '选填'],
+      },
+      disabled: true,
+      role: '@@@@.@@@.SELECT_SHOP_MARKET_MC_LIST',
+    },
+   
+    {
+      title: "门店集市批量选用",
+      mapFn: "selectShopMarketBatchSelect",
+      path: '/supplier-partner/v1/:xsiteid/:xnamespace/select-shop-market/batch-select',
+      isRule: false,
+      params: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+        resource_shop_ids: ['resource_shop_ids', 'Array', '选填'],
+      },
+      disabled: true,
+    },
+    {
+      title: "已选门店查看门店服务类型",
+      mapFn: "selectShopGetConsumeMode",
+      path: '/supplier-partner/v1/:xsiteid/:xnamespace/select-shop/consume-mode',
+      isRule: false,
+      params: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+        shop_id: ['shop_id', 'Number', '选填'],
+        resource_shop_id: ['resource_shop_id', 'Number', '选填'],
+      },
+      disabled: true,
+    },
+    {
+      title: "已选门店修改门店服务类型",
+      mapFn: "selectShopUpdateConsumeMode",
+      path: '/supplier-partner/v1/:xsiteid/:xnamespace/select-shop/update-consume-mode',
+      isRule: false,
+      params: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+        shop_id: ['shop_id', 'Number', '选填'],
+        resource_shop_id: ['resource_shop_id', 'Number', '选填'],
+        consume_mode: ['consume_mode', 'Array', '必填'],
+      },
+      disabled: true,
+      role: '@@@@.@@@.SELECT_SHOP_UPDATE_CONSUME_MODE',
+    },
+    {
+      title: "查看关联前门店",
+      mapFn: "selectShopGetRelatedShops",
+      path: '/supplier-partner/v1/:xsiteid/:xnamespace/select-shop/get-related-shops',
+      isRule: false,
+      params: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+        resource_shop_id: ['resource_shop_id', 'Number', '选填'],
+        consume_mode: ['consume_mode', 'String', '必填'],
+      },
+      disabled: true,
+      role: '@@@@.@@@.SELECT_SHOP_GET_RELATED_SHOPS',
+    },
   ],
 }