From 2e882cbeda6a8a0f4dd193896386192f0f5ba0a7 Mon Sep 17 00:00:00 2001 From: 马宇豪 <978517621@qq.com> Date: 星期四, 06 七月 2023 15:52:24 +0800 Subject: [PATCH] 修改 --- src/views/Admin/sameLevel.vue | 36 +++++++++++++++++++++--------------- 1 files changed, 21 insertions(+), 15 deletions(-) diff --git a/src/views/Admin/sameLevel.vue b/src/views/Admin/sameLevel.vue index 09231d2..8c72a54 100644 --- a/src/views/Admin/sameLevel.vue +++ b/src/views/Admin/sameLevel.vue @@ -4,10 +4,13 @@ <a-col :span="4"> <a-button v-if="unittype && unittype !== null" type="primary" @click="editData('add',{})">新增用户</a-button> </a-col> - <a-col :span="20" v-if="unittype == null || !unittype"> - <a-row type="flex" justify="end" :gutter="12"> - <a-col :span="4"> - <a-cascader :options="areaData" v-model="areaVal" placeholder="行政规划" expandTrigger="hover" :fieldNames="fieldNames" changeOnSelect @change="onChange" style="width: 100%"/> + <a-col :span="20"> + <a-row type="flex" justify="end" :gutter="14"> + <a-col :span="6"> + <a-input v-model="search.searchParams.company" placeholder="单位名称" style="width: 100%"/> + </a-col> + <a-col :span="4" v-if="unittype == null || !unittype"> + <a-cascader :options="areaData" v-model="areaVal" placeholder="所属区域" expandTrigger="hover" :fieldNames="fieldNames" changeOnSelect @change="onChange" style="width: 100%"/> </a-col> <a-col :span="4"> <a-button type="primary" @click="getUserList">查询</a-button> @@ -17,7 +20,7 @@ </a-col> </a-row> <div class="table-cont"> - <a-table :columns="columns" :data-source="tableData" :pagination="pagination" :rowKey="record=>record.name" bordered> + <a-table :columns="columns" :data-source="tableData" :pagination="pagination" :rowKey="record=>record.id" bordered> <template #unittype="unittype"> <a-tag :color="unittype === 1 ? 'purple' : unittype === 2 ? 'blue' : unittype === 3 ? 'cyan' : 'green'" @@ -60,6 +63,7 @@ pageIndex: 1, pageSize: 10, searchParams:{ + company: '', province: '', city: '', area: '', @@ -119,7 +123,6 @@ }, created() { const t = this - console.log(getUserInfo(),'id') t.unittype = getUserInfo().unittype t.districtId = getUserInfo().districtId t.getUserList() @@ -128,7 +131,7 @@ methods:{ async getUserList(){ const t = this - if(t.search.searchParams.province == '' && t.search.searchParams.city == '' && t.search.searchParams.area == '' ){ + if(t.search.searchParams.province == '' && t.search.searchParams.city == '' && t.search.searchParams.area == '' && t.search.searchParams.company == ''){ const {searchParams,...data} = t.search const res = await getRecipient(data) if(res.data.code == 100){ @@ -164,6 +167,7 @@ pageIndex: 1, pageSize: 10, searchParams:{ + company: '', province: '', city: '', area: '', @@ -189,14 +193,15 @@ cancelText: '取消', okText: '确认', centered: true, - async onOk() { - let res = await delRecipient(row.id) - if(res.data.code == 100){ - t.$message.success('删除用户信息成功'); - t.getUserList() - }else{ - t.$message.warning(res.data.msg); - } + onOk() { + delRecipient(row.id).then(res=>{ + if(res.data.code == 100){ + t.$message.success('删除用户信息成功'); + t.getUserList() + }else{ + t.$message.warning(res.data.msg); + } + }) }, onCancel() { console.log('Cancel'); @@ -229,6 +234,7 @@ onChange(value) { const t = this t.search.searchParams = { + company: '', province: '', city: '', area: '', -- Gitblit v1.9.2