jufubao-admin-library 1.1.70 → 1.1.72

package/library/viewModules/viewStat/router/productStat.js

@@ -8,20 +8,20 @@ const productStatRouter = {
   path: '/stat',
   sort: 99,
   component: Layout,
-  name: '商品统计',
+  name: '在售商品销售统计',
   redirect: '/stat/product',
   meta: {
-    title: '商品统计',
+    title: '在售商品销售统计',
     icon: 'xdicon_rizhi',
     iconSize: 22,
   },
   children: [
     {
       path: 'product',
-      name: '商品统计',
+      name: '在售商品销售统计',
       component: () => import ('@/viewsStat/product/index'),
       meta: {
-        title: '商品统计',
+        title: '在售商品销售统计',
         icon: 'xdicon_rizhi',
         iconSize: 22,
         role: ['STAT-PARTNER.PRODUCT_STAT_MENUS',role.totalProductCounts,role.productSalesCyc,role.categoryCycSales,role.brandCycSales]

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

@@ -147,6 +147,13 @@ export default {
           width: 80,
           label: "商品类型",
         },
+        {
+          type: "normal",
+          prop: "supplier_belong_text",
+          align: "center",
+          width: 100,
+          label: "供应商归属",
+        },
         {
           type: "normal",
           prop: "supplier_name",
@@ -528,6 +535,17 @@ export default {
             ele: "slot", //package 名称
             slot: "time",
           },
+          {
+            label: "供应商归属",
+            ele: "xd-select-list",
+            valueKey: "supplier_belong",
+            value: "",
+            placeholder: "请选择供应商归属",
+            list: [
+              { label: "自有", value: "self" },
+              { label: "他人", value: "others" },
+            ],
+          },
         ].filter((i) => i);
         this.renderFormKey = Date.now();
       });

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

@@ -12,7 +12,7 @@
             <i class="xdicon_question-circle xd_admin_iconfont"></i>
           </el-tooltip>
           <span class="s_tit">
-            截止到{{ last_updated_date_time }}
+            <!-- 截止到{{ last_updated_date_time }} -->
           </span>
         </div>
         <div>
@@ -99,55 +99,26 @@
         }}-可售商品-按折扣统计数量为
       </div>
     </div>
-    <el-table
-      v-if="dataList && dataList.length > 0"
-      highlight-current-row
-      stripe
-      fit
-      ref="table"
-      border
-      header-align="center"
-      :data="dataList"
-      max-height="500"
+    <xd-stat-table-group
+      v-if="upNewParams"
+      :params="upNewParams"
+      :key="upNewkey"
+      :getList="getProductDiscount"
     >
-      <el-table-column
-        align="center"
-        v-for="(item, index) in rowTitle"
-        :label="item.label"
-        :key="index"
-        min-width="100"
-        :show-overflow-tooltip="true"
-      >
-        <template slot-scope="scope">
-          <!-- <div>
-            {{JSON.stringify(scope.row)}}
-          </div> -->
-          <div
-            :style="{
-              display: 'flex',
-              alignItems: 'center',
-              justifyContent: 'center',
-              width: '100%',
-              fontWeight: scope.row[0]==='商品总数'?'bold':'normal'
-            }
-            "
-          >
-            {{ scope.row[index] }}
-          </div>
-        </template>
-      </el-table-column>
-    </el-table>
-    <div class="empty_data" v-else>暂无数据</div>
+    </xd-stat-table-group>
     <div style="margin-top: 20px">注：折扣=货源进货价/所选折扣类型</div>
+    <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
+    XdStatTradeDate,
+    XdStatTableGroup
   },
   data() {
     return {
@@ -192,6 +163,8 @@ export default {
         },
       },
       form:{},
+      upNewkey:'upNewkey',
+      upNewParams:null,
     };
   },
   watch: {
@@ -246,26 +219,8 @@ export default {
        if (this.category_id && this.category_id.length) {
         params['category_id'] = this.category_id[this.category_id.length - 1]
       }
-      // 获取产品折扣
-      this.getProductDiscount(params).then((res) => {
-        // 获取行标题列表
-        this.keyList = res.data.col_title_list;
-
-        // 获取数据列表
-        this.dataList = res.data.data;
-        // 获取列标题列表
-        this.rowTitle = res.data.row_title_list;
-        this.last_updated_date_time = res.data.last_updated_date_time;
-        // 遍历数据列表，将行标题和数据列表拼接
-        this.dataList = this.keyList.map((item, i) => {
-          return [
-            this.keyList[i].label,
-            ...this.dataList.map((row) => {
-              return row[this.keyList[i].key];
-            }),
-          ];
-        });
-      });
+      this.upNewParams = params;
+      this.upNewkey = Date.now();
     },
     doExport() {
       this.$prompt("请输入导出文件名称", "提示", {

package/library/viewModules/viewsThird/viewsThird/list.vue

@@ -65,7 +65,7 @@
                 v-for="(item, index) in scope.row.card_number_ranges"
                 :key="index"
               >
-                {{ item.start_number }}~{{ item.end_number }}
+                {{ item.start_number }} — {{ item.end_number }}
               </div>
             </div>
             <div v-else>全部号段</div>
@@ -1259,7 +1259,7 @@ export default {
           }else{
             item.disabled = false
           }
-      
+
           if(item.type==='password'){
             item.rules = [
               {required: this.editId?false:true, message: `请输入${item.label}`, trigger: ['blur', 'change']},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-admin-library",
-  "version": "1.1.70",
+  "version": "1.1.72",
   "description": "聚福宝福利后台管理系统公共模块",
   "author": "goashiyong <gaoshiyong1272@vip.163.com>",
   "scripts": {