From 5bdee15c4bba881d9cb991dd18b40613375bb41e Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期一, 17 二月 2025 10:06:07 +0800
Subject: [PATCH] Merge branch 'dev-licp' into dev
---
src/components/capability/bindPartDialog.vue | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/components/capability/bindPartDialog.vue b/src/components/capability/bindPartDialog.vue
index 011bffa..5fca2f6 100644
--- a/src/components/capability/bindPartDialog.vue
+++ b/src/components/capability/bindPartDialog.vue
@@ -1,10 +1,8 @@
<template>
<div>
<el-dialog title="闆朵欢缁戝畾" :visible.sync="isShow" width="800px" @close="$emit('closeBindPartDialog')">
- <div class="body" v-if="isShow" style="height: 500px;overflow-y: auto;padding: 5px 0;">
- <lims-table :tableData="tableData" :column="column"
- :page="page" :tableLoading="tableLoading"></lims-table>
- </div>
+ <lims-table :tableData="tableData" :column="column" height="460"
+ :page="page" :tableLoading="tableLoading"></lims-table>
<span slot="footer" class="dialog-footer">
<el-button @click="$emit('closeBindPartDialog')">鍙� 娑�</el-button>
<el-button type="primary" @click="addBindPart('add')" :loading="addBindLoad">鏂� 澧�</el-button>
@@ -101,7 +99,7 @@
page: {
total:0,
size:10,
- current:0
+ current:1
},
bindPartComponent: {
entity: {
@@ -156,7 +154,7 @@
this.tableLoading = true
// 鏍规嵁绫诲瀷鍒ゆ柇鏄楠屽璞￠浂浠剁粦瀹氳繕鏄骇鍝佺淮鎶ら浂浠剁粦瀹�
if (this.type === 0) {
- selectByTestObjectId({id: this.currentRow.id}).then(res => {
+ selectByTestObjectId({testObjectId: this.currentRow.id}).then(res => {
this.tableLoading = false
if (res.code === 200) {
this.tableData = res.data.records
@@ -166,7 +164,7 @@
this.tableLoading = false
})
} else {
- selectByProductId({id: this.currentRow.id}).then(res => {
+ selectByProductId({productId: this.currentRow.id}).then(res => {
this.tableLoading = false
if (res.code === 200) {
this.tableData = res.data.records
@@ -182,7 +180,7 @@
this.dialogTitle = type === 'add' ? '鏂板闆朵欢缁戝畾' : '淇敼闆朵欢缁戝畾'
this.operationType = type
if (type === 'edit') {
- this.bindPartData = row
+ this.bindPartData = this.HaveJson(row)
}
},
// 鎻愪氦闆朵欢缁戝畾
--
Gitblit v1.9.3