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="specimenName">
        <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>
<!--      检验项目参数表格-->
@@ -59,6 +69,7 @@
    <!--产品维护弹框-->
    <el-dialog title="产品维护" :visible.sync="diaProduct" width="900px">
      <lims-table :tableData="productData" :column="productColumn" height="460"
                  @pagination="productPagination"
                  :page="productPage" :tableLoading="productableLoading"></lims-table>
      <span slot="footer" class="dialog-footer">
        <el-button @click="diaProduct = false">取 消</el-button>
@@ -126,6 +137,7 @@
import { obtainItemParameterList } from '@/api/structural/laboratoryScope'

export default {
  name: 'Capability',
  components: {limsTable, EditForm, testObjectEditForm, BindPartDialog, BindSupplierDensityDialog},
  data() {
    return {
@@ -296,7 +308,9 @@
      itemParameterForm: {
        inspectionItem: null,
        inspectionItemSubclass: null,
        specimenName: null
        sample: null,
        specimenName: null,
        partNo: null
      },
      radio: 0,
      productLoad: false,
@@ -343,7 +357,8 @@
      productPage: {
        total:0,
        size:10,
        current:0,
        current:1,
        partNo: null,
        layout: 'total, prev, pager, next'
      },
      productableLoading: false,
@@ -538,8 +553,11 @@
    upProduct(row) {
      this.diaProduct = true
      this.objectId = row.id
      this.productPage.current = 1
      this.productPage.partNo = this.itemParameterForm.partNo
      this.getProductList(row)
    },
    // 查询产品维护列表数据
    getProductList () {
      const params = {
        objectId: this.objectId,
@@ -553,6 +571,11 @@
        this.productableLoading = false
      })
    },
    // 产品维护列表分页
    productPagination(page) {
      this.productPage.current = page.page
      this.getProductList()
    },
    // 产品维护-新增-编辑
    editProduct (type, row) {
      this.productEditDia = true