zc

pages/views/teacherPage/teacherHome.vue

@@ -37,6 +37,10 @@
 					<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;">
+					<img class="button-img" :src="imagesUrl('home/icon_sy_hxp@1x.png')">
+					<view class="button-name">危废回收</view>
+				</view>
 				<!-- <view class="button-min" @click="goPage('cageSiteManagement')">
 					<img class="button-img" :src="imagesUrl('home/icon_sy_lwgl@1x.png')">
 					<view class="button-name">笼位管理</view>
@@ -293,6 +297,14 @@
 					uni.navigateTo({
 						url: "/pages_basics/views/deviceCageSitePage?pageType=5",
 					});
+				}else if(type == 'hazardousWasteRecyclingPupil'){
+					//危废回收
+					//判断1.没有任何权限	跳转危废回收权限申请页面
+					
+					//判断2.有权限/有申请	跳转危废回收首页
+					uni.navigateTo({
+						url: "/pages_hazardousWasteRecycling/views/home/home",
+					});
 				}
 			}, 
 			/* 扫一扫*/

pages_hazardousWasteRecycling/api/index.js

@@ -14,4 +14,30 @@ export const demo2 = (data) => {
 		method: 'GET',
 		data: data,
 	})
+};
+
+//称重登记列表
+export const hwmsAppWasteOrderWasteList = (data) => {
+	return apiResquest({
+		url: `/hwms/app/wasteOrder/wasteList`,
+		method: 'POST',
+		data: { ...data }
+	})
+};
+
+//获取危废回收实验室列表
+export const hwmsAppWasteOrderList = (data) => {
+	return apiResquest({
+		url: `/hwms/app/wasteOrder/list`,
+		method: 'POST',
+		data: { ...data }
+	})
+};
+//危废报备添加
+export const hwmsAppWasteOrderAdd = (data) => {
+	return apiResquest({
+		url: `/hwms/app/wasteOrder/add`,
+		method: 'POST',
+		data: { ...data }
+	})
 };

pages_hazardousWasteRecycling/views/recyclingReportRecord/index.vue

@@ -28,7 +28,7 @@
 						<view class="mark-box">*</view>
 						<view class="title-box">类型:</view>
 						<view class="picker-box">
-							<picker @change="(val)=>forChange(index,val)" :value="item.forData3" :range="item.forList" :range-key="'label'">
+							<picker @change="(val)=>forChange(index,val)" :value="item.forData3" :range="item.forList" :range-key="'wasteName'">
 								<view class="picker-p" :class="item.forData1?'check-picker-p':''">{{item.forData1?item.forData2:'请选择危废类型'}}</view>
 							</picker>
 						</view>
@@ -50,12 +50,12 @@
 				<view class="sub-picker-box">
 					<view class="mark-box">*</view>
 					<view class="title-box">备注:</view>
-					<textarea class="input-text-p" type="text" v-model="addForm.remarks" 
+					<textarea class="input-text-p" type="text" v-model="addForm.remark" 
 					maxlength="100" @input="sumfontnum" placeholder="请输入备注说明" 
 					placeholder-style="font-size:28rpx;color:#999;"></textarea>
 				</view>
 			</view>
-			<view class="submit-button">填写完毕，立即报备</view>
+			<view class="submit-button" @click="submitButton">填写完毕，立即报备</view>
 		</view>
 		<!-- <view class="recyclingReportRecord-bottom-box">
 			
