jufubao-admin-library 1.1.182 → 1.1.184

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

@@ -102,5 +102,14 @@ module.exports = {
       disabled: true,
       role: "STAT-PARTNER.SUPPLIER_STAT_NEW_ON"
     },
+    {
+      title: "统计-供应商统计-线下门店-无订单线下门店",
+      mapFn: "getNoOrderOfflineShop",
+      path: '/stat-partner/v1/supplier-stat/no-order-offline-shop',
+      isRule: false,
+      params: {},
+      disabled: true,
+      role: "STAT-PARTNER.TRADE_STAT_NO_ORDER_LINE_SHOP"
+    },
   ]
 }

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

@@ -76,7 +76,11 @@
           :defaultSort="{ prop: 'total_product_num', order: 'descending' }"
           is-border
           @onSortChange="handleSortChange"
-        ></xd-table>
+        >
+        <template slot="discount" slot-scope="scope">
+          <div v-if="scope.row.discount">{{ scope.row.discount }}折</div>
+        </template>
+      </xd-table>
       </div>
       <div class="app-container__list-pagination">
         <xd-pagination
@@ -192,6 +196,18 @@ export default {
             data: ["按支付时间统计已支付客户订单进货价金额","包含商品进货价","自有商品按货源进货价","非自有商品按平台进货价计"],
           },
         },
