Переглянути джерело

fix: 改造axios

bug/0816
yinsiyu 2 місяці тому
джерело
коміт
c40b45da31
31 змінених файлів з 55 додано та 205 видалено
  1. +0
    -34
      src/api/admin/index.js
  2. +0
    -0
      src/api/dictManage/dept.js
  3. +0
    -0
      src/api/dictManage/disease.js
  4. +0
    -0
      src/api/dictManage/hosp.js
  5. +17
    -0
      src/api/index.js
  6. +0
    -0
      src/api/operationManage/recommend.js
  7. +0
    -0
      src/api/userManage/account.js
  8. +0
    -0
      src/api/userManage/menu.js
  9. +0
    -0
      src/api/userManage/role.js
  10. +0
    -0
      src/api/userManage/staff.js
  11. +0
    -137
      src/components/PullTableSelect/index.vue
  12. +1
    -1
      src/components/TreeDept/index.vue
  13. +0
    -6
      src/store/index.js
  14. +1
    -1
      src/store/modules/user.js
  15. +3
    -1
      src/views/dictManage/deptManage/deptList/components/CrudPopup/index.vue
  16. +3
    -1
      src/views/dictManage/deptManage/deptList/index.vue
  17. +2
    -1
      src/views/dictManage/diseaseManage/diseaseList/components/CrudPopup/index.vue
  18. +3
    -1
      src/views/dictManage/diseaseManage/diseaseList/index.vue
  19. +1
    -1
      src/views/dictManage/hospManage/wardList/components/CrudPopup/index.vue
  20. +1
    -1
      src/views/dictManage/hospManage/wardList/index.vue
  21. +3
    -1
      src/views/operationManage/recommendDoctorConfig/components/selectRecommend/index.vue
  22. +1
    -1
      src/views/operationManage/recommendDoctorConfig/index.vue
  23. +3
    -2
      src/views/statisticalManage/followupStatistical/listPage/index.vue
  24. +3
    -4
      src/views/userManage/accountManage/accountList/components/CrudPopup/index.vue
  25. +3
    -6
      src/views/userManage/accountManage/accountList/index.vue
  26. +2
    -1
      src/views/userManage/roleManage/roleDetail/index.vue
  27. +2
    -1
      src/views/userManage/roleManage/roleList/components/CrudPopup/index.vue
  28. +1
    -1
      src/views/userManage/roleManage/roleList/index.vue
  29. +1
    -1
      src/views/userManage/staffManage/staffList/components/CrudPopup/index.vue
  30. +1
    -1
      src/views/userManage/staffManage/staffList/components/StaffSelectorPopup/index.vue
  31. +3
    -1
      src/views/userManage/staffManage/staffList/index.vue

+ 0
- 34
src/api/admin/index.js Переглянути файл

@@ -1,34 +0,0 @@
/*
* @Author: guanxiaoyan guanxiaoyan@pb-station.com
* @Deion:
* @Date: 2024-01-31 10:03:20
* @LastEditors: guanxiaoyan guanxiaoyan@pb-station.com
* @LastEditTime: 2024-01-31 10:07:11
* @FilePath: /followUp-admin/src/api/admin/index.js
*/
import request from "@/utils/request";

export * from "./dictManage/dept";
export * from "./dictManage/hosp";
export * from "./dictManage/disease";

export * from "./userManage/staff";
export * from "./userManage/role";
export * from "./userManage/account";
export * from "./userManage/menu";

// 根据院区ID获取科室
export function getTreeHospDept(query) {
return request({
url: `/internal/hospDept/all-list-children-by-ward`,
method: "get",
params: query,
});
}
export function getTreeHospDeptByPatient(query) {
return request({
url: `/internal/hospDept/all-list-children`,
method: "get",
params: query,
});
}

src/api/admin/dictManage/dept.js → src/api/dictManage/dept.js Переглянути файл


src/api/admin/dictManage/disease.js → src/api/dictManage/disease.js Переглянути файл


src/api/admin/dictManage/hosp.js → src/api/dictManage/hosp.js Переглянути файл


+ 17
- 0
src/api/index.js Переглянути файл

@@ -0,0 +1,17 @@
import request from "@/utils/request";

// 根据院区ID获取科室
export function getTreeHospDept(query) {
return request({
url: `/internal/hospDept/all-list-children-by-ward`,
method: "get",
params: query,
});
}
export function getTreeHospDeptByPatient(query) {
return request({
url: `/internal/hospDept/all-list-children`,
method: "get",
params: query,
});
}

src/api/admin/operationManage/recommend.js → src/api/operationManage/recommend.js Переглянути файл


src/api/admin/userManage/account.js → src/api/userManage/account.js Переглянути файл


