zc

src/assets/styles/button.scss

@@ -73,7 +73,7 @@
 //===========================表格内按钮===========================
 .table-button-box{
   font-weight:500;
-  height:23px;
+  height:27px;
   display: flex;
   margin:0 auto;
   .table-button-null{
@@ -81,7 +81,7 @@
   }
   .table-button-p{
     color:$buttonColorD;
-    line-height:23px;
+    line-height:27px;
     font-size:14px;
     cursor:pointer;
     margin:0 10px !important;

src/assets/styles/commonality.scss

@@ -140,7 +140,7 @@
       display: block;
       height:22px;
       width:14px;
-      margin:auto;
+      margin: 6px auto;
       overflow: hidden;
       span{
         display: block;
@@ -150,7 +150,7 @@
         span{
           height: 14px;
           width: 14px;
-          margin: 4px auto;
+          margin: 0 auto;
         }
       }
     }
@@ -158,6 +158,8 @@
   //默认对齐方向
   .cell{
     text-align: left;
+    height:27px;
+    line-height:27px;
   }
   //向左对齐方向
   .is-table-left{
@@ -191,7 +193,7 @@
     border-right:1px solid $acquiesceThemeTableA;
     height:40px;
     th, td{
-      padding:8px 0;
+      padding:6px 0;
     }
   }
 
@@ -213,13 +215,17 @@
     flex: 1;
     overflow-y: scroll!important;
     th, td{
-      padding:8px 0;
+      padding:6px 0;
     }
     .el-button [class*="el-icon-"] + span {
       margin-left: 1px;
     }
   }
   //表格内switch按钮样式
+  .el-switch{
+    height:26px;
+    line-height: 26px;
+  }
   .switch .el-switch__label {
     position: absolute;
     display: none;
@@ -244,6 +250,16 @@
   .el-switch .el-switch__label {
     width: 64px !important;
     margin: 0;
+    height:26px;
+    line-height: 26px;
+    border-radius:14px;
+  }
+  .el-switch__core:after{
+    top: 4px;
+    left: 4px;
+  }
+  .el-switch.is-checked .el-switch__core::after{
+    margin-left:-20px;
   }
 }
 //表格滚动条样式
@@ -296,7 +312,7 @@
   overflow-y: auto;
 }
 .el-table--medium th, .el-table--medium td {
-  padding: 8px 0;
+  padding: 6px 0;
   border-right: 0 solid #dfe6ec;
   border-left: 1px solid #dfe6ec;
 }
