Merge remote-tracking branch 'remotes/origin/3.3.1-dspf' into 3.3.2-dzxxp

src/views/studentViews/chemicalManagement/studentChemicalInfo/addPage.vue

@@ -236,13 +236,30 @@
         console.log('rule',rule)
         const list = rule.field.split('.');
         let index = parseFloat(list[1]);
+        let index2 = parseFloat(list[3]);
         let max = parseFloat(this.dialogData.maxList[index].maxNum);
+        let tare = parseFloat(this.dialogData.maxList[index].list[index2].tare);
         if(value>max){
           callback(new Error("超出该机柜可存放量"));
+        }else if(value<tare){
+          callback(new Error("容器容量规格不能小于容器重量规格"));
         }else{
           callback();
         }
       };
+      const computingTare = (rule, value, callback) => {
+        console.log('rule',rule)
+        const list = rule.field.split('.');
+        let index = parseFloat(list[1]);
+        let index2 = parseFloat(list[3]);
+        let chemicalAmount = parseFloat(this.dialogData.maxList[index].list[index2].chemicalAmount);
+        if(value>chemicalAmount){
+          callback(new Error("容器重量规格不能大于容器容量规格"));
+        }else{
+          callback();
+        }
+      };
+
       return {
         //限制时间范围
         pickerBeginOption: {
@@ -284,11 +301,12 @@
           chemicalAmount:[
             { required: true, message: '请输入容器容量', trigger: 'blur' },
             { required: true, message: "请输入容器容量", validator: this.spaceJudgment, trigger: "blur" },
-            { required: true, message: "超出该机柜可存放量", validator: computingCapacity, trigger: "blur" },
+            { required: true, validator: computingCapacity, trigger: "blur" },
           ],
           tare:[
             { required: true, message: '请输入容器自重', trigger: 'blur' },
-            { required: true, message: "请输入容器自重", validator: this.spaceJudgment, trigger: "blur" }
+            { required: true, message: "请输入容器自重", validator: this.spaceJudgment, trigger: "blur" },
+            { required: true, validator: computingTare, trigger: "blur" },
           ],
           storageNum:[
             { required: true, message: '请输入存放数量', trigger: 'blur' },