jufubao-admin-library 1.1.170 → 1.1.172

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

@@ -112,6 +112,111 @@ const storeRouter = {
     //     roles:[store_selection.updateCacheDetail]
     //   }
     // },
+    // #ifdef partner-mall
+      {
+      path: 'product_rule_list',
+      name: 'StoreProductRuleList',
+      component: () => import('@/viewStore/product_rule/list'),
+      meta: {
+        title: '门店商品选品规则',
+        icon: 'xdicon_rizhiguanli',
+        roles:[store_selection.selectPolicesleQuery]
+      }
+    },
+    {
+      path: 'product_rule_create',
+      name: 'StoreProductRuleCreate',
+      hidden:true,
+      component: () => import('@/viewStore/product_rule/create'),
+      meta: {
+        title: '创建门店商品选品规则',
+        activeMenu: '/store/product_rule_list',
+        roles:[store_selection.addSelectPolices]
+      }
+    },
+    {
+      path: 'product_rule_edit/:id',
+      name: 'StoreProductRuleEdit',
+      hidden:true,
+      component: () => import('@/viewStore/product_rule/create'),
+      meta: {
+        title: '编辑选店规则',
+        activeMenu: '/store/product_rule_list',
+        roles:[store_selection.editSelectPolices,store_selection.getSelectEditLogDetail]
+      }
+    },
+    {
+      path: 'product_rule_log/:id',
+      name: 'StoreProductRuleLog',
+      hidden:true,
+      component: () => import('@/viewStore/product_rule/log'),
+      meta: {
+        title: '修改记录',
+        activeMenu: '/store/product_rule_list',
+        roles:[store_selection.selectPolicesEditLog]
+      }
+    },
+    {
+      path: 'travel',
+      name: 'travelPricesNumberList',
+      component: () => import('@/views/prices/travel/list'),
+      meta: {
+        title: '门店商品调价规则',
+        icon: 'xdicon_rizhiguanli',
+        roles: ['ROLE_MARKET_TRAVEL_RULE_LIST','ROLE_MARKET_TRAVEL_RULE_MA_LIST']
+      }
+    },
+    {
+      path: 'travel_create',
+      name: 'travelPricesNumberCreate',
+      component: () => import('@/views/prices/travel/create'),
+      hidden: true,
+      meta: {
+        title: '创建调价规则',
+        activeMenu: '/store/travel'
+      }
+    },
+    {
+      path: 'travel_edit/:id',
+      name: 'travelPricesNumberEdit',
+      hidden: true,
+      component: () => import('@/views/prices/travel/edit'),
+      meta: {
+        title: '编辑调价规则',
+        activeMenu: '/store/travel'
+      }
+    },
+    {
+      path: 'mall_create',
+      name: 'ProductPricesMallCreate',
+      component: () => import('@/views/prices/travel/mall_create'),
+      hidden: true,
+      meta: {
+        title: '创建调价规则',
+        activeMenu: '/store/travel'
+      }
+    },
+    {
+      path: 'mall_edit/:id',
+      name: 'ProductPricesMallCreate',
+      hidden: true,
+      component: () => import('@/views/prices/travel/mall_create'),
+      meta: {
+        title: '编辑调价规则',
+        activeMenu: '/store/travel'
+      }
+    },
+    {
+      path: 'log/:id',
+      name: 'StoreRuleLog',
+      hidden: true,
+      component: () => import('@/views/prices/travel/log'),
+      meta: {
+        title: '操作记录',
+        activeMenu: '/store/travel'
+      }
+    },
+    // #endif
   ]
 }
 

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

@@ -472,6 +472,104 @@ module.exports = {
       disabled: true,
       role: '@@@@.@@@.SELECT_SHOP_TASK_LIST_UPDATE',
     },
