pengjun 4 months ago
parent
commit
104892440b
  1. BIN
      public/files/会员卡导入模板.xls
  2. 10
      src/components/patientRegister/PatientRegisterEdit.vue
  3. 14
      src/components/patientRegister/PatientRegisterList.vue
  4. 6
      src/components/report/PatientRegisterListNobtn.vue
  5. 15
      src/views/customerReport/personnelPositive.vue
  6. 33
      src/views/fee-settings/cardRegister.vue

BIN
public/files/会员卡导入模板.xls

10
src/components/patientRegister/PatientRegisterEdit.vue

@ -566,6 +566,14 @@
ref="patientList"> ref="patientList">
<el-table-column type="index" width="30" align="center" /> <el-table-column type="index" width="30" align="center" />
<el-table-column prop="patientNo" label="档案号" min-width="80" align="center" /> <el-table-column prop="patientNo" label="档案号" min-width="80" align="center" />
<el-table-column prop="customerOrgParentName" label="档案号" min-width="180" show-overflow-tooltip/>
<el-table-column prop="customerOrgName" label="档案号" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">
<div>
{{ scope.row.customerOrgParentName == scope.row.customerOrgName ? '':scope.row.customerOrgName }}
</div>
</template>
</el-table-column>
<el-table-column prop="lastTime" label="末次体检" min-width="80" align="center"> <el-table-column prop="lastTime" label="末次体检" min-width="80" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.lastTime"> <div v-if="scope.row.lastTime">
@ -573,7 +581,7 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="medicalTimes" label="体检次数" min-width="70" align="center" />
<el-table-column prop="medicalTimes" label="次数" min-width="70" align="center" />
<el-table-column prop="displayName" label="姓名" min-width="70" align="center" /> <el-table-column prop="displayName" label="姓名" min-width="70" align="center" />
<el-table-column prop="sexId" label="性别" min-width="50" align="center"> <el-table-column prop="sexId" label="性别" min-width="50" align="center">
<template slot-scope="scope"> <template slot-scope="scope">

14
src/components/patientRegister/PatientRegisterList.vue

