zc

pages/api/index.js

@@ -546,4 +546,20 @@ export const systemSubjectCheckIsAdminOrSafeUser = (data) => {
 		method: 'GET',
 		data: data,
 	})
+};
+//查询是否有危废回收相关权限
+export const hwmsAppRegisterApprovalIsPermit = (data) => {
+	return apiResquest({
+		url: `/hwms/app/registerApproval/isPermit`,
+		method: 'POST',
+		data: { ...data }
+	})
+};
+//查询用户身份-校级/院级/管理员/负责人
+export const systemUserGetPost = (data) => {
+	return apiResquest({
+		url: `/system/user/getPost`,
+		method: 'POST',
+		data: { ...data }
+	})
 };

pages/views/pupilPage/pupilHome.vue

@@ -98,6 +98,8 @@
 	import {
 		chemicalAppletSelectStockInfo,
 		laboratorySubPassOutIsotopeSubSign,
+		systemUserGetPost,
+		hwmsAppRegisterApprovalIsPermit,
 	} from '@/pages/api/index.js'
 	import {
 		pageRestrictVerify
@@ -196,12 +198,54 @@
 					});
 				}else if(type == 'hazardousWasteRecyclingPupil'){
 					//危废回收
-					//判断1.没有任何权限	跳转危废回收权限申请页面
-					
-					//判断2.有权限/有申请	跳转危废回收首页
-					uni.navigateTo({
-						url: "/pages_hazardousWasteRecycling/views/home/home",
-					});
+					this.systemUserGetPost();
+				}
+			},
+			async systemUserGetPost(){
+				const {
+					data
+				} = await systemUserGetPost();
+				if (data.code == 200) {
+					let num = 0;
+					for(let i=0;i<data.data.length;i++){
+						if(data.data[i].isPost){
+							num++
+						}
+					}
+					if(num>0){
+						// 拥有身份
+						uni.setStorageSync('hazardousWasteUserType',1)
+						uni.navigateTo({
+							url: "/pages_hazardousWasteRecycling/views/home/home",
+						});
+					}else{
+						// 没有身份
+						uni.setStorageSync('hazardousWasteUserType',0)
+						this.hwmsAppRegisterApprovalIsPermit();
+					}
+				}
+			},
+			async hwmsAppRegisterApprovalIsPermit(){
+				const {
+					data
+				} = await hwmsAppRegisterApprovalIsPermit();
+				if (data.code == 200) {
+					if(data.data == '0'){
+						//没有权限-跳转权限申请
+						uni.navigateTo({
+							url: "/pages_hazardousWasteRecycling/views/permissionApply/index",
+						});
+					}else if(data.data == '1'){
+						//有权限-正常进入
+						uni.navigateTo({
+							url: "/pages_hazardousWasteRecycling/views/home/home",
+						});
+					}else if(data.data == '2'){
+						//没有权限-有申请-跳转申请列表
+						uni.navigateTo({
+							url: "/pages_hazardousWasteRecycling/views/permissionApply/listPage",
+						});
+					}
 				}
 			},
 			/* 扫一扫*/

pages/views/teacherPage/teacherHome.vue

@@ -37,7 +37,7 @@
 					<img class="button-img" :src="imagesUrl('home/icon_sy_yjcz@1x.png')">
 					<view class="button-name">应急处置</view>
 				</view>
-				<view class="button-min" @click="goPage('hazardousWasteRecyclingPupil')" style="margin:23rpx 0 0 20rpx;">
+				<view class="button-min" @click="goPage('hazardousWasteRecycling')" style="margin:23rpx 0 0 20rpx;">
 					<img class="button-img" :src="imagesUrl('home/icon_sy_hxp@1x.png')">
 					<view class="button-name">危废回收</view>
 				</view>
@@ -133,6 +133,8 @@
 		chemicalAppletSelectStockInfo,
 		laboratorySubPassOutIsotopeSubSign,
 		systemUserProfile,
+		systemUserGetPost,
+		hwmsAppRegisterApprovalIsPermit,
 	} from '@/pages/api/index.js'
 	import {
 		tabBar
@@ -297,16 +299,58 @@
 					uni.navigateTo({
 						url: "/pages_basics/views/deviceCageSitePage?pageType=5",
 					});
-				}else if(type == 'hazardousWasteRecyclingPupil'){
+				}else if(type == 'hazardousWasteRecycling'){
 					//危废回收
-					//判断1.没有任何权限	跳转危废回收权限申请页面
-					
-					//判断2.有权限/有申请	跳转危废回收首页
-					uni.navigateTo({
-						url: "/pages_hazardousWasteRecycling/views/home/home",
-					});
+					this.systemUserGetPost();
 				}
 			}, 
