From 51da4ca35854d45ca89aa8cfdfdfc7729f708a72 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 17 二月 2025 10:07:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev-gly
---
src/views/structural/capabilityAndLaboratory/capability/index.vue | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/src/views/structural/capabilityAndLaboratory/capability/index.vue b/src/views/structural/capabilityAndLaboratory/capability/index.vue
index 3d3c034..e23cb5b 100644
--- a/src/views/structural/capabilityAndLaboratory/capability/index.vue
+++ b/src/views/structural/capabilityAndLaboratory/capability/index.vue
@@ -55,11 +55,9 @@
</div>
</div>
<!--浜у搧缁存姢寮规-->
- <el-dialog title="浜у搧缁存姢" :visible.sync="diaProduct" width="600px">
- <div class="body" v-if="diaProduct" style="height: 350px;overflow-y: auto;padding: 5px 0;">
- <lims-table :tableData="productData" :column="productColumn"
- :page="productPage" :tableLoading="productableLoading"></lims-table>
- </div>
+ <el-dialog title="浜у搧缁存姢" :visible.sync="diaProduct" width="900px">
+ <lims-table :tableData="productData" :column="productColumn" height="460"
+ :page="productPage" :tableLoading="productableLoading"></lims-table>
<span slot="footer" class="dialog-footer">
<el-button @click="diaProduct = false">鍙� 娑�</el-button>
<el-button type="primary" @click="editProduct('add')" :loading="productLoad">鏂� 澧�</el-button>
@@ -176,7 +174,7 @@
page: {
total:0,
size:10,
- current:0
+ current:1
},
testObjectTableData: [],
testObjectColumn: [
@@ -299,13 +297,11 @@
{label: '浜у搧鍚嶇ОEN', prop: 'nameEn'},
{
dataType: 'action',
- fixed: 'right',
label: '鎿嶄綔',
operation: [
{
name: '缂栬緫',
type: 'text',
- icon: 'el-icon-edit',
clickFun: (row) => {
this.editProduct('edit', row);
},
@@ -313,7 +309,6 @@
{
name: '鍒犻櫎',
type: 'text',
- icon: 'el-icon-delete',
clickFun: (row) => {
this.deleteProduct(row);
},
@@ -530,12 +525,11 @@
},
getProductList () {
const params = {
- id: this.objectId,
+ objectId: this.objectId,
}
this.productableLoading = true
selectProductListByObjectId({...params, ...this.productPage}).then(res => {
this.productableLoading = false
- if (res.code === 200) return
this.productData = res.data.records
this.productPage.total = res.data.total
}).catch(err => {
@@ -547,37 +541,44 @@
this.productEditDia = true
this.operationType = type
if (type === 'edit') {
- this.productEditForm = row
+ this.productEditForm = this.HaveJson(row)
}
},
// 鎻愪氦浜у搧缁存姢淇敼
submitProduct () {
this.$refs['productEditForm'].validate((valid) => {
if (valid) {
+ this.uploading = true
this.productEditForm.objectId = this.objectId
if (this.operationType === 'add') {
addProduct(this.productEditForm).then(res => {
+ this.uploading = false
if (res.code === 200) {
this.$message.success('鏂板鎴愬姛')
- this.productEditDia = false
+ this.closeProduct()
this.getProductList();
}
+ }).catch(err => {
+ this.uploading = false
})
} else {
upProduct(this.productEditForm).then(res => {
+ this.uploading = false
if (res.code === 200) {
this.$message.success('鏂板鎴愬姛')
- this.productEditDia = false
+ this.closeProduct()
this.getProductList();
}
+ }).catch(err => {
+ this.uploading = false
})
}
}
})
},
closeProduct() {
- this.productEditDia = false
this.resetForm('productEditForm')
+ this.productEditDia = false
},
// 浜у搧缁存姢-鍒犻櫎
deleteProduct (row) {
@@ -589,7 +590,7 @@
delProduct({id:row.id}).then(res => {
if (res.code === 200) {
this.$message.success('鍒犻櫎鎴愬姛')
- this.refreshTable();
+ this.getProductList();
}
})
}).catch(() => {
--
Gitblit v1.9.3