jufubao-admin-library 1.1.46 → 1.1.48

package/library/pageComponents/modules/JfbProductSku.vue

@@ -67,41 +67,14 @@
       XdDialog
 		},
 		data(){
-      let purchase_price_name = this.$setting['system'] === 'supplier' ? '供货商' : '进货价';
       return {
-        uiSkusHeaders: [
-          {"type": "normal", "prop": "stands", "align": "left", "min-width": 200, "label": "规格"},
-          {"type": "price", "prop": "purchase_price", "align": "center", "min-width": 80, "label": purchase_price_name},
-          {"type": "price", "prop": "jfb_price", "align": "center", "min-width": 80, "label": "建议零售价"},
-          {"type": "price", "prop": "jfb_price_ratio", "align": "left", "min-width": 120, "label": "建议售价折扣"},
-          {"type": "price", "prop": "market_price", "align": "center", "min-width": 80, "label": "市场价"},
-          {"type": "price", "prop": "market_price_ratio", "align": "left", "min-width": 120, "label": "市场价折扣"},
-          {"type": "normal", "prop": "init_num", "align": "left", "min-width": 80, "label": "库存"},
-          {"type": "normal", "prop": "weight", "align": "left", "min-width": 80, "label": "重量"},
-          {"type": "normal", "prop": "volume", "align": "left", "min-width": 80, "label": "体积"},
-          {"type": "normal", "prop": "product_code", "align": "left", "min-width": 80, "label": "商品编码"},
-          {"type": "normal", "prop": "product_bar_code", "align": "left", "min-width": 80, "label": "商品条码"},
-          {
-            type: "operate",
-            align: "center",
-            width: 100,
-            label: "价格日历",
-            values: [
-              {
-                ui: "text-button",
-                target: "_blank",
-                name: "查看",
-                type: "text",
-                event: "look",
-              },]
-          }
-        ],
         //价格日历
         dialogSetPrices:false,
         setPricesTables:[],
         setPricesTablesKey:'setPricesTablesKey',
         datePricesRow:null,
         sku_name:'',
+        isShowPurchasePrice: false,
 			}
 		},
     computed:{
@@ -157,10 +130,42 @@
             label: "售价",
           },
         ].filter(i=>i)
