Browse Source

lineModeFlag

master
pengjun 2 years ago
parent
commit
288e95d673
  1. 6
      src/components/doctorCheck/CheckItemList.vue
  2. 5
      src/store/index.js
  3. 412
      src/views/common-settings/ItemType.vue
  4. 24
      src/views/fee-settings/Item.vue

6
src/components/doctorCheck/CheckItemList.vue

@ -26,7 +26,7 @@
doctorCheck.RegisterCheckEdit.completeFlag == '2' doctorCheck.RegisterCheckEdit.completeFlag == '2'
" "
:autosize="{ minRows: 1, maxRows: 100 }" :autosize="{ minRows: 1, maxRows: 100 }"
:data-ismultiline="scope.row.isMultiLine"
:data-lineModeFlag="scope.row.lineModeFlag"
@input="madeTooltips(scope.$index);computeFun(scope.$index)" @input="madeTooltips(scope.$index);computeFun(scope.$index)"
v-bind:class="scope.row.class" v-bind:class="scope.row.class"
/> />
@ -340,9 +340,9 @@ export default {
input.addEventListener('keydown', (event) => { input.addEventListener('keydown', (event) => {
// //
// console.log('data-ismultiline',input.getAttribute('data-ismultiline'));
// console.log('data-lineModeFlag',input.getAttribute('data-lineModeFlag'));
if (event.keyCode === 13 && input.getAttribute('data-ismultiline') == '0') {
if (event.keyCode === 13 && input.getAttribute('data-lineModeFlag') == '0') {
// //
event.preventDefault(); event.preventDefault();
// //

5
src/store/index.js

@ -257,6 +257,11 @@ export default new Vuex.Store({
{ id: "2", displayName: "仅页面节点" }, { id: "2", displayName: "仅页面节点" },
{ id: "3", displayName: "按钮或事件" }, { id: "3", displayName: "按钮或事件" },
], ],
lineModeFlag:[
{ id: "0", displayName: "不换行" },
{ id: "1", displayName: "换行" },
{ id: "2", displayName: "继承项目类别换行属性" },
],
medicalPackage: [], //所有套餐 medicalPackage: [], //所有套餐
customerOrgGroupAll: [], //所有分组,不限单位,不限次数 customerOrgGroupAll: [], //所有分组,不限单位,不限次数
customerOrg: [], //所有单位,非树结构 customerOrg: [], //所有单位,非树结构

412
src/views/common-settings/ItemType.vue

@ -2,204 +2,114 @@
<div class="box"> <div class="box">
<div class="layeredleftright"> <div class="layeredleftright">
<div class="contenttitle"> <div class="contenttitle">
常用设置 /
<span class="contenttitleBold"
>项目类别</span
>
常用设置 /
<span class="contenttitleBold">项目类别</span>
</div> </div>
<div style="display: flex; margin-top: 7px"> <div style="display: flex; margin-top: 7px">
<div style="width: 95%; background-color: #fff; border-radius: 8px">
<div
:style="
'margin-top: 10px;overflow: scroll;height:' +
(window.pageHeight < 600 ? 545 : window.pageHeight - 110) +
'px;'
"
>
<el-tree
:data="tableData"
:props="defaultProps"
ref="tree"
node-key="id"
@node-click="treeclick"
highlight-current
auto-expand-parent
:default-expand-all="true"
>
<span class="custom-tree-node" slot-scope="{ node, data }">
<div>
<span class="treeicons">
<!-- <i
<div style="width: 95%; background-color: #fff; border-radius: 8px">
<div :style="'margin-top: 10px;overflow: scroll;height:' +
(window.pageHeight < 600 ? 545 : window.pageHeight - 110) +
'px;'
">
<el-tree :data="tableData" :props="defaultProps" ref="tree" node-key="id" @node-click="treeclick"
highlight-current auto-expand-parent :default-expand-all="true">
<span class="custom-tree-node" slot-scope="{ node, data }">
<div>
<span class="treeicons">
<!-- <i
class="el-icon-document-remove" class="el-icon-document-remove"
v-if="data.parentId == null" v-if="data.parentId == null"
></i> --> ></i> -->
<img style="width:20px;height:20px;vertical-align: sub;" src="@/assets/images/order.png" v-if="data.parentId == null"/>
</span>
<span
:class="data.parentId == null ? 'maxtitle' : 'mintitle'"
>{{ node.label }}</span
>
</div>
</span>
</el-tree>
</div>
<img style="width:20px;height:20px;vertical-align: sub;" src="@/assets/images/order.png"
v-if="data.parentId == null" />
</span>
<span :class="data.parentId == null ? 'maxtitle' : 'mintitle'">{{ node.label }}</span>
</div>
</span>
</el-tree>
</div> </div>
<!-- 按钮区域 -->
<div style="margin-left: 10px;">
<!-- <el-button type="" @click="addll" class="commonbutton">新增</el-button> -->
<div
v-if="tableData.length == '0' ? true : false"
style="margin-bottom: 10px"
>
<el-button
type=""
class="commonbutton"
@click="append"
>新增项目类别</el-button
>
</div>
<div>
<el-button type="" @click="addll" :disabled="isshow" class="commonbutton"
>新增同级</el-button
>
</div>
<div style="margin-top: 10px">
<el-button type="" @click="append" :disabled="isshow" class="commonbutton"
>新增子级</el-button
>
</div>
<div style="margin-top: 10px">
<el-button type="" @click="rena" :disabled="isshow" class="commonbutton"
>编辑</el-button
>
</div>
<div style="margin-top: 10px">
<el-button type="" @click="deleates" :disabled="isshow" class="deleteButton"
>删除</el-button
>
</div> </div>
<!-- 按钮区域 -->
<div style="margin-left: 10px;">
<!-- <el-button type="" @click="addll" class="commonbutton">新增</el-button> -->
<div v-if="tableData.length == '0' ? true : false" style="margin-bottom: 10px">
<el-button type="" class="commonbutton" @click="append">新增项目类别</el-button>
</div>
<div>
<el-button type="" @click="addll" :disabled="isshow" class="commonbutton">新增同级</el-button>
</div> </div>
<div style="margin-top: 10px">
<el-button type="" @click="append" :disabled="isshow" class="commonbutton">新增子级</el-button>
</div>
<div style="margin-top: 10px">
<el-button type="" @click="rena" :disabled="isshow" class="commonbutton">编辑</el-button>
</div>
<div style="margin-top: 10px">
<el-button type="" @click="deleates" :disabled="isshow" class="deleteButton">删除</el-button>
</div>
</div>
</div> </div>
</div> </div>
<el-dialog
:title="title == 1 ? '新增' : '修改'"
:visible.sync="dialogVisible"
width="40%"
:close-on-click-modal="false"
>
<span v-if="title == 2 ? true : false">上级部门</span>
<el-cascader
v-if="title == 2"
ref="depref"
@change="cascaderchang"
:show-all-levels="false"
v-model="departmentname"
style="margin-left: 10px"
:options="itemtypedata"
:props="{
checkStrictly: true,
children: 'treeChildren',
label: 'displayName',
value: 'displayName',
}"
clearable
size="small"
></el-cascader>
<el-form
:model="form"
label-width="80px"
:rules="rules"
ref="ruleForm"
>
<el-row>
<el-col :span="12">
<el-form-item label="名称" prop="displayName">
<el-input
v-model="form.displayName"
ref="refinput"
size="small"
></el-input>
</el-form-item>
</el-col>
<el-dialog :title="title == 1 ? '新增' : '修改'" :visible.sync="dialogVisible" width="40%" :close-on-click-modal="false">
<span v-if="title == 2 ? true : false">上级部门</span>
<el-cascader v-if="title == 2" ref="depref" @change="cascaderchang" :show-all-levels="false"
v-model="departmentname" style="margin-left: 10px" :options="itemtypedata" :props="{
checkStrictly: true,
children: 'treeChildren',
label: 'displayName',
value: 'displayName',
}" clearable size="small"></el-cascader>
<el-form :model="form" label-width="80px" :rules="rules" ref="ruleForm">
<el-row>
<el-col :span="12">
<el-form-item label="名称" prop="displayName">
<el-input v-model="form.displayName" ref="refinput" size="small"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="指引类别" prop="guidTypeId">
<el-select
v-model="form.guidTypeId"
placeholder="请选择"
style="width: 100%"
size="small"
>
<el-option
v-for="item in guideoptions"
:key="item.id"
:label="item.displayName"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="合并组合" prop="isMergeAsbitem">
<el-select
v-model="form.isMergeAsbitem"
placeholder="请选择"
style="width: 100%"
size="small"
>
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="检查类别" prop="checkTypeFlag">
<el-select
v-model="form.checkTypeFlag"
placeholder="请选择"
style="width: 100%"
size="small"
>
<el-option
v-for="item in checkTypeFlag"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="体检报告" prop="medicalReportTypeId">
<el-select
style="width: 100%"
v-model="form.medicalReportTypeId"
placeholder="请选择"
size="small"
>
<el-option
v-for="item in medicalReportType"
:key="item.id"
:label="item.displayName"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false" class="difference"> </el-button>
<el-button type="" @click="addoredit" class="commonbutton"> </el-button>
</span>
<el-col :span="12">
<el-form-item label="指引类别" prop="guidTypeId">
<el-select v-model="form.guidTypeId" placeholder="请选择" style="width: 100%" size="small">
<el-option v-for="item in guideoptions" :key="item.id" :label="item.displayName" :value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="合并组合" prop="isMergeAsbitem">
<el-select v-model="form.isMergeAsbitem" placeholder="请选择" style="width: 100%" size="small">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="检查类别" prop="checkTypeFlag">
<el-select v-model="form.checkTypeFlag" placeholder="请选择" style="width: 100%" size="small">
<el-option v-for="item in checkTypeFlag" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="体检报告" prop="medicalReportTypeId">
<el-select style="width: 100%" v-model="form.medicalReportTypeId" placeholder="请选择" size="small">
<el-option v-for="item in medicalReportType" :key="item.id" :label="item.displayName" :value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="结果是否换行" prop="lineModeFlagBox" label-width="100px">
<el-checkbox v-model="form.lineModeFlagBox" @change="boxToVal('lineModeFlag')" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false" class="difference"> </el-button>
<el-button type="" @click="addoredit" class="commonbutton"> </el-button>
</span>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
@ -214,6 +124,7 @@ import {
import { basicsetings, physicalexaminationlist } from "@/request/systemapi"; import { basicsetings, physicalexaminationlist } from "@/request/systemapi";
import { getapi } from "@/api/api"; import { getapi } from "@/api/api";
import { mapState } from "vuex"; import { mapState } from "vuex";
import { objCopy } from "@/utlis/proFunc";
export default { export default {
data() { data() {
return { return {
@ -277,18 +188,21 @@ export default {
tableHeight: window.innerHeight - 180, // tableHeight: window.innerHeight - 180, //
screenHeight: window.innerHeight, // screenHeight: window.innerHeight, //
form: { form: {
id:'',
displayName: "", displayName: "",
parentId: "", parentId: "",
isMergeAsbitem: "", isMergeAsbitem: "",
checkTypeFlag: "", checkTypeFlag: "",
guidTypeId: "", guidTypeId: "",
medicalReportTypeId: "", medicalReportTypeId: "",
lineModeFlag: '0', //
lineModeFlagBox: false, // box
}, },
value: "", // value: "", //
dialogVisible: false, dialogVisible: false,
guideoptions: [], guideoptions: [],
row:{},
isshow:true
row: {},
isshow: true
}; };
}, },
created() { created() {
@ -301,32 +215,68 @@ export default {
...mapState(["window"]), ...mapState(["window"]),
}, },
methods: { methods: {
// Box
boxToVal(type) {
// console.log('this.form',this.form)
let val = 'N'
switch (type) {
case 'lineModeFlag':
if (this.form[type + 'Box']) {
val = '1';
} else {
val = '0';
}
break;
default:
//
if (this.form[type + 'Box']) val = 'Y'
break;
}
this.form[type] = val
},
// Box
valToBox(type){
let boxVal = false
switch (type) {
case 'lineModeFlag':
if(this.form[type] == '1') boxVal = true
break;
default:
if(this.form[type] == 'Y') boxVal = true
break;
}
this.form[type + 'Box'] = boxVal
},
cascaderchang(v) { cascaderchang(v) {
this.departmentname = v[v.length - 1]; this.departmentname = v[v.length - 1];
}, },
// //
rena() { rena() {
let id=this.row.id
let id = this.row.id
let a = this.$refs.tree.getNode(id).parent.data.displayName; let a = this.$refs.tree.getNode(id).parent.data.displayName;
this.departmentname = a; this.departmentname = a;
this.title = 2; this.title = 2;
this.dialogVisible = true; this.dialogVisible = true;
if (this.$refs.ruleForm !== undefined) { if (this.$refs.ruleForm !== undefined) {
this.$refs.ruleForm.resetFields();
this.$refs.ruleForm.resetFields();
} }
basicsetings().then((res) => { basicsetings().then((res) => {
if(res.code!=-1){
if (res.code != -1) {
this.guideoptions = res.data.items; this.guideoptions = res.data.items;
} }
}); });
physicalexaminationlist().then((res) => { physicalexaminationlist().then((res) => {
if(res.code!=-1){
if (res.code != -1) {
this.medicalReportType = res.data.items; this.medicalReportType = res.data.items;
} }
}); });
projecttype(id).then((res) => { projecttype(id).then((res) => {
if(res.code!=-1){
this.form = res.data;
if (res.code != -1) {
objCopy(res.data,this.form)
this.valToBox('lineModeFlag') // Box
} }
}); });
// getapi(`/api/app/item/in-item-type/${data.id}`).then((res) => { // getapi(`/api/app/item/in-item-type/${data.id}`).then((res) => {
@ -336,7 +286,7 @@ export default {
// //
getapi(`/api/app/itemtype/getbycodeparent?ItemTypeId=${id}`).then( getapi(`/api/app/itemtype/getbycodeparent?ItemTypeId=${id}`).then(
(res) => { (res) => {
if(res.code!=-1){
if (res.code != -1) {
this.itemtypedata = res.data; this.itemtypedata = res.data;
} }
} }
@ -344,25 +294,25 @@ export default {
}, },
// //
deleates() { deleates() {
let id=this.row.id
let id = this.row.id
this.$confirm("是否删除, 是否继续?", "提示", { this.$confirm("是否删除, 是否继续?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
cancelButtonClass:"difference",
confirmButtonClass:"commonbutton"
cancelButtonClass: "difference",
confirmButtonClass: "commonbutton"
}).then(() => { }).then(() => {
projecteditid(id).then((res) => { projecteditid(id).then((res) => {
if (res.code != -1) { if (res.code != -1) {
this.$message.success("删除成功"); this.$message.success("删除成功");
this.getlist(); this.getlist();
this.isshow=true
this.isshow = true
} }
}); });
}) })
.catch(()=>{
this.$message("取消成功");
})
.catch(() => {
this.$message("取消成功");
})
}, },
append() { append() {
// this.form = {}; // this.form = {};
@ -370,21 +320,22 @@ export default {
// this.form.parentId = data.id; // this.form.parentId = data.id;
// } // }
Object.assign(this.$data.form, this.$options.data().form); Object.assign(this.$data.form, this.$options.data().form);
this.form.parentId = this.row.id; this.form.parentId = this.row.id;
this.dialogVisible = true; this.dialogVisible = true;
if (this.$refs.ruleForm !== undefined) { if (this.$refs.ruleForm !== undefined) {
this.$refs.ruleForm.resetFields();
this.$refs.ruleForm.resetFields();
} }
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.refinput.focus(); this.$refs.refinput.focus();
}); });
basicsetings().then((res) => { basicsetings().then((res) => {
if(res.code!=-1){
if (res.code != -1) {
this.guideoptions = res.data.items; this.guideoptions = res.data.items;
} }
}); });
physicalexaminationlist().then((res) => { physicalexaminationlist().then((res) => {
if(res.code!=-1){
if (res.code != -1) {
this.medicalReportType = res.data.items; this.medicalReportType = res.data.items;
} }
}); });
@ -394,22 +345,22 @@ export default {
// this.form = {}; // this.form = {};
// this.form.parentId = data.parentId; // this.form.parentId = data.parentId;
Object.assign(this.$data.form, this.$options.data().form); Object.assign(this.$data.form, this.$options.data().form);
this.form.parentId=this.row.parentId
this.form.parentId = this.row.parentId
this.dialogVisible = true; this.dialogVisible = true;
this.title = 1; this.title = 1;
if (this.$refs.ruleForm !== undefined) { if (this.$refs.ruleForm !== undefined) {
this.$refs.ruleForm.resetFields();
this.$refs.ruleForm.resetFields();
} }
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.refinput.focus(); this.$refs.refinput.focus();
}); });
basicsetings().then((res) => { basicsetings().then((res) => {
if(res.code!=-1){
if (res.code != -1) {
this.guideoptions = res.data.items; this.guideoptions = res.data.items;
} }
}); });
physicalexaminationlist().then((res) => { physicalexaminationlist().then((res) => {
if(res.code!=-1){
if (res.code != -1) {
this.medicalReportType = res.data.items; this.medicalReportType = res.data.items;
} }
}); });
@ -426,12 +377,13 @@ export default {
checkTypeFlag: this.form.checkTypeFlag, checkTypeFlag: this.form.checkTypeFlag,
guidTypeId: this.form.guidTypeId, guidTypeId: this.form.guidTypeId,
medicalReportTypeId: this.form.medicalReportTypeId, medicalReportTypeId: this.form.medicalReportTypeId,
lineModeFlag: this.form.lineModeFlag
}).then((res) => { }).then((res) => {
if(res.code!=-1){
if (res.code != -1) {
this.$message.success("新增成功"); this.$message.success("新增成功");
this.getlist();
this.dialogVisible = false;
this.isshow=true
this.getlist();
this.dialogVisible = false;
this.isshow = true
} }
}); });
} else { } else {
@ -442,12 +394,13 @@ export default {
checkTypeFlag: this.form.checkTypeFlag, checkTypeFlag: this.form.checkTypeFlag,
guidTypeId: this.form.guidTypeId, guidTypeId: this.form.guidTypeId,
medicalReportTypeId: this.form.medicalReportTypeId, medicalReportTypeId: this.form.medicalReportTypeId,
lineModeFlag: this.form.lineModeFlag
}).then((res) => { }).then((res) => {
if(res.code!=-1){
if (res.code != -1) {
this.$message.success("新增成功"); this.$message.success("新增成功");
this.getlist();
this.dialogVisible = false;
this.isshow=true
this.getlist();
this.dialogVisible = false;
this.isshow = true
} }
}); });
} }
@ -461,13 +414,13 @@ export default {
checkTypeFlag: this.form.checkTypeFlag, checkTypeFlag: this.form.checkTypeFlag,
guidTypeId: this.form.guidTypeId, guidTypeId: this.form.guidTypeId,
medicalReportTypeId: this.form.medicalReportTypeId, medicalReportTypeId: this.form.medicalReportTypeId,
isMultiLine:this.form.isMultiLine
lineModeFlag: this.form.lineModeFlag
}).then((res) => { }).then((res) => {
if(res.code!=-1){
if (res.code != -1) {
this.$message.success("修改成功"); this.$message.success("修改成功");
this.getlist();
this.dialogVisible = false;
this.isshow=true
this.getlist();
this.dialogVisible = false;
this.isshow = true
} }
}); });
} }
@ -476,12 +429,12 @@ export default {
}, },
// //
treeclick(row) { treeclick(row) {
this.row=row
this.isshow=false
this.row = row
this.isshow = false
}, },
getlist() { getlist() {
projectlist(this.pages).then((res) => { projectlist(this.pages).then((res) => {
if(res.code!=-1){
if (res.code != -1) {
this.tableData = res.data; this.tableData = res.data;
} }
}); });
@ -496,30 +449,37 @@ export default {
@import "../../assets/css/global_form.css"; @import "../../assets/css/global_form.css";
@import "../../assets/css/global_input.css"; @import "../../assets/css/global_input.css";
@import "../../assets/css/global.css"; @import "../../assets/css/global.css";
.box { .box {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
.layeredleftright { .layeredleftright {
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
:deep .el-form-item { :deep .el-form-item {
margin-bottom: 14px; margin-bottom: 14px;
} }
/* el-dialog的头部样式 */ /* el-dialog的头部样式 */
:deep .el-dialog__header { :deep .el-dialog__header {
padding: 11px 20px 11px; padding: 11px 20px 11px;
} }
/* el-dialog的主体样式 */ /* el-dialog的主体样式 */
:deep .el-dialog__body { :deep .el-dialog__body {
padding: 0px 20px 0px; padding: 0px 20px 0px;
} }
/* el-divider样式 */ /* el-divider样式 */
:deep .el-divider--horizontal { :deep .el-divider--horizontal {
margin: 0px 0 12px; margin: 0px 0 12px;
} }
/* el-dialog的底部样式 */ /* el-dialog的底部样式 */
:deep .el-dialog__footer { :deep .el-dialog__footer {
padding: 0px 20px 14px; padding: 0px 20px 14px;

24
src/views/fee-settings/Item.vue

@ -632,6 +632,27 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<el-col :span="8">
<el-form-item label="结果换行标志" prop="">
<el-select
v-model="form.lineModeFlag"
placeholder="请选择"
style="width: 100%"
size="small"
>
<el-option
v-for="item in dict.lineModeFlag"
:key="item.id"
:label="item.displayName"
:value="item.id"
>
</el-option>
</el-select>
<!-- <el-input v-model="form.referenceRangeTypeFlag"></el-input> -->
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false" class="difference" <el-button @click="dialogVisible = false" class="difference"
@ -1530,6 +1551,7 @@ export default {
resultTemplateTypeFlag: null, resultTemplateTypeFlag: null,
inputCheck: "", inputCheck: "",
isActive: "", isActive: "",
lineModeFlag:'2'
}, },
referenceRangeTypeFlag: [ referenceRangeTypeFlag: [
@ -1787,7 +1809,7 @@ export default {
this.typeid(); this.typeid();
}, },
computed: { computed: {
...mapState(["window"]),
...mapState(["window","dict"]),
}, },
methods: { methods: {
// //

Loading…
Cancel
Save