删除按钮

src/views/template/templateFirst.vue

@@ -129,7 +129,13 @@
                         />
                       </el-form-item>
                       <el-form-item label="差异:" class="inspectionStandardLabel" prop="standoneCy">
-                        <span>{{inspectJbAl2o3List.standoneCy}}</span>
+                        <el-input
+                          v-model="inspectJbAl2o3List.standoneCy"
+                          class="inspectionStandardsInput"
+                          :maxlength="IRMAXLENGTHONE"
+                          :disabled="firstFromDisabled"
+                          @input="getCalculateDifference"
+                        />
                       </el-form-item>
                     </el-form>
                   </div>
@@ -680,7 +686,14 @@
                         />
                       </el-form-item>
                       <el-form-item label="差异:" class="inspectionStandardLabel" label-width="80" prop="standtwoCy">
-                        <span>{{inspectJbAl2o3List.standtwoCy}}</span>
+                        <el-input
+                          v-model="inspectJbAl2o3List.standtwoCy"
+                          :maxlength="IRMAXLENGTHTWO"
+                          :disabled="firstFromDisabled"
+                          class="inspectionStandardsInput"
+                          @blur="getInspect"
+                          @input="getCalculateDifferences"
+                        />
                       </el-form-item>
                     </el-form>
                   </div>
@@ -2385,7 +2398,10 @@ export default {
           { pattern: /^(0|[1-9]\d*)(\.\d{0,6})?$/, message: '请输入有效的数字', trigger: 'change' },
           { validator: this.validateMethod3, trigger: 'blur' }
         ],
