jufubao-admin-library 1.1.100 → 1.1.102

package/library/pageComponents/modules/lib/JfbRuleCreate.js

@@ -127,19 +127,30 @@ export default {
     },
 
     setMovieForm (data) {
-      if(data.adjust_type=='CARD_CITY') {
+
+      if(data.adjust_type==='CARD_CITY') {
         if (data['valid_data']) {
           let valid_data = this.getParseJSON(data.valid_data)
           data.card= valid_data.card
           data.city=valid_data.city
           delete data.valid_data
         }
+        //设置是否隐藏其他号段
+        if(data['is_hide_other_card']) {
+          data['CARD_CITY_is_hide_other_card'] = data['is_hide_other_card'];
+          delete data['is_hide_other_card']
+        }
       } else {
         let adjust_type_key = `${data.adjust_type}_valid_data`
         if (data['valid_data']) {
           data[adjust_type_key] = this.getParseJSON(data.valid_data)
           delete data.valid_data
         }
+        //设置是否隐藏其他号段
+        if(data['is_hide_other_card']) {
+          data['CARD_is_hide_other_card'] = data['is_hide_other_card'];
+          delete data['is_hide_other_card']
+        }
       }
       if (data.valid_weeks) data.valid_weeks = this.getParseJSON(data.valid_weeks)
 
@@ -730,6 +741,16 @@ export default {
             { required: true, message: '请输入号段', trigger: ['blur', 'change'] }
           ]
         },
+        params.adjust_type === 'CARD_CITY' && {
+          label: '是否隐藏其他卡号:',
+          ele: 'xd-radio',
+          valueKey: 'CARD_CITY_is_hide_other_card',
+          value: params['CARD_CITY_is_hide_other_card'] || 'N',
+          list: [
+            { "label": "隐藏", "value": 'Y' },
+            { "label": "不隐藏", "value": 'N' },
+          ],
+        },
         params.adjust_type === 'CITY' && {
           label: '按城市:',
           placeholder: '请选择城市',
@@ -758,6 +779,16 @@ export default {
             { required: false, message: '请输入时间', trigger: ['blur', 'change'] }
           ]
         },
+        params.adjust_type === 'CARD' && {
+          label: '是否隐藏其他卡号:',
+          ele: 'xd-radio',
+          valueKey: 'CARD_is_hide_other_card',
+          value: params['CARD_is_hide_other_card'] || 'N',
+          list: [
+            { "label": "隐藏", "value": 'Y' },
+            { "label": "不隐藏", "value": 'N' },
+          ],
+        },
         params.adjust_type === 'CINE' && {
           label: '按影院:',
           ele: 'xd-remote-select',
@@ -1054,7 +1085,17 @@ export default {
       let data = this.$xdHelper.cloneDeep(this.listValue)
       let adjust_type_key = `${data.adjust_type}_valid_data`
 
-      if(data.adjust_type==='CARD_CITY') {
+      //是否隐藏其他号段
+      if(data['CARD_CITY_is_hide_other_card']) {
+        data['is_hide_other_card'] = data['CARD_CITY_is_hide_other_card'];
+        delete data['CARD_CITY_is_hide_other_card']
+      }
+      if(data['CARD_is_hide_other_card']) {
+        data['is_hide_other_card'] = data['CARD_is_hide_other_card'];
+        delete data['CARD_is_hide_other_card']
+      }
+
+      if(data.adjust_type === 'CARD_CITY') {
         data['valid_data'] = {
           city:data['city'],
           card:data['card']

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

@@ -34,9 +34,21 @@ const storeRouter = {
       meta: {
         title: '门店集市',
         icon: 'el-icon-sell',
-        roles:[store_selection.selectShopMarketList]
+        roles:[store_selection.selectShopMarketList],
       }
     },
+    // #ifdef partner-movie
+    // {
+    //   path: 'mc-market-list',
+    //   name: 'McMarketList',
+    //   component: () => import('@/viewStore/market/mc_list'),
+    //   meta: {
+    //     title: '在线选座门店集市',
+    //     icon: 'el-icon-sell',
+    //     roles:[store_selection.selectShopSeatList]
+    //   }
+    // },
+    // #endif
     {
       path: 'rule-list',
       name: 'StoreRuleList',
@@ -85,11 +97,21 @@ const storeRouter = {
       name: 'TasksList',
       component: () => import('@/viewStore/task/list'),
       meta: {
-        title: '选店任务管理',
+        title: '门店更新',
         icon: 'xdicon_rizhi',
         roles:[store_selection.selectShopTaskList]
       }
     },
+    // {
+    //   path: 'cache-list',
+    //   name: 'CacheList',
+    //   component: () => import('@/viewStore/cache/list'),
+    //   meta: {
+    //     title: '缓存更新',
+    //     icon: 'el-icon-files',
+    //     roles:[store_selection.updateCacheDetail]
+    //   }
+    // },
   ]
 }
 

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

@@ -372,6 +372,98 @@ module.exports = {
       },
       disabled: true,
     },
+    {
+      mapFn: 'updateCacheDetail',
+      isRule: false,
+      title: '已选门店更新缓存详情',
+      path: '/supplier-partner/v1/:xsiteid/:xnamespace/select-shop/update-cache-detail',
+      params: {
+
+      },
+      disabled: true,
+      role: '@@@@.@@@.SELECT_SHOP_CACHE_LIST',
+    },
+    {
+      mapFn: 'updateCache',
+      isRule: false,
+      title: '已选门店更新缓存',
+      path: '/supplier-partner/v1/:xsiteid/:xnamespace/select-shop/update-cache',
+      params: {
+        
+      },
+      disabled: true,
+      role: '@@@@.@@@.SELECT_SHOP_CACHE_UPDATE',
+    },
+    {
+      title: "在线选座门店集市",
+      mapFn: "selectShopSeatList",
+      path: "/supplier-partner/v1/:xsiteid/:xnamespace/select-shop-market/seatlist",
+      isRule: false,
+      data: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+        fitler: ['fitler', 'String', '选填'],
+        page_token: ['第几页', 'String', '选填'],
+        page_size: ['每页展示条数', 'Number', '选填'],
+      },
+      disabled: true,
+      role: '@@@@.@@@.SELECT_SHOP_MARKET_MC_LIST',
+    },
+   
+    {
+      title: "门店集市批量选用",
+      mapFn: "selectShopMarketBatchSelect",
+      path: '/supplier-partner/v1/:xsiteid/:xnamespace/select-shop-market/batch-select',
+      isRule: false,
+      params: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+        resource_shop_ids: ['resource_shop_ids', 'Array', '选填'],
+      },
+      disabled: true,
+    },
+    {
+      title: "已选门店查看门店服务类型",
+      mapFn: "selectShopGetConsumeMode",
+      path: '/supplier-partner/v1/:xsiteid/:xnamespace/select-shop/consume-mode',
+      isRule: false,
+      params: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+        shop_id: ['shop_id', 'Number', '选填'],
+        resource_shop_id: ['resource_shop_id', 'Number', '选填'],
+      },
+      disabled: true,
+    },
+    {
+      title: "已选门店修改门店服务类型",
+      mapFn: "selectShopUpdateConsumeMode",
+      path: '/supplier-partner/v1/:xsiteid/:xnamespace/select-shop/update-consume-mode',
+      isRule: false,
+      params: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+        shop_id: ['shop_id', 'Number', '选填'],
+        resource_shop_id: ['resource_shop_id', 'Number', '选填'],
+        consume_mode: ['consume_mode', 'Array', '必填'],
+      },
+      disabled: true,
+      role: '@@@@.@@@.SELECT_SHOP_UPDATE_CONSUME_MODE',
+    },
+    {
+      title: "查看关联前门店",
+      mapFn: "selectShopGetRelatedShops",
+      path: '/supplier-partner/v1/:xsiteid/:xnamespace/select-shop/get-related-shops',
+      isRule: false,
+      params: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+        resource_shop_id: ['resource_shop_id', 'Number', '选填'],
+        consume_mode: ['consume_mode', 'String', '必填'],
+      },
+      disabled: true,
+      role: '@@@@.@@@.SELECT_SHOP_GET_RELATED_SHOPS',
+    },
   ],
 }
 

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

