diff --git a/src/api/system/compare.js b/src/api/system/compare.js new file mode 100644 index 0000000..b5b7d67 --- /dev/null +++ b/src/api/system/compare.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询标准科室对照信息列表 +export function listCompare(query) { + return request({ + url: '/system/compare/list', + method: 'get', + params: query + }) +} + +// 查询标准科室对照信息详细 +export function getCompare(id) { + return request({ + url: '/system/compare/' + id, + method: 'get' + }) +} + +// 新增标准科室对照信息 +export function addCompare(data) { + return request({ + url: '/system/compare', + method: 'post', + data: data + }) +} + +// 修改标准科室对照信息 +export function updateCompare(data) { + return request({ + url: '/system/compare', + method: 'put', + data: data + }) +} + +// 删除标准科室对照信息 +export function delCompare(id) { + return request({ + url: '/system/compare/' + id, + method: 'delete' + }) +} diff --git a/src/api/system/departmentDisease.js b/src/api/system/departmentDisease.js index 0763ebb..417c40c 100644 --- a/src/api/system/departmentDisease.js +++ b/src/api/system/departmentDisease.js @@ -37,7 +37,7 @@ export function addDepartmentDisease(data) { export function updateDepartmentDisease(data) { return request({ url: '/system/departmentDisease', - method: 'put', + method: 'post', data: data }) } diff --git a/src/views/system/agency/index.vue b/src/views/system/agency/index.vue index 7e95a22..3714bca 100644 --- a/src/views/system/agency/index.vue +++ b/src/views/system/agency/index.vue @@ -57,7 +57,6 @@ >导出 --> - -->
- - diff --git a/src/views/system/compare/index.vue b/src/views/system/compare/index.vue new file mode 100644 index 0000000..eed7d32 --- /dev/null +++ b/src/views/system/compare/index.vue @@ -0,0 +1,473 @@ + + + diff --git a/src/views/system/department/index.vue b/src/views/system/department/index.vue index ca17650..3594a06 100644 --- a/src/views/system/department/index.vue +++ b/src/views/system/department/index.vue @@ -154,12 +154,28 @@ align="center" prop="departmentType" > - + --> - - - - - - - - - - - - 基本信息
+
+ + + + + + + + + + + - - - - - - - - - - + + + + - - - - - - - - - + + + + + + + + - - - - - - - +
+
扩展信息
+
+ + - - - - - - - + + + + + - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + +
确 定 @@ -549,26 +568,38 @@ import { delDepartment, addDepartment, updateDepartment, - getDepartmentList + getDepartmentList, } from "@/api/system/department"; import { agencyList, getAgencytype } from "@/api/system/agency"; import { getToken } from "@/utils/auth"; -import { listSubdivision, } from "@/api/system/subdivision"; - +import { listSubdivision } from "@/api/system/subdivision"; +import { + listCompare, +} from "@/api/system/compare"; export default { name: "Department", data() { return { - optionsparentDepartment:[], + optionsparentDepartment: [], + queryParamscompare: { + pageNum: 1, + pageSize: 10, + departmentId: null, + departmentName: null, + normCompareName: null, + normCompareCode: null, + normCompareSort: null, + normCompareRemark: null, + }, // 细分 - optionsubdivisionCategory:[], + optionsubdivisionCategory: [], // 标准科室对照4 - optionnormDepartmentCompare:[], + compareList: [], option: [], nodeTypeoptions: [], treeOptions: [], treeOptionsagencyCategoryId: [], - departmentoptions:[], + departmentoptions: [], options: [ // { // value: "PUBLIC_HEALTH", @@ -670,11 +701,11 @@ export default { // 上传的地址 url: process.env.VUE_APP_BASE_API + - "/system/agency/insertAgencyImportList", + "/system/department/insertDepartmentList", }, isResouceShow: 1, isResouceShows: 1, - id:'', + id: "", // 表单校验 rules: { // parentDepartmentId: [ @@ -686,27 +717,40 @@ export default { created() { this.getList(); this.gettreelist(); - // this.gettreelistitem(); this.info(); this.infolist(); this.getinfo(); this.getinfolist(); - this.infodepartment() + this.infodepartment(); + this.infocompare(); }, methods: { - getinfolist(){ - listSubdivision().then(res=>{ - this.optionsubdivisionCategory=res.rows - }) + changeparentDepartment(e){ + this.form.parentDepartmentId=e +console.log(e) }, - getinfo(){ - getDepartmentList().then(res=>{ - console.log(res,'666') - this.optionsparentDepartment=res.data - }) + /** 查询标准科室对照信息列表 */ + infocompare() { + this.loading = true; + listCompare(this.queryParamscompare).then((response) => { + this.compareList = response.rows; + // this.total = response.total; + this.loading = false; + }); + }, + getinfolist() { + listSubdivision().then((res) => { + this.optionsubdivisionCategory = res.rows; + }); + }, + getinfo() { + getDepartmentList().then((res) => { + console.log(res, "666"); + this.optionsparentDepartment = res.data; + }); }, info() { - var dictType = "node_type"; + var dictType = "department_node_type"; getAgencytype(dictType).then((res) => { this.nodeTypeoptions = res.data; }); @@ -725,11 +769,15 @@ export default { }, change(e) { console.log(e, "78"); - // console.log(this.$refs.cascader) - // this.form.parentId = e; this.form.agencyId = e[e.length - 1]; + const arr = this.$refs["cascader"].getCheckedNodes()[0].pathLabels; + this.form.agencyName=arr.slice(-1).join(',') + + console.log(this.form.agencyName); + }, + changeagencyCategoryId(e) { this.form.parentDepartmentId = e[e.length - 1]; }, @@ -745,16 +793,9 @@ export default { agencyList().then((res) => { // 接口请求 this.deptOptions = res.data; - this.treeOptions = res.data.map((item) => { return { value: item.id, ...item }; }); - // this.treeOption = { - // lazy: true, - // checkStrictly: true, - // lazyLoad: this.lazyLoad, - // }; - console.log(res.data, "58", this.treeOptions); }); }, /** 导入按钮操作 */ @@ -765,9 +806,9 @@ export default { /** 下载模板操作 */ importTemplate() { this.download( - "/system/importDownload/downloadTemplate?fileType=agency", + "/system/importDownload/downloadTemplate?fileType=department", {}, - `科室导入模板.xlsx` + `科室下载模板.xlsx` ); }, @@ -884,6 +925,7 @@ export default { const id = row.id || this.ids; getDepartment(id).then((response) => { this.form = response.data; + this.form.parentDepartmentName=response.data.parentDepartmentName this.open = true; this.title = "修改科室信息"; }); @@ -935,3 +977,20 @@ export default { }, }; + diff --git a/src/views/system/departmentDisease/index.vue b/src/views/system/departmentDisease/index.vue index 80b7de3..46afc32 100644 --- a/src/views/system/departmentDisease/index.vue +++ b/src/views/system/departmentDisease/index.vue @@ -241,7 +241,7 @@ {{ departmentName }}{{ form.departmentName }} {{ departmentName }}{{ form.departmentName }}