Merge branch 'dev' into dev_tides

Crunchy

2025-04-29 e5454b769d44a34af423bf87ac8a740bf8c20341

 src/views/structural/capabilityAndLaboratory/capability/index.vue

@@ -33,14 +33,24 @@
                    v-model="itemParameterForm.inspectionItemSubclass" @keyup.enter.native="refreshTable()">
          </el-input>
        </el-form-item>
        <el-form-item label="检验对象" prop="sample">
        <el-form-item label="检验对象" prop="sample" v-if="radio===0">
          <el-input size="small" placeholder="请输入" clearable
                    v-model="itemParameterForm.sample" @keyup.enter.native="refreshTable()">
          </el-input>
        </el-form-item>
        <el-form-item label="检验对象" prop="specimenName" v-if="radio===1">
          <el-input size="small" placeholder="请输入" clearable
                    v-model="itemParameterForm.specimenName" @keyup.enter.native="refreshTable()">
          </el-input>
        </el-form-item>
        <el-form-item label="零件号" prop="partNo" v-if="radio===1">
          <el-input size="small" placeholder="请输入" clearable
                    v-model="itemParameterForm.partNo" @keyup.enter.native="refreshTable()">
          </el-input>
        </el-form-item>
        <el-form-item>
          <el-button type="primary" icon="el-icon-search" size="mini" @click="refreshTable">查 询</el-button>
          <el-button icon="el-icon-refresh" size="mini" @click="refresh">重 置</el-button>
          <el-button type="primary" size="mini" @click="refreshTable">查询</el-button>
          <el-button size="mini" @click="refresh">重置</el-button>
        </el-form-item>
      </el-form>
<!--      检验项目参数表格-->
@@ -298,7 +308,9 @@
      itemParameterForm: {
        inspectionItem: null,
        inspectionItemSubclass: null,
        sample: null
        sample: null,
        specimenName: null,
        partNo: null
      },
      radio: 0,
      productLoad: false,
@@ -346,6 +358,7 @@
        total:0,
        size:10,
        current:1,
        partNo: null,
        layout: 'total, prev, pager, next'
      },
      productableLoading: false,
@@ -541,6 +554,7 @@
      this.diaProduct = true
      this.objectId = row.id
      this.productPage.current = 1
      this.productPage.partNo = this.itemParameterForm.partNo
      this.getProductList(row)
    },
    // 查询产品维护列表数据