diff --git a/src/api/liswork/qualityControl/index.ts b/src/api/liswork/qualityControl/index.ts index 0edf377..82e9e3a 100644 --- a/src/api/liswork/qualityControl/index.ts +++ b/src/api/liswork/qualityControl/index.ts @@ -139,3 +139,11 @@ export function getqcvalmonth(data?: Object) { params: data }) } +//保存质控数据(单项目一个月) +export function saveQcvalItem(data?: Object) { + return request({ + url: '/qc/saveqcvalitem', + method: 'post', + data + }) +} diff --git a/src/api/system/user.js b/src/api/system/user.js index 5c6ca01..a2befb1 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -1,5 +1,7 @@ import request from '@/utils/request' -import { parseStrEmpty } from "@/utils/ruoyi"; +import { + parseStrEmpty +} from "@/utils/ruoyi"; // 查询用户列表 export function listUser(query) { @@ -142,3 +144,11 @@ export function importFromLis() { method: 'get' }) } +// 获取登录用户姓名 +export function getUserName(data) { + return request({ + url: '/system/role/getUserName', + method: 'get', + params: data + }) +} \ No newline at end of file diff --git a/src/components/SelectTable/index.vue b/src/components/SelectTable/index.vue index be27bb9..fe69217 100644 --- a/src/components/SelectTable/index.vue +++ b/src/components/SelectTable/index.vue @@ -323,6 +323,8 @@ const setLabel = (val: any) => { // 清空值 const clearHandle = () => { selectShowValue.value = ''; + currentRow.value = null; + tableRef.value.clearCurrentRow(); emits("update:data", null); emits('getDataValue', null); }; diff --git a/src/main.js b/src/main.js index 68a3ef0..fb60e21 100644 --- a/src/main.js +++ b/src/main.js @@ -12,6 +12,7 @@ import 'vxe-pc-ui/lib/style.css' import VXETable from 'vxe-table' import 'vxe-table/lib/style.css' import '@/assets/styles/index.scss' // global css +import '@/utils/polyfills'; import { setupRem diff --git a/src/utils/hiprintPrinter.ts b/src/utils/hiprintPrinter.ts index c8d61a7..e980e59 100644 --- a/src/utils/hiprintPrinter.ts +++ b/src/utils/hiprintPrinter.ts @@ -186,8 +186,8 @@ export const HiprintPrinter = { }, }; -onUnmounted(() => { - if ('downExe' in window) { - delete (window as any).downExe; - } -}); \ No newline at end of file +// onUnmounted(() => { +// if ('downExe' in window) { +// delete (window as any).downExe; +// } +// }); \ No newline at end of file diff --git a/src/utils/polyfills.ts b/src/utils/polyfills.ts new file mode 100644 index 0000000..0e9a14a --- /dev/null +++ b/src/utils/polyfills.ts @@ -0,0 +1,21 @@ +// 检测浏览器是否支持，不支持则注入兼容版 +if (!Array.prototype.findLastIndex) { + Object.defineProperty(Array.prototype, 'findLastIndex', { + value: function ( + this: T[], + callback: (value: T, index: number, array: T[]) => boolean, + thisArg?: any + ): number { + const arr = this; + const len = arr.length >>> 0; + for (let i = len - 1; i >= 0; i--) { + if (i in arr && callback.call(thisArg, arr[i], i, arr)) { + return i; + } + } + return -1; + }, + writable: true, + configurable: true + }); +} \ No newline at end of file diff --git a/src/views/checkCode/index.vue b/src/views/checkCode/index.vue index 53de4e5..7fa8341 100644 --- a/src/views/checkCode/index.vue +++ b/src/views/checkCode/index.vue @@ -1,6 +1,6 @@