@@ -311,7 +327,7 @@
 //表头
 .el-table__fixed-header-wrapper{
   th, td{
-    padding:8px 0;
+    padding:6px 0;
   }
   .el-table--medium th, .el-table--medium td{
     padding:12px 0!important;

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

@@ -72,7 +72,7 @@
       <div class="page-content-box">
         <el-table class="table-box" v-loading="loading" border :data="dataList"
                   @selection-change="handleSelectionChange" :row-key="getRowKeys">
-          <el-table-column type="selection" width="50" align="center" fixed="" :reserve-selection="true"/>
+          <el-table-column type="selection" width="50" align="center" fixed :reserve-selection="true"/>
           <el-table-column label="名称" prop="name" width="200" fixed="" show-overflow-tooltip/>
           <el-table-column label="CAS" prop="content" width="150" show-overflow-tooltip/>
           <el-table-column label="类别" prop="content" width="150" show-overflow-tooltip/>

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

@@ -1,96 +1,99 @@
 <!--库存统计列表-->
 <template>
   <div class="page-container inventoryStatistics-listPage">
-    <div class="page-top-title-box">
-      <p class="page-top-title-name-p">{{newData.name}} 丨 {{newData.address}}</p>
-      <p class="page-top-title-num-p">总数：{{newData.maxNum}}</p>
-      <p class="page-top-title-num-p">总量：{{newData.maxNum}}ml</p>
-      <p class="page-top-title-out-p" @click="backPage">返回</p>
-    </div>
-    <div class="content-box">
-      <div class="page-form-title-box">
-        <el-form :model="queryParams" class="form-box" ref="queryForm"
-                 :inline="true" style="width:100%;">
-          <el-form-item label="" prop="queryParamsData3">
-            <el-select v-model="queryParams.queryParamsData2"
-                       placeholder="请选择化学品柜" style="width: 180px">
-              <el-option
-                v-for="item in categoryOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="" prop="queryParamsData2">
-            <el-select v-model="queryParams.queryParamsData2"
-                       placeholder="请选择状态" style="width: 140px">
-              <el-option
-                v-for="item in statusOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="" prop="state">
-            <el-date-picker
-              :clearable="false"
-              v-model="dateRange"
-              size="small"
-              style="width: 260px"
-              value-format="yyyy-MM-dd"
-              type="daterange"
-              range-separator="-"
-              start-placeholder="过期开始时间"
-              end-placeholder="过期结束时间"
-            ></el-date-picker>
-          </el-form-item>
-          <el-form-item label="" prop="queryParamsData1">
-            <el-input
-              maxLength="30"
-              v-model="queryParams.queryParamsData1"
-              placeholder="化学品名/CAS/编码/归属人/课题组"
-              clearable
-              style="width: 220px"
-            />
-          </el-form-item>
-          <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
-          <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
-        </el-form>
+    <div class="inventoryStatistics-listPage-min" v-if="pageType == 1">
+      <div class="page-top-title-box">
+        <p class="page-top-title-name-p">{{newData.name}} 丨 {{newData.address}}</p>
+        <p class="page-top-title-num-p">总数：{{newData.maxNum}}</p>
+        <p class="page-top-title-num-p">总量：{{newData.maxNum}}ml</p>
+        <p class="page-top-title-out-p" @click="backPage">返回</p>
       </div>
-      <p class="num-min-box"></p>
-      <div class="page-content-box">
-        <el-table class="table-box" border :data="dataList">
-          <el-table-column label="编号" prop="name" show-overflow-tooltip/>
-          <el-table-column label="规格" prop="content" width="150" show-overflow-tooltip/>
-          <el-table-column label="储存位置" prop="content" width="300" show-overflow-tooltip/>
-          <el-table-column label="归属人" prop="content" width="150" show-overflow-tooltip/>
-          <el-table-column label="库存余量" prop="content" width="150" show-overflow-tooltip/>
-          <el-table-column label="过期时间" prop="content" width="240" show-overflow-tooltip/>
-          <el-table-column label="状态" prop="content" width="150" show-overflow-tooltip/>
-          <el-table-column label="操作" width="150" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <div class="table-button-box">
-                <p class="table-button-null"></p>
-                <p class="table-button-p"
-                   @click="tableButton(2,scope.row)"
-                   v-hasPermiRouter="['demo:demo:detail']"
-                >详情</p>
-                <p class="table-button-null"></p>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-        <pagination :page-sizes="[20, 30, 40, 50]"
-                    v-show="total>0"
-                    :total="total"
-                    :page.sync="queryParams.page"
-                    :limit.sync="queryParams.pageSize"
-                    @pagination="getList"
-        />
+      <div class="content-box">
+        <div class="page-form-title-box">
+          <el-form :model="queryParams" class="form-box" ref="queryForm"
+                   :inline="true" style="width:100%;">
+            <el-form-item label="" prop="queryParamsData3">
+              <el-select v-model="queryParams.queryParamsData2"
+                         placeholder="请选择化学品柜" style="width: 180px">
+                <el-option
+                  v-for="item in categoryOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="" prop="queryParamsData2">
+              <el-select v-model="queryParams.queryParamsData2"
+                         placeholder="请选择状态" style="width: 140px">
+                <el-option
+                  v-for="item in statusOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="" prop="state">
+              <el-date-picker
+                :clearable="false"
+                v-model="dateRange"
+                size="small"
+                style="width: 260px"
+                value-format="yyyy-MM-dd"
+                type="daterange"
+                range-separator="-"
+                start-placeholder="过期开始时间"
+                end-placeholder="过期结束时间"
+              ></el-date-picker>
+            </el-form-item>
+            <el-form-item label="" prop="queryParamsData1">
+              <el-input
+                maxLength="30"
+                v-model="queryParams.queryParamsData1"
+                placeholder="化学品名/CAS/编码/归属人/课题组"
+                clearable
+                style="width: 300px"
+              />
+            </el-form-item>
+            <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
+            <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+          </el-form>
+        </div>
+        <p class="num-min-box"></p>
+        <div class="page-content-box">
+          <el-table class="table-box" border :data="dataList">
+            <el-table-column label="编号" prop="name" show-overflow-tooltip/>
+            <el-table-column label="规格" prop="content" width="150" show-overflow-tooltip/>
+            <el-table-column label="储存位置" prop="content" width="300" show-overflow-tooltip/>
+            <el-table-column label="归属人" prop="content" width="150" show-overflow-tooltip/>
+            <el-table-column label="库存余量" prop="content" width="150" show-overflow-tooltip/>
+            <el-table-column label="过期时间" prop="content" width="240" show-overflow-tooltip/>
+            <el-table-column label="状态" prop="content" width="150" show-overflow-tooltip/>
+            <el-table-column label="操作" width="150" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <div class="table-button-box">
+                  <p class="table-button-null"></p>
+                  <p class="table-button-p"
+                     @click="tableButton(2,scope.row)"
+                     v-hasPermiRouter="['demo:demo:detail']"
+                  >详情</p>
+                  <p class="table-button-null"></p>
+                </div>
+              </template>
+            </el-table-column>
+          </el-table>
+          <pagination :page-sizes="[20, 30, 40, 50]"
+                      v-show="total>0"
+                      :total="total"
+                      :page.sync="queryParams.page"
+                      :limit.sync="queryParams.pageSize"
+                      @pagination="getList"
+          />
+        </div>
       </div>
     </div>
+    <infoPage v-if="pageType == 2" :propsData="propsData"></infoPage>
   </div>
 </template>
 
@@ -98,14 +101,18 @@
   //import { getDicts } from "@/api/commonality/noPermission";
   //import { systemUserSelect } from "@/api/commonality/permission";
   //import { getInfo } from "@/api/basicsModules/index";
+  import infoPage from "./infoPage.vue"
   export default {
     name: 'listPage',
+    components: {
+      infoPage,
+    },
     props:{
       propsData:{},
     },
     data(){
       return{
-        showType:false,
+        pageType:1,
         //状态
         statusOptions:[],
         //类别

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

@@ -0,0 +1,387 @@
+<!-- 待入库 -->
+<template>
+  <div class="app-container savePending">
+    <div class="page-container savePendingPage" v-if="pageType === 1">
+      <div class="page-form-title-box">
+        <el-form :model="queryParams" class="form-box" ref="queryForm"
+                 :inline="true" style="width:100%;">
+          <el-form-item label="" prop="queryParamsData2">
+            <el-select v-model="queryParams.queryParamsData2"
+                       placeholder="请选择学院"
+                       style="width: 140px">
+              <el-option
+                v-for="item in deptOptions"
+                :key="item.deptId"
+                :label="item.deptName"
+                :value="item.deptId"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" prop="queryParamsData3">
+            <el-cascader
+              style="width: 150px"
+              placeholder="请选择楼栋楼层"
+              :props="{value: 'id', label: 'name',children:'buildFloorVoList'}"
+              v-model="queryParams.queryParamsData3"
+              :options="buildFloorOptions">
+            </el-cascader>
+          </el-form-item>
+          <el-form-item label="" prop="queryParamsData4">
+            <el-select v-model="queryParams.queryParamsData4"
+                       placeholder="请选择级别"
+                       style="width: 120px">
+              <el-option
+                v-for="dict in optionList"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" prop="queryParamsData2">
+            <el-select v-model="queryParams.queryParamsData2"
+                       placeholder="请选择类别"
+                       style="width: 120px">
+              <el-option
+                v-for="dict in optionList"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" prop="state">
+            <el-date-picker
+              :clearable="false"
+              v-model="dateRange"
+              size="small"
+              style="width: 220px"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item label="" prop="queryParamsData1">
+            <el-input
+              maxLength="30"
+              v-model="queryParams.queryParamsData1"
+              placeholder="化学品名/CAS/编码/实验室/房间号..."
+              style="width: 260px"
+            />
+          </el-form-item>
+          <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
+          <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+          <p class="page-add-common-style-button"
+             style="float: right;"
+             @click="tableButton(1)"
+             v-hasPermiRouter="['demo:demo:add']"
+          >添加</p>
+          <el-form-item style="float: right;">
+            <export-component :exportConfig="exportConfig" v-hasPermiRouter="['demo:demo:demo']"></export-component>
+          </el-form-item>
+          <el-form-item style="float: right;">
+            <import-component :importConfig="importConfig" v-hasPermiRouter="['demo:demo:demo']"></import-component>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="page-content-box">
+        <el-table class="table-box" v-loading="loading" border :data="dataList"
+                  @selection-change="handleSelectionChange" :row-key="getRowKeys">
+          <el-table-column type="selection" width="50" align="center" fixed :reserve-selection="true"/>
+          <el-table-column label="名称" prop="name" width="150" fixed show-overflow-tooltip/>
+          <el-table-column label="编码" prop="content" width="120" show-overflow-tooltip/>
+          <el-table-column label="CAS" prop="content" width="120" show-overflow-tooltip/>
+          <el-table-column label="类别" prop="content" width="120" show-overflow-tooltip/>
+          <el-table-column label="级别" prop="content" width="120" show-overflow-tooltip/>
+          <el-table-column label="规格" prop="content" width="120" show-overflow-tooltip/>
+          <el-table-column label="数量" prop="content" width="120" show-overflow-tooltip/>
+          <el-table-column label="过期时间" prop="createTime" width="200" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <el-date-picker
+                class="table-date-picker"
+                v-model="scope.row.time"
+                type="date"
+                placeholder="选择日期">
+              </el-date-picker>
+            </template>
+          </el-table-column>
+          <el-table-column label="归属人" prop="content" width="150" show-overflow-tooltip/>
+          <el-table-column label="学院" prop="content" width="150" show-overflow-tooltip/>
+          <el-table-column label="楼栋楼层" prop="content" width="180" show-overflow-tooltip/>
+          <el-table-column label="实验室" prop="content" width="230" show-overflow-tooltip/>
+          <el-table-column label="实验室负责人" prop="content" width="150" show-overflow-tooltip/>
+          <el-table-column label="安全员" prop="content" width="150" show-overflow-tooltip/>
+          <el-table-column label="入库期限" prop="createTime" width="200" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createTime) }}</span><span>逾期</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" width="200" show-overflow-tooltip v-if="tableButtonType">
+            <template slot-scope="scope">
+              <div class="table-button-box">
+                <p class="table-button-null"></p>
+                <p class="table-button-p"
+                   @click="tableButton(2,scope.row)"
+                   v-hasPermiRouter="['demo:demo:detail']"
+                >详情</p>
+                <p class="table-button-p"
+                   @click="tableButton(3,scope.row)"
+                   v-hasPermiRouter="['demo:demo:edit']"
+                >编辑</p>
+                <p class="table-button-p"
+                   @click="tableButton(4,scope.row)"
+                   v-hasPermiRouter="['demo:demo:del']"
+                >删除</p>
+                <p class="table-button-null"></p>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="selected-num-box" v-show="total>0">
+          <p class="selected-num-p">
+            <i class="el-icon-warning"></i>
+            已选择 {{selectedNum}} 项
+          </p>
+          <pagination :page-sizes="[20, 30, 40, 50]"
+                      :total="total"
+                      :page.sync="queryParams.page"
+                      :limit.sync="queryParams.pageSize"
+                      @pagination="getList"
+          />
+        </div>
+      </div>
+    </div>
+    <!--<add-page :propsData="propsData" v-if="pageType === 2"></add-page>-->
+  </div>
+</template>
+<script>
+  //import { getDicts } from "@/api/commonality/noPermission";
+  //import { systemUserSelect } from "@/api/commonality/permission";
+  //import { getInfo } from "@/api/basicsModules/index";
+  //import addPage from "./addPage.vue";
+  import importComponent from "@/components/importComponent/importComponent.vue";
+  import exportComponent from "@/components/exportComponent/exportComponent.vue";
+  import { getDeptDropList,systemBuildingGetTreeList,} from "@/api/commonality/permission";
+  export default {
+    name: 'index',
+    components: {
+      importComponent,
+      exportComponent,
+    },
+    data () {
+      return {
+        //导出配置
+        exportConfig:{
+          api:'system/user/student/export',             //导出接口地址
+          ids:'',                                       //勾选导出,勾选的IDS
+          fileName:'化学品信息',                         //导出文件的命名
+        },
+        importConfig:{
+          upLoadApi:'/system/user/student/importData',                //上传接口地址
+          downloadApi:'/system/user/student/importTemplate',          //下载模板接口地址
+          loseApi:'/system/user/student/importErrorData',             //失败报表接口地址
+          fileName:'导入模板-',                                   //下载模板命名
+        },
+        tableButtonType:this.hasPermiDom(['demo:demo:detail','demo:demo:edit','demo:demo:del',]),
+        //页面状态
+        pageType:1,
+        //页面遮罩
+        loading:false,
+        //学院
+        deptOptions:[],
+        //楼栋楼层
+        buildFloorOptions:[],
+        //下拉列表数据
+        optionList:[{value:true,label:'启用'},{value:false,label:'停用'}],
+        //查询条件
+        queryParams:{
+          page:1,
+          pageSize:20,
+          queryParamsData1:"",
+          queryParamsData2 :null,
+        },
+        //时间数据
+        dateRange:[],
+        //列表数据
+        dataList:[{}],
+        //数据数量
+        total:10,
+        // 选中数组
+        selectedNum:0,
+        ids:[],
+        multiple:true,
+        //组件传参
+        propsData:{},
+      }
+    },
+    created () {
+
+    },
+    mounted () {
+      this.getDeptDropList();
+      this.systemBuildingGetTreeList();
+      //this.getList();
+    },
+    methods: {
+      //查询按钮
+      handleQuery(){
+        this.$set(this.queryParams,'page',1);
+        this.getList();
+      },
+      //重置按钮
+      resetQuery(){
+        this.$set(this,'dateRange',[])
+        this.$set(this,'queryParams',{
+          page:1,
+          pageSize:20,
+          queryParamsData1:"",
+          queryParamsData2 :null,
+        });
+        this.getList();
+      },
+      //获取数据列表
+      getList(){
+        this.$set(this,'loading',true);
+        let obj = JSON.parse(JSON.stringify(this.queryParams))
+        if(this.dateRange[0]){
+          obj.startTime = this.dateRange[0]+'T00:00:00'
+          obj.endTime = this.dateRange[1]+'T23:59:59'
+        }else{
+          obj.startTime = "";
+          obj.endTime = "";
+        }
+        getListFunction(obj).then(response => {
+          this.$set(this,'loading',false);
+          this.$set(this,'dataList',response.data.records);
+          this.$set(this,'total',response.data.total);
+        });
+      },
+      //操作按钮
+      tableButton(type,row){
+        let self = this;
+        if(type == 1){
+          //新增
+          this.$set(this,'pageType',2);
+          this.$set(this,'propsData',{});
+        }else if(type == 2){
+          //详情
+          this.$set(this,'pageType',2);
+          let obj = JSON.parse(JSON.stringify(row))
+          obj.showType = true;
+          this.$set(this,'propsData',obj);
+        }else if(type == 3){
+          //编辑
+          this.$set(this,'pageType',2);
+          let obj = JSON.parse(JSON.stringify(row))
+          obj.showType = false;
+          this.$set(this,'propsData',obj);
+        }else if(type == 4){
+          //删除
+          this.$confirm('是否确认删除?', "警告", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          }).then(function() {
+          }).then(() => {
+            deleteFunction({id:row.id}).then(response => {
+              self.msgSuccess(response.message)
+              self.getList();
+            });
+          }).catch(() => {});
+        }else if(type == 5){
+          //启用&停用
+          let text = row.state  ? "停用" : "启用";
+          this.$confirm('是否确认' + text + '?', "警告", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          }).then(function() {
+          }).then(() => {
+            stateFunction({id:row.id,state:!row.state,}).then(response => {
+              self.msgSuccess(response.message)
+              self.getList();
+            });
+          }).catch(() => {});
+        }else if(type == 6){
+          //返回并刷新
+          this.$set(this,'pageType',1);
+          this.getList();
+        }
+      },
+      //查询学院列表
+      getDeptDropList(){
+        getDeptDropList({deptName:"",level:2,deptType:1}).then(response => {
+          this.$set(this, 'deptOptions', response.data)
+        });
+      },
+      //查询楼栋楼层
+      systemBuildingGetTreeList(){
+        systemBuildingGetTreeList({}).then(response => {
+          if (response.data[0]) {
+            let list = this.forBuildFloor(response.data);
+            let newList = [];
+            for(let i=0;i<list.length;i++){
+              if(list[i].buildFloorVoList){
+                for(let o=0;o<list[i].buildFloorVoList.length;o++){
+                  if(list[i].buildFloorVoList[o].buildFloorVoList){
+                    newList.push(list[i].buildFloorVoList[o])
+                  }
+                }
+              }
+            }
+            console.log('newList========>',newList);
+            this.$set(this, 'buildFloorOptions', newList)
+          }
+        })
+      },
+      //处理楼栋楼层数据
+      forBuildFloor(list){
+        let self = this;
+        for(let i=0;i<list.length;i++){
+          if(list[i].buildFloorVoList){
+            if(list[i].buildFloorVoList[0]){
+              list[i].buildFloorVoList = self.forBuildFloor(list[i].buildFloorVoList);
+            }else{
+              delete list[i].buildFloorVoList;
+            }
+          }else{
+            delete list[i].buildFloorVoList;
+          }
+        }
+        return list
+      },
+      /*===记录勾选数据===
+        需要再el-table 添加  :row-key="getRowKeys"
+        需要在selection 添加 :reserve-selection="true"
+      */
+      getRowKeys(row) {
+        return row.id
+      },
+      //多选框选中数据
+      handleSelectionChange(selection) {
+        this.selectedNum = selection.length;
+        this.ids = selection.map(item => item.id)
+        this.multiple = !selection.length
+      },
+    },
+  }
+</script>
+<style scoped lang="scss">
+  .savePending{
+    .savePendingPage{
+      .table-date-picker{
+        width:176px;
+        height:26px;
+        ::v-deep input{
+          height:26px!important;
+          padding:0 45px;
+        }
+        ::v-deep .el-input__icon{
+          line-height:26px;
+        }
+      }
+    }
+  }
+</style>

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

