Merge branch 'master' of http://192.168.1.43:3000/v3/v3-lab-web

src/views/chemicalManage/basicManagement/chemicalInfo/index.vue

@@ -175,6 +175,7 @@
       //查询按钮
       handleQuery(){
         this.$set(this.queryParams,'page',1);
+        this.$refs['table-box'].clearSelection();
         this.$set(this.exportConfig,'ids','');
         this.getList();
       },

src/views/chemicalManage/basicManagement/chemicalsCabinetManage/infoPage.vue

@@ -95,7 +95,7 @@
             </el-table-column>
             <el-table-column label="返回结果" prop="isSuccessOpen" width="150" show-overflow-tooltip>
               <template slot-scope="scope">
-                <span>{{ scope.row.isSuccessOpen?'开门成功':(!scope.row.isSuccessOpen?'开门失败':'--')}}</span>
+                <span>{{scope.row.isSuccessOpen?'开门成功':'--'}}</span>
               </template>
             </el-table-column>
           </el-table>

src/views/chemicalManage/basicManagement/chemicalsCabinetManage/listPage.vue

@@ -141,7 +141,7 @@
         showType:false,
         //状态
         statusOptions:[
-          {label:'未使用',value:'-1'},
+          {label:'未使用',value:'0'},
           {label:'使用中',value:'1'},
           {label:'超时未归还',value:'2'},
         ],

src/views/chemicalManage/inventoryManagement/inventoryStatistics/collectList.vue

@@ -74,7 +74,7 @@
         </el-form>
       </div>
       <div class="page-content-box">
-        <el-table class="table-box" v-loading="loading" border :data="dataList"
+        <el-table class="table-box" v-loading="loading" border :data="dataList" ref="table-box"
                   @selection-change="handleSelectionChange" :row-key="getRowKeys">
           <el-table-column type="selection" width="50" align="center" fixed :reserve-selection="true"/>
           <el-table-column label="名称" prop="chemicalName" width="200" fixed="" show-overflow-tooltip/>
@@ -224,6 +224,8 @@
           }
         }
         this.$set(this.queryParams,'page',1);
+        this.$refs['table-box'].clearSelection();
+        this.$set(this.exportConfig,'ids','');
         this.getList();
       },
       //重置按钮
@@ -241,6 +243,8 @@
           searchValue :null,
           buildIdAndfloorId :[],
         });
+        this.$refs['table-box'].clearSelection();
+        this.$set(this.exportConfig,'ids','');
         this.getList();
       },
       //获取数据列表

src/views/chemicalManage/inventoryManagement/inventoryStatistics/inventoryList.vue

@@ -85,7 +85,7 @@
         </el-form>
       </div>
       <div class="page-content-box">
-        <el-table class="table-box" v-loading="loading" border :data="dataList"
+        <el-table class="table-box" v-loading="loading" border :data="dataList" ref="table-box"
                   @selection-change="handleSelectionChange" :row-key="getRowKeys">
           <el-table-column type="selection" width="50" align="center" fixed="" :reserve-selection="true"/>
           <el-table-column label="名称" prop="chemicalName" width="200" fixed="" show-overflow-tooltip/>
@@ -261,6 +261,8 @@
           }
         }
         this.$set(this.queryParams,'page',1);
+        this.$refs['table-box'].clearSelection();
+        this.$set(this.exportConfig,'ids','');
         this.getList();
       },
       //重置按钮
@@ -278,6 +280,8 @@
           searchValue :null,
           buildIdAndfloorId :[],
         });
+        this.$refs['table-box'].clearSelection();
+        this.$set(this.exportConfig,'ids','');
         this.getList();
       },
       //获取数据列表

src/views/chemicalManage/inventoryManagement/savePending/addPage.vue

@@ -385,6 +385,11 @@
             controlSolid:0,//管控固体
             unReguLiquids:0,//非管控液体
             unReguSolid:0,//非管控固体
+
+            controlLiquidsMax:0,//管控液体最大值
+            controlSolidMax:0,//管控固体最大值
+            unReguLiquidsMax:0,//非管控液体最大值
+            unReguSolidMax:0,//非管控固体最大值
           });
           if (this.userType==11 ||this.userType==22){
             this.chemicalApplyGetUserInfo();
@@ -427,25 +432,25 @@
               }
             }
           }
