From 51b9e548b0e533e8a415ce141808f2bb747b381e Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期一, 18 三月 2024 16:08:49 +0800
Subject: [PATCH] 1、mdc菜单下除特殊要求外,页面表格最少条数由10条调整为30条,每页最多条数区间由[10,20,30]调整为[30,50,100] 2、OEE基础管理和数据报表模块增加打印按钮,实现打印表格数据功能 3、设备管理、数据报表模块增加按照设备级别和设备类型查询表格数据 4、设备车间管理页面增加车间编码字段 5、修改组件名称以试图解决刷新后进入请求json页面问题

---
 src/views/mdc/base/modules/DeviceProcessReport/DeviceProcessReportList.vue |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/views/mdc/base/modules/DeviceProcessReport/DeviceProcessReportList.vue b/src/views/mdc/base/modules/DeviceProcessReport/DeviceProcessReportList.vue
index f6ae0f2..10b3f60 100644
--- a/src/views/mdc/base/modules/DeviceProcessReport/DeviceProcessReportList.vue
+++ b/src/views/mdc/base/modules/DeviceProcessReport/DeviceProcessReportList.vue
@@ -5,7 +5,7 @@
         <div class="table-page-search-wrapper">
           <a-form layout="inline" @keyup.enter.native="searchQuery">
             <a-row :gutter="24">
-              <a-col :md="5" :sm="5" :xs="5">
+              <a-col :md="4" :sm="4" :xs="4">
                 <a-form-item label="椹卞姩绫诲瀷">
                   <a-auto-complete
                     v-model="queryParam.driveType"
@@ -17,7 +17,20 @@
                 </a-form-item>
               </a-col>
 
-              <a-col :md="7" :sm="7" :xs="7">
+              <a-col :md="4" :sm="4" :xs="4">
+                <a-form-item label="璁惧绾у埆">
+                  <j-dict-select-tag placeholder="璇烽�夋嫨璁惧绾у埆" dictCode="device_level" v-model="queryParam.deviceLevel"
+                                     allow-clear/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="4" :sm="4" :xs="4">
+                <a-form-item label="璁惧绉嶇被">
+                  <j-dict-select-tag placeholder="璇烽�夋嫨璁惧绉嶇被" dictCode="device_category" v-model="queryParam.deviceCategory"
+                                     allow-clear/>
+                </a-form-item>
+              </a-col>
+
+              <a-col :md="5" :sm="5" :xs="5">
                 <a-form-item label="鏃堕棿">
                   <a-range-picker
                     :placeholder="['寮�濮嬫椂闂�', '缁撴潫鏃堕棿']"
@@ -33,6 +46,7 @@
                   <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
                   <a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button>
                   <a-button type="primary" @click="exportExcel" icon="download">瀵煎嚭</a-button>
+                  <a-button type="primary" icon="printer" v-print="'#EfficiencyShift'" v-has="'deviceProcess:print'">鎵撳嵃</a-button>
                 </a-space>
               </a-col>
             </a-row>

--
Gitblit v1.9.3