heyang

src/views/medicUniversity-3_1/chemicalManagement/InventoryManagement/InventoryDetails/index.vue

@@ -270,7 +270,7 @@
             delete this.queryParams.timeTwo
           }
           this.queryParams.pageNum = 1;
-          this.queryParams.pageSize = 10;
+          this.queryParams.pageSize = 20;
           this.getList();
         }else if(type == 2){ //type  1.重置
           this.queryParams = {

src/views/safetyCheck/components/infoDialog/infoDialog.vue

@@ -120,7 +120,8 @@
         <p class="table-top-title-p">不符合项</p>
         <div class="info-dialog-content-info-bottom">
           <div class="table-box">
-            <p class="table-title-p">隐患项</p>
+            <p class="table-title-p" v-if="infoDialogData.checkHazardApplyDto.checkCategory==1">隐患项</p>
+            <p class="table-title-p" v-if="infoDialogData.checkHazardApplyDto.checkCategory==2">【{{infoDialogData.checkHazardApplyDto.hazardName}}】 专项检查</p>
             <div class="table-min">
               <div class="left-box">
                 <p></p>

src/views/safetyCheck/safetyHazard/cannotListPage.vue

@@ -63,7 +63,7 @@
         </el-table-column>
         <el-table-column label="检查内容" align="center" prop="checkRange" show-overflow-tooltip width="120">
           <template slot-scope="scope">
-            <p>{{scope.row.checkCategory?scope.row.checkCategory:'-'}}</p>
+            <p>{{scope.row.hazardName?scope.row.hazardName:'-'}}</p>
           </template>
         </el-table-column>
         <el-table-column label="检查时间" sortable align="center" prop="checkTime" show-overflow-tooltip width="160"/>

src/views/safetyCheck/safetyHazard/departmentListPage.vue

@@ -79,7 +79,7 @@
           </el-table-column>
           <el-table-column label="检查内容" align="center" prop="checkRange" show-overflow-tooltip width="120">
             <template slot-scope="scope">
-              <p>{{scope.row.checkCategory?scope.row.checkCategory:'-'}}</p>
+              <p>{{scope.row.hazardName?scope.row.hazardName:'-'}}</p>
             </template>
           </el-table-column>
           <el-table-column label="检查时间" sortable="custom" align="center" prop="checkTime" show-overflow-tooltip width="160"/>

src/views/safetyCheck/safetyHazard/schoolListPage.vue

@@ -79,7 +79,7 @@
           </el-table-column>
           <el-table-column label="检查内容" align="center" prop="checkRange" show-overflow-tooltip width="120">
             <template slot-scope="scope">
-              <p>{{scope.row.checkCategory?scope.row.checkCategory:'-'}}</p>
+              <p>{{scope.row.hazardName?scope.row.hazardName:'-'}}</p>
             </template>
           </el-table-column>
           <el-table-column label="检查时间" sortable="custom" align="center" prop="checkTime" show-overflow-tooltip width="160"/>

src/views/safetyCheck/startInspection/index.vue

@@ -228,10 +228,10 @@
             </div>
             <div class="dept-table-max-box">
               <div class="device-tip">请选择以下实验室内设备开始检查</div>
-              <el-table  border :data="deviceTableList" @selection-change="deviceChange" height="350">
+              <el-table  border :data="deviceTableList" @selection-change="deviceChange" :row-key="getRowKeys" height="350">
                 <el-table-column type="selection" width="50" :reserve-selection="true" align="center"/>
                 <el-table-column label="名称" align="center" prop="chName" show-overflow-tooltip/>
-                <el-table-column label="数量" align="center" prop="num" show-overflow-tooltip/>
+                <el-table-column label="数量" align="center" prop="hazardNum" show-overflow-tooltip/>
                 <el-table-column label="型号" align="center" prop="code" show-overflow-tooltip />
                 <el-table-column label="类型" align="center" prop="hazardTypeMode" show-overflow-tooltip/>
               </el-table>
@@ -338,10 +338,10 @@
       <!--设备弹窗-->
       <el-dialog title="检查项" v-if="dialogVisible" :visible.sync="dialogVisible" width="730px" :append-to-body="false" :modal-append-to-body="false" :close-on-click-modal="false">
         <div style="margin-bottom:20px ">请选择以下实验室内设备开始检查</div>
-        <el-table ref="deviceTable"  border :data="deviceTableList" @selection-change="deviceChange" :row-key="getRowKeys" height="350">
+        <el-table ref="deviceTable"  border :data="deviceTableList" @selection-change="deviceChange2" :row-key="getRowKeys" height="350">
           <el-table-column type="selection" width="50" :reserve-selection="true" align="center"/>
           <el-table-column label="名称" align="center" prop="chName" show-overflow-tooltip/>
-          <el-table-column label="数量" align="center" prop="num" show-overflow-tooltip/>
+          <el-table-column label="数量" align="center" prop="hazardNum" show-overflow-tooltip/>
           <el-table-column label="型号" align="center" prop="code" show-overflow-tooltip />
           <el-table-column label="类型" align="center" prop="hazardTypeMode" show-overflow-tooltip/>
         </el-table>
@@ -475,10 +475,10 @@
         applyGentle:false,
         myApplyGentle:false,
         /* ==专项检查== */
-        dialogVisible:true,
+        dialogVisible:false,
         pageType:1,
         multipleSelection:[],
-        multipleSelectionArr:[],
+
       }
     },
     created(){
@@ -496,36 +496,43 @@
       },
       //选中设备
       deviceChange(val){
-        this.multipleSelection = val;
-        this.multipleSelectionArr=JSON.parse(JSON.stringify(val))
+        console.log('1',val)
+        let deviceList=val
+        let list=[];
+        if(deviceList[0]){
+          for(let i=0;i<deviceList.length;i++){
+            list.push(deviceList[i].id)
+          }
+          this.multipleSelection=list
+        }
+      },
+      //弹窗选中设备
+      deviceChange2(val){
+        console.log('2',val)
+        let deviceList=val
+        let list=[];
+        if(deviceList[0]){
+          for(let i=0;i<deviceList.length;i++){
+            list.push(deviceList[i].id)
+          }
+          this.multipleSelection=list
+        }
+        console.log(this.multipleSelection)
       },
       handleClick(doType){
         let self=this;
         if(doType=='startBtn'){//开始检查
           let hazardIds='';
-          let list=[];
           if(this.multipleSelection[0]){
-            for(let i=0;i<this.multipleSelection.length;i++){
-              list.push(this.multipleSelection[i].id)
-            }
             this.pageType=2;
             this.checkOptionList();
             this.dialogVisible=false;
-            hazardIds=list.join(',')
+            hazardIds=this.multipleSelection.join(',')
             this.getHazardInfo(this.addForm.subId,hazardIds)
           }else{
             this.msgError('请先选择实验室内设备!')
           }
-          // if(this.addForm.checkHazardInfoVoList.length<10){
-          //   let obj = {
-          //     name:'烘箱-001',
-          //     type:'专项检查',
-          //     checkHazardDtoList:[]
-          //   };
-          //   this.addForm.checkHazardInfoVoList.push(obj);
-          // }
         }else if(doType=='addDevice'){//新增检查项
-          console.log(this.multipleSelectionArr)
         }
       },
       // 取消按钮
