Browse Source

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

lilei 2 năm trước cách đây
mục cha
commit
abd90ae947

+ 11 - 0
src/components/tools/UserMenu.vue

@@ -5,6 +5,10 @@
         <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;"/>
+        <span style="vertical-align: middle;">购物车</span>
+      </p>
       <!-- 通知 -->
       <notice-icon class="action"/>
       <!-- 皮肤设置 -->
@@ -123,6 +127,10 @@ 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
@@ -140,6 +148,9 @@ export default {
     showVideo () {
       store.commit('IS_ShOW_VIDEO', true)
     },
+    showShopCar () {
+      this.$router.push({ path: '/shoppingCarManagement/shoppingCar/list' })
+    },
     handleLogout () {
       this.$confirm({
         title: '提示',

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

@@ -701,7 +701,7 @@ export const asyncRouterMap = [
           //         // permission: 'M_salesQueryList'
           //       }
           //     }
-           //   ]
+          //   ]
           // }
         ]
       },
@@ -712,10 +712,10 @@ export const asyncRouterMap = [
         component: PageView,
         meta: {
           title: '购物车管理',
-          icon: 'contacts'
-          // permission: 'M_supplierInfoList'
-           },
-         children: [
+          icon: 'contacts',
+          permission: 'M_shoppingCarManagement'
+        },
+        children: [
           {
             path: '/shoppingCarManagement/shoppingCar',
             redirect: '/shoppingCarManagement/shoppingCar/list',
@@ -724,8 +724,8 @@ export const asyncRouterMap = [
             meta: {
               title: '购物车',
               icon: 'contacts'
-              // permission: 'M_supplierInfoList'
-           },
+              // permission: 'M_shoppingCarList'
+            },
             hideChildrenInMenu: true,
             children: [
               {
@@ -736,7 +736,7 @@ export const asyncRouterMap = [
                   title: '购物车列表',
                   icon: 'contacts',
                   hidden: true
-                  // permission: 'M_supplierInfoList'
+                  // permission: 'M_shoppingCarList'
                 }
               }
             ]
@@ -810,7 +810,7 @@ export const asyncRouterMap = [
                   replaceTab: true,
                   permission: 'B_purchaseDetail'
                 }
-              },
+              }
             ]
           },
           {
@@ -850,7 +850,7 @@ export const asyncRouterMap = [
               {
                 path: 'edit/:sn/:dealerSn',
                 name: 'purchaseOrderNewEdit',
-               component: () => import(/* webpackChunkName: "purchasingManagement" */ '@/views/purchasingManagement/purchaseOrderNew/edit.vue'),
+                component: () => import(/* webpackChunkName: "purchasingManagement" */ '@/views/purchasingManagement/purchaseOrderNew/edit.vue'),
                 meta: {
                   title: '编辑采购单',
                   icon: 'file-done',
@@ -869,7 +869,7 @@ export const asyncRouterMap = [
                   replaceTab: true,
                   permission: 'B_purchaseDetail'
                 }
-              },
+              }
             ]
           },
           {

+ 24 - 21
src/views/inventoryManagement/inventoryQuery/setPurchaseQty.vue

@@ -26,7 +26,7 @@
         <a-form-model-item label="采购数量" prop="warehouseSnList">
           <a-input-number
             id="shelfMonitoringList-maxUnsalableDays"
-            v-model="formItemLayout.wrapperCol"
+            v-model="formItemLayout.warehouseSnList"
             :precision="0"
             :min="0"
             :max="999999"
@@ -89,28 +89,31 @@ export default {
     //  保存
     handleSave () {
       const _this = this
+      _this.$emit('close')
+      _this.$router.push({ name: 'shoppingCarList', params: { type: 'pageBtn' } })
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
-          const form = JSON.parse(JSON.stringify(_this.form))
-          if (form.checkType == 'ALL') {
-            delete form.warehouseFlag
-          }
-          if (form.warehouseSnList) {
-            form.warehouseSnList = form.warehouseSnList.join(',')
-          }
-          _this.spinning = true
-          checkWarehouseSave(form).then(res => {
-            if (res.status == 200) {
-              _this.$message.success(res.message)
-              setTimeout(() => {
-                _this.isShow = false
-                _this.$emit('ok', res.data)
-                _this.spinning = false
-              }, 1000)
-            } else {
-              _this.spinning = false
-            }
-          })
+
+          // const form = JSON.parse(JSON.stringify(_this.form))
+          // if (form.checkType == 'ALL') {
+          //   delete form.warehouseFlag
+          // }
+          // if (form.warehouseSnList) {
+          //   form.warehouseSnList = form.warehouseSnList.join(',')
+          // }
+          // _this.spinning = true
+          // checkWarehouseSave(form).then(res => {
+          //   if (res.status == 200) {
+          //     _this.$message.success(res.message)
+          //     setTimeout(() => {
+          //       _this.isShow = false
+          //       _this.$emit('ok', res.data)
+          //       _this.spinning = false
+          //     }, 1000)
+          //   } else {
+          //     _this.spinning = false
+          //   }
+          // })
         } else {
           console.log('error submit!!')
           return false

+ 3 - 7
src/views/shoppingCarManagement/shoppingCar/list.vue

@@ -79,12 +79,6 @@ export default {
   name: 'ShoppingCarList',
   components: { STable, ProductType, ProductBrand },
   mixins: [commonMixin],
-  props: {
-    type: { //  按钮状态
-      type: String,
-      default: 'globalBtn'
-    }
-  },
   data () {
     return {
       tableHeight: 0,
@@ -125,7 +119,8 @@ export default {
       openModal: false, //  查看客户详情  弹框
       itemId: '', //  当前产品id
       productTypeList: [], //  分类下拉数据
-      rowSelectionInfo: null
+      rowSelectionInfo: null,
+      type: 'globalBtn'
     }
   },
   computed: {
@@ -267,6 +262,7 @@ export default {
     },
     pageInit () {
       const _this = this
+      _this.type = _this.$route.params.type
       this.$nextTick(() => { // 页面渲染完成后的回调
         _this.setTableH()
       })