Merge branch 'dev' of http://gogs.ywtinfo.com/chenjunkun/th_net_hospital_ali_mp into dev

antbuilder/industry/hospitalV2/components/deposit-list/index.js

@@ -61,6 +61,7 @@ Component({
 					value: item.inpatientId,
 					label: item.inpatientName,
 				}));
+				console.log("typeOptions ==>", typeOptions);
 				this.setData({
 					typeOptions,
 					defaultName:
@@ -130,15 +131,19 @@ Component({
 
 		// 选择不同住院人，或者时间改变时候重新请求列表
 		onFilterHandel(filters) {
-			const { requestDetail } = this.data;
-			const { startTime, endTime, type } = filters;
-			this.setData({
-				requestDetail: {
-					...requestDetail,
-					startTime,
-					endTime,
+			const { requestDetail, typeOptions } = this.data;
+			const { type } = filters;
+			console.log("filters ==>", filters);
+			console.log("requestDetail ===>", requestDetail);
+			let newDetail = Object.assign(requestDetail);
+			if (type) {
+				newDetail = Object.assign(requestDetail, {
 					inpatientId: type,
-				},
+					name: typeOptions.find((item) => item.value === type).label,
+				});
+			}
+			this.setData({
+				requestDetail: newDetail,
 			});
 			this.getCashPledgeListRe();
 		},