+    {
+      title: "加盟商后台 商品选品规则列表",
+      mapFn: "selectPolicesleQuery",
+      isPublic: true,
+      path: '/hourdash-partner/v1/:xsiteid/:xnamespace/select-polices/query',
+      isRule: false,
+      data: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+      },
+      disabled: true,
+      role: 'ROLE_MARKET_STORE_PRODUCT_RULE_LIST',
+    },
+    {
+      title: "加盟商后台 商品选品规则详情",
+      mapFn: "getSelectPolices",
+      isPublic: true,
+      path: '/hourdash-partner/v1/:xsiteid/:xnamespace/select-polices/:id',
+      isRule: false,
+      params: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+      },
+      disabled: true,
+      role: '',
+    },
+    {
+      title: "加盟商后台 商品选品规则删除",
+      mapFn: "deleteSelectPolices",
+      isPublic: true,
+      path: '/hourdash-partner/v1/:xsiteid/:xnamespace/select-polices/:id',
+      isRule: false,
+      data: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+      },
+      method:'delete',
+      disabled: true,
+      role: 'ROLE_MARKET_STORE_PRODUCT_RULE_DELETE',
+    },
+    {
+      title: "加盟商后台 商品选品规则增加",
+      mapFn: "addSelectPolices",
+      isPublic: true,
+      path: '/hourdash-partner/v1/:xsiteid/:xnamespace/select-polices',
+      isRule: false,
+      data: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+        item: ['item', 'Object', '必填'],
+      },
+      disabled: true,
+      role: 'ROLE_MARKET_STORE_PRODUCT_RULE_ADD',
+    },
+    {
+      title: "加盟商后台 商品选品规则编辑",
+      mapFn: "editSelectPolices",
+      isPublic: true,
+      path: '/hourdash-partner/v1/:xsiteid/:xnamespace/select-polices/:id',
+      isRule: false,
+      data: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+        id: ['id', 'Number', '必填'],
+        item: ['item', 'Object', '必填'],
+      },
+      disabled: true,
+      method:'put',
+      role: 'ROLE_MARKET_STORE_PRODUCT_RULE_EDIT',
+    },
+    {
+      title: "加盟商后台 商品选品规则修改记录列表",
+      mapFn: "selectPolicesEditLog",
+      isPublic: true,
+      path: '/hourdash-partner/v1/:xsiteid/:xnamespace/select-polices-edit-log/:id',
+      isRule: false,
+      params: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+        id: ['id', 'String', '必填'],
+      },
+      disabled: true,
+      role: 'ROLE_MARKET_STORE_PRODUCT_RULE_LOG',
+    },
+    {
+      title: "加盟商后台 商品选品规则详情",
+      mapFn: "getSelectEditLogDetail",
+      isPublic: true,
+      path: '/hourdash-partner/v1/:xsiteid/:xnamespace/select-polices-get-edit/:logid',
+      isRule: false,
+      params: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+        logid: ['logid', 'String', '必填'],
+      },
+      disabled: true,
+      role: 'ROLE_MARKET_STORE_PRODUCT_RULE_LOG_DETAIL',
+    },
   ],
 }
 

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

@@ -200,8 +200,9 @@ export default {
       activeName:'offline_market',
       storeType:'SELL',
       storeTypeTabList:[
-        {label:'线下门店集市',value:'SELL'},
+        {label:'核销门店集市',value:'SELL'},
         {label:'旅游门店集市',value:'TRAVEL'},
+        {label:'小时达到店门店集市',value:'HDSELF'},
       ]
     }
   },

package/library/viewModules/viewStore/viewStore/product_rule/create.vue

