shentun
/
peisweb
1
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity
Browse Source

Merge branch 'master' of http://140.143.162.39:3000/shentun/peisweb

master
luobinjie 4 months ago
parent
39f42d062a 9b45b9384e
commit
5d06352db4
3 changed files with 51 additions and 41 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 30
      src/components/patientRegister/PatientRegisterForChoose.vue
  2. 26
      src/views/diagnosis/diagnosis.vue
  3. 36
      src/views/fee-settings/Item.vue

30
src/components/patientRegister/PatientRegisterForChoose.vue
View File

@ -4,17 +4,21 @@
<el-table :data="patientRegisters" border width="800" height="480" highlight-current-row <el-table :data="patientRegisters" border width="800" height="480" highlight-current-row
@row-click="registerRowClick" @row-dblclick="rowDblclick" size="small"> @row-click="registerRowClick" @row-dblclick="rowDblclick" size="small">
<el-table-column prop="patientRegisterNo" label="条码号" min-width="110" align="center"/> <el-table-column prop="patientRegisterNo" label="条码号" min-width="110" align="center"/>
<el-table-column prop="patientNo" label="档案号" align="center"/>
<el-table-column prop="medicalTimes" label="次数" align="center" />
<el-table-column prop="patientName" label="姓名" align="center"/>
<el-table-column prop="sexName" label="性别" align="center" />
<el-table-column prop="age" label="年龄" />
<el-table-column prop="patientNo" label="档案号" sortable align="center"/>
<el-table-column prop="medicalTimes" label="次数" width="50" align="center" />
<el-table-column prop="patientName" label="姓名" sortable align="center"/>
<el-table-column prop="sexId" label="性别" width="50" align="center">
<template slot-scope="scope">
<div>{{ dddw(dict.sex, "id", scope.row.sexId, "displayName") }}</div>
</template>
</el-table-column>
<el-table-column prop="age" label="年龄" width="50" align="center"/>
<el-table-column prop="org" label="单位" min-width="180" show-overflow-tooltip /> <el-table-column prop="org" label="单位" min-width="180" show-overflow-tooltip />
<el-table-column prop="dept" label="部门" min-width="150" show-overflow-tooltip /> <el-table-column prop="dept" label="部门" min-width="150" show-overflow-tooltip />
<el-table-column prop="groupPack" label="分组/套餐" min-width="150" show-overflow-tooltip />
<el-table-column prop="nationName" label="民族" show-overflow-tooltip/>
<el-table-column prop="idNo" label="身份证" min-width="150" show-overflow-tooltip/>
<el-table-column prop="birthDate" label="出生日期" width="100">
<el-table-column prop="groupPack" label="分组/套餐" min-width="150" align="center" show-overflow-tooltip />
<el-table-column prop="nationName" label="民族" align="center" show-overflow-tooltip/>
<el-table-column prop="idNo" label="身份证" min-width="150" align="center" show-overflow-tooltip/>
<el-table-column prop="birthDate" label="出生日期" width="90" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.birthDate"> <div v-if="scope.row.birthDate">
{{ moment(scope.row.birthDate).format("yyyy-MM-DD") }} {{ moment(scope.row.birthDate).format("yyyy-MM-DD") }}
@ -28,7 +32,13 @@
<el-table-column prop="medicalCardNo" label="体检卡号" align="center" show-overflow-tooltip/> <el-table-column prop="medicalCardNo" label="体检卡号" align="center" show-overflow-tooltip/>
<el-table-column prop="jobCardNo" label="工卡号" align="center" show-overflow-tooltip/> <el-table-column prop="jobCardNo" label="工卡号" align="center" show-overflow-tooltip/>
<el-table-column prop="maritalStatusName" label="婚姻" align="center" /> <el-table-column prop="maritalStatusName" label="婚姻" align="center" />
<el-table-column prop="medicalTypeName" label="体检类别" show-overflow-tooltip/>
<el-table-column prop="medicalTypeId" label="体检类别" show-overflow-tooltip >
<template slot-scope="scope">
<div v-if="scope.row.medicalTypeId !== dict.personOrgId">
{{ dddw(dict.medicalType, "id", scope.row.medicalTypeId, "displayName") }}
</div>
</template>
</el-table-column>
<el-table-column prop="personnelTypeName" label="人员类别" show-overflow-tooltip/> <el-table-column prop="personnelTypeName" label="人员类别" show-overflow-tooltip/>
<el-table-column prop="jobPost" label="职务" /> <el-table-column prop="jobPost" label="职务" />
<el-table-column prop="jobTitle" label="职称" /> <el-table-column prop="jobTitle" label="职称" />

