+
-
- 批量调整分组只针对单位体检有效,个人体检将忽略此操作;不能调整已收费或已检的项目及已总检的体检人员。
-
+
批量调整分组只针对单位体检有效,个人体检将忽略此操作;不能调整已收费或已检的项目及已总检的体检人员。
分组
-
-
+
+
-
个人支付
-
单位支付
-
免费
+
个人支付
+
单位支付
+
免费
-
保留加做项目(包括不属于原分组的、没有设置分组的)
+
保留加做项目(包括不属于原分组的、没有设置分组的)
-
+
@@ -79,30 +52,30 @@ import {
import ElProgressOCX from "../report/ElProgressOCX.vue";
export default {
- components: {
+ components: {
ElProgressOCX,
},
- props:["multipleSelection"],
+ props: ["multipleSelection"],
data() {
return {
- customerOrgGroup:[], //单位分组
+ customerOrgGroup: [], //单位分组
groupBatch: {
patientRegisterId: null,
customerOrgGroupId: null,
payTypeFlag: "1", //0:个人付费,1:单位付费 2:免费
isReserveAddAsbitem: true, //是否保留加做项目
},
-
+ groupBatchInit:{},
};
},
created() {
-
+ this.groupBatchInit = deepCopy(this.groupBatch)
},
//挂载完成
mounted() {
-
+ this.getCustomerOrgGroup(this.multipleSelection[0].customerOrgRegisterId)
},
computed: {
...mapState([
@@ -116,18 +89,21 @@ export default {
]),
},
methods: {
- moment,dddw,deepCopy,
-
+ moment, dddw, deepCopy,
+
//获取单位分组 /api/app/customer-org-group/in-customer-org-id/3a0c0444-d7a0-871f-4074-19faf1655caf
- getCustomerOrgGroup(customerOrgId) {
+ getCustomerOrgGroup(customerOrgRegisterId) {
+ this.customerOrgGroup = []
+ this.groupBatch = deepCopy(this.groupBatchInit)
getapi(
- `/api/app/customer-org-group/in-customer-org-id/${customerOrgId}`
+ `/api/app/customerorggroup/getlistinfilter?CustomerOrgRegisterId=${customerOrgRegisterId}`
).then((res) => {
console.log("getCustomerOrgGroup", res.data);
if (res.code == 1) {
- this.customerOrgGroup = res.data;
+ this.customerOrgGroup = res.data.items;
}
});
+
},
//批量更新分组处理(确定)
@@ -170,12 +146,12 @@ export default {
//监听事件
watch: {
- "dataTransOpts.refresh.asbitem.M":{
- immediate: true, // 立即执行
+ "dataTransOpts.plus.PatientRegisterEditGroupBatch": {
+ // immediate: true, // 立即执行
// deep: true, // 深度监听复杂类型内变化
- handler(newVal,oldVal){
+ handler(newVal, oldVal) {
console.log(`watch: 刷新单位分组 newVal: ${newVal} oldVal:${oldVal}`)
- this.getCustomerOrgGroup(this.multipleSelection[0].customerOrgParentId)
+ if (newVal != oldVal) this.getCustomerOrgGroup(this.multipleSelection[0].customerOrgRegisterId)
}
},
},
@@ -199,5 +175,4 @@ export default {
.btnClass {
width: 100px;
}
-
diff --git a/src/components/patientRegister/PatientRegisterEditItemBatch.vue b/src/components/patientRegister/PatientRegisterEditItemBatch.vue
index b8893ca..73078dd 100644
--- a/src/components/patientRegister/PatientRegisterEditItemBatch.vue
+++ b/src/components/patientRegister/PatientRegisterEditItemBatch.vue
@@ -112,6 +112,7 @@ export default {
asbitemsTemp: [], //删除或增加项目临时用
asbitemCurr: {}, //当前选中要删除的项目(批量调整)
},
+ asbitemBatchInit:{},
asbItemQuick: [], //快速选择未过滤前全部项目
quickAsb: [], //可供快速选择的组合项目
@@ -121,13 +122,13 @@ export default {
// 组件创建完成
created() {
-
+ this.asbitemBatchInit = deepCopy(this.asbitemBatch)
},
//挂载完成
mounted() {
// 初始化数据,如:在用组合项目
- // this.dictInit()
+ this.dictInit()
},
computed: {
@@ -349,7 +350,7 @@ export default {
// 初始化字典信息
dictInit() {
-
+ this.asbitemBatch = deepCopy(this.asbitemBatchInit)
// 获取在用的组合项目
postapi('/api/app/asbitem/GetBasicList', { isFilterActive: 'Y' }).then(res => {
if (res.code != -1) {
@@ -363,12 +364,12 @@ export default {
//监听事件
watch: {
- "dataTransOpts.refresh.asbitem.M": {
- immediate: true, // 立即执行
+ "dataTransOpts.plus.PatientRegisterEditItemBatch": {
+ // immediate: true, // 立即执行
// deep: true, // 深度监听复杂类型内变化
handler(newVal, oldVal) {
console.log(`watch: 刷新在用组合项目 newVal: ${newVal} oldVal:${oldVal}`)
- this.dictInit()
+ if(newVal != oldVal) this.dictInit()
}
},
},
diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index 324433d..c2cded7 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -980,9 +980,9 @@ export default {
if (this.multipleSelection.length < 1) {
this.$message.info("请选择要操作的记录!");
return;
- }
-
+ }
this.dialogWin.PatientRegisterEditGroupBatch = true;
+ this.dataTransOpts.plus.PatientRegisterEditGroupBatch++
},
@@ -1006,7 +1006,8 @@ export default {
}
this.dialogWin.PatientRegisterEditItemBatch = true;
-
+ this.dataTransOpts.plus.PatientRegisterEditItemBatch++
+
},
//检验申请
diff --git a/src/components/sumDoctorCheck/SumAsbItemStatus.vue b/src/components/sumDoctorCheck/SumAsbItemStatus.vue
index f7c8980..67b8093 100644
--- a/src/components/sumDoctorCheck/SumAsbItemStatus.vue
+++ b/src/components/sumDoctorCheck/SumAsbItemStatus.vue
@@ -1,5 +1,5 @@
-
+
未检组合项目:
diff --git a/src/components/sumDoctorCheck/SumDiagnosis.vue b/src/components/sumDoctorCheck/SumDiagnosis.vue
index a17e0a6..1007533 100644
--- a/src/components/sumDoctorCheck/SumDiagnosis.vue
+++ b/src/components/sumDoctorCheck/SumDiagnosis.vue
@@ -73,7 +73,7 @@ export default {
...mapState(["window", "dict","dataTransOpts", "patientRegister", "customerOrg", "doctorCheck", "sumDoctorCheck", "report"]),
sumHeight(){
let tempHeight = this.window.pageHeight < 600 ? 600:this.window.pageHeight
- return tempHeight - 352
+ return tempHeight - 367
},
},
methods: {
@@ -85,7 +85,6 @@ export default {
this.diagnosisesAll = res.data
//过滤已选的诊断
this.filterDiagnosises()
-
}
})
diff --git a/src/components/sumDoctorCheck/SumSug.vue b/src/components/sumDoctorCheck/SumSug.vue
index 769395c..7e42a24 100644
--- a/src/components/sumDoctorCheck/SumSug.vue
+++ b/src/components/sumDoctorCheck/SumSug.vue
@@ -118,7 +118,7 @@ export default {
sumHeight(){
let tempHeight = this.window.pageHeight < 600 ? 600:this.window.pageHeight
- return tempHeight - 320
+ return tempHeight - 335
},
},
diff --git a/src/store/index.js b/src/store/index.js
index 07df6f4..154d2e5 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -257,7 +257,7 @@ export default new Vuex.Store({
{ id: "2", displayName: "仅页面节点" },
{ id: "3", displayName: "按钮或事件" },
],
- lineModeFlag:[
+ lineModeFlag: [
{ id: "0", displayName: "不换行" },
{ id: "1", displayName: "换行" },
{ id: "2", displayName: "继承项目类别换行属性" },
@@ -314,7 +314,7 @@ export default new Vuex.Store({
role_menu_info: { S: 0, M: 0 }, // 角色对应的菜单
sum_diagnosis: { S: 0, M: 0 }, // 总检诊断
- sumDoctor:{ S: 0, M: 0 }, // 虚拟表 触发强制刷新 (sumDoctor.M 合并包含:综述、建议、对比、历史等,不包含总检诊断)
+ sumDoctor: { S: 0, M: 0 }, // 虚拟表 触发强制刷新 (sumDoctor.M 合并包含:综述、建议、对比、历史等,不包含总检诊断)
},
//表当前数据(单条记录 S--single)
tableS: {
@@ -358,16 +358,17 @@ export default new Vuex.Store({
},
plus: {
clearPatientRegisterQuery: 0, //清空人员登记界面查询条件
- PatientRegisterEditItemBatch:0, //刷新批量调整项目窗口
+ PatientRegisterEditGroupBatch: 0, //刷新批量调整分组窗口
+ PatientRegisterEditItemBatch: 0, //刷新批量调整项目窗口
}
},
// 弹窗控制
dialogWin: {
- ContactPersonEdit:false, // 联系人
+ ContactPersonEdit: false, // 联系人
CustomerOrgGroupEdit: false, // 单位分组 新增/编辑
- charge:false, // 收费窗口
+ charge: false, // 收费窗口
PatientList: false, // 体检人员档案列表
PatientRegisterEdit: false, // 体检人员登记 新增/编辑
PatientRegisterForChoose: false, // 体检人员登记列表
diff --git a/src/views/doctorCheck/sumDoctorCheck.vue b/src/views/doctorCheck/sumDoctorCheck.vue
index 998b169..cb9ecfe 100644
--- a/src/views/doctorCheck/sumDoctorCheck.vue
+++ b/src/views/doctorCheck/sumDoctorCheck.vue
@@ -1,34 +1,35 @@
-
+
-
+
@@ -107,7 +108,7 @@ export default {
},
methods: {
-
+
//数据初始化
dictInit() {
//性别
@@ -176,7 +177,7 @@ export default {
});
//套餐
- postapi("/api/app/medicalpackage/GetBasicList",{}).then((res) => {
+ postapi("/api/app/medicalpackage/GetBasicList", {}).then((res) => {
if (res.code == 1) {
this.dict.medicalPackage = res.data;
}
@@ -204,7 +205,7 @@ export default {
}
});
- postapi("/api/app/asbitem/GetBasicList",{isFilterActive:'Y'}).then((res) => {
+ postapi("/api/app/asbitem/GetBasicList", { isFilterActive: 'Y' }).then((res) => {
if (res.code == 1) {
this.dict.asbItemAll = res.data;
}
@@ -213,7 +214,7 @@ export default {
console.log("dict", this.dict);
},
- fnSetSuggestionFocus(id){
+ fnSetSuggestionFocus(id) {
console.log('in fnSetSuggestionFocus')
this.curGetFocusSuggestionId = id
},
@@ -221,7 +222,7 @@ export default {
//监听事件()
watch: {
-
+
},
};
@@ -230,5 +231,4 @@ export default {
@import '../../assets/css/global_input.css';
@import '../../assets/css/global_table.css';
@import '../../assets/css/global.css';
-