+        {
+          type: "normal",
+          prop: "discount",
+          align: "center",
+          minWidth: 200,
+          label: "折扣",
+          unit: "元",
+          sort: "custom",
+          notice: {
+            data: ["折扣=查询结果按商品汇总的进货价金额/销售金额；","四舍五入并保留两位小数展示；","注：此数据仅供参考，不代表商品实际利润。"],
+          },
+        },
         {
           type: "normal",
           prop: "total_real_product_num",

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

@@ -58,7 +58,10 @@
           <p>共计核销订单<span>{{ totalData.total_order_count }}</span>个，
             核销金额<span>{{totalData.total_settle_amount}}</span>，
             货源结算金额<span>{{totalData.total_purchase_discount_amount}}</span></p>
-          <el-button type="primary" @click="doExport">条件导出</el-button>
+          <div>
+            <el-button type="primary" v-if="isShowViewStore" @click="viewStore">查看无核销门店</el-button>
+            <el-button type="primary" @click="doExport">条件导出</el-button>
+          </div>
         </div>
       </div>
       <div class="app-container__list-table">
@@ -79,6 +82,94 @@
         ></xd-pagination>
       </div>
     </el-card>
+    <XdDialog
+      v-if="showViewStore"
+      :show.sync="showViewStore"
+      :isBtn="false"
+      @onClose="handleCloseView"
+      title="查看无核销门店"
+    >
+      <el-card class="app-container__search">
+        <xd-search
+          dateFilter
+          v-if="viewSearchForm.length > 0"
+          v-model="viewSearchParams"
+          :list="viewSearchForm"
+          @onSearch="handleViewSearch"
+          @onDone="getViewStoreList"
+        >
+        <template slot="trade-date">
+          <xd-stat-trade-date :typeOptions="typeOptions" :isRangeMonth="true" v-model="viewTradeTime"></xd-stat-trade-date>
+        </template>
+        <template slot="supplier">
+          <div>
+              <el-select
+                v-model="view_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="view_channel_code && showViewSupplier === 'Y'"
+                v-model="view_supplier_ids"
+                filterable
+                remote
+                reserve-keyword
+                placeholder="请输入供应商"
+                :remote-method="remoteViewMethod"
+              >
+                <el-option
+                  v-for="item in supplierList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </div>
+        </template>
+        </xd-search>
+      </el-card>
+      <el-card class="app-container__list">
+        <div class="app-container__list-pagination">
+          <div></div>
+          <div class="table-stat">
+            <div>
+              <el-button type="primary" @click="doViewExport">条件导出</el-button>
+            </div>
+          </div>
+        </div>
+         <div class="app-container__list-table">
+          <xd-table
+            :headers="viewStoreHeaders"
+            :list="viewStoreTables"
+            ref="myTable"
+            is-border
+          >
+          </xd-table>
+        </div>
+        <div class="app-container__list-pagination">
+          <xd-pagination
+            :page="view_page_token"
+            :total="view_total"
+            :limit.sync="view_page_size"
+            :autoScroll="false"
+            @onPagination="handleViewPagination"
+          ></xd-pagination>
+        </div>
+      </el-card>
+     
+  </XdDialog>
   </div>
 </template>
 
@@ -88,9 +179,12 @@ import XdSearch from "@/components/XdSearch";
 import XdPagination from "@/components/XdPagination.vue";
 import XdTable from "@/components/XdTable";
 import XdStatTradeDate from "@/components/XdStatTradeDate";
+import XdDialog from "@/components/XdDialog";
 import { baseJsDateToTime } from "@/utils/xd.base";
 import { mapActions } from "vuex"
 import { getOptions } from "@/utils/options"
+import checkPermission from "@/utils/permission"
+import Role from "@/constant/modules/supplierStat"
 
 export default {
   name: "ComponentTableSupplier",
@@ -99,6 +193,7 @@ export default {
     XdSearch, //搜查插件
     XdTable,
     XdStatTradeDate,
+    XdDialog
   },
   data() {
     return {
@@ -173,7 +268,38 @@ export default {
       supplier_text: "",
       channel_code_text: "",
       showSupplier: "N",
-      sourceList:[],
+      sourceList: [],
+      showViewStore: false,
+      viewSearchForm: [],
+      viewSearchParams: null, //搜索参数
+      viewTradeTime: null,
+      view_channel_code: null,
+      view_supplier_ids: null,
+      view_supplier_text: "",
+      view_channel_code_text: "",
+      showViewSupplier: 'N',
+      viewStoreTables: [],
+      viewStoreHeaders: [
+        { "type": "normal", "prop": "shop_id", "align": "center", "width": 100, "label": "门店ID" },
+        { "type": "normal", "prop": "shop_name", "align": "center", "minWidth": 200, "label": "门店名称" },
+        { "type": "normal", "prop": "brand_name", "align": "center", "width": 100, "label": "门店品牌" },
+        { "type": "normal", "prop": "supplier_name", "align": "center", "minWidth": 200, "label": "供应商" },
+      ],
+      //分页参数
+      view_page_token: 1, //当前页面数量
+      view_page_size: 20, //搜索参数
+      view_total: 0,
+      typeOptions: [
+        {
+          label: "按月",
+          value: "month"
+        }
+      ]
+    }
+  },
+  computed: {
+    isShowViewStore() {
+      return checkPermission(Role.getNoOrderOfflineShop)
     }
   },
   watch:{
@@ -198,6 +324,27 @@ export default {
         ).label;
       }
     },
+    view_channel_code(n, o) {
+      this.view_channel_code_text = "";
+      this.view_supplier_text = "";
+      this.view_supplier_ids = null;
+      if (n && n !== o) {
+        this.view_channel_code_text = this.channelList.find(
+          (item) => item.value === n
+        ).label;
+        this.showViewSupplier = this.channelList.find(
+          (item) => item.value === n
+        ).has_supplier;
+      }
+    },
+    view_supplier_ids(n, o) {
+      this.view_supplier_text = "";
+      if (n && n !== o) {
+        this.view_supplier_text = this.supplierList.find(
+          (item) => item.value === n
+        ).label;
+      }
+    },
   },
   created() {
     getOptions([{
@@ -216,7 +363,7 @@ export default {
     });
   },
   methods: {
-    ...mapActions("supplierStat", ["offlineShopSalesSupplier"]),
+    ...mapActions("supplierStat", ["offlineShopSalesSupplier",'getNoOrderOfflineShop']),
     //相除
     divide(price) {
       return this.$xdHelper.divisionFloatNumber(price, 100);
@@ -238,6 +385,23 @@ export default {
       }
       return params;
     },
+    getViewParams() {
+      let { brand_id,shop_id, ...other } = this.viewSearchParams;
+      
+      if(brand_id && brand_id.length > 0){
+        other.brand_id = brand_id[0].value;
+      }
+      if(shop_id && shop_id.length > 0){
+        other.shop_id = shop_id[0].value;
+      }
+      let params = {
+        ...other,
+        ...this.viewTradeTime,
+        supplier_id:this.view_supplier_ids,
+        channel_code: this.view_channel_code,
+      }
+      return params;
+    },
     doExport(){
       this.$prompt('请输入导出文件名称', '提示', {
         confirmButtonText: '确定',
@@ -264,6 +428,37 @@ export default {
         })
       })
     },
+    doViewExport() {
+      this.$prompt("请输入导出文件名称", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        inputPattern: /[\S]+/,
+        inputErrorMessage: "请填写正确的名称",
+      }).then(({ value }) => {
+        let params = {
+          ...this.getViewParams(),
+          export: true,
+          file_ext: "xlsx",
+          file_name: value,
+        };
+        let loading = this.$loading({});
+        this.getNoOrderOfflineShop(params)
+          .then((res) => {
+            loading.close();
+            this.$alert(
+              "导出任务已经开始执行，请去任务管理查看下载状态",
+              "提示",
+              {
+                confirmButtonText: "确定",
+              }
+            );
+          })
+          .catch((err) => {
+            this.$message.error(err.msg);
+            loading.close();
+          });
+      });
+    },
     /**
      * @description 获取数据列表
      */
@@ -294,6 +489,31 @@ export default {
         loading.close();
       })
     },
