Merge remote-tracking branch 'origin/lims_new_20250213' into lims_new_20250213

gaoluyang

2025-02-15 10d13c202497ac0499767c2e4bb250086b293310

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

@@ -159,7 +159,6 @@
            {
              name: '编辑',
              type: 'text',
              icon: 'el-icon-edit',
              clickFun: (row) => {
                this.editForm(row);
              },
@@ -167,7 +166,6 @@
            {
              name: '删除',
              type: 'text',
              icon: 'el-icon-delete',
              clickFun: (row) => {
                this.delete(row);
              },
@@ -251,7 +249,6 @@
            {
              name: '编辑',
              type: 'text',
              icon: 'el-icon-edit',
              clickFun: (row) => {
                this.editTestObjectForm(row);
              },
@@ -259,7 +256,6 @@
            {
              name: '删除',
              type: 'text',
              icon: 'el-icon-delete',
              clickFun: (row) => {
                this.deleteTest(row);
              },
@@ -532,10 +528,9 @@
      this.objectId = row.id
      this.getProductList(row)
    },
    getProductList (row) {
    getProductList () {
      const params = {
        objectId: 0,
        partNo: row.partNo
        id: this.objectId,
      }
      this.productableLoading = true
      selectProductListByObjectId({...params, ...this.productPage}).then(res => {
@@ -565,7 +560,7 @@
              if (res.code === 200) {
                this.$message.success('新增成功')
                this.productEditDia = false
                this.refreshTable();
                this.getProductList();
              }
            })
          } else {
@@ -573,7 +568,7 @@
              if (res.code === 200) {
                this.$message.success('新增成功')
                this.productEditDia = false
                this.refreshTable();
                this.getProductList();
              }
            })
          }