diff --git a/src/api/blood/index.ts b/src/api/blood/index.ts new file mode 100644 index 0000000..bb3222b --- /dev/null +++ b/src/api/blood/index.ts @@ -0,0 +1,34 @@ +import request from '@/utils/request' + +// 查询登记列表 +export function billQueryList(query?: Object) { + return request({ + url: '/bus/bloodbank/searchTransfuseBill/queryList', + method: 'get', + params: query + }) +} +// 查询某个申请单 +export function queryBillOne(query?: Object) { + return request({ + url: '/bus/bloodbank/searchTransfuseBill/queryOne', + method: 'get', + params: query + }) +} +// 申请单扫描登记 +export function saveBillNo(query?: Object) { + return request({ + url: '/bus/bloodbank/searchTransfuseBill/saveBillNo', + method: 'get', + params: query + }) +} +// 取消扫描登记 +export function deleteBillNo(query?: Object) { + return request({ + url: '/bus/bloodbank/searchTransfuseBill/delete', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/api/nurses/index.ts b/src/api/nurses/index.ts new file mode 100644 index 0000000..7985bb3 --- /dev/null +++ b/src/api/nurses/index.ts @@ -0,0 +1,18 @@ +import request from '@/utils/request' + +// 查询样本信息列表 +export function queryList(query?: Object) { + return request({ + url: '/bus/nurse/sampleInfo/queryList', + method: 'get', + params: query + }) +} +// 打印条码 +export function printBarCode(query?: Object) { + return request({ + url: '/bus/nurse/sampleInfo/printBarCode', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/components/BloodStockNotify/index.vue b/src/components/BloodStockNotify/index.vue index 1a5c7e6..89760b2 100644 --- a/src/components/BloodStockNotify/index.vue +++ b/src/components/BloodStockNotify/index.vue @@ -120,7 +120,9 @@ @@ -240,7 +312,7 @@ onMounted(() => { flex: 1; display: flex; flex-direction: column; - margin-bottom: 10px; + margin-top: 10px; .table_content { flex: 1; diff --git a/src/views/doctor/application/index.vue b/src/views/doctor/application/index.vue index 4b29418..4c3b5ca 100644 --- a/src/views/doctor/application/index.vue +++ b/src/views/doctor/application/index.vue @@ -682,14 +682,13 @@ const cellStyle = ({ row, column, rowIndex, columnIndex }) => { } const getBillStatusInfo = (code: string) => { - // 兜底空数组，不存在字典时不执行find const statusList = dictData.value?.billApplyStatus ?? [] const target = statusList.find(item => item.value == code) if (target) { return { label: target.label, color: target.remark } } - // 未知状态兜底橙色 - return { label: '未审核', color: '#E6A23C' } + + return { label: '未审核', color: '#909399' } } // 血液品种列表 diff --git a/src/views/nurses/specimenEntry/index.vue b/src/views/nurses/specimenEntry/index.vue index 2015768..3e4d4be 100644 --- a/src/views/nurses/specimenEntry/index.vue +++ b/src/views/nurses/specimenEntry/index.vue @@ -10,130 +10,142 @@
- - - + - + - - - + + + - + - + - + - + - - - - + + + - — - - 确定 +
-
- 打印标签 +
+ 检索 + 打印标签
+ @column-drag-end="ColumnDragEnd" @row-click="handleRowClick"> + + + + + + + + + +