Browse Source

Merge branch 'deploy' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into deploy

lilei 3 years ago
parent
commit
81d9ac6948
34 changed files with 312 additions and 135 deletions
  1. 3 3
      src/api/productUniversalCode.js
  2. 1 1
      src/config/router.config.js
  3. 1 1
      src/views/allocationManagement/transferOut/detail.vue
  4. 1 1
      src/views/allocationManagement/transferOut/edit.vue
  5. 19 8
      src/views/allocationManagement/transferOut/list.vue
  6. 4 0
      src/views/basicData/transferTypeManagement/list.vue
  7. 5 3
      src/views/basicData/warehouse/list.vue
  8. 19 4
      src/views/dealerManagement/dealerAccountManagement/list.vue
  9. 4 0
      src/views/dealerManagement/dealerRelationshipBinding/list.vue
  10. 16 3
      src/views/dealerManagement/marketingDivisionSet/list.vue
  11. 10 7
      src/views/dealerManagement/merchantInfoManagement/list.vue
  12. 8 1
      src/views/dealerManagement/rebateSettings/list.vue
  13. 1 1
      src/views/dealerManagement/rebateSettings/queryChild.vue
  14. 14 5
      src/views/financialManagement/financialCollection/list.vue
  15. 12 4
      src/views/financialManagement/returnConfirmation/list.vue
  16. 38 25
      src/views/financialManagement/warehousingConfirmation/list.vue
  17. 4 4
      src/views/power/menu/menu.vue
  18. 7 4
      src/views/power/role/roleList.vue
  19. 7 6
      src/views/power/user/userList.vue
  20. 1 0
      src/views/productManagement/priceChangeRecord/list.vue
  21. 17 3
      src/views/productManagement/productBrand/list.vue
  22. 5 4
      src/views/productManagement/productCategory/list.vue
  23. 6 2
      src/views/productManagement/productInfo/detailModal.vue
  24. 25 9
      src/views/productManagement/productInfo/list.vue
  25. 3 3
      src/views/productManagement/productLaunchAudit/list.vue
  26. 8 1
      src/views/productManagement/productLevel/list.vue
  27. 3 3
      src/views/productManagement/productOfflineAudit/list.vue
  28. 3 2
      src/views/productManagement/productPricing/list.vue
  29. 16 3
      src/views/productManagement/productUniversal/list.vue
  30. 2 0
      src/views/promotionRulesManagement/orderStatistics/list.vue
  31. 2 0
      src/views/promotionRulesManagement/productStatistics/list.vue
  32. 7 4
      src/views/promotionRulesManagement/promotionRules/list.vue
  33. 22 16
      src/views/purchasingManagement/bulkWarehousingOrder/list.vue
  34. 18 4
      src/views/supplierManagement/supplierInfo/list.vue

+ 3 - 3
src/api/productUniversalCode.js

