lilei 2 年之前
父節點
當前提交
3df3ed8225
共有 3 個文件被更改,包括 14 次插入10 次删除
  1. 1 1
      public/version.json
  2. 2 2
      src/components/tools/UserMenu.vue
  3. 11 7
      src/views/purchasingManagement/purchaseOrderNew/edit.vue

+ 1 - 1
public/version.json

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

+ 2 - 2
src/components/tools/UserMenu.vue

@@ -6,7 +6,7 @@
         <span style="vertical-align: middle;">帮助</span>
         <span style="vertical-align: middle;">帮助</span>
       </p>
       </p>
       <p class="help-cont" @click="showShopCar" v-if="$hasPermissions('M_shoppingCart')">
       <p class="help-cont" @click="showShopCar" v-if="$hasPermissions('M_shoppingCart')">
-        <a-badge :count="cartCount">
+        <a-badge :count="cartCount" :overflow-count="999">
           <a-icon type="shopping-cart" style="font-size:16px;margin: 0 5px;"/>
           <a-icon type="shopping-cart" style="font-size:16px;margin: 0 5px;"/>
           <span>购物车</span>
           <span>购物车</span>
         </a-badge>
         </a-badge>
@@ -108,7 +108,7 @@ export default {
     NoticeIcon
     NoticeIcon
   },
   },
   computed: {
   computed: {
-    ...mapGetters(['nickname', 'avatar', 'authOrgs', 'userInfo', 'nowRoute', 'theme', 'fontSize', 'printDefNeedle','cartCount']),
+    ...mapGetters(['nickname', 'avatar', 'authOrgs', 'userInfo', 'nowRoute', 'theme', 'fontSize', 'printDefNeedle', 'cartCount']),
     authOrgsList () { //  过滤掉当前登录账户(不可由自己切换为自己)
     authOrgsList () { //  过滤掉当前登录账户(不可由自己切换为自己)
       const _this = this
       const _this = this
       const arr = []
       const arr = []

+ 11 - 7
src/views/purchasingManagement/purchaseOrderNew/edit.vue

@@ -187,7 +187,6 @@ import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import { STable, VSelect } from '@/components'
 import ImportGuideModal from './importGuideModal.vue'
 import ImportGuideModal from './importGuideModal.vue'
 import outStockModal from './outStockModal.vue'
 import outStockModal from './outStockModal.vue'
-const shopingCatModal = () => import(/* webpackChunkName: "shopingCatModal" */ '@/views/common/shopingCatModal.vue');
 import chooseAddressModal from '@/views/common/receivingAddress/chooseAddressModal.vue'
 import chooseAddressModal from '@/views/common/receivingAddress/chooseAddressModal.vue'
 import { purchaseDetailBySn, purchaseWriteSubmit, purchaseDetailPrint, purchaseDetailExport, purchaseDetailAddress } from '@/api/purchase'
 import { purchaseDetailBySn, purchaseWriteSubmit, purchaseDetailPrint, purchaseDetailExport, purchaseDetailAddress } from '@/api/purchase'
 import { purchaseDetailList, purchaseDetailSave, purchaseDetailDel, purchaseDetailCount, purchaseDetailCancelList } from '@/api/purchaseDetail'
 import { purchaseDetailList, purchaseDetailSave, purchaseDetailDel, purchaseDetailCount, purchaseDetailCancelList } from '@/api/purchaseDetail'
@@ -196,6 +195,7 @@ import chooseProductModal from './chooseProductModal.vue'
 // 打印
 // 打印
 import Print from '@/views/common/print.vue'
 import Print from '@/views/common/print.vue'
 import { hdPrint } from '@/libs/JGPrint'
 import { hdPrint } from '@/libs/JGPrint'
+const shopingCatModal = () => import(/* webpackChunkName: "shopingCatModal" */ '@/views/common/shopingCatModal.vue')
 export default {
 export default {
   name: 'PurchaseEdit',
   name: 'PurchaseEdit',
   components: { STable, VSelect, ImportGuideModal, outStockModal, Print, chooseAddressModal, chooseProductModal, shopingCatModal },
   components: { STable, VSelect, ImportGuideModal, outStockModal, Print, chooseAddressModal, chooseProductModal, shopingCatModal },
@@ -275,13 +275,13 @@ export default {
         if (res.status == 200) {
         if (res.status == 200) {
           this.detail = res.data
           this.detail = res.data
           if (!noRefashTable) {
           if (!noRefashTable) {
-            if(this.detail.totalCategory){
+            if (this.detail.totalCategory) {
               if (isReset) {
               if (isReset) {
                 this.resetPurchaseForm()
                 this.resetPurchaseForm()
               } else {
               } else {
                 this.$refs.purchaseTable.refresh(!!flag)
                 this.$refs.purchaseTable.refresh(!!flag)
               }
               }
-            }else{
+            } else {
               this.localDataSource = []
               this.localDataSource = []
               this.spinning = false
               this.spinning = false
             }
             }
@@ -356,8 +356,12 @@ export default {
       this.addLoading = true
       this.addLoading = true
       purchaseDetailSave(params).then(res => {
       purchaseDetailSave(params).then(res => {
         if (res.status == 200) {
         if (res.status == 200) {
-          this.getOrderDetail(false, true, true)
+          if (type == 0) {
+            this.getOrderDetail(false, true, true)
+          }
           this.$message.success(res.message)
           this.$message.success(res.message)
+        } else {
+          row.qty = row.qtyBackups
         }
         }
         this.addLoading = false
         this.addLoading = false
         this.$refs.chooseProduct.spinning = false
         this.$refs.chooseProduct.spinning = false
@@ -386,12 +390,12 @@ export default {
       this.getOrderDetail(false, true, true)
       this.getOrderDetail(false, true, true)
     },
     },
     // 打开购物车
     // 打开购物车
-    hanldCart(){
+    hanldCart () {
       this.paramsData = {
       this.paramsData = {
         purchaseBillSn: this.$route.params.sn,
         purchaseBillSn: this.$route.params.sn,
         purchaseBillNo: this.detail && this.detail.purchaseBillNo ? this.detail.purchaseBillNo : undefined
         purchaseBillNo: this.detail && this.detail.purchaseBillNo ? this.detail.purchaseBillNo : undefined
       }
       }
-      this.openShopCatModal=true
+      this.openShopCatModal = true
     },
     },
     // 上次缺货
     // 上次缺货
     handleOutStock () {
     handleOutStock () {
@@ -433,7 +437,7 @@ export default {
     // 打印预览/快捷打印
     // 打印预览/快捷打印
     handlePrint (type, printerType) {
     handlePrint (type, printerType) {
       const _this = this
       const _this = this
-      if(type == 'preview'){
+      if (type == 'preview') {
         _this.openChooseProduct = false
         _this.openChooseProduct = false
         _this.openOutStockModal = false
         _this.openOutStockModal = false
       }
       }