-          if(list>this.newData.controlLiquids){
+          if(list>this.newData.controlLiquidsMax){
             self.newData.hxpStockWaitModelList[index].normsNum=undefined;
             self.newData.hxpStockWaitModelList[index].applyNum=undefined;
             this.$message.error('超出管控液体存储上限!')
             return
           }
-          if(list2>this.newData.controlSolid){
+          if(list2>this.newData.controlSolidMax){
             self.newData.hxpStockWaitModelList[index].normsNum=undefined;
             self.newData.hxpStockWaitModelList[index].applyNum=undefined;
             this.$message.error('超出管控固体存储上限!')
             return
           }
-          if(list3>this.newData.unReguLiquids){
+          if(list3>this.newData.unReguLiquidsMax){
             self.newData.hxpStockWaitModelList[index].normsNum=undefined;
             self.newData.hxpStockWaitModelList[index].applyNum=undefined;
             this.$message.error('超出非管控液体存储上限!')
             return
           }
-          if(list4>this.newData.unReguSolid){
+          if(list4>this.newData.unReguSolidMax){
             self.newData.hxpStockWaitModelList[index].normsNum=undefined;
             self.newData.hxpStockWaitModelList[index].applyNum=undefined;
             this.$message.error('超出非管控固体存储上限!')
@@ -620,6 +625,11 @@
           this.$set(this.newData,'controlSolid',response.data.controlSolid);
           this.$set(this.newData,'unReguLiquids',response.data.unReguLiquids);
           this.$set(this.newData,'unReguSolid',response.data.unReguSolid);
+
+          this.$set(this.newData,'controlLiquidsMax',response.data.manageLiquidsMax);
+          this.$set(this.newData,'controlSolidMax',response.data.manageSolidMax);
+          this.$set(this.newData,'unReguLiquidsMax',response.data.notManageLiquidsMax);
+          this.$set(this.newData,'unReguSolidMax',response.data.notManageSolidMax);
         });
       },
       //选中化学品

src/views/chemicalManage/inventoryManagement/savePending/index.vue

@@ -85,7 +85,7 @@
         </el-form>
       </div>
       <div class="page-content-box">
-        <el-table class="table-box" v-loading="loading" border :data="dataList"
+        <el-table class="table-box" v-loading="loading" border :data="dataList" ref="table-box"
                   @selection-change="handleSelectionChange" :row-key="getRowKeys">
           <el-table-column type="selection" width="50" align="center" fixed :reserve-selection="true"/>
           <el-table-column label="名称" prop="chemicalName" width="150" fixed show-overflow-tooltip/>
@@ -281,6 +281,8 @@
           }
         }
         this.$set(this.queryParams,'page',1);
+        this.$refs['table-box'].clearSelection();
+        this.$set(this.exportConfig,'ids','');
         this.getList();
       },
       //重置按钮
@@ -296,6 +298,8 @@
           searchValue:"",
           buildIdAndfloorId :[],
         });
+        this.$refs['table-box'].clearSelection();
+        this.$set(this.exportConfig,'ids','');
         this.getList();
       },
       //获取数据列表

src/views/chemicalManage/inventoryManagement/saveRecord/index.vue

@@ -82,7 +82,7 @@
         </el-form>
       </div>
       <div class="page-content-box">
-        <el-table class="table-box" v-loading="loading" border :data="dataList"
+        <el-table class="table-box" v-loading="loading" border :data="dataList" ref="table-box"
                   @selection-change="handleSelectionChange" :row-key="getRowKeys">
           <el-table-column type="selection" width="50" align="center" fixed :reserve-selection="true"/>
           <el-table-column label="名称" prop="chemicalName" width="150" fixed show-overflow-tooltip/>
@@ -214,6 +214,8 @@
           }
         }
         this.$set(this.queryParams,'page',1);
+        this.$refs['table-box'].clearSelection();
+        this.$set(this.exportConfig,'ids','');
         this.getList();
       },
       //重置按钮
@@ -230,6 +232,8 @@
           searchValue:'',
           cabinetId:'',
         });
+        this.$refs['table-box'].clearSelection();
+        this.$set(this.exportConfig,'ids','');
         this.getList();
       },
       //获取化学品类别

src/views/chemicalManage/inventoryManagement/takeRecord/index.vue

@@ -94,7 +94,7 @@
         </el-form>
       </div>
       <div class="page-content-box">
-        <el-table class="table-box" v-loading="loading" border :data="dataList"
+        <el-table class="table-box" v-loading="loading" border :data="dataList" ref="table-box"
                   @selection-change="handleSelectionChange" :row-key="getRowKeys">
           <el-table-column type="selection" width="50" align="center" fixed :reserve-selection="true"/>
           <el-table-column label="名称" prop="chemicalName" width="150" fixed show-overflow-tooltip/>
@@ -227,6 +227,8 @@
           }
         }
         this.$set(this.queryParams,'page',1);
+        this.$refs['table-box'].clearSelection();
+        this.$set(this.exportConfig,'ids','');
         this.getList();
       },
       //重置按钮
@@ -244,6 +246,8 @@
           cabinetId:'',
           status:'',
         });
+        this.$refs['table-box'].clearSelection();
+        this.$set(this.exportConfig,'ids','');
         this.getList();
       },
       //获取化学品类别

src/views/chemicalManage/purchaseManage/purchaseRegister/addPage.vue

@@ -386,6 +386,11 @@
             controlSolid:0,//管控固体
             unReguLiquids:0,//非管控液体
             unReguSolid:0,//非管控固体
