pengjun 1 week ago
parent
commit
fc37ef38fd
  1. 4
      src/components/doctorCheck/PatientRegisterList.vue
  2. 4
      src/components/patientRegister/PatientRegisterItem.vue
  3. 3
      src/components/patientRegister/PatientRegisterList.vue
  4. 18
      src/components/patientRegister/patientRegisterAsbItem.vue
  5. 70
      src/components/report/BtnReport.vue
  6. 14
      src/components/report/PatientRegisterListNobtn.vue

4
src/components/doctorCheck/PatientRegisterList.vue

@ -101,12 +101,12 @@
</template>
</el-table-column>
<el-table-column prop="age" label="年龄" width="40" align="center" />
<el-table-column prop="customerOrgParentName" label="单位" width="120" sortable>
<el-table-column prop="customerOrgParentName" label="单位" width="120" sortable show-overflow-tooltip>
<template slot-scope="scope">
<div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgParentName : scope.row.customerOrgName }}</div>
</template>
</el-table-column>
<el-table-column prop="customerOrgName" label="部门" width="100" sortable>
<el-table-column prop="customerOrgName" label="部门" width="100" sortable show-overflow-tooltip>
<template slot-scope="scope">
<div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgName : "" }}</div>
</template>

4
src/components/patientRegister/PatientRegisterItem.vue

@ -596,7 +596,9 @@ export default {
amount: 1,
total: asbItemChoosed[i].price,
}
this.dataTransOpts.tableM.register_check_asbitem.push(pojo)
//
//this.dataTransOpts.tableM.register_check_asbitem.push(pojo)
this.dataTransOpts.tableM.register_check_asbitem.splice(0,0,pojo)
}
this.refreshAsbitem()

3
src/components/patientRegister/PatientRegisterList.vue