@@ -0,0 +1,320 @@
+<!-- 入库记录 -->
+<template>
+  <div class="app-container saveRecord">
+    <div class="page-container saveRecordPage" v-if="pageType === 1">
+      <div class="page-form-title-box">
+        <el-form :model="queryParams" class="form-box" ref="queryForm"
+                 :inline="true" style="width:100%;">
+          <el-form-item label="" prop="queryParamsData2">
+            <el-select v-model="queryParams.queryParamsData2"
+                       placeholder="请选择学院"
+                       style="width: 140px">
+              <el-option
+                v-for="item in deptOptions"
+                :key="item.deptId"
+                :label="item.deptName"
+                :value="item.deptId"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" prop="queryParamsData3">
+            <el-cascader
+              style="width: 150px"
+              placeholder="请选择楼栋楼层"
+              :props="{value: 'id', label: 'name',children:'buildFloorVoList'}"
+              v-model="queryParams.queryParamsData3"
+              :options="buildFloorOptions">
+            </el-cascader>
+          </el-form-item>
+          <el-form-item label="" prop="queryParamsData4">
+            <el-select v-model="queryParams.queryParamsData4"
+                       placeholder="请选择类别"
+                       style="width: 120px">
+              <el-option
+                v-for="dict in optionList"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" prop="queryParamsData5">
+            <el-select
+              style="width:180px;"
+              @change="selectChange"
+              v-model="queryParams.queryParamsData5"
+              filterable
+              remote
+              placeholder="请搜索化学品柜"
+              :remote-method="searchSelectList">
+              <el-option
+                v-for="item in searchOptions"
+                :key="item.userId"
+                :label="item.userName"
+                :value="item.userId">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" prop="state">
+            <el-date-picker
+              :clearable="false"
+              v-model="dateRange"
+              size="small"
+              style="width: 220px"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item label="" prop="queryParamsData1">
+            <el-input
+              maxLength="30"
+              v-model="queryParams.queryParamsData1"
+              placeholder="化学品名/CAS/编码/实验室/房间号/姓名/联系方式/课题组"
+              style="width: 390px"
+            />
+          </el-form-item>
+          <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
+          <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+          <el-form-item style="float: right;">
+            <export-component :exportConfig="exportConfig" v-hasPermiRouter="['demo:demo:demo']"></export-component>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="page-content-box">
+        <el-table class="table-box" v-loading="loading" border :data="dataList"
+                  @selection-change="handleSelectionChange" :row-key="getRowKeys">
+          <el-table-column type="selection" width="50" align="center" fixed :reserve-selection="true"/>
+          <el-table-column label="名称" prop="name" width="150" fixed show-overflow-tooltip/>
+          <el-table-column label="CAS" prop="content" width="120" show-overflow-tooltip/>
+          <el-table-column label="类别" prop="content" width="120" show-overflow-tooltip/>
+          <el-table-column label="实验室" prop="content" width="230" show-overflow-tooltip/>
+          <el-table-column label="安全员" prop="content" width="150" show-overflow-tooltip/>
+          <el-table-column label="存储位置" prop="content" width="240" show-overflow-tooltip/>
+          <el-table-column label="规格" prop="content" width="100" show-overflow-tooltip/>
+          <el-table-column label="数量" prop="content" width="100" show-overflow-tooltip/>
+          <el-table-column label="称重方式" prop="content" width="100" show-overflow-tooltip/>
+          <el-table-column label="入库时间" prop="createTime" width="150" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="归属人" prop="content" width="150" show-overflow-tooltip/>
+          <el-table-column label="操作人" prop="content" width="100" show-overflow-tooltip/>
+          <el-table-column label="双人认证" prop="content" width="180" show-overflow-tooltip/>
+        </el-table>
+        <div class="selected-num-box" v-show="total>0">
+          <p class="selected-num-p">
+            <i class="el-icon-warning"></i>
+            已选择 {{selectedNum}} 项
+          </p>
+          <pagination :page-sizes="[20, 30, 40, 50]"
+                      :total="total"
+                      :page.sync="queryParams.page"
+                      :limit.sync="queryParams.pageSize"
+                      @pagination="getList"
+          />
+        </div>
+      </div>
+    </div>
+    <!--<add-page :propsData="propsData" v-if="pageType === 2"></add-page>-->
+  </div>
+</template>
+<script>
+  //import { getDicts } from "@/api/commonality/noPermission";
+  //import { systemUserSelect } from "@/api/commonality/permission";
+  //import { getInfo } from "@/api/basicsModules/index";
+  //import addPage from "./addPage.vue";
+  import exportComponent from "@/components/exportComponent/exportComponent.vue";
+  import { getDeptDropList,systemBuildingGetTreeList,} from "@/api/commonality/permission";
+  export default {
+    name: 'index',
+    components: {
+      exportComponent
+    },
+    data () {
+      return {
+        //导出配置
+        exportConfig:{
+          api:'system/user/student/export',             //导出接口地址
+          ids:'',                                       //勾选导出,勾选的IDS
+          fileName:'化学品信息',                         //导出文件的命名
+        },
+        tableButtonType:this.hasPermiDom(['demo:demo:detail','demo:demo:edit','demo:demo:del',]),
+        //页面状态
+        pageType:1,
+        //页面遮罩
+        loading:false,
+        //学院
+        deptOptions:[],
+        //楼栋楼层
+        buildFloorOptions:[],
+        //搜索化学品柜
+        searchOptions:[],
+        //下拉列表数据
+        optionList:[{value:true,label:'启用'},{value:false,label:'停用'}],
+        //查询条件
+        queryParams:{
+          page:1,
+          pageSize:20,
+          queryParamsData1:"",
+          queryParamsData2 :null,
+        },
+        //时间数据
+        dateRange:[],
+        //列表数据
+        dataList:[{},{},{},{},],
+        //数据数量
+        total:10,
+        // 选中数组
+        selectedNum:0,
+        ids:[],
+        multiple:true,
+        //组件传参
+        propsData:{},
+      }
+    },
+    created () {
+
+    },
+    mounted () {
+      this.getDeptDropList();
+      this.systemBuildingGetTreeList();
+      this.getList();
+    },
+    methods: {
+      //查询按钮
+      handleQuery(){
+        this.$set(this.queryParams,'page',1);
+        this.getList();
+      },
+      //重置按钮
+      resetQuery(){
+        this.$set(this,'dateRange',[])
+        this.$set(this,'queryParams',{
+          page:1,
+          pageSize:20,
+          queryParamsData1:"",
+          queryParamsData2 :null,
+          queryParamsData3 :null,
+          queryParamsData4 :null,
+          queryParamsData5 :null,
+        });
+        this.getList();
+      },
+      //获取数据列表
+      getList(){
+        // this.$set(this,'loading',true);
+        // let obj = JSON.parse(JSON.stringify(this.queryParams))
+        // if(this.dateRange[0]){
+        //   obj.startTime = this.dateRange[0]+'T00:00:00'
+        //   obj.endTime = this.dateRange[1]+'T23:59:59'
+        // }else{
+        //   obj.startTime = "";
+        //   obj.endTime = "";
+        // }
+        // getListFunction(obj).then(response => {
+        //   this.$set(this,'loading',false);
+        //   this.$set(this,'dataList',response.data.records);
+        //   this.$set(this,'total',response.data.total);
+        // });
+      },
+      //查询学院列表
+      getDeptDropList(){
+        getDeptDropList({deptName:"",level:2,deptType:1}).then(response => {
+          this.$set(this, 'deptOptions', response.data)
+        });
+      },
+      //查询楼栋楼层
+      systemBuildingGetTreeList(){
+        systemBuildingGetTreeList({}).then(response => {
+          if (response.data[0]) {
+            let list = this.forBuildFloor(response.data);
+            let newList = [];
+            for(let i=0;i<list.length;i++){
+              if(list[i].buildFloorVoList){
+                for(let o=0;o<list[i].buildFloorVoList.length;o++){
+                  if(list[i].buildFloorVoList[o].buildFloorVoList){
+                    newList.push(list[i].buildFloorVoList[o])
+                  }
+                }
+              }
+            }
+            console.log('newList========>',newList);
+            this.$set(this, 'buildFloorOptions', newList)
+          }
+        })
+      },
+      //处理楼栋楼层数据
+      forBuildFloor(list){
+        let self = this;
+        for(let i=0;i<list.length;i++){
+          if(list[i].buildFloorVoList){
+            if(list[i].buildFloorVoList[0]){
+              list[i].buildFloorVoList = self.forBuildFloor(list[i].buildFloorVoList);
+            }else{
+              delete list[i].buildFloorVoList;
+            }
+          }else{
+            delete list[i].buildFloorVoList;
+          }
+        }
+        return list
+      },
+      //搜索化学品柜
+      searchSelectList(query) {
+        if (query !== '' && query.length>1) {
+          // this.loading = true;
+          // let obj = {
+          //   userName : query,
+          //   userType: 2,
+          //   pageSize: -1,
+          // };
+          // systemUserList(obj).then(response => {
+          //   this.optionsUser = response.data.records;
+          //   this.loading = false;
+          // });
+        } else {
+          this.optionsUser = [];
+        }
+      },
+      //化学品柜选中
+      //人员选中
+      selectChange(data){
+        let self = this;
+        // for(let i=0;i<self.optionsUser.length;i++){
+        //   if(data == self.optionsUser[i].userId){
+        //     this.form.stuNo = self.optionsUser[i].account;
+        //     this.form.deptId = self.optionsUser[i].deptId;
+        //     this.form.deptName = self.optionsUser[i].deptName;
+        //     this.form.joinUserId = self.optionsUser[i].userId;
+        //     this.form.joinUserName = self.optionsUser[i].userName;
+        //     this.form.subjectId = '';
+        //     this.laboratorySubRelInfoList();
+        //   }
+        // }
+      },
+      /*===记录勾选数据===
+        需要再el-table 添加  :row-key="getRowKeys"
+        需要在selection 添加 :reserve-selection="true"
+      */
+      getRowKeys(row) {
+        return row.id
+      },
+      //多选框选中数据
+      handleSelectionChange(selection) {
+        this.selectedNum = selection.length;
+        this.ids = selection.map(item => item.id)
+        this.multiple = !selection.length
+      },
+    },
+  }
+</script>
+<style scoped lang="scss">
+  .saveRecord{
+    .saveRecordPage{
+    }
+  }
+</style>

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