@@ -0,0 +1,427 @@
+<template>
+  <div class="app-container">
+    <el-card class="app-container__list">
+      <xd-base-dynamic-field
+        v-if="formList!==null"
+        ref="form"
+        v-model="formParams"
+        label-width="150px"
+        :list="formList"
+        :key="renderFormKey"
+        size="medium"
+        @success="handleSuccess"
+        @onApiSuccessUrl="handleApiSuccessUrl"
+        @onGetParamsAndHeader="handleGetParamsAndHeader"
+      ></xd-base-dynamic-field>
+      <div style="padding-left: 150px" v-if="!isView&&!isLook">
+        <el-button @click="goBack" type="primary">返回</el-button>
+        <el-button @click="handleConfirm" type="primary">保存</el-button>
+      </div>
+      <div style="padding-left: 150px" v-else>
+        <el-button type="primary" @click="goLogBack">返回</el-button>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+
+<script>
+import XdBaseDynamicField from "@/components/XdBaseDynamicField"
+import { getOptions } from "@/utils/options"
+import { Loading } from 'element-ui'
+import checkPermission from "@/utils/permission"
+import {
+  mapActions,
+  mapState,
+} from 'vuex'
+
+export default {
+  name: "StoreProductRuleCreate",
+  components: {
+    XdBaseDynamicField,
+  },
+  watch: {
+    'formParams.brand_range':{
+      handler(n,o){
+        if(n&&n!==o){
+          this.initFormList(this.formParams)
+        }
+      }
+    }
+  },
+  computed: {
+    isView() {
+      return this.$route.query.isView;
+    },
+    isLook() {
+      return this.$route.query.isLook;
+    },
+  },
+  data () {
+    return {
+      formList: null,
+      formParams: {},
+      id: null,
+      renderFormKey: Date.now(),
+      customForm: {
+        company_id: '',
+        department_id: '',
+      },
+      customRules: {},
+      isMain:true,
+      brand_type:'',
+      consumeModesData:[],
+    }
+  },
+  async created () {
+    this.id = this.$route.params.id
+    this.isLook = this.$route.query.isLook
+    console.log(this.isLook,'ooooo')
+    await getOptions({
+      server: "hourdash-partner",
+      fn: "public",
+      path: "p1",
+    }).then((res) => {
+      this.consumeModesData = res.data.consume_modes;
+    })
+    if(!this.id){
+      this.initFormList({})
+    }else{
+      if(this.isView){
+        let params = {
+          logid: this.id
+        }
+        this.getSelectEditLogDetail(params).then(res => {
+          this.brand_type = res.data.brand_type;
+          if(res.data.start_discount&&res.data.end_discount){
+            res.data.discount = {
+              min:this.$xdHelper.divisionFloatNumber(res.data.start_discount, 100),
+              max:this.$xdHelper.divisionFloatNumber(res.data.end_discount, 100),
+            }
+          }
+          if(res.data.brand_range==='CU'){
+            if(res.data.brand_ids_name&&res.data.brand_ids_name.length){
+              res.data.brand_ids = res.data.brand_ids_name
+            }
+          }
+          this.initFormList(res.data)
+        }).catch(err => {
+          console.log(err, 'err')
+        })
+      }else{
+        let params = {
+          id: this.id
+        }
+        this.getSelectPolices(params).then(res => {
+          this.brand_type = res.data.brand_type;
+          if(res.data.start_discount&&res.data.end_discount){
+            res.data.discount = {
+              min:this.$xdHelper.divisionFloatNumber(res.data.start_discount, 100),
+              max:this.$xdHelper.divisionFloatNumber(res.data.end_discount, 100),
+            }
+          }
+          if(res.data.brand_range==='CU'){
+            if(res.data.brand_ids_name&&res.data.brand_ids_name.length){
+              res.data.brand_ids = res.data.brand_ids_name
+            }
+          }
+          this.initFormList(res.data)
+        }).catch(err => {
+          console.log(err, 'err')
+        })
+      }
+    }  
+  },
+
+  methods: {
+    ...mapActions('store_selection', [
+      'getSelectPolices',
+      'addSelectPolices',
+      'editSelectPolices',
+      'getSelectEditLogDetail',
+    ]),
+  
+    initFormList (params) {
+      let formList = [
+        {
+          label: '基础信息',
+          ele: 'title',
+          size: 'small',
+        },
+        {
+          label: '名称:',
+          ele: 'el-input',
+          type: 'text',
+          valueKey: 'rule_name',
+          value: params.rule_name || '',
+          placeholder: '请输入名称',
+          className: 'input40',
+          rules: [
+            { required: true, message: '请输入名称', trigger: 'blur' },
+            {
+              validator: (rule, value, callback) => {
+                console.log(value.length)
+                value = value.trim()
+                if (value.length < 2) {
+                  callback('输入名称字符串数量大于等于2')
+                } else callback()
+              },
+              trigger: 'blur'
+            }
+          ]
+        },
+        {
+          label: '描述:',
+          ele: 'el-input',
+          type: 'textarea',
+          valueKey: 'rule_desc',
+          value: params.rule_desc || '',
+          placeholder: '请输入描述',
+          className: 'input40',
+          rules: [
+            { required: true, message: '请输入描述', trigger: 'blur' },
+            {
+              validator: (rule, value, callback) => {
+                value = value.trim()
+                if (value.length < 2) {
+                  callback('请输入描述字符串数量大于等于2')
+                } else callback()
+              },
+              trigger: 'blur'
+            }
+          ]
+        },
+        {
+          label: '启用:',
+          ele: 'xd-radio',
+          valueKey: 'status',
+          value: params.status||'Y',
+          list: [
+            { "label": "启用", "value": 'Y' },
+            { "label": "关闭", "value": 'N' }
+          ],
+          inline: false,
+          rules: [
+            { required: true, message: '请选择是否启用规则', trigger: 'change' },
+          ],
+        },
+        {
+          label: '权重设置:',
+          ele: 'el-input',
+          type: 'number',
+          valueKey: 'sort',
+          value: params.sort !== undefined ? params.sort : '',
+          placeholder: '请输入权重值',
+          className: 'input20',
+          rules: [{ required: true, message: '请输入权重值', trigger: 'blur' }],
+          notice: '按倒叙排列,数值越大越靠前',
+          inline: true
+        },
+        {
+          label: ' 选品规则条件',
+          ele: 'title',
+          size: 'small',
+        },
+        {
+          label: '按门店类型:',
+          ele: 'xd-radio',
+          valueKey: 'brand_type',
+          value:'MA',
+          list:[{value:'MA',label:'商城'}],
+          rules: [
+            { required: true, message: '请选择', trigger: 'change' },
+          ],
+        },
+        {
+          label: "门店品牌",
+          ele: "xd-radio",
+          valueKey: "brand_range",
+          value: params.brand_range || 'AL',
+          list: [
+            {
+              label: '全部品牌',
+              value: 'AL'
+            }, {
+              label: '指定品牌',
+              value: 'CU'
+            }
+          ],
+          rules: [
+            { required: true, message: '请选择门店品牌', trigger: 'change' },
+          ],
+        },
+        params.brand_range === 'CU'&&{
+          label: "",
+          ele: 'xd-remote-select',
+          value: params.brand_ids || [],
+          valueKey: "brand_ids",
+          multiple: true,
+          className: "input40",
+          remoteSearch: this.handleRemoteBrandSearch,
+          rules: [
+            { required: true, message: '请选择', trigger: 'change' },
+          ],
+        },
+        {
+          label: '门店服务类型:',
+          ele: 'xd-radio',
+          valueKey: 'consume_mode',
+          value: params.consume_mode || '',
+          list: this.consumeModesData,
+          rules: [
+            { required: true, message: '请选择门店服务', trigger: 'change' },
+          ],
+        },
+        {
+          label: '按商品折扣:',
+          ele: 'xd-input-range',
+          valueKey: 'discount',
+          className: "input20",
+          value: {
+            min: params.discount && params.discount.min,
+            max: params.discount && params.discount.max,
+          },
+          disabled: false,
+          setting: {
+            isRequire:false,
+            unit: '%',
+            selectWidth: '220px',
+            selectMultiple: false,
+          },
+          maps: {
+            start: 'min',
+            end: 'max',
+            select: 'type'
+          },
+          placeholder: {
+            SPlaceholder: '最低折扣值',
+            EPlaceholder: '最高折扣值',
+          },
+          inline:false,
+          notice:'将按进货价/市场价的折扣选取门店商品',
+        },
+      ].filter(i=>i)
+      console.log(formList, params, 'params', this.id)
+      this.formList = formList.filter(i => i)
+      this.renderFormKey = Date.now()
+    },
+  
+    handleConfirm () {
+      this.$refs.form.submit().then(res => {
+        let formParamsCopy = this.$xdHelper.cloneDeep(this.formParams)
+        
+        if(this.formParams['brand_ids']&&this.formParams['brand_ids'].length){
+          let data = []
+          this.formParams['brand_ids'].map(item=>{
+            data.push(item.value)
+          })
+          formParamsCopy.brand_ids = data
+        }
+        if(this.formParams['discount']){
+          if (this.formParams['discount']['min']||this.formParams['discount']['max']){
+            if((this.formParams['discount']['min']&&this.formParams['discount']['min']!=='')&&(!this.formParams['discount']['max']||this.formParams['discount']['max']==='')
+            ||(this.formParams['discount']['max']||this.formParams['discount']['max']!=='')&&(!this.formParams['discount']['min']||this.formParams['discount']['min']==='')
+            ){
+              this.$message.error('请输入完整的开始和结束折扣')
+              return
+            }
+            formParamsCopy.start_discount = this.formParams['discount']['min']*100
+            formParamsCopy.end_discount = this.formParams['discount']['max']*100
+          }
+        }
+        console.log(formParamsCopy,'formParamsCopy')
+        // return
+        if(this.id){
+          let params = {
+            id:this.id,
+            item:{
+              ...formParamsCopy
+            }
+          }
+          this.editSelectPolices(params).then(res => {
+          this.$message({
+            type: "success",
+            message: "编辑成功"
+          })
+          this.$bus.$emit('delTags', this.$route, {}, "StoreProductRuleList")
+          }).catch(err => {
+            console.log(err, 'err')
+          })
+        }else{
+          let params = {
+            item:{
+              ...formParamsCopy
+            }
+          }
+          this.addSelectPolices(params).then(res => {
+          this.$message({
+            type: "success",
+            message: "新增成功"
+          })
+          this.$bus.$emit('delTags', this.$route, {}, "StoreProductRuleList")
+          }).catch(err => {
+            console.log(err, 'err')
+          })
+        }
+      })
+    },
+    goBack () {
+      this.$bus.$emit('delTags', this.$route, {}, "StoreRuleList")
+    },
+
+    goLogBack(){
+      this.$bus.$emit('delTags', this.$route, {}, "StoreRuleLog")
+    },
+    /**
+     * @description 远程搜索品牌
+     * xd-remote-select
+     */
+    async handleRemoteBrandSearch (query, resolve) {
+      let res = await getOptions(
+        {
+          server: "supplier-partner",
+          fn: "brand",
+          path: "p1",
+          params: {
+            keyword: query,
+            brand_type:this.formParams.brand_type
+          }
+        }
+      )
+      resolve(res.data.list)
+    },
+  
+    handleTabClick(){
+      this.getRuleOptions()
+    },
+  }
+}
+
+</script>
+
+<style scoped lang="scss">
+.app-container {
+  &__link {
+    display: flex;
+
+    &-use {
+      display: flex;
+      flex-direction: column;
+      width: 150px;
+      padding: 20px;
+      background: #f7f7f7;
+      margin-right: 20px;
+
+      .el-button + .el-button {
+        margin-left: 0px;
+        margin-top: 30px;
+      }
+    }
+
+    &-tabs {
+      flex: 1;
+    }
+  }
+}
+</style>
+

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