@@ -0,0 +1,181 @@
+<template>
+  <div class="app-container">
+    <el-card class="app-container__list">
+      <div class="app-container__list-pagination">
+        <div></div>
+        <div>
+        </div>
+      </div>
+      <div class="app-container__list-table">
+        <xd-table
+          :headers="headers"
+          :list="tables"
+          :selectionKey="partnerId"
+          :stripe="false"
+          @onClick="handleTableClick"
+          @onSelect="handleSelect"
+          is-border
+        >
+        </xd-table>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+
+<script>
+import XdSearch from "@/components/XdSearch"
+import XdPagination from "@/components/XdPagination.vue"
+import XdTable from "@/components/XdTable"
+import { Loading } from 'element-ui'
+import checkPermission from "@/utils/permission"
+import permissions from "@/constant/permissions"
+import { getOptions } from "@/utils/options"
+import {
+  mapActions,
+  mapState,
+} from 'vuex'
+
+
+export default {
+  name: "CacheList",
+  components: {
+    XdPagination, //翻译插件
+    XdSearch, //搜查插件
+    XdTable
+  },
+  data () {
+    return {
+
+      //分页参数
+      pageSize: 1, //当前页面数量
+      hasNextPage: true, //是否有下一页
+      limit: 20, //搜索参数
+      total: 0,
+      searchForm: [], //搜索区域模块表单
+      searchParams: null, //搜索参数
+
+      //列表对象
+      tables: [],
+      selectIds:[],
+      partnerId:'partner_id',
+      searchFormKey:'searchFormKey',
+    }
+  },
+  computed:{
+    isUpdate () {
+      return checkPermission([permissions.store_selection.updateCache])
+    },
+    headers(){
+      return [
+        { "type": "normal", "prop": "created_time", "align": "center", "label": "开始时间" },
+        { "type": "normal", "prop": "end_time", "align": "center", "label": "结束时间" },
+        { "type": "normal", "prop": "status_name", "align": "center", "width": 100, "label": "状态" },
+        {
+          "type": "operate", "align": "center", "width": 180, "label": "操作",
+          "values": [
+            this.isUpdate&&{ "ui": "text-button", "name": "更新","event":"update", "type": "text" },
+          ].filter(i=>i)
+        }
+      ]
+    }
+  },
+  created () {
+    this.getList()
+  },
+  methods: {
+    ...mapActions('store_selection', [
+      'updateCacheDetail',
+      'updateCache',
+    ]),
+    onJfbTagForReload(){
+      this.getList()
+    },
+    handleTableClick ({ row, value, index, rowIndex }) {
+      let loading = Loading.service({})
+      this.updateCache({}).then(res => {
+        this.$message.success('更新成功')
+        this.getList()
+        loading.close()
+      }).catch(e => loading.close())
+    },
+    handleSelect ({ select, ids }) {
+      this.selectIds = ids
+      console.log(select, ids,1111)
+    },
+    /**
+     * @description 获取数据列表
+     */
+    getList () {
+      let params = {
+        page_token: this.pageSize,
+        page_size: this.limit,
+      }
+      let loading = Loading.service({})
+      this.updateCacheDetail(params).then(res => {
+        let data = [res.data]
+        this.tables = data.map(item => {
+          item.created_time = window.getTimeFormat(item.created_time)
+          item.end_time = window.getTimeFormat(item.end_time)
+          return item
+        })
+        loading.close()
+      }).catch(err=>{
+        console.log(err,'err')
+        loading.close()
+      })
+    },
+    
+    /**
+     * @description 点击搜索进行搜索操作
+     * @param action 动作
+     * @param form 搜索请求参数
+     */
+    handleSearch ({ action, form }) {
+      this.pageSize = 1
+      this.hasNextPage = true
+      this.getList()
+    },
+    /**
+     * @description 翻页处理方法
+     * @param page {Number} 访问页面页码数
+     */
+    handlePagination (page) {
+      this.pageSize = page
+      this.getList()
+    }, //todo
+    /**一键更新**/
+    handleUpdate(){
+      if(this.selectIds.length==0){
+        this.$message.error('请选择要更新的数据')
+        return
+      }
+      let loading = Loading.service({})
+      this.partnerShopUpdate({partner_ids: this.selectIds}).then(res => {
+        this.$message.success('更新成功')
+        this.getList()
+        loading.close()
+      }).catch(e => loading.close())
+    },
+    handleRemoteSearch ({ query }, cb) {
+      return new Promise((resolve) => {
+        getOptions({
+          server: "partner-admin",
+          fn: "partner",
+          path: "p1",
+          params: {
+            keyword: query
+          }
+        }).then(res=>{
+          cb(res.data.list)
+        }).catch()
+      })
+    },
+  }
+}
+
+</script>
+
+<style scoped lang="scss">
+</style>
+

