chenrui hai 8 meses
pai
achega
fe4481befd

+ 16 - 16
src/config/router.config.js

@@ -3643,8 +3643,8 @@ export const asyncRouterMap = [
             component: BlankLayout,
             meta: {
               title: '促销活动',
-              icon: 'file-ppt'
-              // permission: 'M_promotionalActivities'
+              icon: 'file-ppt',
+              permission: 'M_promotionalActivities'
             },
             hideChildrenInMenu: true,
             children: [
@@ -3655,8 +3655,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '促销活动列表',
                   icon: 'file-ppt',
-                  hidden: true
-                  // permission: 'M_promotionalActivitiesList'
+                  hidden: true,
+                  permission: 'M_promotionalActivitiesList'
                 }
               },
               {
@@ -3667,8 +3667,8 @@ export const asyncRouterMap = [
                   title: '新增促销活动',
                   icon: 'file-ppt',
                   hidden: true,
-                  replaceTab: true
-                  // permission: 'B_promotionalActivitiesAdd'
+                  replaceTab: true,
+                  permission: 'B_promoActivitiesAdd'
                 }
               },
               {
@@ -3679,8 +3679,8 @@ export const asyncRouterMap = [
                   title: '编辑促销活动',
                   icon: 'file-ppt',
                   hidden: true,
-                  replaceTab: true
-                  // permission: 'B_promotionalActivitiesEdit'
+                  replaceTab: true,
+                  permission: 'B_promoActivitiesEdit'
                 }
               }
             ]
@@ -3692,8 +3692,8 @@ export const asyncRouterMap = [
             component: BlankLayout,
             meta: {
               title: '首页轮播图',
-              icon: 'file-ppt'
-              // permission: 'M_homepageCarouselImg'
+              icon: 'file-ppt',
+              permission: 'M_homepageCarouselImg'
             },
             hideChildrenInMenu: true,
             children: [
@@ -3704,8 +3704,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '首页轮播图列表',
                   icon: 'file-ppt',
-                  hidden: true
-                  // permission: 'M_homepageCarouselImgList'
+                  hidden: true,
+                  permission: 'M_homepageCarouselImgList'
                 }
               },
               {
@@ -3716,8 +3716,8 @@ export const asyncRouterMap = [
                   title: '新增轮播图',
                   icon: 'file-ppt',
                   hidden: true,
-                  replaceTab: true
-                  // permission: 'B_homepageCarouselImgAdd'
+                  replaceTab: true,
+                  permission: 'B_homepageCarouselAdd'
                 }
               },
               {
@@ -3728,8 +3728,8 @@ export const asyncRouterMap = [
                   title: '编辑轮播图',
                   icon: 'file-ppt',
                   hidden: true,
-                  replaceTab: true
-                  // permission: 'B_homepageCarouselImgEdit'
+                  replaceTab: true,
+                  permission: 'B_homepageCarouselEdit'
                 }
               }
             ]

+ 10 - 8
src/views/easyPassManagement/homepageCarouselImg/list.vue

@@ -40,7 +40,7 @@
     <a-card size="small" :bordered="false">
       <a-spin :spinning="spinning" tip="Loading...">
         <!-- 操作按钮 -->
-        <div class="table-operator" v-if="$hasPermissions('B_promotionManagementAdd')">
+        <div class="table-operator" v-if="$hasPermissions('B_homepageCarouselAdd')">
           <a-button type="primary" id="carouselImage-add-btn" @click="handleAddOrEdit()">新增</a-button>
         </div>
         <s-table
@@ -60,8 +60,10 @@
           </template>
           <!-- 参与经销商 -->
           <template slot="joinCustomers" slot-scope="text, record">
-            <span class="customerBox" @click="handleCustomers(record)" :id="'carouselImage-seeDealerInfo-'+record.id" v-if="record.allDealerFlag&&record.allDealerFlag=='0'">共有<span class="link-bule">{{ record.dealerQty }}</span>个客户</span>
-            <span v-else>全部经销商</span>
+            <span class="customerBox" v-if="$hasPermissions('B_homepageCarouselSee')&&(record.allDealerFlag&&record.allDealerFlag=='0')" @click="handleCustomers(record)" :id="'carouselImage-seeDealerInfo-'+record.id">共有<span class="link-bule">{{ record.dealerQty }}</span>个客户</span>
+            <span v-else-if="!$hasPermissions('B_homepageCarouselSee')&&(record.allDealerFlag&&record.allDealerFlag=='0')">共有<span class="link-bule">{{ record.dealerQty }}</span>个客户</span>
+            <span v-else-if="$hasPermissions('B_homepageCarouselSee')&&(record.allDealerFlag&&record.allDealerFlag=='1')">全部经销商</span>
+            <span v-else>--</span>
           </template>
           <!-- 封面展示 -->
           <template slot="salesShow" slot-scope="text, record">
