From f7905342dd9d28f35be9caf475fd66c23fede131 Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Mon, 13 Nov 2023 14:22:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E7=BA=A6=E6=9C=8D=E5=8A=A1=E5=8D=8F?=
 =?UTF-8?q?=E8=AE=AE=E4=B9=A6=20=E6=BB=91=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/protocol/protocol.vue              | 152 +++++++++---------
 .../contractsigningprotocol.vue               | 124 ++++++++------
 2 files changed, 148 insertions(+), 128 deletions(-)

diff --git a/components/protocol/protocol.vue b/components/protocol/protocol.vue
index a08b5de..814b6ca 100644
--- a/components/protocol/protocol.vue
+++ b/components/protocol/protocol.vue
@@ -12,83 +12,70 @@
 				<h4>乙方：</h4>
 				<h4 class="box-line">{{list.residentName}}</h4>
 			</view>
-			<u-table width="80%">
-					<u-tr class="u-tr">
-						<u-th class="u-th">姓名</u-th>
-						<u-th class="u-th">性别</u-th>
-						<u-th class="u-th">年龄</u-th>
-						<u-th class="u-th">身份证号</u-th>
-						<u-th class="u-th">现住址</u-th>
-						<u-th class="u-th">选择签约基础服务包</u-th>
-						<u-th class="u-th">选择签约个性服务包</u-th>
-					</u-tr>
-					<u-tr class="u-tr">
-						<u-td class="u-th">{{list.residentName}}</u-td>
-						<u-td class="u-th">{{list.gender === '1' ? '男' : '女'}}</u-td>
-						<u-td class="u-th">{{list.age?list.age:''}}</u-td>
-						<u-td class="u-th">{{list.identity?list.identity:''}}</u-td>
-						<u-td class="u-th">{{list.address?list.address:''}}</u-td>
-						<u-td class="u-th">{{list.phone?list.phone:''}}</u-td>
-						<u-td class="u-th">{{list.BasePackage?list.BasePackage:''}} </u-td>
-						<u-td class="u-th">{{list.PersonalityPack?list.PersonalityPack:''}}</u-td>
-					</u-tr>
-				</u-table>
-			<!-- <uni-table border stripe emptyText="暂无更多数据">
-				<uni-tr>
-					<uni-th>姓名</uni-th>
-					<uni-th>性别</uni-th>
-					<uni-th>年龄</uni-th>
-					<uni-th>身份证号</uni-th>
-					<uni-th>现住址</uni-th>
-					<uni-th>手机号码</uni-th>
-					<uni-th>选择签约基础服务包 </uni-th>
-					<uni-th>选择签约个性服务包</uni-th>
-				</uni-tr>
-				<uni-tr>
-					<uni-td>{{list.residentName}}</uni-td>
-					<uni-td>{{list.gender === '1' ? '男' : '女'}}</uni-td>
-					<uni-td>{{list.age?list.age:''}}</uni-td>
-					<uni-td>{{list.identity?list.identity:''}}</uni-td>
-					<uni-td>{{list.address?list.address:''}}</uni-td>
-					<uni-td>{{list.phone?list.phone:''}}</uni-td>
-					<uni-td>{{list.BasePackage?list.BasePackage:''}} </uni-td>
-					<uni-td>{{list.PersonalityPack?list.PersonalityPack:''}}</uni-td>
-				</uni-tr>
-			</uni-table> -->
+			<scroll-view class="scroll-view" scroll-x="true">
+				<view class="itemdata">
+					<uni-table border stripe emptyText="暂无更多数据">
+						<uni-tr>
+							<uni-th>姓名</uni-th>
+							<uni-th>性别</uni-th>
+							<uni-th>年龄</uni-th>
+							<uni-th>身份证号</uni-th>
+							<uni-th>现住址</uni-th>
+							<uni-th>手机号码</uni-th>
+							<uni-th>选择签约基础服务包 </uni-th>
+							<uni-th>选择签约个性服务包</uni-th>
+						</uni-tr>
+						<uni-tr>
+							<uni-td>{{list.residentName}}</uni-td>
+							<uni-td>{{list.gender === '1' ? '男' : '女'}}</uni-td>
+							<uni-td>{{list.age?list.age:''}}</uni-td>
+							<uni-td>{{list.identity?list.identity:''}}</uni-td>
+							<uni-td>{{list.address?list.address:''}}</uni-td>
+							<uni-td>{{list.phone?list.phone:''}}</uni-td>
+							<uni-td>{{list.BasePackage?list.BasePackage:''}} </uni-td>
+							<uni-td>{{list.PersonalityPack?list.PersonalityPack:''}}</uni-td>
+						</uni-tr>
+					</uni-table>
+				</view>
+			</scroll-view>
 			<view>
 				<p style='padding-top: 30rpx;line-height: 46rpx;'>甲乙双方本着平等、尊重和自愿的原则，签订此协议，接受以下条款的约定</p>
 				<p style='padding: 30rpx 0;line-height: 46rpx;'>甲乙双方共同确定
 					<text class="box-line">{{list.teamName}}</text>为乙方的家庭医生服务团队
 				</p>
