新分支

src/router/modules/stock.js

@@ -115,6 +115,15 @@ export default {
       meta: { title: 'print_all', noCache: true }
     },
 
+    {
+      path: '/stock/stockInventoryPrint',
+      component: () => import('@/xt_pages/stock/stockInventoryPrint'),
+      name: 'stockInventoryPrint',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'stockInventoryPrint', noCache: true }
+    },
+
     // {
     //   path: "/stock/",
     //   component: Layout,

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -2203,7 +2203,7 @@
 
 
                       <tr
-                      v-if="org_id == 0 || org_id ==10206 || org_id == 10644"
+                      v-if="org_id == 0 || org_id ==10206 || org_id == 10644 || org_id == 10489"
                       v-for="(advice, advice_index) in projectsOne"
                       :key="advice_index"
                     >
@@ -5645,7 +5645,7 @@ export default {
 
         console.log("haaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",this.doctor_advices)
 
-        if(this.org_id ==10206 || this.org_id ==10644 || this.org_id ==10633 || this.org_id == 0){
+        if(this.org_id ==10206 || this.org_id ==10644 || this.org_id ==10633 || this.org_id == 0 || this.org_id == 10489){
           let projectsOne = [];
           response.data.data.projects.map((item) => {
               projectsOne.push(item);

src/xt_pages/stock/inventoryRecord.vue

@@ -188,7 +188,7 @@ export default {
              this.$message.error("请勾选需要打印的内容")
              return false
           }              
-          this.$router.push({path:'/stock/print_all?storehouse_id='+this.storehouse_id+"&good_name="+this.searchKey+"&limit="+this.limit+"&page="+this.page+"&ids="+this.ids})
+          this.$router.push({path:'/stock/stockInventoryPrint?storehouse_id='+this.storehouse_id+"&good_name="+this.searchKey+"&limit="+this.limit+"&page="+this.page+"&ids="+this.ids})
         },
 
         search(){

src/xt_pages/stock/stockInventory.vue

@@ -22,9 +22,9 @@
                 <stockDamaged ref="childOne"></stockDamaged>
             </el-tab-pane>
 
-            <!-- <el-tab-pane label="盘点记录表" name="seven">
+            <el-tab-pane label="盘点记录表" name="seven">
                 <inventory-record ref="childSeven"></inventory-record>
-            </el-tab-pane> -->
+            </el-tab-pane>
         </el-tabs>
         
     </div>

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-  //   store.dispatch('VerifyConfigList', []).then(() => {
-  //     next()
-  //   })
-  // }
-  // if (store.getters.permission_routers === undefined) {
-  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
-  //     next()
-  //   })
-  // } else {
-  //   next()
-  // }
-  // return
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+    store.dispatch('VerifyConfigList', []).then(() => {
+      next()
+    })
+  }
+  if (store.getters.permission_routers === undefined) {
+    store.dispatch('xt_GenerateRoutes', []).then(() => {
+      next()
+    })
+  } else {
+    next()
+  }
+  return
   // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))