@@ -2,7 +2,7 @@ import { axios } from '@/utils/request'
 
 //  通用产品 列表  有分页
 export const productUniversalCodeList = (params) => {
-  const url = `/productUniversalCode/query/${params.pageNo}/${params.pageSize}`
+  const url = `/productUniversalCode/queryPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({
@@ -29,7 +29,7 @@ export const productUniversalCodeSave = (params) => {
 }
 //  通用产品 详情
 export const productUniversalCodeDetail = (params) => {
-  const url = `/productUniversalCode/${params.id}`
+  const url = `/productUniversalCode/findById/${params.id}`
   return axios({
     url: url,
     method: 'get'
@@ -37,7 +37,7 @@ export const productUniversalCodeDetail = (params) => {
 }
 //  产品编码模糊搜索  有分页  产品编码
 export const productCodeQueryList = (params) => {
-  const url = `/productUniversalCode/productList/${params.pageNo}/${params.pageSize}`
+  const url = `/productUniversalCode/productListPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({

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

@@ -2068,7 +2068,7 @@ export const asyncRouterMap = [
             meta: {
               title: '数据字典管理',
               icon: 'database',
-              permission: 'M_dataDictionary'
+              permission: 'M_dataD_lookup'
             }
           },
           // {

+ 1 - 1
src/views/allocationManagement/transferOut/detail.vue

@@ -14,7 +14,7 @@
             @click.stop="handleEdit">编辑</a-button>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
-        <template slot="extra">
+        <template v-if="$hasPermissions('B_transferOut_print')" slot="extra">
           <a-button key="2" id="allocateBillDetail-preview-btn" :disabled="localDataSource.length==0" @click="handlePrint('preview')">打印预览</a-button>
           <a-button key="1" type="primary" id="allocateBillDetail-print-btn" :disabled="localDataSource.length==0" @click="handlePrint('print')">快捷打印</a-button>
         </template>

+ 1 - 1
src/views/allocationManagement/transferOut/edit.vue

@@ -8,7 +8,7 @@
           <span style="margin: 0 15px;color: #666;">调往对象:{{ $route.params.name || '--' }}</span>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
-        <template slot="extra">
+        <template v-if="$hasPermissions('B_transferOut_print')" slot="extra">
           <a-button key="2" id="allocateBillEdit-preview-btn" :disabled="chooseLoadData.length==0" @click="handlePrint('preview')">打印预览</a-button>
           <a-button key="1" type="primary" id="allocateBillEdit-print-btn" :disabled="chooseLoadData.length==0" @click="handlePrint('print')">快捷打印</a-button>
         </template>

+ 19 - 8
src/views/allocationManagement/transferOut/list.vue

@@ -1,7 +1,7 @@
 <template>
   <a-card size="small" :bordered="false" class="allocateBillList-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
-      
+
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -63,7 +63,7 @@
       </div>
       <!-- 操作按钮 -->
       <div class="table-operator">
-        <a-button id="allocateBillList-add" type="primary" class="button-error" @click="openModal=true">新增</a-button>
+        <a-button v-if="$hasPermissions('B_transferOut_add')" id="allocateBillList-add" type="primary" class="button-error" @click="openModal=true">新增</a-button>
       </div>
       <!-- 列表 -->
       <s-table
@@ -77,7 +77,7 @@
         bordered>
         <!-- 单号 -->
         <template slot="allocateNo" slot-scope="text, record">
-          <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.allocateNo }}</span>
+          <span :class="$hasPermissions('M_transferOut_detail')?'active':'common'" @click="handleDetail(record)">{{ record.allocateNo }}</span>
         </template>
         <!-- 财务状态 -->
         <template slot="settleState" slot-scope="text, record">
@@ -88,25 +88,25 @@
           <a-button
             size="small"
             type="link"
-            v-if="record.state == 'WAIT_AUDIT'"
+            v-if="record.state == 'WAIT_AUDIT' && $hasPermissions('B_transferOut_audit')"
             class="button-warning"
             @click="handleExamine(record)"
             id="allocateBillList-examine-btn">审核</a-button>
           <a-button
             size="small"
             type="link"
-            v-if="(record.state == 'WAIT_SUBMIT') || (record.state == 'WAIT_AUDIT') || (record.state == 'AUDIT_REJECT')"
+            v-if="((record.state == 'WAIT_SUBMIT') || (record.state == 'WAIT_AUDIT') || (record.state == 'AUDIT_REJECT')) && $hasPermissions('M_transferOut_edit')"
             class="button-info"
             @click="handleEdit(record)"
             id="allocateBillList-edit-btn">编辑</a-button>
           <a-button
             size="small"
             type="link"
-            v-if="(record.state == 'WAIT_SUBMIT') || (record.state == 'WAIT_AUDIT') || (record.state == 'AUDIT_REJECT')"
+            v-if="((record.state == 'WAIT_SUBMIT') || (record.state == 'WAIT_AUDIT') || (record.state == 'AUDIT_REJECT')) && $hasPermissions('B_transferOut_del')"
             class="button-error"
             @click="handleDel(record)"
             id="allocateBillList-del-btn">删除</a-button>
-          <span v-if="(record.state != 'WAIT_SUBMIT') && (record.state != 'WAIT_AUDIT') && (record.state != 'AUDIT_REJECT')">--</span>
+          <span v-if="((record.state != 'WAIT_SUBMIT') && (record.state != 'WAIT_AUDIT') && (record.state != 'AUDIT_REJECT'))||(!$hasPermissions('B_transferOut_audit') && !$hasPermissions('M_transferOut_edit') && !$hasPermissions('B_transferOut_del'))">--</span>
         </template>
       </s-table>
     </a-spin>
@@ -245,7 +245,9 @@ export default {
     },
     //  详情
     handleDetail (row) {
-      this.$router.push({ path: `/allocationManagement/transferOut/detail/${row.allocateSn}` })
+      if (this.$hasPermissions('M_transferOut_detail')) {
+        this.$router.push({ path: `/allocationManagement/transferOut/detail/${row.allocateSn}` })
+      }
     },
     //  编辑
     handleEdit (row) {
@@ -293,3 +295,12 @@ export default {
   }
 }
 </script>
+<style lang="less">
+	.active{
+		color: #ed1c24;
+		cursor: pointer;
+	}
+	.common{
+		color: #000;
+	}
+</style>

+ 4 - 0
src/views/basicData/transferTypeManagement/list.vue

@@ -7,6 +7,7 @@
           id="transferTypeManagementList-add"
           type="primary"
           class="button-error"
+          v-if="$hasPermissions('B_transferTypeManagement_add')"
           @click="handleEdit()">新增</a-button>
       </div>
       <!-- 列表 -->
@@ -25,13 +26,16 @@
             type="link"
             class="button-info"
             @click="handleEdit(record)"
+            v-if="$hasPermissions('B_transferTypeManagement_edit')"
             id="transferTypeManagementList-edit-btn">编辑</a-button>
           <a-button
             size="small"
             type="link"
             class="button-error"
             @click="handleDel(record)"
+            v-if="$hasPermissions('B_transferTypeManagement_del')"
             id="transferTypeManagementList-del-btn">删除</a-button>
+          <span v-if="!$hasPermissions('B_transferTypeManagement_del') &&!$hasPermissions('B_transferTypeManagement_edit')">--</span>
         </template>
       </s-table>
     </a-spin>

+ 5 - 3
src/views/basicData/warehouse/list.vue

@@ -19,7 +19,7 @@
       </div>
       <!-- 操作按钮 -->
       <div class="table-operator">
-        <a-button id="warehouseList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
+        <a-button v-if="$hasPermissions('B_warehouse_add')" id="warehouseList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
       </div>
       <!-- 列表 -->
       <s-table
@@ -38,21 +38,23 @@
             type="link"
             class="button-warning"
             @click="goStoringLocation(record)"
+            v-if="$hasPermissions('B_warehouse_add')"
             id="warehouseList-storingLocation-btn">仓位管理</a-button>
           <a-button
             size="small"
             type="link"
             class="button-info"
-            v-if="record.defaultFlag!='1'"
+            v-if="record.defaultFlag!='1' &&$hasPermissions('B_warehouse_edit') "
             @click="handleEdit(record)"
             id="warehouseList-edit-btn">编辑</a-button>
           <a-button
             size="small"
             type="link"
             class="button-error"
-            v-if="record.defaultFlag!='1'"
+            v-if="record.defaultFlag!='1' &&$hasPermissions('B_warehouse_del')"
             @click="handleDel(record)"
             id="warehouseList-del-btn">删除</a-button>
+          <span v-if="record.defaultFlag=='0' && !$hasPermissions('B_warehouse_edit') && !$hasPermissions('B_warehouse_del')">--</span>
         </template>
       </s-table>
     </a-spin>

+ 19 - 4
src/views/dealerManagement/dealerAccountManagement/list.vue

@@ -29,7 +29,7 @@
       </div>
       <!-- 操作按钮 -->
       <div class="table-operator">
-        <a-button id="dealerAccountList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
+        <a-button id="dealerAccountList-add" type="primary" v-if="$hasPermissions('B_dealerAccount_add')" class="button-error" @click="handleEdit()">新增</a-button>
       </div>
       <!-- 列表 -->
       <s-table
@@ -45,22 +45,37 @@
         <template slot="loginFlag" slot-scope="text, record">
           <a-switch
             id="dealerAccountList-enable"
+            v-if="$hasPermissions('B_dealerAccount_enable')"
             checkedChildren="启用"
             unCheckedChildren="禁用"
             @change="changeStatus(record)"
             :checked="record.loginFlag == 1 ? true : false" />
-          <!-- <span v-else>{{ record.loginFlag==1?'已启用':'已禁用' }}</span> -->
+          <span v-else :style="{color:(record.loginFlag==1?'#00aa00':'#999')}"> {{ record.loginFlag==1? '已启用': '已禁用' }} </span>
         </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
-          <a-button size="small" type="link" class="button-info" @click="handleEdit(record)" id="dealerAccountList-edit-btn">编辑</a-button>
-          <a-button size="small" type="link" class="button-success" @click="handleDetail(record)" id="dealerAccountList-detail-btn">详情</a-button>
           <a-button
             size="small"
             type="link"
+            v-if="$hasPermissions('B_dealerAccount_edit')"
+            class="button-info"
+            @click="handleEdit(record)"
+            id="dealerAccountList-edit-btn">编辑</a-button>
+          <a-button
+            size="small"
+            type="link"
+            v-if="$hasPermissions('B_dealerAccount_detail')"
+            class="button-success"
+            @click="handleDetail(record)"
+            id="dealerAccountList-detail-btn">详情</a-button>
+          <a-button
+            size="small"
+            type="link"
+            v-if="$hasPermissions('B_dealerAccount_reset')"
             class="button-warning"
             @click="handleReset(record)"
             id="dealerAccountList-reset-btn">重置密码</a-button>
+          <span v-if="!$hasPermissions('B_dealerAccount_edit') && !$hasPermissions('B_dealerAccount_detail') && !$hasPermissions('B_dealerAccount_reset')">--</span>
         </template>
       </s-table>
     </a-spin>

+ 4 - 0
src/views/dealerManagement/dealerRelationshipBinding/list.vue

@@ -44,22 +44,26 @@
           <template slot="action" slot-scope="text, record">
             <a-button
               type="link"
+              v-if="$hasPermissions('B_dealerRelationshipBinding_unrelation')"
               class="button-error"
               size="small"
               icon="close"
               :id="'relationshipBindingList-delSubItem'+record.id"
               @click.stop="handleDisassociate(record)">取消关联</a-button>
+            <span v-else>--</span>
           </template>
         </a-table>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
           <a-button
             type="link"
+            v-if="$hasPermissions('B_dealerRelationshipBinding_relation')"
             class="button-info"
             size="small"
             icon="plus"
             :id="'relationshipBindingList-addSubItem'+record.id"
             @click.stop="handleAssociate(record)">关联下级</a-button>
+          <span v-else>--</span>
         </template>
       </a-table>
     </a-spin>

+ 16 - 3
src/views/dealerManagement/marketingDivisionSet/list.vue

@@ -3,7 +3,7 @@
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 操作按钮 -->
       <div class="table-operator">
-        <a-button id="marketingDivisionSetList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
+        <a-button id="marketingDivisionSetList-add" type="primary" v-if="$hasPermissions('B_marketingDivisionSet_add')" class="button-error" @click="handleEdit()">新增</a-button>
       </div>
       <!-- 列表 -->
       <s-table
@@ -28,8 +28,21 @@
         </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
-          <a-button size="small" type="link" class="button-info" @click="handleEdit(record)" id="marketingDivisionSetList-edit-btn">编辑</a-button>
-          <a-button size="small" type="link" class="button-error" @click="handleDel(record)" id="marketingDivisionSetList-del-btn">删除</a-button>
+          <a-button
+            size="small"
+            type="link"
+            v-if="$hasPermissions('B_marketingDivisionSet_edit')"
+            class="button-info"
+            @click="handleEdit(record)"
+            id="marketingDivisionSetList-edit-btn">编辑</a-button>
+          <a-button
+            size="small"
+            type="link"
+            v-if="$hasPermissions('B_marketingDivisionSet_del')"
+            class="button-error"
+            @click="handleDel(record)"
+            id="marketingDivisionSetList-del-btn">删除</a-button>
+          <span v-if="!$hasPermissions('B_marketingDivisionSet_edit') && !$hasPermissions('B_marketingDivisionSet_del')">--</span>
         </template>
       </s-table>
     </a-spin>

+ 10 - 7
src/views/dealerManagement/merchantInfoManagement/list.vue

@@ -38,6 +38,7 @@
               <a-button
                 style="margin-left: 5px"
                 type="primary"
+                v-if="$hasPermissions('B_merchantInfo_export')"
                 class="button-warning"
                 @click="handleExport"
                 :disabled="disabled"
@@ -53,7 +54,7 @@
       </div>
       <!-- 操作按钮 -->
       <div class="table-operator">
-        <a-button id="merchantInfoManagementList-add" type="primary" class="button-error" @click="handleAdd">新增</a-button>
+        <a-button id="merchantInfoManagementList-add" type="primary" v-if="$hasPermissions('B_merchantInfo_add')" class="button-error" @click="handleAdd">新增</a-button>
       </div>
       <!-- 总计 -->
       <a-alert type="info" showIcon style="margin-bottom:15px">
@@ -71,7 +72,8 @@
         bordered>
         <!-- 经销商 -->
         <template slot="dealerName" slot-scope="text, record">
-          <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.dealerName }}</span>
+          <span v-if="$hasPermissions('B_merchantInfo_detail')" style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.dealerName }}</span>
+          <span v-else>{{ record.dealerName }}</span>
         </template>
         <!-- 区域 -->
         <template slot="area" slot-scope="text, record">
