给搜索加enter回车事件

src/option/system/dict.js

@@ -11,6 +11,7 @@ export const optionParent = {
   menuWidth: 250,
   dialogWidth: 880,
   dialogClickModal: false,
+  searchEnter:true,
   column: [
     {
       label: "字典编号",

src/option/system/dictbiz.js

@@ -11,6 +11,7 @@ export const optionParent = {
   menuWidth: 250,
   dialogWidth: 880,
   dialogClickModal: false,
+  searchEnter:true,
   column: [
     {
       label: "字典编号",

src/views/authority/apiscope.vue

@@ -133,6 +133,7 @@
           excelBtn: false,       // 导出Excel
           printBtn: false,       // 表格打印导出
           filterBtn: false,      // 筛选
+          searchEnter:true,
           column: [
             {
               label: "菜单名称",

src/views/authority/datascope.vue

@@ -137,6 +137,7 @@
           excelBtn: false,       // 导出Excel
           printBtn: false,       // 表格打印导出
           filterBtn: false,      // 筛选
+          searchEnter:true,
           column: [
             {
               label: "菜单名称",

src/views/authority/role.vue

@@ -126,6 +126,7 @@
           excelBtn: false,       // 导出Excel
           printBtn: false,       // 表格打印导出
           filterBtn: false,      // 筛选
+          searchEnter:true,
           column: [
             {
               label: "角色名称",

src/views/businessManagement/inspection/repair.vue

@@ -459,6 +459,7 @@ export default {
         excelBtn: false,       // 导出Excel
         printBtn: false,       // 表格打印导出
         filterBtn: false,      // 筛选
+        searchEnter:true,
         column: [
           {
             label: "任务单号",

src/views/businessManagement/inspection/task.vue

@@ -6,7 +6,7 @@
       @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
       <template slot-scope="scope" slot="menuLeft">
         <el-button type="primary"  v-show="permission.createTask"  size="small" @click="createTask">生成巡检任务</el-button>
-         <el-button type="primary" size="small" @click="allExportReport">批量导出报告</el-button>
+         <el-button type="primary" size="small" @click="allExportReport" :loading="allExportLoading">批量导出报告</el-button>
       </template>
       <template slot-scope="{ row }" slot="taskStatus">
         <!-- role_id  运维主管 1839537055389515777  维修人员 1839552581620793346 实验室管理员 1846419477876510721-->
@@ -465,6 +465,7 @@ export default {
         excelBtn: false,       // 导出Excel
         printBtn: false,       // 表格打印导出
         filterBtn: false,      // 筛选
+        searchEnter:true,
         column: [
           {
             label: "任务单号",
@@ -568,7 +569,8 @@ export default {
       role_id: '',
       tableData: [],
       inspectionTable: [],
-      routingFormShow: false
+      routingFormShow: false,
+      allExportLoading:false,
     }
   },
   computed: {
@@ -621,6 +623,7 @@ export default {
           this.$message.warning('请选择状态为已完成的数据')
         } else {
           console.log('批量导出报告', this.selectedList)
+          this.allExportLoading = true
           zipDownload('/api/lab-ops/maintenance/batch-maintenance-output-service', this.selectedList)
             .then((response) => {
               const blob = new Blob([response.data])
@@ -637,6 +640,7 @@ export default {
               } else { // IE10+下载
                 navigator.msSaveBlob(blob, fileName)
               }
+              this.allExportLoading = false
             })
             .catch((err) => {
               console.log(err);

src/views/businessManagement/ordinary.vue

@@ -34,7 +34,7 @@
 
         <el-button type="primary" size="small" @click="handleApproval"
           v-show="role_id == '1839600115013713921'">审批</el-button>
-        <el-button type="primary" size="small" @click="allExportReport">批量导出报告</el-button>
+        <el-button type="primary" size="small" @click="allExportReport" :loading="allExportLoading">批量导出报告</el-button>
       </template>
       <template slot-scope="{ row }" slot="menu">
         <!-- orderView() -->
@@ -753,6 +753,7 @@ export default {
         columnBtn: false,
         selection: true,
         menuWidth: 350,
+        searchEnter:true,
         column: [
           {
             label: "提报时间",
@@ -917,6 +918,7 @@ export default {
       },
       overStatusList: [],
       completeImgList: [],//维修完成上传图片
+      allExportLoading:false,//批量上传 loading
     }
   },
 
@@ -1059,6 +1061,7 @@ export default {
         if (tmp.length != this.selectList.length) {
           this.$message.warning('请选择状态为已完成的数据')
         } else {
+          this.allExportLoading = true
           zipDownload('/api/lab-ops/work-order/batch-report-service', this.selectList)
             .then((response) => {
               const blob = new Blob([response.data])
@@ -1075,6 +1078,7 @@ export default {
               } else { // IE10+下载
                 navigator.msSaveBlob(blob, fileName)
               }
+              this.allExportLoading = false
             })
             .catch((err) => {
               console.log(err);

src/views/customerFeedback/feedback.vue

@@ -137,6 +137,7 @@ export default {
                 refreshBtn: false,
                 columnBtn: false,
                 menuWidth: 240,
+                searchEnter:true,
                 column: [
                     {
                         label: "意见单号",

src/views/desk/message.vue

@@ -74,6 +74,7 @@
             excelBtn: true,
             addBtn:false,
             dialogClickModal: false,
+            searchEnter:true,
             column: [
                 {
                     label: "单号",
@@ -301,4 +302,3 @@
 
   <style>
   </style>
-  

src/views/desk/notice.vue

@@ -64,6 +64,7 @@
           selection: true,
           excelBtn: true,
           dialogClickModal: false,
+          searchEnter:true,
           column: [
             {
               label: "通知标题",

src/views/device/deviceSystem.vue

@@ -355,6 +355,7 @@ export default {
         index: true,
         dialogType: "dialog",
         dialogClickModal: false,
+        searchEnter:true,
         addBtn: false,
         viewBtn: false,
         editBtn: false,

src/views/feedback/list.vue

@@ -117,6 +117,7 @@ export default {
                 refreshBtn: false,
                 columnBtn: false,
                 menuWidth: 240,
+                searchEnter:true,
                 column: [
                     {
                         label: "意见单号",

src/views/goodsManagement/examineList.vue

@@ -170,6 +170,7 @@ export default {
                 refreshBtn: false,
                 columnBtn: false,
                 menuWidth: 240,
+                searchEnter:true,
                 column: [
                     {
                         label: "申领人",

src/views/goodsManagement/goodsList.vue

@@ -348,6 +348,7 @@ export default {
         refreshBtn: false,
         columnBtn: false,
         menuWidth: 300,
+        searchEnter:true,
         column: [
           {
             label: "库存ID",

src/views/goodsManagement/reciviceList.vue

@@ -32,8 +32,8 @@
           :tree-options="treeOptions" :default-value="searchFrom.bigClassId.node"></SelectTree>
       </template>
       <template slot-scope="{row}" slot="timeRangeSearch">
-        <el-date-picker v-model="searchFrom.timeRange" type="daterange" range-separator="至" start-placeholder="开始日期"
+        <el-date-picker v-model="searchFrom.timeRange" type="daterange" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期"
-          end-placeholder="结束日期">
+          end-placeholder="结束日期" >
         </el-date-picker>
       </template>
       <!-- <template slot-scope="scope" slot="menuLeft">
@@ -91,6 +91,7 @@
 import SelectTree from '../../components/selectTree/tree.vue'
 import { getReciviceList, getDetail, reciveGoods, returnGoods } from '@/api/goodsManagement/recivice'
 import { mapGetters } from "vuex";
+import { dateFormat } from "../../util/date";
 export default {
   components: {
     SelectTree
@@ -197,6 +198,7 @@ export default {
         refreshBtn: false,
         columnBtn: false,
         menuWidth: 200,
+        searchEnter:true,
         column: [
           {
             label: "申领单号",
@@ -208,7 +210,7 @@ export default {
             label: "申领人",
             labelWidth: 120,
             prop: "applyUser",
-            // search: true,
+            search: true,
             overHidden: true,
           },
           //
@@ -240,6 +242,7 @@ export default {
             labelWidth: 120,
             prop: "applyTypeNum",
             overHidden: true,
+
           },
           {
             label: "申领时间",
@@ -247,6 +250,34 @@ export default {
             prop: "applyTime",
             overHidden: true,
           },
+          {
+            label: "申领时间",
+            prop: "timeRange",
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd",
+            search: true,
+            hide: true,
+            viewDisplay: false,
+            searchValue: dateFormat(new Date(), "yyyy-MM-dd"),
+            searchClearable: false,
+          },
+          {
+            label: "仓库编号",
+            labelWidth: 120,
+            prop: "applyUser",
+            search: true,
+            hide: true,
+            viewDisplay: false,
+          },
+          {
+            label: "物料名称",
+            labelWidth: 120,
+            prop: "applyUser",
+            search: true,
+            hide: true,
+            viewDisplay: false,
+          },
           {
             label: "是否需要归还",
             labelWidth: 150,
@@ -537,14 +568,16 @@ export default {
       //     { goodsId: 'WPID-001', goodsNo: 'WL-20240820-01', goodsName: '钻头', goodsTypeName: '耗材', majorTypeName: '开孔', brand: '德力西', model: '50mm', parameter: '', applyNumber: 30, applyTime: '2024-07-12', applyUser: '',isReturn:1, unit: '件', },
       //     { goodsId: 'WPID-002', goodsNo: 'WL-20240820-02', goodsName: '开孔器', goodsTypeName: '耗材', majorTypeName: '开孔', brand: '德力西', model: '50mm', parameter: '', applyNumber: 60, applyTime: '2024-07-12', applyUser: '',isReturn:2, unit: '件', },
       // ]
+
       console.log('searchForm-------->', this.searchFrom)
       let query = {
         current: this.page.currentPage,
         size: this.page.pageSize,
-        startTime: this.searchFrom.timeRange.length != 0 ? this.searchFrom.timeRange[0] : null,
+        startTime: this.searchFrom.timeRange&&this.searchFrom.timeRange.length != 0 ? this.searchFrom.timeRange[0].toString()+ ' 00:00:00' : null,
-        endTime: this.searchFrom.timeRange.length != 0 ? this.searchFrom.timeRange[1] : null,
+        endTime: this.searchFrom.timeRange&&this.searchFrom.timeRange.length != 0 ? this.searchFrom.timeRange[1].toString() + ' 23:59:59' : null,
         isReturn: this.searchFrom.isReturn ? this.searchFrom.isReturn : null,
-        dataType:this.dataTypes
+        dataType:this.dataTypes,
+        applyUser:this.searchFrom.applyUser
       }
       getReciviceList(query).then(res => {
         this.data = res.data.data.records

src/views/goodsManagement/warehouseList.vue

@@ -109,6 +109,7 @@ export default {
         columnBtn: false,
         menuWidth: 400,
         selection: true,
+        searchEnter:true,
         column: [
           {
             label: "仓库编码",

src/views/knowledge/list.vue

@@ -82,6 +82,7 @@ export default {
         cancelBtn: false,
         dialogType: 'dialog',
         dialogClickModal: false,
+        searchEnter:true,
         column: [
           {
             label: "知识类别",

src/views/labManagement/inspectionManagement.vue

@@ -145,6 +145,7 @@ export default {
         excelBtn: false,       // 导出Excel
         printBtn: false,       // 表格打印导出
         filterBtn: false,      // 筛选
+        searchEnter:true,
         column: [
           {
             label: "巡检计划单号",

src/views/operation/hand.vue

@@ -522,6 +522,7 @@ export default {
         selection: true,
         searchShow: true,
         searchMenuSpan: 6,
+        searchEnter:true,
         border: true,
         index: true,
         dialogType: "dialog",

src/views/system/check.vue

@@ -76,6 +76,7 @@ export default {
         addBtn: false,
         menuWidth: 300,
         dialogClickModal: false,
+        searchEnter:true,
         column: [
           {
             label: '账号',

src/views/system/client.vue

@@ -58,6 +58,7 @@
           viewBtn: true,
           selection: true,
           dialogClickModal: false,
+          searchEnter:true,
           column: [
             {
               label: "应用id",

src/views/system/dept.vue

@@ -70,6 +70,7 @@ export default {
         menuWidth: 300,
         addBtn: true,
         dialogClickModal: false,
+        searchEnter:true,
         column: [
           {
             label: "机构名称",

src/views/system/menu.vue

@@ -82,6 +82,7 @@
           viewBtn: true,
           menuWidth: 300,
           dialogClickModal: false,
+          searchEnter:true,
           column: [
             {
               label: "菜单名称",

src/views/system/post.vue

@@ -63,6 +63,7 @@
           viewBtn: true,
           selection: true,
           dialogClickModal: false,
+          searchEnter:true,
           column: [
             {
               label: "所属租户",

src/views/system/tenant.vue

@@ -208,6 +208,7 @@ export default {
         menuWidth: 380,
         dialogWidth: 900,
         dialogClickModal: false,
+        searchEnter:true,
         column: [
           {
             label: "租户ID",

src/views/system/user.vue

@@ -238,6 +238,7 @@ export default {
         excelBtn: false,       // 导出Excel
         printBtn: false,       // 表格打印导出
         filterBtn: false,      // 筛选
+        searchEnter:true,
         column: [
           {
             label: "登录账号",

src/views/workbench/index.vue

@@ -47,7 +47,7 @@
             <div class="xj_tit">信息公示</div>
             <div class="xj_con">
               <vueSeamless v-if="publicInfo.length >= 1" :data="publicInfo" :class-option="alarmOption"
-                class="xj_con_box">
+                class="xj_con_box" ref="scrollContainer">
                 <div class="xj_item" v-for="item in publicInfo" :key="item.name" @click="pageType(item)">
                   <div class="xj_top">
                     <div class="tit_box">