@@ -0,0 +1,239 @@
+<template>
+  <div class="app-container">
+    <div class="app-container__title">选店规则管理</div>
+    <el-card class="app-container__list">
+      <div class="app-container__list-custom" style="text-align: right">
+        <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" @click="handleCreate()" v-if="isAdd">创建选品规则</el-button>
+      </div>
+      <div class="app-container__list-table">
+        <xd-table
+          :get-link="getLink"
+          :headers="headers"
+          :list="tables"
+          is-border
+          @onClick="handleClick"
+        >
+           <template slot="operate" slot-scope="scope">
+            <div
+              class="app-container__list-table-option"
+            >
+            <el-button v-if="isUpdate" @click="handleTableClick('edit',scope.row)" type="text">编辑</el-button>
+            <el-button v-if="isDelete" @click="handleTableClick('delete',scope.row)" type="text">删除</el-button>
+            <el-button v-if="isLog" @click="handleTableClick('log',scope.row)" type="text">修改记录</el-button>
+            </div>
+          </template>
+        </xd-table>
+      </div>
+      <div class="app-container__list-pagination">
+        <xd-pagination
+          :total="total"
+          :limit.sync="limit"
+          :page="pageSize"
+          :auto-scroll="false"
+          @onPagination="handlePagination"
+        ></xd-pagination>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import XdSearch from "@/components/XdSearch"
+import XdTableStatus from "@/components/XdTableStatus"
+import { baseJsDateToTime } from '@/utils/xd.base'
+import { mapActions } from 'vuex'
+import { Loading } from 'element-ui'
+import XdPagination from "@/components/XdPagination.vue"
+import XdTable from "@/components/XdTable"
+import checkPermission from "@/utils/permission"
+import permissions from "@/constant/permissions"
+
+export default {
+  name: "StoreProductRuleList",
+  components: {
+    XdPagination,
+    XdSearch,
+    XdTableStatus,
+    XdTable
+  },
+
+  data () {
+    return {
+      pageSize: 1,//当前页面数量
+      hasNextPage: true,
+      limit: 20,
+
+      searchForm: [], //搜索区域模块表单
+      searchParams: null, // 搜索参数
+      tables: [],
+      total: 0,
+    }
+  },
+  computed:{
+    isAdd () {
+      return checkPermission([permissions.store_selection.addSelectPolices])
+    },
+    isUpdate () {
+      return checkPermission([permissions.store_selection.editSelectPolices])
+    },
+    isLog() {
+      return checkPermission([permissions.store_selection.selectPolicesEditLog])
+    },
+    isDelete () {
+      return checkPermission([permissions.store_selection.deleteSelectPolices])
+    },
+    headers(){
+      return [
+        { "type": "normal", "prop": "id", "align": "center", "label": "ID" },
+        { "type": "normal", "prop": "rule_name", "align": "center", "label": "规则名称" },
+        { "type": "normal", "prop": "rule_desc", "align": "center", "label": "规则描述" },
+        { "type": "status", "prop": "status", "align": "center", "label": "启用状态",message:['已启用','禁用'] },
+        { "type": "normal", "prop": "created_time", "align": "center", "label": "创建时间" },
+        { "type": "normal", "prop": "updated_time", "align": "center", "label": "修改时间" },
+        {
+          "type": "operate",
+          prop:"operate",
+          "align": "center",
+          "width": 200,
+          "label": "操作",
+          "values": [
+            this.isDelete&&{ "ui": "text-button", "name": "删除", "type": "text" ,event:'delete'},
+            this.isUpdate&&{ "ui": "text-button", "name": "编辑", "type": "text" ,event:'edit'},
+            this.isLog&&{ "ui": "text-button", "name": "修改记录", "type": "text" ,event:'log'},
+           ].filter(i=>i)
+        }
+      ]
+    }
+  },
+  created () {
+    this.getList()
+  },
+
+  methods: {
+
+    ...mapActions('store_selection', [
+      'selectPolicesleQuery',
+      'selectShopRuleExecTask',
+      'deleteSelectPolices'
+    ]),
+
+    onJfbTagForReload () {
+      this.getList()
+    },
+
+    getList () {
+      const { searchParams } = this
+      let params = { ...searchParams, page_token: this.pageSize.toString(),page_size: this.limit}
+      let loading = Loading.service({})
+      this.selectPolicesleQuery(params)
+        .then(list => {
+          this.tables = list.data.list
+          this.tables.map(item => {
+            item.created_time = window.getTimeFormat(item.created_time)
+            item.updated_time = window.getTimeFormat(item.updated_time)
+          })
+          this.total = list.data.total_size
+          loading.close()
+        })
+        .catch(err => {
+          console.error(err)
+          loading.close()
+        })
+    },
+
+    parseTime (time) {
+      return baseJsDateToTime(time)
+    },
+    /**
+     * @description 翻页处理方法
+     * @param page {Number} 访问页面页码数
+     */
+    handlePagination (page) {
+      this.pageSize = page
+      this.getList()
+    },
+
+    /**编辑**/
+    getLink ({ row, value, index }) {
+      return ``
+    },
+
+    /**操作按钮**/
+    handleClick ({ row, value, index }) {
+      console.log('handleClick', row, value, index)
+      if (value.event === "delete") {
+        this.$confirm('是否删除？', '删除', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消'
+        }).then(() => {
+          this.deleteSelectPolices({id:row.id})
+            .then(res=>{
+              this.$message.success('删除成功')
+              this.getList()
+            })
+            .catch(err=>{
+              console.log(err,'err')
+            })
+          
+        })
+      }else if(value.event === "edit") {
+        this.$router.push(`/store/product_rule_edit/${row.id}`)
+      }else if(value.event==='log'){
+        this.$router.push(`/store/product_rule_log/${row.id}`)
+      }
+    },
+
+    handleTableClick(type,row){
+      if (type === "delete") {
+        this.$confirm('是否删除？', '删除', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消'
+        }).then(() => {
+          this.deleteSelectPolices({id:row.id})
+            .then(res=>{
+              this.$message.success('删除成功')
+              this.getList()
+            })
+            .catch(err=>{
+              console.log(err,'err')
+            })
+          
+        })
+      }else if(type === "edit") {
+        this.$router.push(`/store/product_rule_edit/${row.id}`)
+      }else if(type==='log'){
+        this.$router.push(`/store/product_rule_log/${row.id}`)
+      }else if(type === "look") {
+        this.$router.push({path:`/store/product_rule_edit/${row.id}`,query: {
+          isLook: true,
+        },})
+      }
+    },
+    //创建
+    handleCreate(){
+      this.$router.push('/store/product_rule_create')
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.app-container__title {
+  font-size: 16px;
+  line-height: 24px;
+  padding: 0 0 20px;
+  font-weight: bold;
+}
+
+@media screen and (max-width: 768px) {
+  .app-container__title {
+    padding: 0 0 10px;
+  }
+}
+.button_box{
+  display: flex;
+  &>div{
+    margin: 0 2px;
+  }
+}
+</style>

package/library/viewModules/viewStore/viewStore/product_rule/log.vue

@@ -0,0 +1,161 @@
+<template>
+  <div class="app-container">
+    <el-card class="app-container__list">
+      <div class="app-container__list-table">
+        <xd-table
+          @onClick="handleClick"
+          :headers="headers"
+          :list="tables"
+          is-border
+        ></xd-table>
+      </div>
+      <div class="app-container__list-pagination">
+        <xd-pagination
+          :total="total"
+          :limit.sync="limit"
+          :page="pageSize"
+          :auto-scroll="false"
+          @onPagination="handlePagination"
+        ></xd-pagination>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+
+<script>
+import XdPagination from "@/components/XdPagination.vue";
+import XdTable from "@/components/XdTable";
+import { Loading } from "element-ui";
+import { mapActions, mapState } from "vuex";
+import checkPermission from "@/utils/permission"
+import permissions from "@/constant/permissions"
+
+/**
+ * @description 用户管理 - 用户列表
+ * @author coder
+ * @module @/pages/users/list.vue
+ */
+export default {
+  name: "StoreProductRuleLog",
+  components: {
+    XdPagination, //翻译插件
+    XdTable,
+  },
+
+  data() {
+    return {
+      //分页参数
+      pageSize: 1, //当前页面数量
+      hasNextPage: true, //是否有下一页
+      limit: 20, //搜索参数
+      total: 0,
+      type: "",
+      //列表对象
+      tables: [],
+    };
+  },
+  computed: {
+    id() {
+      return this.$route.params.id;
+    },
+    isDetail () {
+      return checkPermission([permissions.store_selection.getSelectEditLogDetail])
+    },
+    headers(){
+      return [
+        {
+          type: "normal",
+          prop: "id",
+          align: "center",
+          label: "记录ID",
+        },
+        {
+          type: "normal",
+          prop: "updated_time",
+          align: "center",
+          label: "修改时间",
+        },
+        {
+          type: "normal",
+          prop: "op_user_name",
+          align: "center",
+          label: "修改用户",
+        },
+        {
+          type: "operate",
+          align: "center",
+          prop: "operate",
+          width: 200,
+          label: "操作",
+          values: [
+            this.isDetail&&{
+              ui: "text-button",
+              name: "查看",
+              type: "primary",
+              event: "view",
+            },
+          ].filter(i=>i),
+        },
+      ]
+    }
+  },
+  created() {
+    this.type = this.$route.query.type;
+    this.getList();
+  },
+
+  methods: {
+    ...mapActions('store_selection', [
+      'selectPolicesEditLog',
+    ]),
+    onJfbTagForReload () {
+      this.getList()
+    },
+    /**
+     * @description 获取数据列表
+     */
+    getList() {
+      //请求数据
+      let params = {
+        page_token: this.pageSize,
+        page_size: this.limit,
+        id: this.id,
+      };
+      let loading = Loading.service({});
+      this.selectPolicesEditLog(params)
+        .then((res) => {
+          const { list, total_size } = res.data;
+          console.log(list, "asawassasasa");
+          this.tables = list.map((item) => {
+            item.updated_time = window.getTimeFormat(item.updated_time)
+            return item;
+          });
+          this.total = total_size;
+          loading.close();
+        })
+        .catch((e) => loading.close());
+    },
+    handleClick({ row, value, index }) {
+        this.$router.push({
+        path: `/store/product_rule_edit/${row.id}`,
+        query: {
+          isView: true,
+        },
+      });
+    },
+    /**
+     * @description 翻页处理方法
+     * @param page {Number} 访问页面页码数
+     */
+    handlePagination(page) {
+      this.pageSize = page;
+      this.getList();
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+</style>
+

package/library/viewModules/viewStore/viewStore/rule/create.vue

@@ -199,7 +199,7 @@ export default {
     ]),
     getRuleOptions(detail){
       console.log(detail,'ddddd')
-        this.selectShopRuleChannelRule({channel_code:this.channelActive,brand_type:this.brand_type,consume_mode:this.consume_mode,rule_type:detail.rule_type?detail.rule_type:''})
+        this.selectShopRuleChannelRule({channel_code:this.channelActive,brand_type:this.brand_type,consume_mode:this.consume_mode})
         .then(res=>{
           console.log(res,'ddd')
           this.ruleOptions = res.data;
@@ -576,7 +576,7 @@ export default {
         .catch((err) => { console.error(err) })
     },
     handleTabClick(){
-      this.getRuleOptions()
+      this.getRuleOptions({})
     },
   }
 }

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

@@ -279,7 +279,7 @@ export default {
       storeTypeTabList:[{label:'已选核销门店',value:'SELL'},{label:'已选选座门店',value:'SEAT'},{label:'已选商品门店',value:'PRODUCT'},{label:'展示门店',value:'AGG'},],
       // #endif
       // #ifdef partner-mall
-      storeTypeTabList:[{label:'已选核销门店',value:'SELL'},{label:'已选旅游门店',value:'TRAVEL'},{label:'已选商品门店',value:'PRODUCT'},{label:'展示门店',value:'AGG'},],
+      storeTypeTabList:[{label:'已选核销门店',value:'SELL'},{label:'已选旅游门店',value:'TRAVEL'},{label:'已选商品门店',value:'PRODUCT'},{label:'已选小时达到店门店',value:'HDSELF'},{label:'展示门店',value:'AGG'},],
       // #endif
       dialogStore:false,
       storeTableKey:'storeTableKey',

package/library/viewModules/viewsMaterial/viewsMaterial/components/CusUpload.vue

@@ -56,8 +56,11 @@
               <span>{{item.name|fitersName}}</span>
             </div>
           </draggable>
-          <div><el-button
+          <div>
+            <div style="margin-bottom: 10px"><span style="color:#999999;font-size:12px">(上传文件格式：JPG/PNG/JPEG/GIF，不超过5MB)</span></div>
+            <el-button
             type="primary"
+            size="small"
             :disabled="isBtnMaterialMore || disabled"
             @click="isDialogShow=true"
           >{{materialBtnName}}</el-button></div>
@@ -249,8 +252,9 @@
             :limit="limit"
             multiple
           >
-            <div class="xd-upload__list-btn">
+             <div class="xd-upload__list-btn" style="text-align: left;">
               <slot>
+                <div style="margin-bottom: 10px"><span style="color:#999999;font-size:12px">(上传文件格式：JPG/PNG/JPEG/GIF，不超过5MB)</span></div>
                 <el-button :disabled="!(showList.length < limit ) || disabled" size="small" type="primary">{{uploadName}}</el-button>
               </slot>
               <div class="xd-upload__disabled" v-if="disabled"></div>
@@ -327,7 +331,7 @@
    * @slot tip插槽：提示文案插槽（one，list，''）
    *
    */
-  import dialogMaterial from "@/viewsMaterial/dialogMaterial.vue";
+  // import dialogMaterial from "@/viewsMaterial/dialogMaterial.vue";
   import XdFontIcon from "@/components/XdFontIcon.vue";
 	import {Loading} from 'element-ui';
 	import draggable from 'vuedraggable';
@@ -341,7 +345,7 @@
     components: {
       XdItemImage,
       draggable,
-      dialogMaterial,
+      // dialogMaterial,
       XdFontIcon
     },
 		props: {
@@ -567,6 +571,7 @@
             url: temp['url'] || temp['file_src'],
             name: temp['name'] || temp['file_name'],
             uid: temp['uid'] || temp['file_id'],
+            file_id: temp['file_id'] || '',
           }
           this.update(this.oneItem);
         }
@@ -578,6 +583,7 @@
               url: item['url'] || item['file_src'],
               name: item['name'] || item['file_name'],
               uid: item['uid'] || item['file_id'],
+              file_id: item['file_id'] || '',
             }
           });
           this.showList = this.$xdHelper.cloneDeep(this.showList).concat(list).map((item)=>{

package/library/viewModules/viewsMaterial/viewsMaterial/components/uploadForm.vue

@@ -3,7 +3,18 @@
     <div class="form-wrap">
       <div class="form-input">
         <div>
-          <div style="margin-bottom: 10px">添加素材：<span style="color:#999999;font-size:12px">(上传文件格式：JPG/PNG/JPEG/GIF，不超过5MB)</span></div>
+          <!-- <div style="margin-bottom: 10px">添加素材：<span style="color:#999999;font-size:12px">(上传文件格式：JPG/PNG/JPEG/GIF，不超过5MB)</span></div> -->
+          <el-form ref="radioForm" :model="radioForm" label-width="65px">
+            <el-form-item label="上传方式">
+              <el-radio-group v-model="radioForm.method" @change="handleRaidoMethodChange">
+                <el-radio
+                  v-for="item in radioOptions"
+                  :key="item.value"
+                  :label="item.value"
+                >{{ item.label }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-form>
           <cus-upload
             v-model="form.file_info"
             action="action"
@@ -12,9 +23,11 @@
             tipsformet="上传文件格式：@imageType@，不超过@size@MB."
             styleType="list"
             uploadType="aliyun"
-            :is-material="false"
+            :is-material="radioForm.method==='local'?false:true"
             :isHideFileName="true"
+            :materialBtnName="'上传'"
             :sort="true"
+            :key="cusUploadKey"
             :showtype="false"
             listSize="100*100"
             :maxlen="100"
@@ -66,7 +79,7 @@ import XdUpload from "@/components/XdUpload.vue";
 import handleUpdate from "@/mixins/handleUpdate";
 import CusUpload from "./CusUpload.vue";
 export default {
-  name: "Form",
+  name: "UploadForm",
   components: {
     XdUpload,
     CusUpload,
@@ -100,6 +113,19 @@ export default {
         status: "",
         file_info: [],
       },
+      radioForm:{
+        method: 'local',
+      },
+      radioOptions:[
+        {
+          label:'直接上传',
+          value:'local'
+        },{
+          label:'选择素材',
+          value:'material'
+        }
+      ],
+      cusUploadKey:'cusUploadKey',
     };
   },
   created() {
@@ -167,6 +193,9 @@ export default {
         });
       }
     },
+    handleRaidoMethodChange(){
+      this.cusUploadKey = Date.now();
+    },
   },
 };
 </script>
