diff --git a/pagesB/orderlist/orderlist.vue b/pagesB/orderlist/orderlist.vue index 11e25a3..ae7eeae 100644 --- a/pagesB/orderlist/orderlist.vue +++ b/pagesB/orderlist/orderlist.vue @@ -18,6 +18,9 @@ 预约状态: + + diff --git a/pagesB/screenorder/screenorder.vue b/pagesB/screenorder/screenorder.vue index de50c67..42e2ebd 100644 --- a/pagesB/screenorder/screenorder.vue +++ b/pagesB/screenorder/screenorder.vue @@ -6,17 +6,17 @@ 年龄:{{userInfo.age}} 性别:{{userInfo.sex}} - - + + - + 高血压 - + 高血糖 - + 高血脂 @@ -193,24 +193,25 @@ this.$refs.form1.setRules(this.rules); }, onLoad(e) { - console.log(e, '4') if (e) { this.userInfo = JSON.parse(e.userinfo) - this.formData.disease = this.userInfo.diseaseList.join(',') - if (this.userInfo.sex == 'MALE') { this.userInfo.sex = '男' - } else { + } else if(this.userInfo.sex == 'FEMALE'){ this.userInfo.sex = '女' } this.userInfo.age = getAgeFun(this.userInfo.birthDate) + if(this.userInfo.diseaseList.length>0){ + this.formData.disease = this.userInfo.diseaseList.join(',') + console.log(this.formData.disease,'9999') + + } } this.getDeptAndPro() }, methods: { appointitem(e) { - // console.log(e, '67') var that = this if (that.formData.hospitalId == '') { this.$refs.uToast.show({ @@ -322,7 +323,7 @@ const value = uni.getStorageSync('userinfo'); this.formData.patientId = value.id this.formData.identity = this.userInfo.cardNo - this.formData.diseaseList = this.userInfo.diseaseList + this.formData.diseaseList = this.userInfo.diseaseList.map(Number) this.formData.applyStartTime = this.datetimerange[0] this.formData.applyEndTime = this.datetimerange[1] if (this.formData.sex == '男') { @@ -488,4 +489,4 @@ /deep/.u-button__text { font-size: 34rpx !important; } - \ No newline at end of file +