Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dev

src/views/material/BOMmanage/detailsPop.vue

@@ -819,6 +819,12 @@
       },
 
       handSubmit() {
+        if (Number(this.currentNodeData.baseCount) <= 0) {
+          this.$message.warning('基本用量需要大于0');
+
+          return;
+        }
+
         if (this.clientEnvironmentId == 5) {
           this.isSubmit = true;
         } else {

src/views/material/product/components/goodsAllocation.vue

@@ -72,7 +72,7 @@
             >
 
             <el-button size="small" type="primary" @click="batchDelete"
-              >批量删除</el-button
+              >批量删除货位</el-button
             >
           </el-form-item>
         </el-col>