@@ -226,4 +255,11 @@ export default {
   color: #409eff;
   background: #ecf5ff;
 }
+::v-deep .form-input .el-form-item__label{
+  width: 65px !important;
+  text-align: left !important;
+  padding: 0 !important;
+  color: #333333!important;
+  font-weight: 400!important;
+}
 </style>

package/library/viewModules/viewsMaterial/viewsMaterial/dialogMaterial.vue

@@ -75,7 +75,7 @@ import company from "./dialog/component/company.vue";
 import share from "./dialog/component/share.vue";
 
 export default {
-  name: "XdMaterial",
+  name: "DialogMaterial",
   props: {
     setting: {
       type: Object,
@@ -197,6 +197,7 @@ export default {
           url: item.file_url,
           name: item.file_name,
           uid: item.file_uid,
+          file_id: item.file_id||'',
         };
       })
 

package/library/viewModules/viewsMaterial/viewsMaterial/material.vue

@@ -125,6 +125,7 @@ import uploadForm from "./components/uploadForm";
 import { mapActions } from "vuex";
 import axios from "axios";
 export default {
+  name: "Material",
   components: {
     XdPagination,
     XdDialog,
@@ -361,6 +362,7 @@ export default {
       this.addMaterial(data)
         .then((res) => {
           this.uploadVisible = false;
+          this.materialForm = {};
           this.getList(this.searchParams);
         })
         .catch((err) => {

package/package.json

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