zc

pages_hazardousWasteRecycling/views/historicalRecords/index.vue

@@ -24,7 +24,8 @@
 				<view class="for-text-p">报备人：{{item.reportName}}</view>
 				<view class="for-text-p">报备时间：{{item.reportTime}}</view>
 				<view class="for-type-p" :class="item.status=='0'?'colorA':(item.status=='1'?'colorB':(item.status=='2'?'colorC':''))">{{item.status=='0'?'已报备待回收':(item.status=='1'?'已回收':(item.status=='2'?'超期未回收':''))}}</view>
-				<view class="for-icon-p">》</view>
+				<!-- <view class="for-icon-p">》</view> -->
+				<img class="for-icon-p" :src="imagesUrl('commonality/icon_04.png')">
 			</view>
 			<view class="get-null-box" v-if="getDataType">暂无更多数据</view>
 		</scroll-view>
@@ -244,6 +245,8 @@
 					right:20rpx;
 				}
 				.for-icon-p{
+					width:14rpx;
+					height:32rpx;
 					position: absolute;
 					top:155rpx;
 					right:20rpx;

pages_hazardousWasteRecycling/views/historicalRecords/infoPage.vue

@@ -1,14 +1,17 @@
 <!-- 历史记录详情 -->
 <template>
 	<view class="historicalRecordsInfoPage">
-		<view class="title-p" style="margin-top:20rpx;">基础信息</view>
+		<view class="top-status-p" v-if="newData.status == 2">若有回收计划请在下次回收时重新报备。</view>
+		<view class="title-p" style="margin-top:20rpx;">
+			<view>基础信息</view>
+				<view class="positon-p" :class="newData.status=='0'?'colorA':(newData.status=='1'?'colorB':(newData.listNewData0=='2'?'colorC':''))">{{newData.listNewData0=='0'?'已报备待回收':(newData.status=='1'?'已回收':(newData.status=='2'?'超期未回收':''))}}</view>
+		</view>
 		<view class="title-weight-p">报备单编号：{{newData.reportNo}}</view>
 		<view class="text-p">报备实验室：{{newData.subName}}({{newData.roomNum}})</view>
 		<view class="text-p">上门回收日期：{{newData.expectTime}}({{newData.expectWeek}})</view>
 		<view class="text-p">报备人：{{newData.reportName}}({{newData.reportAccount}})</view>
 		<view class="text-p">报备时间：{{newData.reportTime}}</view>
 		<view class="title-p">报备内容</view>
-		<view class="positon-p" :class="newData.status=='0'?'colorA':(newData.status=='1'?'colorB':(newData.listNewData0=='2'?'colorC':''))">{{newData.listNewData0=='0'?'已报备待回收':(newData.status=='1'?'已回收':(newData.status=='2'?'超期未回收':''))}}</view>
 		<view class="text-weight-box">
 			<view>危险废物种类</view>
 			<view>共{{newData.wasteOrderHistoryDetailItemVos.length}}种</view>
@@ -86,7 +89,16 @@
 		position: relative;
 		overflow-x: hidden;
 		overflow-y: scroll;
+		.top-status-p{
+			margin-top:40rpx;
+			line-height: 40rpx;
+			padding: 0 20rpx;
+			font-size:32rpx;
+			color:#FF6A6A;
+			text-align: center;
+		}
 		.title-p{
+			position: relative;
 			line-height:80rpx;
 			font-size:32rpx;
 			padding:0 30rpx;
@@ -111,7 +123,7 @@
 		}
 		.positon-p{
 			position: absolute;
-			top:20rpx;
+			top:0;
 			right:30rpx;
 		}
 		.text-weight-box{

pages_hazardousWasteRecycling/views/permissionApply/addPage.vue

@@ -26,6 +26,7 @@
 			<view class="check-title-p">申请实验室</view>
 			<input @click="inputClick(2)" v-model="subject.subName" class="picker-input-box" disabled type="text"
 				placeholder="请选择实验室">
+			<view v-if="subject.subName" class="picker-button-box" @click="inputClick(2)">修改</view>
 		</view>
 		<view style="margin-top:40rpx;">
 			<view class="text-color-p" v-if="subject.subName">基础信息：{{subject.deptName}}</view>
@@ -170,7 +171,7 @@
 				} = await hwmsPermConfigList()
 				if (data.code == 200) {
 					for(let i=0;i<data.data.length;i++){
-						data.data[i].checkType = false;
+						data.data[i].checkType = true;
 					}
 					this.$set(this,'permConfigList',data.data);
 				}
@@ -223,7 +224,7 @@
 		background-color: #fff;
 		.check-big-box{
 			display: flex;
-			padding:0 40rpx;
+			padding:0 0 0 40rpx;
 			margin-top:30rpx;
 			.check-text-p{
 				color:#FF6A6A;
@@ -254,11 +255,21 @@
 				padding: 0 20rpx;
 				display flex;
 				height: 80rpx;
-				width: 400rpx;
+				width: 330rpx;
 				border: 1rpx solid #a2a2a2;
 				border-radius: 10rpx;
 				margin: 0 20rpx;
 			}
+			.picker-button-box{
+				font-size:30rpx;
+				height: 80rpx;
+				width: 100rpx;
+				line-height:80rpx;
+				text-align: center;
+				color:#fff;
+				background-color:#0183FA;
+				border-radius: 10rpx;
+			}
 		}
 		.text-color-p{
 			color:#666;

pages_hazardousWasteRecycling/views/recyclingReportRecord/index.vue

@@ -48,7 +48,7 @@
 				<view class="add-item-button" v-if="this.addForm.formData4.length < this.dialogOptionForList.length"
 				@click="addItemButton()">添加类型</view>
 				<view class="sub-picker-box">
-					<view class="mark-box">*</view>
+					<view class="mark-box"></view>
 					<view class="title-box">备注:</view>
 					<textarea class="input-text-p" type="text" v-model="addForm.remark" 
 					maxlength="100" @input="sumfontnum" placeholder="请输入备注说明" 
@@ -141,15 +141,6 @@
 						return
 					}
 				}
