From 1789ce3650a2665b5abca7a3028611190d1983df Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 14 十二月 2023 09:45:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/common/document.vue | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/views/common/document.vue b/src/views/common/document.vue
index fa46446..fe74309 100644
--- a/src/views/common/document.vue
+++ b/src/views/common/document.vue
@@ -10,7 +10,7 @@
class="part-dialog"
>
<div v-show="showParentInfo">
- <el-row>
+ <!-- <el-row>
<el-col :span="3"><span>鍗板瓧鏂瑰紡锛�</span></el-col>
<el-col :span="3"
><span>{{ relationOrderList[0].printType }}</span></el-col
@@ -41,7 +41,7 @@
<el-col :span="9"
><span>{{ relationOrderList[0].remark }}</span></el-col
>
- </el-row>
+ </el-row> -->
</div>
<ttable
:table="table"
@@ -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