jufubao-admin-library 1.1.62 → 1.1.64

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

@@ -6,7 +6,7 @@ const role = roles.productStat;
 
 const productStatRouter = {
   path: '/stat',
-  sort: 95,
+  sort: 99,
   component: Layout,
   name: '商品统计',
   redirect: '/stat/product',

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

@@ -6,7 +6,7 @@ const role = roles.supplierStat;
 
 const supplierStatRouter = {
   path: '/stat',
-  sort: 95,
+  sort: 100,
   component: Layout,
   name: '供货商统计',
   redirect: '/stat/supplier',

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

@@ -9,6 +9,9 @@
         @onSearch="handleSearch"
         @onDone="getList"
       >
+        <template slot="trade-date">
+          <xd-stat-trade-date :isRangeMonth="true" v-model="tradeTime"></xd-stat-trade-date>
+        </template>
         <template slot="time" slot-scope="scope">
           <div>
             <el-select
@@ -87,6 +90,7 @@
 import XdSearch from "@/components/XdSearch";
 import XdPagination from "@/components/XdPagination.vue";
 import XdTable from "@/components/XdTable";
+import XdStatTradeDate from "@/components/XdStatTradeDate";
 import { baseJsDateToTime } from "@/utils/xd.base";
 import { getOptions } from "@/utils/options";
 import { mapActions } from "vuex";
@@ -97,6 +101,7 @@ export default {
     XdPagination, //翻译插件
     XdSearch, //搜查插件
     XdTable,
+    XdStatTradeDate,
   },
   data() {
     return {
@@ -109,6 +114,7 @@ export default {
       sort_by: "", //排序字段
       sort_direct: "", //排序方向 asc递增 desc递减
       totalData: {},
+      tradeTime: null,
 
       //列表对象
       tables: [],
@@ -150,7 +156,7 @@ export default {
           unit: "元",
           sort: "custom",
           notice: {
-            data: ["按支付时间统计已支付客户订单总金额 包含商品售价和运费"],
+            data: ["按支付时间统计已支付客户订单总金额 包含商品售价"],
           },
         },
         {
@@ -162,7 +168,7 @@ export default {
           unit: "元",
           sort: "custom",
           notice: {
-            data: ["按支付时间统计已支付客户订单进货价金额 包含商品进货价和运费 自有商品按货源进货价，非自有商品按平台进货价计"],
+            data: ["按支付时间统计已支付客户订单进货价金额 包含商品进货价 自有商品按货源进货价，非自有商品按平台进货价计"],
           },
         },
         {
@@ -287,6 +293,7 @@ export default {
       }
       let params = {
         ...other,
+        ...this.tradeTime,
         page_token: this.page_token,
         page_size: this.page_size,
         channel_code: this.channel_code,
@@ -342,10 +349,11 @@ export default {
       let params = {
         ...this.getParams(),
       };
-      if(!this.searchParams.time_range_start||!this.searchParams.time_range_end){
+      if(!this.tradeTime || !this.tradeTime.time_range_start){
         this.$message.error('请选择交易时间')
         return
       }
+
       console.log(params);
       let loading = this.$loading({});
       this.brandCycSales(params)
@@ -398,13 +406,9 @@ export default {
         // this.channelList = res.data.list;
         this.searchForm = [
           {
-            label: "交易时间:", //label
-            ele: "xd-date", //package 名称
-            valueKey: ["time_range_start", "time_range_end"], //form[valueKey]
-            value: [yesterDay, yesterDay], //v-model
-            format: "yyyy-MM-dd", //时间显示格式
-            formatValue: "yyyy-MM-dd", //输出时间格式
-            placeholder: ["开始时间", "结束时间"],
+            label: "交易时间:",
+            ele: "slot",
+            slot: "trade-date",
           },
           {
             label: "商品品牌:", //label

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

@@ -9,7 +9,10 @@
         @onSearch="handleSearch"
         @onDone="getList"
       >
-      <template slot="time" slot-scope="scope">
+        <template slot="trade-date">
+          <xd-stat-trade-date :isRangeMonth="true" v-model="tradeTime"></xd-stat-trade-date>
+        </template>
+        <template slot="time" slot-scope="scope">
           <div>
             <el-select
               v-model="channel_code"
@@ -90,6 +93,7 @@
 import XdSearch from "@/components/XdSearch";
 import XdPagination from "@/components/XdPagination.vue";
 import XdTable from "@/components/XdTable";
+import XdStatTradeDate from "@/components/XdStatTradeDate";
 import { baseJsDateToTime } from "@/utils/xd.base";
 import { mapActions } from "vuex"
 import { getOptions } from "@/utils/options"
@@ -99,7 +103,8 @@ export default {
   components: {
     XdPagination, //翻译插件
     XdSearch, //搜查插件
-    XdTable
+    XdTable,
+    XdStatTradeDate,
   },
   data() {
     return {
@@ -117,6 +122,8 @@ export default {
       sort_by: "", //排序字段
       sort_direct: "", //排序方向 asc递增 desc递减
 
+      tradeTime: null,
+
       //列表对象
       tables: [],
       headers: [
@@ -145,7 +152,7 @@ export default {
           unit: "元",
           sort: "custom",
           notice: {
-            data: ["按支付时间统计已支付客户订单总金额 包含商品售价和运费"],
+            data: ["按支付时间统计已支付客户订单总金额 包含商品售价"],
           },
         },
         {
@@ -157,7 +164,7 @@ export default {
           unit: "元",
           sort: "custom",
           notice: {
-            data: ["按支付时间统计已支付客户订单进货价金额 包含商品进货价和运费 自有商品按货源进货价，非自有商品按平台进货价计"],
+            data: ["按支付时间统计已支付客户订单进货价金额 包含商品进货价 自有商品按货源进货价，非自有商品按平台进货价计"],
           },
         },
         {
@@ -212,7 +219,7 @@ export default {
         lazy: true,
         lazyLoad (node, resolve) {
           getOptions({
-            server: 'product-admin',
+            server: 'product-partner',
             fn: "categories",
             path: "p4",
             params: {
@@ -285,7 +292,7 @@ export default {
   },
   created() {
     getOptions({
-      server: 'product-admin',
+      server: 'product-partner',
       fn: "categories",
       path: "p4",
       params: { value: 0 },
@@ -309,6 +316,7 @@ export default {
       }
       let params = {
         ...other,
+        ...this.tradeTime,
         page_token: this.page_token,
         page_size: this.page_size,
         channel_code: this.channel_code,
@@ -358,10 +366,11 @@ export default {
       let params = {
         ...this.getParams(),
       };
-      if(!this.searchParams.time_range_start||!this.searchParams.time_range_end){
+      if(!this.tradeTime || !this.tradeTime.time_range_start){
         this.$message.error('请选择交易时间')
         return
       }
+
       console.log(params)
       let loading = this.$loading({});
       this.categoryCycSales(params).then(res => {
@@ -414,13 +423,9 @@ export default {
         // this.channelList = res.data.list
         this.searchForm = [
           {
-            label: '交易时间:', //label
-            ele: 'xd-date', //package 名称
-            valueKey: ['time_range_start', 'time_range_end'], //form[valueKey]
-            value: [yesterDay, yesterDay], //v-model
-            format: 'yyyy-MM-dd', //时间显示格式
-            formatValue: 'yyyy-MM-dd', //输出时间格式
-            placeholder: ['开始时间', '结束时间'],
+            label: "交易时间:",
+            ele: "slot",
+            slot: "trade-date",
           },
           // {
           //   label: "分类ID",

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

@@ -10,6 +10,9 @@
         @onDone="getList"
         :key="renderFormKey"
       >
+        <template slot="trade-date">
+          <xd-stat-trade-date :isRangeMonth="false" v-model="tradeTime"></xd-stat-trade-date>
+        </template>
         <template slot="time" slot-scope="scope">
           <div>
             <el-select
@@ -93,6 +96,7 @@
 import XdSearch from "@/components/XdSearch";
 import XdPagination from "@/components/XdPagination.vue";
 import XdTable from "@/components/XdTable";
+import XdStatTradeDate from "@/components/XdStatTradeDate";
 import { baseJsDateToTime } from "@/utils/xd.base";
 import { getOptions } from "@/utils/options";
 import { mapActions } from "vuex";
@@ -103,6 +107,7 @@ export default {
     XdPagination, //翻译插件
     XdSearch, //搜查插件
     XdTable,
+    XdStatTradeDate,
   },
   data() {
     return {
@@ -116,6 +121,8 @@ export default {
       sort_by: "", //排序字段
       sort_direct: "", //排序方向 asc递增 desc递减
 
+      tradeTime: null,
+
       //列表对象
       tables: [],
       headers: [
@@ -170,7 +177,7 @@ export default {
           unit: "元",
           sort: "custom",
           notice: {
-            data: ["按支付时间统计已支付客户订单总金额 包含商品售价和运费"],
+            data: ["按支付时间统计已支付客户订单总金额 包含商品售价"],
           },
         },
         {
@@ -182,7 +189,7 @@ export default {
           unit: "元",
           sort: "custom",
           notice: {
-            data: ["按支付时间统计已支付客户订单进货价金额 包含商品进货价和运费 自有商品按货源进货价，非自有商品按平台进货价计"],
+            data: ["按支付时间统计已支付客户订单进货价金额 包含商品进货价 自有商品按货源进货价，非自有商品按平台进货价计"],
           },
         },
         {
@@ -310,6 +317,7 @@ export default {
       }
       let params = {
         ...other,
+        ...this.tradeTime,
         page_token: this.page_token,
         page_size: this.page_size,
         channel_code: this.channel_code,
@@ -365,10 +373,11 @@ export default {
       let params = {
         ...this.getParams(),
       };
-      if(!this.searchParams.time_range_start||!this.searchParams.time_range_end){
+      if(!this.tradeTime || !this.tradeTime.time_range_start){
         this.$message.error('请选择交易时间')
         return
       }
+
       console.log(params);
       let loading = this.$loading({});
 
@@ -450,13 +459,9 @@ export default {
         this.channelList = res.data.list;
         this.searchForm = [
           {
-            label: "交易时间:", //label
-            ele: "xd-date", //package 名称
-            valueKey: ["time_range_start", "time_range_end"], //form[valueKey]
-            value: [yesterDay, yesterDay], //v-model
-            format: "yyyy-MM-dd", //时间显示格式
-            formatValue: "yyyy-MM-dd", //输出时间格式
-            placeholder: ["开始时间", "结束时间"],
+            label: "交易时间:",
+            ele: "slot",
+            slot: "trade-date",
           },
           {
             label: "商品ID",

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

@@ -130,7 +130,7 @@
       </el-table-column>
     </el-table>
     <div class="empty_data" v-else>暂无数据</div>
-    <div style="margin-top: 20px">注：折扣=货源进货价/市场价</div>
+    <div style="margin-top: 20px">注：折扣=货源进货价/所选折扣类型</div>
   </el-card>
 </template>
 <script>

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

@@ -10,6 +10,9 @@
         @onSearch="handleSearch"
         @onDone="getList"
       >
+      <template slot="trade-date">
+        <xd-stat-trade-date :isRangeMonth="true" v-model="tradeTime"></xd-stat-trade-date>
+      </template>
       <template slot="category_id">
         <el-cascader v-model="searchOtherForm.category_id" :props="categoryProps" clearable></el-cascader>
       </template>
@@ -89,6 +92,7 @@
 import XdSearch from "@/components/XdSearch";
 import XdPagination from "@/components/XdPagination.vue";
 import XdTable from "@/components/XdTable";
+import XdStatTradeDate from "@/components/XdStatTradeDate";
 import { baseJsDateToTime } from "@/utils/xd.base";
 import { mapActions } from "vuex"
 import { getOptions } from "@/utils/options"
@@ -98,7 +102,8 @@ export default {
   components: {
     XdPagination, //翻译插件
     XdSearch, //搜查插件
-    XdTable
+    XdTable,
+    XdStatTradeDate,
   },
   data() {
     return {
@@ -116,6 +121,8 @@ export default {
       sort_by: "", //排序字段
       sort_direct: "", //排序方向 asc递增 desc递减
 
+      tradeTime: null,
+
       //列表对象
       tables: [],
       headers: [
@@ -154,7 +161,7 @@ export default {
         lazy: true,
         lazyLoad (node, resolve) {
           getOptions({
-            server: 'product-admin',
+            server: 'product-partner',
             fn: "categories",
             path: "p4",
             params: {
@@ -200,7 +207,7 @@ export default {
   },
   created() {
     getOptions([{
-      server: 'product-admin',
+      server: 'product-partner',
       fn: "categories",
       path: "p4",
       params: { value: 0 },
@@ -226,6 +233,21 @@ export default {
     divide(price) {
       return this.$xdHelper.divisionFloatNumber(price, 100);
     },
+    getParams(){
+      let { supplier_id, ...other } = this.searchParams;
+  
+      let { category_id } = this.searchOtherForm
+      if (category_id && category_id.length) {
+        other['category_id'] = category_id[category_id.length - 1]
+      }
+      let params = {
+        ...other,
+        ...this.tradeTime,
+        supplier_id:this.supplier_ids,
+        channel_code: this.channel_code,
+      }
+      return params;
+    },
     doExport(){
       this.$prompt('请输入导出文件名称', '提示', {
         confirmButtonText: '确定',
@@ -233,19 +255,10 @@ export default {
         inputPattern: /[\S]+/,
         inputErrorMessage: '请填写正确的名称'
       }).then(({ value }) => {
-        let { supplier_id, ...other } = this.searchParams;
-        if(supplier_id && supplier_id.length > 0){
-          other.supplier_id = supplier_id[0].value;
-        }
-        let { category_id } = this.searchOtherForm
-        if (category_id && category_id.length) {
-          other['category_id'] = category_id[category_id.length - 1]
-        }
+        
         let params = {
-          ...other,
+          ...this.getParams(),
           export: true,
-          supplier_id:this.supplier_ids,
-          channel_code: this.channel_code,
           channel_code_text: this.channel_code_text,
           supplier_text: this.supplier_text,
           file_ext: "xlsx",
@@ -267,26 +280,19 @@ export default {
      * @description 获取数据列表
      */
     getList() {
-      let { ...other } = this.searchParams;
-      if(!this.searchParams.time_range_start||!this.searchParams.time_range_end){
+      if(!this.tradeTime || !this.tradeTime.time_range_start){
         this.$message.error('请选择交易时间')
         return
       }
-      let { category_id } = this.searchOtherForm
-      if (category_id && category_id.length) {
-        other['category_id'] = category_id[category_id.length - 1]
-      }
-
       //请求数据
       let params = {
-        ...other,
+        ...this.getParams(),
         page_token: this.page_token,
         page_size: this.page_size,
-        channel_code: this.channel_code,
-        supplier_id: this.supplier_ids,
         sort_by: this.sort_by,
         sort_direct: this.sort_direct,
       };
+      
       console.log(params)
       let loading = this.$loading({});
       this.productCategoryCycSales(params).then(res => {
@@ -316,7 +322,7 @@ export default {
      * @param form 搜索请求参数
      */
     handleSearch({ action, form }) {
-      if(!this.searchParams.time_range_start||!this.searchParams.time_range_end){
+      if(!this.tradeTime || !this.tradeTime.time_range_start){
         this.$message.error('请选择交易时间')
         return
       }
@@ -359,13 +365,9 @@ export default {
 
       this.searchForm = [
         {
-          label: '交易时间:', //label
-          ele: 'xd-date', //package 名称
-          valueKey: ['time_range_start', 'time_range_end'], //form[valueKey]
-          value: [yesterDay, yesterDay], //v-model
-          format: 'yyyy-MM-dd', //时间显示格式
-          formatValue: 'yyyy-MM-dd', //输出时间格式
-          placeholder: ['开始时间', '结束时间'],
+          label: "交易时间:",
+          ele: "slot",
+          slot: "trade-date",
         },
         // {
         //   label: "分类ID",