diff --git a/src/App.vue b/src/App.vue index 8ee3cc1..24e4bb8 100644 --- a/src/App.vue +++ b/src/App.vue @@ -176,7 +176,7 @@ tipConfirm() { this.tip.visible = false; const name = this.pushRouter[this.tip.k]; - console.log('name: ', name); + // console.log('name: ', name); this.$router.push({ name, }); diff --git a/src/components/keyboard.vue b/src/components/keyboard.vue index 46e13be..7419b1e 100644 --- a/src/components/keyboard.vue +++ b/src/components/keyboard.vue @@ -229,7 +229,7 @@ // 父组件改变值 handleOld() { // 获取父组件存的值后画数字 - if (this.oldValue != '') { + if (this.oldValue && this.oldValue != '') { for (const item of this.oldValue) { const span = document.createElement('span') //创建包含值的元素 span.className = 'val' diff --git a/src/layouts/BasicLayout.vue b/src/layouts/BasicLayout.vue index 09dc6ec..033990b 100644 --- a/src/layouts/BasicLayout.vue +++ b/src/layouts/BasicLayout.vue @@ -103,7 +103,7 @@
当前版本: - 正式版v{{loginInfo?.version}} + 正式版 {{loginInfo?.version}}
@@ -178,7 +178,6 @@ }, beforeRouteEnter(to, from, next) { next((vm) => { - console.log('beforeRouteEnter', to) if (to.fullPath == '/document') { vm.current = 1 vm.current_ = 1 diff --git a/src/main.js b/src/main.js index 93c760a..3b46ced 100644 --- a/src/main.js +++ b/src/main.js @@ -41,7 +41,6 @@ Vue.prototype.utils = util; router.beforeEach(async (to, from, next) => { let token = localStorage.getItem('anyringToken'); - console.log(to) if (to.path != '/login' && !token) { next('/login') return diff --git a/src/utils/index.js b/src/utils/index.js index e65bcc6..618ba54 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -258,7 +258,7 @@ function toDownLoad(path) { function calculateAge(idCard) { let patientAge = 0 - if (idCard.length === 18) { + if (idCard && idCard.length === 18) { // 提取出生日期（前 6 位） let birthDate = idCard.substring(6, 14); diff --git a/src/views/Patient/components/patient-create.vue b/src/views/Patient/components/patient-create.vue index a6c54a7..6a6b7d7 100644 --- a/src/views/Patient/components/patient-create.vue +++ b/src/views/Patient/components/patient-create.vue @@ -141,7 +141,7 @@ open(data) { this.createVisible = true; this.confirmLoading = false; - if (data.firstAidId) { + if (data?.firstAidId) { this.title = "编辑患者"; queryById({ firstAidId: data.firstAidId, @@ -312,7 +312,6 @@ // } console.log(this.patientId) if (this.form.id) { - let res = await createPatient({ param: { ...this.form, @@ -326,15 +325,14 @@ msg } = res; if (code === 200) { - this.confirmLoading = true; - this.createVisible = false; - this.$message.success('修改成功'); + // this.confirmLoading = true; + // this.createVisible = false; + this.close() this.$emit('on-success', data); } else { this.confirmLoading = false; } - - + this.$message.success(msg); } else { let res = await createPatient({ param: { @@ -348,13 +346,15 @@ msg } = res; if (code === 200) { - this.confirmLoading = true; - this.createVisible = false; - this.$message.success('创建成功'); + // this.confirmLoading = true; + // this.createVisible = false; + this.close() + // this.$message.success('创建成功'); this.$emit('on-success', data); } else { this.confirmLoading = false; } + this.$message.success(msg); } diff --git a/src/views/Patient/components/patient-detail.vue b/src/views/Patient/components/patient-detail.vue index 0e6bbe2..2e701ac 100644 --- a/src/views/Patient/components/patient-detail.vue +++ b/src/views/Patient/components/patient-detail.vue @@ -277,6 +277,7 @@ let res = await eduitPatient({ param: { ...this.patientDataCur, + ...this.form // patientIdCardNo: this.patientIdCardNo, }, }); diff --git a/src/views/Patient/components/patient-list.vue b/src/views/Patient/components/patient-list.vue index 634c4df..23644d7 100644 --- a/src/views/Patient/components/patient-list.vue +++ b/src/views/Patient/components/patient-list.vue @@ -13,8 +13,8 @@
{{item.name}} {{item.patientGender ? '女' : '男'}}{{item.patientAge}}岁
-
{{item.identityNo ? utils.maskIDCard(item.identityNo) : ''}} + class="age">{{utils.calculateAge(item.identityNo)}}岁
+
{{item.identityNo ? utils.maskIDCard(item.identityNo) : '-'}}
diff --git a/src/views/Patient/index.vue b/src/views/Patient/index.vue index 9425a61..cdf0949 100644 --- a/src/views/Patient/index.vue +++ b/src/views/Patient/index.vue @@ -28,9 +28,9 @@ - +
diff --git a/src/views/document/index.vue b/src/views/document/index.vue index 2e84f54..aa28f8f 100644 --- a/src/views/document/index.vue +++ b/src/views/document/index.vue @@ -414,7 +414,6 @@ if (code === 200) { this.carList = data.list; this.carNo = this.carList[0]?.deviceNo || ''; // 默认选中第一个平车 - console.log('this.carNo ', this.carNo); } this.component = "patient-list" }, diff --git a/src/views/thrombolysis/components/throm-before4.vue b/src/views/thrombolysis/components/throm-before4.vue index 16efa6d..bd9915d 100644 --- a/src/views/thrombolysis/components/throm-before4.vue +++ b/src/views/thrombolysis/components/throm-before4.vue @@ -263,15 +263,15 @@ path = item.path; } }); - console.log('path: ', path); + // console.log('path: ', path); return this.apiUrl + path; }, }, created() { - console.log('book', this.book) + // console.log('book', this.book) this.queryVideo() this.content = this.book.find((item) => item.type === 0)?.content || ''; - console.log(this.content); + // console.log(this.content); }, mounted() { this.queryConsentResult(); @@ -360,8 +360,8 @@ let d = date.getDate(); d = d < 10 ? '0' + d : d; let dateTime = y + '-' + m + '-' + d; - this.picker = false; this.informed[this.type] = dateTime; + this.picker = false; }, async thTime() { @@ -412,6 +412,14 @@ uploadfile(form).then((res) => { if (res.code === 200) { this.informed.doctorSign = res.url; + const now = new Date() + let y = now.getFullYear(); + let m = now.getMonth() + 1; + m = m < 10 ? '0' + m : m; + let d = now.getDate(); + d = d < 10 ? '0' + d : d; + let dateTime = y + '-' + m + '-' + d; + this.informed.doctorTime = dateTime; this.$message.success('谈话医师签名保存成功'); this.doctorSign = false; } else { @@ -429,6 +437,14 @@ uploadfile(form).then((res) => { if (res.code === 200) { this.informed.patientSign = res.url; + const now = new Date() + let y = now.getFullYear(); + let m = now.getMonth() + 1; + m = m < 10 ? '0' + m : m; + let d = now.getDate(); + d = d < 10 ? '0' + d : d; + let dateTime = y + '-' + m + '-' + d; + this.informed.patientTime = dateTime; this.$message.success('患者本人签名保存成功'); this.patientSign = false; } else { diff --git a/src/views/thrombolysis/components/throm-result-baseInfo.vue b/src/views/thrombolysis/components/throm-result-baseInfo.vue index 94d44be..d2d156b 100644 --- a/src/views/thrombolysis/components/throm-result-baseInfo.vue +++ b/src/views/thrombolysis/components/throm-result-baseInfo.vue @@ -345,6 +345,8 @@ } if(!this.patientId) { await this.home.updateAidCode({ + ...values, + firstAidZlType: this.firstAidZlType, codeAndAnswerList }, false) this.$emit('next')