zc

src/views/comprehensive/laboratoryManagement/record/index.vue

@@ -12,7 +12,7 @@
             size="small"
           />
         </el-form-item>
-        <el-form-item label="学院" prop="deptId" label-width="50px">
+        <el-form-item label="学院" prop="deptId" label-width="45px">
           <el-select v-model="queryParams.deptId" placeholder="请选择学院" @change="handleNodeClick" style="width:200px;">
             <el-option
               v-for="dict in deptOptions"
@@ -32,7 +32,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="进入时间" prop="subjectId" label-width="80px">
+        <el-form-item label="进入时间" prop="subjectId" label-width="75px">
           <el-date-picker
             :clearable="false"
             v-model="dateRange"
@@ -44,37 +44,23 @@
             end-placeholder="结束日期"
           ></el-date-picker>
         </el-form-item>
-        <!--<el-form-item label="时间类型" prop="inOutType">-->
-        <!--<el-select v-model="queryParams.inOutType" placeholder="选择时间类型">-->
-        <!--<el-option-->
-        <!--v-for="item in inOutTypeOptions"-->
-        <!--:key="item.value"-->
-        <!--:label="item.label"-->
-        <!--:value="item.value">-->
-        <!--</el-option>-->
-        <!--</el-select>-->
-        <!--</el-form-item>-->
-
-        <!--<el-form-item label="进入时间" prop="inTime">-->
-        <!--<el-date-picker clearable size="small"-->
-        <!--v-model="queryParams.inTime"-->
-        <!--type="date"-->
-        <!--value-format="yyyy-MM-dd"-->
-        <!--placeholder="选择进入时间">-->
-        <!--</el-date-picker>-->
-        <!--</el-form-item>-->
-        <!--<el-form-item label="离开时间" prop="outTime">-->
-        <!--<el-date-picker clearable size="small"-->
-        <!--v-model="queryParams.outTime"-->
-        <!--type="date"-->
-        <!--value-format="yyyy-MM-dd"-->
-        <!--placeholder="选择离开时间">-->
-        <!--</el-date-picker>-->
-        <!--</el-form-item>-->
         <el-form-item>
           <p class="inquire-button-one" @click="handleQuery">查询</p>
           <p class="reset-button-one" @click="resetQuery">重置</p>
         </el-form-item>
+        <el-form-item>
+          <el-dropdown @command="exportButton" v-hasPermi="['chemical:hxpapply:export']">
+            <div class="form-dropdown-box">
+              <img src="@/assets/ZDimages/personnelManagement/icon_jzgxx_sc.png">
+              <p>导出</p>
+              <img src="@/assets/ZDimages/personnelManagement/icon_jzggl_xljt.png">
+            </div>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item style="border-bottom:1px solid #E0E0E0;margin:0 10px;color:#333;" :command="{command:1}">导出全部数据</el-dropdown-item>
+              <el-dropdown-item style="margin:0 10px;color:#666;" :command="{command:2}">导出选中数据</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+        </el-form-item>
         <el-form-item style="float: right;">
           <el-col :span="1.5">
             <p class="add-button-one-120"
@@ -83,40 +69,14 @@
           </el-col>
         </el-form-item>
       </el-form>
-      <!--<div class="sheet-expand-box" v-hasPermi="['laboratory:record:export']">-->
-      <!--<i class="el-icon-warning" style="color:#0045AF;"></i>-->
-      <!--<p class="color_99">已选择 {{selectedNum}} 项</p>-->
-      <!--<p class="color_one cursor_hover" @click="selectPage">全选本页</p>-->
-      <!--<p class="color_warn cursor_hover" @click="clearSelection">清除选项</p>-->
-      <!--<p class="color_one border-solid-color-one cursor_hover" @click="getSelected" v-hasPermi="['laboratory:record:export']">立即导出</p>-->
-      <!--<p class="color_one border-solid-color-one cursor_hover" @click="handleExport" v-hasPermi="['laboratory:record:export']">导出全部</p>-->
-      <!--</div>-->
       <el-table v-loading="loading" border :data="recordList" @selection-change="handleSelectionChange" ref="multipleTable" :row-key="getRowKeys">
-        <!--<el-table-column type="selection" width="55" align="center" :reserve-selection="true" />-->
+        <el-table-column type="selection" width="55" align="center" :reserve-selection="true" />
         <el-table-column label="姓名" align="left" prop="nickName"  width="140"/>
         <el-table-column label="学院" align="left" prop="deptName" show-overflow-tooltip width="200"/>
         <el-table-column label="实验室" align="left" prop="subjectName" show-overflow-tooltip/>
-        <el-table-column label="进入时间" align="left" prop="inTime" width="200">
-          <!--<template slot-scope="scope">-->
-          <!--<span>{{ parseTime(scope.row.inTime, '{y}-{m}-{d}') }}</span>-->
-          <!--</template>-->
-        </el-table-column>
-        <el-table-column label="离开时间" align="left" prop="outTime" width="200">
-          <!--<template slot-scope="scope">-->
-          <!--<span>{{ parseTime(scope.row.outTime, '{y}-{m}-{d}') }}</span>-->
-          <!--</template>-->
-        </el-table-column>
+        <el-table-column label="进入时间" align="left" prop="inTime" width="200"/>
+        <el-table-column label="离开时间" align="left" prop="outTime" width="200"/>
         <el-table-column label="停留时间" align="left" prop="intervalTime" width="200"/>
