lilei 1 ano atrás
pai
commit
741d4333c0

+ 1 - 1
public/version.json

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

+ 4 - 3
src/views/purchasingManagement/purchaseOrder/detail.vue

@@ -173,9 +173,10 @@ export default {
   },
   },
   computed: {
   computed: {
     showConvertPromoGIftQty(){
     showConvertPromoGIftQty(){
-      const ret = this.detail && (this.detail.totalPutQty + this.detail.totalWaitPutQty + this.detail.totalCancelQty
- + this.detail.totalConvertPromoGiftsQty) == this.detail.totalQty
-      return ret
+      const c = this.detail ? this.detail.totalConvertPromoGiftsQty : 0
+      const a = this.detail ? (this.detail.totalPutQty + this.detail.totalWaitPutQty + this.detail.totalCancelQty + c) : 0
+      const b = this.detail ? this.detail.totalQty : 0
+         return this.detail && c>0 && a == b
     },
     },
     columns () {
     columns () {
       const _this = this
       const _this = this

+ 1 - 1
src/views/purchasingManagement/purchaseOrderNew/detail.vue

@@ -178,7 +178,7 @@ export default {
       const c = this.detail ? this.detail.totalConvertPromoGiftsQty : 0
       const c = this.detail ? this.detail.totalConvertPromoGiftsQty : 0
       const a = this.detail ? (this.detail.totalPutQty + this.detail.totalWaitPutQty + this.detail.totalCancelQty + c) : 0
       const a = this.detail ? (this.detail.totalPutQty + this.detail.totalWaitPutQty + this.detail.totalCancelQty + c) : 0
       const b = this.detail ? this.detail.totalQty : 0
       const b = this.detail ? this.detail.totalQty : 0
-         return this.detail && c && a == b
+         return this.detail && c>0 && a == b
     },
     },
     columns () {
     columns () {
       const _this = this
       const _this = this