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

update

master
pengjun 2 years ago
parent
507df0c98f
commit
1f4fbf6015
3 changed files with 153 additions and 115 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. 8
      public/electron/latest.yml
  2. 230
      src/components/patientRegister/PatientRegisterEdit.vue
  3. 30
      src/components/patientRegister/PatientRegisterItem.vue

8
public/electron/latest.yml
View File

@ -1,8 +0,0 @@
version: 1.0.6
files:
- url: example-001 Setup 1.0.6.exe
sha512: PfambE0KJ9BKAPuXEDNGZz6z6Tbz2/BY66SyhvvZa9DJwhKYzQbgo0x/580pMJzyMv/hwYM9eWpdkOiZ71IgQQ==
size: 124064042
path: example-001 Setup 1.0.6.exe
sha512: PfambE0KJ9BKAPuXEDNGZz6z6Tbz2/BY66SyhvvZa9DJwhKYzQbgo0x/580pMJzyMv/hwYM9eWpdkOiZ71IgQQ==
releaseDate: '2023-07-08T09:33:10.244Z'

230
src/components/patientRegister/PatientRegisterEdit.vue
View File

@ -31,7 +31,8 @@
</el-col>
<el-col :span="3">
<el-form-item label="性别" prop="sexId" label-width="50px">
<el-select v-model="form.sexId" placeholder="请选择" >
<el-select v-model="form.sexId" placeholder="请选择"
:style="'width:' + Math.floor((window.pageWidth - 650) / 8) + 'px;'">
<el-option v-for="item in dict.sex" :key="item.id" :label="item.displayName" :value="item.id">
</el-option>
</el-select>
@ -61,15 +62,24 @@
<el-input type="date" v-model="form.birthDate" @blur="changeBirthDate" />
</el-form-item>
</el-col>
<el-col :span="5">
<el-col :span="3">
<el-form-item label="年龄" prop="age">
<el-input v-model="form.age"></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item label="婚姻" prop="maritalStatusId" label-width="50px">
<el-select v-model="form.maritalStatusId" placeholder="请选择"
:style="'width:' + Math.floor((window.pageWidth - 650) / 8) + 'px;'">
<el-option v-for="item in dict.maritalStatus" :key="item.id" :label="item.displayName"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="3" />
</el-row>
<el-row>
<el-col :span="5">
<el-form-item label="手机号" prop="mobileTelephone">
<el-input v-model="form.mobileTelephone"></el-input>
@ -80,62 +90,31 @@
<el-input v-model="form.telephone"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="婚姻状况" prop="maritalStatusId">
<el-select v-model="form.maritalStatusId" placeholder="请选择"
:style="'width:' + Math.floor((window.pageWidth - 530) / 4.8) + 'px;'">
<el-option v-for="item in dict.maritalStatus" :key="item.id" :label="item.displayName"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" />
</el-row>
<el-row>
<el-col :span="10">
<el-form-item label="地址" prop="address">
<el-input v-model="form.address"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="邮箱" prop="email">
<el-input v-model="form.email"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="邮政编码" prop="postalCode">
<el-col :span="3">
<el-form-item label="邮编" prop="postalCode">
<el-input v-model="form.postalCode"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" />
</el-row>
<el-row>
<el-col :span="5">
<el-form-item label="民族" prop="nationId">
<el-select v-model="form.nationId" placeholder="请选择" filterable clearable
:style="'width:' + Math.floor((window.pageWidth - 530) / 4.8) + 'px;'">
<el-option v-for="item in dict.nation" :key="item.nationId" :label="item.displayName"
:value="item.nationId" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="籍贯" prop="birthPlaceId">
<el-col :span="3">
<el-form-item label="籍贯" prop="birthPlaceId" label-width="50px">
<el-select v-model="form.birthPlaceId" placeholder="请选择" filterable clearable
:style="'width:' + Math.floor((window.pageWidth - 530) / 4.8) + 'px;'">
:style="'width:' + Math.floor((window.pageWidth - 650) / 8) + 'px;'">
<el-option v-for="item in dict.birthPlace" :key="item.id" :label="item.displayName"
:value="item.id" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="体检类别" prop="medicalTypeId">
<el-select v-model="form.medicalTypeId" placeholder="请选择" filterable clearable
:style="'width:' + Math.floor((window.pageWidth - 530) / 4.8) + 'px;'">
<el-option v-for="item in dict.medicalType" :key="item.id" :label="item.displayName"
:value="item.id" />
</el-select>
<el-col :span="3" />
</el-row>
<el-row>
<el-col :span="10">
<el-form-item label="地址" prop="address">
<el-input v-model="form.address"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
@ -147,18 +126,36 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="3">
<el-form-item label="性激素期" prop="sexHormoneTermId">
<el-select v-model="form.sexHormoneTermId" placeholder="请选择" filterable clearable
:style="'width:' + Math.floor((window.pageWidth - 630) / 6) + 'px;'">
<el-select v-model="form.sexHormoneTermId" placeholder="请选择" filterable clearable>
<el-option v-for="item in dict.sexHormoneTerm" :key="item.id" :label="item.displayName"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item label="民族" prop="nationId" label-width="50px">
<el-select v-model="form.nationId" placeholder="请选择" filterable clearable
:style="'width:' + Math.floor((window.pageWidth - 650) / 8) + 'px;'">
<el-option v-for="item in dict.nation" :key="item.nationId" :label="item.displayName"
:value="item.nationId" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="3" />
</el-row>
<el-row>
<el-col :span="5">
<el-form-item label="体检类别" prop="medicalTypeId">
<el-select v-model="form.medicalTypeId" placeholder="请选择" filterable clearable
:style="'width:' + Math.floor((window.pageWidth - 530) / 4.8) + 'px;'">
<el-option v-for="item in dict.medicalType" :key="item.id" :label="item.displayName"
:value="item.id" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="工卡号" prop="jobCardNo">
<el-input v-model="form.jobCardNo"></el-input>
@ -169,51 +166,65 @@
<el-input v-model="form.medicalCardNo"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-col :span="3">
<el-form-item label="职务" prop="jobPost">
<el-input v-model="form.jobPost"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="职称" prop="jobTitle">
<el-input v-model="form.jobTitle"></el-input>
<el-col :span="3">
<el-form-item label="职称" prop="jobTitle" label-width="50px">
<el-input v-model="form.jobTitle"
:style="'width:' + Math.floor((window.pageWidth - 650) / 8) + 'px;'" />
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="3">
<el-form-item label="介绍人" prop="salesman">
<el-input v-model="form.salesman"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="5">
<el-form-item label="体检中心" prop="organizationUnitId">
<el-select v-model="form.organizationUnitId" placeholder="请选择" filterable
:style="'width:' + Math.floor((window.pageWidth - 530) / 4.8) + 'px;'">
<el-option v-for="item in dict.organization" :key="item.id" :label="item.displayName"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="是否VIP" prop="isVip">
<el-radio v-model="form.isVip" label="Y">是</el-radio>
<el-radio v-model="form.isVip" label="N">否</el-radio>
</el-form-item>
</el-col>
<el-col :span="5" style="margin-bottom: -15px; line-height: 40px">
<el-col :span="5">
<el-form-item label="电话随访" prop="isPhoneFollow">
<el-radio v-model="form.isPhoneFollow" label="Y">是</el-radio>
<el-radio v-model="form.isPhoneFollow" label="N">否</el-radio>
</el-form-item>
</el-col>
<el-col :span="5">
<el-col :span="3">
<el-form-item label="隐藏姓名" prop="isNameHide">
<!--
<el-radio v-model="form.isNameHide" label="Y">是</el-radio>
<el-radio v-model="form.isNameHide" label="N">否</el-radio>
-->
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="是否锁住" prop="isLock">
<el-col :span="3">
<el-form-item label="锁住" prop="isLock" label-width="50px">
<!--
<el-radio v-model="form.isLock" label="Y">是</el-radio>
<el-radio v-model="form.isLock" label="N">否</el-radio>
-->
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="3">
<el-form-item label="体检开始" prop="isMedicalStart">
<el-select v-model="form.isMedicalStart" placeholder="请选择" disabled
:style="'width:' + Math.floor((window.pageWidth - 630) / 6) + 'px;'">
<el-select v-model="form.isMedicalStart" placeholder="请选择" disabled>
<el-option label="是" value="Y" />
<el-option label="否" value="N" />
</el-select>
@ -221,55 +232,44 @@
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="体检中心" prop="organizationUnitId">
<el-select v-model="form.organizationUnitId" placeholder="请选择" filterable
:style="'width:' + Math.floor((window.pageWidth - 470) / 4) + 'px;'">
<el-option v-for="item in dict.organization" :key="item.id" :label="item.displayName"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="5">
<el-form-item label="分组" prop="customerOrgGroupId">
<el-select v-model="form.customerOrgGroupId" placeholder="请选择" filterable clearable
@change="changeCustomerOrgGroupId" :disabled="form.customerOrgId === dict.personOrgId ? true : false"
:style="'width:' + Math.floor((window.pageWidth - 470) / 4) + 'px;'">
:style="'width:' + Math.floor((window.pageWidth - 530) / 4.8) + 'px;'">
<el-option v-for="item in patientRegister.customerOrgGroup" :key="item.id" :label="item.displayName"
:value="item.id" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="5">
<el-form-item label="套餐" prop="medicalPackageId">
<el-select v-model="form.medicalPackageId" placeholder="请选择" filterable clearable
@change="changeMedicalPackageId" :disabled="form.customerOrgId === dict.personOrgId ? false : true"
:style="'width:' + Math.floor((window.pageWidth - 470) / 4) + 'px;'">
:style="'width:' + Math.floor((window.pageWidth - 530) / 4.8) + 'px;'">
<el-option v-for="item in dict.medicalPackage" :key="item.id" :label="item.displayName"
:value="item.id" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="完成标志" prop="completeFlag">
<el-select v-model="form.completeFlag" placeholder="请选择" disabled
:style="'width:' + Math.floor((window.pageWidth - 470) / 4) + 'px;'">
<el-col :span="11">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" :rows="1" placeholder="请输入备注"></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item label="状态" prop="completeFlag" label-width="50px">
<el-select v-model="form.completeFlag" placeholder="请选择" disabled>
<el-option v-for="item in dict.completeFlag" :key="item.id" :label="item.displayName"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" :rows="1" placeholder="请输入备注"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="创建者">
<el-form-item label="创建人员">
<el-input v-model="form.creatorId" disabled></el-input>
</el-form-item>
</el-col>
@ -282,7 +282,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="修改者">
<el-form-item label="修改人员">
<el-input v-model="form.lastModifierId" disabled></el-input>
</el-form-item>
</el-col>
@ -297,7 +297,7 @@
</el-row>
</el-form>
<el-image
:style="'position: absolute;top:65px;right:' + (110 + Math.floor((window.pageWidth - 400) / 25)) + 'px; width: 150px; height: 160px;'"
:style="'position: absolute;top:65px;right:' + (110 + Math.floor((window.pageWidth - 750) / 24)) + 'px; width: 150px; height: 160px;'"
:src="form.photo ? (apiurl + '/' + form.photo) : ''">
<div slot="placeholder" class="image-slot">
加载中<span class="dot">...</span>
@ -309,7 +309,7 @@
</div>
</div>
<div style="margin-left: 10px;width:110px;">
<div class="btn">
<div style="margin-top: -20px;">
<el-button type="primary" class="btnClass" @click="openCamera" icon="el-icon-camera">拍照</el-button>
</div>
<div class="btn">
@ -336,6 +336,43 @@
<div class="btn">
<el-button type="primary" class="btnClass" @click="guidePrint('0001', false)">指引单预览</el-button>
</div>
<div style="margin-top: 30px;">
<el-button type="primary" class="btnClass" @click="guidePrint('0001', false)">全个人支付</el-button>
</div>
<div class="btn">
<el-button type="primary" class="btnClass" @click="guidePrint('0001', false)">全单位支付</el-button>
</div>
<div class="btn">
<el-button type="primary" class="btnClass" @click="guidePrint('0001', false)">全赠送</el-button>
</div>
<div class="btn">
<el-button type="success" class="btnClass" @click="guidePrint('0001', false)">收费</el-button>
</div>
</div>
</div>
<!--查询条件-->
<div style="position: absolute;top:40px;left:160px;display: flex; flex-wrap: wrap; height:60px;">
<div class="query">
<span>查找：&nbsp;&nbsp;条码号</span>
<el-input placeholder="条码号" v-model="query.patientRegisterNo" size="small" clearable
style="width: 140px" />
</div>
<div class="query">
<span>档案号</span>
<el-input placeholder="档案号" v-model="query.patientNo" size="small" clearable
style="width: 100px" />
</div>
<div class="query">
<span>姓名</span>
<el-input placeholder="姓名" v-model="query.patientName" size="small" clearable
style="width: 80px" />
</div>
<div class="query">
<span>手机号</span>
<el-input placeholder="预约手机号" v-model="query.tel" size="small" clearable
style="width: 120px" />
</div>
</div>
@ -877,7 +914,7 @@ export default {
// }
return postapi('/api/app/lisrequest/updatelisrequestisprint', { operateType: 1, patientRegisterId: this.form.id })
}
})
})
.catch(err => {
this.$message.warning(err);
});
@ -921,11 +958,13 @@ export default {
</script>
<style scoped>
::v-deep .el-form-item {
margin-bottom: -15px;
margin-bottom: 0px;
}
::v-deep .el-table--small .el-table__cell {
padding: 0px 0;
}
::v-deep .el-input__inner {
text-align: left;
padding-left: 5px;
@ -933,21 +972,14 @@ export default {
}
.btn {
margin-top: 10px;
margin-top: 5px;
}
.btnClass {
width: 110px;
}
.photo {
position: absolute;
top: 65px;
right: 150px;
/* width: 150px;
height: 150px; */
width: 150px;
height: 160px;
.query {
margin-left: 10px;
}
</style>

30
src/components/patientRegister/PatientRegisterItem.vue
View File

@ -1,5 +1,5 @@
<template>
<div style="display: flex; margin-left: 10px; margin-top: 20px;">
<div style="display: flex; margin-left: 10px; margin-top: 10px;">
<div style="width:230px;">
<div>
<span>项目类别</span>
@ -10,7 +10,7 @@
</div>
<div class="mainareaBox">
<el-table :data="dict.asbItem"
:height="(window.pageHeight > 735 ? (window.pageHeight - 537) : 198)" @row-dblclick="dbClickChoosedAsb"
:height="(window.pageHeight > 720 ? (window.pageHeight - 460) : 260)" @row-dblclick="dbClickChoosedAsb"
@selection-change="handleSelectionChange" size="small">
<el-table-column type="selection" align="center" />
<el-table-column prop="displayName" label="未选组合项目" width="120" />
@ -60,12 +60,12 @@
<el-tooltip class="item" effect="dark" content="总金额即该人员此次体检实收金额，并根据此金额自动计算折扣" placement="top">
<span>总金额 </span>
</el-tooltip>
<el-input style="width:70px;" v-model="total" size="small" type="number" @input="changeTotal"
<el-input style="width:70px;" v-model="total" size="small" type="number" @input="changeTotal" ref="total"
@focus="totalFoucs = true" @blur="totalFoucs = false" />
</div>
<div class="disTotal">
<el-select v-model="asbItemId" placeholder="快速选择组合项目" size="small" filterable clearable remote
:remote-method="remoteMethod" @change="quickChoosedAsb" default-first-option
<el-select v-model="asbItemId" placeholder="快速选择组合项目" size="small" filterable clearable remote automatic-dropdown
:remote-method="remoteMethod" @change="quickChoosedAsb" default-first-option ref="asbItemId"
style="width:150px;text-align: left;padding-right: 15px;">
<el-option v-for="item in quickAsb" :key="item.id" :value="item.id" :label="item.displayName" />
</el-select>
@ -73,7 +73,7 @@
</div>
<div class="mainareaBox">
<el-table :data="patientRegister.patientRegisterAbs"
:height="(window.pageHeight > 735 ? (window.pageHeight - 537) : 198)" width="100%" :summary-method="getSummaries"
:height="(window.pageHeight > 720 ? (window.pageHeight - 460) : 260)" width="100%" :summary-method="getSummaries"
show-summary :row-class-name="tableRowClassName" @row-dblclick="removeAbs" @selection-change="selecteditems" size="small">
<!-- temporaryselection personnelUnit.nogroupselected-->
<el-table-column type="selection" align="center"/>
@ -624,7 +624,8 @@ export default {
if (lfind > -1) {
this.addAbs([this.dict.asbItemQuick[lfind]])
}
}
}
},
// quickChoosedAsb(v){
// let lfind = -1
@ -799,6 +800,19 @@ export default {
this.onSubmit('');
}
},
//快速选择完后，重新将光标定位到 asbItemId
"asbItemId"(newVal, oldVal) {
if (newVal != oldVal && newVal != '') {
//重新定位光标
this.$nextTick(() => {
console.log("1this.$refs['asbItemId'].focus()");
this.$refs['asbItemId'].focus(); //total asbItemId
console.log("2this.$refs['asbItemId'].focus()");
});
}
},
},
};
</script>
@ -807,7 +821,7 @@ export default {
.mainareaBox {
border: 1px solid #000;
height: v-bind("(window.pageHeight > 735 ? (window.pageHeight - 535) : 200) + 'px'");
height: v-bind("(window.pageHeight > 720 ? (window.pageHeight - 460) : 260) + 'px'");
margin-top: 5px;
}

Write Preview
Loading…
Cancel
Save