+      },
+      uiSkusHeaders(){
+        let purchase_price_name = this.$setting['system'] === 'supplier' ? '供货商' : '进货价';
+        return [
+          {"type": "normal", "prop": "stands", "align": "left", "min-width": 200, "label": "规格"},
+          this.isShowPurchasePrice && {"type": "price", "prop": "purchase_price", "align": "center", "min-width": 80, "label": purchase_price_name},
+          {"type": "price", "prop": "jfb_price", "align": "center", "min-width": 80, "label": "建议零售价"},
+          {"type": "price", "prop": "jfb_price_ratio", "align": "left", "min-width": 120, "label": "建议售价折扣"},
+          {"type": "price", "prop": "market_price", "align": "center", "min-width": 80, "label": "市场价"},
+          {"type": "price", "prop": "market_price_ratio", "align": "left", "min-width": 120, "label": "市场价折扣"},
+          {"type": "normal", "prop": "init_num", "align": "left", "min-width": 80, "label": "库存"},
+          {"type": "normal", "prop": "weight", "align": "left", "min-width": 80, "label": "重量"},
+          {"type": "normal", "prop": "volume", "align": "left", "min-width": 80, "label": "体积"},
+          {"type": "normal", "prop": "product_code", "align": "left", "min-width": 80, "label": "商品编码"},
+          {"type": "normal", "prop": "product_bar_code", "align": "left", "min-width": 80, "label": "商品条码"},
+          {
+            type: "operate",
+            align: "center",
+            width: 100,
+            label: "价格日历",
+            values: [
+              {
+                ui: "text-button",
+                target: "_blank",
+                name: "查看",
+                type: "text",
+                event: "look",
+              },]
+          }
+        ]
       }
     },
     created(){
-      console.log(this.uiSkusHeaders,'this.uiSkusHeaders')
+      if(this.productSkuList && this.productSkuList.length && this.productSkuList.length > 0) {
+        this.isShowPurchasePrice = this.productSkuList[0].specs.purchase_price > 0;
+      }
     },
 		methods: {
       getTableDataFromResponseData(data = []) {

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

@@ -12,7 +12,7 @@
       <div class="stat_item">
         <p class="_title">
           商品总数
-          <el-tooltip effect="light" content="总共商品数量，多规格商品计1个" placement="right">
+          <el-tooltip effect="light" content="取对应业务线已选商品统计 同一商品多业务线选用按多次计" placement="right">
             <i class="xdicon_question-circle xd_admin_iconfont"></i>
           </el-tooltip>
         </p>
@@ -52,7 +52,7 @@
       <div class="stat_item">
         <p class="_title">
           SKU总数
-          <el-tooltip effect="light" content="总共商品规格数量，多规格商品计多个" placement="right">
+          <el-tooltip effect="light" content="取对应业务线已选商品统计 同一商品多业务线选用按多次计 同一商品多规格按多次计" placement="right">
             <i class="xdicon_question-circle xd_admin_iconfont"></i>
           </el-tooltip>
         </p>

package/library/viewModules/viewStat/viewsStat/product/components/table-brand.vue

@@ -127,22 +127,31 @@ export default {
           minWidth: 200,
           label: "品牌名称",
         },
+        { "type": "normal", "prop": "total_view", "align": "center", "width": 150, "label": "总访问量",notice: {
+            data: ["按查看时间统计用户查看商品详情的总次数 用户多次查看或刷新按多次计"],
+          }, },
         {
           type: "normal",
           prop: "total_product_num",
           align: "center",
-          width: 100,
+          width: 150,
           label: "销量",
           sort: "custom",
+          notice: {
+            data: ["按支付时间统计已支付客户订单中商品的总件数 一个订单多件商品按多个计"],
+          },
         },
         {
           type: "price",
           prop: "total_sale_amount",
           align: "center",
-          width: 100,
+          width: 150,
           label: "销售金额",
           unit: "元",
           sort: "custom",
+          notice: {
+            data: ["按支付时间统计已支付客户订单总金额 包含商品售价和运费"],
+          },
         },
         {
           type: "price",
@@ -152,17 +161,20 @@ export default {
           label: "进货价金额",
           unit: "元",
           sort: "custom",
-          notice:{
-            data: ['自营-按货源价统计','非自营-按平台价统计']
-          }
+          notice: {
+            data: ["按支付时间统计已支付客户订单进货价金额 包含商品进货价和运费 自有商品按货源进货价，非自有商品按平台进货价计"],
+          },
         },
         {
           type: "normal",
           prop: "total_real_product_num",
           align: "center",
-          minWidth: 120,
+          width: 150,
           label: "实际销量",
           sort: "custom",
+          notice: {
+            data: ["即总销量-售后次数"],
+          },
         },
         {
           type: "price",
@@ -172,23 +184,32 @@ export default {
           label: "实际销售金额",
           unit: "元",
           sort: "custom",
+          notice: {
+            data: ["即销售金额-售后金额"],
+          },
         },
         {
           type: "normal",
           prop: "total_aftersale_product_num",
           align: "center",
-          minWidth: 120,
+          minWidth: 150,
           label: "售后次数",
           sort: "custom",
+          notice: {
+            data: ["按审核时间统计客服对应业务线的售后订单中商品的总件数 同一订单售后多件商品按多次计 同一商品多次售后按多次计 仅统计线上订单且处理方式为退款、换购的售后订单"],
+          },
         },
         {
           type: "price",
           prop: "total_aftersale_amount",
           align: "center",
-          width: 100,
+          width: 150,
           label: "售后金额",
           unit: "元",
           sort: "custom",
+          notice: {
+            data: ["按审核时间统计客服对应业务线的售后订单中商品退款金额 同一订单售后多件商品按多次计 同一商品多次售后按多次计 仅统计线上订单且处理方式为退款、换购的售后订单"],
+          },
         },
       ],
       channelList: [],
@@ -290,6 +311,8 @@ export default {
           export: true,
           file_ext: "xlsx",
           file_name: value,
+          supplier_id:this.supplier_ids,
+          channel_code: this.channel_code,
           channel_code_text: this.channel_code_text,
           supplier_text: this.supplier_text,
         };
@@ -319,6 +342,10 @@ export default {
       let params = {
         ...this.getParams(),
       };
+      if(!this.searchParams.time_range_start||!this.searchParams.time_range_end){
+        this.$message.error('请选择交易时间')
+        return
+      }
       console.log(params);
       let loading = this.$loading({});
       this.brandCycSales(params)

package/library/viewModules/viewStat/viewsStat/product/components/table-category.vue

@@ -122,22 +122,31 @@ export default {
       headers: [
         { "type": "normal", "prop": "category_id", "align": "left", "width": 80, "label": "分类ID" },
         { "type": "normal", "prop": "category_name", "align": "center", "minWidth": 200, "label": "分类名称" },
-       {
+       { "type": "normal", "prop": "total_view", "align": "center", "width": 150, "label": "总访问量",notice: {
+            data: ["按查看时间统计用户查看商品详情的总次数 用户多次查看或刷新按多次计"],
+          }, },
+        {
           type: "normal",
           prop: "total_product_num",
           align: "center",
-          width: 100,
+          width: 150,
           label: "销量",
           sort: "custom",
+          notice: {
+            data: ["按支付时间统计已支付客户订单中商品的总件数 一个订单多件商品按多个计"],
+          },
         },
         {
           type: "price",
           prop: "total_sale_amount",
           align: "center",
-          width: 100,
+          width: 150,
           label: "销售金额",
           unit: "元",
           sort: "custom",
+          notice: {
+            data: ["按支付时间统计已支付客户订单总金额 包含商品售价和运费"],
+          },
         },
         {
           type: "price",
@@ -147,17 +156,20 @@ export default {
           label: "进货价金额",
           unit: "元",
           sort: "custom",
-          notice:{
-            data: ['自营-按货源价统计','非自营-按平台价统计']
-          }
+          notice: {
+            data: ["按支付时间统计已支付客户订单进货价金额 包含商品进货价和运费 自有商品按货源进货价，非自有商品按平台进货价计"],
+          },
         },
         {
           type: "normal",
           prop: "total_real_product_num",
           align: "center",
-          minWidth: 120,
+          width: 150,
           label: "实际销量",
           sort: "custom",
+          notice: {
+            data: ["即总销量-售后次数"],
+          },
         },
         {
           type: "price",
@@ -167,23 +179,32 @@ export default {
           label: "实际销售金额",
           unit: "元",
           sort: "custom",
+          notice: {
+            data: ["即销售金额-售后金额"],
+          },
         },
         {
           type: "normal",
           prop: "total_aftersale_product_num",
           align: "center",
-          minWidth: 120,
+          minWidth: 150,
           label: "售后次数",
           sort: "custom",
+          notice: {
+            data: ["按审核时间统计客服对应业务线的售后订单中商品的总件数 同一订单售后多件商品按多次计 同一商品多次售后按多次计 仅统计线上订单且处理方式为退款、换购的售后订单"],
+          },
         },
         {
           type: "price",
           prop: "total_aftersale_amount",
           align: "center",
-          width: 100,
+          width: 150,
           label: "售后金额",
           unit: "元",
           sort: "custom",
+          notice: {
+            data: ["按审核时间统计客服对应业务线的售后订单中商品退款金额 同一订单售后多件商品按多次计 同一商品多次售后按多次计 仅统计线上订单且处理方式为退款、换购的售后订单"],
+          },
         },
       ],
       categoryProps: {
@@ -312,6 +333,8 @@ export default {
           export: true,
           file_ext: "xlsx",
           file_name: value,
+          supplier_id:this.supplier_ids,
+          channel_code: this.channel_code,
           channel_code_text: this.channel_code_text,
           supplier_text: this.supplier_text,
         };
@@ -335,6 +358,10 @@ export default {
       let params = {
         ...this.getParams(),
       };
+      if(!this.searchParams.time_range_start||!this.searchParams.time_range_end){
+        this.$message.error('请选择交易时间')
+        return
+      }
       console.log(params)
       let loading = this.$loading({});
       this.categoryCycSales(params).then(res => {

package/library/viewModules/viewStat/viewsStat/product/components/table-product.vue

@@ -147,22 +147,31 @@ export default {
           minWidth: 200,
           label: "所属供应商",
         },
+        { "type": "normal", "prop": "total_view", "align": "center", "width": 150, "label": "总访问量",notice: {
+            data: ["按查看时间统计用户查看商品详情的总次数 用户多次查看或刷新按多次计"],
+          }, },
         {
           type: "normal",
           prop: "total_product_num",
           align: "center",
-          width: 100,
+          width: 150,
           label: "销量",
           sort: "custom",
+          notice: {
+            data: ["按支付时间统计已支付客户订单中商品的总件数 一个订单多件商品按多个计"],
+          },
         },
         {
           type: "price",
           prop: "total_sale_amount",
           align: "center",
-          width: 100,
+          width: 150,
           label: "销售金额",
           unit: "元",
           sort: "custom",
+          notice: {
+            data: ["按支付时间统计已支付客户订单总金额 包含商品售价和运费"],
+          },
         },
         {
           type: "price",
@@ -173,16 +182,19 @@ export default {
           unit: "元",
           sort: "custom",
           notice: {
-            data: ["自营-按货源价统计", "非自营-按平台价统计"],
+            data: ["按支付时间统计已支付客户订单进货价金额 包含商品进货价和运费 自有商品按货源进货价，非自有商品按平台进货价计"],
           },
         },
         {
           type: "normal",
           prop: "total_real_product_num",
           align: "center",
-          width: 120,
+          width: 150,
           label: "实际销量",
           sort: "custom",
+          notice: {
+            data: ["即总销量-售后次数"],
+          },
         },
         {
           type: "price",
@@ -192,23 +204,32 @@ export default {
           label: "实际销售金额",
           unit: "元",
           sort: "custom",
+          notice: {
+            data: ["即销售金额-售后金额"],
+          },
         },
         {
           type: "normal",
           prop: "total_aftersale_product_num",
           align: "center",
-          minWidth: 120,
+          minWidth: 150,
           label: "售后次数",
           sort: "custom",
+          notice: {
+            data: ["按审核时间统计客服对应业务线的售后订单中商品的总件数 同一订单售后多件商品按多次计 同一商品多次售后按多次计 仅统计线上订单且处理方式为退款、换购的售后订单"],
+          },
         },
         {
           type: "price",
           prop: "total_aftersale_amount",
           align: "center",
-          width: 100,
+          width: 150,
           label: "售后金额",
           unit: "元",
           sort: "custom",
+          notice: {
+            data: ["按审核时间统计客服对应业务线的售后订单中商品退款金额 同一订单售后多件商品按多次计 同一商品多次售后按多次计 仅统计线上订单且处理方式为退款、换购的售后订单"],
+          },
         },
       ],
       channelList: [],
@@ -313,6 +334,8 @@ export default {
           export: true,
           file_ext: "xlsx",
           file_name: value,
+          supplier_id:this.supplier_ids,
+          channel_code: this.channel_code,
           channel_code_text: this.channel_code_text,
           supplier_text: this.supplier_text,
         };
@@ -342,6 +365,10 @@ export default {
       let params = {
         ...this.getParams(),
       };
+      if(!this.searchParams.time_range_start||!this.searchParams.time_range_end){
+        this.$message.error('请选择交易时间')
+        return
+      }
       console.log(params);
       let loading = this.$loading({});
 

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

@@ -38,7 +38,7 @@
     ></stat-all>
     <el-card v-if="has_tab&&site_id&&business_code&&status" style="margin-top: 20px">
       <el-tabs v-model="activeName">
-        <el-tab-pane v-if="has_tab_supplier" label="商品" name="supplier">
+        <el-tab-pane v-if="has_tab_supplier" label="商品(线上客户订单)" name="supplier">
           <table-product
             :site_id="site_id"
             :business_code="business_code"
@@ -46,7 +46,7 @@
             v-if="has_tab_supplier && activeName == 'supplier'"
           ></table-product>
         </el-tab-pane>
-        <el-tab-pane v-if="has_tab_product" label="商品品牌" name="product">
+        <el-tab-pane v-if="has_tab_product" label="商品品牌(线上客户订单)" name="product">
           <table-brand
             :site_id="site_id"
             :business_code="business_code"
@@ -54,7 +54,7 @@
             v-if="has_tab_product && activeName == 'product'"
           ></table-brand>
         </el-tab-pane>
-        <el-tab-pane v-if="has_tab_category" label="商品分类" name="category">
+        <el-tab-pane v-if="has_tab_category" label="商品分类(线上客户订单)" name="category">
           <table-category
             :site_id="site_id"
             :business_code="business_code"

package/library/viewModules/viewStat/viewsStat/supplier/components/discount.vue

@@ -11,6 +11,9 @@
           >
             <i class="xdicon_question-circle xd_admin_iconfont"></i>
           </el-tooltip>
+          <span class="s_tit">
+            截止到{{ last_updated_date_time }}
+          </span>
         </div>
         <div>
           <div>
@@ -77,14 +80,14 @@
         </div>
       </div>
       <div>
-        截止到{{ last_updated_date_time }}，{{
+        {{
           channel_code
             ? channel_code !== "self"
               ? channel_code_text
               : supplier_text
               ? supplier_text
-              : "自有"
-            : "自有"
+              : "全部"
+            : "全部"
         }}-可售商品-按折扣统计数量为
       </div>
     </div>
@@ -296,6 +299,7 @@ export default {
 
         & > div:first-child {
           display: flex;
+          align-items: center;
           font-size: 20px;
           i {
             cursor: pointer;
@@ -312,6 +316,12 @@ export default {
     }
   }
 }
+.s_tit{
+    font-size: 12px;
+    color: #A1A7B3;
+    margin-left: 10px;
+    vertical-align: bottom;
+  }
 .empty_data {
   display: flex;
   justify-content: center;

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

@@ -41,8 +41,8 @@
       </div>
       <div class="stat_item">
         <p class="_title">
-          商品总数
-          <el-tooltip effect="light" content="总共商品数量，多规格商品计1个" placement="right">
+          货源商品总数
+          <el-tooltip effect="light" content="新增供应商按创建时间统计；关闭供应商按最近关闭时间统计，周期内多次关闭按1次计；" placement="right">
             <i class="xdicon_question-circle xd_admin_iconfont"></i>
           </el-tooltip>
         </p>
@@ -72,8 +72,8 @@
       </div>
       <div class="stat_item">
         <p class="_title">
-          SKU总数
-          <el-tooltip effect="light" content="总共商品规格数量，多规格商品计多个" placement="right">
+          货源SKU总数
+          <el-tooltip effect="light" content="全部自有供应商的商品SKU数量，多规格商品计多个" placement="right">
             <i class="xdicon_question-circle xd_admin_iconfont"></i>
           </el-tooltip>
         </p>

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

@@ -3,7 +3,7 @@
     <div slot="header" class="card_header">
       <div class="card_tit">
         <span class="b_tit">商品数量</span>
-        <el-tooltip effect="light" content="按商品最新创建时间和最终下架时间统计 仅统计人工上下架商品" placement="right">
+        <el-tooltip effect="light" content="仅统计人工添加的商品；上架商品按首次审核通过时间统计；下架商品按最近下架时间统计，周期内多次下架按1次计；" placement="right">
           <i class="xdicon_question-circle xd_admin_iconfont"></i>
         </el-tooltip>
       </div>

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

@@ -3,7 +3,7 @@
     <div slot="header" class="card_header">
       <div class="card_tit">
         <span class="b_tit">供应商数量</span>
-        <el-tooltip effect="light" content="按供应商创建时间和最终关闭时间统计" placement="right">
+        <el-tooltip effect="light" content="新增供应商按创建时间统计；关闭供应商按最近关闭时间统计，周期内多次关闭按1次计；" placement="right">
           <i class="xdicon_question-circle xd_admin_iconfont"></i>
         </el-tooltip>
       </div>