From 01dafe60559081d7adc38842747e28ee14bfa226 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Mon, 6 Feb 2023 17:29:53 +0800
Subject: [PATCH] 2023-2-6
---
src/api/schedule/index.js | 10 +
src/views/schedule/component/addSchedule.vue | 1 +
src/views/schedule/component/timeSelect.vue | 10 +-
src/views/schedule/schedule.vue | 17 +-
src/views/schedule/workerSchedule.vue | 223 +++++++++++++++----
5 files changed, 204 insertions(+), 57 deletions(-)
diff --git a/src/api/schedule/index.js b/src/api/schedule/index.js
index 07915c6..87ac714 100644
--- a/src/api/schedule/index.js
+++ b/src/api/schedule/index.js
@@ -63,3 +63,13 @@ export function scheduleIndex(params){
params
})
}
+
+export function nurseSchedule(params){
+ return request(
+ {
+ method:'get',
+ url:'/api/admin/schedule/nurse-schedule',
+ params
+ }
+ )
+}
diff --git a/src/views/schedule/component/addSchedule.vue b/src/views/schedule/component/addSchedule.vue
index b1ca8f5..16a2182 100644
--- a/src/views/schedule/component/addSchedule.vue
+++ b/src/views/schedule/component/addSchedule.vue
@@ -179,6 +179,7 @@ export default {
this.isShowTime = true
}
if(type === 2){
+ this.$refs['timeSelect'].isDelete = schedule.status == 0
this.$refs['timeSelect'].form.id = schedule.id
this.$refs['timeSelect'].form.nurse_id = schedule.nurse_id
this.$refs['timeSelect'].form.start_time = schedule.start_time
diff --git a/src/views/schedule/component/timeSelect.vue b/src/views/schedule/component/timeSelect.vue
index 757d4ba..6e29362 100644
--- a/src/views/schedule/component/timeSelect.vue
+++ b/src/views/schedule/component/timeSelect.vue
@@ -33,7 +33,6 @@
style="width: 300px;"
filterable remote
:remote-method="remoteNurse"
- v-load-more="nurseLoad"
:loading="loading">
@@ -67,7 +66,7 @@
-
+
-
-
-
+
+
+
+
+
+
diff --git a/src/views/schedule/workerSchedule.vue b/src/views/schedule/workerSchedule.vue
index fde0eb2..90ab4e1 100644
--- a/src/views/schedule/workerSchedule.vue
+++ b/src/views/schedule/workerSchedule.vue
@@ -5,44 +5,44 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
@@ -52,24 +52,60 @@
:default-expand-all="false"
:list="list"
:table-item="table"
- :total="total">
+ :total="total"
+ @pageIndexChange="e => {select.page = e;getList()}"
+ @pageSizeChange="e => {select.page = 1;select.page_size = e;getList()}">
+ <
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+