5 Commits 07b717bbe3 ... af5504bdb6

Author SHA1 Message Date
  yesheng af5504bdb6 Merge branch 'master' of http://113.105.183.190:3000/zhaohanlin/rtk-web-wms-cloud 2 weeks ago
  yesheng ad3a27694c 库位打印相关 2 weeks ago
  yesheng dcab99779d Merge branch 'master' of http://192.168.1.160:3000/zhaohanlin/rtk-web-wms-cloud 2 weeks ago
  yesheng 69520695b5 Merge branch 'master' of http://192.168.1.160:3000/zhaohanlin/rtk-web-wms-cloud 2 weeks ago
  yesheng 9abdae57f2 积木打印相关 2 weeks ago

+ 2 - 2
src/store/modules/permission.js

@@ -60,7 +60,7 @@ function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) {
             activeMenu: route.activeMenu,
             id: route.id,
             noCache: !route.keepAlive,
-            reportId: route.reportIds,
+            reportId: route.reportId,
             reportList: route.reportList,
             bpmnModelId: route.bpmnModelId,
             componentName: route.componentName,
@@ -126,4 +126,4 @@ export const loadView = (view) => {
     return (resolve) => require([`@/views/${view}`], resolve);
 };
 
-export default permission;
+export default permission;

+ 0 - 0
src/views/visualization/jmreport/index.vue → src/views/report/jmreport/index.vue


+ 3 - 3
src/views/system/menu/index.vue

@@ -349,12 +349,12 @@
           </el-col>
           <!-- 报表选择 -->
           <el-col v-if="form.type === 2" :span="12">
-            <el-form-item label="报表选择" prop="reportIds">
+            <el-form-item label="报表选择" prop="reportId">
               <ReportSelect
                 ref="reportSelect"
-                v-model="form.reportIds"
+                v-model="form.reportId"
                 filterable
-                multiple
+                clearable
                 placeholder="请选择报表"
               />
             </el-form-item>

+ 1 - 1
src/views/wms/base/components/StockLocation.vue

@@ -658,7 +658,7 @@ export default {
       this.getList();
       this.tokens = localStorage.getItem(AccessTokenKey);
       this.baseUrl = process.env.VUE_APP_REPORT_API;
-      this.reportId = this.$route.meta.reportId[0];
+      this.reportId = this.$route.meta.reportId;
     },
     dialogClose() {
       this.list = [];