pengjun 2 years ago
parent
commit
3458edbfd6
  1. 9
      src/assets/css/global_form.css
  2. 30
      src/assets/css/global_input.css
  3. 61
      src/components/customerOrg/ContactPerson.vue
  4. 9
      src/components/customerOrg/customerOrgEdit.vue
  5. 2
      src/components/customerOrg/customerOrgRegister.vue
  6. 13
      src/components/doctorCheck/PatientRegisterList.vue
  7. 95
      src/components/patientRegister/PatientRegisterEdit.vue
  8. 4
      src/views/customerOrg/customerOrg.vue
  9. 5
      src/views/customerOrg/patientRegister.vue

9
src/assets/css/global_form.css

@ -0,0 +1,9 @@
/* form_label 属性*/
.el-form-item__label {
padding: 0 3px 0 0; /* 原始 默认值:0 12px 0 0; */
}
/* form_item 行距属性*/
.el-form-item {
margin-bottom: 2px; /* 原始 默认值:22px; */
}

30
src/assets/css/global_input.css

@ -3,7 +3,18 @@
padding-left: 2px; /* 原始 默认 15 */
padding-right: 15px; /* 原始 默认 25 */
}
/* 输入框右图标占位大小 */
/* 带前标 输入框 左间距 */
.el-input--prefix .el-input__inner {
padding-left: 2px; /* 原始 默认 30 */
}
/* 带后标 输入框 左间距 */
.el-input--suffix .el-input__inner {
padding-right: 15px; /* 原始 默认 30 */
}
/* 输入框右图标(下拉箭头等)占位大小 */
.el-input__icon{
width: 15px; /* 原始 默认 25 */
}
@ -14,4 +25,21 @@
}
.el-icon-time:before {
content: ""; /* 原始 默认 el-icon-time */
}
/* 大文本 */
.el-textarea__inner {
padding: 5px 15px 5px 2px; /* 原始 默认 5px 15px */
}
/* Radio 组 */
.el-input-group__append{
padding: 0 5px; /* 控件默认 0 20px;*/
}
/* 输入框定义为number时,取消 spin-button */
input[type="number"]::-webkit-inner-spin-button,
input[type="number"]::-webkit-outer-spin-button {
-webkit-appearance: none !important;
margin: 0 !important;
}

61
src/components/customerOrg/ContactPerson.vue

