Browse Source

导航菜单修改

master
mch 2 years ago
parent
commit
3eae3efb80
  1. 166
      src/components/patientRegister/PatientRegisterEdit.vue
  2. 6
      src/components/patientRegister/PatientRegisterItem.vue
  3. 14
      src/components/unitGrouping/unitGroupingTable.vue
  4. 279
      src/views/Home.vue
  5. 2
      src/views/basic-dictionary/MaritalStatus.vue

166
src/components/patientRegister/PatientRegisterEdit.vue

@ -79,7 +79,12 @@
</el-col>
<el-col :span="6">
<el-form-item label="出生日期" prop="birthDate">
<el-date-picker v-model="form.birthDate" type="date" placeholder="出生日期" style="width: 135px"/>
<el-date-picker
v-model="form.birthDate"
type="date"
placeholder="出生日期"
style="width: 135px"
/>
</el-form-item>
</el-col>
<el-col :span="6">
@ -103,15 +108,33 @@
<el-row>
<el-col :span="6">
<el-form-item label="体检类别" prop="medicalTypeId">
<el-select v-model="form.medicalTypeId" placeholder="请选择" filterable>
<el-option v-for="item in dict.medicalType" :key="item.id" :label="item.displayName" :value="item.id" />
<el-select
v-model="form.medicalTypeId"
placeholder="请选择"
filterable
>
<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="6">
<el-form-item label="人员类别" prop="personnelTypeId">
<el-select v-model="form.personnelTypeId" placeholder="请选择" filterable>
<el-option v-for="item in dict.personnelType" :key="item.id" :label="item.displayName" :value="item.id" />
<el-select
v-model="form.personnelTypeId"
placeholder="请选择"
filterable
>
<el-option
v-for="item in dict.personnelType"
:key="item.id"
:label="item.displayName"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
@ -170,8 +193,17 @@
</el-col>
<el-col :span="6">
<el-form-item label="民族" prop="nationId">
<el-select v-model="form.nationId" placeholder="请选择" filterable>
<el-option v-for="item in dict.nation" :key="item.id" :label="item.displayName" :value="item.id" />
<el-select
v-model="form.nationId"
placeholder="请选择"
filterable
>
<el-option
v-for="item in dict.nation"
:key="item.id"
:label="item.displayName"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
@ -198,7 +230,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="是否VIP" prop="isVip">
<el-radio v-model="form.isVip" label="Y"></el-radio>
@ -207,7 +239,7 @@
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-col :span="6" style="margin-bottom: -15px; line-height: 40px">
<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>
@ -254,19 +286,43 @@
</el-col>
<el-col :span="6">
<el-form-item label="分组" prop="customerOrgGroupId">
<el-select v-model="form.customerOrgGroupId" placeholder="请选择" filterable clearable
<el-select
v-model="form.customerOrgGroupId"
placeholder="请选择"
filterable
clearable
@change="changeCustomerOrgGroupId"
:disabled="form.customerOrgId === dict.personOrgId ? true : false">
<el-option v-for="item in patientRegister.customerOrgGroup" :key="item.id" :label="item.displayName" :value="item.id" />
:disabled="
form.customerOrgId === dict.personOrgId ? true : false
"
>
<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-form-item label="套餐" prop="medicalPackageId">
<el-select v-model="form.medicalPackageId" placeholder="请选择" filterable clearable
<el-select
v-model="form.medicalPackageId"
placeholder="请选择"
filterable
clearable
@change="changeMedicalPackageId"
:disabled="form.customerOrgId === dict.personOrgId ? false : true">
<el-option v-for="item in dict.medicalPackage" :key="item.id" :label="item.displayName" :value="item.id" />
:disabled="
form.customerOrgId === dict.personOrgId ? false : true
"
>
<el-option
v-for="item in dict.medicalPackage"
:key="item.id"
:label="item.displayName"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
@ -306,7 +362,14 @@
</el-col>
<el-col :span="6">
<el-form-item label="创建时间">
<el-input :value="form.creationTime ? lmoment(form.creationTime, 'yyyy-MM-DD') :''" disabled></el-input>
<el-input
:value="
form.creationTime
? lmoment(form.creationTime, 'yyyy-MM-DD')
: ''
"
disabled
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
@ -316,7 +379,14 @@
</el-col>
<el-col :span="6">
<el-form-item label="修改时间">
<el-input :value="form.lastModificationTime ? lmoment(form.lastModificationTime, 'yyyy-MM-DD') : ''" disabled></el-input>
<el-input
:value="
form.lastModificationTime
? lmoment(form.lastModificationTime, 'yyyy-MM-DD')
: ''
"
disabled
></el-input>
</el-form-item>
</el-col>
</el-row>
@ -333,7 +403,7 @@
</div>
<!-- 按钮区域 -->
<div style="margin-left: 10px; display: flex;margin-top:10px">
<div style="margin-left: 10px; display: flex; margin-top: 10px">
<div class="btn">
<el-button @click="readIdCard">读身份证</el-button>
</div>
@ -403,7 +473,14 @@
<el-table-column prop="maritalStatusId" label="婚姻">
<template slot-scope="scope">
<div>
{{ ldddw(dict.maritalStatus,"id",scope.row.maritalStatusId,"displayName") }}
{{
ldddw(
dict.maritalStatus,
"id",
scope.row.maritalStatusId,
"displayName"
)
}}
</div>
</template>
</el-table-column>
@ -459,7 +536,7 @@ export default {
},
data() {
return {
apiurl:mm.apiurl,
apiurl: mm.apiurl,
form: {
id: "", //id
patientId: "00000000-0000-0000-0000-000000000000", //ID 00000-0000...
@ -478,7 +555,8 @@ export default {
personnelTypeId: null, //
jobPost: "", //
jobTitle: "", //
photo:"https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg", //
photo:
"https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg", //
salesman: "", //
sexHormoneTermId: null, //
isNameHide: "N", //
@ -552,15 +630,15 @@ export default {
},
//
changeCustomerOrgGroupId(){
this.patientRegister.customerOrgGroupChange++
changeCustomerOrgGroupId() {
this.patientRegister.customerOrgGroupChange++;
},
//
changeMedicalPackageId(){
this.patientRegister.medicalPackageChange++
},
changeMedicalPackageId() {
this.patientRegister.medicalPackageChange++;
},
//
query(param) {
//
@ -636,7 +714,9 @@ export default {
//
console.log("body.birthDate", body.birthDate);
if (body.birthDate) {
body.birthDate = moment(new Date(body.birthDate)).format("yyyy-MM-DD");
body.birthDate = moment(new Date(body.birthDate)).format(
"yyyy-MM-DD"
);
}
if (this.form.id.length < 1) {
@ -652,19 +732,24 @@ export default {
this.patientRegister.patientRegisterId = res.data.id;
this.patientRegister.patientRegisterRd = res.data;
this.patientRegister.query.times++;
this.patientRegister.saveTimes++
this.patientRegister.saveTimes++;
}
}
);
} else {
//id
console.log(`/api/app/patient-register?PatientRegisterId=${this.form.id}`,body);
putapi(`/api/app/patient-register?PatientRegisterId=${this.form.id}`,body)
.then((res) => {
console.log(
`/api/app/patient-register?PatientRegisterId=${this.form.id}`,
body
);
putapi(
`/api/app/patient-register?PatientRegisterId=${this.form.id}`,
body
).then((res) => {
if (res.code == 1) {
this.$message.success("更新 操作成功");
this.patientRegister.query.times++;
this.patientRegister.saveTimes++
this.patientRegister.saveTimes++;
}
});
}
@ -715,9 +800,14 @@ export default {
//
"patientRegister.patientRegisterRd.id"(newVal, oldVal) {
console.log('patientRegister.patientRegisterRd.id newVal:',newVal,' oldVal:',oldVal)
console.log(
"patientRegister.patientRegisterRd.id newVal:",
newVal,
" oldVal:",
oldVal
);
if (newVal != oldVal) {
console.log('newVal:',this.patientRegister.patientRegisterRd)
console.log("newVal:", this.patientRegister.patientRegisterRd);
objCopy(this.patientRegister.patientRegisterRd, this.form);
}
},
@ -734,7 +824,7 @@ export default {
};
</script>
<style scoped>
::v-deep .el-form-item{
::v-deep .el-form-item {
margin-bottom: -15px;
}
.btn {
@ -744,13 +834,13 @@ export default {
.photo {
position: absolute;
top: 100px;
right: 43%;
right: 42%;
/* width: 150px;
height: 150px; */
width: 150px;
height: 160px;
}
::v-deep .el-table--small .el-table__cell{
::v-deep .el-table--small .el-table__cell {
padding: 0px 0;
}
</style>

6
src/components/patientRegister/PatientRegisterItem.vue

@ -9,7 +9,7 @@
</div>
<div class="mainareaBox">
<el-table :header-cell-style="{ background: '#eef1f6' }" :data="dict.asbItem" height="350"
<el-table :header-cell-style="{ background: '#eef1f6' }" :data="dict.asbItem" height="200"
@selection-change="handleSelectionChange" size="small">
<el-table-column type="selection"></el-table-column>
<el-table-column label="未选组合项目" prop="displayName"></el-table-column>
@ -32,7 +32,7 @@
</div>
<div class="mainareaBox">
<el-table :data="patientRegister.patientRegisterAbs" height="350" :summary-method="getSummaries" show-summary
<el-table :data="patientRegister.patientRegisterAbs" height="200" :summary-method="getSummaries" show-summary
@selection-change="selecteditems" size="small">
<!-- temporaryselection personnelUnit.nogroupselected-->
<el-table-column type="selection"></el-table-column>
@ -625,7 +625,7 @@ export default {
<style scoped>
.mainareaBox {
border: 1px solid #000;
height: 350px;
height: 200px;
margin-top: 10px;
}

14
src/components/unitGrouping/unitGroupingTable.vue

@ -92,7 +92,11 @@
</el-col>
<el-col :span="8">
<el-form-item label="婚姻状况">
<el-select v-model="form.maritalStatusId" placeholder="请选择" style="width:100%">
<el-select
v-model="form.maritalStatusId"
placeholder="请选择"
style="width: 100%"
>
<el-option
v-for="item in maritalStatusId"
:key="item.id"
@ -277,7 +281,7 @@ export default {
this.form = res.data;
this.personnelUnit.form = res.data;
});
// //
// //
console.log(this.personnelUnit.form.id);
// getapi(
// `/api/app/customer-org-group-detail/customer-org-group-detail-in-asbitem/${this.personnelUnit.form.id}`
@ -293,7 +297,7 @@ export default {
this.obtainsuperior();
this.dialogVisible = true;
},
//
//
obtainsuperior() {
//
getapi("/api/app/sex").then((res) => {
@ -352,7 +356,7 @@ export default {
} else {
this.dialogVisible = true;
this.title = 1;
this.form={}
this.form = {};
this.obtainsuperior();
}
},
@ -360,7 +364,7 @@ export default {
};
</script>
<style scoped>
::v-deep .el-form-item{
::v-deep .el-form-item {
margin-bottom: 10px;
}
</style>

279
src/views/Home.vue

@ -3,8 +3,267 @@
<el-container style="background: ">
<el-header style="background-color: #ccc; line-height: 50px">
<div class="navs">
<div class="maintitle">神豚医疗信息系统</div>
<!-- <div class="maintitle">神豚医疗信息系统</div> -->
<div>
<el-dropdown>
<span class="el-dropdown-link">
用户权限管理<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item
@click.native="$router.push({ path: '/role' })"
>角色管理</el-dropdown-item
>
<el-dropdown-item
@click.native="$router.push({ path: '/user-list' })"
>用户管理</el-dropdown-item
>
<el-dropdown-item
@click.native="$router.push({ path: '/organization-units' })"
>组织架构</el-dropdown-item
>
<el-dropdown-item
@click.native="$router.push({ path: '/audit-log' })"
>安全日志</el-dropdown-item
>
</el-dropdown-menu>
</el-dropdown>
</div>
<!-- 基础字典 -->
<div style="margin-left: 1%" class="basicdictionany">
<el-dropdown>
<span class="el-dropdown-link">
基础字典<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item
@click.native="$router.push({ path: '/guide-type' })"
>导引类别</el-dropdown-item
>
<el-dropdown-item
@click.native="$router.push({ path: '/medical-report-type' })"
>体检报告类别</el-dropdown-item
>
<el-dropdown-item @click.native="$router.push({ path: '/sex' })"
>性别</el-dropdown-item
>
<el-dropdown-item
@click.native="$router.push({ path: '/marital-status' })"
>婚姻状况</el-dropdown-item
>
<el-dropdown-item
@click.native="$router.push({ path: '/nation' })"
>民族</el-dropdown-item
>
<el-dropdown-item
@click.native="$router.push({ path: '/birth-place' })"
>籍贯</el-dropdown-item
>
<el-dropdown-item
@click.native="$router.push({ path: '/result-status' })"
>结果状态</el-dropdown-item
>
<el-dropdown-item
@click.native="$router.push({ path: '/medical-type' })"
>体检类别</el-dropdown-item
>
<el-dropdown-item
@click.native="$router.push({ path: '/personnel-type' })"
>人员类别</el-dropdown-item
>
<el-dropdown-item
@click.native="$router.push({ path: '/device-type' })"
>仪器类别</el-dropdown-item
>
<el-dropdown-item
@click.native="$router.push({ path: '/sample-type' })"
>标本类型</el-dropdown-item
>
<el-dropdown-item
@click.native="$router.push({ path: '/unit' })"
>单位</el-dropdown-item
>
<el-dropdown-item
@click.native="$router.push({ path: '/diagnosis-postfix' })"
>诊断后缀</el-dropdown-item
>
<el-dropdown-item
@click.native="
$router.push({ path: '/medical-conclusion-type' })
"
>体检结论类别</el-dropdown-item
>
<el-dropdown-item
@click.native="$router.push({ path: '/medical-conclusion' })"
>体检结论</el-dropdown-item
>
<el-dropdown-item
@click.native="$router.push({ path: '/sample-container' })"
>标本容器</el-dropdown-item
>
<el-dropdown-item
@click.native="$router.push({ path: '/common-char-type' })"
>常用字符类别</el-dropdown-item
>
<el-dropdown-item
@click.native="$router.push({ path: '/common-char' })"
>常用字符</el-dropdown-item
>
<el-dropdown-item
@click.native="$router.push({ path: '/customer-org-type' })"
>客户单位类别</el-dropdown-item
>
<el-dropdown-item
@click.native="$router.push({ path: '/item-default-result' })"
>项目默认结果</el-dropdown-item
>
<el-dropdown-item
@click.native="$router.push({ path: '/diagnosis-level' })"
>诊断级别</el-dropdown-item
>
</el-dropdown-menu>
</el-dropdown>
</div>
<!-- 收费设置 -->
<div class="feesettings">
<el-dropdown>
<span class="el-dropdown-link">
收费设置<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item
@click.native="$router.push({ path: '/invoice-item-type' })"
>发票项目类别</el-dropdown-item
>
<el-dropdown-item
@click.native="$router.push({ path: '/pay-mode' })"
>支付方式</el-dropdown-item
>
</el-dropdown-menu>
</el-dropdown>
</div>
<!--常用设置 -->
<div class="commonsettings">
<el-dropdown>
<span class="el-dropdown-link">
常用设置<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item
@click.native="$router.push({ path: '/item-type' })"
>项目类别</el-dropdown-item
>
<el-dropdown-item
@click.native="$router.push({ path: '/sample-group' })"
>条码分组</el-dropdown-item
>
<el-dropdown-item
@click.native="$router.push({ path: '/asbitem' })"
>组和项目</el-dropdown-item
>
<el-dropdown-item
@click.native="$router.push({ path: '/item' })"
>项目</el-dropdown-item
>
<el-dropdown-item
@click.native="$router.push({ path: '/reference-range' })"
>参考范围</el-dropdown-item
>
<el-dropdown-item
@click.native="
$router.push({ path: '/sex-hormone-reference-range' })
"
>性激素参考范围</el-dropdown-item
>
<el-dropdown-item
@click.native="$router.push({ path: '/diagnosis' })"
>诊断</el-dropdown-item
>
<el-dropdown-item
@click.native="$router.push({ path: '/diagnosis-template' })"
>诊断模板</el-dropdown-item
>
<el-dropdown-item
@click.native="
$router.push({ path: '/item-result-template' })
"
>项目结果模板</el-dropdown-item
>
<el-dropdown-item
@click.native="$router.push({ path: '/item-result-match' })"
>项目结果匹配</el-dropdown-item
>
<el-dropdown-item
@click.native="$router.push({ path: '/item-template' })"
>项目模板</el-dropdown-item
>
<el-dropdown-item
@click.native="$router.push({ path: '/medical-package' })"
>套餐</el-dropdown-item
>
<el-dropdown-item
@click.native="$router.push({ path: '/sys-parm-type' })"
>系统参数</el-dropdown-item
>
</el-dropdown-menu>
</el-dropdown>
</div>
<!-- 体检登记 -->
<div class="examinationregistration" style="margin-left: 1%">
<el-dropdown>
<span class="el-dropdown-link">
体检登记<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item
@click.native="$router.push({ path: '/customerOrg' })"
>体检单位设置</el-dropdown-item
>
<el-dropdown-item
@click.native="$router.push({ path: '/customerOrgGroup' })"
>单位分组设置</el-dropdown-item
>
<el-dropdown-item
@click.native="$router.push({ path: '/patientRegister' })"
>体检人员登记</el-dropdown-item
>
<el-dropdown-item
@click.native="$router.push({ path: '/patientRegisterSign' })"
>体检人员签到</el-dropdown-item
>
<el-dropdown-item
@click.native="
$router.push({ path: '/patientRegisterRecover' })
"
>体检表回收</el-dropdown-item
>
<el-dropdown-item
@click.native="
$router.push({ path: '/patientRegisterRefuse' })
"
>弃检登记</el-dropdown-item
>
</el-dropdown-menu>
</el-dropdown>
</div>
<!-- 体检 -->
<div class="physicalexamination" style="margin-left: 1%">
<el-dropdown>
<span class="el-dropdown-link">
体检<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item
@click.native="$router.push({ path: '/doctorCheck' })"
>体检医生诊台</el-dropdown-item
>
<el-dropdown-item
@click.native="$router.push({ path: '/sumDoctorCheck' })"
>总检医生诊台</el-dropdown-item
>
</el-dropdown-menu>
</el-dropdown>
</div>
<div class="btn">
当前用户{{ user }}
<el-dropdown>
@ -23,7 +282,7 @@
</el-header>
<el-container>
<el-aside :width="isCollapse ? '64px' : '220px'">
<!-- <el-aside :width="isCollapse ? '64px' : '220px'">
<el-menu
style="height: 100%"
default-active="2"
@ -228,12 +487,8 @@
</el-menu-item>
</el-submenu>
</el-menu>
</el-aside>
</el-aside> -->
<el-main>
<!-- Main -->
<!-- <el-card>
<el-button type="primary" @click="btn">主要按钮</el-button>
</el-card> -->
<router-view></router-view>
</el-main>
</el-container>
@ -270,6 +525,12 @@ export default {
};
</script>
<style scoped>
.commonsettings {
margin-left: 1%;
}
.feesettings {
margin-left: 1%;
}
.el-menu {
border-right: none;
}
@ -313,7 +574,7 @@ export default {
}
.btn {
margin-right: 5%;
margin-left: 60%;
}
.collapseandunfoled {

2
src/views/basic-dictionary/MaritalStatus.vue

@ -63,7 +63,7 @@
</el-card>
</div>
<!-- 按钮区域 -->
<div style="margin-left: 0px; margin-top: 5%">
<div style="margin-left: 1%; margin-top: 5%">
<el-button type="primary" @click="editreport" style="margin-left: 0px"
>编辑</el-button
>

Loading…
Cancel
Save