Sfoglia il codice sorgente

Merge branch 'develop_yh21' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_yh21

lilei 1 anno fa
parent
commit
8a67301f27

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

@@ -956,8 +956,8 @@ export const asyncRouterMap = [
             component: BlankLayout,
             meta: {
               title: '采购缺货列表',
-              icon: 'money-collect'
-              // permission: 'M_purchaseOutOfStockList'
+              icon: 'money-collect',
+              permission: 'M_purchaseOutOfStockList'
             },
             hideChildrenInMenu: true,
             children: [
@@ -968,8 +968,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '采购缺货列表',
                   icon: 'money-collect',
-                  hidden: true
-                  // permission: 'M_purchaseOutOfStockList'
+                  hidden: true,
+                  permission: 'M_purchaseOutOfStockList'
                 }
               }
             ]

+ 6 - 4
src/views/purchasingManagement/purchaseOutOfStock/list.vue

@@ -11,13 +11,13 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="供应商名称">
-                <a-input id="outOfStockList-purchaseTargetName" v-model.trim="queryParam.purchaseTargetName" placeholder="请输入客户名称" allowClear />
+              <a-form-item label="采购单号">
+                <a-input id="outOfStockList-purchaseBillNo" v-model.trim="queryParam.purchaseBillNo" placeholder="请输入采购单号" allowClear />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="采购单号">
-                <a-input id="outOfStockList-purchaseBillNo" v-model.trim="queryParam.purchaseBillNo" placeholder="请输入采购单号" allowClear />
+              <a-form-item label="供应商名称">
+                <a-input id="outOfStockList-purchaseTargetName" v-model.trim="queryParam.purchaseTargetName" placeholder="请输入客户名称" allowClear />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
@@ -29,6 +29,7 @@
                 @click="handleExport"
                 :disabled="disabled"
                 :loading="exportLoading"
+                v-if="$hasPermissions('B_isExport')"
                 class="button-warning"
                 id="inventoryWarningList-export-btn">导出</a-button>
             </a-col>
@@ -63,6 +64,7 @@
             size="small"
             type="link"
             class="button-success"
+            v-if="$hasPermissions('B_purchaseOutOfStockDetail')"
             @click="handleDetail(record)"
             id="purchaseOutOfStock-edit-btn">详情</a-button>
         </template>