修改警告

This commit is contained in:
jiangs 2025-12-22 15:22:55 +08:00
parent 182d43fd84
commit fc03d50c07
4 changed files with 183 additions and 139 deletions

28
pnpm-lock.yaml generated
View File

@ -68,6 +68,9 @@ importers:
pinia: pinia:
specifier: 2.1.7 specifier: 2.1.7
version: 2.1.7(typescript@5.9.3)(vue@3.5.23(typescript@5.9.3)) version: 2.1.7(typescript@5.9.3)(vue@3.5.23(typescript@5.9.3))
pinia-plugin-persistedstate:
specifier: ^4.0.0
version: 4.7.1(pinia@2.1.7(typescript@5.9.3)(vue@3.5.23(typescript@5.9.3)))
pinyin-pro: pinyin-pro:
specifier: ^3.26.0 specifier: ^3.26.0
version: 3.27.0 version: 3.27.0
@ -1136,6 +1139,9 @@ packages:
resolution: {integrity: sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==} resolution: {integrity: sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==}
engines: {node: '>=0.10.0'} engines: {node: '>=0.10.0'}
defu@6.1.4:
resolution: {integrity: sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==}
delayed-stream@1.0.0: delayed-stream@1.0.0:
resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==} resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
engines: {node: '>=0.4.0'} engines: {node: '>=0.4.0'}
@ -2128,6 +2134,20 @@ packages:
resolution: {integrity: sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==} resolution: {integrity: sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==}
engines: {node: '>=12'} engines: {node: '>=12'}
pinia-plugin-persistedstate@4.7.1:
resolution: {integrity: sha512-WHOqh2esDlR3eAaknPbqXrkkj0D24h8shrDPqysgCFR6ghqP/fpFfJmMPJp0gETHsvrh9YNNg6dQfo2OEtDnIQ==}
peerDependencies:
'@nuxt/kit': '>=3.0.0'
'@pinia/nuxt': '>=0.10.0'
pinia: '>=3.0.0'
peerDependenciesMeta:
'@nuxt/kit':
optional: true
'@pinia/nuxt':
optional: true
pinia:
optional: true
pinia@2.1.7: pinia@2.1.7:
resolution: {integrity: sha512-+C2AHFtcFqjPih0zpYuvof37SFxMQ7OEG2zV9jRI12i9BOy3YQVAHwdKtyyc8pDcDyIc33WCIsZaCFWU7WWxGQ==} resolution: {integrity: sha512-+C2AHFtcFqjPih0zpYuvof37SFxMQ7OEG2zV9jRI12i9BOy3YQVAHwdKtyyc8pDcDyIc33WCIsZaCFWU7WWxGQ==}
peerDependencies: peerDependencies:
@ -3760,6 +3780,8 @@ snapshots:
is-descriptor: 1.0.3 is-descriptor: 1.0.3
isobject: 3.0.1 isobject: 3.0.1
defu@6.1.4: {}
delayed-stream@1.0.0: {} delayed-stream@1.0.0: {}
delegate@3.2.0: {} delegate@3.2.0: {}
@ -4885,6 +4907,12 @@ snapshots:
picomatch@4.0.2: {} picomatch@4.0.2: {}
pinia-plugin-persistedstate@4.7.1(pinia@2.1.7(typescript@5.9.3)(vue@3.5.23(typescript@5.9.3))):
dependencies:
defu: 6.1.4
optionalDependencies:
pinia: 2.1.7(typescript@5.9.3)(vue@3.5.23(typescript@5.9.3))
pinia@2.1.7(typescript@5.9.3)(vue@3.5.23(typescript@5.9.3)): pinia@2.1.7(typescript@5.9.3)(vue@3.5.23(typescript@5.9.3)):
dependencies: dependencies:
'@vue/devtools-api': 6.6.4 '@vue/devtools-api': 6.6.4

View File

@ -1,8 +1,10 @@
<template> <template>
<div class="app-container">
<div class="topForm"> <div class="topForm">
<el-form ref="formRef" :model="formData" inline label-width="80px" class="mb8" @submit.prevent="handleSubmit"> <el-form ref="formRef" :model="formData" inline label-width="80px" class="mb8" @submit.prevent="handleSubmit">
<el-form-item label="检索" prop="js"> <el-form-item label="检索" prop="js">
<el-input placeholder="项目代号,名称,简拼" v-model="formData.js" style="width: 200px;" @keyup.enter="getList"></el-input> <el-input placeholder="项目代号,名称,简拼" v-model="formData.js" style="width: 200px;"
@keyup.enter="getList"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
@ -13,8 +15,9 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="17"> <el-col :span="17">
<CustomTable ref="tableRefLeft" :data="dataListLeft" :columns="columnsLeft" :enable-column-drag="true" @column-drag-end="handleColumnDragEnd" <CustomTable ref="tableRefLeft" :data="dataListLeft" :columns="columnsLeft" :enable-column-drag="true"
:config="tableConfig" @row-dblclick="onDBClick" @row-click="onClick" :pagination="pagination" @size-change="sizeChange" @page-change="currentChange"> @column-drag-end="handleColumnDragEnd" :config="tableConfig" @row-dblclick="onDBClick" @row-click="onClick"
:pagination="pagination" @size-change="sizeChange" @page-change="currentChange">
<template #xsbz="{ row }"> <template #xsbz="{ row }">
<el-checkbox :model-value="row.xsbz === '1'" /> <el-checkbox :model-value="row.xsbz === '1'" />
</template> </template>
@ -25,7 +28,10 @@
</el-col> </el-col>
</el-row> </el-row>
<Modify ref="modifyRef" v-model="modifyVisible" :title="modifyTitle" :type="modifyType" @close-with-return="closeWithReturn"/> <Modify ref="modifyRef" v-model="modifyVisible" :title="modifyTitle" :type="modifyType"
@close-with-return="closeWithReturn" />
</div>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">

