From 4ba7fd89196b428c0968cd833eadad0adbd0ede4 Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Fri, 10 Nov 2023 13:57:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=B6=E5=BA=AD=E6=88=90?=
 =?UTF-8?q?=E5=91=98=20=E5=9B=BE=E6=96=87=E9=97=AE=E8=AF=8A=20=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/pagesB/medicine/index.js         |  4 +-
 pagesB/AddMembers/AddMembers.vue     | 68 +++++++++++++++++++++++++---
 pagesB/confirmation/confirmation.vue |  2 +-
 pagesB/medicine/medicine.vue         |  2 +-
 4 files changed, 65 insertions(+), 11 deletions(-)

diff --git a/api/pagesB/medicine/index.js b/api/pagesB/medicine/index.js
index b9d8c91..1fddc6f 100644
--- a/api/pagesB/medicine/index.js
+++ b/api/pagesB/medicine/index.js
@@ -23,10 +23,10 @@ export function selectDepartment(pageNum, pageSize) {
 //人员
 export function selectHospitalPerson(pageNum, pageSize, departmentId,status) {
 	return request({
-		url: `/nurseApp/healthConsultation/selectHospitalPerson?pageNum=${pageNum}&pageSize=${pageSize}&departmentId=${departmentId}&&status=${1}`,
+		url: `/nurseApp/healthConsultation/selectHospitalPerson?pageNum=${pageNum}&pageSize=${pageSize}&departmentId=${departmentId}&status=${2}`,
 		method: 'GET',
 		header: {
 			Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
 		},
 	})
-}
\ No newline at end of file
+}
diff --git a/pagesB/AddMembers/AddMembers.vue b/pagesB/AddMembers/AddMembers.vue
index daaeb64..1ef9635 100644
--- a/pagesB/AddMembers/AddMembers.vue
+++ b/pagesB/AddMembers/AddMembers.vue
@@ -99,12 +99,20 @@
 						</view>
 					</u-form-item>
 					<view class="name">
+						所属区域
+						<view class="select" @tap='showPicker'>
+							<text v-if="!addressinfo">请选择所属区域</text>
+							<text v-else class="testitem">{{addressinfo}}</text>
+							<!-- <image src="../../static/huijiantou.png" mode=""></image> -->
+						</view>
+					</view>
+				<!-- 	<view class="name">
 						所在位置
 						<view class="selectdata" @tap='getAddress'>
 							<text v-if="form.locationName ==''">请选择所在位置</text>
 							<text class="testitem">{{form.locationName}}</text>
 						</view>
-					</view>
+					</view> -->
 					<u-form-item prop="phone" :border-bottom="false">
 						<view class="name">
 							手机号
@@ -128,6 +136,11 @@
 			<!-- 出生日期 -->
 			<u-picker mode="time" v-model="timeshow" :params="params" @confirm='timechange' @canel='timeshow=false'>
 			</u-picker>
+			<view class="">
+				<m-city style='z-index: 10076;' :provinceData="list" headTitle="地区选择" ref="cityPicker"
+					@funcValue="getpickerParentValue" pickerSize="4">
+				</m-city>
+			</view>
 		</view>
 
 	</view>
@@ -138,15 +151,22 @@
 	import {
 		registerdata
 	} from '@/api/pages/register/register.js'
+	import gkcity from "@/components/m-city/m-city.vue";
+	import ldSelect from '../../components/ld-select/ld-select.vue';
+	import {
+		getSubordinateRegions,
+	} from '@/api/pagesB/modifyAddress/modifyAddress.js';
 
-	// import {
-	//   bindFamilyUser,
-	//   getDictByType
-	// } from '@/service/api/api.js'
-	// import QQMapWX from '@/utils/qqMap/qqmap-wx-jssdk.js';
 	export default {
+		components: {
+			ldSelect,
+			"m-city": gkcity,
+		},
+
 		data() {
 			return {
+				addresslength: null,
+				addressinfo:'',
 				sexlist: [{
 						name: '男',
 						disabled: false
@@ -188,6 +208,7 @@
 					locationName: '',
 					homeLongitude: '',
 					homeLatitude: '',
+					areaCode:'',
 				},
 				householdRelationship: '',
 				userinfo: {},
@@ -259,6 +280,11 @@
 						disabled: false
 					}
 				],
+				list: [{
+					id: "",
+					localName: "请选择",
+					children: [],
+				}, ],
 				rules: {
 					cardNo: [{
 						//必填
@@ -347,6 +373,7 @@
 
 		onLoad(options) {
 			this.form.openid = uni.getStorageSync('openid')
+			this.areaInfo()
 
 		},
 		onShow() {
@@ -382,6 +409,33 @@
 					}
 				});
 			},
+			// 显示三级地址联动
+			showPicker() {
+				this.$refs.cityPicker.show();
+			},
+			// 三级地址联动回调
+			getpickerParentValue(e) {
+				e = e.filter(ele => ele.localName != '暂不选择')
+				e = e.filter(ele => ele.localName != '暂无需选择')
+				this.addresslength = e
+				this.addressinfo = ''
+				this.form.areaCode = ''
+				if (e && e.length >= 1) {
+					e.forEach(el => {
+						this.addressinfo = this.addressinfo + el.localName
+					})
+					this.form.areaCode = e[e.length - 1].id
+				} else {
+					this.addressinfo = ''
+					this.form.areaCode = ''
+				}
+			},
+			//区街道
+			areaInfo() {
+				getSubordinateRegions().then(res => {
+					this.list = res.data;
+				})
+			},
 			//选择出生日期
 			timechange(e) {
 				this.form.birthDate = e.year + '-' + e.month + '-' + e.day
@@ -410,7 +464,7 @@
 						registerdata(_this.form).then(res => {
 							if (res.code == 500) {
 								_this.$refs.uToast.show({
-									title: res.data.msg,
+									title: res.msg,
 									type: 'error'
 								})
 							} else {
diff --git a/pagesB/confirmation/confirmation.vue b/pagesB/confirmation/confirmation.vue
index abf5a05..f6de4cf 100644
--- a/pagesB/confirmation/confirmation.vue
+++ b/pagesB/confirmation/confirmation.vue
@@ -131,7 +131,7 @@
 		</view>
 		<view class="btns">
 			<view class="btnleft">
-				￥<text>{{formdata.price}}</text>.00
+				￥<text>{{formdata.price}}</text>
 			</view>
 			<view class="btnright" @tap='updata'>
 				保存
diff --git a/pagesB/medicine/medicine.vue b/pagesB/medicine/medicine.vue
index ad4d5ce..a82f835 100644
--- a/pagesB/medicine/medicine.vue
+++ b/pagesB/medicine/medicine.vue
@@ -146,7 +146,7 @@
 			//人员
 			selectHospitalPersonInfo() {
 				this.personpageNum = 1
-				var status='1'
+				var status='2'
 				selectHospitalPerson(this.personpageNum, this.pageSize, this.departmentId,status).then(res => {
 					this.HospitalPersonlist = res.rows
 					this.HospitalPersontotal = res.total