@@ -0,0 +1,331 @@
+<!-- 出库记录 -->
+<template>
+  <div class="app-container takeRecord">
+    <div class="page-container takeRecordPage" v-if="pageType === 1">
+      <div class="page-form-title-box">
+        <el-form :model="queryParams" class="form-box" ref="queryForm"
+                 :inline="true" style="width:100%;">
+          <el-form-item label="" prop="queryParamsData2">
+            <el-select v-model="queryParams.queryParamsData2"
+                       placeholder="请选择学院"
+                       style="width: 120px">
+              <el-option
+                v-for="item in deptOptions"
+                :key="item.deptId"
+                :label="item.deptName"
+                :value="item.deptId"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" prop="queryParamsData3">
+            <el-cascader
+              style="width: 150px"
+              placeholder="请选择楼栋楼层"
+              :props="{value: 'id', label: 'name',children:'buildFloorVoList'}"
+              v-model="queryParams.queryParamsData3"
+              :options="buildFloorOptions">
+            </el-cascader>
+          </el-form-item>
+          <el-form-item label="" prop="queryParamsData4">
+            <el-select v-model="queryParams.queryParamsData4"
+                       placeholder="请选择类别"
+                       style="width: 120px">
+              <el-option
+                v-for="dict in optionList"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" prop="queryParamsData4">
+            <el-select v-model="queryParams.queryParamsData4"
+                       placeholder="请选择出库方式"
+                       style="width: 144px">
+              <el-option
+                v-for="dict in optionList"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" prop="queryParamsData5">
+            <el-select
+              style="width:145px;"
+              @change="selectChange"
+              v-model="queryParams.queryParamsData5"
+              filterable
+              remote
+              placeholder="请搜索化学品柜"
+              :remote-method="searchSelectList">
+              <el-option
+                v-for="item in searchOptions"
+                :key="item.userId"
+                :label="item.userName"
+                :value="item.userId">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" prop="state">
+            <el-date-picker
+              :clearable="false"
+              v-model="dateRange"
+              size="small"
+              style="width: 220px"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item label="" prop="queryParamsData1">
+            <el-input
+              maxLength="30"
+              v-model="queryParams.queryParamsData1"
+              placeholder="化学品名/CAS/编码/实验室/房间号/姓名/课题组"
+              style="width: 324px"
+            />
+          </el-form-item>
+          <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
+          <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+          <el-form-item style="float: right;margin-right:0;">
+            <export-component :exportConfig="exportConfig" v-hasPermiRouter="['demo:demo:demo']"></export-component>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="page-content-box">
+        <el-table class="table-box" v-loading="loading" border :data="dataList"
+                  @selection-change="handleSelectionChange" :row-key="getRowKeys">
+          <el-table-column type="selection" width="50" align="center" fixed :reserve-selection="true"/>
+          <el-table-column label="名称" prop="name" width="150" fixed show-overflow-tooltip/>
+          <el-table-column label="编码" prop="content" width="120" show-overflow-tooltip/>
+          <el-table-column label="类别" prop="content" width="120" show-overflow-tooltip/>
+          <el-table-column label="实验室" prop="content" width="230" show-overflow-tooltip/>
+          <el-table-column label="安全员" prop="content" width="150" show-overflow-tooltip/>
+          <el-table-column label="存储位置" prop="content" width="240" show-overflow-tooltip/>
+          <el-table-column label="规格" prop="content" width="100" show-overflow-tooltip/>
+          <el-table-column label="出库量" prop="content" width="100" show-overflow-tooltip/>
+          <el-table-column label="出库方式" prop="content" width="100" show-overflow-tooltip/>
+          <el-table-column label="称重方式" prop="content" width="100" show-overflow-tooltip/>
+          <el-table-column label="出库时间" prop="createTime" width="150" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="归属人" prop="content" width="150" show-overflow-tooltip/>
+          <el-table-column label="操作人" prop="content" width="100" show-overflow-tooltip/>
+          <el-table-column label="双人认证" prop="content" width="180" show-overflow-tooltip/>
+        </el-table>
+        <div class="selected-num-box" v-show="total>0">
+          <p class="selected-num-p">
+            <i class="el-icon-warning"></i>
+            已选择 {{selectedNum}} 项
+          </p>
+          <pagination :page-sizes="[20, 30, 40, 50]"
+                      :total="total"
+                      :page.sync="queryParams.page"
+                      :limit.sync="queryParams.pageSize"
+                      @pagination="getList"
+          />
+        </div>
+      </div>
+    </div>
+    <!--<add-page :propsData="propsData" v-if="pageType === 2"></add-page>-->
+  </div>
+</template>
+<script>
+  //import { getDicts } from "@/api/commonality/noPermission";
+  //import { systemUserSelect } from "@/api/commonality/permission";
+  //import { getInfo } from "@/api/basicsModules/index";
+  //import addPage from "./addPage.vue";
+  import exportComponent from "@/components/exportComponent/exportComponent.vue";
+  import { getDeptDropList,systemBuildingGetTreeList,} from "@/api/commonality/permission";
+  export default {
+    name: 'index',
+    components: {
+      exportComponent
+    },
+    data () {
+      return {
+        //导出配置
+        exportConfig:{
+          api:'system/user/student/export',             //导出接口地址
+          ids:'',                                       //勾选导出,勾选的IDS
+          fileName:'化学品信息',                         //导出文件的命名
+        },
+        tableButtonType:this.hasPermiDom(['demo:demo:detail','demo:demo:edit','demo:demo:del',]),
+        //页面状态
+        pageType:1,
+        //页面遮罩
+        loading:false,
+        //学院
+        deptOptions:[],
+        //楼栋楼层
+        buildFloorOptions:[],
+        //搜索化学品柜
+        searchOptions:[],
+        //下拉列表数据
+        optionList:[{value:true,label:'启用'},{value:false,label:'停用'}],
+        //查询条件
+        queryParams:{
+          page:1,
+          pageSize:20,
+          queryParamsData1:"",
+          queryParamsData2 :null,
+        },
+        //时间数据
+        dateRange:[],
+        //列表数据
+        dataList:[{},{}],
+        //数据数量
+        total:10,
+        // 选中数组
+        selectedNum:0,
+        ids:[],
+        multiple:true,
+        //组件传参
+        propsData:{},
+      }
+    },
+    created () {
+
+    },
+    mounted () {
+      this.getDeptDropList();
+      this.systemBuildingGetTreeList();
+      this.getList();
+    },
+    methods: {
+      //查询按钮
+      handleQuery(){
+        this.$set(this.queryParams,'page',1);
+        this.getList();
+      },
+      //重置按钮
+      resetQuery(){
+        this.$set(this,'dateRange',[])
+        this.$set(this,'queryParams',{
+          page:1,
+          pageSize:20,
+          queryParamsData1:"",
+          queryParamsData2 :null,
+        });
+        this.getList();
+      },
+      //获取数据列表
+      getList(){
+        // this.$set(this,'loading',true);
+        // let obj = JSON.parse(JSON.stringify(this.queryParams))
+        // if(this.dateRange[0]){
+        //   obj.startTime = this.dateRange[0]+'T00:00:00'
+        //   obj.endTime = this.dateRange[1]+'T23:59:59'
+        // }else{
+        //   obj.startTime = "";
+        //   obj.endTime = "";
+        // }
+        // getListFunction(obj).then(response => {
+        //   this.$set(this,'loading',false);
+        //   this.$set(this,'dataList',response.data.records);
+        //   this.$set(this,'total',response.data.total);
+        // });
+      },
+      //查询学院列表
+      getDeptDropList(){
+        getDeptDropList({deptName:"",level:2,deptType:1}).then(response => {
+          this.$set(this, 'deptOptions', response.data)
+        });
+      },
+      //查询楼栋楼层
+      systemBuildingGetTreeList(){
+        systemBuildingGetTreeList({}).then(response => {
+          if (response.data[0]) {
+            let list = this.forBuildFloor(response.data);
+            let newList = [];
+            for(let i=0;i<list.length;i++){
+              if(list[i].buildFloorVoList){
+                for(let o=0;o<list[i].buildFloorVoList.length;o++){
+                  if(list[i].buildFloorVoList[o].buildFloorVoList){
+                    newList.push(list[i].buildFloorVoList[o])
+                  }
+                }
+              }
+            }
+            console.log('newList========>',newList);
+            this.$set(this, 'buildFloorOptions', newList)
+          }
+        })
+      },
+      //处理楼栋楼层数据
+      forBuildFloor(list){
+        let self = this;
+        for(let i=0;i<list.length;i++){
+          if(list[i].buildFloorVoList){
+            if(list[i].buildFloorVoList[0]){
+              list[i].buildFloorVoList = self.forBuildFloor(list[i].buildFloorVoList);
+            }else{
+              delete list[i].buildFloorVoList;
+            }
+          }else{
+            delete list[i].buildFloorVoList;
+          }
+        }
+        return list
+      },
+      //搜索化学品柜
+      searchSelectList(query) {
+        if (query !== '' && query.length>1) {
+          // this.loading = true;
+          // let obj = {
+          //   userName : query,
+          //   userType: 2,
+          //   pageSize: -1,
+          // };
+          // systemUserList(obj).then(response => {
+          //   this.optionsUser = response.data.records;
+          //   this.loading = false;
+          // });
+        } else {
+          this.optionsUser = [];
+        }
+      },
+      //化学品柜选中
+      //人员选中
+      selectChange(data){
+        let self = this;
+        // for(let i=0;i<self.optionsUser.length;i++){
+        //   if(data == self.optionsUser[i].userId){
+        //     this.form.stuNo = self.optionsUser[i].account;
+        //     this.form.deptId = self.optionsUser[i].deptId;
+        //     this.form.deptName = self.optionsUser[i].deptName;
+        //     this.form.joinUserId = self.optionsUser[i].userId;
+        //     this.form.joinUserName = self.optionsUser[i].userName;
+        //     this.form.subjectId = '';
+        //     this.laboratorySubRelInfoList();
+        //   }
+        // }
+      },
+      /*===记录勾选数据===
+        需要再el-table 添加  :row-key="getRowKeys"
+        需要在selection 添加 :reserve-selection="true"
+      */
+      getRowKeys(row) {
+        return row.id
+      },
+      //多选框选中数据
+      handleSelectionChange(selection) {
+        this.selectedNum = selection.length;
+        this.ids = selection.map(item => item.id)
+        this.multiple = !selection.length
+      },
+    },
+  }
+</script>
+<style scoped lang="scss">
+  .takeRecord{
+    .takeRecordPage{
+
+    }
+  }
+</style>

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