+			async systemUserGetPost(){
+				const {
+					data
+				} = await systemUserGetPost();
+				if (data.code == 200) {
+					let num = 0;
+					for(let i=0;i<data.data.length;i++){
+						if(data.data[i].isPost){
+							num++
+						}
+					}
+					if(num>0){
+						// 拥有身份
+						uni.setStorageSync('hazardousWasteUserType',1)
+						uni.navigateTo({
+							url: "/pages_hazardousWasteRecycling/views/home/home",
+						});
+					}else{
+						// 没有身份
+						uni.setStorageSync('hazardousWasteUserType',0)
+						this.hwmsAppRegisterApprovalIsPermit();
+					}
+				}
+			},
+			async hwmsAppRegisterApprovalIsPermit(){
+				const {
+					data
+				} = await hwmsAppRegisterApprovalIsPermit();
+				if (data.code == 200) {
+					if(data.data == '0'){
+						//没有权限-跳转权限申请
+						uni.navigateTo({
+							url: "/pages_hazardousWasteRecycling/views/permissionApply/index",
+						});
+					}else if(data.data == '1'){
+						//有权限-正常进入
+						uni.navigateTo({
+							url: "/pages_hazardousWasteRecycling/views/home/home",
+						});
+					}else if(data.data == '2'){
+						//没有权限-有申请-跳转申请列表
+						uni.navigateTo({
+							url: "/pages_hazardousWasteRecycling/views/permissionApply/listPage",
+						});
+					}
+				}
+			},
 			/* 扫一扫*/
 			saoCode() {
 				let self = this;

pages_hazardousWasteRecycling/api/index.js

@@ -88,4 +88,36 @@ export const hwmsAppWasteOrderHistoryDetail = (data) => {
 		method: 'POST',
 		data: { ...data }
 	})
+};
+//权限-申请列表
+export const hwmsAppRegisterApprovalApplyList = (data) => {
+	return apiResquest({
+		url: `/hwms/app/registerApproval/applyList`,
+		method: 'POST',
+		data: { ...data }
+	})
+};
+//权限-申请
+export const hwmsAppRegisterApprovalAdd = (data) => {
+	return apiResquest({
+		url: `/hwms/app/registerApproval/add`,
+		method: 'POST',
+		data: { ...data }
+	})
+};
+//权限-下拉列表
+export const hwmsPermConfigList = (data) => {
+	return apiResquest({
+		url: `/hwms/permConfig/list`,
+		method: 'POST',
+		data: { ...data }
+	})
+};
+//报备登记人员审核
+export const hwmsAppRegisterApprovalApply = (data) => {
+	return apiResquest({
+		url: `/hwms/app/registerApproval/apply`,
+		method: 'POST',
+		data: { ...data }
+	})
 };

pages_hazardousWasteRecycling/views/historicalRecords/index.vue

@@ -73,6 +73,7 @@
 				this.$set(this.queryParams,'subId',null);
 				this.$set(this.queryParams,'subName',null);
 				this.$set(this, 'subIndex', '');
+				this.$set(this, 'dataList', []);
 				this.$set(this, 'getDataType', false);
 				this.getList();
 			},
@@ -81,6 +82,7 @@
 				this.$set(this.queryParams,'subId',this.subList[e.detail.value].subId);
 				this.$set(this.queryParams,'subName',this.subList[e.detail.value].subName);
 				this.$set(this, 'getDataType', false);
+				this.$set(this, 'dataList', []);
 				this.$set(this.queryParams, 'page', 1);
 				this.getList();
 			},
@@ -103,6 +105,7 @@
 				if(this.typeIndex != type){
 					this.$set(this,'typeIndex',type);
 					this.$set(this, 'getDataType', false);
+				this.$set(this, 'dataList', []);
 					this.$set(this.queryParams, 'page', 1);
 					this.getList();
 				}

pages_hazardousWasteRecycling/views/historicalRecords/infoPage.vue

