Merge branch '3.3.7-scxjy' into web-v2

src/views/medicUniversity-3_1/chemicalManagement/chemicalInventory/infoPage.vue

@@ -102,6 +102,7 @@
         queryParams:{
           pageNum:1,
           pageSize:20,
+          takeStockId:'',
         },
       }
     },
@@ -123,8 +124,10 @@
         this.$parent.controlsButton(1)
       },
       getList(){
-        hxpTakeStockDetailList({takeStockId:this.infoDataProps.id}).then( response => {
+        this.queryParams.takeStockId=this.infoDataProps.id
+        hxpTakeStockDetailList(this.queryParams).then( response => {
           this.$set(this,'tableData',response.rows);
+          this.total = response.total;
         });
       },
     }

src/views/safetyCheck/components/infoPage/infoPage.vue

@@ -282,13 +282,15 @@ import { getToken } from '@/utils/auth'
       //查询详情
       findCheckManage(){
         findCheckManage({id:this.propsInfoData.id}).then(response => {
-          if(response.data.checkHazardInfoVoList[0]){
-            response.data.checkHazardInfoVoList.forEach(function(item) {
-              item.lookType = true;
-              item.checkHazardDtoList.forEach(function(item2) {
-                item2.hazardCheckCode=item2.code
+          if(response.data.checkCategory==2){
+            if(response.data.checkHazardInfoVoList[0]){
+              response.data.checkHazardInfoVoList.forEach(function(item) {
+                item.lookType = true;
+                item.checkHazardDtoList.forEach(function(item2) {
+                  item2.hazardCheckCode=item2.code
+                })
               })
-            })
+            }
           }
           this.$set(this,'addForm',response.data);
         });