From de258800bc11018bb1144d3b995b46d0afe853fd Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Wed, 15 Nov 2023 17:21:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E4=BB=B7=20=E4=B8=93=E5=AE=B6?=
 =?UTF-8?q?=E9=97=AE=E8=AF=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Serviceevaluation/Serviceevaluation.vue   | 18 ++++++++---------
 pagesB/confirmation/confirmation.vue          | 20 +++++++++++++++++++
 pagesB/evaluate/evaluate.vue                  |  3 ++-
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/pagesB/Serviceevaluation/Serviceevaluation.vue b/pagesB/Serviceevaluation/Serviceevaluation.vue
index a805f78..8dfe62d 100644
--- a/pagesB/Serviceevaluation/Serviceevaluation.vue
+++ b/pagesB/Serviceevaluation/Serviceevaluation.vue
@@ -118,11 +118,12 @@
 					patientId: '',
 					openId: '',
 					orderNo: '',
-					evaluateSatisfaction: '',
+
 					evaluateChannel: 'WE_CHAT_APPLET',
 				},
 				openId: '',
 				orderType: '',
+				orderSource:'',
 
 
 			}
@@ -202,9 +203,9 @@
 			healthratenurse(item) {
 				console.log(item, '58')
 				if (item.orderSource == 'FAMILY_DOCTOR') {
-					this.list.orderSource = 'FAMILY_DOCTOR'
+					this.orderSource = 'FAMILY_DOCTOR'
 				} else if (item.orderSource == 'SPRING_DOCTOR') {
-					this.list.orderSource = 'SPRING_DOCTOR'
+					this.orderSource = 'SPRING_DOCTOR'
 				}
 				// 家医模块立即评价
 				if (item.orderType == "FAMILY_DOCTOR") {
@@ -234,13 +235,13 @@
 			// 提交评价
 			submit() {
 				this.list.patientId = this.parentId
-				this.list.openId = this.openId
+				this.list.openId = uni.getStorageSync('openid')
 				console.log(this.list, '45')
-
 				if (this.orderType == "HEALTH_CONSULTATION" || this.orderType == "INTEGRAL_EXCHANGE" || this.orderType ==
 					"DIRECT_BUY" || this.orderType == "FAMILY_DOCTOR") {
-						this.list.evaluateSatisfaction=this.evaluateSatisfaction
+						// this.list.evaluateSatisfaction=this.evaluateSatisfaction
 						this.list.compositeScore=this.rateval
+						this.list.orderSource=this.orderSource
 					insertGoodsEvaluate(this.list).then(res => {
 						if (res.code == 200) {
 							this.$refs.uToast.show({
@@ -262,16 +263,15 @@
 				} else if (this.orderType == "APPOINTMENT_ORDER") {
 					var obj = {
 						"patientId": this.list.patientId,
-						"openid": this.list.openId,
+						"openid": uni.getStorageSync('openid'),
 						"orderNo": this.list.orderNo,
 						"evaluateChannel": "WE_CHAT_APPLET",
 						"evaluateSatisfaction": this.evaluateSatisfaction,
+						"orderSource": this.orderSource,
 						"compositeScore": this.rateval,
-						"orderSource": this.list.orderSource,
 					}
 					addAppointmentEvaluate(obj).then(res => {
 						if (res.code == 200) {
-
 							this.$refs.uToast.show({
 								title: '评价成功',
 								type: 'success',
diff --git a/pagesB/confirmation/confirmation.vue b/pagesB/confirmation/confirmation.vue
index a1afc27..5082923 100644
--- a/pagesB/confirmation/confirmation.vue
+++ b/pagesB/confirmation/confirmation.vue
@@ -256,8 +256,10 @@
 					this.formdata.appointmentStartTime = this.appointmentTimeList[this.timecurrent].morningList[0]
 						.starttime
 				} else if (item == 'after') {
+					console.log(this.appointmentTimeList[this.timecurrent].morningList[0],'2222')
 					this.formdata.appointmentEndTime = this.appointmentTimeList[this.timecurrent].morningList[0]
 						.endtime
+
 				}
 			},
 			//选择时间
@@ -276,6 +278,13 @@
 						.starttime
 					this.formdata.appointmentEndTime = this.appointmentTimeList[this.timecurrent].morningList[0]
 						.endtime
+						if(this.appointmentTimeList[this.timecurrent].morningList[0].status==true){
+							this.formdata.schedulePlanDetailId = this.appointmentTimeList[this.timecurrent].morningList[0].schedulePlanDetailId
+							
+						}else{
+							this.formdata.schedulePlanDetailId=''
+							
+						}
 				}
 			},
 			updata() {
@@ -401,7 +410,18 @@
 						.morningList[0].starttime : ''
 					res.data[0]?.morningList[0]?.endtime ? this.formdata.appointmentEndTime = res.data[0]
 						.morningList[0].endtime : ''
+						if(res.data[0]?.morningList[0]?.status==true){
+							res.data[0]?.morningList[0]?.scheduleDetailId ? this.formdata.scheduleDetailId = res.data[0]
+								.morningList[0].scheduleDetailId : ''
+							
+						}else{
+							this.formdata.scheduleDetailId=''
+							
+						}
+						
+						
 					this.appointmentTimeList = res.data
+					console.log(this.appointmentTimeList,'0000')
 				})
 			},
 			// 显示三级地址联动
diff --git a/pagesB/evaluate/evaluate.vue b/pagesB/evaluate/evaluate.vue
index de5004f..b3e7dc4 100644
--- a/pagesB/evaluate/evaluate.vue
+++ b/pagesB/evaluate/evaluate.vue
@@ -100,7 +100,8 @@
 					"evaluateChannel": "WE_CHAT_APPLET",
 					"evaluateContent": that.text,
 					"compositeScore": that.countvalue,
-					"orderEvaluatePictureInfoList": that.imgs
+					"orderEvaluatePictureInfoList": that.imgs,
+					"orderSource":that.orderlist.orderSource
 				}
 				insertGoodsEvaluate(obj).then(res => {
 					if (res.code == 200) {