Commit 758ef089 authored by 何鹏程's avatar 何鹏程

完成搜索优化

parent 9fb748aa
...@@ -55,3 +55,13 @@ export function queryEmergencySiteDtoById(params) { ...@@ -55,3 +55,13 @@ export function queryEmergencySiteDtoById(params) {
data: params data: params
}) })
} }
export function querySiteListByName(name = "") {
return request({
url: '/api/team/site/querySiteListByName',
method: 'GET',
params: {
name: name
}
})
}
\ No newline at end of file
...@@ -209,7 +209,6 @@ export default { ...@@ -209,7 +209,6 @@ export default {
let count = 0 let count = 0
if (Array.isArray(list) && list.length > 0) { if (Array.isArray(list) && list.length > 0) {
count = list.reduce((a, b) => { count = list.reduce((a, b) => {
console.log(b)
return a + b.value return a + b.value
}, 0) }, 0)
} }
......
...@@ -12,10 +12,28 @@ ...@@ -12,10 +12,28 @@
label="车辆使用单位:" label="车辆使用单位:"
prop="vehicleUsingUnit" prop="vehicleUsingUnit"
> >
<el-input <!-- <el-input
placeholder="请输入车辆使用单位" placeholder="请输入车辆使用单位"
v-model="searchForm.vehicleUsingUnit" v-model="searchForm.vehicleUsingUnit"
/> -->
<el-select
v-model="searchForm.vehicleUsingUnit"
placeholder="请选择车辆使用单位"
style="width: 100%"
filterable
allow-create
remote
:loading="selectLoading"
:remote-method="remoteMethod"
:clearable="true"
>
<el-option
v-for="item in hospitalList"
:label="item.hospitalName"
:key="item.id"
:value="item.hospitalName"
/> />
</el-select>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="辖区:" label="辖区:"
...@@ -254,7 +272,7 @@ import EmergencyCarDialog from './components/emergencyCarDialog.vue' ...@@ -254,7 +272,7 @@ import EmergencyCarDialog from './components/emergencyCarDialog.vue'
import BindSiteDialog from './components/bindSiteDialog.vue' import BindSiteDialog from './components/bindSiteDialog.vue'
import TransferDialog from './components/transferDialog' import TransferDialog from './components/transferDialog'
import { queryEmergencyCarPageList, deleteEmergencyCar, toExamineEmergencyCar, unBindSiteToEmergencyCar } from '@/api/emergencyCar' import { queryEmergencyCarPageList, deleteEmergencyCar, toExamineEmergencyCar, unBindSiteToEmergencyCar } from '@/api/emergencyCar'
import { exportEmergencyResources } from '@/api/common' import { exportEmergencyResources, queryHospitalList } from '@/api/common'
import { queryEmergencySiteList } from '@/api/site' import { queryEmergencySiteList } from '@/api/site'
import { getDic } from '../../util/dict' import { getDic } from '../../util/dict'
export default { export default {
...@@ -277,6 +295,8 @@ export default { ...@@ -277,6 +295,8 @@ export default {
siteId: '', siteId: '',
isPreHospitalVechie: '' isPreHospitalVechie: ''
}, },
hospitalList: [],
selectLoading: false,
vechieTypeList: [], vechieTypeList: [],
auditStatusList: [], auditStatusList: [],
areaList: [], areaList: [],
...@@ -372,6 +392,10 @@ export default { ...@@ -372,6 +392,10 @@ export default {
this.$message.error(res.content) this.$message.error(res.content)
} }
}) })
//获取可选择的医院
queryHospitalList().then(res => {
this.hospitalList = res.respData
})
this.search() this.search()
}, },
methods: { methods: {
...@@ -490,7 +514,14 @@ export default { ...@@ -490,7 +514,14 @@ export default {
transferHandler(row) { transferHandler(row) {
this.$refs.transferDialog.init(row) this.$refs.transferDialog.init(row)
console.log(row) console.log(row)
} },
remoteMethod(query) {
this.selectLoading = true;
queryHospitalList(query).then(res => {
this.hospitalList = res.respData
this.selectLoading = false;
})
},
} }
} }
</script> </script>
......
...@@ -12,10 +12,28 @@ ...@@ -12,10 +12,28 @@
label="站点名称" label="站点名称"
prop="siteName" prop="siteName"
> >
<el-input <!-- <el-input
placeholder="请输入站点名称" placeholder="请输入站点名称"
v-model="searchForm.siteName" v-model="searchForm.siteName"
/> -->
<el-select
v-model="searchForm.siteName"
placeholder="请选择站点名称"
style="width: 100%"
filterable
allow-create
remote
:loading="selectLoading2"
:remote-method="remoteMethod2"
:clearable="true"
>
<el-option
v-for="item in siteList"
:label="item.siteName"
:key="item.id"
:value="item.siteName"
/> />
</el-select>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
prop="area" prop="area"
...@@ -194,7 +212,7 @@ ...@@ -194,7 +212,7 @@
<script> <script>
import { tableDataMixin } from '../../common/js/mixin' import { tableDataMixin } from '../../common/js/mixin'
import { roleMixin } from '../../common/js/roleMixin' import { roleMixin } from '../../common/js/roleMixin'
import { queryEmergencySitePageList, deleteEmergencySite, auditEmergencySite } from '@/api/site' import { queryEmergencySitePageList, deleteEmergencySite, auditEmergencySite, querySiteListByName } from '@/api/site'
import { getDic } from '../../util/dict' import { getDic } from '../../util/dict'
import { queryHospitalList, exportEmergencyResources } from '@/api/common' import { queryHospitalList, exportEmergencyResources } from '@/api/common'
import SiteDialog from './components/siteDialog.vue' import SiteDialog from './components/siteDialog.vue'
...@@ -213,6 +231,9 @@ export default { ...@@ -213,6 +231,9 @@ export default {
areaList: [], areaList: [],
hospitalList: [], hospitalList: [],
auditStatusList: [], auditStatusList: [],
hospitalList: [],
siteList: [],
selectLoading2: false,
selectLoading: false, selectLoading: false,
tableData: { tableData: {
loading: false, loading: false,
...@@ -277,6 +298,7 @@ export default { ...@@ -277,6 +298,7 @@ export default {
queryHospitalList().then(res => { queryHospitalList().then(res => {
this.hospitalList = res.respData this.hospitalList = res.respData
}) })
this.remoteMethod2()
this.search() this.search()
}, },
methods: { methods: {
...@@ -302,6 +324,13 @@ export default { ...@@ -302,6 +324,13 @@ export default {
this.selectLoading = false; this.selectLoading = false;
}) })
}, },
remoteMethod2(query) {
this.selectLoading2 = true;
querySiteListByName(query).then(res => {
this.siteList = res.respData
this.selectLoading2 = false;
})
},
showSaveDialog(type = 'add', id = '') { showSaveDialog(type = 'add', id = '') {
this.$refs.siteDialog.init(type, id) this.$refs.siteDialog.init(type, id)
}, },
......
...@@ -12,10 +12,28 @@ ...@@ -12,10 +12,28 @@
label="车辆使用单位:" label="车辆使用单位:"
prop="vehicleUsingUnit" prop="vehicleUsingUnit"
> >
<el-input <!-- <el-input
placeholder="请输入车辆使用单位" placeholder="请输入车辆使用单位"
v-model="searchForm.vehicleUsingUnit" v-model="searchForm.vehicleUsingUnit"
/> -->
<el-select
v-model="searchForm.vehicleUsingUnit"
placeholder="请选择车辆使用单位"
style="width: 100%"
filterable
allow-create
remote
:loading="selectLoading"
:remote-method="remoteMethod"
:clearable="true"
>
<el-option
v-for="item in hospitalList"
:label="item.hospitalName"
:key="item.id"
:value="item.hospitalName"
/> />
</el-select>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="辖区:" label="辖区:"
...@@ -36,6 +54,19 @@ ...@@ -36,6 +54,19 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item
label="单位性质:"
prop="unitType"
>
<el-radio-group
class="radio-group-type4"
v-model="searchForm.unitType"
>
<el-radio :label="1">公立医疗</el-radio>
<el-radio :label="2">民营医院</el-radio>
<el-radio :label="3">非医疗机构</el-radio>
</el-radio-group>
</el-form-item>
<div class="btns"> <div class="btns">
<el-button <el-button
type="primary" type="primary"
...@@ -124,7 +155,7 @@ import { roleMixin } from '../../common/js/roleMixin' ...@@ -124,7 +155,7 @@ import { roleMixin } from '../../common/js/roleMixin'
import detailDialog from './components/detailDialog.vue' import detailDialog from './components/detailDialog.vue'
import { queryTotalCarByHospital } from '@/api/emergencyCar' import { queryTotalCarByHospital } from '@/api/emergencyCar'
import { getDic } from '../../util/dict' import { getDic } from '../../util/dict'
import { exportEmergencyResources } from '@/api/common' import { exportEmergencyResources, queryHospitalList } from '@/api/common'
export default { export default {
name: 'usage', name: 'usage',
mixins: [tableDataMixin, roleMixin], mixins: [tableDataMixin, roleMixin],
...@@ -138,6 +169,8 @@ export default { ...@@ -138,6 +169,8 @@ export default {
area: '' area: ''
}, },
areaList: [], areaList: [],
hospitalList: [],
selectLoading: false,
tableData: { tableData: {
loading: false, loading: false,
head: [ head: [
...@@ -203,6 +236,10 @@ export default { ...@@ -203,6 +236,10 @@ export default {
getDic(['area']).then(res => { getDic(['area']).then(res => {
this.areaList = res.area this.areaList = res.area
}) })
//获取可选择的医院
queryHospitalList().then(res => {
this.hospitalList = res.respData
})
this.search() this.search()
}, },
methods: { methods: {
...@@ -242,6 +279,13 @@ export default { ...@@ -242,6 +279,13 @@ export default {
} }
}) })
}, },
remoteMethod(query) {
this.selectLoading = true;
queryHospitalList(query).then(res => {
this.hospitalList = res.respData
this.selectLoading = false;
})
},
} }
} }
</script> </script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment