From a252de34f781f52dd1dae9d910c92c11d0c8be51 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 17 二月 2025 13:13:31 +0800
Subject: [PATCH] 1.重构文件路径
---
src/views/structural/capabilityAndLaboratory/capability/index.vue | 59 +++++++++++++++++++++++++++++++++--------------------------
1 files changed, 33 insertions(+), 26 deletions(-)
diff --git a/src/views/structural/capabilityAndLaboratory/capability/index.vue b/src/views/structural/capabilityAndLaboratory/capability/index.vue
index 61b29a9..033f101 100644
--- a/src/views/structural/capabilityAndLaboratory/capability/index.vue
+++ b/src/views/structural/capabilityAndLaboratory/capability/index.vue
@@ -46,20 +46,20 @@
<!-- 妫�楠岄」鐩弬鏁拌〃鏍�-->
<div class="table" v-if="radio===0">
<lims-table :tableData="tableData" :column="column"
+ @pagination="pagination"
:page="page" :tableLoading="tableLoading"></lims-table>
</div>
<!-- 妫�楠屽璞¤〃鏍�-->
<div class="table" v-if="radio===1">
<lims-table :tableData="testObjectTableData" :column="testObjectColumn"
+ @pagination="pagination"
:page="testObjectPage" :tableLoading="tableLoading"></lims-table>
</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>
@@ -112,16 +112,16 @@
</template>
<script>
-import BindPartDialog from "@/components/capability/bindPartDialog.vue"
-import BindSupplierDensityDialog from "@/components/capability/bindSupplierDensityDialog.vue"
+import BindPartDialog from "@/views/structural/capabilityAndLaboratory/capabilityComponents/bindPartDialog.vue"
+import BindSupplierDensityDialog from "@/views/structural/capabilityAndLaboratory/capabilityComponents/bindSupplierDensityDialog.vue"
import {
addProduct,
delItemParameter, delProduct, delTestObject, selectItemParameterList, selectProductListByObjectId,
selectTestObjectList, upProduct,
} from "@/api/structural/capability";
import limsTable from "@/components/Table/lims-table.vue";
-import EditForm from "@/components/capability/EditForm.vue";
-import testObjectEditForm from "@/components/capability/testObjectEditForm.vue";
+import EditForm from "@/views/structural/capabilityAndLaboratory/capabilityComponents/EditForm.vue";
+import testObjectEditForm from "@/views/structural/capabilityAndLaboratory/capabilityComponents/testObjectEditForm.vue";
import {getToken} from "@/utils/auth";
export default {
@@ -131,6 +131,7 @@
uploadAction: process.env.VUE_APP_BASE_API + '/capacityScope/importExcel',
uploadAction1: process.env.VUE_APP_BASE_API + '/capacityScope/importEquipData',
tableData: [],
+ tableLoading: false,
column: [
{label: '妫�楠岄」', prop: 'inspectionItem'},
{label: '妫�楠岄」EN', prop: 'inspectionItemEn'},
@@ -176,7 +177,7 @@
page: {
total:0,
size:10,
- current:0
+ current:1
},
testObjectTableData: [],
testObjectColumn: [
@@ -282,7 +283,6 @@
size:10,
current:0
},
- tableLoading: false,
addOrUpdate: '',
tree: null,
loading: true,
@@ -299,13 +299,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 +311,6 @@
{
name: '鍒犻櫎',
type: 'text',
- icon: 'el-icon-delete',
clickFun: (row) => {
this.deleteProduct(row);
},
@@ -339,7 +336,8 @@
productPage: {
total:0,
size:10,
- current:0
+ current:0,
+ layout: 'total, prev, pager, next'
},
productableLoading: false,
productEditDia: false,
@@ -466,6 +464,10 @@
this.resetForm('itemParameterForm')
this.refreshTable()
},
+ pagination (page) {
+ this.page.size = page.pageNum.limit
+ this.refreshTable()
+ },
// 妫�楠岄」鐩弬鏁版柊澧�
openAdd() {
if (this.radio === 0) {
@@ -528,15 +530,13 @@
this.objectId = row.id
this.getProductList(row)
},
- getProductList (row) {
+ getProductList () {
const params = {
- objectId: 0,
- partNo: row.partNo
+ 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 => {
@@ -548,37 +548,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.refreshTable();
+ 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.refreshTable();
+ this.closeProduct()
+ this.getProductList();
}
+ }).catch(err => {
+ this.uploading = false
})
}
}
})
},
closeProduct() {
- this.productEditDia = false
this.resetForm('productEditForm')
+ this.productEditDia = false
},
// 浜у搧缁存姢-鍒犻櫎
deleteProduct (row) {
@@ -590,7 +597,7 @@
delProduct({id:row.id}).then(res => {
if (res.code === 200) {
this.$message.success('鍒犻櫎鎴愬姛')
- this.refreshTable();
+ this.getProductList();
}
})
}).catch(() => {
--
Gitblit v1.9.3