From 1471f4c7cfe02e2fd2c495f0a5166d24d84bca55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Wed, 6 Mar 2024 11:31:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/departmentDisease.js | 9 + src/views/manage/servicewaycontent/index.vue | 3 +- src/views/system/agency/index.vue | 48 ++++-- src/views/system/agencyCategory/index.vue | 23 ++- src/views/system/compare/index.vue | 18 +- src/views/system/department/index.vue | 21 ++- src/views/system/departmentDisease/index.vue | 78 ++++++--- src/views/system/subdivision/index.vue | 167 ++++++++++++++----- 8 files changed, 267 insertions(+), 100 deletions(-) diff --git a/src/api/system/departmentDisease.js b/src/api/system/departmentDisease.js index 417c40c..e7db3c9 100644 --- a/src/api/system/departmentDisease.js +++ b/src/api/system/departmentDisease.js @@ -15,6 +15,14 @@ export function getDepartmentList(query) { params: query }) } +export function selectDiseaseCount(departmentName) { + return request({ + url: `/system/departmentDisease/selectDiseaseCount?departmentName=${departmentName}`, + method: 'get', + + }) +} +// get 搜索条件传departmentName // 查询科室病种信息详细 export function getDepartmentDisease(id) { @@ -33,6 +41,7 @@ export function addDepartmentDisease(data) { }) } + // 修改科室病种信息 export function updateDepartmentDisease(data) { return request({ diff --git a/src/views/manage/servicewaycontent/index.vue b/src/views/manage/servicewaycontent/index.vue index 2d46a47..811c80b 100644 --- a/src/views/manage/servicewaycontent/index.vue +++ b/src/views/manage/servicewaycontent/index.vue @@ -623,6 +623,7 @@ export default { // this.departmentName = item.serviceWayName; this.loading = true; this.queryParams.serviceWayId = item.id; + this.form.serviceWayId=item.id this.getList(); } else { this.queryParams.serviceWayId = ""; @@ -722,7 +723,7 @@ export default { // const id = row.id getServicewaycontent(row.valuePlusMax).then((response) => { this.form = response.data; - // this.form.id = response.data.serviceFrequencyId; + this.form.id = response.data.serviceFrequencyId; // ---------- if (response.data.serviceFrequencyType == "DIGIT") { diff --git a/src/views/system/agency/index.vue b/src/views/system/agency/index.vue index f02cd1f..82efa7d 100644 --- a/src/views/system/agency/index.vue +++ b/src/views/system/agency/index.vue @@ -291,26 +291,19 @@ /> --> - - - - - - 启用 - 禁用 - - - + + @@ -347,6 +341,7 @@ :show-all-levels="false" ref="cascader" :key="isResouceShows" + clearable > @@ -354,6 +349,7 @@ v-model="form.nodeType" placeholder="请选择" style="width: 205px" + clearable > - + - + + + + + + 启用 + 禁用 + + +
@@ -628,8 +639,10 @@ export default { }, // 表单校验 rules: { - // parentId: [ - // { required: true, message: "上级机构id不能为空", trigger: "blur" }, + agencyName: [ + { required: true, message: "机构名称能为空", trigger: "blur" }, + ], + // areaCode:[{ required: true, message: "行政区划不能为空", trigger: "blur" }, // ], }, treeOptionsagencyCategoryId: [], @@ -822,7 +835,10 @@ export default { console.log(e, "78"); // console.log(this.$refs.cascader) // this.form.parentId = e; - this.form.parentId = e[e.length - 1]; + if(e){ + this.form.parentId = e[e.length - 1]; + + } }, changeagencyCategoryId(e) { diff --git a/src/views/system/agencyCategory/index.vue b/src/views/system/agencyCategory/index.vue index 12bf382..eaf96b5 100644 --- a/src/views/system/agencyCategory/index.vue +++ b/src/views/system/agencyCategory/index.vue @@ -180,8 +180,11 @@ v-model="form.parentCategoryId" :show-all-levels="false" :placeholder=" - form.parentCategoryName ? form.parentCategoryName : '请选择父级类别' + form.parentCategoryName + ? form.parentCategoryName + : '请选择父级类别' " + clearable ref="cascader" :key="isResouceShow" > @@ -189,6 +192,7 @@ --> - + @@ -176,16 +176,16 @@ --> - + - + - + - +
@@ -324,6 +324,14 @@ export default { innerVisibleshow:false, // 表单校验 rules: { + departmentId:[ + { required: true, message: "所属科室不能为空", trigger: "blur" }, + + ], + normCompareName:[ + { required: true, message: "标准对照名称不能为空", trigger: "blur" }, + + ] } }; }, diff --git a/src/views/system/department/index.vue b/src/views/system/department/index.vue index 8acb4d5..8d2154b 100644 --- a/src/views/system/department/index.vue +++ b/src/views/system/department/index.vue @@ -36,6 +36,7 @@ > @@ -363,6 +368,7 @@ v-model="form.departmentType" placeholder="请选择" style="width: 205px" + clearable="" > --> @@ -390,6 +397,7 @@ v-model="form.nodeType" placeholder="请选择" style="width: 205px" + clearable > --> @@ -706,9 +721,9 @@ export default { id: "", // 表单校验 rules: { - // parentDepartmentId: [ - // { required: true, message: "上级科室id不能为空", trigger: "blur" }, - // ], + departmentName: [ + { required: true, message: "科室名称不能为空", trigger: "blur" }, + ], }, }; }, diff --git a/src/views/system/departmentDisease/index.vue b/src/views/system/departmentDisease/index.vue index ed011a6..3e3242d 100644 --- a/src/views/system/departmentDisease/index.vue +++ b/src/views/system/departmentDisease/index.vue @@ -26,6 +26,7 @@ -->
-
+
--> + + + + - 搜索 - 重置 + 搜索 + 重置 @@ -40,7 +55,8 @@ size="mini" @click="handleAdd" v-hasPermi="['system:subdivision:add']" - >新增 + >新增 修改 + >修改 删除 + >删除 导出 + >导出 - + - + - - + + - + - + - + - + - + - + - +
@@ -137,7 +199,13 @@