jufubao-admin-library 1.1.64 → 1.1.66

package/library/pageComponents/modules/JfbRuleCreate.vue

@@ -76,6 +76,7 @@
             <i v-if="(index + 1) === handTimeOptions.length" class="el-icon-circle-plus ml5" @click="add(item)" ></i>
             <i v-if="handTimeOptions.length > 1" class="el-icon-remove ml5" @click="remove(index)"></i>
           </div>
+          <div style="color: red;font-size: 12px;line-height: 18px;">设置后将按每周周几对应时间点调价，例如每周星期五17点~22点调价</div>
         </el-form-item>
       </template>
 			</xd-base-dynamic-field>

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

@@ -127,11 +127,19 @@ export default {
     },
 
     setMovieForm (data) {
-
-      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.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
+        }
+      } 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.valid_weeks) data.valid_weeks = this.getParseJSON(data.valid_weeks)
 
@@ -635,6 +643,7 @@ export default {
             { "label": "按院线", "value": 'LINE' },
             { "label": "按号段", "value": 'CARD' },
             { "label": "按影院", "value": 'CINE' },
+            { "label": "按号段加城市", "value": 'CARD_CITY' },
             this.JfbParent.isShowTypeMove && { "label": "按影片", "value": 'FILM' },
           ].filter(i=>i)
         },
@@ -693,6 +702,34 @@ export default {
             { required: false, message: '请选择院线', trigger: 'change' },
           ]
         },
