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

report

master
pengjun 1 year ago
parent
a643fb74f1
commit
2d0e62dfb0
3 changed files with 55 additions and 47 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 94
      src/components/doctorCheck/PatientRegisterList.vue
  2. 2
      src/components/occDisease/OccDisease.vue
  3. 2
      src/components/occDisease/OccDiseaseBase.vue

94
src/components/doctorCheck/PatientRegisterList.vue
View File

@ -28,6 +28,13 @@
</el-option>
</el-select>
</div>
<div class="query">
<span>体检类别：</span>
<el-select v-model="local.query.medicalTypeIds" placeholder="请选择" clearable filterable
style="width: 200px" size="small" multiple collapse-tags>
<el-option v-for="item in dict.medicalType" :key="item.id" :label="item.displayName" :value="item.id" />
</el-select>
</div>
<div class="query">
<span>人员状态：</span>
<el-select v-model="local.query.completeFlag" placeholder="请选择" clearable style="width: 80px" size="small">
@ -42,26 +49,26 @@
<el-checkbox v-if="win == 'doctorCheck'" v-model="local.query.haveImage">有图</el-checkbox>
</div>
<div class="query" v-if="win == 'doctorCheck'">
<span>组合项目：</span>
<el-select v-model="local.query.checkAsb" placeholder="快速选择组合项目" size="small" filterable
:filter-method="filterMethod" clearable @clear="quickAsb = deepCopy(asbItemQuick)" default-first-option
ref="quickAsbOCX" style="width:207px;text-align: left;">
<el-option v-for="item in quickAsb" :key="item.id" :value="item.id" :label="item.displayName" />
</el-select>
</div>
<div class="query" v-if="win == 'doctorCheck'">
<span>检查状态：</span>
<el-select v-model="local.query.checkCompleteFlag" placeholder="请选择" clearable style="width: 80px" size="small">
<el-option v-for="item in dict.checkCompleteFlag" :key="item.id" :label="item.displayName" :value="item.id">
</el-option>
</el-select>
<el-select v-model="local.query.isAuditCheck" placeholder="请选择" clearable style="width: 75px;margin: 0 2px;"
size="small">
<el-option label="未审核" value="N" />
<el-option label="已审核" value="Y" />
</el-select>
</div>
<div class="query" v-if="win == 'doctorCheck'">
<span>组合项目：</span>
<el-select v-model="local.query.checkAsb" placeholder="快速选择组合项目" size="small" filterable
:filter-method="filterMethod" clearable @clear="quickAsb = deepCopy(asbItemQuick)" default-first-option
ref="quickAsbOCX" style="width:207px;text-align: left;">
<el-option v-for="item in quickAsb" :key="item.id" :value="item.id" :label="item.displayName" />
</el-select>
</div>
<div class="query" v-if="win == 'doctorCheck'">
<span>检查状态：</span>
<el-select v-model="local.query.checkCompleteFlag" placeholder="请选择" clearable style="width: 80px" size="small">
<el-option v-for="item in dict.checkCompleteFlag" :key="item.id" :label="item.displayName" :value="item.id">
</el-option>
</el-select>
<el-select v-model="local.query.isAuditCheck" placeholder="请选择" clearable style="width: 75px;margin: 0 2px;"
size="small">
<el-option label="未审核" value="N" />
<el-option label="已审核" value="Y" />
</el-select>
</div>
<div class="query">
<el-button class="commonbutton" type="primary" @click="query" size="small"
@ -70,10 +77,8 @@
</div>
<!-- 人员列表 -->
<el-table :data="dataList" border width="100%"
:height="tableHeight" row-key="id"
size="small" highlight-current-row @row-click="rowClick" @row-dblclick="rowDblclick" ref="info" id="info"
style="border-radius:10px;">
<el-table :data="dataList" border width="100%" :height="tableHeight" row-key="id" size="small" highlight-current-row
@row-click="rowClick" @row-dblclick="rowDblclick" ref="info" id="info" style="border-radius:10px;">
<el-table-column prop="customerOrgParentName" label="单位" width="120" sortable>
<template slot-scope="scope">
<div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgParentName : scope.row.customerOrgName }}</div>
@ -84,15 +89,15 @@
<div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgName : "" }}</div>
</template>
</el-table-column>
<el-table-column prop="patientName" label="姓名" width="80" sortable align="center"/>
<el-table-column prop="patientName" label="姓名" width="80" sortable align="center" />
<el-table-column prop="sexId" label="性别" sortable 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="年龄" align="center"/>
<el-table-column prop="patientRegisterNo" label="条码号" width="150" sortable align="center"/>
<el-table-column prop="patientNo" label="档案号" sortable align="center"/>
<el-table-column prop="age" label="年龄" align="center" />
<el-table-column prop="patientRegisterNo" label="条码号" width="150" sortable align="center" />
<el-table-column prop="patientNo" label="档案号" sortable align="center" />
<el-table-column prop="medicalTimes" label="体检次数" align="center" />
<el-table-column label="分组/套餐" width="150">
<template slot-scope="scope">
@ -104,7 +109,7 @@
</div>
</template>
</el-table-column>
<el-table-column prop="nationId" label="民族" sortable align="center" >
<el-table-column prop="nationId" label="民族" sortable align="center">
<template slot-scope="scope">
<div>
{{ dddw(dict.nation, "id", scope.row.nationId, "displayName") }}
@ -112,17 +117,17 @@
</template>
</el-table-column>
<el-table-column prop="idNo" label="身份证" sortable width="180" align="center" />
<el-table-column prop="birthDate" label="出生日期" align="center" width="100" >
<el-table-column prop="birthDate" label="出生日期" align="center" width="100">
<template slot-scope="scope">
<div v-if="scope.row.birthDate">
{{ lmoment(scope.row.birthDate, "yyyy-MM-DD") }}
</div>
</template>
</el-table-column>
<el-table-column prop="email" label="邮箱" width="150"/>
<el-table-column prop="mobileTelephone" label="手机" width="130"/>
<el-table-column prop="telephone" label="电话" width="130"/>
<el-table-column prop="address" label="地址" width="400"/>
<el-table-column prop="email" label="邮箱" width="150" />
<el-table-column prop="mobileTelephone" label="手机" width="130" />
<el-table-column prop="telephone" label="电话" width="130" />
<el-table-column prop="address" label="地址" width="400" />
<el-table-column prop="medicalCardNo" label="体检卡号" />
<el-table-column prop="jobCardNo" label="工卡号" />
<el-table-column prop="maritalStatusId" label="婚姻状况" align="center">
@ -146,7 +151,7 @@
</div>
</template>
</el-table-column>
<el-table-column prop="jobPost" label="职务" width="200"/>
<el-table-column prop="jobPost" label="职务" width="200" />
<el-table-column prop="jobTitle" label="职称" />
<el-table-column prop="salesman" label="介绍人" />
<el-table-column prop="isVip" label="是否VIP" align="center">
@ -185,8 +190,8 @@
</div>
<!--通用选单位、体检次数、分组的控件-->
<el-dialog title="体检单位选择" :visible.sync="report.dialogCusOrgOCX" :close-on-click-modal="false" :append-to-body="true"
width="880px" height="600px">
<el-dialog title="体检单位选择" :visible.sync="report.dialogCusOrgOCX" :close-on-click-modal="false"
:append-to-body="true" width="880px" height="600px">
<CusOrgOCX :useCustomerOrg="false" :initDateType="'medicalStartDate'" />
</el-dialog>
@ -231,8 +236,10 @@ export default {
idCardNo: '', //身份证号
haveImage: false,
checkAsb: '', //检查项目
checkCompleteFlag:'', //检查项目状态
isAuditCheck:'', //检查项目审核
checkCompleteFlag: '', //检查项目状态
isAuditCheck: '', //检查项目审核
medicalTypeIds:[]
},
completeFlag: []
},
@ -269,12 +276,12 @@ export default {
...mapState(["window", "dataTransOpts", "dict", "customerOrg", "patientRegister", "doctorCheck", "sumDoctorCheck", "report"]),
divHeight() {
if (this.win == "doctorCheck") {
return 170
return 202
} else {
return 105
return 137
}
},
tableHeight(){
tableHeight() {
return this.winAbsolute ? (this.window.pageHeight - 46 - 30 - this.divHeight) : (this.window.pageHeight - 46 - this.divHeight)
},
},
@ -445,6 +452,7 @@ export default {
if (this.local.query.haveImage) body.isPicture = 'Y'
if (this.local.query.checkCompleteFlag) body.asbitemCompleteFlag = this.local.query.checkCompleteFlag
if (this.local.query.isAuditCheck) body.asbitemIsAudit = this.local.query.isAuditCheck
body.medicalTypeIds = this.local.query.medicalTypeIds
body.isFilterPreRegistration = 'Y' //是否需要过滤预登记数据 Y=过滤预登记数据 N=不过滤 默认为N (备注：只有CompleteFlag参数的值不为0的情况才有效，null值也有效)
// "patientName": "string",
@ -461,7 +469,7 @@ export default {
// });
body = Object.assign(body, this.loadOpts)
let url = '/api/app/PatientRegister/GetSumDoctorPeisRecordList'
if(this.win == "doctorCheck") url = '/api/app/PatientRegister/GetDoctorPeisRecordList'
if (this.win == "doctorCheck") url = '/api/app/PatientRegister/GetDoctorPeisRecordList'
postapi(url, body)
.then((res) => {

2
src/components/occDisease/OccDisease.vue
View File

@ -221,7 +221,7 @@ export default {
this.dataTransOpts.tableM.patient_past_medical_history.forEach(e => {
if(!e.diagnosisDate) e.diagnosisDate = null
});
this.dataTransOpts.tableM.patient_occupational_disease.forEach(e => {
this.dataTransOpts.tableM.patient_occupational_medical_history.forEach(e => {
if(!e.diagnosisDate) e.diagnosisDate = null
});
this.dataTransOpts.tableM.patient_occupational_history.forEach(e => {

2
src/components/occDisease/OccDiseaseBase.vue
View File

@ -248,7 +248,7 @@
</el-col>
<el-col :span="5">
<el-form-item label="修改者">
<el-input v-model="dataTransOpts.tableS.patient_occupational_disease.creatorName" disabled
<el-input v-model="dataTransOpts.tableS.patient_occupational_disease.lastModifierName" disabled
size="small"></el-input>
</el-form-item>
</el-col>

Write Preview
Loading…
Cancel
Save