+
+            controlLiquidsMax:0,//管控液体最大值
+            controlSolidMax:0,//管控固体最大值
+            unReguLiquidsMax:0,//非管控液体最大值
+            unReguSolidMax:0,//非管控固体最大值
           });
           if (this.userType==11 ||this.userType==22){
             this.chemicalApplyGetUserInfo();
@@ -462,25 +467,25 @@
               }
             }
           }
-          if(list>this.newData.controlLiquids){
+          if(list>this.newData.controlLiquidsMax){
             self.newData.hxpApplyDetailModelList[index].normsNum=undefined;
             self.newData.hxpApplyDetailModelList[index].applyNum=undefined;
             this.$message.error('超出管控液体存储上限!')
             return
           }
-          if(list2>this.newData.controlSolid){
+          if(list2>this.newData.controlSolidMax){
             self.newData.hxpApplyDetailModelList[index].normsNum=undefined;
             self.newData.hxpApplyDetailModelList[index].applyNum=undefined;
             this.$message.error('超出管控固体存储上限!')
             return
           }
-          if(list3>this.newData.unReguLiquids){
+          if(list3>this.newData.unReguLiquidsMax){
             self.newData.hxpApplyDetailModelList[index].normsNum=undefined;
             self.newData.hxpApplyDetailModelList[index].applyNum=undefined;
             this.$message.error('超出非管控液体存储上限!')
             return
           }
-          if(list4>this.newData.unReguSolid){
+          if(list4>this.newData.unReguSolidMax){
             self.newData.hxpApplyDetailModelList[index].normsNum=undefined;
             self.newData.hxpApplyDetailModelList[index].applyNum=undefined;
             this.$message.error('超出非管控固体存储上限!')
@@ -599,6 +604,11 @@
           this.$set(this.newData,'controlSolid',response.data.controlSolid);
           this.$set(this.newData,'unReguLiquids',response.data.unReguLiquids);
           this.$set(this.newData,'unReguSolid',response.data.unReguSolid);
+
+          this.$set(this.newData,'controlLiquidsMax',response.data.manageLiquidsMax);
+          this.$set(this.newData,'controlSolidMax',response.data.manageSolidMax);
+          this.$set(this.newData,'unReguLiquidsMax',response.data.notManageLiquidsMax);
+          this.$set(this.newData,'unReguSolidMax',response.data.notManageSolidMax);
         });
       },
       //选中化学品

src/views/chemicalManage/purchaseManage/purchaseRegister/index.vue

@@ -79,7 +79,7 @@
         </el-form>
       </div>
       <div class="page-content-box">
-        <el-table class="table-box" v-loading="loading" border :data="dataList" @selection-change="handleSelectionChange" ref="multipleTable">
+        <el-table class="table-box" v-loading="loading" border :data="dataList" @selection-change="handleSelectionChange" ref="table-box">
           <el-table-column type="selection" width="50" align="center"/>
           <el-table-column label="申请时间" align="left" prop="applyTime" show-overflow-tooltip>
             <template slot-scope="scope">
@@ -214,6 +214,8 @@
       //查询按钮
       handleQuery(){
         this.$set(this.queryParams,'page',1);
+        this.$refs['table-box'].clearSelection();
+        this.$set(this.exportConfig,'ids','');
         this.getList();
       },
       //重置按钮
@@ -231,6 +233,8 @@
           endOverTime :"",
           searchValue :"",
         });
+        this.$refs['table-box'].clearSelection();
+        this.$set(this.exportConfig,'ids','');
         this.getList();
       },
       //查询学院列表

src/views/chemicalManage/useLedger/index.vue

@@ -103,8 +103,8 @@
         </el-form>
       </div>
       <div class="page-content-box">
-        <el-table class="table-box" v-loading="loading" border :data="dataList"
-                  @selection-change="handleSelectionChange" ref="multipleTable" :row-key="getRowKeys">
+        <el-table class="table-box" v-loading="loading" border :data="dataList" ref="table-box"
+                  @selection-change="handleSelectionChange"  :row-key="getRowKeys">
           <el-table-column type="selection" width="50" fixed :reserve-selection="true" align="center"/>
           <el-table-column label="化学品名称" align="left" fixed width="250" prop="chemicalName" />
           <el-table-column label="编码" align="left" width="150" prop="tagCode" />
@@ -252,6 +252,8 @@
           }
         }
         this.queryParams.page = 1;
+        this.$refs['table-box'].clearSelection();
+        this.$set(this.exportConfig,'ids','');
         this.getList();
       },
       /** 重置按钮操作 */
@@ -269,6 +271,8 @@
           chemicalLevel:'',
           cabinetId:'',
         });
+        this.$refs['table-box'].clearSelection();
+        this.$set(this.exportConfig,'ids','');
         this.handleQuery();
       },
       //获取化学品类别