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 @@
+ 所属区域
+
+ 请选择所属区域
+ {{addressinfo}}
+
+
+
+
手机号
@@ -128,6 +136,11 @@
+
+
+
+
@@ -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 @@
- ¥{{formdata.price}}.00
+ ¥{{formdata.price}}
保存
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