|
|
|
@ -43,9 +43,9 @@ |
|
|
|
style="width:140px;text-align: left;" multiple collapse-tags> |
|
|
|
<el-option v-for="item in users" :key="item.id" :value="item.id" :label="item.surname" /> |
|
|
|
</el-select> |
|
|
|
<el-select v-model="local.query.checkAsb" placeholder="请选择组合项目" size="small" filterable |
|
|
|
<el-select v-model="local.query.checkAsbs" placeholder="请选择组合项目" size="small" filterable |
|
|
|
:filter-method="filterMethod" clearable @clear="quickAsb = deepCopy(asbItemQuick)" default-first-option |
|
|
|
ref="quickAsbOCX" style="width:200px;text-align: left;margin-left: 2px;"> |
|
|
|
ref="quickAsbOCX" style="width:200px;text-align: left;margin-left: 2px;" multiple collapse-tags> |
|
|
|
<el-option v-for="item in quickAsb" :key="item.id" :value="item.id" :label="item.displayName" /> |
|
|
|
</el-select> |
|
|
|
</div> |
|
|
|
@ -178,6 +178,12 @@ |
|
|
|
条。</span> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<el-table v-if="checkStatistics.length > 0 ? true:false" :data="checkStatistics" border height="105"> |
|
|
|
<el-table-column prop="checkStatus" label="检查" /> |
|
|
|
<el-table-column prop="maleCount" label="男" /> |
|
|
|
<el-table-column prop="femaleCount" label="女" /> |
|
|
|
<el-table-column prop="unknownCount" label="未知" /> |
|
|
|
</el-table> |
|
|
|
|
|
|
|
<!--通用选单位、体检次数、分组的控件--> |
|
|
|
<el-dialog title="体检单位选择" :visible.sync="report.dialogCusOrgOCX" :close-on-click-modal="false" |
|
|
|
@ -206,6 +212,7 @@ export default { |
|
|
|
data() { |
|
|
|
return { |
|
|
|
dataList: [], //列表数据 |
|
|
|
checkStatistics:[], //检查状态 |
|
|
|
multipleSelection: [], //选中的数据列表 |
|
|
|
dialogVisible: false, |
|
|
|
dialogCamera: false, |
|
|
|
@ -227,7 +234,6 @@ export default { |
|
|
|
sex: '', //性别 |
|
|
|
idCardNo: '', //身份证号 |
|
|
|
haveImage: false, |
|
|
|
checkAsb: '', //检查项目 |
|
|
|
checkCompleteFlag: '', //检查项目状态 |
|
|
|
isAuditCheck: '', //检查项目审核 |
|
|
|
medicalTypeIds: [], |
|
|
|
@ -276,8 +282,12 @@ export default { |
|
|
|
return 175 |
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
|
// 列表高度 |
|
|
|
tableHeight() { |
|
|
|
return this.winAbsolute ? (this.window.pageHeight - 46 - 30 - this.divHeight) : (this.window.pageHeight - 46 - this.divHeight) |
|
|
|
let tableH = this.winAbsolute ? (this.window.pageHeight - 46 - 30 - this.divHeight) : (this.window.pageHeight - 46 - this.divHeight) |
|
|
|
if(this.checkStatistics.length > 0) tableH = tableH - 105 |
|
|
|
return tableH |
|
|
|
}, |
|
|
|
}, |
|
|
|
methods: { |
|
|
|
@ -500,7 +510,7 @@ export default { |
|
|
|
if (this.local.query.sex) body.sexId = this.local.query.sex |
|
|
|
if (this.local.query.isAudit) body.isAudit = this.local.query.isAudit |
|
|
|
if (this.local.query.completeFlag) body.completeFlag = this.local.query.completeFlag |
|
|
|
if (this.local.query.checkAsb) body.asbitems = [this.local.query.checkAsb] |
|
|
|
if (Array.isArray(this.local.query.checkAsbs) && this.local.query.checkAsbs.length > 0) body.asbitems = this.local.query.checkAsbs |
|
|
|
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 |
|
|
|
@ -541,9 +551,12 @@ export default { |
|
|
|
|
|
|
|
// 刷新最大记录数 |
|
|
|
this.loadOpts.totalCount = res.data.totalCount |
|
|
|
if (body.skipCount == 0) this.dataList = []; |
|
|
|
if (body.skipCount == 0){ |
|
|
|
this.dataList = [] |
|
|
|
this.checkStatistics = [] |
|
|
|
} |
|
|
|
this.dataList = this.dataList.concat(res.data.items) |
|
|
|
|
|
|
|
this.checkStatistics = res.data.checkStatistics||[] |
|
|
|
} |
|
|
|
}) |
|
|
|
// .finally(() =>{ |
|
|
|
|
pengjun
3 months ago