Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
e539997c6f
@ -7,7 +7,7 @@
|
|||||||
:mode="mode"
|
:mode="mode"
|
||||||
/>
|
/>
|
||||||
<Editor
|
<Editor
|
||||||
style="height: 500px; overflow-y: hidden; line-height: 32px;"
|
style="height: 500px; overflow-y: hidden;"
|
||||||
v-model="html"
|
v-model="html"
|
||||||
:defaultConfig="editorConfig"
|
:defaultConfig="editorConfig"
|
||||||
:mode="mode"
|
:mode="mode"
|
||||||
@ -104,7 +104,12 @@ import { getToken } from "@/utils/auth";
|
|||||||
|
|
||||||
var that;
|
var that;
|
||||||
export default {
|
export default {
|
||||||
props: ["nodeContent", "taskPartitionDictId", "taskSubdivision","specialDiseaseNodeId"],
|
props: [
|
||||||
|
"nodeContent",
|
||||||
|
"taskPartitionDictId",
|
||||||
|
"taskSubdivision",
|
||||||
|
"specialDiseaseNodeId",
|
||||||
|
],
|
||||||
components: { Editor, Toolbar },
|
components: { Editor, Toolbar },
|
||||||
name: "wangEditor",
|
name: "wangEditor",
|
||||||
data() {
|
data() {
|
||||||
@ -215,7 +220,11 @@ export default {
|
|||||||
return res;
|
return res;
|
||||||
},
|
},
|
||||||
emit() {
|
emit() {
|
||||||
this.$emit("on-nodeContent", { nodeContent: this.html,taskSubdivision:this.taskSubdivision,specialDiseaseNodeId:this.specialDiseaseNodeId });
|
this.$emit("on-nodeContent", {
|
||||||
|
nodeContent: this.html,
|
||||||
|
taskSubdivision: this.taskSubdivision,
|
||||||
|
specialDiseaseNodeId: this.specialDiseaseNodeId,
|
||||||
|
});
|
||||||
},
|
},
|
||||||
panelchange(value) {
|
panelchange(value) {
|
||||||
this.addlist = [];
|
this.addlist = [];
|
||||||
@ -235,8 +244,8 @@ export default {
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
labelclick() {
|
labelclick() {
|
||||||
this.labelshow = false;
|
|
||||||
this.editor.focus();
|
this.editor.focus();
|
||||||
|
this.labelshow = false;
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
if (this.modify) {
|
if (this.modify) {
|
||||||
this.modify = false;
|
this.modify = false;
|
||||||
@ -254,12 +263,16 @@ export default {
|
|||||||
};
|
};
|
||||||
this.editor.insertNode(resume);
|
this.editor.insertNode(resume);
|
||||||
});
|
});
|
||||||
|
|
||||||
++this.isResouceShow;
|
++this.isResouceShow;
|
||||||
this.selectedOptions = [];
|
this.selectedOptions = [];
|
||||||
this.addlist = [];
|
this.addlist = [];
|
||||||
|
console.log(this.html,'this.html')
|
||||||
|
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
this.editor.focus();
|
console.log(22222222)
|
||||||
|
this. editor.focus({ toEnd: true });
|
||||||
|
// this.editor.focus();
|
||||||
|
this.$forceUpdate()
|
||||||
}, 30);
|
}, 30);
|
||||||
}, 100);
|
}, 100);
|
||||||
},
|
},
|
||||||
@ -324,7 +337,6 @@ export default {
|
|||||||
// });
|
// });
|
||||||
if (res) {
|
if (res) {
|
||||||
this.labeloptions = res;
|
this.labeloptions = res;
|
||||||
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -352,7 +364,7 @@ export default {
|
|||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
nodeContent(newValue, oldValue) {
|
nodeContent(newValue, oldValue) {
|
||||||
console.log(newValue,'newValue')
|
// console.log(newValue,'newValue')
|
||||||
this.html = newValue;
|
this.html = newValue;
|
||||||
},
|
},
|
||||||
taskSubdivision(newvalue, oldvalue) {
|
taskSubdivision(newvalue, oldvalue) {
|
||||||
@ -362,14 +374,13 @@ export default {
|
|||||||
console.log(newvalue, "specialDiseaseNodeId");
|
console.log(newvalue, "specialDiseaseNodeId");
|
||||||
|
|
||||||
this.specialDiseaseNodeId = newvalue;
|
this.specialDiseaseNodeId = newvalue;
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|
||||||
taskPartitionDictId(newValue, oldValue) {
|
taskPartitionDictId(newValue, oldValue) {
|
||||||
console.log(newValue, "taskPartitionDictId");
|
console.log(newValue, "taskPartitionDictId");
|
||||||
// this.labeloptions = [];
|
// this.labeloptions = [];
|
||||||
this.taskPartitionDictId = newValue;
|
that.taskPartitionDictId = newValue;
|
||||||
this.info();
|
that.info();
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
@ -479,8 +490,11 @@ function withAttachment(editor) {
|
|||||||
const { isInline, isVoid } = editor;
|
const { isInline, isVoid } = editor;
|
||||||
const newEditor = editor;
|
const newEditor = editor;
|
||||||
newEditor.isInline = (elem) => {
|
newEditor.isInline = (elem) => {
|
||||||
|
// console.log(elem,'elem')
|
||||||
const type = DomEditor.getNodeType(elem);
|
const type = DomEditor.getNodeType(elem);
|
||||||
if (type === "attachment") return false; // 针对 type: attachment ,设置为 inline
|
// console.log(type,'type')
|
||||||
|
|
||||||
|
if (type === "attachment") return true; // 针对 type: attachment ,设置为 inline
|
||||||
if (type === "attachmenttwo") return true; // 针对 type: attachment ,设置为 inline
|
if (type === "attachmenttwo") return true; // 针对 type: attachment ,设置为 inline
|
||||||
return isInline(elem);
|
return isInline(elem);
|
||||||
};
|
};
|
||||||
@ -571,6 +585,7 @@ function renderAttachment(elem, children, editor) {
|
|||||||
props: { contentEditable: false }, // HTML 属性,驼峰式写法
|
props: { contentEditable: false }, // HTML 属性,驼峰式写法
|
||||||
style: {
|
style: {
|
||||||
color: "#fff",
|
color: "#fff",
|
||||||
|
margin: "0 0 0 20px",
|
||||||
background: "#009A82",
|
background: "#009A82",
|
||||||
padding: "5px 10px" /* 其他... */,
|
padding: "5px 10px" /* 其他... */,
|
||||||
}, // style ,驼峰式写法
|
}, // style ,驼峰式写法
|
||||||
@ -731,7 +746,7 @@ function attachmentToHtml(elem, childrenHtml) {
|
|||||||
data-fieldMark="${fieldMark}"
|
data-fieldMark="${fieldMark}"
|
||||||
data-fileName="${fileName}">
|
data-fileName="${fileName}">
|
||||||
<span class="path-tag-wrap">
|
<span class="path-tag-wrap">
|
||||||
<span>${fileName}</span>
|
<span class="finame">${fileName}</span>
|
||||||
<span>${fileSpan}</span>
|
<span>${fileSpan}</span>
|
||||||
</span>
|
</span>
|
||||||
</span>`;
|
</span>`;
|
||||||
@ -836,39 +851,42 @@ Boot.registerModule(parseHtmlConfmodule);
|
|||||||
::v-deep .el-textarea__inner {
|
::v-deep .el-textarea__inner {
|
||||||
color: black !important;
|
color: black !important;
|
||||||
background-color: #fff !important;
|
background-color: #fff !important;
|
||||||
cursor: default !important
|
cursor: default !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.path-tag-wrap {
|
.path-tag-wrap {
|
||||||
font-size: 18px;
|
font-size: 10px;
|
||||||
line-height: 32px;
|
line-height: 32px;
|
||||||
border-radius: 5px;
|
border-radius: 5px;
|
||||||
|
margin-left: 20px;
|
||||||
}
|
}
|
||||||
|
.finame{
|
||||||
|
margin-left: 20px
|
||||||
|
;
|
||||||
|
}
|
||||||
|
::v-deep .el-textarea__inner {
|
||||||
|
color: black !important;
|
||||||
|
background-color: #fff !important;
|
||||||
|
cursor: default !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
// .path-tag-wrap {
|
||||||
|
// font-size: 18px;
|
||||||
|
// line-height: 32px;
|
||||||
|
// border-radius: 5px;
|
||||||
|
// }
|
||||||
|
|
||||||
::v-deep .el-textarea__inner {
|
::v-deep .el-textarea__inner {
|
||||||
color: black !important;
|
color: black !important;
|
||||||
background-color: #fff !important;
|
background-color: #fff !important;
|
||||||
cursor: default !important
|
cursor: default !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.path-tag-wrap {
|
// .path-tag-wrap {
|
||||||
font-size: 18px;
|
// font-size: 18px;
|
||||||
line-height: 32px;
|
// line-height: 32px;
|
||||||
border-radius: 5px;
|
// border-radius: 5px;
|
||||||
}
|
// }
|
||||||
|
|
||||||
|
|
||||||
::v-deep .el-textarea__inner {
|
|
||||||
color: black !important;
|
|
||||||
background-color: #fff !important;
|
|
||||||
cursor: default !important
|
|
||||||
}
|
|
||||||
|
|
||||||
.path-tag-wrap {
|
|
||||||
font-size: 18px;
|
|
||||||
line-height: 32px;
|
|
||||||
border-radius: 5px;
|
|
||||||
}
|
|
||||||
</style>
|
</style>
|
||||||
// ::v-deep .el-textarea__inner {
|
// ::v-deep .el-textarea__inner {
|
||||||
// color: black !important;
|
// color: black !important;
|
||||||
|
|||||||
@ -1,13 +1,23 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="app-container" ref="layout">
|
<div class="app-container" ref="layout">
|
||||||
<el-row :gutter="20">
|
<el-row :gutter="20">
|
||||||
<el-col :span="5" :xs="24" style="height:calc(100vh - 124px);">
|
<el-col :span="5" :xs="24" style="height: calc(100vh - 124px)">
|
||||||
<div class="left" ref="box">
|
<div class="left" ref="box">
|
||||||
<div class="name">科室名称</div>
|
<div class="name">科室名称</div>
|
||||||
<div>
|
<div>
|
||||||
<el-input v-model="name" placeholder="请输入科室名称" clearable @keyup.enter.native="handleQuery" />
|
<el-input
|
||||||
|
v-model="name"
|
||||||
|
placeholder="请输入科室名称"
|
||||||
|
clearable
|
||||||
|
@keyup.enter.native="handleQuery"
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div class="listitem" v-for="(item, index) in DepartmentoList" :key="index" @click="itemdata(item)">
|
<div
|
||||||
|
class="listitem"
|
||||||
|
v-for="(item, index) in DepartmentoList"
|
||||||
|
:key="index"
|
||||||
|
@click="itemdata(item)"
|
||||||
|
>
|
||||||
<div :class="itemname == item.id ? 'allactive' : 'all'">
|
<div :class="itemname == item.id ? 'allactive' : 'all'">
|
||||||
{{ item.departmentName }}
|
{{ item.departmentName }}
|
||||||
</div>
|
</div>
|
||||||
@ -17,8 +27,14 @@
|
|||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="19" :xs="24">
|
<el-col :span="19" :xs="24">
|
||||||
<div ref="topform" class="form">
|
<div ref="topform" class="form">
|
||||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
|
<el-form
|
||||||
label-width="68px">
|
:model="queryParams"
|
||||||
|
ref="queryForm"
|
||||||
|
size="small"
|
||||||
|
:inline="true"
|
||||||
|
v-show="showSearch"
|
||||||
|
label-width="68px"
|
||||||
|
>
|
||||||
<!-- <el-form-item label="所属科室id" prop="departmentId">
|
<!-- <el-form-item label="所属科室id" prop="departmentId">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="queryParams.departmentId"
|
v-model="queryParams.departmentId"
|
||||||
@ -36,8 +52,13 @@
|
|||||||
/>
|
/>
|
||||||
</el-form-item> -->
|
</el-form-item> -->
|
||||||
<el-form-item label="病种名称" prop="diseaseTypeName">
|
<el-form-item label="病种名称" prop="diseaseTypeName">
|
||||||
<el-input maxlength="50" v-model="queryParams.diseaseTypeName" placeholder="请输入病种名称" clearable
|
<el-input
|
||||||
@keyup.enter.native="handleQuery" />
|
maxlength="50"
|
||||||
|
v-model="queryParams.diseaseTypeName"
|
||||||
|
placeholder="请输入病种名称"
|
||||||
|
clearable
|
||||||
|
@keyup.enter.native="handleQuery"
|
||||||
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<!-- <el-form-item label="病种代码" prop="diseaseTypeCode">
|
<!-- <el-form-item label="病种代码" prop="diseaseTypeCode">
|
||||||
<el-input
|
<el-input
|
||||||
@ -64,35 +85,80 @@
|
|||||||
/>
|
/>
|
||||||
</el-form-item> -->
|
</el-form-item> -->
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
<el-button
|
||||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
type="primary"
|
||||||
|
icon="el-icon-search"
|
||||||
|
size="mini"
|
||||||
|
@click="handleQuery"
|
||||||
|
>搜索</el-button
|
||||||
|
>
|
||||||
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
|
||||||
|
>重置</el-button
|
||||||
|
>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
</div>
|
</div>
|
||||||
<div ref="mb8" class="mb8">
|
<div ref="mb8" class="mb8">
|
||||||
<el-row :gutter="10" class="">
|
<el-row :gutter="10" class="">
|
||||||
<el-col :span="1.5">
|
<el-col :span="1.5">
|
||||||
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
|
<el-button
|
||||||
v-hasPermi="['system:departmentDisease:add']">新增</el-button>
|
type="primary"
|
||||||
|
plain
|
||||||
|
icon="el-icon-plus"
|
||||||
|
size="mini"
|
||||||
|
@click="handleAdd"
|
||||||
|
v-hasPermi="['system:departmentDisease:add']"
|
||||||
|
>新增</el-button
|
||||||
|
>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="1.5">
|
<el-col :span="1.5">
|
||||||
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
|
<el-button
|
||||||
v-hasPermi="['system:departmentDisease:edit']">修改</el-button>
|
type="success"
|
||||||
|
plain
|
||||||
|
icon="el-icon-edit"
|
||||||
|
size="mini"
|
||||||
|
:disabled="single"
|
||||||
|
@click="handleUpdate"
|
||||||
|
v-hasPermi="['system:departmentDisease:edit']"
|
||||||
|
>修改</el-button
|
||||||
|
>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="1.5">
|
<el-col :span="1.5">
|
||||||
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
|
<el-button
|
||||||
@click="handleDelete" v-hasPermi="['system:departmentDisease:remove']">删除</el-button>
|
type="danger"
|
||||||
|
plain
|
||||||
|
icon="el-icon-delete"
|
||||||
|
size="mini"
|
||||||
|
:disabled="multiple"
|
||||||
|
@click="handleDelete"
|
||||||
|
v-hasPermi="['system:departmentDisease:remove']"
|
||||||
|
>删除</el-button
|
||||||
|
>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="1.5">
|
<el-col :span="1.5">
|
||||||
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
|
<el-button
|
||||||
v-hasPermi="['system:departmentDisease:export']">导出</el-button>
|
type="warning"
|
||||||
|
plain
|
||||||
|
icon="el-icon-download"
|
||||||
|
size="mini"
|
||||||
|
@click="handleExport"
|
||||||
|
v-hasPermi="['system:departmentDisease:export']"
|
||||||
|
>导出</el-button
|
||||||
|
>
|
||||||
</el-col>
|
</el-col>
|
||||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
<right-toolbar
|
||||||
|
:showSearch.sync="showSearch"
|
||||||
|
@queryTable="getList"
|
||||||
|
></right-toolbar>
|
||||||
</el-row>
|
</el-row>
|
||||||
</div>
|
</div>
|
||||||
<div ref="table">
|
<div ref="table">
|
||||||
<el-table :max-height="maxTableHeight" v-loading="loading" :data="departmentDiseaseList"
|
<el-table
|
||||||
@selection-change="handleSelectionChange">
|
:max-height="maxTableHeight"
|
||||||
|
v-loading="loading"
|
||||||
|
:data="departmentDiseaseList"
|
||||||
|
@selection-change="handleSelectionChange"
|
||||||
|
>
|
||||||
<el-table-column type="selection" width="55" align="center" />
|
<el-table-column type="selection" width="55" align="center" />
|
||||||
<!-- <el-table-column label="主键id" align="center" prop="id" /> -->
|
<!-- <el-table-column label="主键id" align="center" prop="id" /> -->
|
||||||
<!-- <el-table-column
|
<!-- <el-table-column
|
||||||
@ -100,42 +166,90 @@
|
|||||||
align="center"
|
align="center"
|
||||||
prop="departmentId"
|
prop="departmentId"
|
||||||
/> -->
|
/> -->
|
||||||
<el-table-column label="所属科室名称" align="center" prop="departmentName" />
|
<el-table-column
|
||||||
<el-table-column label="病种名称" align="center" prop="diseaseTypeName" />
|
label="病种名称"
|
||||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
align="center"
|
||||||
|
prop="diseaseTypeName"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<el-table-column
|
||||||
|
label="所属科室名称"
|
||||||
|
align="center"
|
||||||
|
prop="departmentName"
|
||||||
|
/>
|
||||||
|
<el-table-column
|
||||||
|
label="操作"
|
||||||
|
align="center"
|
||||||
|
class-name="small-padding fixed-width"
|
||||||
|
>
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
|
<el-button
|
||||||
v-hasPermi="['system:departmentDisease:edit']">修改</el-button>
|
size="mini"
|
||||||
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
|
type="text"
|
||||||
v-hasPermi="['system:departmentDisease:remove']">删除</el-button>
|
icon="el-icon-edit"
|
||||||
|
@click="handleUpdate(scope.row)"
|
||||||
|
v-hasPermi="['system:departmentDisease:edit']"
|
||||||
|
>修改</el-button
|
||||||
|
>
|
||||||
|
<el-button
|
||||||
|
size="mini"
|
||||||
|
type="text"
|
||||||
|
icon="el-icon-delete"
|
||||||
|
@click="handleDelete(scope.row)"
|
||||||
|
v-hasPermi="['system:departmentDisease:remove']"
|
||||||
|
>删除</el-button
|
||||||
|
>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
</div>
|
</div>
|
||||||
<!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
|
<!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
|
||||||
@pagination="getList" /> -->
|
@pagination="getList" /> -->
|
||||||
<myPagination v-show="total > 0" :total="total" :pageSize="queryParams.pageSize"
|
<myPagination
|
||||||
:indexFromWrap="queryParams.pageNum" @updateCPage="updateCPage"></myPagination>
|
v-show="total > 0"
|
||||||
|
:total="total"
|
||||||
|
:pageSize="queryParams.pageSize"
|
||||||
|
:indexFromWrap="queryParams.pageNum"
|
||||||
|
@updateCPage="updateCPage"
|
||||||
|
></myPagination>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<!-- 添加或修改科室病种信息对话框 -->
|
<!-- 添加或修改科室病种信息对话框 -->
|
||||||
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
|
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
|
||||||
<el-form ref="form" :model="form" :rules="rules" label-width="100px" :inline="true">
|
<el-form
|
||||||
|
ref="form"
|
||||||
|
:model="form"
|
||||||
|
:rules="rules"
|
||||||
|
label-width="100px"
|
||||||
|
:inline="true"
|
||||||
|
>
|
||||||
<el-form-item label="所属科室" prop="departmentId">
|
<el-form-item label="所属科室" prop="departmentId">
|
||||||
<el-button type="" v-if="form.departmentName == '请选择科室'" @click="clickinnerVisible()" style="
|
<el-button
|
||||||
|
type=""
|
||||||
|
v-if="form.departmentName == '请选择科室'"
|
||||||
|
@click="clickinnerVisible()"
|
||||||
|
style="
|
||||||
width: 250px;
|
width: 250px;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
height: 36px;
|
height: 36px;
|
||||||
color: #c0c4cc;
|
color: #c0c4cc;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
">{{ form.departmentName }}</el-button>
|
"
|
||||||
<el-button @click="clickinnerVisible()" type="" v-else style="
|
>{{ form.departmentName }}</el-button
|
||||||
|
>
|
||||||
|
<el-button
|
||||||
|
@click="clickinnerVisible()"
|
||||||
|
type=""
|
||||||
|
v-else
|
||||||
|
style="
|
||||||
width: 250px;
|
width: 250px;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
height: 36px;
|
height: 36px;
|
||||||
padding-left: -10px;
|
padding-left: -10px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
">{{ form.departmentName }}</el-button>
|
"
|
||||||
|
>{{ form.departmentName }}</el-button
|
||||||
|
>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<!-- <el-form-item label="所属科室" prop="departmentId">
|
<!-- <el-form-item label="所属科室" prop="departmentId">
|
||||||
|
|
||||||
@ -145,18 +259,32 @@
|
|||||||
<el-input v-model="form.departmentName" placeholder="请输入所属科室名称" />
|
<el-input v-model="form.departmentName" placeholder="请输入所属科室名称" />
|
||||||
</el-form-item> -->
|
</el-form-item> -->
|
||||||
<el-form-item label="病种名称" prop="diseaseTypeName">
|
<el-form-item label="病种名称" prop="diseaseTypeName">
|
||||||
<el-input style="width: 250px" v-model="form.diseaseTypeName" placeholder="请输入病种名称" />
|
<el-input
|
||||||
|
style="width: 250px"
|
||||||
|
v-model="form.diseaseTypeName"
|
||||||
|
placeholder="请输入病种名称"
|
||||||
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<!-- <el-form-item label="病种代码" prop="diseaseTypeCode">
|
<!-- <el-form-item label="病种代码" prop="diseaseTypeCode">
|
||||||
<el-input v-model="form.diseaseTypeCode" placeholder="请输入病种代码" />
|
<el-input v-model="form.diseaseTypeCode" placeholder="请输入病种代码" />
|
||||||
</el-form-item> -->
|
</el-form-item> -->
|
||||||
<el-form-item label="对应诊断信息" prop="diagnosisInfo">
|
<el-form-item label="对应诊断信息" prop="diagnosisInfo">
|
||||||
<el-input type="textarea" maxlength="300" style="width: 610px" v-model="form.diagnosisInfo"
|
<el-input
|
||||||
placeholder="请输入对应诊断信息" />
|
type="textarea"
|
||||||
|
maxlength="300"
|
||||||
|
style="width: 610px"
|
||||||
|
v-model="form.diagnosisInfo"
|
||||||
|
placeholder="请输入对应诊断信息"
|
||||||
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="病种概述" prop="diseaseTypeRemark ">
|
<el-form-item label="病种概述" prop="diseaseTypeRemark ">
|
||||||
<el-input type="textarea" maxlength="200" style="width: 610px" v-model="form.diseaseTypeRemark"
|
<el-input
|
||||||
placeholder="请输入病种概述" />
|
type="textarea"
|
||||||
|
maxlength="200"
|
||||||
|
style="width: 610px"
|
||||||
|
v-model="form.diseaseTypeRemark"
|
||||||
|
placeholder="请输入病种概述"
|
||||||
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|
||||||
<!-- <el-button
|
<!-- <el-button
|
||||||
@ -177,10 +305,24 @@
|
|||||||
</div>
|
</div>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
<!-- 导入 -->
|
<!-- 导入 -->
|
||||||
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
|
<el-dialog
|
||||||
<el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url"
|
:title="upload.title"
|
||||||
:disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess"
|
:visible.sync="upload.open"
|
||||||
:auto-upload="false" drag>
|
width="400px"
|
||||||
|
append-to-body
|
||||||
|
>
|
||||||
|
<el-upload
|
||||||
|
ref="upload"
|
||||||
|
:limit="1"
|
||||||
|
accept=".xlsx, .xls"
|
||||||
|
:headers="upload.headers"
|
||||||
|
:action="upload.url"
|
||||||
|
:disabled="upload.isUploading"
|
||||||
|
:on-progress="handleFileUploadProgress"
|
||||||
|
:on-success="handleFileSuccess"
|
||||||
|
:auto-upload="false"
|
||||||
|
drag
|
||||||
|
>
|
||||||
<i class="el-icon-upload"></i>
|
<i class="el-icon-upload"></i>
|
||||||
<div class="el-upload__text">
|
<div class="el-upload__text">
|
||||||
将文件拖到此处,或
|
将文件拖到此处,或
|
||||||
@ -188,8 +330,13 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="el-upload__tip text-center" slot="tip">
|
<div class="el-upload__tip text-center" slot="tip">
|
||||||
<span>仅允许导入xls、xlsx格式文件。</span>
|
<span>仅允许导入xls、xlsx格式文件。</span>
|
||||||
<el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
|
<el-link
|
||||||
@click="importTemplate">下载模板</el-link>
|
type="primary"
|
||||||
|
:underline="false"
|
||||||
|
style="font-size: 12px; vertical-align: baseline"
|
||||||
|
@click="importTemplate"
|
||||||
|
>下载模板</el-link
|
||||||
|
>
|
||||||
</div>
|
</div>
|
||||||
</el-upload>
|
</el-upload>
|
||||||
<div slot="footer" class="dialog-footer">
|
<div slot="footer" class="dialog-footer">
|
||||||
@ -198,34 +345,84 @@
|
|||||||
</div>
|
</div>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
<!-- 科室弹框 -->
|
<!-- 科室弹框 -->
|
||||||
<el-dialog title="" :visible.sync="innerVisibleshow" width="1000px" append-to-body
|
<el-dialog
|
||||||
:before-close="innerVisiblecancel">
|
title=""
|
||||||
<el-form ref="queryForm" :model="informationqueryParams" :rules="rules" label-width="80px" :inline="true">
|
:visible.sync="innerVisibleshow"
|
||||||
|
width="1000px"
|
||||||
|
append-to-body
|
||||||
|
:before-close="innerVisiblecancel"
|
||||||
|
>
|
||||||
|
<el-form
|
||||||
|
ref="queryForm"
|
||||||
|
:model="informationqueryParams"
|
||||||
|
:rules="rules"
|
||||||
|
label-width="80px"
|
||||||
|
:inline="true"
|
||||||
|
>
|
||||||
<el-form-item label="科室名称" prop="departmentName" label-width="120">
|
<el-form-item label="科室名称" prop="departmentName" label-width="120">
|
||||||
<el-input v-model="informationqueryParams.departmentName" placeholder="请输入科室名称" clearable />
|
<el-input
|
||||||
|
v-model="informationqueryParams.departmentName"
|
||||||
|
placeholder="请输入科室名称"
|
||||||
|
clearable
|
||||||
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="informationInfoinfo">搜索</el-button>
|
<el-button
|
||||||
<el-button icon="el-icon-refresh" size="mini" @click="addresetQuerylist">重置</el-button>
|
type="primary"
|
||||||
|
icon="el-icon-search"
|
||||||
|
size="mini"
|
||||||
|
@click="informationInfoinfo"
|
||||||
|
>搜索</el-button
|
||||||
|
>
|
||||||
|
<el-button
|
||||||
|
icon="el-icon-refresh"
|
||||||
|
size="mini"
|
||||||
|
@click="addresetQuerylist"
|
||||||
|
>重置</el-button
|
||||||
|
>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
|
|
||||||
<el-table :data="infolist" @cell-dblclick="nurseclick" v-loading="loading">
|
<el-table
|
||||||
|
:data="infolist"
|
||||||
|
@cell-dblclick="nurseclick"
|
||||||
|
v-loading="loading"
|
||||||
|
>
|
||||||
<el-table-column label="请选择" width="150" align="center">
|
<el-table-column label="请选择" width="150" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-button type="primary" style="width: 15px; height: 15px" v-if="form.departmentId == scope.row.id" circle
|
<el-button
|
||||||
@click="nurseclick(scope.row)"></el-button>
|
type="primary"
|
||||||
<el-button v-else style="width: 15px; height: 15px" circle @click="nurseclick(scope.row)"></el-button>
|
style="width: 15px; height: 15px"
|
||||||
|
v-if="form.departmentId == scope.row.id"
|
||||||
|
circle
|
||||||
|
@click="nurseclick(scope.row)"
|
||||||
|
></el-button>
|
||||||
|
<el-button
|
||||||
|
v-else
|
||||||
|
style="width: 15px; height: 15px"
|
||||||
|
circle
|
||||||
|
@click="nurseclick(scope.row)"
|
||||||
|
></el-button>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column property="departmentName" label="科室名称" align="center" :show-overflow-tooltip="true">
|
<el-table-column
|
||||||
|
property="departmentName"
|
||||||
|
label="科室名称"
|
||||||
|
align="center"
|
||||||
|
:show-overflow-tooltip="true"
|
||||||
|
>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
<!-- <pagination v-show="totaldepartment > 0" :total="totaldepartment" :page.sync="informationqueryParams.pageNum"
|
<!-- <pagination v-show="totaldepartment > 0" :total="totaldepartment" :page.sync="informationqueryParams.pageNum"
|
||||||
:limit.sync="informationqueryParams.pageSize" @pagination="informationInfoinfo" /> -->
|
:limit.sync="informationqueryParams.pageSize" @pagination="informationInfoinfo" /> -->
|
||||||
<myPagination v-show="totaldepartment > 0" :total="totaldepartment" :pageSize="informationqueryParams.pageSize"
|
<myPagination
|
||||||
:indexFromWrap="informationqueryParams.pageNum" @updateCPage="updateCPagetwo"></myPagination>
|
v-show="totaldepartment > 0"
|
||||||
|
:total="totaldepartment"
|
||||||
|
:pageSize="informationqueryParams.pageSize"
|
||||||
|
:indexFromWrap="informationqueryParams.pageNum"
|
||||||
|
@updateCPage="updateCPagetwo"
|
||||||
|
></myPagination>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@ -332,8 +529,8 @@ export default {
|
|||||||
this.infolists();
|
this.infolists();
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
this.getMaxTableHeight()
|
this.getMaxTableHeight();
|
||||||
this.screenChange()
|
this.screenChange();
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
name(val) {
|
name(val) {
|
||||||
@ -492,7 +689,7 @@ export default {
|
|||||||
},
|
},
|
||||||
/** 重置按钮操作 */
|
/** 重置按钮操作 */
|
||||||
resetQuery() {
|
resetQuery() {
|
||||||
this.queryParams.diseaseTypeName = ''
|
this.queryParams.diseaseTypeName = "";
|
||||||
this.resetForm("queryForm");
|
this.resetForm("queryForm");
|
||||||
this.handleQuery();
|
this.handleQuery();
|
||||||
},
|
},
|
||||||
@ -530,17 +727,16 @@ export default {
|
|||||||
this.$modal.msgSuccess("修改成功");
|
this.$modal.msgSuccess("修改成功");
|
||||||
this.open = false;
|
this.open = false;
|
||||||
this.getList();
|
this.getList();
|
||||||
this.departmentName = ''
|
this.departmentName = "";
|
||||||
this.infolists()
|
this.infolists();
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
addDepartmentDisease(this.form).then((response) => {
|
addDepartmentDisease(this.form).then((response) => {
|
||||||
this.$modal.msgSuccess("新增成功");
|
this.$modal.msgSuccess("新增成功");
|
||||||
this.open = false;
|
this.open = false;
|
||||||
this.getList();
|
this.getList();
|
||||||
this.departmentName = ''
|
this.departmentName = "";
|
||||||
this.infolists()
|
this.infolists();
|
||||||
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -556,8 +752,8 @@ export default {
|
|||||||
})
|
})
|
||||||
.then(() => {
|
.then(() => {
|
||||||
this.getList();
|
this.getList();
|
||||||
this.departmentName = ''
|
this.departmentName = "";
|
||||||
this.infolists()
|
this.infolists();
|
||||||
|
|
||||||
this.$modal.msgSuccess("删除成功");
|
this.$modal.msgSuccess("删除成功");
|
||||||
})
|
})
|
||||||
@ -574,37 +770,38 @@ export default {
|
|||||||
);
|
);
|
||||||
},
|
},
|
||||||
updateCPage(index, size) {
|
updateCPage(index, size) {
|
||||||
this.queryParams.pageNum = index
|
this.queryParams.pageNum = index;
|
||||||
this.queryParams.pageSize = size
|
this.queryParams.pageSize = size;
|
||||||
this.getList();
|
this.getList();
|
||||||
},
|
},
|
||||||
updateCPagetwo(index, size) {
|
updateCPagetwo(index, size) {
|
||||||
this.informationqueryParams.pageNum = index
|
this.informationqueryParams.pageNum = index;
|
||||||
this.informationqueryParams.pageSize = size
|
this.informationqueryParams.pageSize = size;
|
||||||
this.informationInfoinfo();
|
this.informationInfoinfo();
|
||||||
},
|
},
|
||||||
// 获取表格最高高度
|
// 获取表格最高高度
|
||||||
getMaxTableHeight() {
|
getMaxTableHeight() {
|
||||||
const windowInnerHeight = window.innerHeight // 屏幕可视高度
|
const windowInnerHeight = window.innerHeight; // 屏幕可视高度
|
||||||
const layoutDiv = this.$refs.layout
|
const layoutDiv = this.$refs.layout;
|
||||||
const formDiv = this.$refs.topform
|
const formDiv = this.$refs.topform;
|
||||||
const mb8Div = this.$refs.mb8
|
const mb8Div = this.$refs.mb8;
|
||||||
this.maxTableHeight =
|
this.maxTableHeight =
|
||||||
windowInnerHeight - 134 -
|
windowInnerHeight -
|
||||||
|
134 -
|
||||||
this.getBoxPadding(layoutDiv) -
|
this.getBoxPadding(layoutDiv) -
|
||||||
this.getBoxHeight(mb8Div) -
|
this.getBoxHeight(mb8Div) -
|
||||||
this.getBoxHeight(formDiv)
|
this.getBoxHeight(formDiv);
|
||||||
},
|
},
|
||||||
// 屏幕resize监听
|
// 屏幕resize监听
|
||||||
screenChange() {
|
screenChange() {
|
||||||
// 屏幕resize监听事件:一旦屏幕宽高发生变化,就会执行resize
|
// 屏幕resize监听事件:一旦屏幕宽高发生变化,就会执行resize
|
||||||
window.addEventListener('resize', this.getMaxTableHeight, true)
|
window.addEventListener("resize", this.getMaxTableHeight, true);
|
||||||
// 将屏幕监听事件移除
|
// 将屏幕监听事件移除
|
||||||
// 这步是必须的。离开页面时不移除,再返回,或者进入到别的有相同元素的页面会报错
|
// 这步是必须的。离开页面时不移除,再返回,或者进入到别的有相同元素的页面会报错
|
||||||
// 或者将这里的方法直接写在beforeDestroy函数中也可以
|
// 或者将这里的方法直接写在beforeDestroy函数中也可以
|
||||||
this.$once('hook:beforeDestroy', () => {
|
this.$once("hook:beforeDestroy", () => {
|
||||||
window.removeEventListener('resize', this.getMaxTableHeight, true)
|
window.removeEventListener("resize", this.getMaxTableHeight, true);
|
||||||
})
|
});
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
@ -661,7 +858,6 @@ export default {
|
|||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
::v-deep .el-dialog__body {
|
::v-deep .el-dialog__body {
|
||||||
|
|
||||||
padding-bottom: 60px !important;
|
padding-bottom: 60px !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user