@ -9,7 +9,7 @@
: Math.floor(((window.pageHeight - 250) * 2) / 3)
" highlight-current-row @row-click="rowClick" @row-dblclick="dblClick" size="small" row-key="id"
@selection-change="handleSelectionChange" @row-contextmenu="onCellRightClick" ref="info" id="info"
:row-class-name="handleRowClassName" use-virtual :row-height="30" @table-body-scroll="scrollFull"
:row-class-name="handleRowClassName" use-virtual :row-height="25" @table-body-scroll="scrollFull"
big-data-checkbox :data-changes-scroll-top="false">
<u-table-column type="selection" width="40" align="center"></u-table-column>
<u-table-column v-for="(item, index) in dragCol" :key="index" :type="dragCol[index].type"
@ -484,6 +484,7 @@ import ImportOrgData from "./ImportOrgData.vue";
import LocalConfig from "../../components/common/LocalConfig.vue";
import Queue from "../../components/queue/Queue.vue";
import { UTable, UTableColumn } from 'umy-ui';
export default {
components: {
PatientRegisterEdit,

18
src/components/patientRegister/patientRegisterAsbItem.vue

@ -1,6 +1,7 @@
<template>
<div>
<div style="display: flex;">
<el-table :data="dataTransOpts.tableM.register_check_asbitem" border
:width="tableWidth"
:height="window.pageHeight < 600 ? 124 : Math.floor((window.pageHeight - 228) / 3)" size="small"
highlight-current-row :summary-method="getSummaries" show-summary ref="patientRegister.patientRegisterAbs">
<el-table-column type="index" label="序号" width="50" align="center" />
@ -50,6 +51,13 @@
</template>
</el-table-column>
</el-table>
<div
:style="`overflow-y:auto; height:${tableHeight}px;width:${tableWidth}px;background-color: white; margin-left:10px;border: 1px #DCDFE6;`">
<el-tag style="color:#000;margin-top: 5px;margin-left: 5px;"
v-for="item in dataTransOpts.tableM.register_check_asbitem" :key="item.id" size="small">
{{ item.asbitemName }}
</el-tag>
</div>
</div>
</template>
<script>
@ -84,6 +92,14 @@ export default {
computed: {
...mapState(["window", "dataTransOpts", "dict", "patientRegister"]),
tableHeight(){
return this.window.pageHeight < 600 ? 120 : Math.floor((this.window.pageHeight - 240) / 3)
},
tableWidth(){
return Math.floor((this.window.pageWidth - 380)/2)
},
},
methods: {
dddw, moment,

70
src/components/report/BtnReport.vue

@ -20,11 +20,14 @@
<el-button type="primary" class="commonbutton" @click="btnReportExport(false)">导出 pdf 报告</el-button>
</div>
<div class="listBtn">
<el-button type="primary" class="commonbutton" @click="btnGetReport">报告</el-button>
<el-button type="primary" class="commonbutton" @click="btnGetReport">报告</el-button>
</div>
<div class="listBtn">
<el-button type="primary" class="commonbutton" @click="btnUpReport">上传Web</el-button>
</div>
<div class="listBtn">
<el-button type="primary" class="commonbutton" @click="btnExport">导出人员</el-button>
</div>
<div class="listBtn">
<el-button type="primary" class="commonbutton" @click="exportZip">导出Zip</el-button>
</div>
@ -38,6 +41,28 @@
:close-on-click-modal="false" :append-to-body="true">
<ElProgressOCX />
</el-dialog>
<el-dialog title="报告领取" :visible.sync="dialogGetReport" width="350px" :show-close="false"
:close-on-click-modal="false" :append-to-body="true">
<div>
<div class="query" style="display: flex;">
<span class="spanClass">领取人</span>
<el-input placeholder="领取人" v-model="getMan" size="small" clearable style="width: 120px" />
</div>
<div style="display: flex;justify-content: space-between;">
<div></div>
<div style="display: flex;">
<div class="listBtn">
<el-button type="primary" class="commonbutton" @click="btnGetReportOk">确定</el-button>
</div>
<div class="listBtn">
<el-button type="primary" class="commonbutton" @click="dialogGetReport = false">取消</el-button>
</div>
</div>
</div>
</div>
</el-dialog>
</div>
</div>
</template>
@ -55,8 +80,8 @@ export default {
},
data() {
return {
dialogGetReport:false,
getMan: '', //
};
},
@ -76,7 +101,7 @@ export default {
btnQuery() {
this.patientRegister.query.times++
},
exportJpg(){
exportJpg() {
if (!this.$peisAPI) {
this.$message.info({ showClose: true, message: "此功能,需要在壳客户端才可运行!" })
return
@ -98,15 +123,15 @@ export default {
this.$message.error(err)
})
},
async report2Jpg(path){
async report2Jpg(path) {
this.elProgress.display = true;
this.elProgress.percentage = 0;
let token = window.sessionStorage.getItem('token');
let toOutShell = {
localPath:path,
localPath: path,
token,
patientRegisterId:""
patientRegisterId: ""
};
for (let i = 0; i < this.dataTransOpts.tableM.patient_register.length; i++) {
@ -130,7 +155,13 @@ export default {
}
this.elProgress.display = false;
},
exportZip(){
//
btnExport() {
},
exportZip() {
if (!this.$peisAPI) {
this.$message.info({ showClose: true, message: "此功能,需要在壳客户端才可运行!" })
return
@ -152,15 +183,15 @@ export default {
this.$message.error(err)
})
},
async report2Zip(path){
async report2Zip(path) {
this.elProgress.display = true;
this.elProgress.percentage = 0;
let token = window.sessionStorage.getItem('token');
let toOutShell = {
localPath:path,
localPath: path,
token,
patientRegisterId:""
patientRegisterId: ""
};
for (let i = 0; i < this.dataTransOpts.tableM.patient_register.length; i++) {
@ -220,13 +251,18 @@ export default {
},
//
btnGetReportOk(){
},
//
btnGetReport() {
if (!this.dataTransOpts.tableS.patient_register.id) {
this.$message.warning({ showClose: true, message: "请先选择记录!" })
return
}
this.dataTransOpts.tableS.patient_register.completeFlag = '2'
this.dialogGetReport = true
},
//
@ -274,8 +310,8 @@ export default {
try {
if (e.completeFlag == '3') {
toOutShell.BusinessCode = e.patientRegisterId
toOutShell.customerOrgName = e.customerOrgName||'' //
toOutShell.departmentName = e.departmentName||''
toOutShell.customerOrgName = e.customerOrgName || '' //
toOutShell.departmentName = e.departmentName || ''
let jsonToOutShell = JSON.stringify(toOutShell)
console.log('toOutShell', jsonToOutShell)
let res = await this.$peisAPI.upLoadReportPdf(jsonToOutShell)
@ -446,7 +482,7 @@ export default {
},
async report2pdf(path) {
if(this.dataTransOpts.tableM.patient_register.length < 1) return
if (this.dataTransOpts.tableM.patient_register.length < 1) return
this.elProgress.display = true;
this.elProgress.percentage = 0;
@ -487,8 +523,8 @@ export default {
if (e.completeFlag == '3') {
toOutShell.BusinessCode = e.patientRegisterId
toOutShell.ExportDirectory = `${path}\\${e.patientRegisterNo}_${e.patientName}.pdf`
toOutShell.customerOrgName = e.customerOrgName||'' //
toOutShell.departmentName = e.departmentName||''
toOutShell.customerOrgName = e.customerOrgName || '' //
toOutShell.departmentName = e.departmentName || ''
let jsonToOutShell = JSON.stringify(toOutShell)
console.log('toOutShell', jsonToOutShell)

14
src/components/report/PatientRegisterListNobtn.vue

@ -9,7 +9,7 @@
<el-table-column v-for="(item, index) in dragCol" v-if="index != 0" :key="`${item.label + index}`"
:type="dragCol[index].type" :min-width="dragCol[index].minWidth" :align="dragCol[index].align"
:label="dragCol[index].type ? '' : item.label" :prop="dragCol[index].prop"
:sortable="dragCol[index].type ? false : true">
:sortable="dragCol[index].type ? false : true" :show-overflow-tooltip="dragCol[index].showTooltip">
<template slot-scope="scope">
<div v-if="dragCol[index].prop == 'completeFlag'"
@ -36,6 +36,9 @@
<div v-else-if="dragCol[index].prop == 'packGroup'">
{{ scope.row.medicalPackageName || scope.row.customerOrgGroupName }}
</div>
<div v-else-if="dragCol[index].prop == 'departmentName'">
{{ scope.row.customerOrgName == scope.row.departmentName ? '':scope.row.departmentName }}
</div>
<div v-else>
{{ scope.row[dragCol[index].prop] }}
</div>
@ -43,9 +46,6 @@
</el-table-column>
</el-table>
<div style="display: flex;justify-content:space-between;">
<div></div>
@ -116,8 +116,8 @@ export default {
{ label: "年龄", prop: "age", minWidth: 60, align: "center" },
{ label: "分组/套餐", prop: "packGroup", minWidth: 150, align: "center" },
{ label: "体检次数", prop: "medicalTimes", minWidth: 90, align: "center" },
{ label: "单位名称", prop: "customerOrgName", minWidth: 180, align: "left" },
{ label: "部门名称", prop: "departmentName", minWidth: 180, align: "left" },
{ label: "单位名称", prop: "customerOrgName", minWidth: 180, align: "left",showTooltip:true },
{ label: "部门名称", prop: "departmentName", minWidth: 180, align: "left",showTooltip:true },
{ label: "手机", prop: "mobileTelephone", minWidth: 130, align: "center" },
{ label: "电话", prop: "telephone", minWidth: 130, align: "center" },
{ label: "档案号", prop: "patientNo", minWidth: 80, align: "center" },
@ -125,7 +125,7 @@ export default {
{ label: "出生日期", prop: "birthDate", minWidth: 90, align: "center" },
{ label: "婚姻", prop: "maritalStatusName", minWidth: 70, align: "center" },
{ label: "民族", prop: "nationName", minWidth: 70, align: "center" },
{ label: "地址", prop: "address", minWidth: 400, align: "left" },
{ label: "地址", prop: "address", minWidth: 400, align: "left" ,showTooltip:true},
{ label: "体检卡号", prop: "medicalCardNo", minWidth: 90, align: "center" },
{ label: "工卡号", prop: "jobCardNo", minWidth: 90, align: "center" },
{ label: "体检类别", prop: "medicalTypeName", minWidth: 100, align: "center" },

Loading…
Cancel
Save