From aa7a4ca114f8e2f04bc4aca2a6c335f22adf058e Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 17 二月 2025 13:23:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-gly' into dev
---
src/views/structural/premises/index.vue | 53 ++++-------------------------------------------------
1 files changed, 4 insertions(+), 49 deletions(-)
diff --git a/src/views/structural/premises/index.vue b/src/views/structural/premises/index.vue
index c2b8d10..9b45c72 100644
--- a/src/views/structural/premises/index.vue
+++ b/src/views/structural/premises/index.vue
@@ -22,9 +22,6 @@
</div>
</div>
<div class="table">
-<!-- <ValueTable ref="ValueTable" :url="$api.laboratoryScope.selectItemParameter"-->
-<!-- :upUrl="$api.laboratoryScope.upParameter" :delUrl="$api.laboratoryScope.delParameter"-->
-<!-- :componentData="componentData" :key="upIndex" />-->
<lims-table :tableData="tableData" :column="column"
@pagination="pagination"
:page="page" :tableLoading="tableLoading"></lims-table>
@@ -117,7 +114,7 @@
dataType: 'action',
fixed: 'right',
label: '鎿嶄綔',
- width: '140px',
+ width: '180px',
operation: [
{
name: '缂栬緫',
@@ -148,46 +145,6 @@
size:10,
current:1
},
- componentData: {
- entity: {
- laboratoryName: null,
- laboratoryNumber: null,
- head: null,
- orderBy: {
- field: 'id',
- order: 'asc'
- }
- },
- isIndex: true,
- showSelect: false,
- select: false,
- do: [{
- id: 'update',
- font: '缂栬緫',
- type: 'text',
- method: 'doDiy',
- field: ['createUserName']
- }, {
- id: 'delete',
- font: '鍒犻櫎',
- type: 'text',
- method: 'doDiy'
- }, {
- id: '',
- font: '鍗扮珷绠＄悊',
- type: 'text',
- method: 'fileManagement'
- }],
- tagField: {
- type:{
- select:[]
- }
- },
- selectField: {},
- requiredAdd: ['laboratoryName', 'laboratoryNumber', 'head', 'phoneNumber'],
- requiredUp: ['laboratoryName', 'laboratoryNumber', 'head', 'phoneNumber'],
- needSort: ['laboratoryName', 'createTime'],
- },
fileComponentData: {
entity: {
labId:null,
@@ -212,7 +169,6 @@
requiredUp: [],
addUpload:['address'],
},
- entityCopy: {},
fileVisible:false,
upFileVisible:false,
loading:false,
@@ -241,13 +197,12 @@
}
},
mounted() {
- this.entityCopy = this.HaveJson(this.componentData.entity)
- this.getCertificationDetail()
+ this.refreshTable()
},
methods: {
refreshTable() {
this.tableLoading = true
- selectItemParameter({...this.page, ...this.itemParameterForm}).then(res => {
+ selectItemParameter({...this.page, ...this.queryParams}).then(res => {
this.tableLoading = false
if (res.code === 200) {
this.tableData = res.data.records
@@ -284,7 +239,7 @@
})
},
refresh() {
- this.componentData.entity = this.HaveJson(this.entityCopy)
+ this.resetForm('queryForm')
this.refreshTable()
},
pagination (page) {
--
Gitblit v1.9.3