jufubao-admin-library 1.1.213 → 1.1.215

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

@@ -191,13 +191,10 @@ export default {
       path: 'p1',
     },
     {
-        server: "supplier-partner",
-        fn: "supplier-channel",
-        path: "p1",
-        params: {
-          type: 'ALL'
-        },
-      }
+      server: "supplier-partner",
+      fn: "partner-channel",
+      path: "p1",
+    }
     ]).then(res => {
       this.supplierLevel = res[0].data.list;
       this.channelList = res[1].data.list;

package/library/viewModules/viewStore/schemas/store_selection.js

@@ -570,7 +570,7 @@ module.exports = {
       disabled: true,
       role: 'ROLE_MARKET_STORE_PRODUCT_RULE_LOG_DETAIL',
     },
-    {
+	  {
       title: "加盟商后台 复制选店规则条件",
       mapFn: "selectShopRuleCopy",
       isPublic: true,
@@ -583,6 +583,64 @@ module.exports = {
       },
       disabled: true,
     },
+    {
+      title: "按条件隐藏",
+      mapFn: "selectShopIsHidden",
+      path: "/supplier-partner/v1/:xsiteid/:xnamespace/select-shop/is-hidden",
+      isRule: false,
+      data: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+        page_token: ['第几页', 'String', '选填'],
+        page_size: ['每页展示条数', 'Number', '选填'],
+        filters:['filters', 'Array', '选填'],
+        tab: ['tab', 'String', '选填'],
+      },
+      disabled: true,
+      role: '@@@@.@@@.SELECT_SHOP_IS_HIDDEN',
+    },
+    {
+      title: "按条件展示",
+      mapFn: "selectShopIsShow",
+      path: "/supplier-partner/v1/:xsiteid/:xnamespace/select-shop/is-show",
+      isRule: false,
+      data: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+        page_token: ['第几页', 'String', '选填'],
+        page_size: ['每页展示条数', 'Number', '选填'],
+        filters:['filters', 'Array', '选填'],
+        tab: ['tab', 'String', '选填'],
+      },
+      disabled: true,
+      role: '@@@@.@@@.SELECT_SHOP_IS_SHOW',
+    },
+    {
+      title: "单个门店隐藏",
+      mapFn: "selectShopIsHiddenShop",
+      path: "/supplier-partner/v1/:xsiteid/:xnamespace/select-shop/is-hidden-shop",
+      isRule: false,
+      data: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+        resource_shop_id:['resource_shop_id', 'Array', '选填'],
+      },
+      disabled: true,
+      role: '@@@@.@@@.SELECT_SHOP_IS_HIDDEN_SHOP',
+    },
+    {
+      title: "单个门店展示",
+      mapFn: "selectShopIsShowShop",
+      path: "/supplier-partner/v1/:xsiteid/:xnamespace/select-shop/is-show-shop",
+      isRule: false,
+      data: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+        resource_shop_id:['resource_shop_id', 'Array', '选填'],
+      },
+      disabled: true,
+      role: '@@@@.@@@.SELECT_SHOP_IS_SHOW_SHOP',
+    }
   ],
 }
 

package/library/viewModules/viewStore/viewStore/selected/list.vue

@@ -48,6 +48,8 @@
     </el-card>
     <el-card class="app-container__list">
       <div class="app-container__list-custom" style="text-align: right">
+        <el-button v-if="storeType==='AGG'" v-permission="[Role.selectShopIsShow]" type="primary" @click="handleBatchHide(false)">按搜索条件展示</el-button>
+        <el-button v-if="storeType==='AGG'" v-permission="[Role.selectShopIsHidden]" type="primary" @click="handleBatchHide(true)">按搜索条件隐藏</el-button>
         <el-button type="primary" :disabled="batchRowIds.length===0" @click="handleBatchDelete">批量删除</el-button>
         <el-button type="primary" :disabled="batchRowIds.length===0" @click="handleBatchStatus">批量{{ mainFilterIndex === '0' ? '下架' : '上架' }}</el-button>
         <el-button type="primary" size="small" icon="el-icon-edit" @click="handleExport" v-if="isExport">条件导出</el-button>
@@ -196,6 +198,7 @@ import XdDialog from "@/components/XdDialog"
 import { getOptions } from "@/utils/options"
 import XdPaginationJfb from "@/components/XdPaginationJfb";
 import XdBaseDynamicField from "@/components/XdBaseDynamicField.vue";
