chenrui il y a 6 mois
Parent
commit
4613bf0b79

+ 1 - 1
src/api/merchantNew.js

@@ -51,7 +51,7 @@ export const bizTradeList = (params) => {
 
 // 账单流水 统计
 export const bizTradeQueryGroupCount = (params) => {
-  const url = `/bizTrade/queryGroupCount `
+  const url = `/bizTrade/queryGroupCount`
   return axios({
     url: url,
     data: params,

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

@@ -714,8 +714,8 @@ export const asyncRouterMap = [
             component: BlankLayout,
             meta: {
               title: '线上支付账单',
-              icon: 'monitor'
-              // permission: 'M_onlinePayInvoice'
+              icon: 'monitor',
+              permission: 'M_onlinePayInvoice'
             },
             hideChildrenInMenu: true,
             children: [
@@ -726,8 +726,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '线上支付账单',
                   icon: 'monitor',
-                  hidden: true
-                  // permission: 'M_onlinePayInvoiceList'
+                  hidden: true,
+                  permission: 'M_onlinePayInvoiceList'
                 }
               },
               {
@@ -738,8 +738,8 @@ export const asyncRouterMap = [
                   title: '线上支付明细',
                   icon: 'monitor',
                   hidden: true,
-                  replaceTab: true
-                  // permission: 'M_onlinePayInvoiceDetail'
+                  replaceTab: true,
+                  permission: 'M_onlinePayInvoiceDetail'
                 }
               }
             ]
@@ -752,7 +752,7 @@ export const asyncRouterMap = [
             meta: {
               title: '提现管理',
               icon: 'monitor',
-              permission: 'M_NGS_withdrawalManagementNew'
+              permission: 'M_NGS_withdrawalManagement'
             },
             hideChildrenInMenu: true,
             children: [
@@ -776,8 +776,8 @@ export const asyncRouterMap = [
             component: BlankLayout,
             meta: {
               title: '提现管理',
-              icon: 'monitor'
-              // permission: 'M_withdrawalManagementNew'
+              icon: 'monitor',
+              permission: 'M_withdrawalManagementNew'
             },
             hideChildrenInMenu: true,
             children: [
@@ -788,8 +788,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '提现管理列表',
                   icon: 'monitor',
-                  hidden: true
-                  // permission: 'M_withdrawalManagementNewList'
+                  hidden: true,
+                  permission: 'M_withdrawalManagementNewList'
                 }
               }
             ]

+ 2 - 0
src/views/numsGoodsShelves/onlinePayInvoice/list.vue

@@ -46,8 +46,10 @@
             size="small"
             type="link"
             class="button-primary"
+            v-if="$hasPermissions('M_onlinePayInvoiceDetail')"
             @click="handleUndetail(record)"
             :id="'onlinePayInvoice-detail-btn-'+record.id">明细</a-button>
+            <div v-else>--</div>
         </template>
       </s-table>
     </a-spin>

+ 2 - 2
src/views/numsGoodsShelves/withdrawalManagementNew/list.vue

@@ -22,8 +22,8 @@
           账户总金额:{{ pageInfo&&pageInfo.totalAmount?toThousands(pageInfo.totalAmount):'--' }}(包含可提现金额:<span>{{ pageInfo&&pageInfo.activeAmount?toThousands(pageInfo.activeAmount):'--' }}</span>,在途金额:{{ pageInfo&&pageInfo.floatAmount?toThousands(pageInfo.floatAmount):'--' }})
           <p style="margin-top:10px;">(提示:①提现手续费为0.5元/笔;②资金到账周期为工作日+1天;③销售单需审核通过后才能提现;④销售单审核不通过或修理厂取消订单后将会在1-3个工作日原路返回到修理厂)</p>
         </div>
-        <a-button id="withdrawal-tixian" type="primary" class="button-primary" @click="handleTX">申请提现</a-button>
-        <a-button id="withdrawal-tixian" class="button-info" @click="showBillFlowModal=true">账单流水</a-button>
+        <a-button id="withdrawal-tixian" v-if="$hasPermissions('B_withdrawalAudit')" type="primary" class="button-primary" @click="handleTX">申请提现</a-button>
+        <a-button id="withdrawal-zhangdan" class="button-info" v-if="$hasPermissions('B_billFlow')" @click="showBillFlowModal=true">账单流水</a-button>
       </div>
       <s-table
         class="sTable fixPagination"

+ 1 - 1
src/views/salesManagement/onlinePayOrder/detail.vue

@@ -14,7 +14,7 @@
           <a-button id="purchaseNewOrderEdit-back-btn" type="link" @click="handleBack" class="button-default"> <a-icon type="rollback" /> 返回列表</a-button>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
-        <template slot="extra" v-if="outBizSn ? $hasPermissions('B_outboundOrderDetail') : $hasPermissions('B_salesPrint')">
+        <template slot="extra" v-if="outBizSn ? $hasPermissions('B_outboundOrderDetail') : $hasPermissions('B_onlinePayPrint')">
           <div style="margin-top: 5px;">
             <PrintPanel ref="printBox" position="bottomRight" :disabled="localDataSource.length==0" @handlePrint="handlePrint">
               <div style="padding:10px;line-height: 30px;" slot="extendCons">