chenrui преди 3 месеца
родител
ревизия
96dc3f4572

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1741849399063
+  "version": 1741933933630
 }

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

@@ -886,8 +886,8 @@ export const asyncRouterMap = [
             component: BlankLayout,
             meta: {
               title: '客户账户',
-              icon: 'monitor'
-              // permission: 'M_customerAccountList'
+              icon: 'monitor',
+              permission: 'M_customerAccountList'
             },
             hideChildrenInMenu: true,
             children: [
@@ -898,8 +898,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '客户账户列表',
                   icon: 'monitor',
-                  hidden: true
-                  // permission: 'M_customerAccountList'
+                  hidden: true,
+                  permission: 'M_customerAccountList'
                 }
               }
             ]
@@ -948,8 +948,8 @@ export const asyncRouterMap = [
             component: BlankLayout,
             meta: {
               title: '抵扣产品',
-              icon: 'contacts'
-              // permission: 'M_subsidizedProductsList'
+              icon: 'contacts',
+              permission: 'M_subsidizedProductsList'
             },
             hideChildrenInMenu: true,
             children: [
@@ -960,8 +960,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '抵扣产品列表',
                   icon: 'contacts',
-                  hidden: true
-                  // permission: 'M_subsidizedProductsList'
+                  hidden: true,
+                  permission: 'M_subsidizedProductsList'
                 }
               }
             ]
@@ -973,8 +973,8 @@ export const asyncRouterMap = [
             component: BlankLayout,
             meta: {
               title: '充值设置',
-              icon: 'contacts'
-              // permission: 'M_rechargeSettingsList'
+              icon: 'contacts',
+              permission: 'M_rechargeSettingsList'
             },
             hideChildrenInMenu: true,
             children: [
@@ -985,8 +985,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '充值设置',
                   icon: 'contacts',
-                  hidden: true
-                  // permission: 'M_rechargeSettingsList'
+                  hidden: true,
+                  permission: 'M_rechargeSettingsList'
                 }
               }
             ]

+ 11 - 3
src/views/numsGoodsShelves/customerAccount/list.vue

@@ -47,23 +47,31 @@
         bordered>
         <!-- 充值余额 -->
         <template slot="rechargeBalance" slot-scope="text, record">
-          <span class="table-td-link" :id="'storeAccount-recharge'+record.id" v-if="$hasPermissions('B_salesDetail')" @click="handleFlow(record,'1')">{{ (record.rechargeBalance||record.rechargeBalance==0)?toThousands(record.rechargeBalance):'--' }}</span>
+          <span class="table-td-link" :id="'storeAccount-recharge'+record.id" v-if="$hasPermissions('B_clearRecord')" @click="handleFlow(record,'1')">{{ (record.rechargeBalance||record.rechargeBalance==0)?toThousands(record.rechargeBalance):'--' }}</span>
           <span v-else>{{ (record.rechargeBalance||record.rechargeBalance==0)?toThousands(record.rechargeBalance):'--' }}</span>
         </template>
         <!-- 抵扣余额 -->
         <template slot="giveBalance" slot-scope="text, record">
-          <span class="table-td-link" :id="'storeAccount-give'+record.id" v-if="$hasPermissions('B_salesDetail')" @click="handleFlow(record,'2')">{{ (record.giveBalance||record.giveBalance==0)?toThousands(record.giveBalance):'--' }}</span>
+          <span class="table-td-link" :id="'storeAccount-give'+record.id" v-if="$hasPermissions('B_clearRecord')" @click="handleFlow(record,'2')">{{ (record.giveBalance||record.giveBalance==0)?toThousands(record.giveBalance):'--' }}</span>
           <span v-else>{{ (record.giveBalance||record.giveBalance==0)?toThousands(record.giveBalance):'--' }}</span>
         </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
-          <a-button :id="'storeAccount-clearRecord'+record.id" size="small" type="link" class="button-primary" @click="handleClearRecord(record)">清零记录</a-button>
+          <a-button
+            :id="'storeAccount-clearRecord'+record.id"
+            v-if="$hasPermissions('B_clearRecord')"
+            size="small"
+            type="link"
+            class="button-primary"
+            @click="handleClearRecord(record)">清零记录</a-button>
           <a-button
             :id="'storeAccount-ZeroClear-'+record.id"
             size="small"
             type="link"
+            v-if="$hasPermissions('B_zeroClear')"
             class="button-error"
             @click="handleZeroClear(record)">清零</a-button>