+        params.adjust_type === 'CARD_CITY' && {
+          label: '按城市:',
+          placeholder: '请选择城市',
+          ele: 'xd-select-list',
+          valueKey: 'city',
+          value: params['city'] || [],
+          multiple: true,
+          collapseTags: false,
+          className: 'input50',
+          list: this.cityList,
+          rules: [
+            { required: true, message: '请选择城市', trigger: 'change' },
+          ]
+        },
+        params.adjust_type === 'CARD_CITY' && {
+          label: '号段:',
+          tips: '注意:开始和结束卡号段必须填写，并且开始卡号必须小于结束开号.',
+          ele: 'xd-range-group',
+          keys: ['start_number', 'end_number'],
+          value: params['card'] || [],
+          defaultValue: params['card'] || [],
+          valueKey: 'card',
+          className: 'input50',
+          placeholder: ['开始卡号', '结束卡号'],
+          rules: [
+            { required: true, message: '请输入号段', trigger: ['blur', 'change'] }
+          ]
+        },
         params.adjust_type === 'CITY' && {
           label: '按城市:',
           placeholder: '请选择城市',
@@ -999,6 +1036,15 @@ export default {
       let data = this.$xdHelper.cloneDeep(this.listValue)
       let adjust_type_key = `${data.adjust_type}_valid_data`
 
+      if(data.adjust_type==='CARD_CITY') {
+        data['valid_data'] = {
+          city:data['city'],
+          card:data['card']
+        }
+        delete data['city']
+        delete data['card']
+      }
+
       if (data[adjust_type_key]) {
         data['valid_data'] = data[adjust_type_key]
         delete data[adjust_type_key]

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

@@ -0,0 +1,96 @@
+'use strict'
+
+import Layout from '@/layout'
+import roles from '@/constant/permissions' //引用权限值
+const store_selection = roles.store_selection
+
+const storeRouter = {
+  path: '/store',
+  sort: 99,
+  component: Layout,
+  name: '门店管理',
+  meta: {
+    title: '门店管理',
+    icon: 'xdicon_shop',
+    roles: [
+      store_selection.selectShopRuleList, store_selection.selectShopMarketList, store_selection.selectShopTaskList, store_selection.selectShopList, 
+    ],
+  },
+  children: [
+    {
+      path: 'selectd-list',
+      name: 'SelectdList',
+      component: () => import('@/viewStore/selected/list'),
+      meta: {
+        title: '已选门店',
+        icon: 'xdicon_shop',
+        roles:[store_selection.selectShopList]
+      }
+    },
+    {
+      path: 'market-list',
+      name: 'MarketList',
+      component: () => import('@/viewStore/market/list'),
+      meta: {
+        title: '门店集市',
+        icon: 'el-icon-sell',
+        roles:[store_selection.selectShopMarketList]
+      }
+    },
+    {
+      path: 'rule-list',
+      name: 'StoreRuleList',
+      component: () => import('@/viewStore/rule/list'),
+      meta: {
+        title: '选店规则管理',
+        icon: 'xdicon_rizhiguanli',
+        roles:[store_selection.selectShopRuleList]
+      }
+    },
+    {
+      path: 'store_rule_create',
+      name: 'StoreRuleCreate',
+      hidden:true,
+      component: () => import('@/viewStore/rule/create'),
+      meta: {
+        title: '创建选店规则',
+        activeMenu: '/store/rule-list',
+        roles:[store_selection.selectShopRuleAdd]
+      }
+    },
+    {
+      path: 'store_rule_edit/:id',
+      name: 'StoreRuleEdit',
+      hidden:true,
+      component: () => import('@/viewStore/rule/create'),
+      meta: {
+        title: '编辑选店规则',
+        activeMenu: '/store/rule-list',
+        roles:[store_selection.selectShopRuleUpdate]
+      }
+    },
+    {
+      path: 'store_rule_log/:id',
+      name: 'StoreRuleLog',
+      hidden:true,
+      component: () => import('@/viewStore/rule/log'),
+      meta: {
+        title: '修改记录',
+        activeMenu: '/store/rule-list',
+        roles:[store_selection.selectShopRuleEditlog]
+      }
+    },
+    {
+      path: 'tasks',
+      name: 'TasksList',
+      component: () => import('@/viewStore/task/list'),
+      meta: {
+        title: '选店任务管理',
+        icon: 'xdicon_rizhi',
+        roles:[store_selection.selectShopTaskList]
+      }
+    },
+  ]
+}
+
+export default storeRouter

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

@@ -0,0 +1,378 @@
+'use strict'
+
+module.exports = {
+  name: 'store_selection',
+  title: '门店选品',
+  vuex: true,
+  model: [
+    {
+      title: "选店规则列表",
+      mapFn: "selectShopRuleList",
+      path: "/supplier-partner/v1/:xsiteid/:xnamespace/select-shop-rule/list",
+      isRule: false,
+      data: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+        page_token: ['第几页', 'String', '选填'],
+        page_size: ['每页展示条数', 'Number', '选填'],
+      },
+      disabled: true,
+      role: '@@@@.@@@.SELECT_SHOP_RULE_LIST',
+    },
+    {
+      title: "选店规则详情",
+      mapFn: "selectShopRuleGet",
+      path: "/supplier-partner/v1/:xsiteid/:xnamespace/select-shop-rule/get",
+      isRule: false,
+      params: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+        rule_id: ['rule_id', 'String', '选填'],
+      },
+      disabled: true,
+    },
+    {
+      title: "创建选店规则",
+      mapFn: "selectShopRuleAdd",
+      path: "/supplier-partner/v1/:xsiteid/:xnamespace/select-shop-rule/add",
+      isRule: false,
+      data: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+        rule_name: ['规则名', 'String', '选填'],
+        rule_desc: ['规则描述', 'String', '选填'],
+        city_codes: ['城市集合', 'String', '选填'],
+        discount_type: ['折扣类型', 'String', '选填'],
+        start_discount: ['折扣范围开始', 'String', '选填'],
+        end_discount: ['折扣范围结束', 'String', '选填'],
+        consume_mode: ['门店服务类型', 'String', '选填'],
+        category_ids: ['公共分类ids集合', 'String', '选填'],
+        brand_type: ['品牌类型', 'String', '选填'],
+        brand_selected_method: ['品牌选择方式POS正选，INV反选', 'String', '选填'],
+        brand_ids: ['品牌ids 集合', 'String', '选填'],
+        supplier_ids: ['供应商ids集合', 'String', '选填'],
+        rule_channel_code: ['规则渠道code', 'String', '选填'],
+        sort: ['权重', 'String', '选填'],
+        status: ['状态', 'String', '选填'],
+      },
+      disabled: true,
+      role: '@@@@.@@@.SELECT_SHOP_RULE_ADD',
+    },
+    {
+      title: "编辑选店规则",
+      mapFn: "selectShopRuleUpdate",
+      path: "/supplier-partner/v1/:xsiteid/:xnamespace/select-shop-rule/update",
+      isRule: false,
+      data: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+        rule_id: ['rule_id', 'Number', '选填'],
+        rule_name: ['规则名', 'String', '选填'],
+        rule_desc: ['规则描述', 'String', '选填'],
+        city_codes: ['城市集合', 'String', '选填'],
+        discount_type: ['折扣类型', 'String', '选填'],
+        start_discount: ['折扣范围开始', 'String', '选填'],
+        end_discount: ['折扣范围结束', 'String', '选填'],
+        consume_mode: ['门店服务类型', 'String', '选填'],
+        category_ids: ['公共分类ids集合', 'String', '选填'],
+        brand_type: ['品牌类型', 'String', '选填'],
+        brand_selected_method: ['品牌选择方式POS正选，INV反选', 'String', '选填'],
+        brand_ids: ['品牌ids 集合', 'String', '选填'],
+        supplier_ids: ['供应商ids集合', 'String', '选填'],
+        rule_channel_code: ['规则渠道code', 'String', '选填'],
+        sort: ['权重', 'String', '选填'],
+        status: ['状态', 'String', '选填'],
+      },
+      disabled: true,
+      role: '@@@@.@@@.SELECT_SHOP_RULE_UPDATE',
+    },
+    {
+      title: "选店规则条件",
+      mapFn: "selectShopRuleChannelRule",
+      path: "/supplier-partner/v1/:xsiteid/:xnamespace/select-shop-rule/channel-rule",
+      isRule: false,
+      params: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+        channel_code: ['渠道code', 'String', '选填'],
+        brand_type: ['门店类型', 'String', '必填'],
+      },
+      disabled: true,
+    },
+    {
+      title: "执行选品任务",
+      mapFn: "selectShopRuleExecTask",
+      path: "/supplier-partner/v1/:xsiteid/:xnamespace/select-shop-rule/exec-task",
+      isRule: false,
+      data: {
+      },
+      disabled: true,
+      role: '@@@@.@@@.SELECT_SHOP_RULE_EXEC_TASK',
+    },
+    {
+      title: "选店规则记录列表",
+      mapFn: "selectShopRuleEditlog",
+      path: "/supplier-partner/v1/:xsiteid/:xnamespace/select-shop-rule/editlog",
+      isRule: false,
+      params: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+        rule_id: ['rule_id', 'String', '选填'],
+        page_token: ['第几页', 'String', '选填'],
+        page_size: ['每页展示条数', 'Number', '选填'],
+      },
+      disabled: true,
+      role: '@@@@.@@@.SELECT_SHOP_RULE_EDIT_LOG',
+    },
+    {
+      title: "删除选店规则",
+      mapFn: "selectShopRuleDelete",
+      path: "/supplier-partner/v1/:xsiteid/:xnamespace/select-shop-rule/delete",
+      isRule: false,
+      data: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+        rule_id: ['rule_id', 'String', '选填'],
+      },
+      disabled: true,
+      method:'delete',
+      role: '@@@@.@@@.SELECT_SHOP_RULE_DELETE',
+    },
+
+    {
+      title: "门店集市列表",
+      mapFn: "selectShopMarketList",
+      path: "/supplier-partner/v1/:xsiteid/:xnamespace/select-shop-market/list",
+      isRule: false,
+      data: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+        fitler: ['fitler', 'String', '选填'],
+        page_token: ['第几页', 'String', '选填'],
+        page_size: ['每页展示条数', 'Number', '选填'],
+      },
+      disabled: true,
+      role: '@@@@.@@@.SELECT_SHOP_MARKET_LIST',
+    },
+    {
+      title: "门店集市选用",
+      mapFn: "selectShopMarketSelect",
+      path: "/supplier-partner/v1/:xsiteid/:xnamespace/select-shop-market/select",
+      isRule: false,
+      params: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+        shop_id: ['shop_id', 'String', '选填'],
+        resource_shop_id: ['resource_shop_id', 'String', '选填'],
+      },
+      disabled: true,
+      role: '@@@@.@@@.SELECT_SHOP_MARKET_SELECT',
+    },
+    {
+      title: "门店集市聚合渠道过滤器",
+      mapFn: "selectShopMarketChannelFilters",
+      path: "/supplier-partner/v1/:xsiteid/:xnamespace/select-shop-market/channel-filters",
+      isRule: false,
+      params: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+        channel_code: ['channel_code', 'String', '选填'],
+      },
+      disabled: true,
+    },
+    {
+      title: "选店任务列表",
+      mapFn: "selectShopTaskList",
+      path: '/supplier-partner/v1/:xsiteid/:xnamespace/select-shop-task/list',
+      isRule: false,
+      data: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+        page_token: ['第几页', 'String', '选填'],
+        page_size: ['每页展示条数', 'Number', '选填'],
+      },
+      disabled: true,
+      role: '@@@@.@@@.SELECT_SHOP_TASK_LIST',
+    },
+    {
+      title: "选店任务详情",
+      mapFn: "selectShopTaskGet",
+      path: '/supplier-partner/v1/:xsiteid/:xnamespace/select-shop-task/get',
+      isRule: false,
+      params: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+        task_id: ['task_id', 'String', '选填'],
+      },
+      disabled: true,
+      role: '@@@@.@@@.SELECT_SHOP_TASK_GET',
+    },
+    {
+      title: "选店任务停止",
+      mapFn: "selectShopTaskStop",
+      path: '/supplier-partner/v1/:xsiteid/:xnamespace/select-shop-task/stop',
+      isRule: false,
+      params: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+        task_id: ['task_id', 'String', '选填'],
+      },
+      disabled: true,
+      role: '@@@@.@@@.SELECT_SHOP_TASK_STOP',
+    },
+    {
+      title: "已选门店列表",
+      mapFn: "selectShopList",
+      path: '/supplier-partner/v1/:xsiteid/:xnamespace/select-shop/list',
+      isRule: false,
+      data: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+        page_token: ['第几页', 'String', '选填'],
+        page_size: ['每页展示条数', 'Number', '选填'],
+        filters:['filters', 'Array', '选填']
+      },
+      disabled: true,
+      role: '@@@@.@@@.SELECT_SHOP_LIST',
+    },
+    {
+      title: "已选门店列表导出",
+      mapFn: "selectShopListExport",
+      path: '/supplier-partner/v1/:xsiteid/:xnamespace/select-shop/list',
+      isRule: false,
+      data: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+        page_token: ['第几页', 'String', '选填'],
+        page_size: ['每页展示条数', 'Number', '选填'],
+        filters:['filters', 'Array', '选填']
+      },
+      disabled: true,
+      role: '@@@@.@@@.SELECT_SHOP_LIST_EXPORT',
+    },
+    {
+      title: "已选门店上架",
+      mapFn: "selectShopUp",
+      path: '/supplier-partner/v1/:xsiteid/:xnamespace/select-shop/up',
+      isRule: false,
+      params: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+        shop_id: ['shop_id', 'String', '选填'],
+        resource_shop_id: ['resource_shop_id', 'String', '选填'],
+      },
+      disabled: true,
+      role: '@@@@.@@@.SELECT_SHOP_UP',
+    },
+    {
+      title: "已选门店下架",
+      mapFn: "selectShopDown",
+      path: '/supplier-partner/v1/:xsiteid/:xnamespace/select-shop/down',
+      isRule: false,
+      params: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+        shop_id: ['shop_id', 'String', '选填'],
+        resource_shop_id: ['resource_shop_id', 'String', '选填'],
+      },
+      disabled: true,
+      role: '@@@@.@@@.SELECT_SHOP_DOWN',
+    },
+    {
+      title: "已选门店移除",
+      mapFn: "selectShopDelete",
+      path: '/supplier-partner/v1/:xsiteid/:xnamespace/select-shop/delete',
+      isRule: false,
+      data: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+        shop_id: ['shop_id', 'String', '选填'],
+        resource_shop_id: ['resource_shop_id', 'String', '选填'],
+      },
+      disabled: true,
+      method:'delete',
+      role: '@@@@.@@@.SELECT_SHOP_DELETE',
+    },
+    {
+      title: "已选门店选聚合渠道过滤器",
+      mapFn: "selectShopChannelFilters",
+      path: '/supplier-partner/v1/:xsiteid/:xnamespace/select-shop/channel-filters',
+      isRule: false,
+      params: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+        channel_code: ['channel_code', 'String', '选填'],
+      },
+      disabled: true,
+    },
+    {
+      mapFn: 'shopGet',
+      isRule: false,
+      title: '获取门店详情',
+      path: '/supplier-partner/v1/shop/get',
+      params: {
+        shop_id: ['shop_id', 'String', '必填', ''],
+      },
+      disabled: true,
+      role: '@@@@.@@@.SELECT_SHOP_GET',
+    },
+    {
+      mapFn: 'selectShopGet',
+      isRule: false,
+      title: '已选门店详情',
+      path: '/supplier-partner/v1/:xsiteid/:xnamespace/select-shop/get',
+      params: {
+        shop_id: ['shop_id', 'String', '必填', ''],
+      },
+      disabled: true,
+      role: '@@@@.@@@.SELECT_SHOP_GET',
+    },
+    {
+      mapFn: 'selectShopMarketGet',
+      isRule: false,
+      title: '门店集市详情',
+      path: '/supplier-partner/v1/:xsiteid/:xnamespace/select-shop-market/get',
+      params: {
+        shop_id: ['shop_id', 'String', '必填', ''],
+      },
+      disabled: true,
+      role: '@@@@.@@@.SELECT_SHOP_MARKET_GET',
+    },
+    {
+      mapFn: 'getSubCity',
+      isRule: false,
+      title: '三级联动',
+      path: '/common-public/v1/region/city/getsub',
+      params: {
+        parent_code: ['父级code', 'String', '必填', ''],
+      },
+      disabled: true,
+      role: 'getSubCity',
+    },
+    {
+      mapFn: 'shopCategoryList',
+      isRule: false,
+      title: '门店分类',
+      path: '/supplier-partner/v1/shop-category/list',
+      params: {
+        parent_id: ['parent_id', 'Number', '必填', ''],
+        page_token: ['页数', 'String|Number', '必填', 1],
+        page_size: ['每页条数', 'String|Number', '必填', 20],
+        status: ['status', 'String', '必填', 'Y'],
+      },
+      disabled: true,
+    },
+    {
+      mapFn: 'editlogDetail',
+      isRule: false,
+      title: '编辑选店规则记录详情',
+      path: '/supplier-partner/v1/:xsiteid/:xnamespace/select-shop-rule/editlog-detail',
+      params: {
+        id: ['id', 'Number', '必填', ''],
+      },
+      disabled: true,
+    },
+  ],
+}
+
+

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

