From 67da82f0b0c24df5f19bbfcfec63801d9ae902d8 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 13 十二月 2023 16:22:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/common/document.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/views/common/document.vue b/src/views/common/document.vue
index 636bd89..fe74309 100644
--- a/src/views/common/document.vue
+++ b/src/views/common/document.vue
@@ -61,7 +61,7 @@
<el-button @click="innerVisible = false">鍙� 娑�</el-button>
<el-button type="primary" @click="saveSelectRow">纭� 瀹�</el-button>
</div>
- <DocumentDetail :currshowlist.sync="showDocument" :docId="documentId">
+ <DocumentDetail :currshowlist.sync="showDocument" :docId="Number(documentId)">
</DocumentDetail>
</el-dialog>
</template>
@@ -151,7 +151,7 @@
searchInfoType: 'text'
},
// 缁濈紭棰滆壊
- {
+ /* {
minWidth: '120',
prop: 'insulationColor',
label: '缁濈紭棰滆壊',
@@ -169,7 +169,7 @@
isTrue: true,
isSearch: true,
searchInfoType: 'text'
- },
+ }, */
{
minWidth: '120',
prop: 'version',
@@ -189,7 +189,7 @@
isSearch: true,
searchInfoType: 'text'
},
- {
+ /* {
minWidth: '120',
prop: 'country',
label: '鍥藉',
@@ -197,7 +197,7 @@
isTrue: true,
isSearch: true,
searchInfoType: 'text'
- },
+ }, */
{
minWidth: '120',
prop: 'state',
--
Gitblit v1.9.3