padding 调整

多文本显示内容多的信息
默认加载信息时 设置缓存数据

pages/apply/user.vue

@@ -326,7 +326,7 @@
 	.form-sub {
 		/* margin: 20px 16px 10px 16px; */
 		/* border: 1px solid #EBEEF5; */
-		padding: 20px 30px 10px 30px;
+		padding: 20px 10px 10px 10px;
 		/* box-shadow: rgba(0, 0, 0, 0.08) 0px 0px 3px 1px; */
 		background-color: #ffffff;
 		border-radius: 10px;

pages/apply/viewCheck.vue

@@ -33,8 +33,12 @@
 										v-for="(item, index) in model.ListShow">
 										<uni-collapse-item :title="(index+1) + '. ' + item.CHECKCONTENT" name="1">
 											<u-form-item label="检查内容" prop="CHECKCONTENT" borderBottom>
-												<u--input disabled disabledColor="#fff" v-model="item.CHECKCONTENT"
+
-													border="none" inputAlign="right"></u--input>
+												<!-- <u--input disabled disabledColor="#fff" v-model="item.CHECKCONTENT"
+													border="none" inputAlign="right"></u--input> -->
+
+												<u--textarea disabled disabledColor="#fff" v-model="item.CHECKCONTENT"
+													border="none" inputAlign="right" autoHeight ></u--textarea>
 											</u-form-item>
 											<u-form-item v-if="model.ISDOWN=='是'" label="区域" prop="Nav_RiskArea.NAME"
 												borderBottom>
@@ -127,7 +131,7 @@
 			this.OrgId = option.OrgId // 'B043B28B-BBC3-C452-6052-4FBA1457ABFA'
 			if (this.model.RISK_AREA_ID != undefined && this.model.RISK_AREA_ID != '') {
 				this.PagedCheckMain() //扫二维码 默认赋值
-				
+
 				const json = initFilter(this.OrgId, null, "NAME", 0, 1);
 				json.IgnoreDataRule = true
 				json.Limit = 2
@@ -289,7 +293,7 @@
 	.form-sub {
 		/* margin: 20px 16px 10px 16px; */
 		/* border: 1px solid #EBEEF5; */
-		padding: 20px 30px 10px 30px;
+		padding: 20px 10px 10px 10px;
 		/* box-shadow: rgba(0, 0, 0, 0.08) 0px 0px 3px 1px; */
 		background-color: #ffffff;
 		border-radius: 10px;

pages/apply/viewEvaluation.vue

@@ -3,7 +3,7 @@
 	<view class="content">
 		<view class="container">
 			<view class="form-sub">
-				
+
 				<u-form :model="model" ref="uForm" label-width="90px" class="demo-ruleForm" size="mini">
 					<view style="font-size: 15px; font-weight: bold;color: #3d4b70;margin-bottom: 10px;">隐患信息</view>
 					<u-form-item label="区域名称" prop="RISK_AREA_NAME" borderBottom ref="item1"
@@ -29,14 +29,15 @@
 							<u--form labelPosition="left" labelWidth="auto" labelAlign="center"
 								errorType="border-bottom" style="margin-bottom: 50px;" ref="sForm">
 								<uni-collapse :border="false" accordion>
-									<uni-card style="margin-bottom: 5px;" margin="0"
+									<uni-card style="margin-bottom: 5px;" margin="0" spacing="0" :is-shadow="false"
-										spacing="0" :is-shadow="false" v-for="(item, index) in model.ListShow">
+										v-for="(item, index) in model.ListShow">
 										<uni-collapse-item :title="(index+1) + '. ' + item.CHECKCONTENT" name="1">
 											<u-form-item label="检查内容" prop="CHECKCONTENT" borderBottom>
-												<u--input disabled disabledColor="#fff" v-model="item.CHECKCONTENT"
+												<u--textarea disabled disabledColor="#fff" v-model="item.CHECKCONTENT"
-													border="none" inputAlign="right"></u--input>
+													border="none" inputAlign="right" autoHeight></u--textarea>
 											</u-form-item>
-											<u-form-item   v-if="model.ISDOWN=='是'" label="区域" prop="Nav_RiskArea.NAME" borderBottom>
+											<u-form-item v-if="model.ISDOWN=='是'" label="区域" prop="Nav_RiskArea.NAME"
+												borderBottom>
 												<u--input disabled disabledColor="#fff" v-model="item.Nav_RiskArea.NAME"
 													border="none" inputAlign="right"></u--input>
 											</u-form-item>
@@ -44,10 +45,6 @@
 												<u--input disabled disabledColor="#fff" v-model="item.DESCREPTION"
 													border="none" inputAlign="right"></u--input>
 											</u-form-item>
-											<!-- <u-form-item label="上报时间" prop="CREATE_TIME" borderBottom>
-												<u--input disabled disabledColor="#fff" v-model="item.CREATE_TIME"
-													border="none" inputAlign="right"></u--input>
-											</u-form-item> -->
 										</uni-collapse-item>
 									</uni-card>
 								</uni-collapse>
@@ -77,9 +74,9 @@
 		data() {
 			return {
 				OrgId: '',
-				pageIndex:0,
+				pageIndex: 0,
-				pageSize:20,
+				pageSize: 20,
-				total:0,
+				total: 0,
 				model: {
 					RISK_AREA_NAME: '请选择区域',
 					RISK_AREA_ID: '',
@@ -125,7 +122,7 @@
 			this.OrgId = option.OrgId // 'B043B28B-BBC3-C452-6052-4FBA1457ABFA'
 			if (this.model.RISK_AREA_ID != undefined && this.model.RISK_AREA_ID != '') {
 				// this.PagedCheckMain()//扫二维码 默认赋值
-				
+
 				const json = initFilter(this.OrgId, null, "NAME", 0, 1);
 				json.IgnoreDataRule = true
 				json.Limit = 2
@@ -147,14 +144,14 @@
 				const json = initFilter(this.OrgId, this.model.RISK_AREA_ID, "CREATE_TIME", 1, this.pageIndex, ((
 					this.model.ISDOWN == '否' || this.model.ISDOWN == '') ? false : true))
 				json.IgnoreDataRule = true
-				json.Limit = this.pageSize 
+				json.Limit = this.pageSize
-				json.SelectField = ["CHECKCONTENT", "DESCREPTION","Nav_RiskArea.NAME", "CREATE_TIME"]
+				json.SelectField = ["CHECKCONTENT", "DESCREPTION", "Nav_RiskArea.NAME", "CREATE_TIME"]
 				PagedCheckMain(json).then(res => {
 					if (res.IsSuccessful) {
-						this.total=res.TotalCount
+						this.total = res.TotalCount
 						// this.model.ListShow = res.Data
 						if (paginate) {
-							this.model.ListShow= this.model.ListShow.concat(res.Data)
+							this.model.ListShow = this.model.ListShow.concat(res.Data)
 						} else {
 							this.model.ListShow = res.Data
 						}
@@ -242,7 +239,7 @@
 			}
 		},
 		onReachBottom() {
-			if (this.total > this.pageSize  * this.pageIndex)
+			if (this.total > this.pageSize * this.pageIndex)
 				this.PagedCheckMain(true)
 		}
 		// watch: {
@@ -284,7 +281,7 @@
 	.form-sub {
 		/* margin: 20px 16px 10px 16px; */
 		/* border: 1px solid #EBEEF5; */
-		padding: 20px 30px 10px 30px;
+		padding: 20px 10px 10px 10px;
 		/* box-shadow: rgba(0, 0, 0, 0.08) 0px 0px 3px 1px; */
 		background-color: #ffffff;
 		border-radius: 10px;

pages/apply/viewRisk.vue

@@ -33,8 +33,11 @@
 										v-for="(item, index) in model.ListShow">
 										<uni-collapse-item :title="(index+1) + '. ' + item.CHECKCONTENT" name="1">
 											<u-form-item label="检查内容" prop="CHECKCONTENT" borderBottom>
-												<u--input disabled disabledColor="#fff" v-model="item.CHECKCONTENT"
+												<!-- <u--input disabled disabledColor="#fff" v-model="item.CHECKCONTENT"
-													border="none" inputAlign="right"></u--input>
+													border="none" inputAlign="right"></u--input> -->
+
+												<u--textarea disabled disabledColor="#fff" v-model="item.CHECKCONTENT"
+													border="none" inputAlign="right" autoHeight></u--textarea>
 											</u-form-item>
 											<u-form-item v-if="model.ISDOWN=='是'" label="区域" prop="Nav_RiskArea.NAME"
 												borderBottom>
@@ -271,7 +274,7 @@
 	.form-sub {
 		/* margin: 20px 16px 10px 16px; */
 		/* border: 1px solid #EBEEF5; */
-		padding: 20px 30px 10px 30px;
+		padding: 20px 10px 10px 10px;
 		/* box-shadow: rgba(0, 0, 0, 0.08) 0px 0px 3px 1px; */
 		background-color: #ffffff;
 		border-radius: 10px;

pages/apply/viewVideo.vue

@@ -284,7 +284,7 @@
 	.form-sub {
 		/* margin: 20px 16px 10px 16px; */
 		/* border: 1px solid #EBEEF5; */
-		padding: 20px 30px 10px 30px;
+		padding: 20px 10px 10px 10px;
 		/* box-shadow: rgba(0, 0, 0, 0.08) 0px 0px 3px 1px; */
 		background-color: #ffffff;
 		border-radius: 10px;

pages/index/index.vue

@@ -111,13 +111,19 @@
 							this.POST_ID = e.split('=')[1]
 						}
 					})
-				} else {
-					//出现公司选择
 				}
 			}
 			// createType    '区域'10    '岗位'20
-			if (this.OrgId && this.OrgId.length > 1)
+			if (this.OrgId && this.OrgId.length > 1) {
+				this.dataLists.forEach(e => {
+					if (this.OrgId.toUpperCase() == e.id) {
+						this.NAME = e.name
+						//初始化加载 存值
+						uni.setStorageSync('tenantId', e.tenantId)
+					}
+				})
 				this.getCaidan()
+			}
 		},
 
 		//页面跳转到APP
@@ -232,6 +238,7 @@
 				this.selectorInfo.showPopup = false
 				this.OrgId = e.id
 				this.NAME = e.name
+				//公司选择 存值
 				uni.setStorageSync('tenantId', e.tenantId)
 				if (this.OrgId && this.OrgId.length > 1)
 					this.getCaidan()