@@ -0,0 +1,121 @@
+<template>
+  <div class="app-container">
+    <!-- <el-card class="app-container__content"> -->
+      <xd-detail v-if="status" :list="tables"></xd-detail>
+    <!-- </el-card> -->
+  </div>
+</template>
+
+<script>
+
+import XdDetail from "@/components/XdDetail";
+import XdTable from "@/components/XdTable.vue";
+import XdDialog from "@/components/XdDialog"
+import checkPermission from "@/utils/permission";
+import { Loading } from "element-ui";
+import {
+  mapActions,
+  mapState,
+} from 'vuex'
+
+export default {
+  name: "edit",
+  components: {
+    XdDetail,
+    XdTable,
+    XdDialog,
+  },
+  // mixins: [mixXdCascadeSelect],
+  props:{
+    id: {
+      type: Number,
+    },
+    type: {
+      type: String,
+    },
+  },
+  data () {
+    return {
+      status: false,
+      tables: [],
+    }
+  },
+
+  async created () {
+    this.title = this.$route['meta']['title']
+    let id = this.id
+    let type = this.type
+    this.getDetail(id,type)
+  },
+  methods: {
+    ...mapActions('store_selection', [
+      'shopGet',
+      'selectShopGet',
+      'selectShopMarketGet'
+    ]),
+    
+    getDetail(id,type) {
+      console.log(type,'ttt')
+      let loading = Loading.service({});
+      //正式数据调用模版
+      if(type==='select'){
+        this.selectShopGet({ shop_id: id }).then((info) => {
+          loading.close();
+          this.tables = info.data['containers'];
+          this.status = true;
+        }).catch(err=>{
+           loading.close();
+        });
+      }else{
+        this.selectShopMarketGet({ shop_id: id }).then((info) => {
+          loading.close();
+          this.tables = info.data['containers'];
+          this.status = true;
+        }).catch(err=>{
+           loading.close();
+        });
+      }
+      
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.app-container {
+  &__title {
+    font-size: 16px;
+    line-height: 24px;
+    padding: 0 0 20px;
+    font-weight: bold;
+  }
+
+  &__body {
+    & ::v-deep .el-tabs__content {
+      padding-top: 20px;
+    }
+  }
+}
+
+.adjust-btn {
+  margin-left: 115px;
+}
+
+@media screen and (max-width: 768px) {
+  .app-container {
+    &__title {
+      padding: 0 0 10px;
+    }
+
+    & ::v-deep .el-card__body {
+      padding: 10px;
+    }
+
+    &__body {
+      & ::v-deep .el-tabs__content {
+        padding-top: 10px;
+      }
+    }
+  }
+}
+</style>