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

Merge branch 'master' of http://140.143.162.39:3000/shentun/peisweb

master
pengjun 2 years ago
parent
b6663e7938 ea97d9a149
commit
fea5f863ac
3 changed files with 152 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
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      src/components/itemSet/ReferenceRange.vue
  2. 17
      src/views/fee-settings/Diagnosis.vue
  3. 212
      src/views/fee-settings/Item.vue

12
src/components/itemSet/ReferenceRange.vue
View File

@ -65,13 +65,13 @@
<!-- 按钮区域 --> <!-- 按钮区域 -->
<div style="margin-left: 10px; width: 10%" class="editButton"> <div style="margin-left: 10px; width: 10%" class="editButton">
<div style="width:100%;"> <div style="width:100%;">
<el-button type="success" @click="add">新增</el-button>
<el-button type="" @click="add">新增</el-button>
</div> </div>
<div style="margin-top: 5px;width:100%;"> <div style="margin-top: 5px;width:100%;">
<el-button type="primary" @click="edit">编辑</el-button>
<el-button type="" @click="edit">编辑</el-button>
</div> </div>
<div style="margin-top: 5px;width:100%;"> <div style="margin-top: 5px;width:100%;">
<el-button type="danger" @click="del">删除</el-button>
<el-button type="" @click="del">删除</el-button>
</div> </div>
</div> </div>
@ -221,9 +221,7 @@ export default {
created() {}, created() {},
mounted() { mounted() {
//console.log('@子节点', this.itemId, this.ReferenceRangeTypeFlag)
this.addtoedit(); this.addtoedit();
this.getlist(this.itemId, this.ReferenceRangeTypeFlag); this.getlist(this.itemId, this.ReferenceRangeTypeFlag);
}, },
computed: { computed: {
@ -390,7 +388,6 @@ export default {
let before=/^\d+\.?\d?$/.test(that.form.referenceRangeValue.match(/(\S*)-/)[1]) let before=/^\d+\.?\d?$/.test(that.form.referenceRangeValue.match(/(\S*)-/)[1])
let after=/^\d+\.?\d?$/.test(that.form.referenceRangeValue.match(/-(\S*)/)[1]) let after=/^\d+\.?\d?$/.test(that.form.referenceRangeValue.match(/-(\S*)/)[1])
if(before && after){ if(before && after){
console.log(that.form)
if(that.form.criticalRangeValue!="" && that.form.criticalRangeValue!=undefined){ if(that.form.criticalRangeValue!="" && that.form.criticalRangeValue!=undefined){
if(that.form.criticalRangeValue.includes('-')){ if(that.form.criticalRangeValue.includes('-')){
let criticalBefore=/^\d+\.?\d?$/.test(that.form.criticalRangeValue.match(/(\S*)-/)[1]) let criticalBefore=/^\d+\.?\d?$/.test(that.form.criticalRangeValue.match(/(\S*)-/)[1])
@ -441,4 +438,7 @@ export default {
:deep .editButton .el-button{ :deep .editButton .el-button{
width: 100%; width: 100%;
} }
:deep .el-form-item {
margin-bottom: 14px;
}
</style> </style>

17
src/views/fee-settings/Diagnosis.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="box"> <div class="box">
<div style="width: 95%"> <div style="width: 95%">
<el-card style="border-radius: 15px; height: 800px">
<el-card style="border-radius: 15px;">
<div class="publiccss">诊断</div> <div class="publiccss">诊断</div>
<div class="" style="display: flex"> <div class="" style="display: flex">
<div style="margin-left: 5px; margin-top: 15px; width: 15%"> <div style="margin-left: 5px; margin-top: 15px; width: 15%">
@ -11,13 +11,14 @@
@node-click="handleNodeClick" @node-click="handleNodeClick"
></el-tree> ></el-tree>
</div> </div>
<div style="width: 80%">
<div style="width: 85%">
<el-table <el-table
:data="tableData" :data="tableData"
style="width: 100%; margin-top: 20px; height: 500px" style="width: 100%; margin-top: 20px; height: 500px"
row-key="id" row-key="id"
class="el-table__body-wrapper tbody" class="el-table__body-wrapper tbody"
@row-click="rowick" @row-click="rowick"
:height="window.pageHeight < 600 ? 440 : window.pageHeight - 160"
highlight-current-row highlight-current-row
> >
<el-table-column prop="id" label="编号" width="300"> <el-table-column prop="id" label="编号" width="300">
@ -331,12 +332,6 @@ export default {
{ required: true, message: "请选择诊断级别", trigger: "blur" }, { required: true, message: "请选择诊断级别", trigger: "blur" },
], ],
}, },
pages: {
Filter: "",
SkipCount: 0,
MaxResultCount: 100,
Sorting: "displayOrder desc",
},
tableData: [], tableData: [],
initTableData: [], initTableData: [],
dialogVisible: false, dialogVisible: false,
@ -717,9 +712,9 @@ export default {
console.log(row); console.log(row);
}, },
getlist() { getlist() {
postapi("/api/app/diagnosis/getlistinfilter", this.pages).then((res) => {
this.initTableData = [...res.data.items];
this.tableData = res.data.items;
postapi("/api/app/diagnosis/getlistinsuggestion").then((res) => {
this.initTableData = [...res.data];
this.tableData = res.data;
console.log(res); console.log(res);
}); });
}, },

212
src/views/fee-settings/Item.vue
View File

@ -1,29 +1,14 @@
<template> <template>
<div class="box"> <div class="box">
<div style="width: 90%">
<div style="width: 95%">
<el-card <el-card
style="height: 600px; width: 105%; border-radius: 15px"
style="width: 100%; border-radius: 15px"
class="elcard" class="elcard"
> >
<div class="publiccss">项目设置</div> <div class="publiccss">项目设置</div>
<el-row style="margin-top: 20px; margin-left: 15px">
<el-col :span="4">
<!-- <el-autocomplete
class="inline-input"
v-model="pages.Filter"
:fetch-suggestions="querySearch"
placeholder="请输入内容"
@select="handleSelect"
>
<template slot-scope="{ item }">
<div
class="name"
@click="selsearch(item.id, item.medicalConclusionTypeId)"
>
{{ item.displayName }}
</div>
</template></el-autocomplete
> -->
<div style="display: flex;margin-top:15px;">
<div style="width: 15%;">
<div>
<el-select v-model="department" placeholder="请选择" filterable :filter-method="remoteMethodes" default-first-option @change="quckDepartments" clearable> <el-select v-model="department" placeholder="请选择" filterable :filter-method="remoteMethodes" default-first-option @change="quckDepartments" clearable>
<el-option <el-option
v-for="item in quckDepartment" v-for="item in quckDepartment"
@ -33,10 +18,8 @@
> >
</el-option> </el-option>
</el-select> </el-select>
</el-col>
</el-row>
<div style="display: flex">
<div style="width: 15%; margin-top: 20px">
</div>
<div style=" margin-top: 20px">
<el-tree <el-tree
:data="itemTypeId" :data="itemTypeId"
:props="treeprops" :props="treeprops"
@ -47,12 +30,13 @@
auto-expand-parent auto-expand-parent
></el-tree> ></el-tree>
</div> </div>
<div style="width: 85%; margin-top: 15px">
</div>
<div style="width: 85%;">
<el-table <el-table
:data="tableData" :data="tableData"
style="width: 100%" style="width: 100%"
row-key="id" row-key="id"
height="500"
:height="window.pageHeight < 600 ? 440 : window.pageHeight - 160"
class="el-table__body-wrapper tbody" class="el-table__body-wrapper tbody"
highlight-current-row highlight-current-row
@row-click="rowick" @row-click="rowick"
@ -371,33 +355,32 @@
</span> </span>
</el-dialog> </el-dialog>
<!-- 按钮区域 --> <!-- 按钮区域 -->
<div style="margin-left: 6%; margin-top: 7%">
<div style="margin-left: 10px; margin-top: 4%">
<el-button type="" @click="add" class="commonbutton">新增</el-button> <el-button type="" @click="add" class="commonbutton">新增</el-button>
<div> <div>
<el-button <el-button
type="" type=""
@click="editpopup" @click="editpopup"
style="margin-left: 0; margin-top: 10px"
class="commonbutton" class="commonbutton"
>编辑</el-button >编辑</el-button
> >
</div> </div>
<div style="margin-top: 10px">
<div>
<el-button type="" @click="delsrts" class="commonbutton" <el-button type="" @click="delsrts" class="commonbutton"
>删除</el-button >删除</el-button
> >
</div> </div>
<div style="margin-top: 10px">
<div>
<el-button type="" @click="topping" class="commonbutton" <el-button type="" @click="topping" class="commonbutton"
>置顶</el-button >置顶</el-button
> >
</div> </div>
<div style="margin-top: 10px">
<div>
<el-button type="" @click="toppings" class="commonbutton" <el-button type="" @click="toppings" class="commonbutton"
>置底</el-button >置底</el-button
> >
</div> </div>
<div style="margin-top: 10px">
<div>
<el-button <el-button
type="" type=""
:disabled="isshow" :disabled="isshow"
@ -406,7 +389,7 @@
>排序</el-button >排序</el-button
> >
</div> </div>
<div style="margin-top: 5px">
<div>
<el-button <el-button
type="" type=""
:disabled="isshow" :disabled="isshow"
@ -415,23 +398,21 @@
>取消</el-button >取消</el-button
> >
</div> </div>
<div style="margin-top: 10px">
<div>
<el-button <el-button
type="" type=""
size="" size=""
@click="resulttemplate" @click="resulttemplate"
style="height: 35px"
class="commonbutton" class="commonbutton"
>结果模板</el-button >结果模板</el-button
> >
</div> </div>
<div style="margin-top: 10px">
<div>
<el-button <el-button
type="" type=""
size="" size=""
@click="referencerange" @click="referencerange"
class="commonbutton" class="commonbutton"
style="width: 100px"
>参考范围</el-button >参考范围</el-button
> >
</div> </div>
@ -494,12 +475,12 @@
</el-table> </el-table>
</div> </div>
<div style="margin-top: 5px; margin-left: 15px;width:10%;"> <div style="margin-top: 5px; margin-left: 15px;width:10%;">
<el-button type="primary" @click="increase" style="width:100%;">添加</el-button>
<el-button type="" @click="increase" style="width:100%;">添加</el-button>
<div style="margin-top: 5px"> <div style="margin-top: 5px">
<el-button type="primary" @click="resultediting" style="width:100%;">编辑</el-button>
<el-button type="" @click="resultediting" style="width:100%;">编辑</el-button>
</div> </div>
<div style="margin-top: 5px"> <div style="margin-top: 5px">
<el-button type="primary" @click="delemtdelite" style="width:100%;">删除</el-button>
<el-button type="" @click="delemtdelite" style="width:100%;">删除</el-button>
</div> </div>
<!-- <div style="margin-top: 5px"> <!-- <div style="margin-top: 5px">
<el-button type="primary" @click="templatecategory" <el-button type="primary" @click="templatecategory"
@ -507,7 +488,7 @@
> >
</div> --> </div> -->
<div style="margin-top: 5px;margin-bottom:14px;"> <div style="margin-top: 5px;margin-bottom:14px;">
<el-button type="primary" @click="diagnosticmatching" style="width:100%;">诊断匹配</el-button
<el-button type="" @click="diagnosticmatching" style="width:100%;">诊断匹配</el-button
> >
</div> </div>
</div> </div>
@ -544,7 +525,7 @@
</el-col> --> </el-col> -->
<el-col :span="8"> <el-col :span="8">
<el-form-item label="结果" prop="result"> <el-form-item label="结果" prop="result">
<el-input v-model="rusetform.result" ref="ruseInput" @input="changeUpdate()"></el-input>
<el-input v-model="rusetform.result" ref="ruseInput" @change="changeUpdate($event)"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@ -625,7 +606,7 @@
<el-card <el-card
v-if="referencerangevalue == 0" v-if="referencerangevalue == 0"
style="margin-top: 20px" style="margin-top: 20px"
></el-card>
>无参考范围</el-card>
<!-- 数字型参考范围 --> <!-- 数字型参考范围 -->
<div style="display: flex" v-if="referencerangevalue == 1"> <div style="display: flex" v-if="referencerangevalue == 1">
<ReferenceRange :itemId="form.id" ReferenceRangeTypeFlag="1" /> <ReferenceRange :itemId="form.id" ReferenceRangeTypeFlag="1" />
@ -633,7 +614,7 @@
<!-- 字符型参考范围 --> <!-- 字符型参考范围 -->
<div v-if="referencerangevalue == 2"> <div v-if="referencerangevalue == 2">
<div style="margin: 20px 0; display: flex"> <div style="margin: 20px 0; display: flex">
<div style="width: 95%">
<div style="width: 100%">
<el-input <el-input
type="textarea" type="textarea"
placeholder="请输入内容" placeholder="请输入内容"
@ -644,9 +625,9 @@
> >
</el-input> </el-input>
</div> </div>
<div style="margin-top: 5px; margin-left: 15px;width:10%;">
<!-- <div style="margin-top: 5px; margin-left: 15px;width:10%;">
<el-button type="primary" @click="addfssubdex" style="width:100%;">新增</el-button> <el-button type="primary" @click="addfssubdex" style="width:100%;">新增</el-button>
</div>
</div> -->
</div> </div>
</div> </div>
<!-- 性激素参考范围 --> <!-- 性激素参考范围 -->
@ -723,12 +704,12 @@
</el-table> </el-table>
</div> </div>
<div style="margin-top: 5px; margin-left: 15px;width:10%;"> <div style="margin-top: 5px; margin-left: 15px;width:10%;">
<el-button type="primary" @click="adddiagnosis" style="width:100%;">增加</el-button>
<el-button type="" @click="adddiagnosis" style="width:100%;">增加</el-button>
<div style="margin-top: 5px"> <div style="margin-top: 5px">
<el-button type="primary" @click="editDiagnosis" style="width:100%;">编辑</el-button>
<el-button type="" @click="editDiagnosis" style="width:100%;">编辑</el-button>
</div> </div>
<div style="margin-top: 5px"> <div style="margin-top: 5px">
<el-button type="primary" @click="deleteDiagnosis" style="width:100%;">删除</el-button>
<el-button type="" @click="deleteDiagnosis" style="width:100%;">删除</el-button>
</div> </div>
</div> </div>
</div> </div>
@ -751,7 +732,7 @@
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="结果" prop="result"> <el-form-item label="结果" prop="result">
<el-input v-model="editdigoisceditingform.result" ref="editdiInput" @input="changeUpdate()"></el-input>
<el-input v-model="editdigoisceditingform.result" ref="editdiInput" @change="changeUpdates($event)"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@ -1246,6 +1227,7 @@ export default {
diagnostiele:1, diagnostiele:1,
curRows:{}, curRows:{},
curRowes:{}, curRowes:{},
fssubdexDete:""
}; };
}, },
created() { created() {
@ -1269,8 +1251,29 @@ export default {
this.disableddiagnosisFunction = false; this.disableddiagnosisFunction = false;
} }
}, },
addfssubdex(){
// addfssubdex(){
// if(this.fssubdex){
// let obj = {
// itemId: this.form.id,
// referenceRangeValue: this.fssubdex,
// referenceRangeTypeFlag: this.referencerangevalue,
// };
// postapi("/api/app/reference-range/text", obj).then((res) => {
// if(res.code!=-1){
// this.$message.success("新增成功");
// this.fssubdex = "";
// }
// });
// }else{
// this.$message.warning("内容不能为空");
// }
// },
//参考范围确定类型
determinetype() {
this.referencerangedialogVisible = false;
if(this.referencerangevalue == 2){
if(this.fssubdex){ if(this.fssubdex){
if(!this.fssubdexDete){
let obj = { let obj = {
itemId: this.form.id, itemId: this.form.id,
referenceRangeValue: this.fssubdex, referenceRangeValue: this.fssubdex,
@ -1282,22 +1285,24 @@ export default {
this.fssubdex = ""; this.fssubdex = "";
} }
}); });
}else{
let obj = {
itemId: this.form.id,
referenceRangeValue: this.fssubdex,
referenceRangeTypeFlag: this.referencerangevalue,
};
putapi(`/api/app/reference-range/${this.fssubdexDete.id}/text`, obj).then((res) => {
if(res.code!=-1){
this.$message.success("修改成功");
this.fssubdex = "";
}
});
}
}else{ }else{
this.$message.warning("内容不能为空"); this.$message.warning("内容不能为空");
} }
},
//参考范围确定类型
determinetype() {
this.referencerangedialogVisible = false;
// if(this.referencerangevalue == 0){
// this.referencerangedialogVisible = false;
// }else if(this.referencerangevalue == 1){
// this.referencerangedialogVisible = false;
// }else if (this.referencerangevalue == 2) {
// }else if(this.referencerangevalue == 3){
// this.referencerangedialogVisible = false;
// }
}
this.curRow.referenceRangeTypeFlag=this.referencerangevalue
this.referencerangevalue="0" this.referencerangevalue="0"
}, },
async blurInput(id, name, value) { async blurInput(id, name, value) {
@ -1448,7 +1453,12 @@ export default {
} }
}, },
changeUpdate(e){ changeUpdate(e){
this.$forceUpdate()
this.$delete(this.rusetform,'result')
this.$set(this.rusetform,'result',e)
},
changeUpdates(e){
this.$delete(this.editdigoisceditingform,'result')
this.$set(this.editdigoisceditingform,'result',e)
}, },
//结果模板添加 //结果模板添加
resultaddition() {}, resultaddition() {},
@ -1585,16 +1595,18 @@ export default {
//参考范围下拉选择 //参考范围下拉选择
selecttype(v) { selecttype(v) {
this.referencerangevalue = v; this.referencerangevalue = v;
// if (v == 1) {
// getapi("/api/app/sex").then((res) => {
// console.log(res);
// this.sexid = res.data;
// });
// postapi("/api/app/diagnosis/getlistinsuggestion").then((res) => {
// this.scopediagnostic = res.data.items;
// console.log(res);
// });
// }
if(v=="2"){
getapi(`/api/app/reference-range/in-type/${this.form.id}?ReferenceRangeTypeFlag=${this.referencerangevalue}`).then((res) => {
if(res.code!=-1){
if(res.data[0]){
this.fssubdex=res.data[0].referenceRangeValue
}else{
this.fssubdex=""
}
this.fssubdexDete=res.data[0]
}
});
}
}, },
//参考范围 //参考范围
referencerange() { referencerange() {
@ -1602,7 +1614,20 @@ export default {
if (this.form.id == undefined) { if (this.form.id == undefined) {
this.$message.warning("请选择操作的数据"); this.$message.warning("请选择操作的数据");
} else { } else {
this.referencerangevalue=this.form.referenceRangeTypeFlag
this.referencerangedialogVisible = true; this.referencerangedialogVisible = true;
if(this.referencerangevalue=="2"){
getapi(`/api/app/reference-range/in-type/${this.form.id}?ReferenceRangeTypeFlag=${this.form.referenceRangeTypeFlag}`).then((res) => {
if(res.code!=-1){
if(res.data[0]){
this.fssubdex=res.data[0].referenceRangeValue
}else{
this.fssubdex=""
}
this.fssubdexDete=res.data[0]
}
});
}
} }
}, },
//结果模板添加或者修改需要的列 //结果模板添加或者修改需要的列
@ -2055,7 +2080,12 @@ export default {
} else if (this.title == 2) { } else if (this.title == 2) {
projectedit(this.form.id, this.form).then((res) => { projectedit(this.form.id, this.form).then((res) => {
this.$message.success("修改成功"); this.$message.success("修改成功");
this.getlist();
this.tableData.forEach((item,index)=>{
if(res.data.id==item.id){
this.$set(this.tableData,index,res.data)
}
})
this.curRow={...res.data}
this.dialogVisible = false; this.dialogVisible = false;
}); });
} }
@ -2093,10 +2123,10 @@ export default {
//新增或者编辑弹框需要的下拉框接口数据 //新增或者编辑弹框需要的下拉框接口数据
addorgropdata() { addorgropdata() {
//获取项目id //获取项目id
projectlist().then((res) => {
this.itemTypeId = res.data;
this.tcdate(this.itemTypeId);
});
// projectlist().then((res) => {
// this.itemTypeId = res.data;
// this.tcdate(this.itemTypeId);
// });
//获取单位 //获取单位
unitlist().then((res) => { unitlist().then((res) => {
this.unitId = res.data.items; this.unitId = res.data.items;
@ -2106,9 +2136,9 @@ export default {
this.priceItemId = res.data.items; this.priceItemId = res.data.items;
}); });
//参考范围 //参考范围
getapi("/api/app/reference-range").then((res) => {
this.reference = res.data.items;
});
// getapi("/api/app/reference-range").then((res) => {
// this.reference = res.data.items;
// });
//结果模板 //结果模板
getapi("/api/app/item-result-template").then((res) => { getapi("/api/app/item-result-template").then((res) => {
this.resulttemp = res.data.items; this.resulttemp = res.data.items;
@ -2137,6 +2167,17 @@ export default {
}; };
</script> </script>
<style scoped> <style scoped>
@import "../../assets/css/global_button.css";
@import "../../assets/css/global_dialog.css";
@import "../../assets/css/global_table.css";
@import "../../assets/css/global_form.css";
@import "../../assets/css/global_input.css";
@import "../../assets/css/global.css";
.commonbutton {
width:100px;
margin-bottom: 10px
}
::v-deep .el-table__header th { ::v-deep .el-table__header th {
/* font-size: px; */ /* font-size: px; */
background-color: rgb(245, 245, 245); /* 设置表头背景颜色 */ background-color: rgb(245, 245, 245); /* 设置表头背景颜色 */
@ -2166,11 +2207,12 @@ export default {
padding: 0px 20px 14px; padding: 0px 20px 14px;
} }
:deep .downText .el-input--suffix .el-input__inner { :deep .downText .el-input--suffix .el-input__inner {
width: 0;
height: 100%; height: 100%;
padding-right: 22px;
padding: 0 19px;
} }
:deep .downText .el-input--suffix .el-input__suffix { :deep .downText .el-input--suffix .el-input__suffix {
right: 7px;
right: 12px;
} }
:deep .downText{ :deep .downText{
display: flex!important; display: flex!important;

Write Preview
Loading…
Cancel
Save