@@ -82,11 +84,12 @@
         </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
-          <a-button size="small" type="link" class="button-warning" v-if="record.auditState == 'WAIT'" @click="handleAudit(record)" >审核</a-button>
-          <a-button size="small" type="link" class="button-success" @click="handleCooperation(record)" >合作设置</a-button>
-          <a-button size="small" type="link" class="button-error" v-if="record.auditState != 'WAIT'" @click="handleDistribution(record)">经销权</a-button>
-          <a-button size="small" type="link" class="button-primary" @click="handleLevel(record)">级别设置</a-button>
-          <a-button size="small" type="link" class="button-info" @click="handleEdit(record)">编辑</a-button>
+          <a-button size="small" type="link" class="button-warning" v-if="record.auditState == 'WAIT' && $hasPermissions('B_merchantInfo_audit')" @click="handleAudit(record)" >审核</a-button>
+          <a-button size="small" type="link" class="button-success" v-if="$hasPermissions('B_merchantInfo_cooperation')" @click="handleCooperation(record)" >合作设置</a-button>
+          <a-button size="small" type="link" class="button-error" v-if="record.auditState != 'WAIT' && $hasPermissions('B_merchantInfo_distribution')" @click="handleDistribution(record)">经销权</a-button>
+          <a-button size="small" type="link" class="button-primary" v-if="$hasPermissions('B_merchantInfo_level')" @click="handleLevel(record)">级别设置</a-button>
+          <a-button size="small" type="link" class="button-info" v-if="$hasPermissions('B_merchantInfo_edit')" @click="handleEdit(record)">编辑</a-button>
+          <span v-if="!(record.auditState == 'WAIT' && $hasPermissions('B_merchantInfo_audit')) && !$hasPermissions('B_merchantInfo_cooperation') && !(record.auditState != 'WAIT' && $hasPermissions('B_merchantInfo_distribution')) && !$hasPermissions('B_merchantInfo_level') && !$hasPermissions('B_merchantInfo_edit')">--</span>
         </template>
       </s-table>
     </a-spin>

+ 8 - 1
src/views/dealerManagement/rebateSettings/list.vue

@@ -28,7 +28,14 @@
       bordered>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" type="link" class="button-info" @click="handleEdit(record)" id="rebateSettingsList-edit-btn">编辑</a-button>
+        <a-button
+          size="small"
+          type="link"
+          v-if="$hasPermissions('B_rebateSettings_edit')"
+          class="button-info"
+          @click="handleEdit(record)"
+          id="rebateSettingsList-edit-btn">编辑</a-button>
+        <span v-else>--</span>
       </template>
       <!-- 经销商名称 -->
       <template slot="jxs" slot-scope="text, record">

+ 1 - 1
src/views/dealerManagement/rebateSettings/queryChild.vue

@@ -45,7 +45,7 @@ export default {
       const fetchId = this.lastFetchId
       this.data = []
       this.fetching = true
-      dealerRelationList({ 'dealerName': dealerName, 'dealerLevelList': this.dealerLevelList, pageNo: 1, pageSize: 1000 }).then(res => {
+      dealerRelationList({ 'dealerName': dealerName, 'dealerLevelList': this.dealerLevelList, pageNo: 1, pageSize: 20 }).then(res => {
         if (fetchId !== this.lastFetchId) {
           return
         }

+ 14 - 5
src/views/financialManagement/financialCollection/list.vue

@@ -1,6 +1,6 @@
 <template>
   <a-card size="small" :bordered="false" class="financialCollectionList-wrap">
-	  <a-spin :spinning="spinning" tip="Loading...">
+    <a-spin :spinning="spinning" tip="Loading...">
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -125,14 +125,14 @@
         bordered>
         <!-- 单号 -->
         <template slot="salesBillNo" slot-scope="text, record">
-          <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.salesBillNo }}</span>
+          <span :class="$hasPermissions('B_salesDetail')?'active':'common'" @click="handleDetail(record)">{{ record.salesBillNo }}</span>
         </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
           <a-button
             size="small"
             type="link"
-            v-if="record.financialStatus=='WAIT'"
+            v-if="record.financialStatus=='WAIT' && $hasPermissions('B_financialCollection_receipt')"
             class="button-warning"
             @click="handleAudit(record)"
             id="financialCollectionList-audit-btn">收款</a-button>
@@ -250,7 +250,9 @@ export default {
     },
     // 详情
     handleDetail (row) {
-      this.$router.push({ name: 'salesDetail', params: { sn: row.salesBillSn } })
+      if (this.$hasPermissions('B_salesDetail')) {
+        this.$router.push({ name: 'salesDetail', params: { sn: row.salesBillSn } })
+      }
     },
     // 收款
     handleAudit (row) {
@@ -266,7 +268,7 @@ export default {
               _this.$message.success(res.message)
               _this.$refs.table.refresh()
               _this.spinning = false
-            }else{
+            } else {
               _this.spinning = false
             }
           })
@@ -329,5 +331,12 @@ export default {
     .sTable{
       margin-top: 20px;
     }
+	.active{
+		color: #ed1c24;
+		cursor: pointer;
+	}
+	.common{
+		color: #000;
+	}
   }
 </style>

+ 12 - 4
src/views/financialManagement/returnConfirmation/list.vue

@@ -1,6 +1,6 @@
 <template>
   <a-card size="small" :bordered="false" class="returnConfirmationList-wrap">
-	  <a-spin :spinning="spinning" tip="Loading...">
+    <a-spin :spinning="spinning" tip="Loading...">
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -67,14 +67,14 @@
         bordered>
         <!-- 销退单号 -->
         <template slot="salesReturnBillNo" slot-scope="text, record">
-          <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.salesReturnBillNo }}</span>
+          <span :class="$hasPermissions('B_returnConfirmation_detail')?'active':'common'" @click="handleDetail(record)">{{ record.salesReturnBillNo }}</span>
         </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
           <a-button
             size="small"
             type="link"