@@ -65,34 +65,24 @@
 
 <script>
 	import {
-		demo1,
-		demo2
+		hwmsAppWasteOrderList,
+		hwmsAppWasteOrderAdd,
 	} from '@/pages_hazardousWasteRecycling/api/index.js'
 	export default {
 		data() {
 			return {
-				timeData:'2025-11-04（星期四）',
+				timeData:'',
 				addForm:{
+					expectTime:'',
 					subId:'',
 					subName:'',
 					subIndex:'',
-					remarks:'',
+					remark:'',
 					formData4:[],
 				},
-				subList: [
-					{ subId: 1, subName: "实验室1" },
-					{ subId: 2, subName: "实验室2" },
-					{ subId: 3, subName: "实验室3" },
-				],
+				subList: [],
         dialogOptionList:[],
-        dialogOptionForList:[
-          {value:'1',label:'数据1',dict:'斤'},
-          {value:'2',label:'数据2',dict:'公斤'},
-          {value:'3',label:'数据3',dict:'升'},
-          {value:'4',label:'数据4',dict:'毫升'},
-          {value:'5',label:'数据5',dict:'公升'},
-          {value:'6',label:'数据6',dict:'克'},
-        ],
+        dialogOptionForList:[],
 			}
 		},
 		onLoad(option) {
@@ -102,9 +92,92 @@
 
 		},
 		mounted() {
-			this.initialize(1);
+			this.hwmsAppWasteOrderList();
 		},
 		methods: {
+			submitButton(){
+				let self = this;
+				if(!this.addForm.subId){
+					uni.showToast({
+						title: '请选择实验室',
+						icon: "none",
+						mask: true,
+						duration: 2000
+					});
+					return
+				}
+				if(!this.addForm.formData4[0]){
+					uni.showToast({
+						title: '请添加危废类型',
+						icon: "none",
+						mask: true,
+						duration: 2000
+					});
+					return
+				}
+				for(let i=0;i<self.addForm.formData4.length;i++){
+					if(self.addForm.formData4[i].forData4 == 0){
+						uni.showToast({
+							title: self.addForm.formData4[i].forData2+'没有填写数量',
+							icon: "none",
+							mask: true,
+							duration: 2000
+						});
+						return
+					}
+				}
+				if(!this.addForm.remark){
+					uni.showToast({
+						title: '请输入备注',
+						icon: "none",
+						mask: true,
+						duration: 2000
+					});
+					return
+				}
+				let obj = {
+					expectTime:this.addForm.expectTime,
+					remark:this.addForm.remark,
+					subId:this.addForm.subId,
+					wasteOrderItemList:[],
+				}
+				for(let i=0;i<self.addForm.formData4.length;i++){
+					obj.wasteOrderItemList.push({
+						quantity:self.addForm.formData4[i].forData4,
+						typeId:self.addForm.formData4[i].forData1,
+					})
+				}
+				this.hwmsAppWasteOrderAdd(obj);
+			},
+			async hwmsAppWasteOrderAdd(obj){
+				let self = this;
+				const {
+					data
+				} = await hwmsAppWasteOrderAdd(obj);
+				if (data.code == 200) {
+					uni.showToast({
+						title: '提交成功',
+						icon: "none",
+						mask: true,
+						duration: 2000
+					});
+					setTimeout(function() {
+						uni.navigateBack();
+					}, 2000);
+				}
+			},
+			async hwmsAppWasteOrderList(){
+				const {
+					data
+				} = await hwmsAppWasteOrderList();
+				if (data.code == 200) {
+					this.$set(this,'timeData',data.data.expectTime+'('+data.data.expectWeek+')');
+					this.$set(this.addForm,'expectTime',data.data.expectTime);
+					this.$set(this,'subList',data.data.subjectVos);
+					this.$set(this,'dialogOptionForList',data.data.wasteOrder);
+					this.initialize(1);
+				}
+			},
 			//初始化
 			initialize(type){
 				let self = this;
@@ -113,11 +186,11 @@
 					for(let i=0;i<self.dialogOptionForList.length;i++){
 						if(i<4){
 							let obj = {
-								forData1:self.dialogOptionForList[i].value,
-								forData2:self.dialogOptionForList[i].label,
+								forData1:self.dialogOptionForList[i].id,
+								forData2:self.dialogOptionForList[i].wasteName,
 								forData3:i,
 								forData4:0,
-								forData5:self.dialogOptionForList[i].dict,
+								forData5:self.dialogOptionForList[i].unit,
 								forList:self.dialogOptionForList,
 							}
 							self.addForm.formData4.push(JSON.parse(JSON.stringify(obj)))
@@ -136,9 +209,9 @@
 			},
 			//选中类型
 			forChange(index,e){
-				this.$set(this.addForm.formData4[index],'forData1',this.addForm.formData4[index].forList[e.detail.value].value);
-				this.$set(this.addForm.formData4[index],'forData2',this.addForm.formData4[index].forList[e.detail.value].label);
-				this.$set(this.addForm.formData4[index],'forData5',this.addForm.formData4[index].forList[e.detail.value].dict);
+				this.$set(this.addForm.formData4[index],'forData1',this.addForm.formData4[index].forList[e.detail.value].id);
+				this.$set(this.addForm.formData4[index],'forData2',this.addForm.formData4[index].forList[e.detail.value].wasteName);
+				this.$set(this.addForm.formData4[index],'forData5',this.addForm.formData4[index].forList[e.detail.value].unit);
 				this.$set(this.addForm.formData4[index],'forData3',e.detail.value);
 				this.filtrateList();
 			},
@@ -208,7 +281,7 @@
         for(let i=0;i<forList.length;i++){
           let num = 0;
           for(let o=0;o<self.addForm.formData4.length;o++){
-            if(forList[i].value == self.addForm.formData4[o].forData1){
+            if(forList[i].id == self.addForm.formData4[o].forData1){
               num++
               break
             }
@@ -222,7 +295,7 @@
           let list = [];
           if(self.addForm.formData4[i].forData1){
             for(let o=0;o<newList.length;o++){
-              if(self.addForm.formData4[i].forData1 == newList[o].value){
+              if(self.addForm.formData4[i].forData1 == newList[o].id){
                 list.push(newList[o]);
               }
             }

pages_hazardousWasteRecycling/views/weighingRegistration/index.vue

@@ -40,8 +40,7 @@
 
 <script>
 	import {
-		demo1,
-		demo2
+		hwmsAppWasteOrderWasteList,
 	} from '@/pages_hazardousWasteRecycling/api/index.js'
 	export default {
 		data() {
@@ -60,9 +59,9 @@
 			
 		},
 		onShow() {
-
 		},
 		mounted() {
+			this.getList();
 			this.$set(this,'dataList',[{
 				data1:'植物营养实验室',
 				data2:'A201',
@@ -141,7 +140,7 @@
 				let obj = JSON.parse(JSON.stringify(this.queryParams));
 				const {
 					data
-				} = await laboratoryAppletSubList(obj);
+				} = await hwmsAppWasteOrderWasteList(obj);
 				if (data.code == 200) {
 					if(self.queryParams.page == 1){
 						this.$set(this, 'dataList', data.data.records);