@@ -689,28 +696,24 @@
       addObjectDevice(item){
         let self=this;
         this.dialogVisible=true;
-        //this.$refs.deviceTable.clearSelection()
-        console.log(self.multipleSelectionArr)
-        let row={
-          chName:'一氧化碳',
-          code:'001',
-          hazardNum:1,
-          hazardTypeMode:1,
-          hazardTypeModeName:'危险品',
-          id:37
-        }
-        setTimeout(function() {
-          self.$refs.deviceTable.toggleRowSelection(row,true);
-        },1000)
-        // self.$nextTick(()=>{
-        //   self.multipleSelectionArr.forEach(row => {
-        //     console.log(row)
-        //     //self.$refs.deviceTable.toggleRowSelection(row,true);
-        //   });
-        // })
+        console.log(self.multipleSelection)
+        setTimeout(function(){
+          self.$refs.deviceTable.clearSelection();
+          if(self.multipleSelection[0]){
+            self.deviceTableList.forEach(row => {
+              self.multipleSelection.forEach(function(item) {
+                if(row.id==item){
+                  self.$refs.deviceTable.toggleRowSelection(row,true);
+                }
+              })
+            });
+          }else{
+            if(self.$refs.deviceTable){
+              self.$refs.deviceTable.clearSelection();
+            }
+          }
+        },100);
 
-       // this.$refs.deviceTable=this.multipleSelectionArr;
-        //this.dialogVisible=true;
       },
       //查看图片
       lookImg(list,index){