-        <!--<el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="120" v-if="tableButtonType">-->
-          <!--<template slot-scope="scope">-->
-            <!--<div class="button-box" style="display: flex;margin-left:20px;">-->
-              <!--<p class="table-min-button"-->
-                 <!--@click="handleUpdate(scope.row)"-->
-                 <!--v-hasPermi="['laboratory:record:query']"-->
-              <!--&gt;查看</p>-->
-            <!--</div>-->
-          <!--</template>-->
-        <!--</el-table-column>-->
       </el-table>
       <pagination :page-sizes="[20, 30, 40, 50]"
         v-show="total>0"
@@ -126,47 +86,6 @@
         :limit.sync="queryParams.pageSize"
         @pagination="getList"
       />
-      <!-- 添加或修改实验室进出记录对话框 -->
-      <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-          <el-form-item label="姓名" prop="nickName" >
-            <el-input v-model="form.nickName" placeholder="无" disabled/>
-          </el-form-item>
-          <el-form-item label="学院" prop="deptName" >
-            <el-input v-model="form.deptName" placeholder="无" disabled/>
-          </el-form-item>
-          <el-form-item label="实验室" prop="subjectName" >
-            <el-input v-model="form.subjectName" placeholder="无" disabled/>
-          </el-form-item>
-          <el-form-item label="进入时间" prop="inTime" >
-            <el-input v-model="form.inTime" placeholder="无" disabled/>
-          </el-form-item>
-          <!--<el-form-item label="进入时间" prop="inTime" >-->
-          <!--<el-date-picker clearable size="small"-->
-          <!--disabled-->
-          <!--v-model="form.inTime"-->
-          <!--type="date"-->
-          <!--value-format="yyyy-MM-dd"-->
-          <!--placeholder="无">-->
-          <!--</el-date-picker>-->
-          <!--</el-form-item>-->
-          <el-form-item label="离开时间" prop="outTime" >
-            <el-input v-model="form.outTime" placeholder="无" disabled/>
-          </el-form-item>
-          <!--<el-form-item label="离开时间" prop="outTime" >-->
-          <!--<el-date-picker clearable size="small"-->
-          <!--disabled-->
-          <!--v-model="form.outTime"-->
-          <!--type="date"-->
-          <!--value-format="yyyy-MM-dd"-->
-          <!--placeholder="无">-->
-          <!--</el-date-picker>-->
-          <!--</el-form-item>-->
-          <el-form-item label="停留时间" prop="remark" >
-            <el-input v-model="form.intervalTime" placeholder="无" disabled/>
-          </el-form-item>
-        </el-form>
-      </el-dialog>
     </div>
     <my-record v-if="pageType == 2"></my-record>
   </div>
@@ -256,6 +175,14 @@ export default {
         this.pageType = type;
       }
     },
+    //导出按钮
+    exportButton(data){
+      if(data.command == 1){
+        this.handleExport();
+      } else if(data.command == 2){
+        this.getSelected();
+      }
+    },
     //选中导出
     getSelected(){
       if(!this.ids[0]){
@@ -270,6 +197,7 @@ export default {
       this.download('laboratory/record/export', {
         ...obj
       }, `进出记录.xlsx`)
+      this.$refs.multipleTable.clearSelection();
     },
     /* 全部导出按钮操作 */
     handleExport() {
@@ -278,6 +206,7 @@ export default {
       this.download('laboratory/record/export', {
         ...obj
       }, `进出记录.xlsx`)
+      this.$refs.multipleTable.clearSelection();
     },
     /** 查询实验室字典列表 */
     getSubjectDictList (deptId) {
@@ -292,17 +221,6 @@ export default {
         this.loading = false;
       });
     },
-    //=========表格扩展选择器方法---开始=========
-    //选择本页
-    selectPage(){
-      console.log(this.$refs.multipleTable)
-      this.$refs.multipleTable.toggleAllSelection()
-      // console.log(this.$refs.multipleTable.selection)
-    },
-    //清除选择
-    clearSelection(){
-      this.$refs.multipleTable.clearSelection()
-    },
     /*===记录勾选数据===
       需要再el-table 添加  :row-key="getRowKeys"
       需要在selection 添加 :reserve-selection="true"
@@ -336,23 +254,13 @@ export default {
         this.$set(this, 'deptOptions', response.data)
       });
     },
-    // 筛选节点
-    filterNode(value, data) {
-      if (!value) return true;
-      return data.label.indexOf(value) !== -1;
-    },
-    // 节点单击事件
+    // 学院选择事件
     handleNodeClick(data) {
       this.queryParams.deptId = data;
       // console.log("data",data);
       this.getSubjectDictList(data);
       // this.getList();
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
     // 表单重置
     reset() {
       this.form = {
@@ -401,53 +309,6 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加实验室进出记录";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      this.form = row;
-        this.open = true;
-        this.title = "记录详情";
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateRecord(this.form).then(response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addRecord(this.form).then(response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('确认删除实验室进出记录吗?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delRecord(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        }).catch(() => {});
-    },
   }
 };
 </script>
@@ -467,6 +328,30 @@ export default {
       border-radius:10px;
       padding:20px!important;
       overflow: hidden;
+      .form-dropdown-box{
+        display: flex;
+        margin:0;
+        padding:0 10px;
+        cursor: pointer;
+        height:40px;
+        img:nth-child(1){
+          width:16px;
+          height:16px;
+          margin-top:12px;
+        }
+        p{
+          width:47px;
+          text-align: center;
+          font-size:14px;
+          margin:0;
+          line-height:40px;
+        }
+        img:nth-child(3){
+          width:10px;
+          height:6px;
+          margin-top:17px;
+        }
+      }
     }
     .el-row{
       margin-bottom:20px;