lilei vor 3 Jahren
Ursprung
Commit
be48b3a5a1

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

@@ -81,7 +81,7 @@ export const asyncRouterMap = [
         meta: {
           title: '数字货架',
           icon: 'hdd',
-          permission: 'M_numsGoodsShelves'
+          // permission: 'M_numsGoodsShelves'
         },
         children: [
           {
@@ -92,7 +92,7 @@ export const asyncRouterMap = [
             meta: {
               title: '货架设置',
               icon: 'monitor',
-              permission: 'M_shelfSet'
+              // permission: 'M_shelfSet'
             },
             hideChildrenInMenu: true,
             children: [
@@ -129,7 +129,7 @@ export const asyncRouterMap = [
             meta: {
               title: '货架监控',
               icon: 'monitor',
-              permission: 'M_shelfMonitoring'
+              // permission: 'M_shelfMonitoring'
             },
             hideChildrenInMenu: true,
             children: [
@@ -166,7 +166,7 @@ export const asyncRouterMap = [
             meta: {
               title: '补货管理',
               icon: 'monitor',
-              permission: 'M_replenishmentManagement'
+              // permission: 'M_replenishmentManagement'
             },
             hideChildrenInMenu: true,
             children: [
@@ -191,7 +191,7 @@ export const asyncRouterMap = [
             meta: {
               title: '调回管理',
               icon: 'monitor',
-              permission: 'M_recallManagement'
+              // permission: 'M_recallManagement'
             },
             hideChildrenInMenu: true,
             children: [
@@ -216,7 +216,7 @@ export const asyncRouterMap = [
             meta: {
               title: '结算管理',
               icon: 'monitor',
-              permission: 'M_settlementManagement'
+              // permission: 'M_settlementManagement'
             },
             hideChildrenInMenu: true,
             children: [
@@ -265,7 +265,7 @@ export const asyncRouterMap = [
             meta: {
               title: '提现管理',
               icon: 'monitor',
-              permission: 'M_withdrawalManagement'
+              // permission: 'M_withdrawalManagement'
             },
             hideChildrenInMenu: true,
             children: [

+ 1 - 1
src/views/numsGoodsShelves/replenishmentManagement/list.vue

@@ -77,7 +77,7 @@
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
           <a-button v-if="record.billState=='WAIT_CONFIRM'" size="small" type="link" class="button-primary" @click.stop="handleConfirm(record)">确认</a-button>
-          <a-button v-if="record.billState=='WAIT_OUT_STOCK'" size="small" type="link" class="button-primary" @click.stop="handlePrintSticker(record)">打印贴签</a-button>
+          <a-button size="small" type="link" class="button-primary" @click.stop="handlePrintSticker(record)">打印贴签</a-button>
           <a-button v-if="record.billState=='WAIT_OUT_STOCK'" size="small" type="link" class="button-primary" @click.stop="handleOutWarehousing(record)">出库</a-button>
           <a-button v-if="record.billState=='WAIT_CHECK'" size="small" type="link" class="button-primary" @click.stop="handlePutWarehousing(record)">签收</a-button>
           <a-button v-if="record.billState=='WAIT_CONFIRM' || record.billState=='WAIT_OUT_STOCK'" size="small" type="link" class="button-primary" @click.stop="handleCancelOrder(record)">取消补货单</a-button>

+ 4 - 2
src/views/numsGoodsShelves/replenishmentManagement/printStickerModal.vue

@@ -20,7 +20,7 @@
         size="small"
         :rowKey="(record) => record.id"
         rowKeyName="id"
-        :row-selection="{ columnWidth: 40, getCheckboxProps: record => ({ props: { disabled: record.confirmQty == 0 } }) }"
+        :row-selection="{ columnWidth: 40, getCheckboxProps: record => ({ props: { disabled: !record.confirmQty} }) }"
         @rowSelection="rowSelectionFun"
         :columns="columns"
         :data="loadData"
@@ -125,7 +125,9 @@ export default {
     },
     //  开始打印
     handleSave () {
-      if (this.rowSelectionInfo && this.rowSelectionInfo.selectedRows && this.rowSelectionInfo.selectedRows.length < 1) {
+      const hasSel = this.rowSelectionInfo && this.rowSelectionInfo.selectedRows
+      console.log(hasSel)
+      if (!hasSel || hasSel && hasSel.length < 1) {
         this.$message.warning('请至少选择一个产品')
       } else {
         const nowData = this.nowData