26
src/views/diagnosis/diagnosis.vue
View File

@ -44,10 +44,10 @@
<div> <div>
<el-table :data="tableData" id="elTableDiagnosis" row-key="id" <el-table :data="tableData" id="elTableDiagnosis" row-key="id"
:height="window.pageHeight < 600 ? 190 : Math.floor((window.pageHeight - 240) / 2)" :height="window.pageHeight < 600 ? 190 : Math.floor((window.pageHeight - 240) / 2)"
highlight-current-row @row-click="rowClick" size="small" ref="elTable">
highlight-current-row @row-click="rowClick" size="small" ref="elTable" border>
<el-table-column type="index" label="序号" width="40" align="center" /> <el-table-column type="index" label="序号" width="40" align="center" />
<el-table-column v-for="(item, index) in headerCols" :key="`col_${index}`"
:min-width="dropCol[index].minWidth" :align="dropCol[index].align" :label="item.label">
<el-table-column v-for="(item, index) in headerCols" :key="`col_${index}`" :prop="dropCol[index].prop"
:min-width="dropCol[index].minWidth" :align="dropCol[index].align" :label="item.label" :sortable="dropCol[index].sortable">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="dropCol[index].prop == 'sn'"> <div v-if="dropCol[index].prop == 'sn'">
{{ scope.$index + 1 }} {{ scope.$index + 1 }}
@ -251,16 +251,16 @@
dropCol: [ dropCol: [
//{ label: "序号",prop: "sn",minWidth: 40,align:"center"}, //{ label: "序号",prop: "sn",minWidth: 40,align:"center"},
// { label: "项目类别",prop: "itemTypeId",minWidth: 120,align:"center"}, // { label: "项目类别",prop: "itemTypeId",minWidth: 120,align:"center"},
{ label: "诊断级别", prop: "diagnosisLevelId", minWidth: 60, align: "center" },
{ label: "诊断名称", prop: "displayName", minWidth: 100, align: "center" },
{ label: "建议名称", prop: "suggestionName", minWidth: 100, align: "center" },
{ label: "疾病", prop: "isIll", minWidth: 40, align: "center" },
{ label: "适用性别", prop: "forSexId", minWidth: 60, align: "center" },
{ label: "总检模板", prop: "isSummaryTemplate", minWidth: 60, align: "center" },
{ label: "创建者", prop: "creatorName", minWidth: 60, align: "center" },
{ label: "创建时间", prop: "creationTime", minWidth: 130, align: "center" },
{ label: "修改者", prop: "lastModifierName", minWidth: 60, align: "center" },
{ label: "修改时间", prop: "lastModificationTime", minWidth: 130, align: "center" },
{ label: "诊断级别", prop: "diagnosisLevelId", minWidth: 80, align: "center",sortable:true },
{ label: "诊断名称", prop: "displayName", minWidth: 100, align: "center",sortable:true },
{ label: "建议名称", prop: "suggestionName", minWidth: 100, align: "center" ,sortable:true},
{ label: "疾病", prop: "isIll", minWidth: 60, align: "center" ,sortable:true},
{ label: "适用性别", prop: "forSexId", minWidth: 80, align: "center" ,sortable:true},
{ label: "总检模板", prop: "isSummaryTemplate", minWidth: 80, align: "center" ,sortable:true},
{ label: "创建者", prop: "creatorName", minWidth: 60, align: "center" ,sortable:true},
{ label: "创建时间", prop: "creationTime", minWidth: 130, align: "center" ,sortable:true},
{ label: "修改者", prop: "lastModifierName", minWidth: 60, align: "center" ,sortable:true},
{ label: "修改时间", prop: "lastModificationTime", minWidth: 130, align: "center" ,sortable:true},
], ],
}; };
}, },

36
src/views/fee-settings/Item.vue
View File

