xinyilu/xinelu-applet-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
shidongli 2023-10-10 17:35:51 +08:00
commit a719e9d2c9
4 changed files with 131 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pages.json
View File

@ -269,14 +269,15 @@
"path": "nursestation/nursestation", "path": "nursestation/nursestation",
"style": { "style": {
"navigationBarTitleText": "护理机构详情", "navigationBarTitleText": "护理机构详情",
"onReachBottomDistance": 100, //距离底部多远时触发 单位为px "onReachBottomDistance": 40, //距离底部多远时触发 单位为px
"enablePullDownRefresh": true //设置参数为true "enablePullDownRefresh": true //设置参数为true
} }
}, { }, {
"path": "site/site", "path": "site/site",
"style": { "style": {
"navigationBarTitleText": "护理机构", "navigationBarTitleText": "护理机构",
"onReachBottomDistance": 100, //距离底部多远时触发 单位为px "navigationStyle": "custom", // 隐藏系统导航栏
"onReachBottomDistance": 20, //距离底部多远时触发 单位为px
"enablePullDownRefresh": true //设置参数为true "enablePullDownRefresh": true //设置参数为true
} }
}, { }, {

52
pages/medicalservice/medicalservice.vue
View File

@ -71,24 +71,24 @@
// 筛查预约 // 筛查预约
// this.userInfo // this.userInfo
// let userInfo = uni.getStorageSync('userInfo') let userInfo = uni.getStorageSync('userinfo')
// if (!userInfo) { if (!userInfo) {
// uni.showModal({ uni.showModal({
// title: "提示", title: "提示",
// content: "您还未注册，是否去注册？", content: "您还未注册，是否去注册？",
// confirmText: '是', confirmText: '是',
// cancelText: '否', cancelText: '否',
// success(res) { success(res) {
// if (res.confirm) { if (res.confirm) {
// uni.redirectTo({ uni.redirectTo({
// url: "/pages/login/login?mode=注册" url: "/pages/register/register"
// }) })
// } else { } else {
// wx.exitMiniProgram() wx.exitMiniProgram()
// } }
// }, },
// }) })
// } else { } else {
// if (!uni.getStorageSync('userInfo').identity) { // if (!uni.getStorageSync('userInfo').identity) {
// uni.navigateTo({ // uni.navigateTo({
// url: '../../pagesB/modifyInfo/modifyInfo' // url: '../../pagesB/modifyInfo/modifyInfo'
@ -97,28 +97,28 @@
// } // }
this.patientId = uni.getStorageSync('patientId'); this.patientId = uni.getStorageSync('patientId');
getScreening(this.patientId).then(res => { getScreening(this.patientId).then(res => {
if (res.data.code == 200) { if (res.code == 200) {
// let userInfo = JSON.stringify(this.userInfo) let userinfo = JSON.stringify(userInfo)
if (!res.data) { if (!res.data) {
uni.navigateTo({ uni.navigateTo({
url: '/pagesB/screenorder/screenorder' url: `/pagesB/screenorder/screenorder?userinfo=${userinfo}`
}) })
} else { } else {
uni.navigateTo({ uni.navigateTo({
url: '/pagesB/orderlist/orderlist' url: `/pagesB/orderlist/orderlist?userinfo=${userinfo}`
}) })
} }
} }
}) })
// } }
// uni.navigateTo({ // uni.navigateTo({
// url: '/pagesB/screenorder/screenorder' // url: '/pagesB/screenorder/screenorder'
// }) // })
uni.navigateTo({ // uni.navigateTo({
url: '/pagesB/orderlist/orderlist' // url: '/pagesB/orderlist/orderlist'
}) // })
}, },
//跳转健康常识item //跳转健康常识item
gohealthitem(item) { gohealthitem(item) {

23
pagesB/orderlist/orderlist.vue
View File

@ -4,7 +4,7 @@
新增预约 新增预约
</view> </view>
<template v-for="(item, index) in pageList"> <template v-for="(item, index) in pageList">
<view class="content" @click="goitemDetail(item)" :key="index"> <view class="content" :key="index">
<view class="c_top" > <view class="c_top" >
<view class="c_right"> <view class="c_right">
<text>预约项目：{{ item.projectName }}</text> <text>预约项目：{{ item.projectName }}</text>
@ -44,12 +44,11 @@
pageNum:1, pageNum:1,
} }
}, },
// onLoad(e) { onLoad(e) {
// if (e) { if (e) {
// this.userInfo = JSON.parse(e.userInfo) this.userInfo = JSON.parse(e.userinfo)
// this.registerId = this.userInfo.registerId }
// } },
// },
onShow() { onShow() {
this.getOrderList() this.getOrderList()
}, },
@ -61,22 +60,18 @@
methods: { methods: {
getOrderList() { getOrderList() {
this.patientId = uni.getStorageSync('patientId'); this.patientId = uni.getStorageSync('patientId');
console.log(this.pageNum,'55')
getOrderList(this.patientId,this.pageNum,this.pageSize).then(res => { getOrderList(this.patientId,this.pageNum,this.pageSize).then(res => {
// console.log(res,'999')
if (res.code == 200) { if (res.code == 200) {
this.pageList = res.rows this.pageList = res.rows
console.log(this.pageList,'999')
} }
}) })
}, },
goScreenOrder() { goScreenOrder() {
// let userInfo = JSON.stringify(this.userInfo) let userInfo = JSON.stringify(this.userInfo)
console.log(userInfo,'999999')
uni.navigateTo({ uni.navigateTo({
// url: `/pagesB/screenorder/screenorder?userInfo=${userInfo}` url: `/pagesB/screenorder/screenorder?userInfo=${userInfo}`
url: '/pagesB/screenorder/screenorder'
}) })
// redirectTo
}, },
// goitemDetail(e) { // goitemDetail(e) {

174
pagesB/screenorder/screenorder.vue
View File

@ -2,24 +2,24 @@
<view class="screenorder"> <view class="screenorder">
<view class="user_info"> <view class="user_info">
<view class="basic"> <view class="basic">
<view class="name">{{userInfo.residentName}}</view> <view class="name">{{userInfo.patientName}}</view>
<view style="margin-right: 30rpx; color: #333">年龄：{{userInfo.age}}</view> <view style="margin-right: 30rpx; color: #333">年龄：{{userInfo.age}}</view>
<view style="color: #333;">性别：{{userInfo.gender}}</view> <view style="color: #333;">性别：{{userInfo.sex}}</view>
</view> </view>
<!-- <view class="illness"> <view class="illness" v-if="userInfo.diseaseList">
<view v-show="userInfo.disease.indexOf('0') != -1"> <view v-show="userInfo.diseaseList.includes(0)">
<span>无</span> <span>无</span>
</view> </view>
<view v-show="userInfo.disease.indexOf('1') != -1"> <view v-show="userInfo.diseaseList.includes(1)">
<span>高血压</span> <span>高血压</span>
</view> </view>
<view v-show="userInfo.disease.indexOf('2') != -1"> <view v-show="userInfo.diseaseList.includes(2) ">
<span>高血糖</span> <span>高血糖</span>
</view> </view>
<view v-show="userInfo.disease.indexOf('3') != -1"> <view v-show="userInfo.diseaseList.includes(3)">
<span>高血脂</span> <span>高血脂</span>
</view> </view>
</view> --> </view>
</view> </view>
<view class="line"></view> <view class="line"></view>
<view class="title"> <view class="title">
@ -49,10 +49,11 @@
<!-- <view style="display: flex;justify-content: center;margin-top: 80rpx;"><uni-data-checkbox multiple v-model="test" :localdata="test1"></uni-data-checkbox></view> --> <!-- <view style="display: flex;justify-content: center;margin-top: 80rpx;"><uni-data-checkbox multiple v-model="test" :localdata="test1"></uni-data-checkbox></view> -->
<view style="height: 180rpx;"></view> <view style="height: 180rpx;"></view>
<view class="btn"> <view class="btn">
<u-button type="success" text="提交预约信息" @click="submit">提交预约信息</u-button> <u-button type="success" text="提交预约信息" @click="process()">提交预约信息</u-button>
</view> </view>
<u-action-sheet :show="showSex" :actions="actions" title="请选择性别" @close="showSex = false" @select="sexSelect"> <u-action-sheet :show="showSex" :actions="actions" title="请选择性别" @close="showSex = false" @select="sexSelect">
</u-action-sheet> </u-action-sheet>
<u-toast ref="uToast" />
</view> </view>
</template> </template>
@ -75,12 +76,12 @@
datetimerange: [Date.now(), this.todayEndTime()], datetimerange: [Date.now(), this.todayEndTime()],
test: ['1'], test: ['1'],
formData: { formData: {
residentName: '', patientName: '',
identity: '370921199810180329', identity: '',
certType: '1', certType: '',
gender: '', sex: '',
birthday: '1998-10-18', birthDate: '',
phone: '18854188230', phone: '',
address: '', address: '',
disease: '', disease: '',
height: '', height: '',
@ -125,7 +126,7 @@
value: '1' value: '1'
}], }],
rules: { rules: {
residentName: [{ patientName: [{
required: true, required: true,
message: '请填写姓名', message: '请填写姓名',
trigger: ['blur', 'change'] trigger: ['blur', 'change']
@ -182,48 +183,46 @@
} }
} }
}, },
onReady() {
this.$refs.form1.setRules(this.rules);
},
onLoad(e) { onLoad(e) {
console.log(e, '55') if (e) {
// if (e) { this.userInfo = JSON.parse(e.userInfo)
// this.userInfo = JSON.parse(e.userInfo) this.formData.disease = this.userInfo.diseaseList.join(',')
// this.diseaseValue = this.userInfo.disease.split(',')
// if (this.userInfo.gender == '1') { if (this.userInfo.sex == 'MALE') {
// this.userInfo.gender = '男' this.userInfo.sex = '男'
// } else { } else {
// this.userInfo.gender = '女' this.userInfo.sex = '女'
// } }
// this.userInfo.age = getAgeFun(this.userInfo.birthday) this.userInfo.age = getAgeFun(this.userInfo.birthDate)
// } }
// this.init()
this.getDeptAndPro() this.getDeptAndPro()
}, },
methods: { methods: {
getDeptAndPro() { getDeptAndPro() {
getDeptList().then(res => { getDeptList().then(res => {
console.log(res, '1')
// if (res.data.code == 200) {
this.DeptList = res.data.map(item => { this.DeptList = res.data.map(item => {
console.log(item, '888')
return { return {
text: item.hospitalName, text: item.hospitalName,
value: item.id value: item.id
} }
}) })
// }
}) })
getProlist({ getProlist({
projectType: 1, projectType: 1,
status: 0 status: 0
}).then(res => { }).then(res => {
// if (res.data.code == 200) { if (res.code == 200) {
this.ProList = res.data.map(item => { this.ProList = res.data.map(item => {
console.log(item, '999') return {
return { text: item.projectName,
text: item.projectName, value: item.projectId
value: item.projectId }
} })
}) }
// }
}) })
}, },
changeDept(e) { changeDept(e) {
@ -240,41 +239,38 @@
return todayTime return todayTime
}, },
changeDisease() { changeDisease() {
if (this.formData.disease.length != 0 && this.formData.disease.find(item => item != '0')) { if (this.formData.diseaseList.length != 0 && this.formData.diseaseList.find(item => item != '0')) {
this.disease[3].disable = true this.diseaseList[3].disable = true
} }
if (this.formData.disease.length != 0 && this.formData.disease.find(item => item == '0')) { if (this.formData.diseaseList.length != 0 && this.formData.diseaseList.find(item => item == '0')) {
this.disease[0].disable = true this.diseaseList[0].disable = true
this.disease[1].disable = true this.diseaseList[1].disable = true
this.disease[2].disable = true this.diseaseList[2].disable = true
this.formData.disease = ['0'] this.formData.diseaseList = ['0']
this.disease[3].disable = false this.diseaseList[3].disable = false
} }
if (this.formData.disease.length == 0) { if (this.formData.diseaseList.length == 0) {
for (let item in this.disease) { for (let item in this.diseaseList) {
this.disease[item].disable = false this.diseaseList[item].disable = false
} }
} }
}, },
changeCheckbox(e) { changeCheckbox(e) {
if (e.detail.value.length != 0 && e.detail.value.find(item => item != '0')) { if (e.detail.value.length != 0 && e.detail.value.find(item => item != '0')) {
this.disease[3].disable = true this.diseaseList[3].disable = true
} }
if (e.detail.value.length != 0 && e.detail.value.find(item => item == '0')) { if (e.detail.value.length != 0 && e.detail.value.find(item => item == '0')) {
this.disease[0].disable = true this.diseaseList[0].disable = true
this.disease[1].disable = true this.diseaseList[1].disable = true
this.disease[2].disable = true this.diseaseList[2].disable = true
} }
if (e.detail.value.length == 0) { if (e.detail.value.length == 0) {
for (let item in this.disease) { for (let item in this.diseaseList) {
this.disease[item].disable = false this.diseaseList[item].disable = false
} }
} }
}, },
process() { process() {
let _this = this
console.log(this.formData, '123')
if (!this.formData.hospitalId) { if (!this.formData.hospitalId) {
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
@ -297,24 +293,23 @@
return return
} }
this.formData.patientId = uni.getStorageSync('patientId'); this.formData.patientId = uni.getStorageSync('patientId');
// this.formData.identity = this.userInfo.identity this.formData.identity = this.userInfo.cardNo
// this.formData.disease = this.userInfo.disease this.formData.diseaseList = this.userInfo.diseaseList
this.formData.applyStartTime = this.datetimerange[0] this.formData.applyStartTime = this.datetimerange[0]
this.formData.applyEndTime = this.datetimerange[1] this.formData.applyEndTime = this.datetimerange[1]
if (this.formData.gender == '男') { if (this.formData.sex == '男') {
this.formData.gender = '1' this.formData.sex = 'MALE'
} else { } else {
this.formData.gender = '2' this.formData.sex = 'FEMALE'
} }
screenOrder(this.formData).then(res => { screenOrder(this.formData).then(res => {
// this.formData.disease = this.formData.disease.split(',') // this.formData.diseaseList = this.formData.diseaseList.slice(',')
if (this.formData.gender == '1') { if (this.formData.sex == 'MALE') {
this.formData.gender = '男' this.formData.sex = '男'
} else { } else {
this.formData.gender = '女' this.formData.sex = '女'
} }
console.log(res,'55')
if (res.code == 200) { if (res.code == 200) {
uni.showToast({ uni.showToast({
title: '预约成功', title: '预约成功',
@ -322,29 +317,40 @@
}); });
setTimeout(() => { setTimeout(() => {
// uni.navigateTo({ // uni.navigateTo({
// url: `../screensuccess/screensuccess?registerId=${res.data.data}` // url: `../screensuccess/screensuccess?registerId=${res.data.data}`
// url: `/pageB/orderlist/orderlist?patientId=${this.formData.patientId}` // url: `/pageB/orderlist/orderlist?patientId=${this.formData.patientId}`
// url: '/pageB/orderlist/orderlist'/ // url: '/pageB/orderlist/orderlist'/
// }) // })
uni.navigateBack({ uni.navigateBack({
delta: 1 delta: 1
}) })
}, 1000) }, 1000)
} else if (res.code == 500) {
this.$refs.uToast.show({
title: res.msg,
type: 'error'
})
} }
}) })
}, },
submit() { submit() {
// console.log(8) let that = this
// this.$refs.form1.validate().then(res => { that.$refs.form1.validate(valid => {
// console.log(res,'555') // console.log(111)
this.process() if (valid) {
// }).catch(errors => {
return
// })
}
}).catch(errors => {
return
})
}, },
IdentityBlur(e) { IdentityBlur(e) {
this.formData.gender = getSex(e) this.formData.sex = getSex(e)
this.formData.birthday = getBirthday(e) this.formData.birthDate = getBirthday(e)
} }
} }
} }