src/api/admin/userManage/menu.js → src/api/userManage/menu.js Переглянути файл


src/api/admin/userManage/role.js → src/api/userManage/role.js Переглянути файл


src/api/admin/userManage/staff.js → src/api/userManage/staff.js Переглянути файл


+ 0
- 137
src/components/PullTableSelect/index.vue Переглянути файл

@@ -1,137 +0,0 @@
<template>
<div>
<vxe-pulldown ref="pulldownRef" popup-class-name="my-dropdown4" transfer>
<template #default>
<vxe-input
v-model="searchName"
suffix-icon="vxe-icon-table"
v-bind="inputProps"
@keyup="keyupEvent"
@focus="focusEvent"
@suffix-click="suffixClick"
></vxe-input>
</template>
<template #dropdown>
<div class="my-bodydown4">
<vxe-grid
ref="xGrid"
:data="tableData"
:pagerConfig="pagerConfig"
@cell-click="cellClickEvent"
@checkbox-change="onCheckBoxChange"
@checkbox-all="onCheckBoxAll"
@page-change="pageChangeEvent"
v-bind="tableConfig"
></vxe-grid>
</div>
</template>
</vxe-pulldown>
</div>

</template>
<script>
export default {
props: {
inputProps: {
type: Object,
default: () => ({
placeholder: '请选择'
})
},
tableConfig: {
type: Object,
default: () => ({
})
},
apiMethod: {
required: true,
},
apiCallback: {
required: false
}
},
data() {
return {
searchName: "",
pagerConfig: {
pageSize: 10,
pageSizes: [10, 20, 50, 100, 200],
enabled: true
},
tableData: [],
};
},
created() {
this.getList()
},
mounted() {
},
methods: {
// 获取表格数据
async getList() {
if (this.apiMethod) {
const res = await this.apiMethod()
console.log('apiCallback=',this.apiCallback)
// 如果有回调处理参数
if (this.apiCallback) {
const newRes = this.apiCallback(res)
this.tableData = newRes.list
console.log('this.tableData', newRes)
} else {
// 如果没有回调处理参数,则走默认的
}
}
},
// 复选
onCheckBoxChange(params) {
console.log('复选了=', params)
this.$emit('change',params)
},
// 全选/全不选
onCheckBoxAll(params) {
console.log('params=', params)
this.$emit('changeAll',params)
},
focusEvent() {
const $pulldown = this.$refs.pulldownRef;
if ($pulldown) {
$pulldown.showPanel();
}
},
keyupEvent() {
},
suffixClick() {
const $pulldown = this.$refs.pulldownRef;
if ($pulldown) {
$pulldown.togglePanel();
}
},
cellClickEvent({ row }) {
const $pulldown = this.$refs.pulldownRef;
if ($pulldown) {
this.searchName = row.name;
$pulldown.hidePanel();
}
},
pageChangeEvent({ currentPage, pageSize }) {
this.pagerConfig.currentPage = currentPage;
this.pagerConfig.pageSize = pageSize;
},
},
};
</script>

<style lang="scss">
.my-dropdown4 {
background-color: #fff;
box-shadow: 0 0 6px 2px rgba(0, 0, 0, 0.1);
.my-bodydown4 {
width: 600px;
height: 300px;
}

.my-footdown4 {
border-top: 1px solid #e8eaec;
}
}
</style>

+ 1
- 1
src/components/TreeDept/index.vue Переглянути файл

@@ -11,7 +11,7 @@
</template>

