diff --git a/src/api/biosafety/medicine.js b/src/api/biosafety/medicine.js index 5068d6c..a95ae86 100644 --- a/src/api/biosafety/medicine.js +++ b/src/api/biosafety/medicine.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询药品列表 export function listMedicine(query) { return request({ - url: '/system/medicine/list', + url: '/biosafety/medicine/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listMedicine(query) { // 查询药品详细 export function getMedicine(id) { return request({ - url: '/system/medicine/' + id, + url: '/biosafety/medicine/' + id, method: 'get' }) } @@ -20,7 +20,7 @@ export function getMedicine(id) { // 新增药品 export function addMedicine(data) { return request({ - url: '/system/medicine', + url: '/biosafety/medicine', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addMedicine(data) { // 修改药品 export function updateMedicine(data) { return request({ - url: '/system/medicine', + url: '/biosafety/medicine', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateMedicine(data) { // 删除药品 export function delMedicine(id) { return request({ - url: '/system/medicine/' + id, + url: '/biosafety/medicine/' + id, method: 'delete' }) } diff --git a/src/views/work/index.vue b/src/views/work/index.vue index 00945b3..1ee6ea8 100644 --- a/src/views/work/index.vue +++ b/src/views/work/index.vue @@ -517,14 +517,13 @@ function onBizTypeChange() { function getList() { loading.value = true const qp = { ...queryParams.value } - qp.params = qp.params || {} if (daterangePlanDate.value?.length) { - qp.params.beginPlanDate = daterangePlanDate.value[0] + ' 00:00:00' - qp.params.endPlanDate = daterangePlanDate.value[1] + ' 23:59:59' + qp.beginPlanDate = daterangePlanDate.value[0] + qp.endPlanDate = daterangePlanDate.value[1] } if (daterangeFinishDate.value?.length) { - qp.params.beginFinishDate = daterangeFinishDate.value[0] + ' 00:00:00' - qp.params.endFinishDate = daterangeFinishDate.value[1] + ' 23:59:59' + qp.beginFinishDate = daterangeFinishDate.value[0] + qp.endFinishDate = daterangeFinishDate.value[1] } listWork(qp).then(res => { workList.value = res.rows