上次记录
This commit is contained in:
parent
132b87b4c3
commit
56cb0013cf
@ -273,3 +273,12 @@ export function getGroupInstrdList(query?: Object) {
|
||||
params: query
|
||||
})
|
||||
}
|
||||
// 结果修改记录
|
||||
export function getresultchangelog(query?: Object) {
|
||||
return request({
|
||||
url: '/liswork/getresultchangelog',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@ -316,6 +316,29 @@
|
||||
border-color: #aef5ef;
|
||||
}
|
||||
|
||||
// 表格input宽度
|
||||
.full-width-input .el-input__inner {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
|
||||
background: transparent !important;
|
||||
border: none !important;
|
||||
}
|
||||
|
||||
.full-width-input {
|
||||
.el-input__wrapper {
|
||||
// box-shadow: 0 0 0 1px rgba(64, 158, 255, 0.2);
|
||||
box-shadow: none;
|
||||
background: transparent !important;
|
||||
padding: 0 !important;
|
||||
outline: none;
|
||||
|
||||
&:hover {
|
||||
box-shadow: none !important;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/** 表单布局 **/
|
||||
.form-header {
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<el-checkbox :model-value="row.lxsr == '1'" readonly />
|
||||
</template>
|
||||
<template #zdsr="{ row }">
|
||||
<el-checkbox :model-value="row.zdsr == '1'" readonly />
|
||||
<el-checkbox :model-value="row.zdsr == 'Y'" readonly />
|
||||
</template>
|
||||
</CustomTable>
|
||||
</div>
|
||||
|
||||
@ -19,17 +19,17 @@
|
||||
<CustomTable ref="tableRef" :data="tableData" :columns="columns" :config="tableConfig" :enable-column-drag="true"
|
||||
@row-click="handleRowClick" @column-drag-end="handleColumnDragEnd" class="custom-table-container">
|
||||
<template #index="{ row, $index }">
|
||||
<el-popover effect="dark" v-if="row.cp_modify == 1">
|
||||
<el-popover effect="dark" v-if="row.cp_modify == 1" @before-enter="beforeEnter(row)" width="300">
|
||||
<template #reference>
|
||||
<div style="width: 100%;">{{ $index + 1 }}</div>
|
||||
</template>
|
||||
<template #default>
|
||||
<el-row>
|
||||
<el-col>修改前结果：</el-col>
|
||||
<el-col>修改日期：</el-col>
|
||||
<el-col>修改人：</el-col>
|
||||
<el-col>上次审核时间：</el-col>
|
||||
<el-col>上次审核人：</el-col>
|
||||
<el-col>修改前结果：{{ lastResult.csjg }}</el-col>
|
||||
<el-col>修改日期：{{ lastResult.xgrq }}</el-col>
|
||||
<el-col>修改人：{{ formatYs(lastResult.xgr) }}</el-col>
|
||||
<el-col>上次审核时间：{{ lastResult.shsj }}</el-col>
|
||||
<el-col>上次审核人：{{ formatYs(lastResult.shys) }}</el-col>
|
||||
</el-row>
|
||||
</template>
|
||||
</el-popover>
|
||||
@ -159,13 +159,18 @@
|
||||
|
||||
<script setup>
|
||||
import { ref, toRefs, watch, nextTick, onMounted } from "vue";
|
||||
import { check1, check2, uncheck2, unconfirmlog, checkuser, reglimit, queryXmInfo, deleteresult, changeresult, newresult, queryXmVal, printListwork } from "@/api/liswork/work/LisWork";
|
||||
import {
|
||||
check1, check2, uncheck2, unconfirmlog, checkuser, reglimit, queryXmInfo, deleteresult, changeresult,
|
||||
newresult, queryXmVal, printListwork, getresultchangelog
|
||||
} from "@/api/liswork/work/LisWork";
|
||||
import { ElMessageBox, ElMessage } from "element-plus";
|
||||
import ItemInput from "@/views/liswork/work/components/ItemInput.vue";
|
||||
import projectsJg from "@/components/projectsjg/index.vue"
|
||||
import { classCom } from '@/utils/classCom'
|
||||
import CustomTable from '@/components/elTable/index.vue'
|
||||
import dayjs from 'dayjs';
|
||||
// @ts-ignore
|
||||
import { listUser } from '@/api/system/user.js'
|
||||
// 组件属性定义
|
||||
const props = defineProps({
|
||||
resultSysList: { type: Array, required: true },
|
||||
@ -217,7 +222,7 @@ const columns = ref([
|
||||
{ label: "复", prop: "redo_flag", width: 30, align: 'center', visible: true, },
|
||||
{ label: "项目", prop: "xmdh", width: 50, visible: true, },
|
||||
{ label: "名称", prop: "xmmc", width: 180, visible: true, },
|
||||
{ label: "结果", prop: "csjg", width: 50, visible: true, slot: "csjg" },
|
||||
{ label: "结果", prop: "csjg", width: 60, visible: true, slot: "csjg" },
|
||||
{ label: "上次结果", prop: "cp_compa", width: 60, visible: true, headerSlot: "cp_compa" },
|
||||
{ label: "OD", prop: "od", width: 80, visible: true, slot: "od" },
|
||||
{ label: "CUTOFF", prop: "cutoff", width: 80, visible: true, slot: "cutoff" },
|
||||
@ -244,7 +249,7 @@ const cellStyle = ({ row, column, rowIndex, columnIndex }) => {
|
||||
}
|
||||
|
||||
|
||||
if (column.label == "上次结果" && (row.alarm_flag ?? "").trim().length > 0 && row.cp_compa) {
|
||||
if (column.label == "上次结果" && row.cp_lastflag == "J") {
|
||||
return { background: '#f00 !important', color: '#FFF' };
|
||||
}
|
||||
if (column.label == "上次结果" && row.cp_lastflag == "H") {
|
||||
@ -278,6 +283,18 @@ const tableConfig = ref({
|
||||
const handleColumnDragEnd = (data) => {
|
||||
columns.value = data.columns;
|
||||
};
|
||||
const lastResult = ref({});
|
||||
const beforeEnter = (row) => {
|
||||
console.log('row==>', row);
|
||||
const data = {
|
||||
...tableKey.value,
|
||||
xmdh: row.xmdh,
|
||||
}
|
||||
getresultchangelog(data).then(res => {
|
||||
lastResult.value = res.data || {}
|
||||
})
|
||||
};
|
||||
|
||||
|
||||
|
||||
const warningForm = ref({
|
||||
@ -767,19 +784,17 @@ const previewHandle = () => {
|
||||
const getRowIndex = (index) => {
|
||||
return index + 1;
|
||||
};
|
||||
|
||||
const userList = ref([]);
|
||||
onMounted(() => {
|
||||
if (props.tableData.length > 0) {
|
||||
// updateOriginalCsjgMap();
|
||||
}
|
||||
const data = { status: 0, del_flag: 0, pageSize: 1000, pageNum: 1 }
|
||||
listUser(data).then((res) => {
|
||||
userList.value = res.rows;
|
||||
});
|
||||
});
|
||||
|
||||
watch(
|
||||
() => props.tableData,
|
||||
() => {
|
||||
// updateOriginalCsjgMap();
|
||||
}
|
||||
);
|
||||
const formatYs = (v) => {
|
||||
return userList.value.find((item) => item.userName == v)?.nickName || v
|
||||
};
|
||||
|
||||
</script>
|
||||
|
||||
@ -798,27 +813,4 @@ watch(
|
||||
.custom-table-container {
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
|
||||
.full-width-input .el-input__inner {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
|
||||
background: transparent !important;
|
||||
border: none !important;
|
||||
}
|
||||
|
||||
.full-width-input {
|
||||
:deep(.el-input__wrapper) {
|
||||
// box-shadow: 0 0 0 1px rgba(64, 158, 255, 0.2);
|
||||
box-shadow: none;
|
||||
background: transparent !important;
|
||||
padding: 0 !important;
|
||||
outline: none;
|
||||
|
||||
&:hover {
|
||||
box-shadow: none !important;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -1,10 +1,17 @@
|
||||
<template>
|
||||
<div class="reex_box">
|
||||
<div class="mb10">
|
||||
<el-button type="primary" plain>新增</el-button>
|
||||
<el-button type="primary" plain>保存</el-button>
|
||||
</div>
|
||||
<!-- 结果复查 -->
|
||||
<el-table ref="tableRef" :data="tableData" style="width: 100%" highlight-current-row border height="82vh"
|
||||
show-overflow-tooltip>
|
||||
<el-table ref="tableRef" :data="tableData" style="width: 100%" border height="77vh" show-overflow-tooltip>
|
||||
<el-table-column prop="xmdh" label="检验项目" align="center" width="120" />
|
||||
<el-table-column prop="csjg" label="复查前结果" align="center" width="150" />
|
||||
<el-table-column prop="csjg" label="复查前结果" align="center" width="150">
|
||||
<template #default="{ row }">
|
||||
<el-input v-model="row.csjg" class="full-width-input" @change="handleCsjgEnter(row)" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="150">
|
||||
<template #default>
|
||||
<el-button type="primary" link size="small"> 删除 </el-button>
|
||||
@ -44,6 +51,10 @@ const getReexamination = () => {
|
||||
watch(() => queryParams.value, () => {
|
||||
getReexamination();
|
||||
}, { immediate: true })
|
||||
|
||||
const handleCsjgEnter = (row: any) => {
|
||||
console.log('复查结果修改', row);
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user