王震
2024-01-25 36653c98622c8a74cb850575b2001457121b794c
src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -340,8 +340,8 @@
                <el-table-column prop="userName" label="检验员"></el-table-column>
                <el-table-column prop="judgeState" label="检验结论">
                  <template slot-scope="scope">
                    <el-tag type="success" v-if="scope.row.testState == '1'">合格</el-tag>
                    <el-tag type="danger" v-else-if="scope.row.testState == '0'">不合格</el-tag>
                    <el-tag type="success" v-if="scope.row.testState == 1">合格</el-tag>
                    <el-tag type="danger" v-else-if="scope.row.testState == 0">不合格</el-tag>
                  </template>
                </el-table-column>
                <el-table-column  label="操作">
@@ -492,8 +492,7 @@
    },
    created(){
      this.dataForm.id = this.$route.query.id
      this.resultVal = this.$route.query.resultVal
      console.log("aa--",this.resultVal);
      this.resultVal = this.$route.params.resultVal
      if(this.resultVal == null){
        let val = sessionStorage.getItem("raw-resultVal-"+this.dataForm.id)
        val == undefined ? null : this.resultVal=val
@@ -893,10 +892,12 @@
            for(var i=0;i<row.testValueList.length;i++){
              let val = row.testValueList[i]
              let reg = /(^-?[0-9]{1,6}$)|(^-?[0-9]{1,6}[\.]{1}[0-9]{1,3}$)/
              if(!reg.test(val) && !['是','否'].includes(val)){
                  row.testValueList[i] = null
                  this.$message.error("请输入6位数字或选择是否")
                  isTrue = false
              if(val.slice(-1)!='.'){
                  if(!reg.test(val) && !['是','否'].includes(val)){
                      row.testValueList[i] = null
                      this.$message.error("请输入6位数字或选择是否")
                      isTrue = false
                  }
              }
            }
            if(!isTrue){