-            v-if="record.billStatus=='WAIT_FINANCIAL_AUDIT'"
+            v-if="record.billStatus=='WAIT_FINANCIAL_AUDIT' && $hasPermissions('B_returnConfirmation_return')"
             class="button-warning"
             @click="handleAudit(record)"
             id="returnConfirmationList-audit-btn">退货确认</a-button>
@@ -165,6 +165,7 @@ export default {
     },
     // 详情
     handleDetail (row) {
+      if (!this.$hasPermissions('B_returnConfirmation_detail')) { return }
       this.itemSn = row.salesReturnBillSn
       this.openModal = true
     },
@@ -201,7 +202,7 @@ export default {
           _this.$message.success(res.message)
           _this.$refs.table.refresh()
           _this.spinning = false
-        }else{
+        } else {
           _this.spinning = false
         }
       })
@@ -215,5 +216,12 @@ export default {
     .sTable{
       margin-top: 20px;
     }
+	.active{
+		color: #ed1c24;
+		cursor: pointer;
+	}
+	.common{
+		color: #000;
+	}
   }
 </style>

+ 38 - 25
src/views/financialManagement/warehousingConfirmation/list.vue

@@ -1,6 +1,6 @@
 <template>
   <a-card size="small" :bordered="false" class="warehousingConfirmationList-wrap">
-	  <a-spin :spinning="spinning" tip="Loading...">
+    <a-spin :spinning="spinning" tip="Loading...">
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -29,7 +29,7 @@
         </a-form>
       </div>
       <!-- 列表 -->
-      <div style="margin-bottom: 15px">
+      <div v-if="$hasPermissions('B_warehousingConfirmationpl')" style="margin-bottom: 15px">
         <a-button type="primary" id="warehousingConfirmationList-export" :loading="loading" @click="handleBatchAudit">批量确认</a-button>
         <span style="margin-left: 8px">
           <template v-if="hasSelected">{{ `已选 ${selectedRowKeys.length} 项` }}</template>
@@ -47,14 +47,14 @@
         bordered>
         <!-- 入库单号 -->
         <template slot="stockPutNo" slot-scope="text, record">
-          <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.stockPutNo }}</span>
+          <span :class="$hasPermissions('B_warehousingConfirmationDetail')?'active':'common'" @click="handleDetail(record)">{{ record.stockPutNo }}</span>
         </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
           <a-button
             size="small"
             type="link"
-            v-if="record.auditState=='WAIT'"
+            v-if="record.auditState=='WAIT' && $hasPermissions('B_warehousingConfirmationAlone')"
             class="button-warning"
             @click="handleAudit(record)"
             id="warehousingConfirmationList-audit-btn">入库确认</a-button>
@@ -142,17 +142,21 @@ export default {
       return this.selectedRowKeys.length > 0
     },
     rowSelection () {
-      return {
-        selectedRowKeys: this.selectedRowKeys,
-        onChange: (selectedRowKeys, selectedRows) => {
-          console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows)
-          this.onSelectChange(selectedRowKeys)
-        },
-        getCheckboxProps: record => ({
-          props: {
-            disabled: record.auditState != 'WAIT'
-          }
-        })
+      if (this.$hasPermissions('B_warehousingConfirmationpl')) {
+        return {
+			  selectedRowKeys: this.selectedRowKeys,
+			  onChange: (selectedRowKeys, selectedRows) => {
+			    console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows)
+			    this.onSelectChange(selectedRowKeys)
+			  },
+			  getCheckboxProps: record => ({
+			    props: {
+			      disabled: record.auditState != 'WAIT'
+			    }
+			  })
+        }
+      } else {
+        return null
       }
     }
   },