-				<uni-table border stripe emptyText="暂无更多数据">
-					<uni-tr>
-						<uni-th>家庭医生服务团队成员</uni-th>
-						<uni-th>姓名</uni-th>
-						<uni-th>职称</uni-th>
-						<uni-th>固定电话</uni-th>
-						<uni-th>联系电话</uni-th>
-					</uni-tr>
-					<uni-tr v-for="(member, index) in list.DoctorList" :index="index" :key="index">
-						<uni-td v-if="member.teamLeader">
-							团队长
-						</uni-td>
-						<uni-td v-else>
-							{{member.teamMemberType=='0'?'全科医生':''}}
-							{{member.teamMemberType=='1'?'专科医生':''}}
-							{{member.teamMemberType=='2'?'社区护士':''}}
-							{{member.teamMemberType=='3'?'公共卫生人员':''}}
-						</uni-td>
-						<uni-td>{{member.realname?member.realname:''}}</uni-td>
-						<uni-td>
-							{{member.profTitle=='0'?'初级':''}}
-							{{member.profTitle=='1'?'中级':''}}
-							{{member.profTitle=='2'?'高级':''}}
-							{{member.profTitle=='99'?'其他':''}}
-						</uni-td>
-						<uni-td>{{member.landline?member.landline:''}}</uni-td>
-						<uni-td>{{member.mobilePhone?member.mobilePhone:''}}</uni-td>
-					</uni-tr>
-				</uni-table>
+				<scroll-view class="scroll-view" scroll-x="true">
+					<view class="itemdata">
+						<uni-table border stripe emptyText="暂无更多数据">
+							<uni-tr>
+								<uni-th>家庭医生服务团队成员</uni-th>
+								<uni-th>姓名</uni-th>
+								<uni-th>职称</uni-th>
+								<uni-th>固定电话</uni-th>
+								<uni-th>联系电话</uni-th>
+							</uni-tr>
+							<uni-tr v-for="(member, index) in list.DoctorList" :index="index" :key="index">
+								<uni-td v-if="member.teamLeader">
+									团队长
+								</uni-td>
+								<uni-td v-else>
+									{{member.teamMemberType=='0'?'全科医生':''}}
+									{{member.teamMemberType=='1'?'专科医生':''}}
+									{{member.teamMemberType=='2'?'社区护士':''}}
+									{{member.teamMemberType=='3'?'公共卫生人员':''}}
+								</uni-td>
+								<uni-td>{{member.realname?member.realname:''}}</uni-td>
+								<uni-td>
+									{{member.profTitle=='0'?'初级':''}}
+									{{member.profTitle=='1'?'中级':''}}
+									{{member.profTitle=='2'?'高级':''}}
+									{{member.profTitle=='99'?'其他':''}}
+								</uni-td>
+								<uni-td>{{member.landline?member.landline:''}}</uni-td>
+								<uni-td>{{member.mobilePhone?member.mobilePhone:''}}</uni-td>
+							</uni-tr>
+						</uni-table>
+					</view>
+				</scroll-view>
 				<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
