pengjun 4 months ago
parent
commit
f7fad294c6
  1. 7
      src/components/customerOrg/customerOrgGroupAsbitem.vue
  2. 16
      src/views/customerOrg/customerOrgGroup.vue
  3. 101
      src/views/customerReport/personnelPositive.vue

7
src/components/customerOrg/customerOrgGroupAsbitem.vue

@ -470,9 +470,12 @@ export default {
// //
refAsbItemByChoosed() {
//
let asbItemQuick = deepCopy(this.dict.asbItemAll)
arrayReduce(this.dict.asbItem, [...this.customerOrgGroupAsbitems], "id=asbitemId");
arrayReduce(this.dict.asbItemQuick, [...this.customerOrgGroupAsbitems], "id=asbitemId");
this.quickAsb = Object.assign(this.dict.asbItemQuick)
arrayReduce(asbItemQuick, [...this.customerOrgGroupAsbitems], "id=asbitemId");
this.dict.asbItemQuick = deepCopy(asbItemQuick)
this.quickAsb = deepCopy(asbItemQuick)
},
//

16
src/views/customerOrg/customerOrgGroup.vue

@ -32,16 +32,16 @@
height="258px" size="small" highlight-current-row :row-class-name="handleRowClassName"
@row-click="rowClick" id="customerOrgGroups">
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column label="id" prop="id" min-width="200" align="center" />
<el-table-column prop="displayName" label="名称" min-width="150" />
<el-table-column label="id" prop="id" min-width="280" align="center" />
<el-table-column prop="displayName" label="名称" min-width="150" align="center"/>
<el-table-column prop="price" label="价格" min-width="60" align="center" />
<el-table-column prop="canAddMoney" label="可自选金额" min-width="80" align="center" />
<el-table-column prop="forSexId" label="适用性别" min-width="60" align="center">
<el-table-column prop="forSexId" label="性别" min-width="60" align="center">
<template slot-scope="scope">
{{ dddw(dict.forSex, "id", scope.row.forSexId, "displayName") }}
</template>
</el-table-column>
<el-table-column prop="maritalStatusId" label="适用婚姻状况" min-width="80" align="center">
<el-table-column prop="maritalStatusId" label="婚姻" min-width="60" align="center">
<template slot-scope="scope">
{{
dddw(
@ -54,11 +54,9 @@
</template>
</el-table-column>
<el-table-column prop="creatorName" label="创建者" min-width="60" align="center" />
<el-table-column label="创建时间" min-width="150" align="center">
<template slot-scope="scope">
{{ scope.row.creationTime ? moment(scope.row.creationTime).format("yyyy-MM-DD HH:mm:ss") : "" }}
</template>
</el-table-column>
<el-table-column prop="creationTime" label="创建时间" min-width="140" align="center"/>
<el-table-column prop="lastModifierName" label="修改者" min-width="60" align="center" />
<el-table-column prop="lastModificationTime" label="修改时间" min-width="140" align="center"/>
<el-table-column label="操作" align="center">
<template>
<el-tag class="move" style="

101
src/views/customerReport/personnelPositive.vue

@ -8,8 +8,7 @@
</div>
</div>
<div :style="'display: block;'">
<div
style="
<div style="
background-color: #fff;
padding: 15px;
border-radius: 8px;
@ -18,23 +17,13 @@
margin-bottom: 10px;
height: 35px;
margin-top: 7px;
"
>
">
<div class="query">
<span>体检单位</span>
<el-input
placeholder="请选择体检单位"
v-model="patientRegister.query.cusOrgOCX"
style="width: 240px"
size="small"
disabled
>
<el-button
slot="append"
icon="el-icon-search"
@click="report.dialogCusOrgOCX = true"
style="font-size: 20px"
></el-button>
<el-input placeholder="请选择体检单位" v-model="patientRegister.query.cusOrgOCX" style="width: 240px" size="small"
disabled>
<el-button slot="append" icon="el-icon-search" @click="report.dialogCusOrgOCX = true"
style="font-size: 20px"></el-button>
</el-input>
</div>
<!-- <div class="query">
@ -65,59 +54,28 @@
<span>分类统计</span>
</div> -->
<div class="query">
<el-button @click="btnQuery" size="small" class="commonbutton"
>查询</el-button
>
<el-button @click="btnQuery" size="small" class="commonbutton">查询</el-button>
</div>
<div class="query">
<el-button @click="handleExport" size="small" class="commonbutton"
>导出excel</el-button
>
<el-button @click="handleExport" size="small" class="commonbutton">导出excel</el-button>
</div>
<div class="query">
<el-button @click="onPrint" size="small" class="commonbutton"
>打印</el-button
>
<el-button @click="onPrint" size="small" class="commonbutton">打印</el-button>
</div>
</div>
<div
ref="imageDom"
style="background-color: #fff; padding: 15px; border-radius: 8px"
>
<el-table
:data="dataList"
border
width="45%"
:height="
flag
<div ref="imageDom" style="background-color: #fff; padding: 15px; border-radius: 8px">
<el-table :data="dataList" border width="45%" :height="flag
? window.pageHeight < 600
? 415
: window.pageHeight - 185 - 25
: ''
"
row-key="id"
highlight-current-row
ref="dataList"
:row-class-name="tableRowClassName"
id="table"
show-summary
:summary-method="getSummaries"
>
" row-key="id" highlight-current-row ref="dataList" :row-class-name="tableRowClassName" id="table"
show-summary :summary-method="getSummaries">
<el-table-column :label="summary.customerOrgName">
<el-table-column
:label="`开始时间: ${summary.startDate || ''} 结束时间:${
summary.endDate || ''
} 体检人员共计 ${
summary.maleCount + summary.femaleCount
} 男性 ${summary.maleCount} 女性 ${summary.femaleCount}`"
align="left"
>
<el-table-column
type="index"
label="序号"
width="60"
align="center"
/>
<el-table-column :label="`开始时间 ${summary.startDate || ''} 结束时间${summary.endDate || ''
} 体检人员共计 ${summary.maleCount + summary.femaleCount
} 男性 ${summary.maleCount} 女性 ${summary.femaleCount}`" align="left">
<el-table-column type="index" label="序号" width="60" align="center" />
<el-table-column prop="customerOrgParentName" label="单位" align="center" />
<el-table-column prop="customerOrgName" label="部门" align="center" />
<el-table-column prop="patientNo" label="档案号" width="90" align="center" />
@ -125,13 +83,15 @@
<el-table-column prop="sexName" label="性别" width="50" align="center" />
<el-table-column prop="age" label="年龄" width="80" align="center" />
<el-table-column prop="medicalTimes" label="次数" width="50" align="center" />
<el-table-column
prop="mobileTelephone"
label="手机号码"
width="120"
/>
<el-table-column prop="summary" label="检查综述" />
<el-table-column prop="diagnosisNames" label="检查结果" />
<el-table-column prop="mobileTelephone" label="手机号码" width="120" />
<el-table-column prop="sumSummarysContent" label="检查综述" min-width="400">
<template slot-scope="scope">
<div v-for="(line, index) in scope.row.sumSummarysContent.split('\n')" :key="index">
{{ line }}
</div>
</template>
</el-table-column>
<el-table-column prop="diagnosisNames" label="检查结果" min-width="400"/>
</el-table-column>
</el-table-column>
</el-table>
@ -139,13 +99,8 @@
</div>
</div>
<!--通用选单位体检次数分组的控件-->
<el-dialog
title="体检单位选择"
:visible.sync="report.dialogCusOrgOCX"
:close-on-click-modal="false"
width="880px"
height="600px"
>
<el-dialog title="体检单位选择" :visible.sync="report.dialogCusOrgOCX" :close-on-click-modal="false" width="880px"
height="600px">
<CusOrgOCX :initDateType="'creationTime'" :useCustomerOrg="true" />
</el-dialog>
</div>

Loading…
Cancel
Save