Browse Source

Merge branch 'feature_20250311_物料任务设置最大值' into uat(dev)

zhujindu 9 months ago
parent
commit
5f4387f7c1
2 changed files with 10 additions and 3 deletions
  1. 0 3
      src/store/modules/user.js
  2. 10 0
      src/views/deviceWithin/addStoreVisit.vue

+ 0 - 3
src/store/modules/user.js

@@ -15,9 +15,6 @@ const user = {
     SET_ACTIVA_TYPE_STORE: (state, value) => {
       state.activaTypeStore = value;
     },
-    SET_ASSIGN_FLAG: (state, value) => {
-      state.isAssignFlag = value;
-    },
     SET_STORE_TYPE: (state, value) => {
       state.storeType = value;
     },

+ 10 - 0
src/views/deviceWithin/addStoreVisit.vue

@@ -3092,6 +3092,11 @@ export default {
           if (Number(val) > Number(this.tableData1[index].inventoryNum)) {
             this.$toast('请输入小于等于销售部库存量');
             this.tableData1[index].value = '';
+            return
+          }
+          if (Number(val) > Number(this.tableData1[index].maxValue)) {
+            this.$toast('请输入小于等于最大发放量');
+            this.tableData1[index].value = '';
           }
         } else if (!this.insert) {
           if (
@@ -3101,6 +3106,11 @@ export default {
           ) {
             this.$toast('请输入小于等于销售部库存量+发放量');
             this.tableData1[index].value = this.tableData1[index].contrastValue;
+            return
+          }
+          if (Number(val) > Number(this.tableData1[index].maxValue)) {
+            this.$toast('请输入小于等于最大发放量');
+            this.tableData1[index].value = '';
           }
         } else {
           this.tableData1[index].value = val.replace(/[^\d.]/g, ''); //清除"数字"和"."以外的字符