From 9cc2ceb61fbc1896d8e78d7ec1f1b0d8ebf3e208 Mon Sep 17 00:00:00 2001 From: pengjun <158915633@qq.com> Date: Thu, 20 Jul 2023 18:09:40 +0800 Subject: [PATCH] sum --- src/components/doctorCheck/ButtonList.vue | 7 +- .../doctorCheck/PatientRegisterBase.vue | 8 +- .../doctorCheck/PatientRegisterList.vue | 5 +- src/components/sumDoctorCheck/ButtonList.vue | 347 +++++++++++++++++- src/components/sumDoctorCheck/SumPREdit.vue | 25 +- src/components/sumDoctorCheck/SumSug.vue | 236 ++++++++++++ src/store/index.js | 8 +- src/views/doctorCheck/sumDoctorCheck.vue | 6 +- 8 files changed, 605 insertions(+), 37 deletions(-) create mode 100644 src/components/sumDoctorCheck/SumSug.vue diff --git a/src/components/doctorCheck/ButtonList.vue b/src/components/doctorCheck/ButtonList.vue index bae21eb..4da0225 100644 --- a/src/components/doctorCheck/ButtonList.vue +++ b/src/components/doctorCheck/ButtonList.vue @@ -25,7 +25,7 @@ 生成小结
- 总检 + 总检
审核 @@ -240,6 +240,11 @@ export default { }); }, + //总检 + toSumDoctorCheck(){ + this.$router.push({ path: "/sumDoctorCheck" }); + }, + //更新检查项目与医生 updateDoctorCheck() { let body = { diff --git a/src/components/doctorCheck/PatientRegisterBase.vue b/src/components/doctorCheck/PatientRegisterBase.vue index 7f90c75..697589d 100644 --- a/src/components/doctorCheck/PatientRegisterBase.vue +++ b/src/components/doctorCheck/PatientRegisterBase.vue @@ -13,8 +13,7 @@
姓名 - +
性别 @@ -132,7 +131,7 @@ export default { console.log(`/api/app/patient-register/patient-register-or-patient?SType=1&PatientRegisterNo=${val}`) getapi(`/api/app/patient-register/patient-register-or-patient?SType=1&PatientRegisterNo=${val}`) .then((res) => { - if (res.code != -1) { + if (res.code != -1) { this.doctorCheckPrBaseInit() this.doctorCheck.prBase.patientRegisterNo = val objCopy(res.data,this.doctorCheck.prBase) @@ -153,6 +152,9 @@ export default { this.doctorCheckPrBaseInit() this.doctorCheck.prBase.patientNo = val objCopy(res.data,this.doctorCheck.prBase) + + this.sumPREditInit() + objCopy(res.data,this.sumDoctorCheck.sumPREdit) } }); }, diff --git a/src/components/doctorCheck/PatientRegisterList.vue b/src/components/doctorCheck/PatientRegisterList.vue index 64cf915..4f20157 100644 --- a/src/components/doctorCheck/PatientRegisterList.vue +++ b/src/components/doctorCheck/PatientRegisterList.vue @@ -289,7 +289,7 @@ export default { //挂载完成 mounted() { }, computed: { - ...mapState(["dict", "patientRegister", "customerOrg","doctorCheck"]), + ...mapState(["dict", "patientRegister", "customerOrg","doctorCheck","sumDoctorCheck"]), }, methods: { ...mapMutations(['doctorCheckPrBaseInit']), @@ -299,7 +299,8 @@ export default { rowick(row) { this.doctorCheckPrBaseInit() this.doctorCheck.prBase.patientRegisterNo = row.patientRegisterNo - objCopy(row,this.doctorCheck.prBase) + objCopy(row,this.doctorCheck.prBase) //基本信息 + objCopy(row,this.sumDoctorCheck.sumPREdit) //总检信息 }, ldddw(arrayData, key, value, display) { diff --git a/src/components/sumDoctorCheck/ButtonList.vue b/src/components/sumDoctorCheck/ButtonList.vue index 3a001e3..4aee044 100644 --- a/src/components/sumDoctorCheck/ButtonList.vue +++ b/src/components/sumDoctorCheck/ButtonList.vue @@ -1,35 +1,362 @@ + \ No newline at end of file diff --git a/src/store/index.js b/src/store/index.js index 3642e91..68e8cbe 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -39,8 +39,7 @@ export default new Vuex.Store({ patientRegisterTimes: 0, //体检人员登记窗口显示次数(弃用) addTimes: 0, //用于触发新增时初始化赋值 saveTimes:0, //用于体检登记时,触发分组调整保存 - photo: - "https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg", //单独抽出,拍照时会更新 + photo:"https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg", //单独抽出,拍照时会更新 cameraVisble: false, //拍照控件显示 patientRegisterRdInit: { id: "", //id @@ -130,7 +129,9 @@ export default new Vuex.Store({ //总检医生 sumDoctorCheck:{ - sumPREdit:{}, //总检医生时间等相关信息 + sumPREdit:{}, //总检医生时间等相关信息(sumPREditInit) + summaryList:[], //综述 + suggestionList:[], //建议 }, //公共字典数据 add by pengjun @@ -233,6 +234,7 @@ export default new Vuex.Store({ isAudit:'', //审核状态 auditDoctor:'', //审核医生 auditDate:'', //审核日期 + isLock:'', //锁定状态 } //人员体检登记显示基本信息 }, }, diff --git a/src/views/doctorCheck/sumDoctorCheck.vue b/src/views/doctorCheck/sumDoctorCheck.vue index 57cfa09..ae980ba 100644 --- a/src/views/doctorCheck/sumDoctorCheck.vue +++ b/src/views/doctorCheck/sumDoctorCheck.vue @@ -14,7 +14,7 @@
- +
@@ -50,7 +50,7 @@ import RegisterCheckList from "../../components/doctorCheck/RegisterCheckList.vue"; import CheckItemList from "../../components/doctorCheck/CheckItemList.vue"; - import CheckSumSug from "../../components/doctorCheck/CheckSumSug.vue"; + import SumSug from "../../components/sumDoctorCheck/SumSug.vue"; import SumPREdit from "../../components/sumDoctorCheck/SumPREdit.vue"; export default { @@ -59,7 +59,7 @@ PatientRegisterBase, ButtonList, CheckItemList, - CheckSumSug, + SumSug, SumPREdit }, data() {