zc

pages_safetyCheck/api/index.js

@@ -639,7 +639,7 @@ export const subjectList = (data) => {
         data: data
     })
 };
-//根据名称查询实验室
+//批次下-检查项
 export const securityAppCheckPlanSetGetOptionList = (data) => {
     return apiResquest({
         url: '/security/appCheckPlanSet/getOptionList',

pages_safetyCheck/component/checkItemModule.vue

@@ -280,6 +280,8 @@
 			//查询批次下-检查项
 			async securityAppCheckPlanSetGetOptionList(maxList){
 				let self = this;
+				console.log('this.optionData',this.optionData)
+				console.log('this.searchValue',this.searchValue)
 				const {
 					data
 				} = await securityAppCheckPlanSetGetOptionList({

pages_safetyCheck/views/inspectManage/conductInspections.vue

@@ -192,12 +192,12 @@
 						this.$set(this.newData,'hazardCheckPro',this.optionData.hazardCheckPro);
 						this.$set(this.newData,'hazardCheckCode',this.optionData.hazardCheckCode);
 						this.$set(this.newData,'hazardCheckName',this.optionData.hazardCheckName);
+						this.$set(this.newData,'hazardCheckPro1',this.optionData.hazardCheckPro1);
+						this.$set(this.newData,'hazardCheckCode1',this.optionData.hazardCheckCode1);
+						this.$set(this.newData,'hazardCheckName1',this.optionData.hazardCheckName1);
 						this.$set(this.newData,'hazardCheckPro2',this.optionData.hazardCheckPro2);
 						this.$set(this.newData,'hazardCheckCode2',this.optionData.hazardCheckCode2);
 						this.$set(this.newData,'hazardCheckName2',this.optionData.hazardCheckName2);
-						this.$set(this.newData,'hazardCheckPro3',this.optionData.hazardCheckPro3);
-						this.$set(this.newData,'hazardCheckCode3',this.optionData.hazardCheckCode3);
-						this.$set(this.newData,'hazardCheckName3',this.optionData.hazardCheckName3);
 						this.$set(this.newData,'hazardCheckPoint',this.optionData.hazardCheckPoint);
 						this.$set(this.form,'hazardDescribe',this.optionData.hazardCheckPoint);
 						// let list=[];
@@ -252,18 +252,15 @@
 					this.$set(this, 'checkItemModuleType', false);
 					this.$set(this, 'propsData', {});
 				} else if (type == 'submit') {
-					//this.itemsClick(item);
-					console.log('item',item)
-					console.log('keyPoint',keyPoint)
 					this.$set(this.newData, 'hazardCheckPro', item.hazardCheckPro);
 					this.$set(this.newData, 'hazardCheckCode', item.hazardCheckCode);
 					this.$set(this.newData, 'hazardCheckName', item.hazardCheckName);
+					this.$set(this.newData, 'hazardCheckPro1', item.hazardCheckPro1);
+					this.$set(this.newData, 'hazardCheckCode1', item.hazardCheckCode1);
+					this.$set(this.newData, 'hazardCheckName1', item.hazardCheckName1);
 					this.$set(this.newData, 'hazardCheckPro2', item.hazardCheckPro2);
 					this.$set(this.newData, 'hazardCheckCode2', item.hazardCheckCode2);
 					this.$set(this.newData, 'hazardCheckName2', item.hazardCheckName2);
-					this.$set(this.newData, 'hazardCheckPro3', item.hazardCheckPro3);
-					this.$set(this.newData, 'hazardCheckCode3', item.hazardCheckCode3);
-					this.$set(this.newData, 'hazardCheckName3', item.hazardCheckName3);
 					this.$set(this.newData, 'hazardCheckPoint', item.hazardCheckPoint);
 					this.$set(this.form, 'hazardDescribe', keyPoint);
 					// this.$set(this.optionData, 'setOptionId', item.setOptionId);
@@ -335,6 +332,7 @@
 					});
 					
 					let infoData = this.optionData;
+					infoData.setOptionId = data.data;
 					uni.redirectTo({
 						url: '/pages_safetyCheck/views/itemsManage/hiddenDangerItemsDetail?infoData=' +
 							encodeURIComponent(JSON

pages_safetyCheck/views/itemsManage/hiddenDangerItems.vue

@@ -644,6 +644,7 @@
 					//开展检查
 					let infoData = this.checkPlanList[0];
 					infoData.manageId = this.optionData.manageId;
+					infoData.planSetId = this.optionData.planSetId;
 					infoData.hazardCheckPro = this.checkPlanList[0].hazardCheckPro;
 					infoData.pageType = this.pageType;
 					infoData.itemsStatus = this.curTabTow;
@@ -696,27 +697,27 @@
 					for (let o = 0; o < maxList[i].children.length; o++) {
 						for (let x = 0; x < minList.length; x++) {
 							if (maxList[i].children[o].id == minList[x].parentId) {
-								//一级
-								maxList[i].hazardCheckPro = minList[x].id
-								maxList[i].hazardCheckCode = minList[x].code
-								maxList[i].hazardCheckName = minList[x].name
-								maxList[i].hazardCheckPro2 = maxList[i].children[o].id
-								maxList[i].hazardCheckCode2 = maxList[i].children[o].code
-								maxList[i].hazardCheckName2 = maxList[i].children[o].name
-								maxList[i].hazardCheckPro1 = maxList[i].id
-								maxList[i].hazardCheckCode1 = maxList[i].code
-								maxList[i].hazardCheckName1 = maxList[i].name
-								//二级
-								maxList[i].children[o].hazardCheckPro = minList[x].id
-								maxList[i].children[o].hazardCheckCode = minList[x].code
-								maxList[i].children[o].hazardCheckName = minList[x].name
-								maxList[i].children[o].hazardCheckPro2 = maxList[i].children[o].id
-								maxList[i].children[o].hazardCheckCode2 = maxList[i].children[o].code
-								maxList[i].children[o].hazardCheckName2 = maxList[i].children[o].name
-								maxList[i].children[o].hazardCheckPro1 = maxList[i].id
-								maxList[i].children[o].hazardCheckCode1 = maxList[i].code
-								maxList[i].children[o].hazardCheckName1 = maxList[i].name
-								//三级
+								// //一级
+								// minList[x].hazardCheckPro = minList[x].id
+								// minList[x].hazardCheckCode = minList[x].code
+								// minList[x].hazardCheckName = minList[x].name
+								// minList[x].hazardCheckPro2 = maxList[i].children[o].id
+								// minList[x].hazardCheckCode2 = maxList[i].children[o].code
+								// minList[x].hazardCheckName2 = maxList[i].children[o].name
+								// minList[x].hazardCheckPro1 = maxList[i].id
+								// minList[x].hazardCheckCode1 = maxList[i].code
+								// minList[x].hazardCheckName1 = maxList[i].name
+								// //二级
+								// minList[x].children[o].hazardCheckPro = minList[x].id
+								// minList[x].children[o].hazardCheckCode = minList[x].code
+								// minList[x].children[o].hazardCheckName = minList[x].name
+								// minList[x].children[o].hazardCheckPro2 = maxList[i].children[o].id
+								// minList[x].children[o].hazardCheckCode2 = maxList[i].children[o].code
+								// minList[x].children[o].hazardCheckName2 = maxList[i].children[o].name
+								// minList[x].children[o].hazardCheckPro1 = maxList[i].id
+								// minList[x].children[o].hazardCheckCode1 = maxList[i].code
+								// minList[x].children[o].hazardCheckName1 = maxList[i].name
+								// //三级
 								minList[x].level = 3;
 								minList[x].hazardCheckPro = minList[x].id
 								minList[x].hazardCheckCode = minList[x].code
@@ -728,11 +729,7 @@
 								minList[x].hazardCheckCode1 = maxList[i].code
 								minList[x].hazardCheckName1 = maxList[i].name
 								minList[x].hazardCheckPoint = minList[x].mainPoint.split('#')[0]
-								if (maxList[i].children[o].children) {
-									list.push(minList[x])
-								} else {
-									list = [minList[x]]
-								}
+								list.push(minList[x])
 							}
 						}
 					}