@@ -37,14 +37,17 @@
 	export default {
 		data() {
 			return {
-				newData:{},
+				newId:'',
+				newData:{
+					wasteOrderHistoryDetailItemVos:[],
+				},
 			}
 		},
 		onLoad(option) {
-			this.hwmsAppWasteOrderHistoryDetail(option.id);
+			this.$set(this,'newId',option.id);
 		},
 		onShow() {
-
+			this.hwmsAppWasteOrderHistoryDetail(this.newId);
 		},
 		mounted() {
 			
@@ -53,7 +56,7 @@
 			goPage(type){
 				if(type == 1){
 					uni.navigateTo({
-						url: "/pages_hazardousWasteRecycling/views/historicalRecords/index",
+						url: "/pages_hazardousWasteRecycling/views/recyclingReportRecord/index?subId="+this.newData.subId,
 					});
 				}else if(type == 2){
 					uni.navigateTo({

pages_hazardousWasteRecycling/views/permissionApply/addPage.vue

@@ -4,7 +4,13 @@
 		<view class="check-big-box">
 			<view class="check-text-p">*</view>
 			<view class="check-title-p">所需权限</view>
-			<view class="check-box" @click="checkButton(1)">
+			<view class="check-box" @click="checkButton(item)"
+				v-for="(item,index) in permConfigList" :key="index">
+				<img v-if="!item.checkType" class="left-box" :src="imagesUrl('commonality/icon_12.png')">
+				<img v-if="item.checkType" class="left-box" :src="imagesUrl('commonality/icon_13.png')">
+				<view>{{item.permName}}</view>
+			</view>
+			<!-- <view class="check-box" @click="checkButton(1)">
 				<img v-if="!newData.checkType1" class="left-box" :src="imagesUrl('commonality/icon_12.png')">
 				<img v-if="newData.checkType1" class="left-box" :src="imagesUrl('commonality/icon_13.png')">
 				<view>回收报备</view>
@@ -13,7 +19,7 @@
 				<img v-if="!newData.checkType2" class="left-box" :src="imagesUrl('commonality/icon_12.png')">
 				<img v-if="newData.checkType2" class="left-box" :src="imagesUrl('commonality/icon_13.png')">
 				<view>称重登记</view>
-			</view>
+			</view> -->
 		</view>
 		<view class="check-big-box">
 			<view class="check-text-p">*</view>
@@ -21,11 +27,12 @@
 			<input @click="inputClick(2)" v-model="subject.subName" class="picker-input-box" disabled type="text"
 				placeholder="请选择实验室">
 		</view>
-		<view style="margin-top:60rpx;height:160rpx;">
-			<view class="text-color-p" v-if="subject.subName">基础信息：{{subject.deptName}}{{subject.buidName}}{{subject.forllName}}</view>
+		<view style="margin-top:40rpx;">
+			<view class="text-color-p" v-if="subject.subName">基础信息：{{subject.deptName}}</view>
+			<view class="text-color-p" v-if="subject.subName">{{subject.buildName}} - {{subject.floorName}} - {{subject.roomNum}}</view>
 			<view class="text-color-p" v-if="subject.subName">实验室负责人：{{subject.adminName}}</view>
 		</view>
-		<view class="submit-button-p" @click="submitButton()">立 即 申 请</view>
+		<view class="submit-button-p" style="margin-top:60rpx;" @click="submitButton()">立 即 申 请</view>
 		<!-- 实验室选择页面 -->
 		<view class="pageTwo" v-if="pageType == 2">
 			<view class="pageTwo-input-box">
@@ -50,11 +57,11 @@
 
 <script>
 	import {
-		systemMineGetListByPower,
-	} from '@/pages_student/api/index.js'
+		laboratorySubRelInfoGetRelList,
+	} from '@/api/index.js'
 	import {
-		demo1,
-		demo2
+		hwmsPermConfigList,
+		hwmsAppRegisterApprovalAdd,
 	} from '@/pages_hazardousWasteRecycling/api/index.js'
 	export default {
 		data() {
@@ -71,27 +78,102 @@
 					checkType1:true,
 					checkType2:true
 				},
+				permConfigList:[],
 			}
 		},
 		onLoad(option) {
 			
 		},
 		onShow() {
-
+			this.hwmsPermConfigList();
 		},
 		mounted() {
 			
 		},
 		methods: {
-			checkButton(type){
-				if(type == 1){
-					this.$set(this.newData,'checkType1',!this.newData.checkType1)
-				}else if(type == 2){
-					this.$set(this.newData,'checkType2',!this.newData.checkType2)
-				}
+			checkButton(item){
+				item.checkType = !item.checkType;
 			},
 			submitButton(){
-				console.log('this,',this.newData)
+				let self = this;
+				let num = 0;
+				for(let i=0;i<self.permConfigList.length;i++){
+					if(self.permConfigList[i].checkType){
+						num++
+					}
+				}
+				if(num == 0){
+					uni.showToast({
+						title: '请勾选所需权限',
+						icon: "none",
+						mask: true,
+						duration: 2000
+					});
+					return
+				}
+				if(!this.subject.subId){
+					uni.showToast({
+						title: '请选择实验室',
+						icon: "none",
+						mask: true,
+						duration: 2000
+					});
+					return
+				}
+				uni.showModal({
+					content: '是否确认提交?',
+					cancelColor: "#999",
+					confirmColor: "#0183FA",
+					success: function(res) {
+						if (res.confirm) {
+							self.hwmsAppRegisterApprovalAdd();
+						} else if (res.cancel) {}
+					}
+				});
+			},
+			async hwmsAppRegisterApprovalAdd(){
+				let self = this;
+				let obj = {
+					perm : [],
+					buildId : this.subject.buildId,
+					buildName : this.subject.buildName,
+					deptId : this.subject.deptId,
+					deptName : this.subject.deptName,
+					roomNum : this.subject.roomNum,
+					subId : this.subject.subId,
+					subName : this.subject.subName,
+				};
+				for(let i=0;i<self.permConfigList.length;i++){
+					if(self.permConfigList[i].checkType){
+						obj.perm.push(self.permConfigList[i].id)
+					}
+				}
+				obj.perm = obj.perm + '';
+				const {
+					data
+				} = await hwmsAppRegisterApprovalAdd(obj)
+				if (data.code == 200) {
+					uni.showToast({
+						title: '提交成功',
+						icon: "none",
+						mask: true,
+						duration: 2000
+					});
+					setTimeout(function() {
+						uni.navigateBack();
+					}, 2000);
+				}
+			},
+			async hwmsPermConfigList(){
+				const {
+					data
+				} = await hwmsPermConfigList()
+				if (data.code == 200) {
+					for(let i=0;i<data.data.length;i++){
+						data.data[i].checkType = false;
+					}
+					this.$set(this,'permConfigList',data.data);
+				}
 			},
 			//选择搜索页面
 			inputClick(type) {
@@ -114,7 +196,7 @@
 				}
 				const {
 					data
-				} = await systemMineGetListByPower({
+				} = await laboratorySubRelInfoGetRelList({
 					searchValue: this.subjectName
 				})
 				if (data.code == 200) {

pages_hazardousWasteRecycling/views/permissionApply/listPage.vue

@@ -3,24 +3,27 @@
 	<view class="permissionApplyListPage">
 		<view class="top-picker-box">
 			<picker @change="typeChange" :value="typeIndex" :range="typeList" :range-key="'label'">
-				<view class="picker-p" :class="queryParams.type?'check-picker-p':''">{{queryParams.type?typeList[typeIndex].label:'请选择'}}</view>
+				<view class="picker-p check-picker-p">
+				{{typeList[typeIndex].label}}
+				</view>
 			</picker>
 		</view>
 		<scroll-view scroll-y @scrolltolower="scrollGet" class="for-max-box">
 			<view class="for-box" v-for="(item,index) in dataList" :key="index">
-				<view class="title-p">{{item.data1}}</view>
-				<view class="text-p">{{item.data2}}</view>
-				<view class="text-p">申请权限类型：{{item.data3}}</view>
-				<view class="text-p">申请人：{{item.data4}}</view>
-				<view class="text-p">申请时间：{{item.data5}}</view>
-				<view class="text-p">审核人：{{item.data6}}</view>
-				<view class="text-p">审核时间：{{item.data7}}</view>
-				<view class="position-p" :class="item.data8==3?'colorB':'colorA'">{{item.data8==1?'待审批':(item.data8==2?'审批通过':(item.data8==3?'驳回':''))}}</view>
-				<view class="button-p-1" @click="throughButton()">通过</view>
-				<view class="button-p-2" @click="rejectionButton(1)">驳回</view>
+				<view class="title-p">{{item.subName}}({{item.roomNum}})</view>
+				<view class="text-p">{{item.deptName}} - {{item.buildName}}</view>
+				<view class="text-p">申请权限类型：{{item.perm}}</view>
+				<view class="text-p">申请人：{{item.userName}}({{item.userNum}})</view>
+				<view class="text-p">申请时间：{{item.submitTime}}</view>
+				<view class="text-p" v-if="item.status!=0&&item.approveBy">审核人：{{item.approveBy}}</view>
+				<view class="text-p" v-if="item.status!=0&&item.approveTime">审核时间：{{item.approveTime}}</view>
+				<view class="position-p" :class="item.status==2?'colorB':'colorA'">{{item.status==0?'待审批':(item.status==1?'审批通过':(item.status==2?'驳回':''))}}</view>
+				<view class="button-p-1" v-if="item.status==0&&hazardousWasteUserType==1" @click="throughButton(item)">通过</view>
+				<view class="button-p-2" v-if="item.status==0&&hazardousWasteUserType==1" @click="rejectionButton(1,item)">驳回</view>
 			</view>
+			<view class="get-null-box" v-if="getDataType">暂无更多数据</view>
 		</scroll-view>
-		<view class="add-button" @click="goPage()">新申请</view>
+		<view v-if="hazardousWasteUserType == 0" class="add-button" @click="goPage()">新申请</view>
 		<view class="shade-max-big-box" v-if="dialogType">
 			<view class="shade-null-1" @click="rejectionButton(2)"></view>
 			<view class="shade-big-box">
@@ -39,28 +42,33 @@
 
 <script>
 	import {
-		demo1,
-		demo2
+		parseTime
+	} from '@/component/public.js'
+	import {
+		hwmsAppRegisterApprovalApplyList,
+		hwmsAppRegisterApprovalApply,
 	} from '@/pages_hazardousWasteRecycling/api/index.js'
 	export default {
 		data() {
 			return {
+				hazardousWasteUserType:uni.getStorageSync('hazardousWasteUserType'),
 				typeList:[
-					{ value: 1, label: "全部" },
-					{ value: 2, label: "待审批" },
-					{ value: 3, label: "已通过" },
-					{ value: 4, label: "驳回" },
+					{ value: "", label: "全部" },
+					{ value: "0", label: "待审批" },
+					{ value: "1", label: "已通过" },
+					{ value: "2", label: "驳回" },
 				],
 				// 查询参数
 				getDataType: false,
 				queryParams: {
 					page: 1,
 					pageSize: 10,
-					type:1,
+					status:1,
 				},
 				typeIndex:0,
 				total: 0,
 				dataList: [],
+				dialogData:{},
 				dialogType:false,
 				dialogText:'',
 			}
@@ -69,41 +77,10 @@
 			
 		},
 		onShow() {
-
+			this.getList();
 		},
 		mounted() {
-			this.$set(this,'dataList',[
-				{
-					data1:'植物营养实验室（A201）',
-					data2:'资源环境学院-农科楼- A201',
-					data3:'回收报备、称重登记',
-					data4:'张三（2020110010）',
-					data5:'2025-11-03 10:10:09',
-					data6:'王二小',
-					data7:'2025-11-04 10:10:09',
-					data8:'1',
-				},
-				{
-					data1:'植物营养实验室（A201）',
-					data2:'资源环境学院-农科楼- A201',
-					data3:'回收报备、称重登记',
-					data4:'张三（2020110010）',
-					data5:'2025-11-03 10:10:09',
-					data6:'王二小',
-					data7:'2025-11-04 10:10:09',
-					data8:'2',
-				},
-				{
-					data1:'植物营养实验室（A201）',
-					data2:'资源环境学院-农科楼- A201',
-					data3:'回收报备、称重登记',
-					data4:'张三（2020110010）',
-					data5:'2025-11-03 10:10:09',
-					data6:'王二小',
-					data7:'2025-11-04 10:10:09',
-					data8:'3',
-				},
-			]);
+			
 		},
 		methods: {
 			//滚动加载事件
@@ -122,10 +99,15 @@
 			async getList() {
 				let self = this;
 				let obj = JSON.parse(JSON.stringify(this.queryParams));
+				obj.type = this.hazardousWasteUserType == 1?'2':'1'
 				const {
 					data
-				} = await laboratoryAppletSubList(obj);
+				} = await hwmsAppRegisterApprovalApplyList(obj);
 				if (data.code == 200) {
+					for(let i=0;i<data.data.records.length;i++){
+						data.data.records[i].approveTime = parseTime(data.data.records[i].approveTime, "{y}-{m}-{d} {h}:{i}:{s}");
+						data.data.records[i].submitTime = parseTime(data.data.records[i].submitTime, "{y}-{m}-{d} {h}:{i}:{s}");
+					}
 					if(self.queryParams.page == 1){
 						this.$set(this, 'dataList', data.data.records);
 						this.$set(this, 'total', data.data.total);
@@ -143,26 +125,32 @@
 			},
 			//选择器
 			typeChange(e){
-				this.$set(this.queryParams,'type',this.typeList[e.detail.value].value);
+				this.$set(this.queryParams,'status',this.typeList[e.detail.value].value);
 				this.$set(this,'typeIndex',e.detail.value);
+				this.$set(this.queryParams, 'page', 1);
+				this.$set(this, 'dataList', []);
+				this.$set(this, 'getDataType', true);
+				this.getList();
 			},
 			//通过
-			throughButton(){
+			throughButton(item){
 				let self = this;
+				this.$set(this,'dialogData',item);
 				uni.showModal({
 					content: '是否确认通过?',
 					cancelColor: "#999",
 					confirmColor: "#0183FA",
 					success: function(res) {
 						if (res.confirm) {
-							
+							self.hwmsAppRegisterApprovalApply(1);
 						} else if (res.cancel) {}
 					}
 				});
 			},
 			//驳回
-			rejectionButton(type){
+			rejectionButton(type,item){
 				if(type == 1){
+					this.$set(this,'dialogData',item);
 					this.$set(this,'dialogText','');
 					this.$set(this,'dialogType',true);
 				}else{
@@ -172,14 +160,50 @@
 			//弹窗按钮
 			dialogButton(type){
 				if(type == 1){
-					this.$set(this,'dialogType',false);
+					this.hwmsAppRegisterApprovalApply(1);
 				}else if(type == 2){
+					if(!this.dialogText){
+						uni.showToast({
+							title: '请输入备注',
+							icon: "none",
+							mask: true,
+							duration: 2000
+						});
+						return
+					}
+					this.hwmsAppRegisterApprovalApply(2);
+				}
+			},
+			async hwmsAppRegisterApprovalApply(type){
+				let self = this;
+				let obj = {
+					id:this.dialogData.id,
+					status:type,
+				};
+				if(type == 2){
+					obj.rejectReason = this.dialogText;
+				}
+				const {
+					data
+				} = await hwmsAppRegisterApprovalApply(obj)
+				if (data.code == 200) {
+					for(let i=0;i<self.dataList.length;i++){
+						if(self.dialogData.id == self.dataList[i].id){
+							self.dataList[i].status = type;
+						}
+					}
+					uni.showToast({
+						title: '提交成功',
+						icon: "none",
+						mask: true,
+						duration: 2000
+					});
 					this.$set(this,'dialogType',false);
 				}
 			},
 			goPage(){
 				uni.navigateTo({
-					url: "/pages_hazardousWasteRecycling/views/permissionApply/index",
+					url: "/pages_hazardousWasteRecycling/views/permissionApply/addPage",
 				});
 			},
 		},
@@ -191,6 +215,12 @@
 		height: 100%;
 		display flex;
 		flex-direction column;
+		.get-null-box {
+			height: 100rpx;
+			line-height: 100rpx;
+			color: #999;
+			text-align center;
+		}
 		.top-picker-box{
 			.picker-p{
 				border:1px solid #dedede;
@@ -319,7 +349,7 @@
 					display: flex;
 					view:nth-child(1){
 						flex:1;
-						border-top:1px solid #0183FA;
+						border-top:1px solid #dedede;
 						background-color: #FFF;
 						color:#0183FA;
 						text-align: center;

pages_hazardousWasteRecycling/views/recyclingReportRecord/index.vue

@@ -82,10 +82,13 @@
 				subList: [],
         dialogOptionList:[],
         dialogOptionForList:[],
+				subId:null,
 			}
 		},
 		onLoad(option) {
-			
+			if(option.subId){
+				this.$set(this,'subId',option.subId);
+			}
 		},
 		onShow() {
 
@@ -188,6 +191,7 @@
 				}
 			},
 			async hwmsAppWasteOrderList(){
+				let self = this;
 				const {
 					data
 				} = await hwmsAppWasteOrderList();
@@ -196,6 +200,16 @@
 					this.$set(this.addForm,'expectTime',data.data.expectTime);
 					this.$set(this,'subList',data.data.subjectVos);
 					this.$set(this,'dialogOptionForList',data.data.wasteOrder);
+					if(this.subId){
+						for(let i=0;i<self.subList.length;i++){
+							if(this.subId == self.subList[i].subId){
+								this.$set(this.addForm,'subId',self.subList[i].subId);
+								this.$set(this.addForm,'subName',self.subList[i].subName);
+								this.$set(this.addForm,'subIndex',i);
+							}
+						}
+						this.hwmsAppWasteOrderWasteItems(this.subId);
+					}
 				}
 			},
 			//选中实验室