diff --git a/src/api/mzcx/index.ts b/src/api/mzcx/index.ts index eb676e4..0f5fb3b 100644 --- a/src/api/mzcx/index.ts +++ b/src/api/mzcx/index.ts @@ -77,4 +77,55 @@ export function xmfeeDel(query?: Object) { method: 'delete', params: query, }); +} + + + +// 报告领取规则维护列表 +export function rptgetruleList(query?: Object) { + return request({ + url: 'rptgetrule/query', + method: 'get', + params: query, + }); +} +// 报告领取规则明细列表 +export function rptgetruleDetail(query?: Object) { + return request({ + url: 'rptgetrule/queryDetail', + method: 'get', + params: query, + }); +} +// 报告领取规则新增 +export function rptgetruleadd(query?: Object) { + return request({ + url: 'rptgetrule/add', + method: 'post', + data: query, + }); +} +// 报告领取规则修改 +export function rptgetruleUpdate(query?: Object) { + return request({ + url: 'rptgetrule/update', + method: 'post', + data: query, + }); +} +// 报告领取规则删除 +export function rptgetruleDel(query?: Object) { + return request({ + url: 'rptgetrule/del', + method: 'delete', + params: query, + }); +} +// 报告领取规则明细删除 +export function rptgetruleDelDetail(query?: Object) { + return request({ + url: 'rptgetrule/delDetail', + method: 'delete', + params: query, + }); } \ No newline at end of file diff --git a/src/views/checkCode/index.vue b/src/views/checkCode/index.vue index abb6c19..252d34e 100644 --- a/src/views/checkCode/index.vue +++ b/src/views/checkCode/index.vue @@ -48,7 +48,7 @@ 生成条码 - 选中所有未打印 + 选中所有未打印 打印 @@ -77,6 +77,9 @@ + @@ -231,6 +234,7 @@ const loading = ref(true); const tableData = ref([]) // 配置项 const columns = ref([ + { prop: 'zt', label: '打印', visible: true, key: 0, sortable: true, slot: 'dy', }, { prop: 'ch', label: '床号', visible: true, key: 0, sortable: true, }, { prop: 'brxm', label: '姓名', visible: true, key: 1, }, { prop: 'brxbname', label: '性别', align: 'center', visible: true, key: 2, }, @@ -301,7 +305,7 @@ const tableConfig = ref({ border: false, // 边框 selection: true, // 多选框 index: false, // 序号 - height: '100%', // 高度 + height: '', // 高度 highlightCurrentRow: true, // 高亮当前行 cellStyle: cellStyleHd, rowClassName: rowClassNameHd, @@ -325,7 +329,7 @@ const rightTableConfig = ref({ border: false, // 边框 // selection: true, // 多选框 index: false, // 序号 - height: '100%', // 高度 + height: '', // 高度 highlightCurrentRow: true, // 高亮当前行 }) @@ -369,10 +373,16 @@ const openBlock = async (value: string) => { yljg: 1 })); const results = await Promise.all(requests); - console.log('所有请求成功:', results); + console.log('results==>', results); + if (results.some((item: any) => item.code != 0)) { + ElMessage.error('调用失败'); + } else { + ElMessage.success('调用成功'); + } + return results; } catch (error: any) { - console.error('至少一个请求失败:', error.message); + ElMessage.error(error.message); throw error; } @@ -476,11 +486,12 @@ function adjustTableHeight() { heightForm.value = compactForm.value.offsetHeight; tableConfig.value.height = `calc(72vh - ${heightForm.value}px)`; // 设置表格容器的高度 rightTableConfig.value.height = `calc(76vh - ${heightForm.value}px)`; + } } const handletime = (val: Array) => { - console.log('时间', val); + // console.log('时间', val); } // 生成条码 @@ -523,6 +534,15 @@ const getList = () => { } }) } + +const selectStatusRows = () => { + tableRef.value.clearSelection() + tableData.value.forEach((item: any) => { + if (item.zt == 1) { + tableRef.value.toggleRowSelection(item, true) + } + }) +} const printHandle1 = () => { const url = 'http://47.97.125.165:8904/lis.pdf' // const url = sqhs.value[0]?.pdfUrl diff --git a/src/views/checkCode/report/index.vue b/src/views/checkCode/report/index.vue index d3b54ab..c2861bc 100644 --- a/src/views/checkCode/report/index.vue +++ b/src/views/checkCode/report/index.vue @@ -290,7 +290,7 @@ const tableConfig = ref( // border: true, // 边框 selection: true, // 多选框 index: false, // 序号 - height: '100%', // 高度 + height: '', // 高度 highlightCurrentRow: true, // 高亮当前行 fit: true, cellStyle: cellStyleHd diff --git a/src/views/mzcx/blood/index.vue b/src/views/mzcx/blood/index.vue index 147b7fd..9d3baa7 100644 --- a/src/views/mzcx/blood/index.vue +++ b/src/views/mzcx/blood/index.vue @@ -15,7 +15,7 @@