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

api/pagesB/myfamilydoctorteam/index.js

@@ -1,9 +1,9 @@
 import request from "@/api/request.js"
 
 
-export function getDoctorListtwo(pageNum, pageSize, teamNo, region) {
+export function getDoctorListtwo(pageNum, pageSize, teamNo, region,realname) {
 	return request({
-		url: `/applet/signinfo/getDoctorList?pageNum=${pageNum}&pageSize=${pageSize}&teamNo=${teamNo}`,
+		url: `/applet/signinfo/getDoctorList?pageNum=${pageNum}&pageSize=${pageSize}&teamNo=${teamNo}&realname=${realname}`,
 		method: 'get',
 		header: {
 			region: region

api/pagesC/choosedoctor/index.js

@@ -1,9 +1,9 @@
 import request from "@/api/request.js"
 
-// 获取区划列表
+// 获取医生列表
-export function getDoctorList(pageNum, orgNo, region) {
+export function getDoctorList(pageNum, orgNo, region,realname) {
 	return request({
-		url: `/applet/signinfo/getDoctorList?pageNum=${pageNum}&orgNo=${orgNo}`,
+		url: `/applet/signinfo/getDoctorList?pageNum=${pageNum}&orgNo=${orgNo}&realname=${realname}`,
 		method: 'get',
 		header: {
 			region: region

api/pagesC/contractsigningprotocol/index.js

@@ -1,9 +1,9 @@
 import request from "@/api/request.js"
 
 
-export function getContent(orgNo, region) {
+export function getContent(userNo, region) {
 	return request({
-		url: `/applet/signinfo/getContent/${orgNo}`,
+		url: `/applet/signinfo/getContent/${userNo}`,
 		method: 'get',
 		header: {
 			region: region

components/protocol/protocol.vue

@@ -6,11 +6,11 @@
 		<view class="agreement-content-container">
 			<view class="agreement-content_parta-box">
 				<h4>甲方：</h4>
-				<h4 class="box-line">{{list.signInfo.agencyOrgName}}</h4>
+				<h4 class="box-line">{{list.orgName}}</h4>
 			</view>
 			<view class="agreement-content_parta-box">
 				<h4>乙方：</h4>
-				<h4 class="box-line">{{list.signInfo.residentName?list.signInfo.residentName:''}}</h4>
+				<h4 class="box-line">{{list.residentName}}</h4>
 			</view>
 			<uni-table border stripe emptyText="暂无更多数据">
 				<uni-tr>
@@ -24,20 +24,20 @@
 					<uni-th>选择签约个性服务包</uni-th>
 				</uni-tr>
 				<uni-tr>
-					<uni-td>{{list.signInfo.residentName?list.signInfo.residentName:''}}</uni-td>
+					<uni-td>{{list.residentName}}</uni-td>
-					<uni-td>{{list.signInfo.gender === '1' ? '男' : '女'}}</uni-td>
+					<uni-td>{{list.gender === '1' ? '男' : '女'}}</uni-td>
-					<uni-td>{{list.signInfo.age?list.signInfo.age:''}}</uni-td>
+					<uni-td>{{list.age?list.age:''}}</uni-td>
-					<uni-td>{{list.signInfo.identity?list.signInfo.identity:''}}</uni-td>
+					<uni-td>{{list.identity?list.identity:''}}</uni-td>
-					<uni-td>{{list.signInfo.address?list.signInfo.address:''}}</uni-td>
+					<uni-td>{{list.address?list.address:''}}</uni-td>
-					<uni-td>{{list.signInfo.phone?list.signInfo.phone:''}}</uni-td>
+					<uni-td>{{list.phone?list.phone:''}}</uni-td>
-					<uni-td>{{list.basePackagesName?list.basePackagesName:''}} </uni-td>
+					<uni-td>{{list.BasePackage?list.BasePackage:''}} </uni-td>
-					<uni-td>{{list.specialPackagesName?list.specialPackagesName:""}}</uni-td>
+					<uni-td>{{list.PersonalityPack?list.PersonalityPack:''}}</uni-td>
 				</uni-tr>
 			</uni-table>
 			<view>
 				<p style='padding-top: 30rpx;line-height: 46rpx;'>甲乙双方本着平等、尊重和自愿的原则，签订此协议，接受以下条款的约定</p>
 				<p style='padding: 30rpx 0;line-height: 46rpx;'>甲乙双方共同确定
-					<text class="box-line">{{list.signInfo.teamName}}</text>为乙方的家庭医生服务团队
+					<text class="box-line">{{list.teamName}}</text>为乙方的家庭医生服务团队
 				</p>
 				<uni-table border stripe emptyText="暂无更多数据">
 					<uni-tr>
@@ -47,7 +47,7 @@
 						<uni-th>固定电话</uni-th>
 						<uni-th>联系电话</uni-th>
 					</uni-tr>
-					<uni-tr v-for="(member, index) in list.signInfo.dutyDoctorList" :index="index" :key="index">
+					<uni-tr v-for="(member, index) in list.DoctorList" :index="index" :key="index">
 						<uni-td v-if="member.teamLeader">
 							团队长
 						</uni-td>
@@ -68,15 +68,14 @@
 						<uni-td>{{member.mobilePhone?member.mobilePhone:''}}</uni-td>
 					</uni-tr>
 				</uni-table>
-				<u-parse style="margin-top: 30rpx;" :html="list.protocolContent.content"></u-parse>
+				<u-parse style="margin-top: 30rpx;" :html="content"></u-parse>
 				<h4 style='padding-top: 30rpx;font-weight: 600;'>三、服务收费</h4>
 				<p style='padding-top: 30rpx;line-height: 46rpx;'>1. 根据自愿选择的原则，乙方选择<text
-						class="box-line">{{list.basePackagesName?list.basePackagesName:''}}{{list.specialPackagesName?'，'+list.specialPackagesName:''}}</text>由甲方提供相应服务，服务费为<text
+						class="box-line">{{list.BasePackage?list.BasePackage:''}}{{list.PersonalityPack?list.PersonalityPack:''}}</text>由甲方提供相应服务，服务费为<text
 						class="box-line">{{list.packSignCost}}</text>元/年</p>
 				<p style='padding-top: 30rpx;line-height: 46rpx;'>2.服务过程中，根据医生判断及患者临时需求增加的服务内容，按照国家相关规定和当地物价部门规定收费。
 				</p>
-				<p style='padding-top: 30rpx;line-height: 46rpx;'>3.乙方应于<text
+				<p style='padding-top: 30rpx;line-height: 46rpx;'>3.乙方应于<text class="box-line">{{list.signTime}}</text>
-						class="box-line">{{list.signInfo.signTime}}</text>
 					前将签约服务费缴纳至甲方机构指定科室，不得由签约团队成员代收。
 				</p>
 				<h4 style='padding-top: 30rpx;font-weight: 600;'>四、其他约定服务：<text class="box-line">{{' '}}</text></h4>
@@ -87,8 +86,7 @@
 				<h4 style='padding-top:30rpx;font-weight: 600;'>六、本协议未尽事宜，经双方协商一致，签订补充协议，补充协议具有同等效力。</h4>
 				<h4 style='padding-top: 30rpx;font-weight: 600;'>
 					七、本协议解释权归甲方。协议一式两份，甲、乙双方各执一份，自双方签字之日起生效，
-					<text
+					<text class="box-line">{{list.signTime}}{{' —— '}}{{list.signDeadline}}</text>有效期<text
-						class="box-line">{{list.signInfo.signTime}}{{' —— '}}{{list.signInfo.signDeadline}}</text>有效期<text
 						class="box-line">{{list.signYears}}</text>年
 				</h4>
 			</view>
@@ -96,15 +94,15 @@
 		<view class="agreement-execute_container-img">
 			<view class="parta-execute_box">
 				<view class="textparta">甲方(团队长)签字</br><text style="padding-left: 15rpx;">或(单位盖章)</text></view>
-				<image :src="list.doctorBase64" mode="aspectFill" style="width: 280rpx; height: 200rpx;"></image>
+				<image :src="doctorBase64" mode="aspectFill" style="width: 280rpx; height: 200rpx;"></image>
 			</view>
 			<view class="parta-execute_box">
 				<view class="textparta">乙方(居民)签字</br><text style="padding-left: 8rpx;">或拍照</text></view>
-				<image :src="list.residentBase64" mode="widthFix" style="width: 180rpx; height: 180rpx;"></image>
+				<image :src="meimage" mode="widthFix" style="width: 180rpx; height: 180rpx;"></image>
 			</view>
 			<view class="parta-execute_box">
 				<view class="textparta">机构公章</view>
-				<image :src="list.orgBase64" mode="widthFix" style="width: 180rpx; height: 180rpx;"></image>
+				<image :src="orgBase64" mode="widthFix" style="width: 180rpx; height: 180rpx;"></image>
 			</view>
 		</view>
 		<u-mask :show="signatureshow" @click="signatureshow = false">
@@ -119,19 +117,27 @@
 </template>
 
 <script>
+	import {
+		getContent
+	} from '@/api/pagesC/contractsigningprotocol/index.js'
 	import baseurl from '@/api/baseurl.js'
 	import signature from '@/components/signature/signature.vue'
 	import {
 		getSignProtocol
 	} from '@/api/pagesC/contractsigningprotocol/index.js'
 	export default {
+		name: "protocol",
 		components: {
 			signature
 		},
+		props: ["list"],
 		data() {
 			return {
+				content: '',
+				orgBase64:'',
+				doctorBase64:'',
+				meimage:'',
 				signatureshow: false,
-				list: null,
 				fabContent: [{
 					iconPath: '/static/pageC/signature-unselected.png',
 					selectedIconPath: '/static/pageC/signature-selected.png',
@@ -145,6 +151,13 @@
 				}],
 			};
 		},
+		created() {
+			getContent(this.list.userNo, '1').then(res => {
+				this.content = res.data.content
+				this.orgBase64 = res.data.orgBase64
+				this.doctorBase64 = res.data.doctorBase64
+			})
+		},
 		methods: {
 			fabTrigger(e) {
 				if (e.index === 0) {
@@ -155,27 +168,30 @@
 			},
 			openCamera() {
 				let that = this
-				setTimeout(function() {
 				uni.chooseImage({
 					sizeType: ['compressed'],
 					sourceType: ['camera'],
 					success: function(res) {
-								let tempFilePath = res.tempFilePaths[0]
+						that.meimage = res.tempFilePaths[0]
 						uni.saveImageToPhotosAlbum({
 							filePath: tempFilePath,
 							success: (resp) => {
 								uni.uploadFile({
 									url: baseurl +
 										'/applet/sign/apply/residentSignatureUpload',
-											filePath: tempFilePath,
+									filePath: that.meimage,
 									name: 'file',
 									header: {
 										region: '1'
 									},
-											timeout: 10000,
+									timeout: 60000,
 									success(respp) {
-												// residentAutographPath
+										that.signatureshow = false
-												console.log(respp)
+										that.$emit('residentAutographPathlist', {
+											residentAutographPath: JSON.parse(res
+												.data).imgUrl,
+											image: that.meimage
+										})
 									}
 								})
 							}
@@ -183,23 +199,28 @@
 					}
 				})
 			},
-					150)
-			},
 			// //签名
 			userSignaturePicture(data) {
-				this.signatureshow = false
+				let that = this
+				that.meimage = data
+				uni.uploadFile({
+					url: baseurl + '/applet/sign/apply/residentSignatureUpload',
+					filePath: data,
+					name: 'file',
+					header: {
+						region: '1'
 					},
-			info() {
+					timeout: 60000,
-				getSignProtocol(this.cardNo, '1').then(res => {
+					success(res) {
-					this.list = res.data
+						that.signatureshow = false
+						that.$emit('residentAutographPathlist', {
+							residentAutographPath: JSON.parse(res.data).imgUrl,
+							image: data
+						})
+					}
 				})
 			},
 		},
-		onLoad(options) {
-			this.cardNo = options.cardNo
-			this.cardNo = '372424194703207523'
-			this.info();
-		},
 	}
 </script>
 

pages.json

@@ -9,7 +9,7 @@
 				"navigationStyle": "custom",
 				"enablePullDownRefresh": false
 			}
-		},{
+		}, {
 			"path": "pages/homepage/homepage",
 			"style": {
 				"enablePullDownRefresh": false,
@@ -502,8 +502,7 @@
 					"navigationBarTitleText": "",
 					"enablePullDownRefresh": false
 				}
-			},
+			},{
-			{
 				"path": "contractsigningprotocol/contractsigningprotocol",
 				"style": {
 					"navigationBarTitleText": "签约协议",

pages/homepage/homepage.vue

@@ -113,9 +113,28 @@
 			},
 			// 家医签约
 			goonline() {
-				uni.navigateTo({
+				if (!this.userinfo) {
+					this.gologin();
+				} else {
+					if (!this.checkSign) {
+						this.$refs.uToast.show({
+							title: '未签约，请先签约',
+							type: 'error',
+							duration: '1000',
 							url: "/pagesC/Onlinesigning/Onlinesigning"
 						})
+					} else {
+						uni.navigateTo({
+							url: "/pagesB/mysigning/mysigning"
+						})
+					}
+				}
+			},
+			// 积分兑换
+			count() {
+				uni.navigateTo({
+					url: "/pagesB/PointsMall/PointsMall"
+				})
 				// if (!this.userinfo) {
 				// 	this.gologin();
 				// } else {
@@ -128,30 +147,11 @@
 				// 		})
 				// 	} else {
 				// 		uni.navigateTo({
-				// 			url: "/pagesB/mysigning/mysigning"
+				// 			url: "/pagesB/PointsMall/PointsMall"
 				// 		})
 				// 	}
 				// }
 			},
-			// 积分兑换
-			count() {
-				if (!this.userinfo) {
-					this.gologin();
-				} else {
-					if (!this.checkSign) {
-						this.$refs.uToast.show({
-							title: '未签约，请先签约',
-							type: 'error',
-							duration: '1000',
-							url: "/pagesC/Onlinesigning/Onlinesigning"
-						})
-					} else {
-						uni.navigateTo({
-							url: ""
-						})
-					}
-				}
-			},
 			// 健康档案
 			goHealthrecords() {
 				if (!this.userinfo) {

pages/medicalservice/medicalservice.scss

@@ -1,3 +1,6 @@
+	page{
+		background-color: #fff;
+	}
 	.app {
 		width: 100%;
 		height: 1000rpx;

pages/myinformation/myinformation.vue

@@ -5,7 +5,8 @@
 				我的
 			</view> -->
 			<image src="../../static/pages/userbanner.png" mode="" class="userbanner"></image>
-			<image :src="baseurl+appPersonallist.headPictureUrl" mode="" class="headsculpture" @tap='updatainfo'></image>
+			<image :src="baseurl+appPersonallist.headPictureUrl" mode="" class="headsculpture" @tap='updatainfo'>
+			</image>
 			<view class="namesigning">
 				<span class="name">
 					{{appPersonallist.patientName}}
@@ -175,15 +176,11 @@
 			// this.bjimg = baseurl + '/profile/appletPicture/inviteFriendsOne.png'
 			let that = this
 			this.baseurl = baseurl
-			this.myInfo()
 			const value = uni.getStorageSync('patientId');
-			if (value) {} else {
+			if (value) {
+				that.myInfo()
+			} else {
 				that.appPersonallist = null
-				that.$refs.uToast.show({
-					title: '您未登录,请先登录',
-					type: 'error',
-					duration: '1000',
-				})
 			}
 		},
 		methods: {

pagesB/Healthitem/Healthitem.vue

@@ -17,7 +17,6 @@
 		},
 		onLoad(options) { //获取传值
 			this.item = JSON.parse(decodeURIComponent(options.item))
-			console.log(this.item)
 			this.item.informationContent = this.item.informationContent.replace(/\<img/gi,
 				"<br/> <img class='richPic'")
 			this.item.informationContent = this.item.informationContent.replace(/\<p/gi,

pagesB/PointsMall/PointsMall.vue

@@ -28,9 +28,6 @@
 				兑换
 			</view>
 		</view>
-
-
-
 	</view>
 </template>
 

pagesB/myfamilydoctorteam/myfamilydoctorteam.vue

@@ -37,6 +37,7 @@
 				pageSize: 10,
 				teamNo: null,
 				list: null,
+				realname: '',
 				total: 0,
 			};
 		},
@@ -46,7 +47,7 @@
 		},
 		methods: {
 			info() {
-				getDoctorListtwo(this.pageNum, this.pageSize, this.teamNo, '1').then(res => {
+				getDoctorListtwo(this.pageNum, this.pageSize, this.teamNo, '1', this.realname).then(res => {
 					this.list = res.rows
 					this.total = res.total
 				})

pagesB/mysigning/mysigning.scss

@@ -27,6 +27,7 @@
 					flex: 1;
 
 					text {
+						width:100%;
 						height: 63rpx;
 						padding: 0 60rpx 0 20rpx;
 						line-height: 63rpx;

pagesB/mysigning/mysigning.vue

@@ -85,18 +85,19 @@
 				<view class="titletext">
 					<text>解约类型：</text>
 					<view class="select" @tap='maskshowtwo=true'>
-						<text v-if="list.rescindName">{{list.rescindName}}</text>
+						<text v-if="list.rescindName"
+							style="font-size: 26rpx;color: #303133;">{{list.rescindName}}</text>
 						<text v-else>请选择解约类型</text>
 						<image src="../../static/huijiantou.png" mode=""></image>
 					</view>
 				</view>
 				<view class="titletext">
 					<text>解约原因：</text>
-					<textarea name="" id="" cols="30" rows="10" style="width: 60%;color: gray;" placeholder="请输入解决原因"
+					<textarea name="" id="" cols="30" rows="10" style="width: 60%;" placeholder="请输入解决原因"
 						v-model="list.rescindReason"></textarea>
 				</view>
 				<view class="btnss">
-					<view class="cancel" @click="maskshowtwo=false">
+					<view class="cancel" @click="maskshow=false">
 						取消
 					</view>
 					<view class="Rescind" @click="rescindapplysaveinfo">

pagesC/Onlinesigning/Onlinesigning.vue

@@ -103,6 +103,12 @@
 					<image src="../../static/huijiantou.png" mode=""></image>
 				</view>
 			</view>
+			<view class="name">
+				签约时间
+				<view class="select" style="height: 100%;">
+					<text style="font-size: 26rpx;color: #303133;">{{query.signTime}}</text>
+				</view>
+			</view>
 			<view class="name">
 				签约周期(年)
 				<u-input v-model="query.signYears" type='number' :border="true" placeholder="请输入签约周期(单位年)" />
@@ -129,7 +135,7 @@
 			</view>
 			<view class="submititem">
 				<view class="laststep" @tap="tapstep('-')"> 上一步 </view>
-				<view class="submit" @tap='updata'>
+				<view class="submit" @tap='protocolshowtrue'>
 					提交
 				</view>
 			</view>
@@ -148,12 +154,17 @@
 				</u-checkbox-group>
 			</scroll-view>
 		</u-popup>
-		<protocol></protocol>
+		<u-popup v-model="protocolshow" mode="bottom" width='50%' height="70%">
+			<protocol :list='query' @residentAutographPathlist='residentAutographPath' v-if="protocolshow"></protocol>
+		</u-popup>
 		<u-toast ref="uToast" />
 	</view>
 </template>
 
 <script>
+	import {
+		getDoctorListtwo
+	} from '@/api/pagesB/myfamilydoctorteam/index.js'
 	import {
 		arealist,
 		applysave,
@@ -162,15 +173,17 @@
 	} from '@/api/pagesC/Onlinesigning/index.js'
 	import {
 		getSex,
-		getBirthday
+		getBirthday,
+		getAgeFun
 	} from '@/api/conversion.js'
-	import protocol from '@/components/protocol/index.vue'
+	import protocol from '@/components/protocol/protocol.vue'
 	export default {
 		components: {
 			protocol
 		},
 		data() {
 			return {
+				content: '',
 				showGroup: 1,
 				packageslist: [],
 				crowdslist: [],
@@ -181,6 +194,7 @@
 				Townshipshow: false, //乡镇选择开关
 				villagelist: [], //村
 				villageshow: false, //乡镇选择开关
+				protocolshow: false,
 				radio: '',
 				stepnumber: 1,
 				query: {
@@ -205,11 +219,15 @@
 					teamName: null,
 					crowdsName: null,
 					packagesName: null,
-					crowdList: [],
+					crowdList: null,
 					crowdNoList: null,
-					packageList: [],
+					packageList: null,
 					packageNoList: null,
 					signYears: null,
+					BasePackage: null, //基础包
+					PersonalityPack: null, //	个性包
+					packSignCost: 0, //价格
+					residentAutographPath: null, //拍照或者签名
 				}
 			}
 		},
@@ -219,6 +237,48 @@
 			// }
 		},
 		methods: {
+			protocolshowtrue() {
+				if (!this.query.county || !this.query.orgNo || !this.query.userName || !this.query.crowdList || this.query
+					.crowdList.length == 0 || !this.query.packageList ||
+					this.query.packageList.length == 0) {
+					this.$refs.uToast.show({
+						title: '请完善完信息',
+						type: 'error',
+					})
+					return
+				}
+				if (this.query.signYears >= 10) {
+					this.$refs.uToast.show({
+						title: '签约周期过长',
+						type: 'error',
+					})
+					return
+				}
+				if (!this.query.signYears) {
+					this.query.signYears = 1
+				}
+				let signTime = new Date(this.query.signTime);
+				let dueTime = new Date(new Date(signTime.setFullYear(signTime.getFullYear() + Number(this.query
+						.signYears)))
+					.setDate(signTime.getDate() - 1))
+				let dueY = dueTime.getFullYear()
+				let dueM = dueTime.getMonth() + 1
+				let dueD = dueTime.getDate()
+				this.query.signDeadline = dueY + '-' + dueM + '-' + dueD
+				if (this.query.identity) {
+					this.query.birthday = getBirthday(this.query.identity)
+					this.query.age = getAgeFun(this.query.birthday)
+					let gender = getSex(this.query.identity)
+					if (gender == '女') {
+						this.query.gender = 2
+					} else if (gender == '男') {
+						this.query.gender = 1
+					} else {
+						this.query.gender = 99
+					}
+				}
+				this.protocolshow = true
+			},
 			updata() {
 				if (this.radio == 2) {
 					if (!this.query.signYears) this.query.signYears = 1
@@ -267,7 +327,6 @@
 						type: 'error',
 					})
 				}
-
 			},
 			//切换
 			changeRadio() {
@@ -325,14 +384,14 @@
 					})
 				} else {
 					uni.navigateTo({
-						url: `/pagesC/choosedoctor/choosedoctor?orgNo=${this.query.orgNo}`
+						url: `/pagesC/choosedoctor/choosedoctor?orgNo=${this.query.orgNo}&userNo=${this.query.userNo}`
 					})
 				}
 			},
 			//签约机构
 			goselectInstitution() {
 				uni.navigateTo({
-					url: "/pagesC/selectInstitution/selectInstitution"
+					url: `/pagesC/selectInstitution/selectInstitution?orgNo=${this.query.orgNo}`
 				})
 			},
 			//点击乡镇
@@ -378,18 +437,8 @@
 					})
 					return
 				}
-				var obj = {
-					crowdNoList: this.query.crowdNoList,
-					orgNo: this.query.orgNo
-				}
-				getPackageByCrowdNo(obj, '1').then(res => {
-					res.data.forEach(e => {
-						e.checked = false
-					})
-					this.packageslist = res.data
 				this.showGroup = 2
 				this.popupShow = true
-				})
 			},
 			//人群list
 			getCrowdinfo() {
@@ -417,18 +466,38 @@
 							}
 						})
 					})
+					var obj = {
+						crowdNoList: this.query.crowdNoList,
+						orgNo: this.query.orgNo
+					}
+					getPackageByCrowdNo(obj, '1').then(res => {
+						res.data.forEach(e => {
+							e.checked = false
+						})
+						this.packageslist = res.data
+					})
 				} else {
 					this.query.packageList = []
 					this.query.packagesName = ''
+					this.query.BasePackage = ''
+					this.query.PersonalityPack = ''
+					this.query.packSignCost = 0
 					this.query.packageNoList.forEach(el => {
 						this.packageslist.forEach(ele => {
 							if (el == ele.packageNo) {
+								this.query.packSignCost = this.query.packSignCost + ele.packCost
 								var obj = {
 									packageNo: ele.packageNo,
 									packageName: ele.packageName
 								}
 								this.query.packageList.push(obj)
 								this.query.packagesName = ele.packageName + ',' + this.query.packagesName
+								if (ele.packCategory == 0) {
+									this.query.BasePackage = ele.packageName + ',' + this.query.BasePackage
+								} else if (ele.packCategory == 1) {
+									this.query.PersonalityPack = ele.packageName + ',' + this.query
+										.PersonalityPack
+								}
 							}
 						})
 					})
@@ -440,17 +509,38 @@
 			packagescheckboxGroupChange(e) {
 				this.query.packageNoList = e
 			},
+			//接收拍照或签名
+			residentAutographPath(data) {
+				this.query.residentAutographPath = data
+			},
 		},
 		onLoad(options) {
 			this.arealistinfo('371400000000 ', '1', 'county');
 			this.getCrowdinfo();
+			let date = new Date();
+			let year = date.getFullYear();
+			let month = date.getMonth() + 1;
+			let day = date.getDate();
+			if (month < 10) {
+				month = '0' + month;
+			}
+			if (day < 10) {
+				day = '0' + day;
+			}
+			this.query.signTime = year + '-' + month + '-' + day;
 		},
 		onShow() {
 			var that = this
 			uni.$on('data', function(data) {
 				let item = JSON.parse(data.data)
+				if (that.query.orgNo != item.orgNo) {
 					that.query.orgName = item.orgName
 					that.query.orgNo = item.orgNo
+					that.query.userName = ''
+					that.query.userNo = ''
+					that.query.teamNo = ''
+					that.query.teamName = ''
+				}
 				uni.$off('data')
 			})
 			uni.$on('doctordata', function(data) {
@@ -459,6 +549,9 @@
 				that.query.userNo = item.userNo
 				that.query.teamNo = item.teamNo
 				that.query.teamName = item.teamName
+				getDoctorListtwo(1, 20, item.teamNo, '1').then(res => {
+					that.query.DoctorList = res.rows
+				})
 				uni.$off('doctordata')
 			})
 		},

pagesC/choosedoctor/choosedoctor.scss

@@ -64,7 +64,11 @@
 					top: 65%;
 					right: 10rpx;
 				}
-
+				.nobtn{
+						background: #fff !important;
+						border: 2rpx solid #26A888 !important;
+						color: #26A888 !important;
+				}
 				.title {
 					position: absolute;
 					top: 70%;

pagesC/choosedoctor/choosedoctor.vue

@@ -2,7 +2,7 @@
 	<view class="app">
 		<view class="inputs">
 			<i class="icon"></i>
-			<input type="text" name="" id="" class="input" placeholder="请输入医生姓名">
+			<input type="text" name="" id="" class="input" placeholder="请输入医生姓名" v-model="realname">
 		</view>
 		<view class="list">
 			<view class="item" v-for="item in doctorlist" @tap='emitdata(item)'>
@@ -16,7 +16,10 @@
 				<view class="title">
 					{{item.teamMemberTypeName?item.teamMemberTypeName:''}}
 				</view>
-				<view class="zixunbtn">
+				<view class="zixunbtn" v-if="item.userNo==userNo">
+					已选择
+				</view>
+				<view class="zixunbtn  nobtn" v-else>
 					选TA
 				</view>
 			</view>
@@ -35,21 +38,30 @@
 		data() {
 			return {
 				orgNo: null,
+				userNo: null,
 				teamNo: null,
+				realname: '',
 				doctorlist: [],
 				doctortotal: 0,
 				pageNum: 1,
 			};
 		},
+		watch: {
+			realname: {
+				handler(newval, oldval) {
+					this.getDoctorListinfo();
+				}
+			}
+		},
 		methods: {
 			getDoctorListinfo() {
 				if (this.orgNo) {
-					getDoctorList(this.pageNum, this.orgNo, '1').then(res => {
+					getDoctorList(this.pageNum, this.orgNo, '1', this.realname).then(res => {
 						this.doctorlist = res.rows
 						this.doctortotal = res.total
 					})
 				} else {
-					getDoctorListtwo(this.pageNum, 10, this.teamNo, '1').then(res => {
+					getDoctorListtwo(this.pageNum, 10, this.teamNo, '1', this.realname).then(res => {
 						this.doctorlist = res.rows
 						this.doctortotal = res.total
 					})
@@ -67,6 +79,7 @@
 		onLoad(options) {
 			if (options.orgNo) {
 				this.orgNo = options.orgNo
+				this.userNo = options.userNo
 			} else {
 				// this.teamNo = uni.getStorageSync('userinfo').teamNo
 				this.teamNo = "00bf7f5a02f3460aa975721ff9f5e533"
@@ -77,14 +90,14 @@
 			if (this.doctorlist.length >= this.doctortotal) {} else {
 				this.pageNum++;
 				if (this.orgNo) {
-					getDoctorList(this.pageNum, this.orgNo, '1').then(res => {
+					getDoctorList(this.pageNum, this.orgNo, '1', this.realname).then(res => {
 						res.rows.forEach(e => {
 							this.doctorlist.push(e)
 						})
 						this.doctortotal = res.total
 					})
 				} else {
-					getDoctorListtwo(this.pageNum, 10, this.teamNo, '1').then(res => {
+					getDoctorListtwo(this.pageNum, 10, this.teamNo, '1', this.realname).then(res => {
 						res.rows.forEach(e => {
 							this.doctorlist.push(e)
 						})

pagesC/selectInstitution/selectInstitution.vue

@@ -7,7 +7,7 @@
 			</u-dropdown>
 			<view class="inputs">
 				<i class="icon"></i>
-				<input type="text" name="" id="" class="input" placeholder="搜签约机构">
+				<input type="text" name="" id="" class="input" placeholder="搜签约机构" v-model="query.orgName">
 			</view>
 		</view>
 		<view class="text">
@@ -27,7 +27,7 @@
 						{{item.distance}} KM
 					</view>
 				</view>
-				<view class="Selected">
+				<view class="Selected" v-if='item.orgNo == orgNo'>
 					已选择
 				</view>
 			</view>
@@ -43,6 +43,7 @@
 	export default {
 		data() {
 			return {
+				orgNo: '',
 				address: 1,
 				addressname: '全部',
 				addressoptions: [{
@@ -53,12 +54,20 @@
 					lat: '',
 					lng: '',
 					pageSize: 10,
-					pageNum: 1
+					pageNum: 1,
+					orgName: '',
 				},
 				institutionlist: [],
 				institutiontotal: 0,
 			};
 		},
+		watch: {
+			'query.orgName': {
+				handler(newval, oldval) {
+					this.getNearbyOrginfo();
+				}
+			}
+		},
 		methods: {
 			dropitemchange(e) {
 				this.addressname = this.addressoptions.find(m => m.value === e).label
@@ -94,6 +103,7 @@
 			},
 		},
 		onLoad(options) {
+			options.orgNo ? this.orgNo = options.orgNo : ''
 			this.getCountyinfo()
 			var that = this
 			uni.getLocation({
@@ -132,7 +142,7 @@
 			}
 		},
 		onPullDownRefresh() { //下拉刷新
-			this.pageNum = 1;
+			this.query.pageNum = 1;
 			this.getNearbyOrginfo()
 			setTimeout(function() {
 				uni.stopPullDownRefresh();