diff --git a/admin/src/api/workbench.ts b/admin/src/api/workbench.ts new file mode 100644 index 00000000..61ca314c --- /dev/null +++ b/admin/src/api/workbench.ts @@ -0,0 +1,15 @@ +import request from '@/utils/request' + +/** + * 工作台相关API + */ +export const workbenchApi = { + /** + * 获取工作台数据 + */ + getWorkbenchData: () => { + return request.get({ + url: '/workbench/index' + }) + } +} diff --git a/admin/src/views/workbench/index.vue b/admin/src/views/workbench/index.vue index c8ba1a28..6e7eca34 100644 --- a/admin/src/views/workbench/index.vue +++ b/admin/src/views/workbench/index.vue @@ -1,1243 +1,1420 @@ + \ No newline at end of file diff --git a/server/app/common/model/Order.php b/server/app/common/model/Order.php index 5afa05bb..a0908ae9 100644 --- a/server/app/common/model/Order.php +++ b/server/app/common/model/Order.php @@ -173,3 +173,4 @@ class Order extends BaseModel } } } +} diff --git a/server/app/common/model/doctor/Appointment.php b/server/app/common/model/doctor/Appointment.php index 77aa8525..a8309852 100644 --- a/server/app/common/model/doctor/Appointment.php +++ b/server/app/common/model/doctor/Appointment.php @@ -96,8 +96,8 @@ class Appointment extends BaseModel return $this->hasOne('app\adminapi\logic\auth\AdminLogic', 'id', 'doctor_id') ->bind(['doctor_name' => 'name']); } - public function diagnosis(){ - - return $this->belongsTo('app\common\model\tcm\Diagnosis', 'patient_id', 'id'); + public function diagnosis() + { + return $this->belongsTo('app\common\model\tcm\Diagnosis', 'patient_id', 'id'); } }