@@ -0,0 +1,236 @@
+<!-- 盘点记录 -->
+<template>
+  <div class="app-container takeStockRecord">
+    <div class="page-container takeStockRecordPage" v-if="pageType === 1">
+      <div class="page-form-title-box">
+        <el-form :model="queryParams" class="form-box" ref="queryForm"
+                 :inline="true" style="width:100%;">
+          <el-form-item label="" prop="queryParamsData2">
+            <el-select v-model="queryParams.queryParamsData2"
+                       placeholder="请选择学院"
+                       style="width: 180px">
+              <el-option
+                v-for="item in deptOptions"
+                :key="item.deptId"
+                :label="item.deptName"
+                :value="item.deptId"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" prop="queryParamsData3">
+            <el-cascader
+              style="width: 180px"
+              placeholder="请选择楼栋楼层"
+              :props="{value: 'id', label: 'name',children:'buildFloorVoList'}"
+              v-model="queryParams.queryParamsData3"
+              :options="buildFloorOptions">
+            </el-cascader>
+          </el-form-item>
+          <el-form-item label="" prop="state">
+            <el-date-picker
+              :clearable="false"
+              v-model="dateRange"
+              size="small"
+              style="width: 240px"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item label="" prop="queryParamsData1">
+            <el-input
+              maxLength="30"
+              v-model="queryParams.queryParamsData1"
+              placeholder="标题/实验室/房间号/姓名/联系方式"
+              style="width: 260px"
+            />
+          </el-form-item>
+          <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
+          <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+          <div style="display: flex;float: right;cursor: pointer;margin-right:10px;">
+            <p class="el-icon-refresh-left" style="transform: scaleX(-1);color:#0183FA;font-size:20px;font-weight:700;line-height:40px;"></p>
+            <p style="line-height:40px;margin-left:10px;font-size:14px;">刷新</p>
+          </div>
+        </el-form>
+      </div>
+      <div class="page-content-box">
+        <el-table class="table-box" v-loading="loading" border :data="dataList"
+                  @sort-change="sortChange">
+          <el-table-column label="序号" prop="name" width="50" show-overflow-tooltip/>
+          <el-table-column label="标题" prop="name"  show-overflow-tooltip/>
+          <el-table-column label="学院" prop="content" width="230" show-overflow-tooltip/>
+          <el-table-column label="楼栋楼层" prop="content" width="200" show-overflow-tooltip/>
+          <el-table-column label="实验室" prop="content" width="200" show-overflow-tooltip/>
+          <el-table-column label="安全员" prop="content" width="200" show-overflow-tooltip/>
+          <el-table-column label="盘点人" prop="state" width="100" show-overflow-tooltip/>
+          <el-table-column label="盘点时间" prop="createTime" sortable="custom" width="200" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination :page-sizes="[20, 30, 40, 50]"
+                    v-show="total>0"
+                    :total="total"
+                    :page.sync="queryParams.page"
+                    :limit.sync="queryParams.pageSize"
+                    @pagination="getList"
+        />
+      </div>
+    </div>
+    <!--<add-page :propsData="propsData" v-if="pageType === 2"></add-page>-->
+  </div>
+</template>
+<script>
+  //import { getDicts } from "@/api/commonality/noPermission";
+  //import { systemUserSelect } from "@/api/commonality/permission";
+  //import { getInfo } from "@/api/basicsModules/index";
+  //import addPage from "./addPage.vue";
+  import { getDeptDropList,systemBuildingGetTreeList,} from "@/api/commonality/permission";
+  export default {
+    name: 'index',
+    //components: {
+    //  addPage
+    //},
+    data () {
+      return {
+        tableButtonType:this.hasPermiDom(['demo:demo:detail','demo:demo:edit','demo:demo:del',]),
+        //页面状态
+        pageType:1,
+        //页面遮罩
+        loading:false,
+        //学院
+        deptOptions:[],
+        //楼栋楼层
+        buildFloorOptions:[],
+        //下拉列表数据
+        optionList:[{value:true,label:'启用'},{value:false,label:'停用'}],
+        //查询条件
+        queryParams:{
+          page:1,
+          pageSize:20,
+          queryParamsData1:"",
+          queryParamsData2 :null,
+        },
+        //时间数据
+        dateRange:[],
+        //列表数据
+        dataList:[{name:'1'},{name:'2'},],
+        //数据数量
+        total:0,
+        //组件传参
+        propsData:{},
+      }
+    },
+    created () {
+
+    },
+    mounted () {
+      this.getDeptDropList();
+      this.systemBuildingGetTreeList();
+      //this.getList();
+    },
+    methods: {
+      //查询按钮
+      handleQuery(){
+        this.$set(this.queryParams,'page',1);
+        this.getList();
+      },
+      //重置按钮
+      resetQuery(){
+        this.$set(this,'dateRange',[])
+        this.$set(this,'queryParams',{
+          page:1,
+          pageSize:20,
+          queryParamsData1:"",
+          queryParamsData2 :null,
+        });
+        this.getList();
+      },
+      //时间排序方法
+      sortChange(val){
+        if(val.prop == 'checkTime'){
+          this.$set(this.queryParams,'checkTimeOrder',val.order=='ascending'?'1':(val.order=='descending'?'2':''));
+          this.handleQuery();
+        }
+      },
+      //获取数据列表
+      getList(){
+        // this.$set(this,'loading',true);
+        // let obj = JSON.parse(JSON.stringify(this.queryParams))
+        // if(this.dateRange[0]){
+        //   obj.startTime = this.dateRange[0]+'T00:00:00'
+        //   obj.endTime = this.dateRange[1]+'T23:59:59'
+        // }else{
+        //   obj.startTime = "";
+        //   obj.endTime = "";
+        // }
+        // getListFunction(obj).then(response => {
+        //   this.$set(this,'loading',false);
+        //   this.$set(this,'dataList',response.data.records);
+        //   this.$set(this,'total',response.data.total);
+        // });
+      },
+      //操作按钮
+      tableButton(type,row){
+        let self = this;
+        if(type == 1){
+          //新增
+          this.$set(this,'pageType',2);
+          this.$set(this,'propsData',{});
+        }
+      },
+      //查询学院列表
+      getDeptDropList(){
+        getDeptDropList({deptName:"",level:2,deptType:1}).then(response => {
+          this.$set(this, 'deptOptions', response.data)
+        });
+      },
+      //查询楼栋楼层
+      systemBuildingGetTreeList(){
+        systemBuildingGetTreeList({}).then(response => {
+          if (response.data[0]) {
+            let list = this.forBuildFloor(response.data);
+            let newList = [];
+            for(let i=0;i<list.length;i++){
+              if(list[i].buildFloorVoList){
+                for(let o=0;o<list[i].buildFloorVoList.length;o++){
+                  if(list[i].buildFloorVoList[o].buildFloorVoList){
+                    newList.push(list[i].buildFloorVoList[o])
+                  }
+                }
+              }
+            }
+            console.log('newList========>',newList);
+            this.$set(this, 'buildFloorOptions', newList)
+          }
+        })
+      },
+      //处理楼栋楼层数据
+      forBuildFloor(list){
+        let self = this;
+        for(let i=0;i<list.length;i++){
+          if(list[i].buildFloorVoList){
+            if(list[i].buildFloorVoList[0]){
+              list[i].buildFloorVoList = self.forBuildFloor(list[i].buildFloorVoList);
+            }else{
+              delete list[i].buildFloorVoList;
+            }
+          }else{
+            delete list[i].buildFloorVoList;
+          }
+        }
+        return list
+      },
+    },
+  }
+</script>
+<style scoped lang="scss">
+  .takeStockRecord{
+    .takeStockRecordPage{
+
+    }
+  }
+</style>

src/views/integratedManagement/laboratoryManagement/subject/index.vue

@@ -2151,8 +2151,8 @@ export default {
 .subject-page{
   .el-table{
     .el-input--medium .el-input__inner{
-      height:30px;
-      line-height:30px;
+      height:26px;
+      line-height:26px;
       width:55px;
       text-align: center;
       padding:0 10px;

src/views/integratedManagement/personnelManage/teacherInfo/index.vue

@@ -174,7 +174,7 @@
               </el-table-column>
               <el-table-column label="在职状态" align="left" prop="userName" width="100">
                 <template slot-scope="scope">
-                  <p style="width:64px;margin:0 auto;">
+                  <p style="width:64px;margin:-1px auto 0;">
                     <el-switch
                       @click.native="userStateChange(scope.row)"
                       class="switch captcha-img"