<script>
import { getTreeHospDept as getDeptApi2 } from "@/api/admin";
import { getTreeHospDept as getDeptApi2 } from "@/api/index";
const getDeptApi = getDeptApi2
export default {
name: "TreeDept",


+ 0
- 6
src/store/index.js Переглянути файл

@@ -6,16 +6,10 @@ import tagsView from "./modules/tagsView";
import permission from "./modules/permission";
import settings from "./modules/settings";
import getters from "./getters";
import createPersistedState from "vuex-persistedstate";

Vue.use(Vuex);

const store = new Vuex.Store({
plugins: [
createPersistedState({
storage: window.localStorage, // 注意
}),
],
modules: {
app,
user,


+ 1
- 1
src/store/modules/user.js Переглянути файл

@@ -6,7 +6,7 @@
* @LastEditTime: 2024-01-30 20:08:05
* @FilePath: /followUp-admin/src/store/modules/user.js
*/
import { getUserPermissions } from "@/api/common";
import { getUserPermissions } from "@/api/common/login";
import Cookies from "js-cookie";

const user = {


+ 3
- 1
src/views/dictManage/deptManage/deptList/components/CrudPopup/index.vue Переглянути файл

@@ -46,7 +46,9 @@

<script>
import Popup from "@/components/Popup";
import { addDept, updateDept, getAllHospital, getAllFirstDept, checkDeptUse } from "@/api/admin";
import { checkDeptUse } from "@/api/userManage/account";
import { addDept, updateDept, getAllFirstDept } from '@/api/dictManage/dept'
import { getAllHospital } from '@/api/dictManage/hosp'
export default {
components: {
Popup,


+ 3
- 1
src/views/dictManage/deptManage/deptList/index.vue Переглянути файл

@@ -106,7 +106,9 @@
</template>

<script>
import { deptPageList, deleteDept, checkDeptUse, getAllHospital } from "@/api/admin";
import { checkDeptUse } from "@/api/userManage/account";
import { getAllHospital } from "@/api/dictManage/hosp";
import { deptPageList, deleteDept } from '@/api/dictManage/dept'
import CrudPopup from "./components/CrudPopup/index.vue";

export default {


+ 2
- 1
src/views/dictManage/diseaseManage/diseaseList/components/CrudPopup/index.vue Переглянути файл

@@ -34,7 +34,8 @@
<script>
import Popup from "@/components/Popup";
import TreeDept from "@/components/TreeDept";
import { addDisease, updateDisease, getAllHospitalList, getTreeHospDept } from "@/api/admin";
import {getAllHospitalList } from '@/api/dictManage/hosp'
import { addDisease, updateDisease } from '@/api/dictManage/disease'
export default {
components: {
Popup,


+ 3
- 1
src/views/dictManage/diseaseManage/diseaseList/index.vue Переглянути файл

@@ -108,7 +108,9 @@

<script>
import ImportResultPopup from "@/components/ImportResultPopup";
import { diseasePageList, deleteDisease, batchImportDisease, getAllHospital, getTreeHospDept } from "@/api/admin";
import { getTreeHospDept } from "@/api/index";
import { diseasePageList, deleteDisease, batchImportDisease } from '@/api/dictManage/disease';
import { getAllHospital } from '@/api/dictManage/hosp';
import CrudPopup from "./components/CrudPopup/index.vue";
import TreeDept from "@/components/TreeDept";



+ 1
- 1
src/views/dictManage/hospManage/wardList/components/CrudPopup/index.vue Переглянути файл

@@ -19,7 +19,7 @@

<script>
import Popup from "@/components/Popup";
import { addHospital, updateHospital } from "@/api/admin";
import { addHospital, updateHospital } from "@/api/dictManage/hosp";
import { IS_MY_HOSPITAL } from '@/enums/index'
export default {
components: {


+ 1
- 1
src/views/dictManage/hospManage/wardList/index.vue Переглянути файл

@@ -94,7 +94,7 @@

<script>
import ApiButton from "@/components/ApiButton/index.vue";
import { hospitalPageList, deleteHospital, updateHospital } from "@/api/admin";
import { hospitalPageList, deleteHospital, updateHospital } from '@/api/dictManage/hosp'
import CrudPopup from "./components/CrudPopup/index.vue";
import { WARD_STATUS, IS_MY_HOSPITAL } from '@/enums/index'



+ 3
- 1
src/views/operationManage/recommendDoctorConfig/components/selectRecommend/index.vue Переглянути файл

@@ -63,7 +63,9 @@

<script>
import { TableMixin } from '@/mixins/tableMixin'
import { staffPageList, getAllHospital, getTreeHospDept } from "@/api/admin";
import { getTreeHospDept } from "@/api/index";
import { staffPageList, } from '@/api/userManage/staff'
import { getAllHospital } from "@/api/dictManage/hosp";
import TreeDept from "@/components/TreeDept";
export default {
name: "SelectRecommend",


+ 1
- 1
src/views/operationManage/recommendDoctorConfig/index.vue Переглянути файл

@@ -26,7 +26,7 @@
</template>
<script>

import { getRecommendDoctorListApi, saveRecommendDoctorApi } from '@/api/admin/operationManage/recommend'
import { getRecommendDoctorListApi, saveRecommendDoctorApi } from '@/api/operationManage/recommend'
import SelectRecommend from './components/selectRecommend/index.vue'
import draggable from 'vuedraggable'
import { nanoid } from 'nanoid'


+ 3
- 2
src/views/statisticalManage/followupStatistical/listPage/index.vue Переглянути файл

@@ -279,8 +279,9 @@ import {
statisticalViewData,
statisticalPageList,
statisticalExport,
} from "@/api/common";
import { getAllHospital, getTreeHospDeptByPatient } from "@/api/admin";
} from "@/api/common/statisticalManage/followupStatistical";
import { getTreeHospDeptByPatient } from "@/api/index";
import { getAllHospital } from "@/api/dictManage/hosp";
import ApiButton from "@/components/ApiButton";
import TreeDept from "@/components/TreeDept";
import { FOLLOWUP_STATUS, PERIOD_UNIT } from '@/enums/index'


+ 3
- 4
src/views/userManage/accountManage/accountList/components/CrudPopup/index.vue Переглянути файл

@@ -73,11 +73,10 @@ import { validContact, validPasword } from "@/utils/validate";
const DEFAULT_PASSWORD = "________";
import { ACCOUNT_STATUS } from '@/enums/index'
import {
getAllHospitalList,
getRoleAllList,
addAccount,
editAccount,
} from "@/api/admin";
} from "@/api/userManage/role";
import { addAccount, editAccount } from '@/api/userManage/account'
import { getAllHospitalList } from '@/api/dictManage/hosp'
export default {
components: {
Popup,


+ 3
- 6
src/views/userManage/accountManage/accountList/index.vue Переглянути файл

@@ -141,13 +141,10 @@
import ApiButton from "@/components/ApiButton/index.vue";
import TreeDept from "@/components/TreeDept";
import {
accountPageList,
delAccount,
enableAccount,
disableAccount,
getAllHospital,
getTreeHospDept
} from "@/api/admin";
} from "@/api/index";
import { accountPageList, delAccount, enableAccount, disableAccount } from '@/api/userManage/account'
import { getAllHospital } from '@/api/dictManage/hosp'
import CrudPopup from "./components/CrudPopup/index.vue";
import { ACCOUNT_STATUS } from '@/enums/index'



+ 2
- 1
src/views/userManage/roleManage/roleDetail/index.vue Переглянути файл

@@ -82,7 +82,8 @@
<script>
import ApiButton from "@/components/ApiButton/index.vue";
import CrudPopup from "../roleList/components/CrudPopup/index.vue";
import { geMenuTreeList, getRoleAllList, getRoleMenuList } from "@/api/admin";
import { getRoleAllList } from "@/api/userManage/role";
import { getRoleMenuList, geMenuTreeList } from '@/api/userManage/menu'
import { RULE_STATUS } from '@/enums/index'
export default {
name: "RoleDetail",


+ 2
- 1
src/views/userManage/roleManage/roleList/components/CrudPopup/index.vue Переглянути файл

@@ -37,7 +37,8 @@

<script>
import Popup from "@/components/Popup";
import { geMenuTreeList, getRoleMenuList, saveRole } from "@/api/admin";
import { saveRole } from "@/api/userManage/role";
import { getRoleMenuList, geMenuTreeList } from '@/api/userManage/menu'
import { RULE_STATUS } from '@/enums/index';
export default {
components: {


+ 1
- 1
src/views/userManage/roleManage/roleList/index.vue Переглянути файл

@@ -102,7 +102,7 @@

<script>
import ApiButton from "@/components/ApiButton/index.vue";
import { rolePageList, disableRole, enableRole, delRole } from "@/api/admin";
import { rolePageList, disableRole, enableRole, delRole } from "@/api/userManage/role";
import CrudPopup from "./components/CrudPopup/index.vue";
import { RULE_STATUS } from '@/enums/index';
export default {


+ 1
- 1
src/views/userManage/staffManage/staffList/components/CrudPopup/index.vue Переглянути файл

@@ -31,7 +31,7 @@
<script>
import Popup from "@/components/Popup";
import TreeDept from "@/components/TreeDept";
import { getAllHospitalList } from "@/api/admin";
import { getAllHospitalList } from '@/api/dictManage/hosp'
export default {
components: {
Popup,


+ 1
- 1
src/views/userManage/staffManage/staffList/components/StaffSelectorPopup/index.vue Переглянути файл

@@ -70,7 +70,7 @@
<script>
import Popup from "@/components/Popup";
import CrudPopup from "../CrudPopup";
import { getTrustDoctorInfos, batchAddStaff, getAllDoctorIdForClient } from "@/api/admin";
import { getTrustDoctorInfos, batchAddStaff, getAllDoctorIdForClient } from '@/api/userManage/staff'
export default {
components: {
Popup,


+ 3
- 1
src/views/userManage/staffManage/staffList/index.vue Переглянути файл

@@ -112,7 +112,9 @@ import ApiButton from "@/components/ApiButton/index.vue";
import StaffSelectorPopup from "./components/StaffSelectorPopup";
import CrudPopup from "./components/CrudPopup";
import TreeDept from "@/components/TreeDept";
import { staffPageList, editStaff, delStaff, getAllHospital, getTreeHospDept } from "@/api/admin";
import { getTreeHospDept } from "@/api/index";
import { staffPageList, editStaff, delStaff } from '@/api/userManage/staff'
import { getAllHospital } from '@/api/dictManage/hosp'

export default {
name: "StaffManage",


Завантаження…
Відмінити
Зберегти