From 46c74b0ab0ca5c0d99aa6682fead79a85eb1feb5 Mon Sep 17 00:00:00 2001 From: shidongli Date: Tue, 5 Mar 2024 17:20:34 +0800 Subject: [PATCH 01/21] =?UTF-8?q?=E6=89=8B=E6=9C=AF=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/operationInfo/operationInfo/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/operationInfo/operationInfo/index.vue b/src/views/operationInfo/operationInfo/index.vue index 7b17555..0017b10 100644 --- a/src/views/operationInfo/operationInfo/index.vue +++ b/src/views/operationInfo/operationInfo/index.vue @@ -428,7 +428,7 @@ export default { this.open = true; this.title = "修改手术信息"; if (this.title == "修改手术信息") { - this.disabled = true + // this.disabled = true } }); From 5c4b023f020e50cdffda6437e39854ea50df46dd Mon Sep 17 00:00:00 2001 From: shidongli Date: Tue, 5 Mar 2024 17:21:25 +0800 Subject: [PATCH 02/21] =?UTF-8?q?=E8=AF=9D=E6=9C=AF=E5=BA=93=E5=B7=A6?= =?UTF-8?q?=E4=BE=A7=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/manage/script.js | 9 +++++++++ src/views/manage/script/index.vue | 5 ++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/api/manage/script.js b/src/api/manage/script.js index 067a754..bb0e1f4 100644 --- a/src/api/manage/script.js +++ b/src/api/manage/script.js @@ -69,3 +69,12 @@ export function delScript(id) { method: 'delete' }) } +// 左侧科室 +export function listServicePackageNum(query) { + return request({ + url: '/system/department/listServicePackageNum', + method: 'get', + params: query + }) +} + diff --git a/src/views/manage/script/index.vue b/src/views/manage/script/index.vue index d5a7e7c..b6294d0 100644 --- a/src/views/manage/script/index.vue +++ b/src/views/manage/script/index.vue @@ -561,8 +561,7 @@ + From c643410c18f51fde6b9e5e07f1ace95e479cf0e0 Mon Sep 17 00:00:00 2001 From: shidongli Date: Tue, 5 Mar 2024 17:24:59 +0800 Subject: [PATCH 04/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/manage/servicepackage/index.vue | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/views/manage/servicepackage/index.vue b/src/views/manage/servicepackage/index.vue index 2eb734a..8d69b81 100644 --- a/src/views/manage/servicepackage/index.vue +++ b/src/views/manage/servicepackage/index.vue @@ -1323,20 +1323,9 @@ this.$set(this.form,'packageTermUnit',e); submitForm() { console.log(this.form) this.$refs["form"].validate(valid => { - if (valid) { if(this.form.voList){ this.form.voList.forEach(e=>{ - if(e.serviceWayName==null){ - this.$modal.msgError("请选择服务方式"); - - }else if(e.serviceContent==null){ - this.$modal.msgError("请选择服务内容"); - } - else if(e.serviceFrequencyText==null){ - this.$modal.msgError("请选择服务频次"); - } - else{ if(e.serviceFrequencyText.includes('~')){ const str = e.serviceFrequencyText; const parts = str.split('~'); @@ -1379,10 +1368,6 @@ this.$set(this.form,'packageTermUnit',e); }); } - - - } - }) } From f61b11cea415fc4884287cd9ea08d9b0dde73dc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Tue, 5 Mar 2024 17:26:23 +0800 Subject: [PATCH 05/21] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8C=85=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=92=8C=E7=94=A8=E6=88=B7=E6=B7=BB=E5=8A=A0=E7=A7=91?= =?UTF-8?q?=E5=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/user.js | 28 +- src/views/manage/servicewaycontent/index.vue | 79 +++-- src/views/system/user/index.vue | 348 ++++++++++++++++--- 3 files changed, 383 insertions(+), 72 deletions(-) diff --git a/src/api/system/user.js b/src/api/system/user.js index ddf7f9e..5cb3d5f 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -18,6 +18,15 @@ export function selectUserAgencyleft(query) { }) } +export function selectUserDepartment(query) { + return request({ + url: '/system/user/selectUserDepartment', + method: 'get', + params: query + + }) +} + export function selectUserAgency(userName) { return request({ url: `/system/user/selectUserBelongAgency?userName=${userName}`, @@ -25,6 +34,14 @@ export function selectUserAgency(userName) { }) } +export function getBelongDepartment(userName) { + return request({ + url: `/system/user/getBelongDepartment?userName=${userName}`, + method: 'get', + + }) +} + // /system/user/selectUserAgency 这个是右边的接口，传值不变 // 查询用户详细 export function getUser(userId) { @@ -46,8 +63,15 @@ export function addUser(data) { // 修改用户 export function updateUser(data) { return request({ - url: '/system/user', - method: 'put', + url: '/system/user/editAgency', + method: 'post', + data: data + }) +} +export function editDepartment(data) { + return request({ + url: '/system/user/editDepartment', + method: 'post', data: data }) } diff --git a/src/views/manage/servicewaycontent/index.vue b/src/views/manage/servicewaycontent/index.vue index fa93e56..571b03f 100644 --- a/src/views/manage/servicewaycontent/index.vue +++ b/src/views/manage/servicewaycontent/index.vue @@ -225,8 +225,9 @@ label="服务频次" align="center" prop="serviceWayFrequencyList" + :key="keyTable" > -