+          <span v-if="!$hasPermissions('B_clearRecord')&&!$hasPermissions('B_zeroClear')">--</span>
         </template>
       </s-table>
     </a-spin>

+ 4 - 4
src/views/promotionManagement/rechargeSettings/list.vue

@@ -35,7 +35,7 @@
       </div>
       <!-- 操作按钮 -->
       <div class="table-operator-nobor">
-        <a-button id="rechargeList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
+        <a-button id="rechargeList-add" type="primary" v-if="$hasPermissions('B_echargeSettings_add')" class="button-error" @click="handleEdit()">新增</a-button>
       </div>
       <!-- 列表 -->
       <s-table
@@ -53,7 +53,7 @@
         <template slot="statusBox" slot-scope="text, record">
           <a-switch
             :id="'rechargeList-switch-'+record.id"
-            v-if="$hasPermissions('B_customer_customerInfo_enable')"
+            v-if="$hasPermissions('B_echargeSettings_enable')"
             checkedChildren="启用"
             unCheckedChildren="禁用"
             :checked="record.state==1?true:false"
@@ -66,14 +66,14 @@
             size="small"
             type="link"
             class="button-primary"
-            v-if="record.state==0"
+            v-if="record.state==0&&$hasPermissions('B_echargeSettings_edit')"
             @click="handleEdit(record)"
             :id="'rechargeList-editBtn-'+record.id">编辑</a-button>
           <a-button
             size="small"
             type="link"
             class="button-error"
-            v-if="record.state==0"
+            v-if="record.state==0&&$hasPermissions('B_echargeSettings_del')"
             :id="'rechargeList-delBtn-'+record.id"
             @click="handleDel(record)">删除</a-button>
         </template>

+ 7 - 7
src/views/promotionManagement/subsidizedProducts/list.vue

@@ -40,10 +40,10 @@
     </div>
     <!-- 操作按钮 -->
     <div class="table-operator-nobor">
-      <a-button id="subsidizedProducts-add" type="primary" class="button-error" @click="openAddModal=true">新增</a-button>
-      <a-button id="subsidizedProducts-edit" type="primary" class="button-info" @click="handleEdit()">批量编辑</a-button>
-      <a-button id="subsidizedProducts-del" type="primary" class="button-error" ghost @click="handleDel()">批量删除</a-button>
-      <a-button id="subsidizedProducts-import" style="margin-left:5px;" @click="openGuideModal=true">导入</a-button>
+      <a-button id="subsidizedProducts-add"  v-if="$hasPermissions('B_subsidizedProducts_add')" type="primary" class="button-error" @click="openAddModal=true">新增</a-button>
+      <a-button id="subsidizedProducts-edit"  v-if="$hasPermissions('B_subsidizedProducts_edit')" type="primary" class="button-info" @click="handleEdit()">批量编辑</a-button>
+      <a-button id="subsidizedProducts-del"  v-if="$hasPermissions('B_subsidizedProducts_del')" type="primary" class="button-error" ghost @click="handleDel()">批量删除</a-button>
+      <a-button id="subsidizedProducts-import"  v-if="$hasPermissions('B_subsidizedProducts_import')" style="margin-left:5px;" @click="openGuideModal=true">导入</a-button>
       <span style="margin-left: 10px;" v-if="selectTotal">已选{{ selectTotal }}项</span>
     </div>
     <a-spin :spinning="spinning" tip="Loading...">
@@ -77,7 +77,7 @@
         <template slot="action" slot-scope="text, record">
           <a-button
             size="small"
-            v-if="$hasPermissions('B_product_dealerProduct_edit')"
+            v-if="$hasPermissions('B_subsidizedProducts_edit')"
             type="link"
             class="button-primary"
             @click="handleEdit(record)"
@@ -86,7 +86,7 @@
             编辑
           </a-button>
           <a-button
-            v-if="$hasPermissions('B_product_dealerProduct_detail')"
+            v-if="$hasPermissions('B_subsidizedProducts_del')"
             size="small"
             type="link"
             class="button-error"
@@ -95,7 +95,7 @@
           >
             删除
           </a-button>
-          <span v-if="!$hasPermissions('B_product_dealerProduct_edit') && !$hasPermissions('B_product_dealerProduct_detail')">--</span>
+          <span v-if="!$hasPermissions('B_subsidizedProducts_edit') && !$hasPermissions('B_subsidizedProducts_del')">--</span>
         </template>
       </s-table>
     </a-spin>