@ -54,26 +54,26 @@
</div> </div>
<div> <div>
<el-table :data="tableData" row-key="id" :height="window.pageHeight < 600 ? 450 : window.pageHeight - 130 <el-table :data="tableData" row-key="id" :height="window.pageHeight < 600 ? 450 : window.pageHeight - 130
" class="el-table__body-wrapper tbody" highlight-current-row @row-click="rowick" ref="tableData">
<el-table-column prop="id" label="编号" width="300">
" class="el-table__body-wrapper tbody" highlight-current-row @row-click="rowick" ref="tableData" border>
<el-table-column prop="id" label="编号" width="300" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="displayName" label="名称" width="">
<el-table-column prop="displayName" label="名称" min-width="150" sortable>
</el-table-column> </el-table-column>
<el-table-column prop="creatorName" label="创建者" width="">
<el-table-column prop="creatorName" label="创建者" width="80" sortable align="center">
</el-table-column> </el-table-column>
<el-table-column prop="creationTime" label="创建时间" width="200">
<el-table-column prop="creationTime" label="创建时间" width="140" sortable align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.creationTime | dateFormat }} {{ scope.row.creationTime | dateFormat }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="lastModifierName" label="修改者" width="">
<el-table-column prop="lastModifierName" label="修改者" width="80" sortable align="center">
</el-table-column> </el-table-column>
<el-table-column prop="lastModificationTime" label="修改时间" width="200">
<el-table-column prop="lastModificationTime" label="修改时间" width="140" sortable align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.lastModificationTime | dateFormat }} {{ scope.row.lastModificationTime | dateFormat }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="结果类别" prop="resultTemplateTypeFlag"></el-table-column>
<el-table-column label="结果类别" prop="resultTemplateTypeFlag" sortable align="center"></el-table-column>
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center">
<template> <template>
<el-tag class="move" style=" <el-tag class="move" style="
@ -576,26 +576,26 @@
<div style="width: 90%"> <div style="width: 90%">
<el-table :data="reusttableData" @row-click="reustclick" row-key="id" highlight-current-row <el-table :data="reusttableData" @row-click="reustclick" row-key="id" highlight-current-row
style="width: 100%" :height="window.pageHeight < 600 ? 270 : window.pageHeight - 330" style="width: 100%" :height="window.pageHeight < 600 ? 270 : window.pageHeight - 330"
ref="reusttableData" class="el-table__body-wrappers tbodys">
ref="reusttableData" class="el-table__body-wrappers tbodys" border>
<!-- <el-table-column label="编号" prop="id"></el-table-column> <!-- <el-table-column label="编号" prop="id"></el-table-column>
<el-table-column label="项目编号" prop="itemId"></el-table-column> --> <el-table-column label="项目编号" prop="itemId"></el-table-column> -->
<el-table-column label="结果" prop="result" width="300"></el-table-column>
<el-table-column label="诊断" width="200">
<el-table-column label="结果" prop="result" width="300" sortable ></el-table-column>
<el-table-column label="诊断" width="200" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
{{ dddw(diagnosisId, "id", scope.row.diagnosisId, "displayName") }} {{ dddw(diagnosisId, "id", scope.row.diagnosisId, "displayName") }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="小结前加名称" width="120">
<el-table-column label="小结前加名称" width="110" align="center" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<el-checkbox v-model="scope.row.isNameIntoSummary" true-label="Y" false-label="N" disabled /> <el-checkbox v-model="scope.row.isNameIntoSummary" true-label="Y" false-label="N" disabled />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="结果状态" width="100">
<el-table-column label="结果状态" width="80" align="center" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
{{ getChangeResult(scope.row.resultStatusId) }} {{ getChangeResult(scope.row.resultStatusId) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="结果进入小结" width="120">
<el-table-column label="结果进入小结" width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-checkbox v-model="scope.row.isResultIntoSummary" true-label="Y" false-label="N" disabled /> <el-checkbox v-model="scope.row.isResultIntoSummary" true-label="Y" false-label="N" disabled />
</template> </template>
@ -611,22 +611,22 @@
</el-tag> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建者" width="100">
<el-table-column label="创建者" width="80" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.creatorName }} {{ scope.row.creatorName }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建时间" width="200">
<el-table-column label="创建时间" width="200" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.creationTime | dateFormat }} {{ scope.row.creationTime | dateFormat }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="修改者" width="100">
<el-table-column label="修改者" width="80" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.lastModifierName }} {{ scope.row.lastModifierName }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="修改时间" width="200">
<el-table-column label="修改时间" width="200" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.lastModificationTime | dateFormat }} {{ scope.row.lastModificationTime | dateFormat }}
</template> </template>

Write Preview
Loading…
Cancel
Save