From 71c4ece010f68a74eeff5e986caecb9a0bb2e36c Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 25 四月 2024 17:37:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/components/view/b1-expenses.vue |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 48 insertions(+), 0 deletions(-)

diff --git a/src/components/view/b1-expenses.vue b/src/components/view/b1-expenses.vue
index 4f667ad..fd35c90 100644
--- a/src/components/view/b1-expenses.vue
+++ b/src/components/view/b1-expenses.vue
@@ -38,6 +38,10 @@
 	.el-form-item {
 		margin-bottom: 16px;
 	}
+
+  >>>.el-table tbody tr:hover > td {
+      background-color: transparent !important;
+  }
 </style>
 
 <template>
@@ -112,8 +116,52 @@
 					isIndex: true,
 					showSelect: false,
 					select: false,
+          highlight:false,
 					do: [],
 					linkEvent:{},
+          spanConfig:{
+            //鍚堝苟琛�
+            rows:[
+              {
+                name:'createTime',
+                index:1
+              },
+              {
+                name:'entrustCode',
+                index:2
+              },
+              {
+                name:'company',
+                index:8
+              },
+              {
+                name:'name',
+                index:9
+              },
+            ],
+            // 鐗规畩鐨勫悎骞惰锛屾牴鎹甿ain鍜宺ows鐨刵ame鏉ュ悎骞�
+            special:{
+              main:'insSampleId',
+              rows:[
+                {
+                  name:'sample',
+                  index:3
+                },
+                {
+                  name:'model',
+                  index:4
+                },
+                {
+                  name:'num',
+                  index:5
+                },
+                {
+                  name:'price',
+                  index:6
+                },
+              ]
+            }
+          },
 					tagField: {
 						type: {
 							select: [{

--
Gitblit v1.9.3