From a75b18a4157ab486e0b51c438ac165ab3a08e3e0 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 25 七月 2024 18:10:00 +0800
Subject: [PATCH] 代码提交
---
admin/src/views/business/shop.vue | 53 ++++++++++++++++++++++++++++-------------------------
1 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/admin/src/views/business/shop.vue b/admin/src/views/business/shop.vue
index a52ebe5..233e5a8 100644
--- a/admin/src/views/business/shop.vue
+++ b/admin/src/views/business/shop.vue
@@ -2,33 +2,31 @@
<TableLayout :permissions="['business:shop:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="閮ㄩ棬鍚嶇О" prop="name">
+ <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="parentId">
+ <el-form-item label="" prop="parentId">
<el-input v-model="searchForm.parentName" placeholder="璇疯緭鍏ヤ笂绾х粍缁囧悕绉�/缂栫爜" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鐘舵��" prop="status">
- <el-select v-model="searchForm.status" @change="search" clearable placeholder="鐘舵��">
- <el-option label="鍋滅敤" value="1"></el-option>
+ <el-form-item label="" prop="status">
+ <el-select v-model="searchForm.status" style="width: 130px" @change="search" clearable placeholder="鐘舵��">
+ <el-option label="鍋滅敤" value="0"></el-option>
<el-option label="姝ｅ父" value="1"></el-option>
- <el-option label="宸插垹闄�" value="2"></el-option>
+ <el-option label="宸插垹闄�" value="-1"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="缁勭粐缂栫爜" prop="code">
+ <el-form-item label="" prop="code">
<el-input v-model="searchForm.code" placeholder="璇疯緭鍏ョ粍缁囩紪鐮�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="涓�绾х粍缁囩被鍨�" prop="type">
- <el-select v-model="searchForm.type" @change="search" clearable placeholder="涓�绾х粍缁囩被鍨�">
- <el-option label="涓�浣撳晢" value="1"></el-option>
+ <el-form-item label="" prop="type">
+ <el-select v-model="searchForm.type" @change="search" style="width: 130px" clearable placeholder="涓�绾х粍缁囩被鍨�">
+ <el-option label="HR" value="1"></el-option>
<el-option label="鍔犵洘鍟�" value="2"></el-option>
- <el-option label="搴楅潰" value="3"></el-option>
- <el-option label="閮ㄩ棬(HR/鍔�)" value="4"></el-option>
- <el-option label="铏氭嫙搴楅潰(鍔�/铏�)" value="5"></el-option>
+ <el-option label="铏氭嫙缁勭粐" value="3"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="浜岀骇缁勭粐绫诲瀷" prop="type">
- <el-select v-model="searchForm.secondType" @change="search" clearable placeholder="浜岀骇缁勭粐绫诲瀷">
+ <el-form-item label="" prop="type">
+ <el-select v-model="searchForm.secondType" @change="search" style="width: 130px" clearable placeholder="浜岀骇缁勭粐绫诲瀷">
<el-option label="S" value="1"></el-option>
<el-option label="F" value="2"></el-option>
<el-option label="搴楅潰" value="3"></el-option>
@@ -36,8 +34,8 @@
<el-option label="铏氭嫙搴楅潰" value="5"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="閮ㄩ棬灞炴��" prop="attribute">
- <el-select v-model="searchForm.attribute" @change="search" clearable placeholder="閮ㄩ棬灞炴��">
+ <el-form-item label="" prop="attribute">
+ <el-select v-model="searchForm.attribute" @change="search" style="width: 130px" clearable placeholder="閮ㄩ棬灞炴��">
<el-option label="瀹炰綋搴楅潰" value="1"></el-option>
<el-option label="铏氭嫙搴楅潰" value="2"></el-option>
<el-option label="鐢靛晢閮�" value="3"></el-option>
@@ -45,17 +43,20 @@
<el-option label="璐㈠姟閮�" value="5"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="鐪佷唤鍚嶇О" prop="provinceName">
+ <el-form-item label="" prop="provinceName">
<el-input v-model="searchForm.provinceName" placeholder="璇疯緭鍏ョ渷浠藉悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鍩庡競鍚嶇О" prop="cityName">
+ <el-form-item label="" prop="cityName">
<el-input v-model="searchForm.cityName" placeholder="璇疯緭鍏ュ煄甯傚悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鍖哄幙鍚嶇О" prop="areaName">
+ <el-form-item label="" prop="areaName">
<el-input v-model="searchForm.areaName" placeholder="璇疯緭鍏ュ尯鍘垮悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鍝佺被缂栫爜" prop="unitCode">
+ <el-form-item label="" prop="unitCode">
<el-input v-model="searchForm.unitCode" placeholder="璇疯緭鍏ュ搧绫荤紪鐮�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="" prop="siteCode">
+ <el-input v-model="searchForm.siteCode" placeholder="璇疯緭鍏ュ鎴风被鍨嬬紪鐮�" @keypress.enter.native="search"></el-input>
</el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
@@ -65,10 +66,10 @@
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:shop:create', 'business:shop:delete']">
+<!-- <ul class="toolbar" v-permissions="['business:shop:create', 'business:shop:delete']">
<li><el-button type="primary" @click="$refs.operaShopWindow.open('鏂板缓蹇楅偊缁勭粐淇℃伅琛�')" icon="el-icon-plus" v-permissions="['business:shop:create']">鏂板缓</el-button></li>
<li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:shop:delete']">鍒犻櫎</el-button></li>
- </ul>
+ </ul>-->
<el-table
v-loading="isWorking.search"
:data="tableData.list"
@@ -77,6 +78,7 @@
>
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="name" label="缁勭粐鍚嶇О" min-width="120px"></el-table-column>
+ <el-table-column prop="code" label="缁勭粐缂栫爜" min-width="120px"></el-table-column>
<el-table-column prop="type" label="涓�绾х被鍨�" min-width="80px">
<template scope="{row}">
<span v-if="row.type == 1">HR</span>
@@ -106,7 +108,7 @@
<template scope="{row}">
<span v-if="row.status == 0" style="color: red">鍋滅敤</span>
<span v-if="row.status == 1" style="color: green">姝ｅ父</span>
- <span v-if="row.status == 2" style="color: grey">宸插垹闄�</span>
+ <span v-if="row.status == -1" style="color: grey">宸插垹闄�</span>
</template>
</el-table-column>
<el-table-column prop="namePath" label="缁勭粐璺緞" min-width="200px"></el-table-column>
@@ -160,7 +162,8 @@
provinceName: '',
cityName: '',
areaName: '',
- unitCode: ''
+ unitCode: '',
+ siteCode:''
}
}
},
--
Gitblit v1.9.3