-
+        standoneCy: [ { required: true, message: '请输入差异', trigger: 'blur' },
+          { pattern: /^(0|[1-9]\d*)(\.\d{0,6})?$/, message: '请输入有效的数字', trigger: 'change' }],
+        standtwoCy: [{ required: true, message: '请输入差异', trigger: 'blur' },
+          { pattern: /^(0|[1-9]\d*)(\.\d{0,6})?$/, message: '请输入有效的数字', trigger: 'change' }]
         standardTwo: [
           { required: true, message: '请输入检验标准', trigger: 'blur' },
           { pattern: /^(0|[1-9]\d*)(\.\d{0,6})?$/, message: '请输入有效的数字', trigger: 'change' }
@@ -2904,7 +2920,7 @@ export default {
           this.calculate(this.removeEmptyValues(this.SumList), 1)
         }
 
-      this.calculateStandardTagOne(index,this.inspectJbAl2o3List.standardOne,this.inspectJbAl2o3List.standonePlus)
+      this.calculateStandardTagOne(index,this.inspectJbAl2o3List.standardOne,this.inspectJbAl2o3List.standonePlus,this.inspectJbAl2o3List.standoneCy)
       // console.log('11111', this.SumList)
     },
     /**
@@ -3029,18 +3045,20 @@ export default {
           this.calculate(this.removeEmptyValues(this.SumList1), 2)
         }
 
-      this.calculateStandardTagTwo(index,this.inspectJbAl2o3List.standardTwo,this.inspectJbAl2o3List.standtwoPlus)
+      this.calculateStandardTagTwo(index,this.inspectJbAl2o3List.standardTwo,this.inspectJbAl2o3List.standtwoPlus,this.inspectJbAl2o3List.standtwoCy)
     },
 
 
-    calculateStandardTagOne(index,standardOne,standardTwo) {
-       if (standardOne && standardOne !== null && standardTwo && standardTwo !== null) {
+    calculateStandardTagOne(index,standardOne,standardTwo,difference) {
+
+       if (standardOne && standardOne !== null && standardTwo && standardTwo !== null && difference && difference !== null) {
          const limitOne = parseFloat(standardOne)
          const limitTwo = parseFloat(standardTwo)
+         const difference1 = parseFloat(difference)
          const recordData = this.inspectJbAl2o3List.recode1[index].recordData
          if (recordData !== '') {
            const num = parseFloat(recordData)
-           if (num >= limitOne && num <= limitTwo) {
+           if (num >= (limitOne - difference1)  && num <= (limitTwo + difference1 ) ) {
              this.inspectJbAl2o3List.recode1[index].differenceValue2 = '合格'
            } else {
              this.inspectJbAl2o3List.recode1[index].differenceValue2 = '不合格'
@@ -3048,14 +3066,15 @@ export default {
          }
        }
     },
-    calculateStandardTagTwo(index,standardOne,standardTwo) {
-       if (standardOne && standardOne !== null && standardTwo && standardTwo !== null) {
+    calculateStandardTagTwo(index,standardOne,standardTwo,difference) {
+       if (standardOne && standardOne !== null && standardTwo && standardTwo !== null && difference && difference !== null) {
          const limitOne = parseFloat(standardOne)
          const limitTwo = parseFloat(standardTwo)
+         const difference1 = parseFloat(difference)
          const recordData = this.inspectJbAl2o3List.recode2[index].recordData
          if (recordData !== '') {
            const num = parseFloat(recordData)
-           if (num >= limitOne && num <= limitTwo) {
+           if (num >= (limitOne - difference1) && num <= (limitTwo + difference1)) {
              this.inspectJbAl2o3List.recode2[index].differenceValue2 = '合格'
            } else {
              this.inspectJbAl2o3List.recode2[index].differenceValue2 = '不合格'
@@ -3110,29 +3129,29 @@ export default {
     },
     // 计算标签一的校验标准1 和 检验标准2 之间的差值
     getCalculateDifference() {
-       if (this.inspectJbAl2o3List.standardOne && this.inspectJbAl2o3List.standardOne !== '' && this.inspectJbAl2o3List.standonePlus && this.inspectJbAl2o3List.standonePlus != '' ) {
-         const limitOne = parseFloat(this.inspectJbAl2o3List.standardOne )
-         const limitTwo = parseFloat(this.inspectJbAl2o3List.standonePlus)
-         this.inspectJbAl2o3List.standoneCy = Math.abs(limitOne - limitTwo)
-       } else {
-         this.inspectJbAl2o3List.standoneCy = ''
-       }
+       // if (this.inspectJbAl2o3List.standardOne && this.inspectJbAl2o3List.standardOne !== '' && this.inspectJbAl2o3List.standonePlus && this.inspectJbAl2o3List.standonePlus != '' ) {
+       //   const limitOne = parseFloat(this.inspectJbAl2o3List.standardOne )
+       //   const limitTwo = parseFloat(this.inspectJbAl2o3List.standonePlus)
+       //   this.inspectJbAl2o3List.standoneCy = Math.abs(limitOne - limitTwo)
+       // } else {
+       //   this.inspectJbAl2o3List.standoneCy = ''
+       // }
        for (var i=0; i<10; i++) {
-         this.calculateStandardTagOne(i,this.inspectJbAl2o3List.standardOne,this.inspectJbAl2o3List.standonePlus)
+         this.calculateStandardTagOne(i,this.inspectJbAl2o3List.standardOne,this.inspectJbAl2o3List.standonePlus,this.inspectJbAl2o3List.standoneCy)
        }
     },
 
     // 计算标签一的校验标准1 和 检验标准2 之间的差值
     getCalculateDifferences() {
-      if (this.inspectJbAl2o3List.standardTwo && this.inspectJbAl2o3List.standardTwo !== '' && this.inspectJbAl2o3List.standtwoPlus && this.inspectJbAl2o3List.standtwoPlus != '' ) {
-        const limitOne = parseFloat(this.inspectJbAl2o3List.standardTwo )
-        const limitTwo = parseFloat(this.inspectJbAl2o3List.standtwoPlus)
-        this.inspectJbAl2o3List.standtwoCy = Math.abs(limitOne - limitTwo)
-      } else {
-        this.inspectJbAl2o3List.standtwoPlus = ''
-      }
+      // if (this.inspectJbAl2o3List.standardTwo && this.inspectJbAl2o3List.standardTwo !== '' && this.inspectJbAl2o3List.standtwoPlus && this.inspectJbAl2o3List.standtwoPlus != '' ) {
+      //   const limitOne = parseFloat(this.inspectJbAl2o3List.standardTwo )
+      //   const limitTwo = parseFloat(this.inspectJbAl2o3List.standtwoPlus)
+      //   this.inspectJbAl2o3List.standtwoCy = Math.abs(limitOne - limitTwo)
+      // } else {
+      //   this.inspectJbAl2o3List.standtwoPlus = ''
+      // }
       for (var i=0; i<10; i++) {
-        this.calculateStandardTagTwo(i,this.inspectJbAl2o3List.standardTwo,this.inspectJbAl2o3List.standtwoPlus)
+        this.calculateStandardTagTwo(i,this.inspectJbAl2o3List.standardTwo,this.inspectJbAl2o3List.standtwoPlus,this.inspectJbAl2o3List.standtwoCy)
       }
     },