From 8c4dfb07d551ceb372887ff8f22bd1f574d0347b Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 31 十月 2025 11:26:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
admin/src/views/business/jkLine.vue | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/admin/src/views/business/jkLine.vue b/admin/src/views/business/jkLine.vue
index 256926e..1bbc62b 100644
--- a/admin/src/views/business/jkLine.vue
+++ b/admin/src/views/business/jkLine.vue
@@ -11,7 +11,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="杩愰�佽溅杈�" prop="carId">
+ <el-form-item label="杩愰�佽溅杈�" prop="carCode">
<el-input v-model="searchForm.carCode" placeholder="璇疯緭鍏ヨ繍閫佽溅杈�" clearable @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="搴忓彿" prop="code">
@@ -31,8 +31,7 @@
<li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:jkline:delete']">鍒犻櫎</el-button></li>
</ul>
<el-table
-
- :height="tableHeightNew"
+ :height="tableHeightNew"
v-loading="isWorking.search"
:data="tableData.list"
stripe
--
Gitblit v1.9.3