Merge remote-tracking branch 'origin/main' into addwork

This commit is contained in:
tangw 2025-07-23 17:09:12 +08:00
commit c373658ad4
6 changed files with 5093 additions and 8 deletions

4985
pnpm-lock.yaml generated Normal file

File diff suppressed because it is too large Load Diff

View File

@ -24,7 +24,9 @@ export function updateComDictService(data) {
method: 'post',
data
})
}
// 根据字典类型查询字典数据信息
export function getComDicts(zdlb) {
return request({
@ -33,3 +35,4 @@ export function getComDicts(zdlb) {
params: zdlb
})
}

View File

@ -0,0 +1,19 @@
import request from '@/utils/request'
//查询条码数据列表
export function queryZycxListService(query) {
return request({
url: '/zycx/query',
method: 'get',
params: query
})
}
export function createBarCodeService(data) {
return request({
url: '/zycx/add',
method: 'get',
data
})
}

View File

@ -74,8 +74,7 @@ service.interceptors.request.use(config => {
// 响应拦截器
service.interceptors.response.use(res => {
// 未设置状态码则默认成功状态
const code = Number(res.data.code) || 200;
const code = res.data.code || 0;
// 获取错误信息
const msg = errorCode[code] || res.data.msg || errorCode['default']
// 二进制数据则直接返回

View File

@ -216,6 +216,38 @@ function cancel() {
}
//提交表单数据
function submitForm() {
proxy.$refs["dictRef"].validate(valid => {
if (valid) {
if (form.value.zdlb != undefined && form.value.zdlb != '') {
updateComDictService(form.value).then(response => {
proxy.$modal.msgSuccess("修改成功");
open.value = false;
getList();
}).catch(error => {
reset();
});
} else {
form.value.zdlb = queryParams.value.zdlb;
addComDictService(form.value).then(response => {
proxy.$modal.msgSuccess("新增成功");
open.value = false;
getList();
}).catch(error => {
form.value.zdlb = '';
});
}
}
});
}
function cancel() {
open.value = false;
reset();
}
getTypeList()
</script>
@ -231,6 +263,9 @@ getTypeList()
<div class="card-content">
<p class="clickable" v-for="item in typeList" :key="item.zdlb" @click="refreshDetail(item.zddh)">{{ item.zdmc }}</p>
</div>
<div class="card-content">
<p class="clickable" v-for="item in typeList" :key="item.zdlb" @click="refreshDetail(item.zddh)">{{ item.zdmc }}</p>
</div>
</div>
</el-col>
<!-- 字典明细-->
@ -347,6 +382,7 @@ getTypeList()
<style scoped lang="scss">
.card-content {
.card-content {
max-height: 450px; /* 设置最大高度 */
overflow-y: auto; /* 超出高度时显示垂直滚动条 */

View File

@ -4,35 +4,52 @@ const data = reactive({
queryParams: {
pageNum: 1,
pageSize: 10,
brxm: undefined,
roleKey: undefined,
status: undefined
dept: undefined,
userid: undefined,
st: undefined,
et: undefined,
yljg: undefined,
zt: undefined
}
})
const { queryParams, form, rules } = toRefs(data);
const barCodeList = ref([]);
const dateRange = ref([]);
//搜索
function handleQuery(){
}
//重置
function resetQuery(){
}
//生成条码
function handleCreate(){
}
//获取条码列表
function getList() {
// 模拟获取数据
data.barCodeList = [
{ roleName: '张三', roleKey: '男', roleSort: '项目1' },
{ roleName: '李四', roleKey: '女', roleSort: '项目2' }
];
data.total = data.barCodeList.length; // 模拟总数
}
</script>
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryRef" :inline="true" label-width="68px">
<el-form-item label="病人姓名" prop="roleName">
<el-form-item label="病人姓名" prop="brxm">
<el-input v-model="queryParams.brxm" placeholder="请输入角色名称" clearable style="width: 240px" @keyup.enter="handleQuery"/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-form-item label="状态" prop="zt">
<el-select v-model="queryParams.status" placeholder="条码状态" clearable style="width: 240px">
<el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
@ -46,6 +63,32 @@ function handleCreate(){
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<!-- 表格区域 -->
<el-table :data="barCodeList">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="床号" prop="ch" width="120" />
<el-table-column label="姓名" prop="brxm" :show-overflow-tooltip="true" width="150" />
<el-table-column label="性别" prop="xb" :show-overflow-tooltip="true" width="150" />
<el-table-column label="项目名称" prop="jymd" width="100" />
<el-table-column label="类别" prop="sflbmc" align="center" width="100"/>
<el-table-column label="采样提示" prop="sampletips" align="center" width="100"/>
<el-table-column label="急诊" prop="jzbz" align="center" width="100"/>
<el-table-column label="样本类型" prop="yblx" align="center" width="100"/>
<el-table-column label="病人号" prop="brdh" align="center" width="100"/>
<el-table-column label="科室名称" prop="ksdh" align="center" width="100"/>
<el-table-column label="申请号/条码" prop="sqh" align="center" width="100"/>
<el-table-column label="状态" prop="zt" align="center" width="100"/>
<el-table-column label="病人来源" prop="brly" align="center" width="100"/>
<el-table-column label="申请医生" prop="sqys" align="center" width="100"/>
<el-table-column label="申请时间" prop="sqsj" align="center" width="100"/>
<el-table-column label="计价标志" prop="jjzt" align="center" width="100"/>
<el-table-column label="执行医生" prop="zxys" align="center" width="100"/>
<el-table-column label="执行时间" prop="zxsj" align="center" width="100"/>
<el-table-column label="送检人" prop="bbsjr" align="center" width="100"/>
<el-table-column label="医疗机构" prop="yljg" align="center" width="100"/>
</el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList"/>
</div>
</template>