@@ -79,33 +81,33 @@
               class="button-warning"
               :id="'carouselImage-edit-btn-'+record.id"
               @click="handleAddOrEdit(record)"
-              v-if="(record.state=='UNPUBLISH' || record.state=='CLOSE') && $hasPermissions('B_promotionManagementEdit')">编辑</a-button>
+              v-if="(record.state=='UNPUBLISH' || record.state=='CLOSE') && $hasPermissions('B_homepageCarouselEdit')">编辑</a-button>
             <a-button
               size="small"
               type="link"
               class="button-success"
               @click="handleSee(record)"
-              v-if="(record.state=='PUBLISH' || record.state=='END')&&$hasPermissions('B_promotionManagementDetail')"
+              v-if="(record.state=='PUBLISH' || record.state=='END')&&$hasPermissions('B_homepageCarouselDetail')"
               :id="'carouselImage-seeDetail-btn-'+record.id">查看</a-button>
             <a-button
               size="small"
               type="link"
               class="button-info"
               @click="closeReleaseDel(record,'PUBLISH')"
-              v-if="(record.state=='UNPUBLISH'||record.state=='CLOSE')&&$hasPermissions('B_promotionManagementContent')"
+              v-if="(record.state=='UNPUBLISH'||record.state=='CLOSE')&&$hasPermissions('B_homepageCarouselRelease')"
               :id="'carouselImage-release-btn-'+record.id">发布</a-button>
             <a-button
               size="small"
               type="link"
               class="button-info"
               @click="closeReleaseDel(record,'CLOSE')"
-              v-if="(record.state=='PUBLISH')&&$hasPermissions('B_promotionManagementContent')"
+              v-if="(record.state=='PUBLISH')&&$hasPermissions('B_homepageCarouselClose')"
               :id="'carouselImage-release-btn-'+record.id">关闭</a-button>
             <a-button
               size="small"
               type="link"
               class="button-error"
-              v-if="(record.state=='UNPUBLISH'||record.state=='CLOSE')&&$hasPermissions('B_promotionManagementDel')"
+              v-if="(record.state=='UNPUBLISH'||record.state=='CLOSE')&&$hasPermissions('B_homepageCarouselDel')"
               @click="closeReleaseDel(record,'1')"
               :id="'carouselImage-del-btn-'+record.id">删除</a-button>
           </template>

+ 4 - 4
src/views/easyPassManagement/promotionalActivities/detailModal.vue

