diff --git a/src/api/liswork/micro/index.ts b/src/api/liswork/micro/index.ts
index 57790ab..3382b75 100644
--- a/src/api/liswork/micro/index.ts
+++ b/src/api/liswork/micro/index.ts
@@ -132,6 +132,46 @@ export function getmediumList(data?: Object) {
params: data
})
}
+//获取培养基字典
+export function getbactmediumList(data?: Object) {
+ return request({
+ url: '/lisworkgerm/getbactmedium',
+ method: 'get',
+ params: data
+ })
+}
+//新增培养基
+export function insertmedium(data?: Object) {
+ return request({
+ url: '/lisworkgerm/insertmedium',
+ method: 'post',
+ data
+ })
+}
+//修改培养基
+export function updatemedium(data?: Object) {
+ return request({
+ url: '/lisworkgerm/updatemedium',
+ method: 'post',
+ data
+ })
+}
+//删除培养基
+export function deletemedium(data?: Object) {
+ return request({
+ url: '/lisworkgerm/deletemedium',
+ method: 'delete',
+ params: data
+ })
+}
+//删除培养基 Array
+export function deletemediums(data?: Object) {
+ return request({
+ url: '/lisworkgerm/deletemedium',
+ method: 'delete',
+ data
+ })
+}
//微生物报告审核
export function cbebCheck(data?: Object) {
return request({
diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss
index 19a70cf..7e7c07d 100644
--- a/src/assets/styles/ruoyi.scss
+++ b/src/assets/styles/ruoyi.scss
@@ -426,6 +426,7 @@
box-shadow: none;
background: transparent !important;
padding: 0 !important;
+ padding-left: .3125rem !important;
outline: none;
&:hover {
diff --git a/src/components/Ballpit/index.vue b/src/components/Ballpit/index.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/components/SelectTable/index.vue b/src/components/SelectTable/index.vue
index 850b02e..e03c36e 100644
--- a/src/components/SelectTable/index.vue
+++ b/src/components/SelectTable/index.vue
@@ -113,7 +113,7 @@ const visibleChange = (val: any) => {
currentIndex.value = filterData.value.findIndex(item => item[props.value!] === props.data);
if (currentIndex.value >= 0) {
tableRef.value.setCurrentRow(filterData.value[currentIndex.value]);
- tableRef.value.setScrollTop(currentIndex.value * 25);
+ tableRef.value.setScrollTop(currentIndex.value * 30);
}
}, 10);
}
@@ -235,7 +235,7 @@ const handleKeydown = (e: any) => {
tableRef.value.setCurrentRow(filterData.value[currentIndex.value]);
// 滚动到当前行
- tableRef.value.setScrollTop(currentIndex.value * 25);
+ tableRef.value.setScrollTop(currentIndex.value * 30);
// 回车确认
if (e.key === "Enter") {
diff --git a/src/views/liswork/micro/index.vue b/src/views/liswork/micro/index.vue
index 76582ac..e67719b 100644
--- a/src/views/liswork/micro/index.vue
+++ b/src/views/liswork/micro/index.vue
@@ -14,7 +14,8 @@
-
+
@@ -25,8 +26,9 @@
-
+
@@ -73,7 +75,7 @@
@previewHandle="previewHandle" />
-
+
@@ -139,6 +141,8 @@
+
+
labPat.value, (newValue) => {
queryParams.value.ybh = newValue.ybh;
+ ybJyrq.value = newValue.jyrq;
}, { deep: true });
+const checkUserRef = ref()
+const jyrqChange = (val: string) => {
+ ElMessageBox.confirm(
+ `确定修改当前样本检验日期?`,
+ '提示',
+ {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning',
+ }
+ ).then(() => {
+ if (!queryParams.value.yhdh) {
+ checkUserRef.value.open();
+ } else {
+ updateJyrq()
+ }
+ }).catch(() => {
+ fetchLabPat();
+ })
+
+};
+
+const handleCheckUserConfirm = (info: { yhdh: string, mm: string }) => {
+ checkuser({ yhdh: info.yhdh, mm: info.mm }).then((response: any) => {
+ if (response.code == 0) {
+ queryParams.value.yhdh = info.yhdh;
+ updateJyrq()
+ } else {
+ fetchLabPat();
+ }
+ })
+};
+
+const checkUserCancel = () => {
+ fetchLabPat();
+};
+
+// 更新检验日期
+const updateJyrq = () => {
+ // updateLabPat({ ...queryParams.value, ...labPat.value })
+};
+
// 模糊查询
const searchQuery = () => {
let filterMhList = [...originalLabPatList.value];
@@ -287,7 +336,6 @@ const searchQuery = () => {
selectJob(firstRow);
} else {
labPat.value = {};
- labInfo.value = {};
zbLabResuts.value = [];
highlightRowIndex.value = -1;
}
@@ -325,7 +373,6 @@ const handleQueryResult = (params: QueryParams) => {
selectJob(firstRow);
} else {
labPat.value = {};
- labInfo.value = {};
zbLabResuts.value = [];
highlightRowIndex.value = -1;
}
@@ -348,7 +395,6 @@ const mbStore = useCommonStore();
const yqHandleChange = (val: any) => {
zbLabResuts.value = [];
labPat.value = {}
- labInfo.value = {}
mbStore.setLxsrList([]);
getSysList()
fetchlabPatList()
@@ -406,7 +452,7 @@ const selectJob = (job: any) => {
}
const zbLabResuts = ref([])
//载入样本结果表单(中间labresult.vue组件)
-const fetchLabResults = async () => {
+const fetchLabResults = () => {
sampleMedInfo({ jyrq: labInfo.value.jyrq ? labInfo.value.jyrq : queryParams.value.jyrq, yq: labInfo.value.yq, ybh: labInfo.value.ybh }).then((response: any) => {
zbLabResuts.value = response.data;
})
@@ -463,11 +509,10 @@ const handleQuery = () => {
// 创建新样本
const handleCreate = () => {
- labInfo.value.jyrq = ''
+ ybJyrq.value = ''
loadDefault({ ...queryParams.value }).then((response: any) => {
if (response.code == 0) {
labPat.value = response.data;
- labInfo.value = response.data;
labPat.value.id = `temp_${Date.now()}_${Math.random().toString(36).substr(2, 8)}`;
zbLabResuts.value = [];
labPatListRef.value?.clearCurrentRow();
@@ -599,7 +644,6 @@ const changeStatus = (updatedPat: any, flag: boolean) => {
queryLabPat(data).then((response: any) => {
if (response.code == 0) {
labPat.value = response.data;
- labInfo.value = response.data;
const index = labPatList.value.findIndex((item: any) => item.ybh == updatedPat.ybh);
if (index !== -1) {
labPatList.value = labPatList.value.map((item, i) =>
diff --git a/src/views/liswork/micro/labresult/components/pyjDict.vue b/src/views/liswork/micro/labresult/components/pyjDict.vue
index b12c816..e0271d6 100644
--- a/src/views/liswork/micro/labresult/components/pyjDict.vue
+++ b/src/views/liswork/micro/labresult/components/pyjDict.vue
@@ -17,7 +17,7 @@
diff --git a/src/views/liswork/micro/labresult/pyj.vue b/src/views/liswork/micro/labresult/pyj.vue
index 64e020b..ae3a80a 100644
--- a/src/views/liswork/micro/labresult/pyj.vue
+++ b/src/views/liswork/micro/labresult/pyj.vue
@@ -12,7 +12,30 @@
培养基 {{ tableData?.length }}个
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -21,11 +44,15 @@