diff --git a/src/api/liswork/labItem/LabItemApi.ts b/src/api/liswork/labItem/LabItemApi.ts index d2329bd..be53699 100644 --- a/src/api/liswork/labItem/LabItemApi.ts +++ b/src/api/liswork/labItem/LabItemApi.ts @@ -2,6 +2,8 @@ import request from '@/utils/request' //检验项目界面 + + //获取列表数据 export function queryXmInfoNewService(query: any){ return request({ @@ -65,3 +67,21 @@ export function delXmAlarmdetailNew(xmid:number,seq:number){ }) } +//保存数据 +export function saveDataService(query:any){ + return request({ + url: '/xminfo/update', + method: 'post', + data: query + }) +} + +//删除常用取值 +export function delXmValNewService(query:any){ + return request({ + url: '/xminfo/delXmValNew', + method: 'get', + params: query + }) +} + diff --git a/src/utils/czUtil/lisUtil.ts b/src/utils/czUtil/lisUtil.ts new file mode 100644 index 0000000..64cb077 --- /dev/null +++ b/src/utils/czUtil/lisUtil.ts @@ -0,0 +1,5 @@ + + +// export function getArrayMaxXh(tableList: Array) { +// return tableList.length > 0 ? Math.max(...tableList.map((item:any) => item.xh || 0)) : 0; +// } \ No newline at end of file diff --git a/src/views/liswork/labItem/index.vue b/src/views/liswork/labItem/index.vue index be200f9..1e33f27 100644 --- a/src/views/liswork/labItem/index.vue +++ b/src/views/liswork/labItem/index.vue @@ -75,7 +75,7 @@ - + @@ -94,12 +94,13 @@ import Sort from './tab/Sort.vue' import Parameter from './tab/Parameter.vue'; import ChannelNumber from './tab/ChannelNumber.vue'; import ReferenceValueDetails from './tab/ReferenceValueDetails.vue'; -import { queryXmInfoNewService,queryXmInfoNewDetailService } from '@/api/liswork/labItem/labItemApi'; +import { queryXmInfoNewService,queryXmInfoNewDetailService,saveDataService} from '@/api/liswork/labItem/labItemApi'; import SelectTable from '@/components/SelectTable/index.vue' import { getGroupInstrdList } from '@/api/liswork/work/LisWork'; import tabView from '@/components/tabViews/index.vue'; import { LabInstr,XmInfoNew } from '@/types'; import { formatDict,getDictData,dictData } from '@/hooks'; +import { ElMessage } from 'element-plus'; const xmlbList = ref>([ { label: '数值型', value: '1' }, @@ -200,6 +201,16 @@ const tabDataList = ref([]); const selectRow = ref(); //明细数据 const selectDetailRow = ref() +const tableTabRef = ref() +const modelParam = ref({ + basicData: {}, + commonlyValuesData: [], + userInstrData: [], + commonDescriptionsData: [], + referenceValueDetailsData: [] +}) + + // 仪器 const getYqConfig = () => { @@ -244,8 +255,20 @@ const handleDelCorr = () => { } //保存 -const handleSave = () => { - console.log('保存') +const handleSave = async () => { + await saveDataService({ + xmInfoNew: modelParam.value.basicData, + xmDoubleRows: [], + xmValRows: [], + xmInterRows: [], + xmRefRows: [], + xmTextResultRows: [], + xmValNewRows: modelParam.value.commonlyValuesData, + xmRefNewRows: modelParam.value.referenceValueDetailsData, + xmInfoVsRows: modelParam.value.userInstrData, + xmTextresultNewRows: modelParam.value.commonDescriptionsData + }) + ElMessage.success('保存成功!') } //退拽属性 const handleColumnDragEnd = (data: any) => { @@ -279,22 +302,44 @@ const updateActive = () => { const changeActiveTab = () => { switch(activeTab.value){ case 'Basic': - tabDataList.value = selectDetailRow.value.xmInfoNewRows[0] || []; + if(selectDetailRow.value.xmInfoNew){ + modelParam.value = toRaw(selectDetailRow.value.xmInfoNew || {}); + // basicData.value = tableTabRef.value.basicData || [] + }else{ + //basicData.value = [] + } break; case 'CommonlyValues': - tabDataList.value = selectDetailRow.value.xmValNewRows[0] || []; + if(selectDetailRow.value.xmValNewRows){ + console.log('selectDetailRow.value.xmValNewRows',selectDetailRow.value.xmValNewRows) + modelParam.value.commonlyValuesData = toRaw(selectDetailRow.value.xmValNewRows || []); + }else{ + modelParam.value.commonlyValuesData = [] + } break; case 'UseInstr': - tabDataList.value = selectDetailRow.value.xmInfoVsRows[0] || []; + if(selectDetailRow.value.xmInfoVsRows.length){ + tabDataList.value = selectDetailRow.value.xmInfoVsRows[0] || []; + }else{ + tabDataList.value = [] + } break; case 'Knowledge': //tabDataList.value = res.data.xmInfoVsRows[0]; case 'Sort': case 'CommonDescriptions': - tabDataList.value = selectDetailRow.value.xmTextresultNewRows[0] || []; + if(selectDetailRow.value.xmTextresultNewRows.length){ + tabDataList.value = selectDetailRow.value.xmTextresultNewRows[0] || []; + }else{ + tabDataList.value = [] + } break; case 'ReferenceValueDetails': - tabDataList.value = selectDetailRow.value.xmRefNewRows[0] || []; + if(selectDetailRow.value.xmRefNewRows.length){ + tabDataList.value = selectDetailRow.value.xmRefNewRows[0] || []; + }else{ + tabDataList.value = [] + } break; } } diff --git a/src/views/liswork/labItem/tab/CommonlyValues.vue b/src/views/liswork/labItem/tab/CommonlyValues.vue index be1b411..02a8f65 100644 --- a/src/views/liswork/labItem/tab/CommonlyValues.vue +++ b/src/views/liswork/labItem/tab/CommonlyValues.vue @@ -5,7 +5,7 @@ 增加 删除 -