View File

@ -1,4 +1,5 @@
<template> <template>
<div class="app-container">
<!--报告单设定--> <!--报告单设定-->
<el-form ref="form" :model="formData" label-width="80px"> <el-form ref="form" :model="formData" label-width="80px">
<el-form-item label="仪器" prop="yq"> <el-form-item label="仪器" prop="yq">
@ -11,7 +12,8 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table ref="reportTable" :data="tableData" border width="100%" height="700px" @row-click="onRowClick" highlight-current-row> <el-table ref="reportTable" :data="tableData" border width="100%" height="700px" @row-click="onRowClick"
highlight-current-row>
<el-table-column label="仪器" prop="yq" align="center"> <el-table-column label="仪器" prop="yq" align="center">
<template #default="scope"> <template #default="scope">
{{ formatInstr(scope.row.yq) }} {{ formatInstr(scope.row.yq) }}
@ -20,13 +22,15 @@
<el-table-column label="序号" prop="xh" align="center"></el-table-column> <el-table-column label="序号" prop="xh" align="center"></el-table-column>
<el-table-column label="报告单号" prop="bgdh" align="center"> <el-table-column label="报告单号" prop="bgdh" align="center">
<template #default="scope"> <template #default="scope">
<el-input v-model="scope.row.bgdh" placeholder="请输入报告单号" class="full-width-input" @change="handleRowChange(scope.row, scope.$index)"></el-input> <el-input v-model="scope.row.bgdh" placeholder="请输入报告单号" class="full-width-input"
@change="handleRowChange(scope.row, scope.$index)"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="医疗机构" prop="yljg" align="center"></el-table-column> <el-table-column label="医疗机构" prop="yljg" align="center"></el-table-column>
<el-table-column label="使用类型" prop="type" align="center"> <el-table-column label="使用类型" prop="type" align="center">
<template #default="scope"> <template #default="scope">
<el-select v-model="scope.row.type" placeholder="请选择" class="full-width-input" @change="handleRowChange(scope.row, scope.$index)"> <el-select v-model="scope.row.type" placeholder="请选择" class="full-width-input"
@change="handleRowChange(scope.row, scope.$index)">
<el-option label="默认" value="1"></el-option> <el-option label="默认" value="1"></el-option>
<el-option label="参数" value="2"></el-option> <el-option label="参数" value="2"></el-option>
<el-option label="根据项目来判断" value="3"></el-option> <el-option label="根据项目来判断" value="3"></el-option>
@ -35,10 +39,13 @@
</el-table-column> </el-table-column>
<el-table-column label="使用条件" prop="condition" align="center"> <el-table-column label="使用条件" prop="condition" align="center">
<template #default="scope"> <template #default="scope">
<el-input v-model="scope.row.condition" placeholder="请输入使用条件" class="full-width-input" @change="handleRowChange(scope.row, scope.$index)"></el-input> <el-input v-model="scope.row.condition" placeholder="请输入使用条件" class="full-width-input"
@change="handleRowChange(scope.row, scope.$index)"></el-input>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">

View File

@ -1,5 +1,6 @@
<template> <template>
<!--仪器收费项目对照--> <!--仪器收费项目对照-->
<div class="app-container">
<el-row> <el-row>
<el-form ref="form" :model="formData" label-width="80px" inline> <el-form ref="form" :model="formData" label-width="80px" inline>
<el-form-item label="仪器" prop="yq"> <el-form-item label="仪器" prop="yq">
@ -18,15 +19,17 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="5"> <el-col :span="5">
<CustomTable ref="tableRefLeft" :data="dataListLeft" :columns="columnsLeft" :enable-column-drag="true" @column-drag-end="handleColumnDragEnd" <CustomTable ref="tableRefLeft" :data="dataListLeft" :columns="columnsLeft" :enable-column-drag="true"
:config="tableConfig" @row-dblclick="onDBClickLeft"/> @column-drag-end="handleColumnDragEnd" :config="tableConfig" @row-dblclick="onDBClickLeft" />
</el-col> </el-col>
<el-col :span="19"> <el-col :span="19">
<CustomTable ref="tableRefRight" :data="dataListRight" :columns="columnsRight" :enable-column-drag="true" @column-drag-end="handleColumnDragEnd" <CustomTable ref="tableRefRight" :data="dataListRight" :columns="columnsRight" :enable-column-drag="true"
:config="tableConfig" @row-dblclick="onDBClickRight"/> @column-drag-end="handleColumnDragEnd" :config="tableConfig" @row-dblclick="onDBClickRight" />
</el-col> </el-col>
</el-row> </el-row>
</div>
</template> </template>
@ -77,9 +80,10 @@ const getList = async () => {
if (!formData.value.yq) formData.value.yq = '' if (!formData.value.yq) formData.value.yq = ''
let res = await queryService({ yq: formData.value.yq }); let res = await queryService({ yq: formData.value.yq });
dataListLeft.value = res.data; dataListLeft.value = res.data;
res = await queryOneService('HISOPT','sp_gyxmyljg') // res = await queryOneService('HISOPT', 'sp_gyxmyljg')
let param = res.data.value // let param = res.data.value
//先写固定值,后面再改 //先写固定值,后面再改
let param = '1'
if (param && param !== '') { if (param && param !== '') {
param = '1' param = '1'
} else { } else {
@ -116,5 +120,4 @@ const onQueryClick = () => {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss"></style>
</style>