diff --git a/.env.development b/.env.development index 4e262404..1b41c7eb 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ VITE_BASE_URL=http://localhost:12080/admin-api -# VITE_BASE_URL=http://dev.ccwin-in.com:28051/api/admin-api +#VITE_BASE_URL=http://dev.ccwin-in.com:28051/api/admin-api # VITE_BASE_URL_IMAGE=http://172.22.32.9:81/admin-api # 租户配置 diff --git a/src/mycomponents/qty/recommendQtyEdit.vue b/src/mycomponents/qty/recommendQtyEdit.vue index a722fc76..75bb6791 100644 --- a/src/mycomponents/qty/recommendQtyEdit.vue +++ b/src/mycomponents/qty/recommendQtyEdit.vue @@ -187,6 +187,7 @@ import { nextTick } from 'vue'; setValue() { // var recommendQty = Number(this.dataContent.qty); // var labelQty = Number(this.dataContent.record.label.qty); + // 采购收货判断是否大于包装数量isNumPackTips这个字段做判断 if (this.allQty > parseFloat(this.dataContent.packQty) && this.isNumPackTips) { this.$refs.comMessage.showErrorMessage('数量[' + this.allQty + ']不允许大于包装数量[' + this.dataContent.packQty + @@ -196,6 +197,7 @@ import { nextTick } from 'vue'; }) return } + // 其他功能判断是否大于标签数量 if (this.allQty > this.labelQty && this.isNumTips && !this.isNumPackTips) { this.$refs.comMessage.showErrorMessage('数量[' + this.allQty + ']不允许大于标签数量[' + this.labelQty +