@ -2,7 +2,7 @@
<div>
<div style="display: flex;">
<div :style="'width:' + (window.pageWidth - 200 - 120 - 90) + 'px;'">
<el-table :data="customerOrg.contactPersonList" border :height="(window.pageHeight < 600 ? 54:window.pageHeight - 492)/2"
<el-table :data="customerOrg.contactPersonList" border :height="(window.pageHeight < 600 ? 64:window.pageHeight - 472)/2"
size="small" highlight-current-row @row-click="rowClick" ref="customerOrg.contactPersonList">
<el-table-column prop="displayName" label="姓名" />
<el-table-column prop="title" label="职务" />
@ -25,7 +25,7 @@
</el-table-column>
</el-table>
<el-table :data="customerOrg.contactMethodList" border :height="(window.pageHeight < 600 ? 54:window.pageHeight - 492)/2"
<el-table :data="customerOrg.contactMethodList" border :height="(window.pageHeight < 600 ? 64:window.pageHeight - 472)/2"
size="small" highlight-current-row @row-click="rowClickMethod" ref="customerOrg.contactMethodList">
<el-table-column prop="contactMethodType" label="类型">
<template slot-scope="scope">
@ -145,6 +145,7 @@ import { getapi, postapi, putapi, deletapi } from "@/api/api";
import { objCopy } from "../../utlis/proFunc";
export default {
components: {},
props:["customerOrgId"],
data() {
return {
personId: "",
@ -201,11 +202,11 @@ export default {
//
add() {
//this.$message.success(" addContactPerson");
if (!this.customerOrg.customerOrgId) {
if (!this.customerOrgId) {
this.$message.warning("没有体检单位信息");
return;
}
this.form = { customerOrgId: this.customerOrg.customerOrgId };
this.form = { customerOrgId: this.customerOrgId };
this.dialogContactPerson = true;
this.formTitle = "新增";
this.personId = "";
@ -214,7 +215,8 @@ export default {
edit() {
//this.$message.success(" editContactPerson");
if (!this.customerOrg.customerOrgId) {
console.log('this.customerOrgId',this.customerOrgId)
if (!this.customerOrgId) {
this.$message.warning("没有体检单位信息");
return;
} else if (!this.personId) {
@ -307,6 +309,7 @@ export default {
//console.log('api/app/contact-method/many')
this.getContactPersonList(this.customerOrg.customerOrgId);
this.$message.success("操作成功!");
this.dialogContactPerson = false
});
} else {
putapi(`/api/app/contact-person/${this.personId}`, body)
@ -330,6 +333,7 @@ export default {
//console.log('api/app/contact-method/many')
this.getContactPersonList(this.customerOrg.customerOrgId);
this.$message.success("操作成功!");
this.dialogContactPerson = false
});
}
} else {
@ -361,48 +365,25 @@ export default {
//this.$message.success("rowClickMethod");
},
},
watch: {
'customerOrgId' (newVal,oldVal){
console.log('watch customerOrgId',newVal,oldVal)
if(newVal != oldVal){
this.personId = ''
}
}
},
};
</script>
<style scoped>
@import '../../assets/css/global_table.css';
@import '../../assets/css/global_input.css';
@import '../../assets/css/global_form.css';
.btnClass {
width: 110px;
}
::v-deep .el-form-item {
margin-bottom: 2px;
}
::v-deep .el-input__inner {
/*text-align: center;*/
padding-left: 2px;
padding-right: 15px;
}
::v-deep .el-input__icon{
width: 15px; /* 输入框下拉箭头或清除图标 默认 25 */
}
/* 表格 表头 列间距控制 */
::v-deep .el-table th.el-table__cell>.cell{
text-align: center; /* 表格 表头 对齐方式,默认 left */
padding-right: 2px; /* 表格 表头 列间距控制,默认 10px */
padding-left: 2px; /* 表格 表头 列间距控制,默认 10px */
}
/* 表格 表体 首列左间距控制 */
::v-deep .el-table--border .el-table__cell:first-child .cell {
padding-left: 2px; /* 表格 表体 首列左间距控制,默认 10px */
}
/* 表格 行列间距控制 ,默认 10 px*/
::v-deep .el-table__cell {
padding: 2px 2px 2px 2px; /* 上,右,下,左 */
}
/* 表格单元格 .el-table .cell ,默认 10 px*/
::v-deep .cell {
padding-left: 2px;
padding-right: 2px;
}
::v-deep .el-icon-date:before {
content: ""
}
</style>

9
src/components/customerOrg/customerOrgEdit.vue

@ -543,7 +543,7 @@ export default {
watch: {
id(newVal, oldVal) {
console.log("watch getCustomerOrgRd newVal:", newVal, " oldVal:", oldVal);
console.log("watch getCustomerOrgRd ", newVal, oldVal);
if (newVal != oldVal && newVal != "") {
this.getCustomerOrgRd(newVal);
}
@ -552,9 +552,10 @@ export default {
};
</script>
<style scoped>
::v-deep .el-form-item {
margin-bottom: 5px;
}
@import "../../assets/css/global_form.css";
.btnList {
margin-bottom: 10px;

2
src/components/customerOrg/customerOrgRegister.vue

@ -1,7 +1,7 @@
<template>
<div style="display: flex;">
<div :style="'width:' + (window.pageWidth - 200 - 120 - 90) + 'px;'">
<el-table :data="customerOrg.customerOrgRegisterList" border :height="window.pageHeight < 600 ? 108:window.pageHeight - 492" size="small"
<el-table :data="customerOrg.customerOrgRegisterList" border :height="window.pageHeight < 600 ? 128:window.pageHeight - 472" size="small"
highlight-current-row @row-click="rowClick" ref="customerOrg.customerOrgRegisterList">
<el-table-column prop="medicalTimes" label="体检次数" />
<el-table-column prop="beginTime" label="开始日期">

13
src/components/doctorCheck/PatientRegisterList.vue

@ -40,7 +40,7 @@
<!-- 人员列表 -->
<el-table :data="dataList" border width="100%" height="430" row-key="id" size="small"
:height="window.pageHeight - 80 - 120"
class="el-table__body-wrapper tbody" highlight-current-row @row-click="rowick" ref="dataList">
highlight-current-row @row-click="rowick" ref="dataList">
<el-table-column prop="customerOrgParentName" label="单位" width="150">
<template slot-scope="scope">
@ -274,18 +274,7 @@ export default {
};
</script>
<style scoped>
/* 输入框相关设置*/
::v-deep .el-input__inner {
padding-left: 2px;
padding-right: 15px;
}
::v-deep .el-input__icon{
width: 15px; /* 输入框下拉箭头或清除图标 默认 25 */
}
::v-deep .el-input-group__append{
padding: 0 5px; /* 控件默认 0 20px;*/
}
.box {
display: flex;
}

95
src/components/patientRegister/PatientRegisterEdit.vue

@ -10,28 +10,28 @@
<el-cascader v-model="form.customerOrgId" :options="patientRegister.customerOrgTreeAll"
:style="'width:' + Math.floor((window.pageWidth - 530) / 4.8) + 'px;'"
:props="{ checkStrictly: true, expandTrigger: 'hover', ...customerOrg.treeprops, }"
:show-all-levels="false" disabled>
:show-all-levels="false" disabled size="small">
</el-cascader>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="条码号" prop="patientRegisterNo">
<el-input v-model="form.patientRegisterNo" disabled></el-input>
<el-input v-model="form.patientRegisterNo" disabled size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="档案号" prop="patientNo">
<el-input v-model="form.patientNo" disabled></el-input>
<el-input v-model="form.patientNo" disabled size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item label="体检次数" prop="medicalTimes">
<el-input v-model="form.medicalTimes" disabled></el-input>
<el-input v-model="form.medicalTimes" disabled size="small"></el-input>
</el-form-item>
</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="请选择" size="small"
: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>
@ -44,29 +44,29 @@
<el-row>
<el-col :span="5">
<el-form-item label="姓名" prop="patientName">
<el-input v-model="form.patientName" @blur="Query(form.patientName)"></el-input>
<el-input v-model="form.patientName" @blur="Query(form.patientName)" size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="身份证号" prop="idNo">
<el-input v-model="form.idNo" @change="changeIdNo" @blur="Query(form.idNo)"></el-input>
<el-input v-model="form.idNo" @change="changeIdNo" @blur="Query(form.idNo)" size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="出生日期" prop="birthDate">
<el-date-picker v-model="form.birthDate" type="date" value-format="yyyy-MM-dd" placeholder="出生日期"
:style="'width:' + Math.floor((window.pageWidth - 530) / 4.8) + 'px;'" @change="changeBirthDate"
prefix-icon="" />
prefix-icon="" size="small"/>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item label="年龄" prop="age">
<el-input v-model="form.age"></el-input>
<el-input v-model="form.age" size="small"></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="请选择"
<el-select v-model="form.maritalStatusId" placeholder="请选择" size="small"
: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">
@ -79,28 +79,28 @@
<el-row>
<el-col :span="5">
<el-form-item label="手机号" prop="mobileTelephone">
<el-input v-model="form.mobileTelephone"></el-input>
<el-input v-model="form.mobileTelephone" size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="电话" prop="telephone">
<el-input v-model="form.telephone"></el-input>
<el-input v-model="form.telephone" size="small"></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-input v-model="form.email" size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item label="邮编" prop="postalCode">
<el-input v-model="form.postalCode"></el-input>
<el-input v-model="form.postalCode" size="small"></el-input>
</el-form-item>
</el-col>
<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 - 650) / 8) + 'px;'">
:style="'width:' + Math.floor((window.pageWidth - 650) / 8) + 'px;'" size="small">
<el-option v-for="item in dict.birthPlace" :key="item.id" :label="item.displayName"
:value="item.id" />
</el-select>
@ -111,13 +111,13 @@
<el-row>
<el-col :span="10">
<el-form-item label="地址" prop="address">
<el-input v-model="form.address"></el-input>
<el-input v-model="form.address" size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="人员类别" prop="personnelTypeId">
<el-select v-model="form.personnelTypeId" placeholder="请选择" filterable clearable
:style="'width:' + Math.floor((window.pageWidth - 530) / 4.8) + 'px;'">
:style="'width:' + Math.floor((window.pageWidth - 530) / 4.8) + 'px;'" size="small">
<el-option v-for="item in dict.personnelType" :key="item.id" :label="item.displayName"
:value="item.id" />
</el-select>
@ -125,7 +125,7 @@
</el-col>
<el-col :span="3">
<el-form-item label="性激素期" prop="sexHormoneTermId">
<el-select v-model="form.sexHormoneTermId" placeholder="请选择" filterable clearable>
<el-select v-model="form.sexHormoneTermId" placeholder="请选择" filterable clearable size="small">
<el-option v-for="item in dict.sexHormoneTerm" :key="item.id" :label="item.displayName"
:value="item.id">
</el-option>
@ -135,7 +135,7 @@
<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;'">
:style="'width:' + Math.floor((window.pageWidth - 650) / 8) + 'px;'" size="small">
<el-option v-for="item in dict.nation" :key="item.nationId" :label="item.displayName"
:value="item.nationId" />
</el-select>
@ -147,7 +147,7 @@
<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;'">
:style="'width:' + Math.floor((window.pageWidth - 530) / 4.8) + 'px;'" size="small">
<el-option v-for="item in dict.medicalType" :key="item.id" :label="item.displayName"
:value="item.id" />
</el-select>
@ -155,28 +155,28 @@
</el-col>
<el-col :span="5">
<el-form-item label="工卡号" prop="jobCardNo">
<el-input v-model="form.jobCardNo"></el-input>
<el-input v-model="form.jobCardNo" size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="体检卡号" prop="medicalCardNo">
<el-input v-model="form.medicalCardNo"></el-input>
<el-input v-model="form.medicalCardNo" size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item label="职务" prop="jobPost">
<el-input v-model="form.jobPost"></el-input>
<el-input v-model="form.jobPost" size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item label="职称" prop="jobTitle" label-width="50px">
<el-input v-model="form.jobTitle"
<el-input v-model="form.jobTitle" size="small"
:style="'width:' + Math.floor((window.pageWidth - 650) / 8) + 'px;'" />
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item label="介绍人" prop="salesman">
<el-input v-model="form.salesman"></el-input>
<el-input v-model="form.salesman" size="small"></el-input>
</el-form-item>
</el-col>
</el-row>
@ -184,7 +184,7 @@
<el-col :span="5">
<el-form-item label="体检中心" prop="organizationUnitId">
<el-select v-model="form.organizationUnitId" placeholder="请选择" filterable
:disabled="peisid ? true : false"
:disabled="peisid ? true : false" size="small"
: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">
@ -241,7 +241,7 @@
</el-col>
<el-col :span="3">
<el-form-item label="体检开始" prop="isMedicalStart">
<el-select v-model="form.isMedicalStart" placeholder="请选择" disabled>
<el-select v-model="form.isMedicalStart" placeholder="请选择" disabled size="small">
<el-option label="是" value="Y" />
<el-option label="否" value="N" />
</el-select>
@ -253,7 +253,7 @@
<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 - 530) / 4.8) + 'px;'">
:style="'width:' + Math.floor((window.pageWidth - 530) / 4.8) + 'px;'" size="small">
<el-option v-for="item in patientRegister.customerOrgGroup" :key="item.id" :label="item.displayName"
:value="item.id" />
</el-select>
@ -263,7 +263,7 @@
<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 - 530) / 4.8) + 'px;'">
:style="'width:' + Math.floor((window.pageWidth - 530) / 4.8) + 'px;'" size="small">
<el-option v-for="item in dict.medicalPackage" :key="item.id" :label="item.displayName"
:value="item.id" />
</el-select>
@ -271,12 +271,12 @@
</el-col>
<el-col :span="11">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" :rows="1" placeholder="请输入备注"></el-input>
<el-input v-model="form.remark" type="textarea" :rows="1" placeholder="请输入备注" size="small"></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-select v-model="form.completeFlag" placeholder="请选择" disabled size="small">
<el-option v-for="item in dict.completeFlag" :key="item.id" :label="item.displayName"
:value="item.id">
</el-option>
@ -287,20 +287,20 @@
<el-row>
<el-col :span="6">
<el-form-item label="创建人员">
<el-input v-model="form.creatorId" disabled></el-input>
<el-input v-model="form.creatorId" disabled size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="创建时间">
<el-input :value="form.creationTime
<el-input :value="form.creationTime
? lmoment(form.creationTime, 'yyyy-MM-DD')
: ''
" disabled></el-input>
" disabled size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="修改人员">
<el-input v-model="form.lastModifierId" disabled></el-input>
<el-input v-model="form.lastModifierId" disabled size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
@ -308,7 +308,7 @@
<el-input :value="form.lastModificationTime
? lmoment(form.lastModificationTime, 'yyyy-MM-DD')
: ''
" disabled></el-input>
" disabled size="small"></el-input>
</el-form-item>
</el-col>
</el-row>
@ -326,7 +326,7 @@
</div>
</div>
<div style="margin-left: 10px;width:110px;">
<div style="margin-top: -20px;">
<div>
<el-button type="primary" class="btnClass" @click="photoGrah" icon="el-icon-camera">拍照</el-button>
</div>
<div class="btn">
@ -373,7 +373,7 @@
</div>
<!--查询条件-->
<div style="position: absolute;top:40px;left:160px;display: flex; flex-wrap: wrap; height:60px;">
<div style="position: absolute;top:30px;left:180px;display: flex; flex-wrap: wrap; height:60px;">
<div class="query">
<span class="querySpan">查找&nbsp;&nbsp;条码号</span>
<el-input placeholder="条码号" v-model="query.patientRegisterNo" size="small"
@ -1464,29 +1464,12 @@ export default {
};
</script>
<style scoped>
::v-deep .el-button {
padding: 10px 5px;
/* 原值:12px 20px; */
}
::v-deep .el-form-item {
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;
padding-right: 15px;
}
::v-deep .el-icon-date:before {
content: ""
}
.btn {
margin-top: 5px;
}

4
src/views/customerOrg/customerOrg.vue

@ -28,7 +28,7 @@
<el-tabs :style="'margin-left: 10px;width:' +
(window.pageWidth - 200 - 90) +
'px;height:' +
(window.pageHeight < 600 ? 164 : window.pageHeight - 436) +
(window.pageHeight < 600 ? 182 : window.pageHeight - 418) +
'px;'
" v-model="tabChoosed">
<!-- 体检次数 -->
@ -37,7 +37,7 @@
</el-tab-pane>
<!-- 联系人 -->
<el-tab-pane label="联系人" name="2">
<ContactPerson />
<ContactPerson :customerOrgId="customerOrg.customerOrgRd.id"/>
</el-tab-pane>
</el-tabs>
</div>

5
src/views/customerOrg/patientRegister.vue

@ -199,6 +199,11 @@ export default {
};
</script>
<style scoped>
@import '../../assets/css/global_dialog.css';
@import '../../assets/css/global_form.css';
@import '../../assets/css/global_input.css';
@import '../../assets/css/global_table.css';
@import '../../assets/css/global.css';
.box {
display: flex;
}

Loading…
Cancel
Save