Merge branch 'master' of http://47.107.245.0:3000/xiongxing/kyj-yanglao-web-new

src/api/elderly/elder/outwardRegustration/index.ts

@@ -61,6 +61,11 @@ export const getTempOutList = (data) => {
   })
 }
 
+//
+export const exportAskLeave = async (params) => {
+  return await request.download({ url: `/elderly/askLeave/exportExcel`, params })
+}
+
 // 查询详情
 export const getOutboundRefundConfigList = (params) => {
   return request.get({

src/views/elderly/elder/outward-registration/index.vue

@@ -19,6 +19,17 @@
         />
       </el-form-item>
 
+      <el-form-item label="是否返院" prop="isUpdated">
+        <el-select v-model="queryParams.isUpdated" placeholder="请选择" class="!w-240px" clearable>
+          <el-option
+            v-for="(dict, index) in [{label:'是',value:'1'},{label:'否',value:'0'}]"
+            :key="index"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+
       <el-form-item label="实际离院日期" label-width="auto">
         <el-date-picker
           v-model="queryParams.queryTime"
@@ -45,6 +56,10 @@
         <Icon icon="ep:plus" class="mr-5px" />
         外出登记
       </el-button>
+      <el-button type="warning" plain @click="openImport()"  >
+        <Icon icon="ep:download" class="mr-5px" />
+        导出
+      </el-button>
       <el-text style="color: #aaaaaa; margin-left: 5px">(根据外出退费配置生成缴费单)</el-text>
     </div>
     <el-table v-loading="loading" :data="list" :header-cell-style="tableHeaderColor">
@@ -125,11 +140,13 @@
 import Form from '@/views/elderly/elder/outward-registration/Form.vue'
 import ReturnHospitalForm from '@/views/elderly/elder/outward-registration/ReturnHospitalForm.vue'
 import {
-  deleteASK,
+  deleteASK, exportAskLeave,
   getAskLeList,
   getOutboundRefundConfigList
 } from '@/api/elderly/elder/outwardRegustration'
 import { useUserStore } from '@/store/modules/user'
+import {DICT_TYPE, getStrDictOptions} from "@/utils/dict";
+import download from "@/utils/download";
 defineOptions({ name: 'OutwardRegistration' })
 const userStore = useUserStore()
 const message = useMessage() // 消息弹窗
@@ -143,6 +160,7 @@ let queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
   elderName: '',
+  isUpdated: '',
   queryTime: [],
   tenantIds: userStore.orgTenantId
 })
@@ -180,10 +198,15 @@ const handleQuery = async () => {
 const resetQuery = () => {
   queryParams.elderName = ''
   queryParams.queryTime = []
+  queryParams.isUpdated = ''
   queryFormRef.value.resetFields()
   handleQuery()
 }
 
+const openImport = async () => {
+   const data = await exportAskLeave(queryParams)
+  download.excel(data, '外出登记.xls')
+}
 
 const getOutboundRefundConfigListFun = () => {
   getOutboundRefundConfigList()