-				if(!this.addForm.remark){
-					uni.showToast({
-						title: '请输入备注',
-						icon: "none",
-						mask: true,
-						duration: 2000
-					});
-					return
-				}
 				let obj = {
 					id:this.addForm.id,
 					expectTime:this.addForm.expectTime,

pages_hazardousWasteRecycling/views/weighingRegistration/addPage.vue

@@ -77,7 +77,12 @@
 				<view class="sub-picker-box" style="padding-bottom:50rpx;">
 				</view>
 			</view>
-			<view class="submit-button" @click="submitButton">登记完成，提交</view>
+			<view class="submit-check-box" @click="buttonCheck()">
+				<img v-if="!checkType" class="left-box" :src="imagesUrl('commonality/icon_12.png')">
+				<img v-if="checkType" class="left-box" :src="imagesUrl('commonality/icon_13.png')">
+				<view :class="checkType?'check-view':''">本人已认真核对本次危险废物的登记类别及重量信息，确认数据真实、准确、完整，并对其真实性依法承担相应责任。</view>
+			</view>
+			<view class="submit-button" :class="!checkType?'no-submit-button':''" @click="submitButton">登记完成，提交</view>
 		</view>
 	</view>
 </template>
@@ -112,6 +117,7 @@
 				},
 				dialogOptionList:[],
 				dialogOptionForList:[],
+				checkType:false,
 			}
 		},
 		onLoad(option) {
@@ -123,9 +129,15 @@
 		mounted() {
 		},
 		methods: {
+			buttonCheck(){
+				this.$set(this,'checkType',!this.checkType);
+			},
 			//提交按钮
 			submitButton(){
 				let self = this;
+				if(!this.checkType){
+					return
+				}
 				if(!this.addForm.formData4[0]){
 					uni.showToast({
 						title: '请添加危废类型',
@@ -608,6 +620,23 @@
 				border-radius:6rpx;
 			}
 		}
+		.submit-check-box{
+			display: flex;
+			padding:20rpx;
+			img{
+				width:40rpx;
+				height:40rpx;
+				margin:20rpx 20rpx 0 20rpx;
+			}
+			view{
+				flex:1;
+				line-height: 40rpx;
+				color:#666;
+			}
+			.check-view{
+				color:#0183FA !important;
+			}
+		}
 		.submit-button{
 			width:650rpx;
 			line-height:80rpx;
@@ -619,5 +648,8 @@
 			text-align: center;
 			border-radius:6rpx;
 		}
+		.no-submit-button{
+			background-color: #999 !important;
+		}
 	}
 </style>

pages_hazardousWasteRecycling/views/weighingRegistration/index.vue

@@ -30,7 +30,8 @@
 						<view style="width:160rpx;">报备时间：</view>
 						<view>{{minItem.reportTime}}</view>
 					</view>
-					<view class="fop-position-p" v-if="minItem.status!=1">》</view>
+					<img class="fop-position-p" v-if="minItem.status!=1" :src="imagesUrl('commonality/icon_04.png')">
+					<!-- <view class="fop-position-p" v-if="minItem.status!=1">》</view> -->
 				</view>
 			</view>
 			<view class="for-null-p"></view>
@@ -188,6 +189,8 @@
 						padding:20rpx 30rpx 0;
 					}
 					.fop-position-p{
+						width:14rpx;
+						height:32rpx;
 						position: absolute;
 						top:150rpx;
 						right:20rpx;