Просмотр исходного кода

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

chenrui 2 лет назад
Родитель
Сommit
62a3c806f4

+ 1 - 1
public/version.json

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

+ 3 - 7
src/components/tools/UserMenu.vue

@@ -5,8 +5,8 @@
         <img style="width: 22px;height: 22px;vertical-align: middle;margin: 0 5px;" src="../../assets/icon_movie.png"/>
         <span style="vertical-align: middle;">帮助</span>
       </p>
-      <p class="help-cont" v-if="isShopCar" @click="showShopCar">
-        <a-icon type="shopping-cart" style="font-size:18px;vertical-align: middle;margin: 0 5px;"/>
+      <p class="help-cont" @click="showShopCar">
+        <a-icon type="shopping-cart" style="font-size:16px;vertical-align: middle;margin: 0 5px;"/>
         <span style="vertical-align: middle;">购物车</span>
       </p>
       <!-- 通知 -->
@@ -127,10 +127,6 @@ export default {
       const isPurchaseReturn = this.nowRoute.indexOf('purchaseReturn') > -1 // 当前展示是否为采购退货模块
       return isSaleOrder || isSalesReturn || isPurchaseOrder || isPurchaseReturn
     },
-    isShopCar () {
-      const isInventoryQuery = this.nowRoute.indexOf('inventoryQuery') > -1
-      return isInventoryQuery
-    },
     printName () {
       const defName = this.printDefNeedle
       return defName && defName != 'undefined' ? defName : null
@@ -149,7 +145,7 @@ export default {
       store.commit('IS_ShOW_VIDEO', true)
     },
     showShopCar () {
-      this.$router.push({ path: '/shoppingCarManagement/shoppingCar/list' })
+      this.$router.push({ name: 'shoppingCarList' })
     },
     handleLogout () {
       this.$confirm({

+ 10 - 38
src/config/router.config.js

@@ -68,6 +68,16 @@ export const asyncRouterMap = [
                   icon: 'bell',
                   hidden: true
                 }
+              },
+              {
+                path: '/shoppingCarList',
+                name: 'shoppingCarList',
+                component: () => import(/* webpackChunkName: "home" */ '@/views/shoppingCarManagement/shoppingCar/list.vue'),
+                meta: {
+                  title: '购物车',
+                  icon: 'contacts',
+                  hidden: true
+                }
               }
             ]
           }
@@ -705,44 +715,6 @@ export const asyncRouterMap = [
           // }
         ]
       },
-      // 购物车
-      {
-        path: '/shoppingCarManagement',
-        redirect: '/shoppingCarManagement/shoppingCar',
-        component: PageView,
-        meta: {
-          title: '购物车管理',
-          icon: 'contacts',
-          permission: 'M_shoppingCarManagement'
-        },
-        children: [
-          {
-            path: '/shoppingCarManagement/shoppingCar',
-            redirect: '/shoppingCarManagement/shoppingCar/list',
-            name: 'shoppingCar',
-            component: BlankLayout,
-            meta: {
-              title: '购物车',
-              icon: 'contacts'
-              // permission: 'M_shoppingCarList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'shoppingCarList',
-                component: () => import(/* webpackChunkName: "productManagement" */ '@/views/shoppingCarManagement/shoppingCar/list.vue'),
-                meta: {
-                  title: '购物车列表',
-                  icon: 'contacts',
-                  hidden: true
-                  // permission: 'M_shoppingCarList'
-                }
-              }
-            ]
-          }
-        ]
-      },
       // 采购管理
       {
         path: '/purchasingManagement',

+ 4 - 0
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -400,6 +400,10 @@ export default {
       params.zeroQtyFlag = params.zeroQtyFlag ? '0' : ''
       params.enableFlag = params.enableFlag ? '' : '1'
       params.showCost = this.$hasPermissions('M_ShowAllCost') ? 1 : 0
+      // 仓库仓位
+      params.warehouseSn = params.warehouse[0]
+      params.warehouseLocationSn = params.warehouse[1]
+      
       this.exportLoading = true
       _this.spinning = true
       stockExport(params).then(res => {