diff --git a/src/api/liswork/qualityControl/index.ts b/src/api/liswork/qualityControl/index.ts index 870a1d5..5826185 100644 --- a/src/api/liswork/qualityControl/index.ts +++ b/src/api/liswork/qualityControl/index.ts @@ -179,3 +179,35 @@ export function getmonthst(data?: Object) { params: data }) } +//查询月室内质控小结 +export function getmonthpj(data?: Object) { + return request({ + url: '/qcstat/getmonthpj', + method: 'get', + params: data + }) +} +//保存月室内质控小结 +export function savemonthpj(data?: Object) { + return request({ + url: '/qcstat/savemonthpj', + method: 'post', + data + }) +} +//查询月失控情况总结 +export function getmonthskzj(data?: Object) { + return request({ + url: '/qcstat/getmonthskzj', + method: 'get', + params: data + }) +} +//保存月失控情况总结 +export function savemonthskzj(data?: Object) { + return request({ + url: '/qcstat/savemonthskzj', + method: 'post', + data + }) +} diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 2ec7bcb..f298b78 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -125,6 +125,7 @@ aside { .app-container { padding: 10px 10px 0 10px; height: calc(100vh - 5.25rem); + overflow: auto; } .components-container { diff --git a/src/components/SelectTable/YQSelectTable/index.vue b/src/components/SelectTable/YQSelectTable/index.vue index fa47f01..dfea0e9 100644 --- a/src/components/SelectTable/YQSelectTable/index.vue +++ b/src/components/SelectTable/YQSelectTable/index.vue @@ -47,7 +47,8 @@ const getYqConfig = () => { if (res.code == 0) { instrOptions.value = res.data.map((item: any) => ({ yq: item.yq.trim(), - yqmc: item.yqmc + yqmc: item.yqmc, + lisgroupid: item.lisgroup })) } }) diff --git a/src/views/checkCode/index.vue b/src/views/checkCode/index.vue index dc1ee45..aa64449 100644 --- a/src/views/checkCode/index.vue +++ b/src/views/checkCode/index.vue @@ -71,9 +71,10 @@ 清单打印 - + 打印机设置 + @@ -609,7 +610,20 @@ const visibleChange = (visible: boolean) => { }; const changePrinter = (value: string) => { - printStore.setDefaultPrinter(value); + // printStore.setDefaultPrinter(value); + + const link = document.createElement('a'); + link.href = 'lisbarprint://setup'; + link.style.display = 'none'; + document.body.appendChild(link); + + // 模拟点击 + link.click(); + + // 移除创建的标签(清理DOM) + document.body.removeChild(link); + + }; const timeDate = () => { @@ -752,7 +766,7 @@ const selectStatusRows = () => { // 打印pdf const printPdf = () => { - if (!printName.value) return ElMessage.warning("未设置打印机,请先设置打印机!"); + // if (!printName.value) return ElMessage.warning("未设置打印机,请先设置打印机!"); const selections = tableRef.value.allSelection() if (selections.length <= 0) return ElMessage.warning('请选择数据!') ElMessageBox.confirm(`确定打印选中的数据吗?`, "提示", { @@ -769,8 +783,18 @@ const printPdf = () => { }).then((res: any) => { if (res.code == 0) { done(); + // HiprintPrinter.silentPrint(res.data, printName.value); + const link = document.createElement('a'); + link.href = `lisbarprint://${res.data}`; + link.style.display = 'none'; + document.body.appendChild(link); + + // 模拟点击 + link.click(); + + // 移除创建的标签(清理DOM) + document.body.removeChild(link); getList() - HiprintPrinter.silentPrint(res.data, printName.value); } }) } else { diff --git a/src/views/liswork/qualityControl/indoorStatistics/index.vue b/src/views/liswork/qualityControl/indoorStatistics/index.vue index 266a778..b716ac2 100644 --- a/src/views/liswork/qualityControl/indoorStatistics/index.vue +++ b/src/views/liswork/qualityControl/indoorStatistics/index.vue @@ -8,7 +8,8 @@
- + @@ -32,14 +33,14 @@
{{ formatDict(userStore.sysLoginParam.loginYLJG, 'HOS') }}
室内质控数据统计表
-
专业组:
-
仪器:{{ queryParams.yq }}
-
浓度:
+
专业组:{{ lisgroup }}
+
仪器:{{ yqmc }}
+
浓度: {{ ld }}
质控品号:{{ queryParams.zkph }}
质控月份:{{ queryParams.zkrq }}
- + @@ -71,7 +72,7 @@
- +