-
+
- 项目类别
+ 项目类别
{{ node.label }}
@@ -312,7 +308,6 @@ export default {
},
methods: {
cascaderchang(v) {
- console.log(this.departmentname);
this.departmentname = v[v.length - 1];
},
//编辑弹框
@@ -322,7 +317,6 @@ export default {
this.title = 2;
this.dialogVisible = true;
basicsetings().then((res) => {
- console.log(res);
this.guideoptions = res.data.items;
});
physicalexaminationlist().then((res) => {
@@ -330,7 +324,6 @@ export default {
});
projecttype(data.id).then((res) => {
this.form = res.data;
- console.log(res);
});
// getapi(`/api/app/item/in-item-type/${data.id}`).then((res) => {
// this.itemtypedata = res.data;
@@ -340,7 +333,6 @@ export default {
getapi(`/api/app/itemtype/getbycodeparent?ItemTypeId=${data.id}`).then(
(res) => {
this.itemtypedata = res.data;
- console.log(res, "qqwqqqqqqqqqqqqqqqqq");
}
);
},
@@ -357,18 +349,18 @@ export default {
}).then(() => {
projecteditid(data.id).then((res) => {
if (res.code == 0) {
- console.log("删除成功");
+ this.$message.success("删除成功");
this.getlist();
} else {
}
});
});
- console.log(node, data);
},
append(node, data) {
- console.log(node, data);
this.form = {};
- this.form.parentId = data.id;
+ if(node&& data){
+ this.form.parentId = data.id;
+ }
this.dialogVisible = true;
this.$nextTick(() => {
this.$refs.refinput.focus();
@@ -381,15 +373,15 @@ export default {
});
},
//新增弹框
- addll() {
+ addll(node, data) {
this.form = {};
+ this.form.parentId = data.parentId;
this.dialogVisible = true;
this.title = 1;
this.$nextTick(() => {
this.$refs.refinput.focus();
});
basicsetings().then((res) => {
- console.log(res);
this.guideoptions = res.data.items;
});
physicalexaminationlist().then((res) => {
@@ -398,7 +390,6 @@ export default {
},
//确定新增或者编辑
addoredit() {
- console.log(this.form.parentId);
this.$refs.ruleForm.validate((v) => {
if (v) {
if (this.title == 1) {
@@ -418,7 +409,7 @@ export default {
guidTypeId: this.form.guidTypeId,
medicalReportTypeId: this.form.medicalReportTypeId,
}).then((res) => {
- console.log("新增成功");
+ this.$message.success("新增成功");
this.getlist();
this.dialogVisible = false;
});
@@ -431,7 +422,7 @@ export default {
guidTypeId: this.form.guidTypeId,
medicalReportTypeId: this.form.medicalReportTypeId,
}).then((res) => {
- console.log("新增成功");
+ this.$message.success("新增成功");
this.getlist();
this.dialogVisible = false;
});
@@ -447,7 +438,7 @@ export default {
guidTypeId: this.form.guidTypeId,
medicalReportTypeId: this.form.medicalReportTypeId,
}).then((res) => {
- console.log("修改成功");
+ this.$message.success("修改成功");
this.getlist();
this.dialogVisible = false;
});
@@ -457,23 +448,27 @@ export default {
},
// 点击获取每一列
rowick(row) {
- console.log(row, "11111");
},
getlist() {
projectlist(this.pages).then((res) => {
this.tableData = res.data;
- console.log(res);
});
},
},
};
diff --git a/src/views/fee-settings/Asbitem.vue b/src/views/fee-settings/Asbitem.vue
index d8d8f7e..ecf499e 100644
--- a/src/views/fee-settings/Asbitem.vue
+++ b/src/views/fee-settings/Asbitem.vue
@@ -6,7 +6,7 @@
@@ -569,7 +588,7 @@
@@ -856,7 +875,7 @@ export default {
isActive: "Y",
isActiveBox:true,
isBeforeEatBox:false,
- isCheckBox:false,
+ isCheckBox:true,
isContinueProcessBox:false,
isDiagnosisFunctionBox:false,
isItemResultMergerBox:false,
@@ -1240,10 +1259,13 @@ export default {
getapi("/api/app/organization-units/by-code-all").then((res) => {
this.organizationUnitdata = res.data;
});
- //获取组合项目 {isFilterActive:'Y'}
+ //获取组合项目
+ // getapi("/api/app/asbitem/in-filter").then((res) => {
+ // this.asbitemdata = res.data.items;
+ // });
postapi('/api/app/asbitem/getasbitemlist').then(res =>{
this.asbitemdata = res.data
- })
+ })
//获取适用性别
getapi("/api/app/for-sex").then((res) => {
this.forsexdata = res.data;
@@ -1383,8 +1405,8 @@ export default {
details:sdate
}).then((res) => {
if(res.code!=-1){
- console.log("操作成功");
this.isdislob = true;
+ this.$message.success("确定成功！");
}
})
}
@@ -1533,11 +1555,19 @@ export default {
this.projectid = res.data;
this.initprojectid=[...res.data]
});
- groupsandlist(this.pages).then((res) => {
- this.initTableData = [...res.data.items];
- this.quckDepartment=res.data.items;
- console.log(res);
+ postapi('/api/app/asbitem/getasbitemlist').then((res) => {
+ if(res.code != -1){
+ this.initTableData = res.data;
+ this.quckDepartment=[...res.data]
+ }
});
+ // groupsandlist(this.pages).then((res) => {
+ // if(res.code!=-1){
+ // this.initTableData = [...res.data.items];
+ // this.quckDepartment=res.data.items;
+ // initTableData
+ // }
+ // });
},
//ary1 需要追加的数据 ary2目标数组
updatedate() {
@@ -1555,16 +1585,23 @@ export default {
}
});
},
+ ischangsItemTypeId(v){
+ this.$refs.itemTypeIds.toggleDropDownVisible();
+ },
//项目类别选择
ischangs(v) {
if(v){
if(this.curRow.id==undefined || this.curRow.id==""){
this.$message.warning("请先选择组合项目")
}else{
- getapi(`/api/app/item/in-item-type/${v}`).then((res) => {
- let bq=[]
+ this.$refs.example.toggleDropDownVisible();
+ let last = v.slice(-1)[0]
+ getapi(`/api/app/item/in-item-type/${last}`).then((res) => {
+ if(res.code!=-1){
+ let bq=[]
bq = res.data.filter(item => !this.rightdata.some(ele=>ele.id === item.id));
this.leftdata = [...bq];
+ }
});
}
}else{
@@ -1682,13 +1719,14 @@ export default {
if (this.form.id == undefined) {
this.$message.warning("请点击选择操作的数据");
} else {
- this.dialogVisible = true;
this.title = 2;
+ this.dialogVisible = true;
if (this.$refs.ruleForm !== undefined){
this.$refs.ruleForm.resetFields()
}
asbitemgetid(this.form.id).then((res) => {
- this.form=res.data
+ if(res.code!=-1){
+ this.form=res.data
if (res.data.isItemResultMerger == 'Y') {
this.form.isItemResultMergerBox = true;
} else {
@@ -1724,6 +1762,7 @@ export default {
} else {
this.form.isActiveBox = false;
}
+ }
});
//性别
// examinationgender().then((res) => {
@@ -1748,6 +1787,10 @@ export default {
});
}
},
+ editcancellation(){
+ this.dialogVisible = false
+ this.$refs.itemTypeIds.toggleDropDownVisible();
+ },
//确定新增或者编辑
addoredit() {
this.$refs.ruleForm.validate((v) => {
@@ -1757,7 +1800,7 @@ export default {
displayName: this.form.displayName,
shortName: this.form.shortName,
forSexId: this.form.forSexId,
- itemTypeId: this.form.itemTypeId,
+ itemTypeId: this.form.itemTypeId.slice(-1)[0],
price: Number(this.form.price),
deviceTypeId: this.form.deviceTypeId,
invoiceItemTypeId: this.form.invoiceItemTypeId,
@@ -1782,6 +1825,7 @@ export default {
this.$refs['tableData'].setCurrentRow(res.data);
this.rowick(res.data)
})
+ this.$refs.itemTypeIds.toggleDropDownVisible();
}
});
} else if (this.title == 2) {
@@ -1789,7 +1833,7 @@ export default {
displayName: this.form.displayName,
shortName: this.form.shortName,
forSexId: this.form.forSexId,
- itemTypeId: this.form.itemTypeId,
+ itemTypeId: this.form.itemTypeId.slice(-1)[0],
price: Number(this.form.price),
deviceTypeId: this.form.deviceTypeId,
invoiceItemTypeId: this.form.invoiceItemTypeId,
@@ -1815,6 +1859,7 @@ export default {
})
this.curRow={...res.data}
this.dialogVisible = false;
+ this.$refs.itemTypeIds.toggleDropDownVisible();
}
});
}
@@ -1865,16 +1910,16 @@ export default {
},
rowick(row) {
this.curRow={...row}
- asbitemgetid(row.id).then((res) => {
- this.curRow = { ...res.data };
- this.form = res.data;
- });
+ // asbitemgetid(row.id).then((res) => {
+ // this.curRow = { ...res.data };
+ // this.form = res.data;
+ // });
this.values=row.itemTypeId
getapi(
`/api/app/asbitem-detail/asbitem-detail-in-item?AsbitemId=${row.id}`
).then((res) => {
this.rightdata = [...res.data];
- getapi(`/api/app/item/in-item-type/${row.itemTypeId}`).then((res) => {
+ getapi(`/api/app/item/in-item-type/${this.values}`).then((res) => {
// this.leftdata = [...res.data];
let bq=[]
bq = res.data.filter(item => !this.rightdata.some(ele=>ele.id === item.id));
@@ -2003,3 +2048,21 @@ export default {
margin-bottom: 0;
}
+
diff --git a/src/views/fee-settings/Item.vue b/src/views/fee-settings/Item.vue
index 2d2a622..87ed002 100644
--- a/src/views/fee-settings/Item.vue
+++ b/src/views/fee-settings/Item.vue
@@ -112,21 +112,18 @@
-
-
-
+
-
-
@@ -610,6 +607,7 @@
v-model="rusetform.resultStatusId"
placeholder="请选择"
filterable
+ @change="quckRusetform"
>
{
if(res.code!=-1){
- console.log("新增成功");
+ this.$message.success("新增成功");
this.fssubdex = "";
this.curRow.referenceRangeTypeFlag=this.referencerangevalue
}
@@ -1407,7 +1405,7 @@ export default {
};
putapi(`/api/app/reference-range/${this.fssubdexDete.id}/text`, obj).then((res) => {
if(res.code!=-1){
- console.log("修改成功");
+ this.$message.success("修改成功");
this.fssubdex = "";
this.curRow.referenceRangeTypeFlag=this.referencerangevalue
}
@@ -1476,7 +1474,7 @@ export default {
if(this.diagnostiele==1){
postapi("/api/app/item-result-match", this.editdigoisceditingform).then((res) => {
if(res.code!=-1){
- console.log("添加成功");
+ this.$message.success("添加成功");
this.diagnosticediting = false;
this.putDiagnosis()
}
@@ -1490,8 +1488,9 @@ export default {
}
).then((res) => {
if(res.code!=-1){
- console.log("修改成功");
+ this.$message.success("修改成功");
this.diagnosticediting = false;
+ this.curRowes=res.data
this.putDiagnosis()
}
});
@@ -1500,9 +1499,10 @@ export default {
});
},
diagnosick(row){
- getapi(`/api/app/item-result-match/${row.id}`).then((res) => {
- this.curRowes = res.data;
- });
+ this.curRowes = row;
+ // getapi(`/api/app/item-result-match/${row.id}`).then((res) => {
+ // this.curRowes = res.data;
+ // });
},
editDiagnosis(){
this.editdigoisceditingform={ ...this.curRowes }
@@ -1531,7 +1531,7 @@ export default {
deletapi(`/api/app/item-result-match/${this.editdigoisceditingform.id}`).then(
(res) => {
if(res.code!=-1){
- console.log("删除成功");
+ this.$message.success("删除成功");
Object.assign(this.$data.editdigoisceditingform, this.$options.data().editdigoisceditingform)
this.curRowes={}
this.putDiagnosis()
@@ -1613,7 +1613,7 @@ export default {
putapi(
`/api/app/itemresulttemplate/updatemanysort?id=${this.rusetform.id}&SortType=2`
).then((res) => {
- console.log("操作成功");
+ this.$message.success("操作成功");
this.resultlist();
});
}
@@ -1626,7 +1626,7 @@ export default {
putapi(
`/api/app/itemresulttemplate/updatemanysort?id=${this.rusetform.id}&SortType=1`
).then((res) => {
- console.log("操作成功");
+ this.$message.success("操作成功");
this.resultlist();
});
}
@@ -1646,7 +1646,7 @@ export default {
deletapi(`/api/app/item-result-template/${this.rusetform.id}`).then(
(res) => {
if(res.code!=-1){
- console.log("删除成功");
+ this.$message.success("删除成功");
Object.assign(this.$data.rusetform, this.$options.data().rusetform)
this.curRows={}
this.resultlist();
@@ -1658,10 +1658,10 @@ export default {
}
},
reustclick(row) {
- // this.rusetform = row;
- getapi(`/api/app/item-result-template/${row.id}`).then((res) => {
- this.curRows = res.data;
- });
+ this.curRows = row;
+ // getapi(`/api/app/item-result-template/${row.id}`).then((res) => {
+ // this.curRows = res.data;
+ // });
},
//项目结果模板新增弹框
resultediting() {
@@ -1687,7 +1687,7 @@ export default {
}
postapi(`/api/app/item-result-template`, this.rusetform).then((res) => {
if(res.code!=-1){
- console.log("新增成功");
+ this.$message.success("新增成功");
this.ruesttieledialogVisible = false;
this.resultlist();
}
@@ -1701,8 +1701,9 @@ export default {
this.rusetform
).then((res) => {
if(res.code!=-1){
- console.log("修改成功");
+ this.$message.success("修改成功");
this.ruesttieledialogVisible = false;
+ this.curRows={...res.data}
this.resultlist();
}
});
@@ -1788,9 +1789,10 @@ export default {
this.rusetform.itemId = this.form.id;
},
quckRusetform(e){
- if(!e){
- this.remoteMethod()
- }
+ // if(!e){
+ // this.remoteMethod()
+ // }
+ this.$forceUpdate()
},
//获取项目类别列表
getmedicalconclusionlist() {
@@ -1803,12 +1805,13 @@ export default {
// this.form.customerOrgId = id;
// console.log(id);
// this.form.customerOrgId=this.form.customerOrgId[0]
- if(this.form.itemTypeId){
- this.form.itemTypeId.forEach((item) => {
- // console.log(item);
- this.form.itemTypeId = item;
- });
- }
+ // if(this.form.itemTypeId){
+ // this.form.itemTypeId.forEach((item) => {
+ // // console.log(item);
+ // this.form.itemTypeId = item;
+ // });
+ // }
+ this.$refs.itemTypeId.toggleDropDownVisible();
},
gettypelist(listdata) {
listdata.forEach((items) => {
@@ -2037,7 +2040,7 @@ export default {
});
projectdreog({ itemList: result }).then((res) => {
if(res.code!=-1){
- console.log("操作成功");
+ this.$message.success("操作成功");
this.isshow = true;
}
// this.getlist();
@@ -2086,7 +2089,7 @@ export default {
});
putapi("/api/app/itemresulttemplate/updatesortmany",{ itemList: result }).then((res) => {
if(res.code!=-1){
- console.log("操作成功");
+ this.$message.success("操作成功");
this.isshows = true;
}
// this.getlist();
@@ -2135,7 +2138,7 @@ export default {
`/api/app/itemresulttemplate/updatemanysort?id=${this.rusetform.id}&SortType=1`
).then((res) => {
if(res.code!=-1){
- console.log("操作成功");
+ this.$message.success("操作成功");
this.resultlist();
}
});
@@ -2145,13 +2148,13 @@ export default {
resulttoppings(){
this.rusetform = { ...this.curRows };
if (this.rusetform.id == undefined) {
- console.log("请点击选择操作的数据");
+ this.$message.warning("请点击选择操作的数据");
} else {
putapi(
`/api/app/itemresulttemplate/updatemanysort?id=${this.rusetform.id}&SortType=2`
).then((res) => {
if(res.code!=-1){
- console.log("操作成功");
+ this.$message.success("操作成功");
this.resultlist();
}
});
@@ -2171,7 +2174,7 @@ export default {
});
putapi("/api/app/itemresultmatch/updatesortmany",{ itemList: result }).then((res) => {
if(res.code!=-1){
- console.log("操作成功");
+ this.$message.success("操作成功");
this.isshowes = true;
}
// this.getlist();
@@ -2214,7 +2217,7 @@ export default {
`/api/app/itemresultmatch/updatesortmany?id=${this.editdigoisceditingform.id}&SortType=1`
).then((res) => {
if(res.code!=-1){
- console.log("操作成功");
+ this.$message.success("操作成功");
this.resultlist();
}
});
@@ -2230,7 +2233,7 @@ export default {
`/api/app/itemresultmatch/updatesortmany?id=${this.editdigoisceditingform.id}&SortType=2`
).then((res) => {
if(res.code!=-1){
- console.log("操作成功");
+ this.$message.success("操作成功");
this.resultlist();
}
});
@@ -2246,11 +2249,11 @@ export default {
toppings() {
this.form = { ...this.curRow };
if (this.form.id == undefined) {
- console.log("请点击选择操作的数据");
+ this.$message.warning("请点击选择操作的数据");
} else {
projttitem(this.form.id, 2).then((res) => {
if(res.code!=-1){
- console.log("操作成功");
+ this.$message.success("操作成功");
this.getItemTypeIdList();
}
});
@@ -2264,7 +2267,7 @@ export default {
} else {
projttitem(this.form.id, 1).then((res) => {
if(res.code!=-1){
- console.log("操作成功");
+ this.$message.success("操作成功");
this.getItemTypeIdList();
}
});
@@ -2283,7 +2286,7 @@ export default {
})
.then(() => {
projectdeleft(this.form.id).then((res) => {
- console.log("删除成功");
+ this.$message.success("删除成功");
this.getItemTypeIdList();
Object.assign(this.$data.form, this.$options.data().form)
this.curRow=this.$options.data().curRow
@@ -2294,16 +2297,17 @@ export default {
},
//点击列表通过id查询
rowick(row) {
- posjrctid(row.id).then((res) => {
- this.curRow = { ...res.data };
- // console.log(res);
- // this.form = res.data;
- });
+ this.curRow=row
+ // posjrctid(row.id).then((res) => {
+ // this.curRow = { ...res.data };
+ // });
+ },
+ change(e){
+ this.$forceUpdate();
},
//编辑弹框
editpopup() {
this.form = { ...this.curRow };
- console.log(this.form)
if (this.form.id == undefined) {
this.$message.warning("请选择操作的数据");
} else {
@@ -2392,9 +2396,10 @@ export default {
if (v) {
if (this.title == 1) {
this.form.price = Number(this.form.price);
+ this.form.itemTypeId=this.form.itemTypeId.slice(-1)[0]
addproject(this.form).then((res) => {
if (res.code == 1) {
- console.log("新增成功");
+ this.$message.success("新增成功");
this.getItemTypeIdList();
this.dialogVisible = false;
this.$nextTick(()=>{
@@ -2404,8 +2409,9 @@ export default {
}
});
} else if (this.title == 2) {
+ this.form.itemTypeId=this.form.itemTypeId.slice(-1)[0]
projectedit(this.form.id, this.form).then((res) => {
- console.log("修改成功");
+ this.$message.success("修改成功");
this.tableData.forEach((item,index)=>{
if(res.data.id==item.id){
this.$set(this.tableData,index,res.data)
@@ -2576,3 +2582,21 @@ export default {
border-color: #fff !important;
}
+
- 项目类别
-
-
-
+ 新增项目类别
-
+
-
+
项目类别
-
-
+ -->
+
+
搜索选择
-->
-
+
@@ -188,7 +202,7 @@
>
-->
- {{ item.displayName }}
{{ item.displayName }}