package/library/viewModules/viewStore/viewStore/components/StoreDetail.vue

@@ -30,9 +30,15 @@ export default {
     id: {
       type: Number,
     },
+    resource_shop_id: {
+      type: Number,
+    },
     type: {
       type: String,
     },
+    consume_mode: {
+      type: String,
+    },
   },
   data () {
     return {
@@ -45,7 +51,9 @@ export default {
     this.title = this.$route['meta']['title']
     let id = this.id
     let type = this.type
-    this.getDetail(id,type)
+    let resource_shop_id = this.resource_shop_id
+    let consume_mode = this.consume_mode
+    this.getDetail(id,resource_shop_id,type,consume_mode)
   },
   methods: {
     ...mapActions('store_selection', [
@@ -54,12 +62,12 @@ export default {
       'selectShopMarketGet'
     ]),
     
-    getDetail(id,type) {
+    getDetail(id,resource_shop_id,type,consume_mode) {
       console.log(type,'ttt')
       let loading = Loading.service({});
       //正式数据调用模版
       if(type==='select'){
-        this.selectShopGet({ shop_id: id }).then((info) => {
+        this.selectShopGet({ shop_id: id,resource_shop_id:resource_shop_id,consume_mode:consume_mode }).then((info) => {
           loading.close();
           this.tables = info.data['containers'];
           this.status = true;
@@ -67,7 +75,7 @@ export default {
            loading.close();
         });
       }else{
-        this.selectShopMarketGet({ shop_id: id }).then((info) => {
+        this.selectShopMarketGet({ shop_id: id,resource_shop_id:resource_shop_id,consume_mode:consume_mode }).then((info) => {
           loading.close();
           this.tables = info.data['containers'];
           this.status = true;

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

@@ -1,6 +1,19 @@
 <template>
   <div class="app-container">
-    <div class="app-container__title">门店集市</div>
+    <!-- #ifdef partner-mall -->
+     <el-tabs v-model="storeType" @tab-click="handleStoreTypeClick">
+      <el-tab-pane
+        v-for="item in storeTypeTabList"
+        :label="item.label"
+        :name="item.value"
+        :key="item.value"
+      ></el-tab-pane>
+    </el-tabs>
+    <!-- #endif -->
+    <!-- #ifdef partner-movie -->
+    <el-tabs v-model="storeType" @tab-click="handleTopClick">
+      <el-tab-pane label="线下门店集市" name="SELL">
+    <!-- #endif -->
     <div class="main-tab" v-show="isMain">
       <el-tabs
         type="card"
@@ -81,6 +94,13 @@
         ></xd-pagination-jfb>
       </div>
     </el-card>
+     <!-- #ifdef partner-movie -->
+    </el-tab-pane>
+      <el-tab-pane label="在线选座门店集市" name="SEAT">
+        <mc-list v-if="storeType==='SEAT'"></mc-list>
+      </el-tab-pane>
+    </el-tabs>
+      <!-- #endif -->
     <el-drawer
       title=""
       size="70%"
@@ -94,7 +114,7 @@
       :show-close="true"
       :direction="direction"
     >
-       <store-detail :id="clickId" :key="detailKey" type="market"></store-detail>
+       <store-detail :id="clickId" :resource_shop_id="resourceShopId" :key="detailKey" :consume_mode="storeType" type="market"></store-detail>
        <el-button class="back_button" @click="drawer=false" type="primary" size="small">返回</el-button>
     </el-drawer>
   </div>
@@ -113,6 +133,9 @@ import permissions from "@/constant/permissions"
 import StoreDetail from "../components/StoreDetail"
 import { getOptions } from "@/utils/options"
 import XdPaginationJfb from "@/components/XdPaginationJfb";
+// #ifdef partner-movie
+import McList from "./mc_list"
+// #endif
 
 export default {
   name: "MarketList",
@@ -122,7 +145,10 @@ export default {
     XdTableStatus,
     XdTable,
     StoreDetail,
-    XdPaginationJfb
+    XdPaginationJfb,
+    // #ifdef partner-movie
+    McList
+    // #endif
   },
 
   // mixins: [downloadString, getChannelList],
@@ -143,6 +169,7 @@ export default {
       direction:'rtl',
       drawer:false,
       clickId:'',
+      resourceShopId:'',
       drawerKey:'drawerKey',
       searchOptions:{},
       cityData:[],
@@ -156,6 +183,12 @@ export default {
       page_size: 20,
       searchKey:'searchKey',
       tableKey:'tableKey',
+      activeName:'offline_market',
+      storeType:'SELL',
+      storeTypeTabList:[
+        {label:'线下门店集市',value:'SELL'},
+        {label:'旅游门店集市',value:'TRAVEL'},
+      ]
     }
   },
   watch:{
@@ -176,11 +209,13 @@ export default {
     },
     headers(){
       return [
-        { "type": "normal", "prop": "resource_shop_id","width": 120, "align": "center", "label": "聚合后门店ID" },
-        { "type": "normal", "prop": "resource_shop_name", "align": "center", "label": "聚合后门店名称" },
+        { "type": "normal", "prop": "resource_shop_id","width": 120, "align": "center", "label": "关联后门店ID" },
+        { "type": "normal", "prop": "resource_shop_name", "align": "center", "label": "关联后门店名称" },
         { "type": "normal", "prop": "shop_id", "align": "center", "label": "门店ID" },
         { "type": "normal", "prop": "shop_name", "align": "center", "label": "门店名称" },
+        // #ifndef partner-movie
         { "type": "image", "prop": "shop_icon", "align": "center", "width": 100, "height": 100, "label": "门店logo" },
+        // #endif
         { "type": "normal", "prop": "brand_type_name", "align": "center", "label": "门店类型" },
         { "type": "normal", "prop": "business_status_name", "align": "center", "label": "营业状态" },
         { "type": "normal", "prop": "brand_name", "align": "center", "label": "门店品牌" },
@@ -221,7 +256,8 @@ export default {
       fn: "select-shop-channel",
       path: "p3",
       params:{
-        type:'market'
+        type:'market',
+        consume_mode:this.storeType
       }
     }).then((res) => {
       this.channelTabList = res.data.channel_data
@@ -255,7 +291,7 @@ export default {
       this.getList('list')
     },
     getSearchOptions(){
-      this.selectShopMarketChannelFilters({channel_code:this.channelActive,})
+      this.selectShopMarketChannelFilters({channel_code:this.channelActive,type:'market',consume_mode:this.storeType})
       .then(res=>{
         this.searchOptions = res.data;
         this.initSearchForm(res.data)
@@ -293,6 +329,7 @@ export default {
       let params = {
         filters:this.getParams(),
         tab:this.channelActive,
+        consume_mode:this.storeType,
         page_token: this.currentPage,
         page_size: this.limit
       } 
@@ -335,6 +372,13 @@ export default {
           value: '', 
           placeholder: '请输入门店ID'
         },
+        this.checkEnabled(options,'resource_shop_id')&&{
+          label: '关联后门店ID:',
+          ele: 'el-input',
+          valueKey: 'resource_shop_id',
+          value: '', 
+          placeholder: '请输入关联后门店ID'
+        },
         this.checkEnabled(options,'shop_name')&&{
           label: '门店名称:',
           ele: 'el-input',
@@ -367,7 +411,12 @@ export default {
               params: {
                 page_token: '1',
                 page_size: '500',
+                // #ifdef partner-movie
+                brand_type: 'MC',
+                // #endif
+                // #ifdef partner-mall
                 brand_type: 'MA',
+                // #endif
                 keyword: query
               }
             })
@@ -481,7 +530,7 @@ export default {
     handleClick ({ row, value, index }) {
       console.log('handleClick', row, value, index)
       if (value.event === "choose") {
-        this.selectShopMarketSelect({shop_id:row.shop_id,resource_shop_id:row.resource_shop_id,channel_code:row.channel_code})
+        this.selectShopMarketSelect({shop_id:row.shop_id,resource_shop_id:row.resource_shop_id,channel_code:row.channel_code,consume_mode:this.storeType})
           .then(res=>{
             this.$message.success('操作成功')
             this.getList('list')
@@ -491,6 +540,7 @@ export default {
           })
       }else if (value.event === "preview") {
         this.clickId = row.shop_id;
+        this.resourceShopId = row.resource_shop_id;
         this.drawer = true;
         this.detailKey = Date.now()
       }
@@ -517,6 +567,14 @@ export default {
         return true
       }
     },
+    handleTopClick(){
+      this.channelActive = this.channelTabList[0]['value']
+      this.getList('list')
+    },
+    handleStoreTypeClick(){
+      this.channelActive = this.channelTabList[0]['value']
+      this.getList('list')
+    },
   }
 }
 </script>