@@ -165,9 +169,11 @@ export default {
     },
     // 详情
     handleDetail (row) {
-      this.itemSn = row.stockPutSn
-      this.nowData = row
-      this.openModal = true
+      if (this.$hasPermissions('B_warehousingConfirmationDetail')) {
+        this.itemSn = row.stockPutSn
+        this.nowData = row
+        this.openModal = true
+      }
     },
     closeModal () {
       this.itemSn = ''
@@ -175,18 +181,18 @@ export default {
       this.openModal = false
     },
     // 通过
-    handleConfirmationOk(){
-      if(this.isBatch){  //  批量
+    handleConfirmationOk () {
+      if (this.isBatch) { //  批量
         this.auditOrder(this.selectedRowKeys, true)
-      }else{
+      } else {
         this.auditOrder([this.confirmationInfo.stockPutSn], true)
       }
     },
     // 不通过
-    handleConfirmationFail(){
-      if(this.isBatch){  //  批量
+    handleConfirmationFail () {
+      if (this.isBatch) { //  批量
         this.auditOrder(this.selectedRowKeys, false)
-      }else{
+      } else {
         this.auditOrder([this.confirmationInfo.stockPutSn], false)
       }
     },
@@ -215,7 +221,7 @@ export default {
           _this.$refs.table.refresh()
           _this.confirmationModal = false
           _this.spinning = false
-        }else{
+        } else {
           _this.confirmationModal = false
           _this.spinning = false
         }
@@ -245,6 +251,13 @@ export default {
       margin-top: 20px;
     }
   }
+	.active{
+		color: #ed1c24;
+		cursor: pointer;
+	}
+	.common{
+		color: #000;
+	}
   .confirmation-modal{
     .ant-modal-body{
       padding: 32px 32px 24px;

+ 4 - 4
src/views/power/menu/menu.vue

@@ -1,9 +1,9 @@
 <template>
   <a-card :bordered="false">
     <a-row :gutter="24">
-      <a-button style="margin-right: 10px;" type="primary" icon="plus" @click="addChild">添加子菜单</a-button>
-      <a-button style="margin-right: 10px;background-color: #19be6b;color: #fff;" type="" icon="plus" @click="addTitle">添加顶部菜单</a-button>
-      <a-button style="margin-right: 10px;background-color: red;color: #fff;" type="" icon="delete" @click="delect()">删除</a-button>
+      <a-button v-if="$hasPermissions('B_power_menu_child_add')" style="margin-right: 10px;" type="primary" icon="plus" @click="addChild">添加子菜单</a-button>
+      <a-button v-if="$hasPermissions('B_power_menu_top_add')" style="margin-right: 10px;background-color: #19be6b;color: #fff;" type="" icon="plus" @click="addTitle">添加顶部菜单</a-button>
+      <a-button v-if="$hasPermissions('B_power_menu_del')" style="margin-right: 10px;background-color: red;color: #fff;" type="" icon="delete" @click="delect()">删除</a-button>
 
     </a-row>
     <a-row :gutter="24">
@@ -172,7 +172,7 @@
           </a-form-item>
 
           <a-form-item :wrapper-col="{ span: 12, offset: 5 }">
-            <a-button type="primary" @click="handleSubmit()">
+            <a-button type="primary" @click="handleSubmit()" v-if="$hasPermissions('B_power_menu_edit')">
               保存
             </a-button>
             <a-button :style="{ marginLeft: '8px' }" @click="clear">

+ 7 - 4
src/views/power/role/roleList.vue

@@ -29,7 +29,7 @@
       </div>
       <div class="table-operator">
         <!-- <a-button v-if="$hasPermissions('B_powerMD_role_add')" type="primary" class="button-error" @click="openModal" id="roleList-openModal">新增</a-button> -->
-        <a-button type="primary" class="button-error" @click="openModal" id="roleList-openModal">新增</a-button>
+        <a-button type="primary" v-if="$hasPermissions('B_power_role_add')" class="button-error" @click="openModal" id="roleList-openModal">新增</a-button>
       </div>
 
       <s-table
@@ -55,7 +55,9 @@
             unCheckedChildren="禁用"
             id="roleList-isEnable"
             v-model="record.isEnable"
+            v-if="$hasPermissions('B_power_role_enable')"
             @change="changeFlagHandle(text, record)" />
+          <span v-else>--</span>
         </span>
         <!-- 角色描述 -->
         <template slot="remarks" slot-scope="text, record">
@@ -71,14 +73,15 @@
             :style="{fontSize: '20px',color: '#f00',padding: '0 10px'}"
             v-if="!record.isEnable && $hasPermissions('B_powerMD_role_del')"
             @click="delect(record)" /> -->
-          <a-icon type="setting" title="菜单权限" :style="{ fontSize: '20px', color: '#e29e14', padding: '0 10px' }" @click="openMenuModal(record)" />
-          <a-icon type="edit" title="编辑" :style="{fontSize: '20px',color:' #1890FF',padding:' 0 10px'}" @click="handleEdit(record)" />
+          <a-icon type="setting" title="菜单权限" v-if="$hasPermissions('M_power_role_menu')" :style="{ fontSize: '20px', color: '#e29e14', padding: '0 10px' }" @click="openMenuModal(record)" />
+          <a-icon type="edit" title="编辑" v-if="$hasPermissions('B_power_role_edit')" :style="{fontSize: '20px',color:' #1890FF',padding:' 0 10px'}" @click="handleEdit(record)" />
           <a-icon
             type="delete"
             title="删除"
             :style="{fontSize: '20px',color: '#f00',padding: '0 10px'}"
-            v-if="!record.isEnable"
+            v-if="!record.isEnable && $hasPermissions('B_power_role_del')"
             @click="delect(record)" />
+          <span v-if="!$hasPermissions('M_power_role_menu') && !$hasPermissions('B_power_role_edit') && (record.isEnable && !$hasPermissions('B_power_role_del'))">--</span>
         </span>
       </s-table>
     </a-spin>

+ 7 - 6
src/views/power/user/userList.vue

@@ -28,7 +28,7 @@
       </div>
       <div class="table-operator">
         <!-- <a-button v-if="$hasPermissions('B_powerMD_user_add')" type="primary" class="button-error" @click="openModal">新增</a-button> -->
-        <a-button type="primary" class="button-error" @click="openModal">新增</a-button>
+        <a-button type="primary" v-if="$hasPermissions('B_power_user_add')" class="button-error" @click="openModal">新增</a-button>
       </div>
       <s-table
         ref="table"
@@ -44,8 +44,8 @@
           <!-- <a-switch v-if="$hasPermissions('B_powerMD_user_enable')" checkedChildren="启用" unCheckedChildren="禁用" v-model="record.loginFlag" @change="changeFlagHandle(text, record)"/>
           <span v-else>{{ record.loginFlag==1?'已启用':'已禁用' }}</span> -->
           <!-- 超级管理员不可删除不可编辑不可启禁用 -->
-          <a-switch v-if="record.superAdmin!=1" checkedChildren="启用" unCheckedChildren="禁用" v-model="record.loginFlag" @change="changeFlagHandle(text, record)"/>
-          <span v-if="record.superAdmin==1">{{ record.loginFlag==1?'已启用':'已禁用' }}</span>
+          <a-switch v-if="record.superAdmin!=1 && $hasPermissions('B_power_user_enable')" checkedChildren="启用" unCheckedChildren="禁用" v-model="record.loginFlag" @change="changeFlagHandle(text, record)"/>
+          <span v-else>{{ record.loginFlag==1?'已启用':'已禁用' }}</span>
         </span>
         <span slot="action" slot-scope="text, record">
           <!-- <a-icon
@@ -70,25 +70,26 @@
           <a-icon
             type="edit"
             title="编辑"
-            v-if="record.superAdmin!=1"
+            v-if="record.superAdmin!=1 &&$hasPermissions('B_power_user_edit')"
             :style="{fontSize: '20px',color:' #1890FF',padding:' 0 10px'}"
             @click="handleEdit(record)"
           />
           <a-icon
             type="unlock"
             title="重置密码"
-            v-if="record.loginFlag==1 && record.superAdmin!=1"
+            v-if="record.loginFlag==1 && record.superAdmin!=1 &&$hasPermissions('B_power_user_resetPsd')"
             :style="{fontSize: '20px',color:' #ffaa00',padding: '0 10px'}"
             @click="resetPassword(record)" />
           <a-icon
             type="delete"
             title="删除"
             :style="{fontSize: '20px',color: '#f00',padding: '0 10px'}"
-            v-if="record.loginFlag==0 && record.superAdmin!=1"
+            v-if="record.loginFlag==0 && record.superAdmin!=1 &&$hasPermissions('B_power_user_del')"
             @click="delect(record)"/>
           <a-icon
             type="setting"
             title="分区设置"
+            v-if="$hasPermissions('B_power_user_set')"
             :style="{fontSize: '20px',color:' #00aa00',padding: '0 10px'}"
             @click="handleSetting(record)" />
         </span>

+ 1 - 0
src/views/productManagement/priceChangeRecord/list.vue

@@ -56,6 +56,7 @@
               <a-button
                 style="margin: 0 0 18px 8px"
                 type="primary"
+                v-if="$hasPermissions('B_priceChangeRecord_export')"
                 class="button-warning"
                 @click="handleExport"
                 :loading="exportLoading"

+ 17 - 3
src/views/productManagement/productBrand/list.vue

@@ -31,7 +31,7 @@
       </div>
       <!-- 操作按钮 -->
       <div class="table-operator">
-        <a-button id="productBrandList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
+        <a-button id="productBrandList-add" type="primary" v-if="$hasPermissions('B_productBrand_add')" class="button-error" @click="handleEdit()">新增</a-button>
       </div>
       <!-- 列表 -->
       <s-table
@@ -49,14 +49,28 @@
         </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
-          <a-button size="small" type="link" class="button-info" @click="handleEdit(record)" id="productBrandList-edit-btn">编辑</a-button>
-          <a-button size="small" type="link" class="button-success" @click="handleDetail(record)" id="productBrandList-detail-btn">详情</a-button>
           <a-button
             size="small"
             type="link"
+            v-if="$hasPermissions('B_productBrand_edit')"
+            class="button-info"
+            @click="handleEdit(record)"
+            id="productBrandList-edit-btn">编辑</a-button>
+          <a-button
+            size="small"
+            type="link"
+            v-if="$hasPermissions('B_productBrand_detail')"
+            class="button-success"
+            @click="handleDetail(record)"
+            id="productBrandList-detail-btn">详情</a-button>
+          <a-button
+            size="small"
+            type="link"
+            v-if="$hasPermissions('B_productBrand_del')"
             class="button-error"
             @click="handleDel(record)"
             id="productBrandList-del-btn">删除</a-button>
+          <span v-if="!$hasPermissions('B_productBrand_edit') && !$hasPermissions('B_productBrand_detail') && !$hasPermissions('B_productBrand_del')">--</span>
         </template>
       </s-table>
     </a-spin>

+ 5 - 4
src/views/productManagement/productCategory/list.vue

@@ -3,7 +3,7 @@
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 操作按钮 -->
       <div class="table-operator-nobor">
-        <a-button id="productCategoryList-add" type="primary" class="button-error" @click="handleAdd()">新增一级分类</a-button>
+        <a-button id="productCategoryList-add" type="primary" v-if="$hasPermissions('B_productCategory_add')" class="button-error" @click="handleAdd()">新增一级分类</a-button>
       </div>
       <!-- 列表 -->
       <s-table
@@ -20,7 +20,7 @@
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
           <a-button
-            v-if="record.productTypeLevel<3"
+            v-if="record.productTypeLevel<3 && $hasPermissions('B_productCategory_add')"
             type="link"
             class="button-success"
             size="small"
@@ -28,7 +28,7 @@
             id="productCategory-addSubItem"
             @click="handleAdd(record)">新增子级</a-button>
           <a-button
-            v-if="record.pid != 0"
+            v-if="record.pid != 0 && $hasPermissions('B_productCategory_edit')"
             type="link"
             class="button-info"
             size="small"
@@ -36,13 +36,14 @@
             id="productCategory-edit"
             @click="handleEdit(record)">编辑</a-button>
           <a-button
-            v-if="record.pid != 0"
+            v-if="record.pid != 0 && $hasPermissions('B_productCategory_del')"
             type="link"
             class="button-error"
             size="small"
             icon="delete"
             id="productCategory-del"
             @click="handleDel(record)">删除</a-button>
+          <span v-if="!(record.productTypeLevel<3 && $hasPermissions('B_productCategory_add')) && !(record.pid != 0 && $hasPermissions('B_productCategory_edit')) && !(record.pid != 0 && $hasPermissions('B_productCategory_del'))">--</span>
         </template>
       </s-table>
     </a-spin>

+ 6 - 2
src/views/productManagement/productInfo/detailModal.vue

@@ -22,7 +22,7 @@
         <a-descriptions-item label="产品图片:" :span="2">
           <div style="display: flex;">
             <p class="pic-box" v-for="(item,index) in fileList" :key="index">
-              <img :src="item" title="点击查看大图" class="productPic" @click="getPreview(item)" />
+              <img :src="item.imageUrl" title="点击查看大图" class="productPic" @click="getPreview(item.imageUrl)" />
             </p>
           </div>
           <span v-if="fileList.length == 0">--</span>
@@ -85,7 +85,11 @@ export default {
       productSnDetail({ sn: this.itemSn }).then(res => {
         if (res.status == 200) {
           this.detailsData = res.data
-          this.fileList = res.data.productMsg ? res.data.productMsg.split(',') : []
+          if (res.data && res.data.productPicList && res.data.productPicList.length > 0) {
+            this.fileList = res.data.productPicList
+          } else {
+            this.fileList = []
+          }
         } else {
           this.detailsData = null
         }

+ 25 - 9
src/views/productManagement/productInfo/list.vue

@@ -59,6 +59,7 @@
               <a-button style="margin-bottom: 18px;" type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productInfoList-refresh">查询</a-button>
               <a-button style="margin: 0 0 18px 5px" @click="resetSearchForm" :disabled="disabled" id="productInfoList-reset">重置</a-button>
               <a-button
+                v-if="$hasPermissions('B_productInfo_export')"
                 style="margin-left: 5px"
                 type="primary"
                 class="button-warning"
@@ -76,10 +77,11 @@
       </div>
       <!-- 操作按钮 -->
       <div class="table-operator">
-        <a-button id="productInfoList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
+        <a-button id="productInfoList-add" type="primary" v-if="$hasPermissions('B_productInfo_add')" class="button-error" @click="handleEdit()">新增</a-button>
         <a-button
           id="productInfoList-batchAudit"
           type="primary"
+          v-if="$hasPermissions('B_productInfo_batchAudit')"
           class="button-warning"
           :loading="loadingAudit"
           @click="handleBatchAudit"
@@ -87,6 +89,7 @@
         <a-button
           id="productInfoList-batchLaunch"
           type="primary"
+          v-if="$hasPermissions('B_productInfo_batchLaunch')"
           class="button-primary"
           :loading="loadingLaunch"
           @click="handleBatchLaunch"
@@ -94,15 +97,15 @@
         <a-button
           id="productInfoList-batchDownline"
           type="primary"
+          v-if="$hasPermissions('B_productInfo_batchDownline')"
           class="button-grey"
           :loading="loadingDownline"
           @click="handleBatchDownline"
           style="margin: 0 15px;">批量下线</a-button>
-        <span style="margin-left: 8px">
+        <span style="margin-left: 8px" v-if="$hasPermissions('B_productInfo_batchAudit') || $hasPermissions('B_productInfo_batchLaunch') || $hasPermissions('B_productInfo_batchDownline')">
           <template v-if="hasSelected">{{ `已选 ${selectedRowKeys.length} 项` }}</template>
         </span>
       </div>
-      <!-- 列表 -->
       <s-table
         class="sTable"
         ref="table"
@@ -140,33 +143,46 @@
           <a-button
             size="small"
             type="link"
-            v-if="record.state=='WAIT'"
+            v-if="record.state=='WAIT' && $hasPermissions('B_productInfo_audit')"
             class="button-warning"
             @click="handleAudit(record)"
             id="productInfoList-audit-btn">审核</a-button>
           <a-button
             size="small"
             type="link"
-            v-if="record.state=='WAIT_ONLINE'||record.state=='OFFLINE'"
+            v-if="(record.state=='WAIT_ONLINE'||record.state=='OFFLINE') && $hasPermissions('B_productInfo_launch')"
             class="button-primary"
             @click="handleLaunch(record)"
             id="productInfoList-launch-btn">上线</a-button>
           <a-button
             size="small"
             type="link"
-            v-if="record.state=='ONLINE'"
+            v-if="record.state=='ONLINE' && $hasPermissions('B_productInfo_downline')"
             class="button-grey"
             @click="handleDownline(record)"
             id="productInfoList-downline-btn">下线</a-button>
-          <a-button size="small" type="link" class="button-info" @click="handleEdit(record)" id="productInfoList-edit-btn">编辑</a-button>
-          <a-button size="small" type="link" class="button-success" @click="handleDetail(record)" id="productInfoList-detail-btn">详情</a-button>
           <a-button
             size="small"
             type="link"
-            v-if="record.state=='WAIT'"
+            v-if="$hasPermissions('B_productInfo_edit')"
+            class="button-info"
+            @click="handleEdit(record)"
+            id="productInfoList-edit-btn">编辑</a-button>
+          <a-button
+            size="small"
+            type="link"
+            v-if="$hasPermissions('B_productInfo_detail')"
+            class="button-success"
+            @click="handleDetail(record)"
+            id="productInfoList-detail-btn">详情</a-button>
+          <a-button
+            size="small"
+            type="link"
+            v-if="record.state=='WAIT' && $hasPermissions('B_productInfo_del')"
             class="button-error"
             @click="handleDel(record)"
             id="productInfoList-del-btn">删除</a-button>
+          <span v-if="!(record.state=='WAIT' && $hasPermissions('B_productInfo_audit')) && !((record.state=='WAIT_ONLINE'||record.state=='OFFLINE') && $hasPermissions('B_productInfo_launch')) && !(record.state=='ONLINE' && $hasPermissions('B_productInfo_downline')) && !$hasPermissions('B_productInfo_edit') && !$hasPermissions('B_productInfo_detail') && !(record.state=='WAIT' && $hasPermissions('B_productInfo_del'))">--</span>
         </template>
       </s-table>
     </a-spin>

+ 3 - 3
src/views/productManagement/productLaunchAudit/list.vue

@@ -35,8 +35,8 @@
       </div>
       <!-- 列表 -->
       <div style="margin-bottom: 15px">
-        <a-button type="primary" id="productLaunchAudit-export" :loading="loading" @click="handleBatchAudit">批量审核</a-button>
-        <span style="margin-left: 8px">
+        <a-button type="primary" v-if="$hasPermissions('B_productLaunchAudit_batchAudit')" id="productLaunchAudit-export" :loading="loading" @click="handleBatchAudit">批量审核</a-button>
+        <span style="margin-left: 8px" v-if="$hasPermissions('B_productLaunchAudit_batchAudit')">
           <template v-if="hasSelected">{{ `已选 ${selectedRowKeys.length} 项` }}</template>
         </span>
       </div>
@@ -60,7 +60,7 @@
           <a-button
             size="small"
             type="link"
-            v-if="record.state=='WAIT_ONLINE_AUDIT'"
+            v-if="record.state=='WAIT_ONLINE_AUDIT' && $hasPermissions('B_productLaunchAudit_audit')"
             class="button-warning"
             @click="handleAudit(record)"
             id="productLaunchAuditList-audit-btn">审核</a-button>

+ 8 - 1
src/views/productManagement/productLevel/list.vue

@@ -82,7 +82,14 @@
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" type="link" class="button-info" @click="handleEdit(record)" id="productLevelList-edit-btn">编辑</a-button>
+        <a-button
+          size="small"
+          type="link"
+          v-if="$hasPermissions('B_productLevel_edit')"
+          class="button-info"
+          @click="handleEdit(record)"
+          id="productLevelList-edit-btn">编辑</a-button>
+        <span v-else>--</span>
       </template>
     </s-table>
     <!-- 编辑价格 -->

+ 3 - 3
src/views/productManagement/productOfflineAudit/list.vue

@@ -80,8 +80,8 @@
       </div>
       <!-- 列表 -->
       <div style="margin-bottom: 15px">
-        <a-button type="primary" id="productOfflineAudit-export" :loading="loading" @click="handleBatchAudit">批量审核</a-button>
-        <span style="margin-left: 8px">
+        <a-button type="primary" v-if="$hasPermissions('B_productOfflineAudit_batchAudit')" id="productOfflineAudit-export" :loading="loading" @click="handleBatchAudit">批量审核</a-button>
+        <span style="margin-left: 8px" v-if="$hasPermissions('B_productOfflineAudit_batchAudit')">
           <template v-if="hasSelected">{{ `已选 ${selectedRowKeys.length} 项` }}</template>
         </span>
       </div>
@@ -105,7 +105,7 @@
           <a-button
             size="small"
             type="link"
-            v-if="record.state=='WAIT_OFFLINE_AUDIT'"
+            v-if="record.state=='WAIT_OFFLINE_AUDIT' && $hasPermissions('B_productOfflineAudit_audit')"
             class="button-warning"
             @click="handleAudit(record)"
             id="productOfflineAuditList-audit-btn">审核</a-button>

+ 3 - 2
src/views/productManagement/productPricing/list.vue

@@ -98,11 +98,12 @@
         <a-button
           size="small"
           type="link"
-          v-if="record.pricingState=='WAIT_PRICING_AUDIT'"
+          v-if="record.pricingState=='WAIT_PRICING_AUDIT' && $hasPermissions('B_productPricing_audit')"
           class="button-warning"
           @click="handleAudit(record)"
           id="productPricingList-audit-btn">审核</a-button>
-        <a-button size="small" type="link" class="button-info" @click="handleEdit(record)" id="productPricingList-edit-btn">编辑</a-button>
+        <a-button size="small" type="link" v-if="$hasPermissions('B_productPricing_edit')" class="button-info" @click="handleEdit(record)" id="productPricingList-edit-btn">编辑</a-button>
+        <span v-if="!(record.pricingState=='WAIT_PRICING_AUDIT' && $hasPermissions('B_productPricing_audit')) && !$hasPermissions('B_productPricing_edit')">--</span>
       </template>
     </s-table>
     <!-- 编辑价格 -->

+ 16 - 3
src/views/productManagement/productUniversal/list.vue

@@ -45,7 +45,7 @@
       </div>
       <!-- 操作按钮 -->
       <div class="table-operator">
-        <a-button id="productUniversalList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
+        <a-button id="productUniversalList-add" type="primary" v-if="$hasPermissions('B_productUniversal_add')" class="button-error" @click="handleEdit()">新增</a-button>
       </div>
       <!-- 列表 -->
       <s-table
@@ -64,8 +64,21 @@
         </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
-          <a-button size="small" type="link" class="button-info" @click="handleEdit(record)" id="productUniversalList-edit-btn">编辑</a-button>
-          <a-button size="small" type="link" class="button-error" @click="handleDel(record)" id="productUniversalList-del-btn">删除</a-button>
+          <a-button
+            size="small"
+            type="link"
+            v-if="$hasPermissions('B_productUniversal_edit')"
+            class="button-info"
+            @click="handleEdit(record)"
+            id="productUniversalList-edit-btn">编辑</a-button>
+          <a-button
+            size="small"
+            type="link"
+            v-if="$hasPermissions('B_productUniversal_del')"
+            class="button-error"
+            @click="handleDel(record)"
+            id="productUniversalList-del-btn">删除</a-button>
+          <span v-if="!$hasPermissions('B_productUniversal_edit') && !$hasPermissions('B_productUniversal_del')">--</span>
         </template>
       </s-table>
     </a-spin>

+ 2 - 0
src/views/promotionRulesManagement/orderStatistics/list.vue

@@ -77,9 +77,11 @@
         <a-button
           size="small"
           type="link"
+          v-if="$hasPermissions('B_orderStatistics_detail')"
           @click="handleDetail(record)"
           class="button-success"
           id="orderStatisticsList-edit-btn">详情</a-button>
+        <span v-else>--</span>
       </template>
     </s-table>
     <!-- 详情 -->

+ 2 - 0
src/views/promotionRulesManagement/productStatistics/list.vue

@@ -82,9 +82,11 @@
         <a-button
           size="small"
           type="link"
+          v-if="$hasPermissions('B_productStatistics_detail')"
           class="button-success"
           @click="handleDetail(record)"
           id="productStatisticsList-detail-btn">详情</a-button>
+        <span v-else>--</span>
       </template>
     </s-table>
     <!-- 详情 -->

+ 7 - 4
src/views/promotionRulesManagement/promotionRules/list.vue

@@ -29,7 +29,7 @@
       </div>
       <!-- 操作按钮 -->
       <div class="table-operator">
-        <a-button id="promotionRulesList-add" type="primary" class="button-error" @click="openModal=true">新增</a-button>
+        <a-button id="promotionRulesList-add" type="primary" v-if="$hasPermissions('B_promotionRules_add')" class="button-error" @click="openModal=true">新增</a-button>
       </div>
       <!-- 总计 -->
       <a-alert type="info" showIcon style="margin-bottom:15px">
@@ -56,35 +56,38 @@
         <!-- 状态 -->
         <template slot="enabledFlag" slot-scope="text, record">
           <a-switch
+            v-if="$hasPermissions('B_promotionRules_enable')"
             id="promotionRulesList-enable"
             checkedChildren="启用"
             unCheckedChildren="禁用"
             @change="changeStatus(record)"
             :checked="record.enabledFlag == 1 ? true : false" />
-          <!-- <span v-else :style="{color:(record.enabledFlag==1?'#00aa00':'#999')}"> {{ record.enabledFlag==1? '已启用': '已禁用' }} </span> -->
+          <span v-else :style="{color:(record.enabledFlag==1?'#00aa00':'#999')}"> {{ record.enabledFlag==1? '已启用': '已禁用' }} </span>
         </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
           <a-button
             size="small"
             type="link"
-            v-if="record.enabledFlag != 1"
+            v-if="record.enabledFlag != 1 && $hasPermissions('B_promotionRules_ruleSet')"
             class="button-primary"
             @click="handleRule(record)"
             id="promotionRulesList-rule-btn">规则设置</a-button>
           <a-button
             size="small"
             type="link"
-            v-if="record.enabledFlag != 1"
+            v-if="record.enabledFlag != 1 && $hasPermissions('B_promotionRules_edit')"
             class="button-info"
             @click="handleEdit(record)"
             id="promotionRulesList-edit-btn">编辑</a-button>
           <a-button
             size="small"
             type="link"
+            v-if="$hasPermissions('B_promotionRules_detail')"
             class="button-success"
             @click="handleDetail(record)"
             id="promotionRulesList-detail-btn">详情</a-button>
+          <span v-if="!(record.enabledFlag != 1 && $hasPermissions('B_promotionRules_ruleSet')) && !(record.enabledFlag != 1 && $hasPermissions('B_promotionRules_edit')) && !$hasPermissions('B_promotionRules_detail')">--</span>
         </template>
       </s-table>
     </a-spin>

+ 22 - 16
src/views/purchasingManagement/bulkWarehousingOrder/list.vue

@@ -26,8 +26,9 @@
       </div>
       <!-- 操作按钮 -->
       <div class="table-operator">
-        <a-button id="bulkWarehousingOrderList-add" type="primary" class="button-error" @click="handleAdd">新增</a-button>
+        <a-button v-if="$hasPermissions('B_sparePartsNew')" id="bulkWarehousingOrderList-add" type="primary" class="button-error" @click="handleAdd">新增</a-button>
         <a-button
+          v-if="$hasPermissions('B_sparePartsAudit')"
           id="bulkWarehousingOrderList-batchAudit"
           type="primary"
           class="button-warning"
@@ -51,7 +52,7 @@
         bordered>
         <!-- 入库单号 -->
         <template slot="sparePartsNo" slot-scope="text, record">
-          <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.sparePartsNo }}</span>
+          <span :class="$hasPermissions('B_sparePartsDetail')?'active':'common'" @click="handleDetail(record)">{{ record.sparePartsNo }}</span>
         </template>
         <!-- 财务状态 -->
         <template slot="settleState" slot-scope="text, record">
@@ -62,18 +63,18 @@
           <a-button
             size="small"
             type="link"
-            v-if="record.state == 'WAIT_AUDIT'"
+            v-if="record.state == 'WAIT_AUDIT' && $hasPermissions('B_sparePartsEdit')"
             @click="handleEdit(record)"
             class="button-info"
             id="bulkWarehousingOrderList-edit-btn">编辑</a-button>
           <a-button
             size="small"
             type="link"
-            v-if="record.state == 'WAIT_AUDIT'"
+            v-if="record.state == 'WAIT_AUDIT' && $hasPermissions('B_sparePartsDel')"
             @click="handleDel(record)"
             class="button-error"
             id="bulkWarehousingOrderList-del-btn">删除</a-button>
-          <span v-if="record.state != 'WAIT_AUDIT'">--</span>
+          <span v-if="record.state != 'WAIT_AUDIT'||(!$hasPermissions('B_sparePartsEdit') && !$hasPermissions('B_sparePartsDel'))">--</span>
         </template>
       </s-table>
     </a-spin>
@@ -143,17 +144,21 @@ export default {
       return this.selectedRowKeys.length > 0
     },
     rowSelection () {
-      return {
-        selectedRowKeys: this.selectedRowKeys,
-        onChange: (selectedRowKeys, selectedRows) => {
-          console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows)
-          this.onSelectChange(selectedRowKeys)
-        },
-        getCheckboxProps: record => ({
-          props: {
-            disabled: record.state != 'WAIT_AUDIT'
-          }
-        })
+      if (this.$hasPermissions('B_sparePartsAudit')) {
+        return {
+			  selectedRowKeys: this.selectedRowKeys,
+			  onChange: (selectedRowKeys, selectedRows) => {
+			    console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows)
+			    this.onSelectChange(selectedRowKeys)
+			  },
+			  getCheckboxProps: record => ({
+			    props: {
+			      disabled: record.state != 'WAIT_AUDIT'
+			    }
+			  })
+        }
+      } else {
+        return null
       }
     }
   },
@@ -176,6 +181,7 @@ export default {
     },
     //  详情
     handleDetail (row) {
+      if (!this.$hasPermissions('B_sparePartsDetail')) { return }
       this.itemSn = row.sparePartsSn
       this.openDetailModal = true
     },

+ 18 - 4
src/views/supplierManagement/supplierInfo/list.vue

@@ -19,7 +19,7 @@
       </div>
       <!-- 操作按钮 -->
       <div class="table-operator">
-        <a-button id="supplierInfoList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
+        <a-button id="supplierInfoList-add" type="primary" v-if="$hasPermissions('B_supplierInfo_add')" class="button-error" @click="handleEdit()">新增</a-button>
       </div>
       <!-- 总计 -->
       <a-alert type="info" showIcon style="margin-bottom:15px">
@@ -36,12 +36,26 @@
         bordered>
         <!-- 状态 -->
         <template slot="enabledFlag" slot-scope="text, record">
-          <a-switch checkedChildren="启用" unCheckedChildren="禁用" v-model="record.enableFlag" @change="changeFlagHandle(text, record)"/>
+          <a-switch v-if="$hasPermissions('B_supplierInfo_enabled')" checkedChildren="启用" unCheckedChildren="禁用" v-model="record.enableFlag" @change="changeFlagHandle(text, record)"/>
+          <span v-else :style="{color:(record.enableFlag==1?'#00aa00':'#999')}"> {{ record.enableFlag==1? '已启用': '已禁用' }} </span>
         </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
-          <a-button size="small" type="link" class="button-warning" @click="handleRelated(record)" id="supplierInfoList-related-btn">关联产品</a-button>
-          <a-button size="small" type="link" class="button-info" @click="handleEdit(record)" id="supplierInfoList-edit-btn">编辑</a-button>
+          <a-button
+            size="small"
+            type="link"
+            v-if="$hasPermissions('B_supplierInfo_relation')"
+            class="button-warning"
+            @click="handleRelated(record)"
+            id="supplierInfoList-related-btn">关联产品</a-button>
+          <a-button
+            size="small"
+            type="link"
+            v-if="$hasPermissions('B_supplierInfo_edit')"
+            class="button-info"
+            @click="handleEdit(record)"
+            id="supplierInfoList-edit-btn">编辑</a-button>
+          <span v-if="!$hasPermissions('B_supplierInfo_relation') && !$hasPermissions('B_supplierInfo_edit')">--</span>
         </template>
       </s-table>
     </a-spin>