From e6e520abd96702db6b29459a66440801f58bc89d Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 30 一月 2026 14:11:39 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbom_dianjiang
---
admin/src/views/business/member.vue | 98 ++++++++++++++++++++++++------------------------
1 files changed, 49 insertions(+), 49 deletions(-)
diff --git a/admin/src/views/business/member.vue b/admin/src/views/business/member.vue
index c89fec6..b8804e8 100644
--- a/admin/src/views/business/member.vue
+++ b/admin/src/views/business/member.vue
@@ -8,43 +8,41 @@
<el-form-item label="宸ュ彿" prop="code">
<el-input v-model="searchForm.code" style="width: 150px" placeholder="璇疯緭鍏ュ伐鍙�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鎴樺尯" prop="fieldIdList">
+ <el-form-item label="鎴樺尯" prop="zhanquIds">
<el-select
- v-model="searchForm.fieldIdList"
+ v-model="searchForm.zhanquIds"
style="width: 150px"
placeholder="鎴樺尯"
clearable
- multiple
@change="search"
>
<el-option
- v-for="item in cateList"
+ v-for="item in cateList.filter(item=>{return item.type==0})"
:key="item.id"
:value="item.id"
:label="item.name"
></el-option>
</el-select>
</el-form-item>
- <el-form-item label="鍟嗕笟鍖栫被鍨�" prop="busTypeIdList">
+ <el-form-item label="鍟嗕笟鍖栫被鍨�" prop="bustypeIds">
<el-select
- v-model="searchForm.busTypeIdList"
+ v-model="searchForm.bustypeIds"
style="width: 150px"
placeholder="鍟嗕笟鍖栫被鍨�"
clearable
- multiple
@change="search"
>
<el-option
- v-for="item in cateList1"
+ v-for="item in cateList.filter(item=>{return item.type==1})"
:key="item.id"
:value="item.id"
:label="item.name"
></el-option>
</el-select>
</el-form-item>
- <el-form-item label="鎿呴暱棰嗗煙" prop="levelIdList">
+ <el-form-item label="鎿呴暱棰嗗煙" prop="fieldIdList">
<el-select
- v-model="searchForm.levelIdList"
+ v-model="searchForm.fieldIdList"
style="width: 150px"
placeholder="鎿呴暱棰嗗煙"
clearable
@@ -52,24 +50,23 @@
@change="search"
>
<el-option
- v-for="item in cateList2"
+ v-for="item in cateList.filter(item=>{return item.type==2})"
:key="item.id"
:value="item.id"
:label="item.name"
></el-option>
</el-select>
</el-form-item>
- <el-form-item label="鑰佸笀绛夌骇" prop="levelIdList">
+ <el-form-item label="鑰佸笀绛夌骇" prop="levelId">
<el-select
- v-model="searchForm.levelIdList"
+ v-model="searchForm.levelId"
style="width: 150px"
placeholder="鑰佸笀绛夌骇"
clearable
- multiple
@change="search"
>
<el-option
- v-for="item in cateList3"
+ v-for="item in cateList.filter(item=>{return item.type==3})"
:key="item.id"
:value="item.id"
:label="item.name"
@@ -110,8 +107,8 @@
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="imgurl" label="鍥剧墖" min-width="100px">
<template slot-scope="{row}">
- <el-image v-if="row.imgurlfull" style="width: 50px; height: 50px; margin-right: 10px" :src="row.imgurlfull"
- :preview-src-list="[row.imgurlfull]">
+ <el-image v-if="row.fullImgurl" style="width: 50px; height: 50px; margin-right: 10px" :src="row.fullImgurl"
+ :preview-src-list="[row.fullImgurl]">
</el-image>
</template>
</el-table-column>
@@ -123,7 +120,7 @@
<span v-if="row.sex ==1">濂�</span>
</template>
</el-table-column>
- <el-table-column prop="position" label="宀椾綅" min-width="120px"></el-table-column>
+ <el-table-column prop="positon" label="宀椾綅" min-width="120px"></el-table-column>
<el-table-column prop="levelName" label="绛夌骇" min-width="100px"></el-table-column>
<el-table-column prop="jobYear" label="浠庝笟骞翠唤" min-width="100px"></el-table-column>
<el-table-column prop="serveNum" label="鏈嶅姟鍟嗗満" min-width="100px">
@@ -133,21 +130,40 @@
</el-table-column>
<el-table-column prop="caseNum" label="鏍囨潌妗堜緥" min-width="100px">
<template slot-scope="{row}">
- <span v-if="row.caseNum">{{row.caseNum}}涓�</span>
+ <span >{{row.caseNum || 0}}涓�</span>
</template>
</el-table-column>
- <el-table-column prop="busTypeNames" label="鍟嗕笟鍖栫被鍨�" min-width="200px"></el-table-column>
- <el-table-column prop="areaNames" label="鏈嶅姟鎴樺尯" min-width="200px"></el-table-column>
- <el-table-column prop="fieldNames" label="鎿呴暱棰嗗煙" min-width="200px"></el-table-column>
- <el-table-column label="鐘舵��">
+ <el-table-column prop="busTypeNames" label="鍟嗕笟鍖栫被鍨�" min-width="200px">
+ <template slot-scope="{row}">
+ <div v-if="row.typeList && row.typeList.length">
+ <div style="display:inline-block;" v-for="(item,index) in row.typeList">{{item.name||''}} <span v-if="index < row.typeList.length-1" style="display:inline-block;padding: 0px 3px;">/</span></div>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="areaNames" label="鏈嶅姟鎴樺尯" min-width="200px">
+ <template slot-scope="{row}">
+ <div v-if="row.zqList && row.zqList.length">
+ <div style="display:inline-block;" v-for="(item,index) in row.zqList">{{item.name||''}} <span v-if="index < row.zqList.length-1" style="display:inline-block;padding: 0px 3px;">/</span></div>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="fieldNames" label="鎿呴暱棰嗗煙" min-width="200px">
+ <template slot-scope="{row}">
+ <div v-if="row.fieldList && row.fieldList.length">
+ <div style="display:inline-block;" v-for="(item,index) in row.fieldList">{{item.name||''}} <span v-if="index < row.fieldList.length-1" style="display:inline-block;padding: 0px 3px;">/</span></div>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="fee" label="璐圭敤鏍囧噯(鍏�/鍛�)" min-width="130px"></el-table-column>
+ <el-table-column prop="updateUserName" label="鎿嶄綔浜�" min-width="100px"></el-table-column>
+ <el-table-column prop="updateTime" label="鏈�杩戞搷浣滄椂闂�" min-width="150px"></el-table-column>
+ <el-table-column label="鐘舵��" fixed="right">
<template slot-scope="{row}">
<el-switch @change="changeStatus($event, row)" v-model="row.status" active-color="#13ce66"
- inactive-color="#ff4949" :active-value="0" :inactive-value="1">
+ inactive-color="#ff4949" :active-value="0" :inactive-value="1">
</el-switch>
</template>
</el-table-column>
- <el-table-column prop="updateUserName" label="鎿嶄綔浜�" min-width="100px"></el-table-column>
- <el-table-column prop="updateTime" label="鏈�杩戞搷浣滄椂闂�" min-width="150px"></el-table-column>
<el-table-column
v-if="containPermissions(['business:member:update', 'business:member:delete'])"
label="鎿嶄綔"
@@ -189,17 +205,16 @@
// 鎼滅储
searchForm: {
name: '',
+ queryFlag:1,
code: '',
status: null,
- levelIdList:[],
+ levelId:null,
fieldIdList: [],
- busTypeIdList:[],
+ zhanquIds:null,
+ bustypeIds:null,
type: 0
},
- cateList:[],
- cateList1:[],
- cateList2:[],
- cateList3:[],
+ cateList:[]
}
},
created () {
@@ -211,25 +226,10 @@
})
this.search()
cateList({
- type: 0 , //鎴樺尯
}).then(res => {
this.cateList = res
})
- cateList({
- type: 1 , //鍟嗕笟鍖�
- }).then(res => {
- this.cateList1 = res
- })
- cateList({
- type: 2 , //鎿呴暱棰嗙敤
- }).then(res => {
- this.cateList2 = res
- })
- cateList({
- type: 3 , //绛夌骇
- }).then(res => {
- this.cateList3 = res
- })
+
},
methods: {
changeStatus (e, row) {
@@ -237,7 +237,7 @@
this.api.updateStatus({ id: row.id, status: e })
.then(res => {
this.$tip.apiSuccess(res || '鎿嶄綔鎴愬姛')
- this.search()
+ this.handlePageChange()
})
.catch(e => {
this.$tip.apiFailed(e)
--
Gitblit v1.9.3