@ -757,10 +757,10 @@ export default {
{ {
label: "条码号", label: "条码号",
prop: "patientRegisterNo", prop: "patientRegisterNo",
minWidth: 150,
minWidth: 110,
align: "center", align: "center",
}, },
{ label: "档案号", prop: "patientNo", minWidth: 100, align: "center" },
{ label: "档案号", prop: "patientNo", minWidth: 90, align: "center" },
{ {
label: "体检次数", label: "体检次数",
prop: "medicalTimes", prop: "medicalTimes",
@ -836,10 +836,10 @@ export default {
{ label: "高铁", prop: "qztlIsGt", minWidth: 50, align: "center" }, { label: "高铁", prop: "qztlIsGt", minWidth: 50, align: "center" },
{ label: "职害", prop: "qztlIsWh", minWidth: 50, align: "center" }, { label: "职害", prop: "qztlIsWh", minWidth: 50, align: "center" },
{ label: "复检", prop: "qztlIsFj", minWidth: 50, align: "center" }, { label: "复检", prop: "qztlIsFj", minWidth: 50, align: "center" },
{ label: "标准金额", prop: "standardAmount", minWidth: 80, align: "center" },
{ label: "应收金额", prop: "receivableAmount", minWidth: 80, align: "center" },
{ label: "实收金额", prop: "chargeAmount", minWidth: 80, align: "center" },
{ label: "支付方式", prop: "chargePayMode", minWidth: 80, align: "center" },
// { label: "", prop: "standardAmount", minWidth: 80, align: "center" },
// { label: "", prop: "receivableAmount", minWidth: 80, align: "center" },
// { label: "", prop: "chargeAmount", minWidth: 80, align: "center" },
// { label: "", prop: "chargePayMode", minWidth: 80, align: "center" },
], ],
dialogColSort: false, dialogColSort: false,
jsonFields: {}, jsonFields: {},
@ -1877,7 +1877,7 @@ export default {
// /api/app/PatientRegister/GetPatientRegisterWithCharge // /api/app/PatientRegister/GetPatientRegisterWithCharge
// /api/app/patientregister/getlistinfilter // /api/app/patientregister/getlistinfilter
postapi("/api/app/PatientRegister/GetPatientRegisterWithCharge", body).then(
postapi("/api/app/patientregister/getlistinfilter", body).then(
async (res) => { async (res) => {
if (res.code > -1) { if (res.code > -1) {
// //

6
src/components/report/PatientRegisterListNobtn.vue

@ -134,11 +134,11 @@ export default {
{ label: "介绍人", prop: "salesman", minWidth: 80, align: "center" }, { label: "介绍人", prop: "salesman", minWidth: 80, align: "center" },
{ label: "VIP", prop: "isVip", minWidth: 80, align: "center" }, { label: "VIP", prop: "isVip", minWidth: 80, align: "center" },
{ label: "总检医生", prop: "summaryDoctorName", minWidth: 90, align: "center" }, { label: "总检医生", prop: "summaryDoctorName", minWidth: 90, align: "center" },
{ label: "总检日期", prop: "summaryDate", minWidth: 140, align: "center" },
{ label: "总检日期", prop: "summaryDate", minWidth: 160, align: "center" },
{ label: "审核医生", prop: "auditDoctorName", minWidth: 90, align: "center" }, { label: "审核医生", prop: "auditDoctorName", minWidth: 90, align: "center" },
{ label: "审核日期", prop: "auditDate", minWidth: 140, align: "center" },
{ label: "审核日期", prop: "auditDate", minWidth: 160, align: "center" },
{ label: "登记人", prop: "registerName", minWidth: 80, align: "center" }, { label: "登记人", prop: "registerName", minWidth: 80, align: "center" },
{ label: "登记时间", prop: "registerDate", minWidth: 140, align: "center" },
{ label: "登记时间", prop: "registerDate", minWidth: 160, align: "center" },
{ label: "打印人", prop: "reportPrintName", minWidth: 70, align: "center" }, { label: "打印人", prop: "reportPrintName", minWidth: 70, align: "center" },
{ label: "领取人", prop: "reportReceiveName", minWidth: 70, align: "center" }, { label: "领取人", prop: "reportReceiveName", minWidth: 70, align: "center" },
{ label: "领取时间", prop: "reportReceiveDate", minWidth: 140, align: "center" }, { label: "领取时间", prop: "reportReceiveDate", minWidth: 140, align: "center" },

15
src/views/customerReport/personnelPositive.vue

@ -19,13 +19,19 @@
margin-top: 7px; margin-top: 7px;
"> ">
<div class="query"> <div class="query">
<span>体检单位</span>
<span style="margin-right: 3px;">体检单位</span>
<el-input placeholder="请选择体检单位" v-model="patientRegister.query.cusOrgOCX" style="width: 240px" size="small" <el-input placeholder="请选择体检单位" v-model="patientRegister.query.cusOrgOCX" style="width: 240px" size="small"
disabled> disabled>
<el-button slot="append" icon="el-icon-search" @click="report.dialogCusOrgOCX = true" <el-button slot="append" icon="el-icon-search" @click="report.dialogCusOrgOCX = true"
style="font-size: 20px"></el-button> style="font-size: 20px"></el-button>
</el-input> </el-input>
</div> </div>
<div class="query">
<span style="margin-right: 3px;">显示综述</span>
<el-checkbox v-model="isDispSummary" size="small" true-label="Y"
false-label="N" />
</div>
<!-- <div class="query"> <!-- <div class="query">
<span>检查状态</span> <span>检查状态</span>
<el-select v-model="completeFlag" placeholder="请选择" clearable style="width: 80px" <el-select v-model="completeFlag" placeholder="请选择" clearable style="width: 80px"
@ -64,7 +70,7 @@
</div> </div>
</div> </div>
<div ref="imageDom" style="background-color: #fff; padding: 15px; border-radius: 8px"> <div ref="imageDom" style="background-color: #fff; padding: 15px; border-radius: 8px">
<el-table :data="dataList" border width="45%" :height="flag
<el-table :data="dataList" border :height="flag
? window.pageHeight < 600 ? window.pageHeight < 600
? 415 ? 415
: window.pageHeight - 185 - 25 : window.pageHeight - 185 - 25
@ -83,8 +89,8 @@
<el-table-column prop="sexName" label="性别" width="50" align="center" /> <el-table-column prop="sexName" label="性别" width="50" align="center" />
<el-table-column prop="age" label="年龄" width="80" 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="medicalTimes" label="次数" width="50" align="center" />
<el-table-column prop="mobileTelephone" label="手机号码" width="120" />
<el-table-column prop="sumSummarysContent" label="检查综述" min-width="400">
<el-table-column prop="mobileTelephone" label="手机号码" width="120" />
<el-table-column prop="sumSummarysContent" label="检查综述" min-width="400" v-if="isDispSummary == 'Y' ? true:false">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-for="(line, index) in scope.row.sumSummarysContent.split('\n')" :key="index"> <div v-for="(line, index) in scope.row.sumSummarysContent.split('\n')" :key="index">
{{ line }} {{ line }}
@ -131,6 +137,7 @@ export default {
completeFlag: "", completeFlag: "",
classification: "Y", classification: "Y",
flag: true, flag: true,
isDispSummary:'N', //
summary: { summary: {
startDate: "", startDate: "",
endDate: "", endDate: "",

33
src/views/fee-settings/cardRegister.vue

@ -174,24 +174,12 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="creatorName" label="创建人员" align="center"/>
<el-table-column prop="creationTime" label="创建日期" width="150" align="center">
<template slot-scope="scope">
<div v-if="scope.row.creationTime">
{{ moment(scope.row.creationTime).format("yyyy-MM-DD") }}
</div>
</template>
</el-table-column>
<el-table-column prop="creatorName" label="操作人员" align="center"/>
<el-table-column prop="creationTime" label="操作日期" width="160" align="center" />
<!--
<el-table-column prop="lastModifierName" label="修改人员" /> <el-table-column prop="lastModifierName" label="修改人员" />
<el-table-column prop="lastModificationTime" label="修改日期" width="150">
<template slot-scope="scope">
<div v-if="scope.row.lastModificationTime">
{{
moment(scope.row.lastModificationTime).format("yyyy-MM-DD")
}}
</div>
</template>
</el-table-column>
<el-table-column prop="lastModificationTime" label="修改日期" width="160" align="center"/>
-->
</el-table> </el-table>
</div> </div>
</div> </div>
@ -232,7 +220,7 @@
</a> </a>
</div> </div>
<div style="margin-top: 10px"> <div style="margin-top: 10px">
<el-button class="commonbutton" @click="btnImportCard">导入建卡</el-button>
<el-button class="commonbutton" @click="seq = 0">导入建卡</el-button>
</div> </div>
<div style="margin-top: 10px"> <div style="margin-top: 10px">
<download-excel :fields="jsonFields" :fetch="btnExport" type="xls" :name="tableName"> <download-excel :fields="jsonFields" :fetch="btnExport" type="xls" :name="tableName">
@ -417,14 +405,13 @@
<br />注意事项如下: <br />注意事项如下:
<br /> <br />
<div style="margin-left: 25px"> <div style="margin-left: 25px">
1卡号卡主不能为空其余数据可根据实际情况选择是否填写
<br />2卡类别与本软件系统中的名称完全一致
1卡号卡主不能为空其余数据可根据实际情况选择是否填写
<br />2卡类别与本软件系统中的名称完全一致初始金额不为 0 充值方式必填
<br />3折扣率填写错误未填0负数或非有数字则默认为 100 <br />3折扣率填写错误未填0负数或非有数字则默认为 100
<br />4Excel中标题列不能有单元格合并 <br />4Excel中标题列不能有单元格合并
</div> </div>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button class="commonbutton" type="primary" @click="seq--">上一步</el-button>
<el-button class="commonbutton" type="primary" @click="seq++">下一步</el-button> <el-button class="commonbutton" type="primary" @click="seq++">下一步</el-button>
<el-button class="commonbutton" @click="seq = -1">关闭</el-button> <el-button class="commonbutton" @click="seq = -1">关闭</el-button>
</span> </span>
@ -643,7 +630,7 @@ export default {
oldMansOpts: false, // oldMansOpts: false, //
}, },
oldSeq: -2, // oldSeq: -2, //
seq: 0, //
seq: -1, //
mode: "10", // 10 20 30 mode: "10", // 10 20 30
excelCols: [{ dispLabel: "", val: "", dataLabel: "" }], //excel {dispLabel:'',val:'',dataLabel:''} excelCols: [{ dispLabel: "", val: "", dataLabel: "" }], //excel {dispLabel:'',val:'',dataLabel:''}
importCols: [], // dataCols importCols: [], // dataCols
@ -656,6 +643,7 @@ export default {
{ dispLabel: "会员卡号", val: "cardNo" }, { dispLabel: "会员卡号", val: "cardNo" },
{ dispLabel: "折扣率", val: "discount" }, { dispLabel: "折扣率", val: "discount" },
{ dispLabel: "初始余额", val: "cardBalance" }, { dispLabel: "初始余额", val: "cardBalance" },
{ dispLabel: "充值方式", val: "payMode" },
{ dispLabel: "性别", val: "expiryDate" }, { dispLabel: "性别", val: "expiryDate" },
{ dispLabel: "年龄", val: "age" }, { dispLabel: "年龄", val: "age" },
{ dispLabel: "有效期限", val: "birthDate" }, { dispLabel: "有效期限", val: "birthDate" },
@ -674,6 +662,7 @@ export default {
sheetNameChoosed: "", // sheetNameChoosed: "", //
titleRow: 1, // titleRow: 1, //
}, },
jsonFields: { jsonFields: {
卡类别: "cardTypeId", 卡类别: "cardTypeId",
会员卡号: "cardNo", 会员卡号: "cardNo",

Loading…
Cancel
Save