From d8eb4220bf06aacf9b1512dccf10148254a312cd Mon Sep 17 00:00:00 2001 From: song Date: Mon, 20 Dec 2021 15:56:16 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=8D=AF=E7=89=A9=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + src/config/yyInfo.js | 6 -- .../ConfigInfo/components/MedicineDetail.vue | 101 +++++++++++------- 3 files changed, 65 insertions(+), 43 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ec27d1..bf98041 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -201,6 +201,7 @@ - | 缓存基本信息 | [d160dad](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/d160dad) - | 角色显示状态修改 | [7d3b906](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/7d3b906) - | 角色栏修改 | [19228d6](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/19228d6) + - | 解决error | [00d96c4](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/00d96c4) - | 解决error | [b1975e5](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/b1975e5) - | 解决error | [2acacaa](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/2acacaa) - | 解决error | [1d67797](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/1d67797) diff --git a/src/config/yyInfo.js b/src/config/yyInfo.js index c755380..5ec5978 100644 --- a/src/config/yyInfo.js +++ b/src/config/yyInfo.js @@ -425,12 +425,6 @@ export const medicineInfo = [ type: 3, value: null, }, - { - name: '总分', - label: 'totalScore', - type: 3, - value: null, - }, ], }, { diff --git a/src/pagesProject/project/components/ConfigInfo/components/MedicineDetail.vue b/src/pagesProject/project/components/ConfigInfo/components/MedicineDetail.vue index b60e95c..75b55a9 100644 --- a/src/pagesProject/project/components/ConfigInfo/components/MedicineDetail.vue +++ b/src/pagesProject/project/components/ConfigInfo/components/MedicineDetail.vue @@ -21,7 +21,8 @@ - + + {{ colItem.value || '请选择' }} @@ -37,14 +38,17 @@ 无需填写 - - + + + + + 无需填写 @@ -117,6 +121,7 @@ export default { minute: true, second: true, }, + isShow: false, }; }, @@ -148,7 +153,8 @@ export default { case 1: { // 单选 item.value = e; - this.medicineInfo[0].date[1].chooseTime = e === 1 ? true : false; + // this.medicineInfo[0].date[1].chooseTime = e === 1 ? true : false; + this.isShow = e === 1 ? true : false; if (!this.show) { this.updateMedicine(item); } else { @@ -224,43 +230,60 @@ export default { const info = this.medicineInfo[i]; for (let j = 0; j < info.date.length; j++) { const item = info.date[j]; - if (item.type === 2) { - if (item.chooseTime && !item.value) { - this.$t.ui.showToast(`请选择测评时间`); - isComplete = false; + switch (item.type) { + case 2: { + if (this.isShow && !item.value) { + this.$t.ui.showToast(`请选择测评时间`); + isComplete = false; + } break; } - } else if (item.type === 4) { - if (!item.value && !item.checked) { - this.$t.ui.showToast(`请填写${item.name}`); - isComplete = false; + case 3: { + if (this.isShow && !item.value) { + this.$t.ui.showToast(`请填写${item.name}`); + isComplete = false; + } break; } - } else { - if (!item.value) { - this.$t.ui.showToast(`请填写${item.name}`); - isComplete = false; + case 4: { + if (!item.value && !item.checked) { + this.$t.ui.showToast(`请填写${item.name}`); + isComplete = false; + } + break; + } + default: { + if (!item.value) { + this.$t.ui.showToast(`请填写${item.name}`); + isComplete = false; + } break; } } + // if (item.type === 2) { + // if (item.chooseTime && !item.value) { + // this.$t.ui.showToast(`请选择测评时间`); + // isComplete = false; + // break; + // } + // } else if (item.type === 4) { + // if (!item.value && !item.checked) { + // this.$t.ui.showToast(`请填写${item.name}`); + // isComplete = false; + // break; + // } + // } else { + // if (!item.value) { + // this.$t.ui.showToast(`请填写${item.name}`); + // isComplete = false; + // break; + // } + // } } if (!isComplete) { break; } } - // if (!isComplete) { - // return; - // } - // if (!this.otherName.value) { - // this.$t.ui.showToast(`请填写${this.otherName.name}`); - // isComplete = false; - // return; - // } - // if (!this.otherMedicine.value) { - // this.$t.ui.showToast(`请填写${this.otherMedicine.name}`); - // isComplete = false; - // return; - // } if (isComplete) return true; }, @@ -274,7 +297,7 @@ export default { for (let j = 0; j < info.date.length; j++) { const item = info.date[j]; if (item.type === 2) { - item.chooseTime = false; + this.isShow = false; } if (item.type === 4) { item.checked = false; @@ -298,7 +321,6 @@ export default { case 2: { if (date[item.label]) { item.value = date[item.label]; - item.chooseTime = true; } break; } @@ -307,6 +329,11 @@ export default { break; } default: { + if (date.isTest === '0') { + this.isShow = false; + } else { + this.isShow = true; + } if (date[item.label] !== '未服用') { item.value = date[item.label]; item.checked = false;