Browse Source

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

chenrui 4 years ago
parent
commit
a0d01416cd

+ 1 - 1
src/views/basicData/warehouse/list.vue

@@ -38,7 +38,7 @@
             type="link"
             class="button-warning"
             @click="goStoringLocation(record)"
-            v-if="$hasPermissions('B_warehouse_add')"
+            v-if="$hasPermissions('B_warehouse_ckSet')"
             id="warehouseList-storingLocation-btn">仓位管理</a-button>
           <a-button
             size="small"

+ 1 - 1
src/views/inventoryManagement/inventoryWarning/list.vue

@@ -92,7 +92,7 @@
         class="sTable"
         ref="table"
         size="default"
-        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onChange, onSelect: onSelectChange, onSelectAll: onSelectAllChange }"
+        :row-selection="$hasPermissions('B_inventoryWarning_refresh')?{ selectedRowKeys: selectedRowKeys, onChange: onChange, onSelect: onSelectChange, onSelectAll: onSelectAllChange }:null"
         :rowKey="(record) => record.id"
         :columns="columns"
         :dataSource="loadData"

+ 5 - 1
src/views/productManagement/productInfo/list.vue

@@ -110,7 +110,7 @@
         class="sTable"
         ref="table"
         size="default"
-        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onChange, onSelect: onSelectChange, onSelectAll: onSelectAllChange }"
+        :row-selection=" showSelect ?{ selectedRowKeys: selectedRowKeys, onChange: onChange, onSelect: onSelectChange, onSelectAll: onSelectAllChange }:null"
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
@@ -267,6 +267,10 @@ export default {
   computed: {
     hasSelected () {
       return this.selectedRowKeys.length > 0
+    },
+    // 是否显示table选择框
+    showSelect () {
+      return this.$hasPermissions('B_productInfo_batchAudit') || this.$hasPermissions('B_productInfo_batchLaunch') || this.$hasPermissions('B_productInfo_batchDownline')
     }
   },
   methods: {

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

@@ -118,7 +118,7 @@ export default {
       return this.selectedRowKeys.length > 0
     },
     rowSelection () {
-      return {
+      return this.$hasPermissions('B_productLaunchAudit_batchAudit') ? {
         selectedRowKeys: this.selectedRowKeys,
         onChange: (selectedRowKeys, selectedRows) => {
           console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows)
@@ -129,7 +129,7 @@ export default {
             disabled: record.state != 'WAIT_ONLINE_AUDIT'
           }
         })
-      }
+      } : null
     }
   },
   methods: {

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

@@ -177,7 +177,7 @@ export default {
       return this.selectedRowKeys.length > 0
     },
     rowSelection () {
-      return {
+      return this.$hasPermissions('B_productOfflineAudit_batchAudit') ? {
         selectedRowKeys: this.selectedRowKeys,
         onChange: (selectedRowKeys, selectedRows) => {
           console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows)
@@ -188,7 +188,7 @@ export default {
             disabled: record.state != 'WAIT_OFFLINE_AUDIT'
           }
         })
-      }
+      } : null
     }
   },
   methods: {