+import Role from "@/constant/modules/store_selection"
 export default {
   name: "SelectedList",
   components: {
@@ -213,6 +216,7 @@ export default {
 
   data () {
     return {
+      Role,
       pageSize: 1,//当前页面数量
       hasNextPage: true,
       limit: 20,
@@ -356,6 +360,8 @@ export default {
             this.storeType!=='AGG'&&this.storeType!=='PRODUCT'&&{ "ui": "text-button", "name": "移除", "type": "text" ,event:'delete'},
             // { "ui": "text-button", "name": "修改服务类型", "type": "text" ,event:'off_consume'},
             this.storeType==='AGG'&&this.storeType!=='PRODUCT'&&{ "ui": "text-button", "name": "查看关联前门店", "type": "text" ,event:'look_store'},
+            this.storeType==='AGG'&&checkPermission([Role.selectShopIsHiddenShop])&&{ "ui": "text-button", "name": "隐藏门店", "type": "text" ,event:'hide'},
+            this.storeType==='AGG'&&checkPermission([Role.selectShopIsShowShop])&&{ "ui": "text-button", "name": "展示门店", "type": "text" ,event:'show'},
            ].filter(i=>i)
         }
       ].filter(i=>i)
@@ -428,6 +434,10 @@ export default {
       'selectShopGetConsumeMode',
       'selectShopUpdateConsumeMode',
       'selectShopGetRelatedShops',
+      'selectShopIsHiddenShop',
+      'selectShopIsShowShop',
+      'selectShopIsHidden',
+      'selectShopIsShow',
     ]),
 
     onJfbTagForReload () {
@@ -477,6 +487,13 @@ export default {
       }
       return filters
     },
+    getListParams(){
+      return {
+        filters:this.getParams(),
+        tab:this.channelActive,
+        consume_mode:this.storeType,
+      }
+    },
     getList (type, action, cb) {
       console.log(typeof cb,'cccc')
       if (action === 'reset'||action === 'search') {
@@ -485,9 +502,7 @@ export default {
         this.currentPage = 'all';
       }
       let params = {
-        filters:this.getParams(),
-        tab:this.channelActive,
-        consume_mode:this.storeType,
+        ...this.getListParams(),
         page_token: this.currentPage,
         page_size: this.limit
       } 
@@ -619,6 +634,17 @@ export default {
               })
           }
         },
+        this.storeType==='AGG'&&{
+          label: "是否隐藏:",
+          ele: "xd-select-list",
+          valueKey: "is_hidden",
+          value: '',
+          multiple:false,
+          list: [
+            { label: '是', value: 'Y' },
+            { label: '否', value: 'N' },
+          ],
+        },
         (this.checkEnabled(options,'category_ids')||this.storeType==='AGG')&&{
           label: "门店分类:", //label
           ele: "slot", //package 名称
@@ -814,6 +840,16 @@ export default {
           this.storeTableKey = Date.now()
           this.dialogStore=true;
         })
+      }else if(value.event==='hide'){
+        this.selectShopIsHiddenShop({resource_shop_id: row.resource_shop_id,consume_mode:this.storeType}).then(res => {
+          this.$message({ message: '隐藏成功', type: 'success' })
+          this.getList('list')
+        })
+      }else if(value.event==='show'){
+        this.selectShopIsShowShop({resource_shop_id: row.resource_shop_id,consume_mode:this.storeType}).then(res => {
+          this.$message({ message: '展示成功', type: 'success' })
+          this.getList('list')
+        })
       }
     },
     initDialogForm(){
@@ -843,6 +879,7 @@ export default {
     },
 
      handleCustom({action,data}){
+      let row = data.row;
       if (action === 'btn') {
         if (data.btn.event==='on') {
           if(!this.isOn||this.site_business_status==='Y'){
@@ -874,6 +911,17 @@ export default {
             return false
           }
         }
+        if(data.btn.event === 'hide'){
+          if(data.row.is_hidden === 'Y'){
+            return false
+          }
+        }
+        if(data.btn.event === 'show'){
+          if(data.row.is_hidden === 'N'){
+            return false
+          }
+        }
+        
         return true
       }
     },
@@ -921,6 +969,20 @@ export default {
         // this.getList('list');
       })
     },
+    handleBatchHide(isHide){
+      let action = isHide ? '隐藏' : '展示'
+      this.$confirm(`是否${action}搜索条件门店？`, action, {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消'
+      }).then(() => {
+        let api = isHide ? this.selectShopIsHidden : this.selectShopIsShow
+        let params = this.getListParams();
+        api(params).then(res => {
+          this.$message({ message: `${action}成功`, type: 'success' })
+          this.getList('list')
+        })
+      })
+    },
     /**导出售后订单**/
     handleExport () {
        this.dialogExport = true

package/package.json

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