Merge remote-tracking branch 'origin/master'

jinlin

2024-12-10 a8ce806c8a81f685fa9fafaa453820197ced9961

 web/src/views/modules/taskReliability/PlanMake.vue

@@ -5,7 +5,7 @@
      </el-table-column>
      <el-table-column align="center" prop="specifiedValue" label="检验上限">
        <template v-slot="{ row }">
          <el-input v-model="row.specifiedValue" style="width:100%" :disabled="row.tjlx==='不限定规定值查询'"></el-input>
          <el-input v-model="row.specifiedValue" style="width:100%" :disabled="row.tjlx==='不限定检验上限查询'"></el-input>
        </template>
      </el-table-column>
      <el-table-column align="center" prop="minAccepValue" label="检验下限">
@@ -86,7 +86,7 @@
            showFailureTime: 10
          },
          {
            tjlx: '不限定规定值查询',
            tjlx: '不限定检验上限查询',
            btnName: '查询三',
            specifiedValue: null,
            minAccepValue: null,
@@ -152,7 +152,7 @@
            flag = false
          }
        }
        if (row.tjlx === "不限定规定值查询") {
        if (row.tjlx === "不限定检验上限查询") {
          if (!row.showFailureTime || !row.minAccepValue || !row.productionRisk || !row.userRisk) {
            this.$tip.alert("有未填写的值")
            flag = false
@@ -163,7 +163,7 @@
        }
        let res = await this.$http.get(`/TestScheme/TestScheme/condition`, {params: row})
        this.dataList = res.data
        if (row.tjlx === "不限定规定值查询") {
        if (row.tjlx === "不限定检验上限查询") {
          this.isShow = true
        } else {
          this.isShow = false