+
{{ scope.row[dropCol[index].prop] == "Y" ? "是" : "否" }}
+
{{ scope.row.customerOrgParentName
? scope.row.customerOrgParentName
@@ -314,6 +323,13 @@ export default {
{ label: "登记人", prop: "creatorName", minWidth: 80, align: "center" },
{ label: "登记日期", prop: "creationTime", minWidth: 80, align: "center" },
{ label: "是否上传", prop: "isUpload", minWidth: 80, align: "center" },
+ { label: "高原/健康", prop: "qztlType", minWidth: 90, align: "center" },
+ { label: "行车", prop: "qztlIsMain", minWidth: 50, align: "center" },
+ { label: "从业", prop: "qztlIsCy", minWidth: 50, align: "center" },
+ { label: "普速", prop: "qztlIsCw", minWidth: 50, align: "center" },
+ { label: "高铁", prop: "qztlIsGt", minWidth: 50, align: "center" },
+ { label: "职害", prop: "qztlIsWh", minWidth: 50, align: "center" },
+ { label: "复检", prop: "qztlIsFj", minWidth: 50, align: "center" },
],
dom: null, //用于滚动加载数据
@@ -616,7 +632,7 @@ export default {
if (lfind > -1) {
// 弹出编辑框，只有在编辑框显示时，才去触发获取数据
- this.dataTransOpts.tableS.patient_register.id = this.tableData[lfind].id
+ this.dataTransOpts.tableS.patient_register = deepCopy(this.tableData[lfind])
this.tableDataCurrentRow = deepCopy(this.tableData[lfind])
this.dataTransOpts.refresh.register_check_asbitem.M++ //触发所选组合项目刷新
}
@@ -720,7 +736,7 @@ export default {
let res = await postapi('/api/app/patientregister/getlistinfilter', { patientRegisterNo: this.dataTransOpts.tableS.patient_register.patientRegisterNo })
if (res.code != 1) return
- let currentRow = res.data[0]
+ let currentRow = res.data.items[0]
// this.tableData.forEach(e => {
// e.choosed = false
@@ -780,7 +796,7 @@ export default {
})
.then(() => {
//// console.log('{patientRegisterIds}',{patientRegisterIds})
- return postapi(`/ api / app / patient - register / delete -many`, {
+ return postapi('/api/app/patient-register/delete-many', {
patientRegisterIds,
});
})
@@ -1062,7 +1078,7 @@ export default {
}
try {
- res = await postapi(`/ api / app / lisrequest / setlisrequest ? PatientRegisterId = ${ prId }`);
+ res = await postapi(`/ api / app / lisrequest / setlisrequest ? PatientRegisterId = ${prId}`);
// console.log(`/ api / app / lisrequest / setlisrequest ? PatientRegisterId = ${ prId }`,res);
} catch (error) {
return;
@@ -1146,7 +1162,7 @@ export default {
})
.catch((err) => {
// console.log('打印检验条码错误', err)
- this.$message.warning({ showClose: true, message: `${ err }` });
+ this.$message.warning({ showClose: true, message: `${err}` });
});
} else {
@@ -1196,12 +1212,12 @@ export default {
})
.then(res => {
if (res && res.code < 0) {
- this.$message.error({ showClose: true, message: `${ res.message }` });
+ this.$message.error({ showClose: true, message: `${res.message}` });
}
})
.catch((err) => {
// console.log('打印检验条码错误', err)
- this.$message.error({ showClose: true, message: `${ err }` });
+ this.$message.error({ showClose: true, message: `${err}` });
});
}
},
@@ -1254,7 +1270,7 @@ export default {
})
.catch((err) => {
// console.log('打印pacs条码错误', err)
- this.$message.warning({ showClose: true, message: `${ err }` });
+ this.$message.warning({ showClose: true, message: `${err}` });
});
} else {
/*
@@ -1302,12 +1318,12 @@ export default {
})
.then(res => {
if (res && res.code < 0) {
- this.$message.error({ showClose: true, message: `${ res.message }` });
+ this.$message.error({ showClose: true, message: `${res.message}` });
}
})
.catch((err) => {
// console.log('打印pacs条码错误', err)
- this.$message.error({ showClose: true, message: `${ err }` });
+ this.$message.error({ showClose: true, message: `${err}` });
});
}
},
diff --git a/src/components/patientRegister/customerOrgTreeAll.vue b/src/components/patientRegister/customerOrgTreeAll.vue
index bcb5285..5ad44b1 100644
--- a/src/components/patientRegister/customerOrgTreeAll.vue
+++ b/src/components/patientRegister/customerOrgTreeAll.vue
@@ -85,8 +85,9 @@ export default {
//点击树节点
treeclick(data) {
+ // console.log('data',data)
this.patientRegister.query.customerOrgId = data.id;
-
+ this.patientRegister.query.customerOrgName = data.displayName;
this.dataTransOpts.plus.PatientRegisterEditQuery++
//获取体检单位父级ID
// this.getCustomerOrgParentId(data.id);
diff --git a/src/components/patientRegister/patientRegisterQuery.vue b/src/components/patientRegister/patientRegisterQuery.vue
index 3bc6d2e..82935cd 100644
--- a/src/components/patientRegister/patientRegisterQuery.vue
+++ b/src/components/patientRegister/patientRegisterQuery.vue
@@ -132,12 +132,14 @@ export default {
return
}
+ // 获取顶级ID
getapi(`/api/app/customer-org/parent/${customerOrgId}`).then(res => {
- if (res.code != - 1) {
+ if (res.code > - 1) {
+ this.patientRegister.query.CustomerOrgParentId = res.data
return getapi(`/api/app/customerorgregister/getlistincustomerorgid?CustomerOrgId=${res.data}`)
}
}).then(res => {
- if (res.code != -1) {
+ if (res && res.code > -1) {
this.customerOrgRegisterList = res.data;
if (res.data.length > 0) {
this.patientRegister.query.customerOrgRegister = res.data[res.data.length - 1];
diff --git a/src/store/index.js b/src/store/index.js
index 286c29e..84cdb1d 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -129,7 +129,7 @@ export default new Vuex.Store({
endDate: null,
containRefuse: true, //包含弃检项目
times: 0, //触发查询次数
- customerOrgId: "", //体检单位ID
+ customerOrgId: "", //体检单位ID
CustomerOrgParentId: "", //单位父级ID
customerOrgFlag: true, //单位作为查询条件
customerOrgRegister: { id: '' }, //单位体检次数
@@ -309,7 +309,7 @@ export default new Vuex.Store({
menu_info: { S: 0, M: 0 }, // 菜单与页面
lis_request: { S: 0, M: 0 }, // 检验申请（条码）
patient_register: { S: 0, M: 0 }, // 体检人员记录
- register_check_asbitem: { S: 0, M: 0, D: 0 }, // 体检人员登记的项目（合并前）
+ register_check_asbitem: { S: 0, M: 0, D: 0, OnlyRefreshAsbitem: 0 }, // 体检人员登记的项目（合并前）
register_check: { S: 0, M: 0 }, // 体检人员登记的项目（合并后）
register_check_item: { S: 0, M: 0 }, // 体检人员登记的明细项目
role_menu_info: { S: 0, M: 0 }, // 角色对应的菜单
diff --git a/src/views/customerOrg/patientRegister.vue b/src/views/customerOrg/patientRegister.vue
index 74dbfc7..a9aa66a 100644
--- a/src/views/customerOrg/patientRegister.vue
+++ b/src/views/customerOrg/patientRegister.vue
@@ -66,8 +66,7 @@ export default {
...mapState(["window","dataTransOpts", "dict", "patientRegister", "customerOrg"]),
},
- methods: {
- ...mapActions(["getCustomerOrgGroup"]),
+ methods: {
//数据初始化
dictInit() {
//性别（仅档案用）
@@ -183,18 +182,7 @@ export default {
//监听事件()
watch: {
- //1级单位值改变，分组改变
- "patientRegister.query.CustomerOrgParentId"(newVal, oldVal) {
- console.log(
- "watch patientRegister.query.CustomerOrgParentId newVal：",
- newVal,
- "oldVal：",
- oldVal
- );
- if (newVal != oldVal && newVal !== this.dict.personOrgId) {
- this.getCustomerOrgGroup(newVal);
- }
- },
+
},
};
diff --git a/src/views/doctorCheck/sumDoctorCheck.vue b/src/views/doctorCheck/sumDoctorCheck.vue
index 5ef8f5b..62d28af 100644
--- a/src/views/doctorCheck/sumDoctorCheck.vue
+++ b/src/views/doctorCheck/sumDoctorCheck.vue
@@ -233,7 +233,7 @@ export default {
// immediate:true,
handler(newVal, oldVal) {
console.log(`watch 总检--历次综述建议 newVal: ${newVal}, oldVal: ${oldVal} `);
- if(newVal != oldVal) this.dataTransOpts.refresh.sumDoctor.M++
+ if(newVal != oldVal && newVal != '1') this.dataTransOpts.refresh.sumDoctor.M++
}
},