Browse Source

权限控制

lilei 2 years ago
parent
commit
016ec5759a

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1674959935746
+  "version": 1674960852515
 }

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

@@ -2620,8 +2620,8 @@ export const asyncRouterMap = [
             component: BlankLayout,
             meta: {
               title: '连锁调入报表',
-              icon: 'profile'
-              // permission: 'M_chainTransferReportList'
+              icon: 'profile',
+              permission: 'M_chainTransferReportList'
             },
             hideChildrenInMenu: true,
             children: [
@@ -2644,8 +2644,8 @@ export const asyncRouterMap = [
             component: BlankLayout,
             meta: {
               title: '连锁调出报表',
-              icon: 'profile'
-              // permission: 'M_chainCallReportList'
+              icon: 'profile',
+              permission: 'M_chainCallReportList'
             },
             hideChildrenInMenu: true,
             children: [

+ 12 - 12
src/views/chainReportData/chainCallReport/detailList.vue

@@ -3,7 +3,7 @@
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
       <a-form-model
-        id="storeTransOutDetailReport-form"
+        id="chainCallReportExport-form"
         ref="ruleForm"
         class="form-model-con"
         layout="inline"
@@ -25,13 +25,13 @@
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-model-item label="连锁调出单号">
-              <a-input id="chainTransferInReport-allocationLinkageOutNo" v-model.trim="queryParam.allocationLinkageOutNo" allowClear placeholder="请输入连锁调入单号"/>
+              <a-input id="chainCallReportExport-allocationLinkageOutNo" v-model.trim="queryParam.allocationLinkageOutNo" allowClear placeholder="请输入连锁调入单号"/>
             </a-form-model-item>
           </a-col>
           <template v-if="advanced">
             <a-col :md="4" :sm="24">
               <a-form-item label="调往对象">
-                <outTenant id="chainTransferInReport-putTenantSn" v-model="queryParam.putTenantSn"></outTenant>
+                <outTenant id="chainCallReportExport-putTenantSn" v-model="queryParam.putTenantSn"></outTenant>
               </a-form-item>
             </a-col>
             <a-col :md="4" :sm="24">
@@ -39,7 +39,7 @@
                 <v-select
                   v-model="queryParam.allocationType"
                   ref="allocationType"
-                  id="chainTransferInReport-allocationType"
+                  id="chainCallReportExport-allocationType"
                   code="ALLOCATION_LINKAGE_PRODUCT_TYPE"
                   placeholder="请选择调拨产品类型"
                   allowClear></v-select>
@@ -47,37 +47,37 @@
             </a-col>
             <a-col :md="4" :sm="24">
               <a-form-model-item label="产品编码">
-                <a-input id="chainTransferInReport-code" v-model.trim="queryParam.productEntity.code" allowClear placeholder="请输入产品编码"/>
+                <a-input id="chainCallReportExport-code" v-model.trim="queryParam.productEntity.code" allowClear placeholder="请输入产品编码"/>
               </a-form-model-item>
             </a-col>
             <a-col :md="4" :sm="24">
               <a-form-model-item label="产品名称">
-                <a-input id="chainTransferInReport-name" v-model.trim="queryParam.productEntity.name" allowClear placeholder="请输入产品名称"/>
+                <a-input id="chainCallReportExport-name" v-model.trim="queryParam.productEntity.name" allowClear placeholder="请输入产品名称"/>
               </a-form-model-item>
             </a-col>
             <a-col :md="4" :sm="24">
               <a-form-item label="产品品牌">
-                <ProductBrand id="chainTransferInReport-productBrandSn" placeholder="请选择产品品牌" v-model="queryParam.productEntity.productBrandSn"></ProductBrand>
+                <ProductBrand id="chainCallReportExport-productBrandSn" placeholder="请选择产品品牌" v-model="queryParam.productEntity.productBrandSn"></ProductBrand>
               </a-form-item>
             </a-col>
             <a-col :md="4" :sm="24">
               <a-form-model-item label="产品分类">
-                <ProductType id="chainTransferInReport-productType" placeholder="请选择产品分类" :isDealer="true" @change="changeProductType" v-model="queryParam.productType"></ProductType>
+                <ProductType id="chainCallReportExport-productType" placeholder="请选择产品分类" :isDealer="true" @change="changeProductType" v-model="queryParam.productType"></ProductType>
               </a-form-model-item>
             </a-col>
           </template>
           <a-col :md="4" :sm="24" style="margin-bottom: 10px;">
-            <a-button type="primary" @click="handleSearch" :disabled="disabled" id="chainTransferInReport-refresh">查询</a-button>
-            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="chainTransferInReport-reset">重置</a-button>
+            <a-button type="primary" @click="handleSearch" :disabled="disabled" id="chainCallReportExport-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="chainCallReportExport-reset">重置</a-button>
             <a-button
               type="primary"
               style="margin-left: 5px"
               @click="handleExport"
               :disabled="disabled"
               :loading="exportLoading"
-              v-if="$hasPermissions('M_storeTransferOutReportExport')"
+              v-if="$hasPermissions('M_chainCallReportExport')"
               class="button-warning"
-              id="chainTransferInReport-export-btn">导出</a-button>
+              id="chainCallReportExport-export-btn">导出</a-button>
             <a @click="advanced=!advanced" style="margin-left: 5px">
               {{ advanced ? '收起' : '展开' }}
               <a-icon :type="advanced ? 'up' : 'down'"/>

+ 8 - 8
src/views/chainReportData/chainCallReport/list.vue

@@ -3,7 +3,7 @@
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
       <a-form-model
-        id="storeTransOutReport-form"
+        id="chainCallReportExport-form"
         ref="ruleForm"
         class="form-model-con"
         layout="inline"
@@ -25,13 +25,13 @@
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-model-item label="连锁调出单号">
-              <a-input id="chainTransferInReport-allocationLinkageOutNo" v-model.trim="queryParam.allocationLinkageOutNo" allowClear placeholder="请输入连锁调出单号"/>
+              <a-input id="chainCallReportExport-allocationLinkageOutNo" v-model.trim="queryParam.allocationLinkageOutNo" allowClear placeholder="请输入连锁调出单号"/>
             </a-form-model-item>
           </a-col>
           <template v-if="advanced">
             <a-col :md="4" :sm="24">
               <a-form-item label="调往对象">
-                <outTenant id="chainTransferInReport-putTenantSn" v-model="queryParam.putTenantSn"></outTenant>
+                <outTenant id="chainCallReportExport-putTenantSn" v-model="queryParam.putTenantSn"></outTenant>
               </a-form-item>
             </a-col>
              <a-col :md="4" :sm="24">
@@ -39,7 +39,7 @@
                  <v-select
                    v-model="queryParam.allocationType"
                    ref="allocationType"
-                   id="chainTransferInReport-allocationType"
+                   id="chainCallReportExport-allocationType"
                    code="ALLOCATION_LINKAGE_PRODUCT_TYPE"
                    placeholder="请选择调拨产品类型"
                    allowClear></v-select>
@@ -47,17 +47,17 @@
              </a-col>
           </template>
           <a-col :md="4" :sm="24" style="margin-bottom: 10px;">
-            <a-button type="primary" @click="handleSearch" :disabled="disabled" id="chainTransferInReport-refresh">查询</a-button>
-            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="chainTransferInReport-reset">重置</a-button>
+            <a-button type="primary" @click="handleSearch" :disabled="disabled" id="chainCallReportExport-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="chainCallReportExport-reset">重置</a-button>
             <a-button
               type="primary"
               style="margin-left: 5px"
               @click="handleExport"
               :disabled="disabled"
               :loading="exportLoading"
-              v-if="$hasPermissions('M_storeTransferOutReportExport')"
+              v-if="$hasPermissions('M_chainCallReportExport')"
               class="button-warning"
-              id="chainTransferInReport-export-btn">导出</a-button>
+              id="chainCallReportExport-export-btn">导出</a-button>
               <a @click="advanced=!advanced" style="margin-left: 5px">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>

+ 1 - 1
src/views/chainReportData/chainTransferReport/detailList.vue

@@ -70,7 +70,7 @@
               @click="handleExport"
               :disabled="disabled"
               :loading="exportLoading"
-              v-if="$hasPermissions('M_storeTransferOutReportExport')"
+              v-if="$hasPermissions('M_chainTransferInReportExport')"
               class="button-warning"
               id="chainTransferInReport-export-btn">导出</a-button>
             <a @click="advanced=!advanced" style="margin-left: 5px">

+ 1 - 1
src/views/chainReportData/chainTransferReport/list.vue

@@ -48,7 +48,7 @@
               @click="handleExport"
               :disabled="disabled"
               :loading="exportLoading"
-              v-if="$hasPermissions('M_storeTransferOutReportExport')"
+              v-if="$hasPermissions('M_chainTransferInReportExport')"
               class="button-warning"
               id="chainTransferInReport-export-btn">导出</a-button>
           </a-col>

+ 2 - 2
vue.config.js

@@ -211,8 +211,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.0.216:8076/qpls-md',
-        // target: 'http://p.iscm.360arrow.com/qpls-md',
+        // target: 'http://192.168.0.216:8076/qpls-md',
+        target: 'http://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         ws: true,
         changeOrigin: true,