@@ -155,9 +142,9 @@
 		data() {
 			return {
 				content: '',
-				orgBase64:'',
-				doctorBase64:'',
-				meimage:'',
+				orgBase64: '',
+				doctorBase64: '',
+				meimage: '',
 				signatureshow: false,
 				fabContent: [{
 					iconPath: '/static/pageC/signature-unselected.png',
@@ -252,6 +239,19 @@
 		background-color: #fff;
 	}
 
+	.scroll-view {
+		width: 100%;
+		white-space: nowrap; //scroll-view元素
+
+		.itemdata {
+			width: 105%;
+
+			display: inline-block; //子元素
+		}
+
+	}
+
+
 	.agreement-title-box {
 		padding-top: 20rpx;
 		margin: 0 0 30rpx;
@@ -302,4 +302,4 @@
 			}
 		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pagesC/contractsigningprotocol/contractsigningprotocol.vue b/pagesC/contractsigningprotocol/contractsigningprotocol.vue
index 75a91e5..4b10441 100644
--- a/pagesC/contractsigningprotocol/contractsigningprotocol.vue
+++ b/pagesC/contractsigningprotocol/contractsigningprotocol.vue
@@ -12,62 +12,71 @@
 				<h4>乙方：</h4>
 				<h4 class="box-line">{{list.signInfo.residentName?list.signInfo.residentName:''}}</h4>
 			</view>
-			<uni-table border stripe emptyText="暂无更多数据">
-				<uni-tr>
-					<uni-th>姓名</uni-th>
-					<uni-th>性别</uni-th>
-					<uni-th>年龄</uni-th>
-					<uni-th>身份证号</uni-th>
-					<uni-th>现住址</uni-th>
-					<uni-th>手机号码</uni-th>
-					<uni-th>选择签约基础服务包 </uni-th>
-					<uni-th>选择签约个性服务包</uni-th>
-				</uni-tr>
-				<uni-tr>
-					<uni-td>{{list.signInfo.residentName?list.signInfo.residentName:''}}</uni-td>
-					<uni-td>{{list.signInfo.gender === '1' ? '男' : '女'}}</uni-td>
-					<uni-td>{{list.signInfo.age?list.signInfo.age:''}}</uni-td>
-					<uni-td>{{list.signInfo.identity?list.signInfo.identity:''}}</uni-td>
-					<uni-td>{{list.signInfo.address?list.signInfo.address:''}}</uni-td>
-					<uni-td>{{list.signInfo.phone?list.signInfo.phone:''}}</uni-td>
-					<uni-td>{{list.basePackagesName?list.basePackagesName:''}} </uni-td>
-					<uni-td>{{list.specialPackagesName?list.specialPackagesName:""}}</uni-td>
-				</uni-tr>
-			</uni-table>
+			<scroll-view class="scroll-view" scroll-x="true">
+				<view class="itemdata">
+					<uni-table border stripe emptyText="暂无更多数据">
+						<uni-tr>
+							<uni-th>姓名</uni-th>
+							<uni-th>性别</uni-th>
+							<uni-th>年龄</uni-th>
+							<uni-th>身份证号</uni-th>
+							<uni-th>现住址</uni-th>
+							<uni-th>手机号码</uni-th>
+							<uni-th>选择签约基础服务包 </uni-th>
+							<uni-th>选择签约个性服务包</uni-th>
+						</uni-tr>
+						<uni-tr>
+							<uni-td>{{list.signInfo.residentName?list.signInfo.residentName:''}}</uni-td>
+							<uni-td>{{list.signInfo.gender === '1' ? '男' : '女'}}</uni-td>
+							<uni-td>{{list.signInfo.age?list.signInfo.age:''}}</uni-td>
+							<uni-td>{{list.signInfo.identity?list.signInfo.identity:''}}</uni-td>
+							<uni-td>{{list.signInfo.address?list.signInfo.address:''}}</uni-td>
+							<uni-td>{{list.signInfo.phone?list.signInfo.phone:''}}</uni-td>
+							<uni-td>{{list.basePackagesName?list.basePackagesName:''}} </uni-td>
+							<uni-td>{{list.specialPackagesName?list.specialPackagesName:""}}</uni-td>
+						</uni-tr>
+					</uni-table>
+				</view>
+			</scroll-view>
+
 			<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>为乙方的家庭医生服务团队
 				</p>
-				<uni-table border stripe emptyText="暂无更多数据">
-					<uni-tr>
-						<uni-th>专病管理服务团队成员</uni-th>
-						<uni-th>姓名</uni-th>
-						<uni-th>职称</uni-th>
-						<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-td v-if="member.teamLeader">
-							团队长
-						</uni-td>
-						<uni-td v-else>
-							{{member.teamMemberType=='0'?'全科医生':''}}
-							{{member.teamMemberType=='1'?'专科医生':''}}
-							{{member.teamMemberType=='2'?'社区护士':''}}
-							{{member.teamMemberType=='3'?'公共卫生人员':''}}
-						</uni-td>
-						<uni-td>{{member.realname?member.realname:''}}</uni-td>
-						<uni-td>
-							{{member.profTitle=='0'?'初级':''}}
-							{{member.profTitle=='1'?'中级':''}}
-							{{member.profTitle=='2'?'高级':''}}
-							{{member.profTitle=='99'?'其他':''}}
-						</uni-td>
-						<uni-td>{{member.landline?member.landline:''}}</uni-td>
-						<uni-td>{{member.mobilePhone?member.mobilePhone:''}}</uni-td>
-					</uni-tr>
-				</uni-table>
+				<scroll-view class="scroll-view" scroll-x="true">
+					<view class="itemdata">
+						<uni-table border stripe emptyText="暂无更多数据">
+							<uni-tr>
+								<uni-th>家庭医生服务团队成员</uni-th>
+								<uni-th>姓名</uni-th>
+								<uni-th>职称</uni-th>
+								<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-td v-if="member.teamLeader">
+									团队长
+								</uni-td>
+								<uni-td v-else>
+									{{member.teamMemberType=='0'?'全科医生':''}}
+									{{member.teamMemberType=='1'?'专科医生':''}}
+									{{member.teamMemberType=='2'?'社区护士':''}}
+									{{member.teamMemberType=='3'?'公共卫生人员':''}}
+								</uni-td>
+								<uni-td>{{member.realname?member.realname:''}}</uni-td>
+								<uni-td>
+									{{member.profTitle=='0'?'初级':''}}
+									{{member.profTitle=='1'?'中级':''}}
+									{{member.profTitle=='2'?'高级':''}}
+									{{member.profTitle=='99'?'其他':''}}
+								</uni-td>
+								<uni-td>{{member.landline?member.landline:''}}</uni-td>
+								<uni-td>{{member.mobilePhone?member.mobilePhone:''}}</uni-td>
+							</uni-tr>
+						</uni-table>
+					</view>
+				</scroll-view>
 				<u-parse style="margin-top: 30rpx;" :html="list.protocolContent.content"></u-parse>
 				<h4 style='padding-top: 30rpx;font-weight: 600;'>三、服务收费</h4>
 				<p style='padding-top: 30rpx;line-height: 46rpx;'>1. 根据自愿选择的原则，乙方选择<text
@@ -207,6 +216,17 @@
 		margin: 10rpx auto;
 		background-color: #fff;
 	}
+	.scroll-view {
+		width: 100%;
+		white-space: nowrap; //scroll-view元素
+	
+		.itemdata {
+			width: 105%;
+	
+			display: inline-block; //子元素
+		}
+	
+	}
 
 	.agreement-title-box {
 		padding-top: 20rpx;
@@ -258,4 +278,4 @@
 			}
 		}
 	}
-</style>
+</style>
\ No newline at end of file