+    /**
+     * @description 获取数据列表
+     */
+    getViewStoreList() {
+      //请求数据
+      let params = {
+        ...this.getViewParams(),
+        page_token: this.view_page_token,
+        page_size: this.view_page_size,
+      };
+      if(!this.viewTradeTime || !this.viewTradeTime.time_range_start){
+        this.$message.error('请选择交易时间')
+        return
+      }
+
+      console.log(params)
+      let loading = this.$loading({});
+      this.getNoOrderOfflineShop(params).then(res => {
+        loading.close();
+        this.viewStoreTables = res.data.list;
+        this.view_total = res.data.total_size;
+      }).catch(err => {
+        loading.close();
+      })
+    },
     handleSortChange({ prop, order }) {
       if(order === null){
         this.sort_by = '';
@@ -324,6 +544,18 @@ export default {
       this.page_token = 1;
       this.getList();
     },
+    handleViewSearch({ action, form }) {
+      if(!this.viewTradeTime || !this.viewTradeTime.time_range_start){
+        this.$message.error('请选择交易时间')
+        return
+      }
+      if (action == "reset") {
+        this.view_channel_code = '';
+        this.view_supplier_ids = '';
+      }
+      this.view_page_token = 1;
+      this.getViewStoreList();
+    },
     /**
      * @description 初始化搜索模块
      */
@@ -410,6 +642,79 @@ export default {
         },
       ];
     },
+    initViewSearchForm() {
+      let yesterDay = new Date().getTime() - 24 * 60 * 60 * 1000;
+      yesterDay = baseJsDateToTime(yesterDay/1000);
+      yesterDay = yesterDay.split(' ')[0];
+      this.viewSearchForm = [
+        {
+            label: "交易时间:",
+            ele: "slot",
+            slot: "trade-date",
+          },
+          {
+            label: "供应商: ",
+            ele: "slot",
+            slot: "supplier",
+          },
+          {
+            label: "门店名称:", //label
+            ele: "xd-remote-select", //package 名称
+            valueKey: "shop_id", //form[valueKey]
+            value: [], //v-model
+            placeholder: "请选择门店名称",
+            multiple: false,
+            collapseTags: false,
+            className: "input40",
+            remoteSearch: (query, resolve) => {
+              getOptions({
+                server: "supplier-partner",
+                fn: "shop",
+                path: "p1",
+                params: {
+                  keyword: query,
+                  page_token: 1,
+                  page_size: 500,
+                },
+              })
+                .then((res) => {
+                  resolve(res.data.list);
+                })
+                .catch((err) => {
+                  console.log(err, "err");
+                });
+            },
+          },
+          {
+            label: "品牌名称:", //label
+            ele: "xd-remote-select", //package 名称
+            valueKey: "brand_id", //form[valueKey]
+            value: [], //v-model
+            placeholder: "请选择品牌名称",
+            multiple: false,
+            collapseTags: false,
+            className: "input40",
+            remoteSearch: (query, resolve) => {
+              getOptions({
+                server: "supplier-partner",
+                fn: "brand",
+                path: "p1",
+                params: {
+                  keyword: query,
+                  page_token: 1,
+                  page_size: 500,
+                },
+              })
+                .then((res) => {
+                  resolve(res.data.list);
+                })
+                .catch((err) => {
+                  console.log(err, "err");
+                });
+            },
+          },
+      ];
+    },
     /**
      * @description 翻页处理方法
      * @param page {Number} 访问页面页码数
@@ -418,6 +723,10 @@ export default {
       this.page_token = page;
       this.getList();
     }, //todo
+    handleViewPagination(page) {
+      this.view_page_token = page;
+      this.getViewStoreList();
+    },
     remoteMethod(query) {
       if (query !== "") {
         getOptions({
@@ -439,6 +748,36 @@ export default {
         this.supplierList = [];
       }
     },
+    remoteViewMethod(query) {
+      if (query !== "") {
+        getOptions({
+          server: "supplier-partner",
+          fn: "channel-supplier",
+          path: "p1",
+          params: {
+            channel_code: this.view_channel_code,
+            keyword: query,
+          },
+        })
+          .then((res) => {
+            this.supplierList = res.data.list;
+          })
+          .catch((err) => {
+            console.log(err, "err");
+          });
+      } else {
+        this.supplierList = [];
+      }
+    },
+    viewStore() {
+      this.initViewSearchForm()
+      this.showViewStore = true;
+    },
+    handleCloseView() {
+      this.showViewStore = false;
+      this.view_channel_code = "";
+      this.view_supplier_ids = [];
+    }
   }
 }
 </script>

package/library/viewModules/viewsThird/viewsThird/create.vue

@@ -566,7 +566,7 @@ export default {
           ];
         }else {
           let key = item.valueKey;
-          item.value = params[key] || '';
+          item.value = (params[key]==0||params[key]) ? params[key]: "";
         }
       });
       // #endif

package/package.json

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