From 05cf6324ea8322164d99a3d3d4161fe374534b3b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期日, 18 二月 2024 15:22:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
company/src/views/business/company.vue | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/company/src/views/business/company.vue b/company/src/views/business/company.vue
index ca2a24f..a527481 100644
--- a/company/src/views/business/company.vue
+++ b/company/src/views/business/company.vue
@@ -5,9 +5,6 @@
<el-form-item label="浼佷笟鍚嶇О" prop="name">
<el-input v-model="searchForm.name" placeholder="璇疯緭鍏ヤ紒涓氬悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鎵�灞炲晢鎴�" prop="name">
- <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ユ墍灞炲晢鎴�" @keypress.enter.native="search"></el-input>
- </el-form-item>
<el-form-item label="鎵�灞炵悊璧斿憳" prop="username">
<el-input v-model="searchForm.username" placeholder="璇疯緭鍏ユ墍灞炵悊璧斿憳" @keypress.enter.native="search"></el-input>
</el-form-item>
@@ -19,7 +16,7 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:company:create']">
- <li><el-button type="primary" @click="$refs.operaCompanyWindow.open('鏂板缓浼佷笟')" v-permissions="['business:company:create']">鏂板缓浼佷笟</el-button></li>
+ <li><el-button type="primary" @click="$refs.operaCompanyWindow.open('鏂板缓浼佷笟',null)" v-permissions="['business:company:create']">鏂板缓浼佷笟</el-button></li>
</ul>
<el-table
v-loading="isWorking.search"
--
Gitblit v1.9.3