@@ -221,14 +221,14 @@ export default {
       const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品编码', dataIndex: 'productCode', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', width: '18%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品编码', dataIndex: 'productCode', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', width: '28%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'productOrigCode', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '商城售价', dataIndex: 'shopProductPrice', width: '10%', align: 'right', customRender: text => { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
       ]
       if (_this.form.promoType === 'BUY_PROD_GIVE_PROD') {
-        arr.splice(4, 0, { title: '买', dataIndex: 'conditionValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } })
-        arr.splice(5, 0, { title: '赠', dataIndex: 'resultValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } })
+        arr.splice(4, 0, { title: '买', dataIndex: 'conditionValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } })
+        arr.splice(5, 0, { title: '赠', dataIndex: 'resultValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } })
       } else if (_this.form.promoType === 'PROMO_PROD') {
         arr.splice(5, 0, { title: '特价价格', dataIndex: 'conditionValue', width: '10%', align: 'right', customRender: text => { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       } else {

+ 11 - 12
src/views/easyPassManagement/promotionalActivities/list.vue

@@ -51,7 +51,7 @@
     <a-card size="small" :bordered="false">
       <a-spin :spinning="spinning" tip="Loading...">
         <!-- 操作按钮 -->
-        <div class="table-operator" v-if="$hasPermissions('B_promotionManagementAdd')">
+        <div class="table-operator" v-if="$hasPermissions('B_promoActivitiesAdd')">
           <a-button type="primary" class="button-info" id="promotion-add1-btn" @click="handleEdit('BUY_PROD_GIVE_PROD')">买产品送产品</a-button>
           <a-button type="primary" class="button-info" id="promotion-add2-btn" @click="handleEdit('PROMO_PROD')">特价产品</a-button>
           <a-button type="primary" class="button-info" id="promotion-add3-btn" @click="handleEdit('BUY_PROD_GIVE_VALID')">买产品返代金券</a-button>
@@ -68,10 +68,9 @@
           :defaultLoadData="false"
           bordered>
           <!-- 促销名称 -->
-          <!-- v-if="$hasPermissions('B_dealerPromotionDetail')" -->
           <template slot="promotionName" slot-scope="text, record">
-            <div :id="'promotion-info-'+record.id" class="link-bule nameBox text-overflows2" @click="handleDetail(record)">{{ record.promoName }}</div>
-            <!-- <div v-else class="nameBox text-overflows2">{{ record.title }}</div> -->
+            <div :id="'promotion-info-'+record.id" v-if="$hasPermissions('B_promoActivitiesDetail')" class="link-bule nameBox text-overflows2" @click="handleDetail(record)">{{ record.promoName }}</div>
+            <div v-else class="nameBox text-overflows2">{{ record.promoName }}</div>
           </template>
           <!-- 促销时间 -->
           <template slot="promotionTime" slot-scope="text, record">
@@ -103,33 +102,33 @@
                 class="button-warning"
                 :id="'promotion-edit-btn-'+record.id"
                 @click="handleEdit('edit',record)"
-                v-if="(record.promoState=='NOT_RELEASE') && $hasPermissions('B_promotionManagementEdit')">编辑</a-button>
+                v-if="(record.promoState=='NOT_RELEASE') && $hasPermissions('B_promoActivitiesEdit')">编辑</a-button>
               <a-button
                 size="small"
                 type="link"
                 class="button-warning"
                 :id="'promotion-abandon-btn-'+record.id"
-                v-if="(record.promoState=='HAVE_RELEASE') && $hasPermissions('B_promotionManagementEdit')"
+                v-if="(record.promoState=='HAVE_RELEASE') && $hasPermissions('B_promoActivitiesAbandon')"
                 @click="handleAbandon(record)">废弃</a-button>
               <a-button
                 size="small"
                 type="link"
                 class="button-warning"
                 :id="'promotion-img-btn-'+record.id"
-                v-if="(record.promoState=='HAVE_RELEASE') && $hasPermissions('B_promotionManagementEdit')"
+                v-if="(record.promoState=='HAVE_RELEASE') && $hasPermissions('B_promoActivitiesImg')"
                 @click="handleSet(record)">轮播图</a-button>
               <a-button
                 size="small"
                 type="link"
                 class="button-info"
                 @click="handleRelease(record)"
-                v-if="record.promoState=='NOT_RELEASE'&&$hasPermissions('B_promotionManagementContent')"
+                v-if="record.promoState=='NOT_RELEASE'&&$hasPermissions('B_promoActivitiesRelease')"
                 :id="'promotion-release-btn-'+record.id">发布</a-button>
               <a-button
                 size="small"
                 type="link"
                 class="button-error"
-                v-if="record.promoState=='NOT_RELEASE'&&$hasPermissions('B_promotionManagementDel')"
+                v-if="record.promoState=='NOT_RELEASE'&&$hasPermissions('B_promoActivitiesDel')"
                 @click="handleDel(record)"
                 :id="'promotion-del-btn-'+record.id">删除</a-button>
             </div>
@@ -229,14 +228,14 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '创建时间', dataIndex: 'createDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '促销名称', scopedSlots: { customRender: 'promotionName' }, width: '15%', align: 'left' },
-        { title: '促销时间', scopedSlots: { customRender: 'promotionTime' }, width: '15%', align: 'center' },
+        { title: '促销名称', scopedSlots: { customRender: 'promotionName' }, width: '18%', align: 'left' },
+        { title: '促销时间', scopedSlots: { customRender: 'promotionTime' }, width: '18%', align: 'center' },
         { title: '参与经销商', scopedSlots: { customRender: 'joinCustomers' }, width: '8%', align: 'center' },
         { title: '促销类型', dataIndex: 'promoTypeDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '加盟商编辑', dataIndex: 'dealerEditFlag', width: '6%', align: 'center', customRender: function (text) { return (text ? text == '1' ? '是' : '否' : '--') } },
         { title: '首页轮播图', dataIndex: 'shopBannerFlag', width: '6%', align: 'center', customRender: function (text) { return (text ? text == '1' ? '是' : '否' : '--') } },
         { title: '促销状态', dataIndex: 'promoStateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: '15%', align: 'center' }
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '11%', align: 'center' }
       ]
     }
   },

+ 2 - 2
src/views/easyPassManagement/promotionalActivities/productTable.vue

@@ -147,8 +147,8 @@ export default {
       const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品编码', dataIndex: 'productCode', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', width: '20%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品编码', dataIndex: 'productCode', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', width: '25%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'productOrigCode', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '商城售价', dataIndex: 'shopProductPrice', width: '10%', align: 'right', customRender: text => { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }