jufubao-admin-library 1.1.66 → 1.1.68

package/library/pageComponents/modules/JfbProductSearch.vue

@@ -115,7 +115,6 @@ export default {
     ...mapState(['commonParams']),
   },
   async created () {
-    console.log(this.projectType,"projectTypeprojectType");
     let cityData = await this.getAllCityList()
     this.cityData = cityData.data.list
     this.cookieKey = `${this.commonParams.xsiteid}.${this.commonParams.xnamespace}.${this.pagesType}.channel`
@@ -246,6 +245,10 @@ export default {
      * @param form 搜索请求参数
      */
     handleSearch ({ action, form }) {
+      if(action==='reset'){
+        this.category_id = []
+        this.custom_category_id = []
+      }
       if (this.JfbParent.page) this.JfbParent.page = 1
       this.getList(action)
     },
@@ -383,7 +386,7 @@ export default {
           formatValue: "timestamp", //输出时间格式
           placeholder: ["开始时间", "结束时间"],
         },
-        {
+        this.projectType!=='wholesale'&&{
           label: "按价格:", //label
           ele: "xd-input-range", //package 名称
           valueKey: "price_range", //form[valueKey]
@@ -419,13 +422,13 @@ export default {
           },
           notice: "市场价和分销价",
         },
-        {
+        this.projectType!=='wholesale'&&{
           label: "按折扣:", //label
           ele: "xd-input-range", //package 名称
           valueKey: "discount_ratio", //form[valueKey]
+          labelSlot:'按大于等于最低折扣，小于最高折扣(不含)进行搜索',
           value: {},
           disabled: false,
-          labelSlot:'按大于等于最低折扣，小于最高折扣(不含)进行搜索',
           setting: {
             /**单位显示**/
             //图标优先于文字单位

package/library/viewModules/viewCardsGift/viewCardsGift/config.vue

@@ -154,7 +154,6 @@ import {mapActions} from "vuex";
 import {Loading} from "element-ui";
 import {isPlatform} from "@/utils/xd.base";
 import XdBaseDynamicField from "@/components/XdBaseDynamicField.vue";
-import {number} from "echarts/lib/export";
 import {getImageFullPath} from "@/mixins/handleUpdate";
 const Color = require("color");
 

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

@@ -93,5 +93,14 @@ module.exports = {
       disabled: true,
       role: "STAT-PARTNER.TRADE_STAT_OFFLINE_SHOP_SALES"
     },
+    {
+      title: "统计-供应商统计-上新商品折扣分布数据",
+      mapFn: "getNewOnShelfProductDiscounts",
+      path: '/stat-partner/v1/supplier-stat/new-on-shelf-product-discounts',
+      isRule: false,
+      params: {},
+      disabled: true,
+      role: "STAT-PARTNER.SUPPLIER_STAT_NEW_ON"
+    },
   ]
 }

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

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

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

@@ -179,7 +179,7 @@ export default {
           label: "实际销量",
           sort: "custom",
           notice: {
-            data: ["即总销量-售后次数"],
+            data: ["总销量减去仅退款和换购的售后次数"],
           },
         },
         {
@@ -202,7 +202,7 @@ export default {
           label: "售后次数",
           sort: "custom",
           notice: {
-            data: ["按审核时间统计客服对应业务线的售后订单中商品的总件数 同一订单售后多件商品按多次计 同一商品多次售后按多次计 仅统计线上订单且处理方式为退款、换购的售后订单"],
+            data: ["按审核时间统计客服对应业务线的售后订单中商品的总件数;同一订单售后多件商品按多次计;同一商品多次售后按多次计;仅统计线上订单且全部处理方式的售后订单；"],
           },
         },
         {

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

@@ -45,7 +45,7 @@
                 :label="item.label"
                 :value="item.value"
               >
-              </el-option>
+              </el-option> 
             </el-select>
           </div>
         </template>
@@ -175,7 +175,7 @@ export default {
           label: "实际销量",
           sort: "custom",
           notice: {
-            data: ["即总销量-售后次数"],
+            data: ["总销量减去仅退款和换购的售后次数"],
           },
         },
         {
@@ -198,7 +198,7 @@ export default {
           label: "售后次数",
           sort: "custom",
           notice: {
-            data: ["按审核时间统计客服对应业务线的售后订单中商品的总件数 同一订单售后多件商品按多次计 同一商品多次售后按多次计 仅统计线上订单且处理方式为退款、换购的售后订单"],
+            data: ["按审核时间统计客服对应业务线的售后订单中商品的总件数;同一订单售后多件商品按多次计;同一商品多次售后按多次计;仅统计线上订单且全部处理方式的售后订单；"],
           },
         },
         {

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

@@ -200,7 +200,7 @@ export default {
           label: "实际销量",
           sort: "custom",
           notice: {
-            data: ["即总销量-售后次数"],
+            data: ["总销量减去仅退款和换购的售后次数"],
           },
         },
         {
@@ -223,7 +223,7 @@ export default {
           label: "售后次数",
           sort: "custom",
           notice: {
-            data: ["按审核时间统计客服对应业务线的售后订单中商品的总件数 同一订单售后多件商品按多次计 同一商品多次售后按多次计 仅统计线上订单且处理方式为退款、换购的售后订单"],
+            data: ["按审核时间统计客服对应业务线的售后订单中商品的总件数;同一订单售后多件商品按多次计;同一商品多次售后按多次计;仅统计线上订单且全部处理方式的售后订单；"],
           },
         },
         {

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

@@ -2,7 +2,7 @@
   <el-card class="discount-wrap">
     <div class="discount-wrap-header" slot="header">
       <div class="discount-wrap-header-select">
-        <div>
+        <div class="mb10">
           在售商品折扣分布
           <el-tooltip
             effect="light"
@@ -16,67 +16,75 @@
           </span>
         </div>
         <div>
-          <div>
-            <span style="margin-right: 10px">折扣类型</span>
-            <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-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>
-            </el-select>
-          </div>
-          <div>
-            <span style="margin-right: 10px">供应商</span>
-            <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
+                  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>
-            </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
+                  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>
-            </el-select>
-          </div>
-          <el-button
-            @click="getDataList"
-            style="margin-left: 10px"
-            type="primary"
-            >搜索</el-button
-          >
-          <el-button @click="doExport" type="primary">条件导出</el-button>
+                <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>
@@ -136,7 +144,11 @@
 <script>
 import { getOptions } from "@/utils/options";
 import { mapActions } from "vuex";
+import XdStatTradeDate from "@/components/XdStatTradeDate";
 export default {
+  components: {
+    XdStatTradeDate
+  },
   data() {
     return {
       keyList: [],
@@ -161,6 +173,25 @@ export default {
         },
       ],
       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:{},
     };
   },
   watch: {
@@ -194,20 +225,29 @@ export default {
     }).then((res) => {
       this.channelList = res.data.list;
     });
+    
+  },
+  mounted(){
     this.getDataList();
   },
   methods: {
     ...mapActions("supplierStat", ["getProductDiscount"]),
     // 获取列表数据
     async getDataList(row) {
-      // 获取产品折扣
-      this.getProductDiscount({
+     
+      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
-      }).then((res) => {
+        discount_type:this.discount_type,
+        ...this.tradeTime,
+      }
+       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;
 
@@ -242,7 +282,8 @@ export default {
           file_name: value,
           channel_code_text: this.channel_code_text,
           supplier_text: this.supplier_text,
-          discount_type:this.discount_type
+          discount_type:this.discount_type,
+          ...this.tradeTime,
         };
         let loading = this.$loading({});
         this.getProductDiscount(params)
@@ -292,9 +333,9 @@ export default {
     margin-top: 20px;
     &-header {
       &-select {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
+        //display: flex;
+        //justify-content: space-between;
+        //align-items: center;
         margin-bottom: 10px;
 
         & > div:first-child {
@@ -310,6 +351,7 @@ export default {
 
         & > div:nth-child(2) {
           display: flex;
+          flex-wrap: wrap;
           align-items: center;
         }
       }
@@ -330,4 +372,10 @@ export default {
   color: #a1a7b3;
   font-size: 14px;
 }
+.mb10{
+  margin-bottom: 10px;
+}
+.dis_f{
+  display: flex;
+}
 </style>

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

@@ -3,7 +3,10 @@
     <div slot="header" class="card_header">
       <div class="card_tit">
         <span class="b_tit">商品数量</span>
-        <el-tooltip effect="light" content="仅统计人工添加的商品；上架商品按首次审核通过时间统计；下架商品按最近下架时间统计，周期内多次下架按1次计；" placement="right">
+        <el-tooltip effect="light" placement="right">
+          <div slot="content">仅统计人工添加的商品;上架商品按首次审核通过时间统计;<br/>
+下架商品按最近下架时间统计，周期内多次下架按1次计;<br/>
+上架环比为月度环比增长，即(当月上架商品-上月上架商品)/上月上架商品。<br/></div>
           <i class="xdicon_question-circle xd_admin_iconfont"></i>
         </el-tooltip>
       </div>
@@ -46,7 +49,7 @@ export default {
     },
     getChartOptions(data){
       let xAxisData = data.x.data;
-      let legendData = ['上架商品', '下架商品'];
+      let legendData = ['上架商品', '下架商品','上架环比'];
       let seriesData = [];
       data.series.forEach(item => {
         for(let i = 0; i < item.length; i++){
@@ -59,10 +62,12 @@ export default {
       return {
         tooltip: {
           trigger: 'axis',
-          // backgroundColor: 'rgba(255,255,255,0.9)',
-          // textStyle: {
-          //   color: '#666'
-          // }
+          axisPointer: {
+            type: 'cross',
+            crossStyle: {
+              color: '#999'
+            }
+          }
         },
         legend: {
           data: legendData
@@ -75,7 +80,10 @@ export default {
         },
         toolbox: {
           feature: {
-            saveAsImage: {}
+            dataView: { show: true, readOnly: false },
+            magicType: { show: true, type: ['line', 'bar'] },
+            restore: { show: true },
+            saveAsImage: { show: true }
           }
         },
         xAxis: {
@@ -84,17 +92,36 @@ export default {
           smooth: true,
           data: xAxisData
         },
-        yAxis: {
+        yAxis: [{
           type: 'value'
-        },
+        },{
+          type: 'value',
+          axisLabel: {
+            formatter: '{value} %'
+          }
+        }],
         series: seriesData.map((item, index) => {
           return {
             name: legendData[index],
-            type: 'line',
+            type: index==0||index==1?'bar':'line',
+            yAxisIndex: index==0||index==1?0:1,
             smooth: true,
+            // label:{
+            //   show:index==0||index==1?true:false,
+            // },
+            tooltip: {
+              valueFormatter: function (value) {
+                if(index==0||index==1){
+                  return value
+                }else{
+                  return value+'%';
+                }
+              }
+            },
             data: item
           }
-        })
+        }),
+        color:['#165DFF','#0FC6C2','#EB0B0B']
       };
     },
     handleChangeType(val){

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

@@ -144,13 +144,13 @@ export default {
             data: ["按支付时间统计已支付货源订单中对应商品件数x平台进货价 仅计算商品价格，不包含运费"],
           } },
         { "type": "normal", "prop": "total_real_product_num", "align": "center", "minWidth": 150, "label": "实际销量", "sort": "custom",notice: {
-            data: ["即总销量-售后次数"],
+            data: ["总销量减去仅退款和换购的售后次数"],
           } },
         { "type": "price", "prop": "total_real_sale_amount", "align": "center", "width": 160, "label": "实际建议售价金额", "unit": "元", "sort": "custom",notice: {
             data: ["即建议售价金额-售后建议售价金额"],
           } },
         { "type": "normal", "prop": "total_aftersale_product_num", "align": "center", "minWidth": 150, "label": "售后次数", "sort": "custom",notice: {
-            data: ["按审核时间统计客服售后订单中商品的总件数 同一订单售后多件商品按多次计 同一商品多次售后按多次计 仅统计线上订单且处理方式为退款、换购的售后订单"],
+            data: ["按审核时间统计客服对应业务线的售后订单中商品的总件数;同一订单售后多件商品按多次计;同一商品多次售后按多次计;仅统计线上订单且全部处理方式的售后订单；"],
           } },
         { "type": "price", "prop": "total_aftersale_amount", "align": "center", "width": 160, "label": "售后建议售价金额", "unit": "元", "sort": "custom",notice: {
             data: ["按审核时间统计客服售后订单中商品的建议售价金额 同一订单售后多件商品按多次计 同一商品多次售后按多次计 仅统计线上订单且处理方式为退款、换购的售后订单"],

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

@@ -145,13 +145,13 @@ export default {
             data: ["按支付时间统计已支付货源订单中对应商品件数x平台进货价 仅计算商品价格，不包含运费"],
           } },
         { "type": "normal", "prop": "total_real_product_num", "align": "center", "minWidth": 150, "label": "实际销量", "sort": "custom",notice: {
-            data: ["即总销量-售后次数"],
+            data: ["总销量减去仅退款和换购的售后次数"],
           } },
         { "type": "price", "prop": "total_real_sale_amount", "align": "center", "width": 160, "label": "实际建议售价金额", "unit": "元", "sort": "custom",notice: {
             data: ["即建议售价金额-售后建议售价金额"],
           } },
         { "type": "normal", "prop": "total_aftersale_product_num", "align": "center", "minWidth": 150, "label": "售后次数", "sort": "custom",notice: {
-            data: ["按审核时间统计客服售后订单中商品的总件数 同一订单售后多件商品按多次计 同一商品多次售后按多次计 仅统计线上订单且处理方式为退款、换购的售后订单"],
+            data: ["按审核时间统计客服对应业务线的售后订单中商品的总件数;同一订单售后多件商品按多次计;同一商品多次售后按多次计;仅统计线上订单且全部处理方式的售后订单；"],
           } },
         { "type": "price", "prop": "total_aftersale_amount", "align": "center", "width": 160, "label": "售后建议售价金额", "unit": "元", "sort": "custom",notice: {
             data: ["按审核时间统计客服售后订单中商品的建议售价金额 同一订单售后多件商品按多次计 同一商品多次售后按多次计 仅统计线上订单且处理方式为退款、换购的售后订单"],

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

@@ -139,13 +139,13 @@ export default {
             data: ["按支付时间统计已支付货源订单中对应商品件数x平台进货价 仅计算商品价格，不包含运费"],
           } },
         { "type": "normal", "prop": "total_real_product_num", "align": "center", "minWidth": 150, "label": "实际销量", "sort": "custom",notice: {
-            data: ["即总销量-售后次数"],
+            data: ["总销量减去仅退款和换购的售后次数"],
           } },
         { "type": "price", "prop": "total_real_sale_amount", "align": "center", "width": 160, "label": "实际建议售价金额", "unit": "元", "sort": "custom",notice: {
             data: ["即建议售价金额-售后建议售价金额"],
           } },
         { "type": "normal", "prop": "total_aftersale_product_num", "align": "center", "minWidth": 150, "label": "售后次数", "sort": "custom",notice: {
-            data: ["按审核时间统计客服售后订单中商品的总件数 同一订单售后多件商品按多次计 同一商品多次售后按多次计 仅统计线上订单且处理方式为退款、换购的售后订单"],
+            data: ["按审核时间统计客服对应业务线的售后订单中商品的总件数;同一订单售后多件商品按多次计;同一商品多次售后按多次计;仅统计线上订单且全部处理方式的售后订单；"],
           } },
         { "type": "price", "prop": "total_aftersale_amount", "align": "center", "width": 160, "label": "售后建议售价金额", "unit": "元", "sort": "custom",notice: {
             data: ["按审核时间统计客服售后订单中商品的建议售价金额 同一订单售后多件商品按多次计 同一商品多次售后按多次计 仅统计线上订单且处理方式为退款、换购的售后订单"],

package/library/viewModules/viewStat/viewsStat/supplier/components/up-new.vue

@@ -0,0 +1,334 @@
+<template>
+  <el-card class="discount-wrap">
+    <div class="discount-wrap-header" slot="header">
+      <div class="discount-wrap-header-select">
+        <div class="mb10">
+          上新商品折扣分布
+          <!-- <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="getNewOnShelfProductDiscounts"
+    >
+    </xd-stat-table-group>
+  </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",
+      form:{},
+      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"])
+          })
+        },
+      },
+      upNewkey:'upNewkey',
+      upNewParams: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;
+      }
+    },
+  },
+  created() {
+    getOptions({
+      server: "supplier-partner",
+      fn: "partner-channel",
+      path: "p1",
+    }).then((res) => {
+      this.channelList = res.data.list;
+    });
+    
+  },
+  mounted(){
+    this.getDataList();
+  },
+  methods: {
+    ...mapActions("supplierStat", ["getNewOnShelfProductDiscounts"]),
+    // 获取列表数据
+    async getDataList() {
+     
+      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,
+        ...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 = {
+          export: true,
+          file_ext: "xlsx",
+          file_name: value,
+          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,
+          ...this.tradeTime,
+        };
+        if (this.category_id && this.category_id.length) {
+          params['category_id'] = this.category_id[this.category_id.length - 1]
+        }
+        let loading = this.$loading({});
+        this.getNewOnShelfProductDiscounts(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 {
+        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;
+}
+</style>

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

@@ -3,7 +3,8 @@
     <stat-all v-permission="[Role.totalCounts]"></stat-all>
     <stat-product v-permission="[Role.productCycCounts]" style="margin-top: 20px;"></stat-product>
     <stat-supplier v-permission="[Role.supplierCycCounts]" style="margin-top: 20px"></stat-supplier>
-    <discount></discount>
+    <discount v-permission="[Role.getNewOnShelfProductDiscounts]"></discount>
+    <up-new></up-new>
     <el-card v-if="has_tab" style="margin-top: 20px;">
       <el-tabs v-model="activeName" >
         <el-tab-pane v-if="has_tab_supplier" label="供应商(线上货源订单)" name="supplier">
@@ -34,6 +35,7 @@
   import tableCategory from "./components/table-category.vue"
   import tableStore from "./components/table-store.vue"
   import discount from './components/discount.vue'
+  import upNew from './components/up-new.vue'
   import checkPermission from "@/utils/permission"
   import Role from "@/constant/modules/supplierStat"
 
@@ -47,7 +49,8 @@
       tableProduct,
       tableCategory,
       discount,
-      tableStore
+      tableStore,
+      upNew
     },
     data() {
       return {
@@ -71,7 +74,7 @@
       },
       is_shop(){
         return checkPermission([Role.offlineShopSalesSupplier])
-      }
+      },
     },
 
     created() {

package/library/viewModules/viewsEnterpriseBuy/viewsEnterpriseBuy/compontents/OrderInfoButton.vue

@@ -108,6 +108,11 @@ export default {
       default: () => {
       }
     },
+    info: {
+      type: Object,
+      default: () => {
+      }
+    },
   },
   data () {
     return {
@@ -151,7 +156,7 @@ export default {
     }
   },
   created () {
-
+    console.log(this.info,'iiii')
   },
   methods: {
     ...mapActions('enterprise_buy',
@@ -257,6 +262,27 @@ export default {
             }
           ]
         },
+        {
+          label: '商品金额:', 
+          ele: 'el-html', 
+          type: 'text',
+          valueKey: 'supplier_product_amount', 
+          value: this.$xdHelper.divisionFloatNumber(this.info['total_amount'],100), 
+        },
+        {
+          label: '运费金额:', 
+          ele: 'el-html', 
+          type: 'text',
+          valueKey: 'supplier_logistic_amount', 
+          value: this.$xdHelper.divisionFloatNumber(this.info['supplier_logistic_amount'],100), 
+        },
+        {
+          label: '总金额:', 
+          ele: 'el-html', 
+          type: 'text',
+          valueKey: 'total_amount', 
+          value: this.$xdHelper.divisionFloatNumber(this.info['total_amount'],100)+this.$xdHelper.divisionFloatNumber(this.info['supplier_logistic_amount'],100), 
+        },
       ]
 
       this.renderFormSetAmountKey = Date.now()

package/library/viewModules/viewsEnterpriseBuy/viewsEnterpriseBuy/detail.vue

@@ -2,12 +2,13 @@
   <div class="app-container">
     <el-card class="app-container__list">
       <div class="app-container__list-name">
-        <div>{{baseData.main_order.purchase_name}} （{{baseData.main_order.order_status_name}}）</div>
+        <div v-if="baseData">{{baseData.main_order.purchase_name}} （{{baseData.main_order.order_status_name}}）</div>
         <div>
           <order-button
-            v-if="isOperate"
+            v-if="isOperate&&baseData"
             :events="buttonData"
             :purchase_main_order_id="id"
+            :info="baseData['main_order']"
             @refresh="handeleRefresh"
             @confirmPrice="handleConfirmPrice"
           ></order-button>
@@ -15,12 +16,12 @@
       </div>
     </el-card>
     <el-card class="app-container__list">
-      <table-card :orderData="baseData" :key="baseKey"></table-card>
+      <table-card v-if="baseData" :orderData="baseData" :key="baseKey"></table-card>
     </el-card>
     <el-card class="app-container__list">
       <div class="mb-10">商品（{{product_num}}个）</div>
       <div class="export_box">
-        <div class="mb-10">配送至 <i class="el-icon-location-information"></i>{{baseData.main_order.receipt_province_name}}{{baseData.main_order.receipt_city_name}}{{baseData.main_order.receipt_area_name}}{{baseData.main_order.receipt_street_name}}{{baseData.main_order.receipt_address_detail}}</div>
+        <div v-if="baseData" class="mb-10">配送至 <i class="el-icon-location-information"></i>{{baseData.main_order.receipt_province_name}}{{baseData.main_order.receipt_city_name}}{{baseData.main_order.receipt_area_name}}{{baseData.main_order.receipt_street_name}}{{baseData.main_order.receipt_address_detail}}</div>
         <el-button v-if="isExport" type="primary" size="small" @click="handleExport">导出</el-button>
       </div>
       <div class="app-container__list-table">
@@ -61,13 +62,31 @@
               </template>
               <template slot="supplier_settlement_amount" slot-scope="scope">
                 <div v-if="scope.row.is_can_edit_amount===1">
-                  <el-input v-model="scope.row.supplier_settlement_amount" type="number" @change="handleChangeAmount(scope.row.supplier_settlement_amount,scope1)" placeholder="请输入清单结算金额"></el-input>
+                  <el-input disabled v-model="scope.row.supplier_settlement_amount" type="number" @change="handleChangeAmount(scope.row.supplier_settlement_amount,scope1,'supplier_settlement_amount')" placeholder="请输入清单结算金额"></el-input>
                   <span class="red">结算金额为最终支付金额</span>
                 </div>
                 <div v-else>
                   <span class="red">{{scope.row.supplier_settlement_amount}}</span>元
                 </div>
               </template>
+              <template slot="supplier_product_amount" slot-scope="scope">
+                <div v-if="scope.row.is_can_edit_amount===1">
+                  <el-input v-model="scope.row.supplier_product_amount" type="number" @change="handleChangeAmount(scope.row.supplier_product_amount,scope1,'supplier_product_amount')" placeholder="请输入订单金额"></el-input>
+                  <span class="red">结算金额为最终支付金额</span>
+                </div>
+                <div v-else>
+                  <span class="red">{{scope.row.supplier_product_amount}}</span>元
+                </div>
+              </template>
+              <template slot="supplier_logistic_amount" slot-scope="scope">
+                <div v-if="scope.row.is_can_edit_amount===1">
+                  <el-input v-model="scope.row.supplier_logistic_amount" type="number" @change="handleChangeAmount(scope.row.supplier_logistic_amount,scope1,'supplier_logistic_amount')" placeholder="请输入运费"></el-input>
+                  <span class="red">结算金额为最终支付金额</span>
+                </div>
+                <div v-else>
+                  <span class="red">{{scope.row.supplier_logistic_amount}}</span>元
+                </div>
+              </template>
             </xd-table>
           </template>
         </xd-table>
@@ -181,6 +200,8 @@ export default {
         { "type": "price", "prop": "total_amount1", "align": "center", "label": "订单金额" },
         { "type": "normal", "prop": "supplier_name1", "align": "center", "label": "供应商" },
         // #ifdef admin
+        { "type": "normal", "prop": "supplier_product_amount1", "align": "center","width":170, "label": "订单金额" },
+        { "type": "normal", "prop": "supplier_logistic_amount1", "align": "center","width":170, "label": "运费" },
         { "type": "normal", "prop": "supplier_settlement_amount1", "align": "center","width":170, "label": "供应商结算金额" },
         // #endif
          // #ifdef oa-finance
@@ -212,6 +233,8 @@ export default {
         // #endif
         { "type": "normal", "prop": "supplier_name", "align": "center", "label": "供应商" },
         // #ifdef admin
+        { "type": "normal", "prop": "supplier_product_amount", "align": "center","width":170, "label": "订单金额" },
+        { "type": "normal", "prop": "supplier_logistic_amount", "align": "center","width":170, "label": "运费" },
         { "type": "normal", "prop": "supplier_settlement_amount", "align": "center","width":170, "label": "供应商结算金额" },
         // #endif
         // #ifdef oa-finance
@@ -284,15 +307,20 @@ export default {
         let product_num = 0;
         this.tables.map(item=>{
           item.supplier_settlement_amount = this.$xdHelper.divisionFloatNumber(item.supplier_settlement_amount,100)
+          item.supplier_logistic_amount = this.$xdHelper.divisionFloatNumber(item.supplier_logistic_amount,100)
+          item.supplier_product_amount = this.$xdHelper.divisionFloatNumber(item.supplier_product_amount,100)
           product_num+=item.order_products.length
           item.order_products.map(ls=>{
             ls.supplier_name = item.supplier_name
             ls.total_amount = item.total_amount
+            ls.supplier_logistic_amount = item.supplier_logistic_amount
+            ls.supplier_product_amount = item.supplier_product_amount
             ls.sale_price = this.$xdHelper.divisionFloatNumber(ls.sale_price, 100)
             ls.purchase_sub_order_id = item.purchase_sub_order_id
             ls.supplier_settlement_amount = item.supplier_settlement_amount
             ls.supplier_settlement_amount_finace = item.supplier_settlement_amount
             ls.actual_settlement_amount = item.actual_settlement_amount
+            
             if(item.dist_amount){
               ls.sub_dist_amount = item.dist_amount
             }
@@ -414,7 +442,10 @@ export default {
         let { row, column, rowIndex, columnIndex } = data
         let mergeColumns = [];
         //rowIndex，columnIndex的值是从0开始
-        // #ifdef admin oa-finance
+        // #ifdef admin
+        mergeColumns = [5,6,7,8,9] //第4列需要合并行，并且合并到数组最大值,
+        // #endif
+        // #ifdef oa-finance
         mergeColumns = [5,6,7] //第4列需要合并行，并且合并到数组最大值,
         // #endif
         // #ifdef partner-wholesale
@@ -451,9 +482,38 @@ export default {
           this.$message.error('小数点后最多保留两位小数')
           return
         }
+        if(!reg.test(Number(copyData[i]['supplier_product_amount']))){
+          this.$message.error('小数点后最多保留两位小数')
+          return
+        }
+        if(!reg.test(Number(copyData[i]['supplier_logistic_amount']))){
+          this.$message.error('小数点后最多保留两位小数')
+          return
+        }
         if(copyData[i]['supplier_settlement_amount']){
           copyData[i]['amount'] = this.$xdHelper.multiplyFloatNumber(Number(copyData[i]['supplier_settlement_amount']),100)
+          copyData[i]['supplier_settlement_amount'] = this.$xdHelper.multiplyFloatNumber(Number(copyData[i]['supplier_settlement_amount']),100)
+        }
+        if(copyData[i]['supplier_product_amount']){
+          copyData[i]['supplier_product_amount'] = this.$xdHelper.multiplyFloatNumber(Number(copyData[i]['supplier_product_amount']),100)
+        }
+        if(copyData[i]['supplier_logistic_amount']){
+          copyData[i]['supplier_logistic_amount'] = this.$xdHelper.multiplyFloatNumber(Number(copyData[i]['supplier_logistic_amount']),100)
         }
+        copyData[i]['order_products'].map(item=>{
+          if(item.supplier_product_amount){
+            item.supplier_product_amount= this.$xdHelper.multiplyFloatNumber(Number(item.supplier_product_amount),100)
+          }
+          if(item.supplier_settlement_amount){
+            item.supplier_settlement_amount= this.$xdHelper.multiplyFloatNumber(Number(item.supplier_settlement_amount),100)
+          }
+          if(item.supplier_settlement_amount_finace){
+            item.supplier_settlement_amount_finace= this.$xdHelper.multiplyFloatNumber(Number(item.supplier_settlement_amount_finace),100)
+          }
+          if(item.supplier_logistic_amount){
+            item.supplier_logistic_amount= this.$xdHelper.multiplyFloatNumber(Number(item.supplier_logistic_amount),100)
+          }
+        })
       }
       console.log(copyData,'ccc')
       let data = {
@@ -472,8 +532,32 @@ export default {
       })
     },
     //结算金额改变
-    handleChangeAmount(value,scope1){
-      this.$set(this.tables[scope1['index']],'supplier_settlement_amount',value)
+    handleChangeAmount(value,scope1,type){
+      // debugger
+      if(type==='supplier_settlement_amount'){
+        this.$set(this.tables[scope1['index']],type,value)
+      }else if(type==='supplier_product_amount'){
+        this.$set(this.tables[scope1['index']],type,value)
+        let num = 0;
+        num = Number(value) + Number(this.tables[scope1['index']]['supplier_logistic_amount'])
+        this.$set(this.tables[scope1['index']],'supplier_settlement_amount',num)
+      }else if(type==='supplier_logistic_amount'){
+        this.$set(this.tables[scope1['index']],type,value)
+        let num = 0;
+        num = Number(value) + Number(this.tables[scope1['index']]['supplier_product_amount'])
+        this.$set(this.tables[scope1['index']],'supplier_settlement_amount',num)
+        console.log(num,'nnn')
+      }
+      this.tables.map(item=>{
+        item.order_products.map(ls=>{
+          ls.supplier_product_amount = item.supplier_product_amount
+          ls.supplier_logistic_amount = item.supplier_logistic_amount
+          ls.supplier_settlement_amount = item.supplier_settlement_amount
+          ls.supplier_settlement_amount_finace = item.supplier_settlement_amount
+        })
+      })
+      this.tableRefresh = Date.now()
+      this.tableKey = Date.now()
        console.log(this.tables,value,scope1,2222)
     },
     goBack () {

package/library/viewModules/viewsEnterpriseBuy/viewsEnterpriseBuy/table-card.vue

@@ -13,7 +13,7 @@
         <span>清单预算:</span><span class="red">{{$xdHelper.divisionFloatNumber(baseData.purchase_plan_amount, 100)}}</span>
       </div>
       <div class="card-box_base_item">
-        <span>总金额:</span><span class="red">{{$xdHelper.divisionFloatNumber(baseData.total_amount, 100)}}</span>
+        <span>商品金额:</span><span class="red">{{$xdHelper.divisionFloatNumber(baseData.total_amount, 100)}}</span>
          <el-tooltip
           popper-class="notice-popper"
           placement="top"
@@ -27,6 +27,17 @@
       <!-- #endif -->
       <div class="card-box_base_item">
         <span>用户实际结算金额:</span><span class="red">{{baseData.user_settlement_amount===-1?'--':$xdHelper.divisionFloatNumber(baseData.user_settlement_amount, 100)}}</span>
+      </div>
+       <!-- #ifdef admin -->
+      <div class="card-box_base_item">
+        <span>结算总金额:</span><span class="red">{{baseData.supplier_settlement_amount===-1?'--':$xdHelper.divisionFloatNumber(baseData.supplier_settlement_amount, 100)}}</span>
+      </div>
+      <div class="card-box_base_item">
+        <span>订单金额:</span><span class="red">{{baseData.supplier_product_amount===-1?'--':$xdHelper.divisionFloatNumber(baseData.supplier_product_amount, 100)}}</span>
+      </div>
+       <!-- #endif -->
+       <div class="card-box_base_item">
+        <span>运费金额:</span><span class="red">{{baseData.supplier_logistic_amount===-1?'--':$xdHelper.divisionFloatNumber(baseData.supplier_logistic_amount, 100)}}</span>
       </div>
       <!-- #ifdef oa-finance -->
       <div class="card-box_base_item">

package/package.json

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