From 8beb8b143ecb6cd5ac5617d6329d8127303ea438 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 18 Aug 2023 14:37:42 +0800
Subject: [PATCH] =?UTF-8?q?fixed:=E7=BB=9F=E4=B8=80=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=A1=86=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                             |   4 +
 src/views/em/equipment.vue              |  15 +-
 src/views/em/mpoint.vue                 |  11 +-
 src/views/enm_coal/handoverLog.vue      | 314 ++++++++++++----------
 src/views/enm_coal/teamAnalysis.vue     |   2 +-
 src/views/enm_coal/workshopAnalysis.vue |   2 +-
 src/views/enm_kiln/handoverLog.vue      | 340 +++++++++++++-----------
 src/views/enm_kiln/teamAnalysis.vue     |   2 +-
 src/views/enm_kiln/workshopAnalysis.vue |   2 +-
 src/views/enm_mill/handoverLog.vue      |  98 ++++---
 src/views/enm_mill/teamAnalysis.vue     |   2 +-
 src/views/enm_mill/workshopAnalysis.vue |   2 +-
 src/views/enm_pack/handoverLog.vue      | 192 +++++++------
 src/views/enm_pack/teamAnalysis.vue     |   2 +-
 src/views/enm_pack/workshopAnalysis.vue |   2 +-
 src/views/enm_rm/handoverLog.vue        |  61 +++--
 src/views/enm_rm/teamAnalysis.vue       |   2 +-
 src/views/enm_rm/workshopAnalysis.vue   |  14 +-
 src/views/enm_slag/handoverLog.vue      | 196 ++++++++------
 src/views/enm_slag/teamAnalysis.vue     |   2 +-
 src/views/enm_slag/workshopAnalysis.vue |  14 +-
 src/views/ungrouped/costing.vue         |   8 +-
 src/views/ungrouped/energy.vue          |   7 +-
 src/views/ungrouped/feeset.vue          |  31 ++-
 src/views/ungrouped/goalSetting.vue     |  81 +++---
 src/views/ungrouped/material.vue        |  15 +-
 src/views/ungrouped/mgroup.vue          |  13 +-
 src/views/ungrouped/priceset.vue        |  25 +-
 src/views/ungrouped/quality.vue         |  14 +-
 src/views/ungrouped/report.vue          |   3 +-
 src/views/ungrouped/team.vue            |  21 +-
 31 files changed, 838 insertions(+), 659 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 519ba75d..cc342659 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -43,6 +43,10 @@
 
 <style lang="scss">
 	@import '@/style/style.scss';
+	.headerSearch{
+		width: 120px!important;
+		margin-right: 5px;
+	}
 	.printWrap{
         width: 100%;
         overflow-x: scroll;
diff --git a/src/views/em/equipment.vue b/src/views/em/equipment.vue
index 899953cb..8828edde 100644
--- a/src/views/em/equipment.vue
+++ b/src/views/em/equipment.vue
@@ -2,22 +2,20 @@
   <el-container>
     <el-header>
       <div class="left-panel">
-        <el-button type="primary" icon="el-icon-plus" @click="add"></el-button>
-      </div>
-      <div class="right-panel">
-        <div class="right-panel-search">
-          <el-input
+        <el-input
             v-model="query.search"
             placeholder="名称"
             clearable
-            @keyup.enter="handleQuery"
+            style="margin-right: 5px;"
           ></el-input>
           <el-button
             type="primary"
             icon="el-icon-search"
             @click="handleQuery"
           ></el-button>
-        </div>
+      </div>
+      <div class="right-panel">
+        <el-button type="primary" icon="el-icon-plus" @click="add" v-auth="'equipment.create'"></el-button>
       </div>
     </el-header>
     <el-main class="nopadding">
@@ -75,12 +73,15 @@
             <el-link
               type="primary"
               @click="table_edit(scope.row)"
+              v-auth="'equipment.update'"
             >
               编辑
             </el-link>
+            <el-divider direction="vertical"></el-divider>
             <el-link
               type="danger"
               @click="table_del(scope.row)"
+              v-auth="'equipment.delete'"
             >
               删除
             </el-link>
diff --git a/src/views/em/mpoint.vue b/src/views/em/mpoint.vue
index 3b7c2c37..bf632340 100644
--- a/src/views/em/mpoint.vue
+++ b/src/views/em/mpoint.vue
@@ -6,15 +6,16 @@
             v-model="query.search"
             placeholder="名称"
             clearable
-            @keyup.enter="handleQuery"
+            style="margin-right: 5px;"
           ></el-input>
-
           <el-button
             type="primary"
             icon="el-icon-search"
             @click="handleQuery"
           ></el-button>
-        <el-button type="primary" icon="el-icon-plus" @click="table_add"></el-button>
+      </div>
+      <div class="right-panel">
+			  <el-button type="primary" icon="el-icon-plus" @click="table_add" v-auth="'mpoint.create'"></el-button>
       </div>
     </el-header>
     <el-main class="nopadding">
@@ -27,11 +28,11 @@
 				<el-table-column label="创建时间" prop="create_time" min-width="150"></el-table-column>
 				<el-table-column label="操作" fixed="right" align="center" width="140">
 					<template #default="scope">
-						<el-button link size="small" @click="table_edit(scope.row)" v-auth="'team.update'" type="primary">编辑</el-button>
+						<el-button link size="small" @click="table_edit(scope.row)" v-auth="'mpoint.update'" type="primary">编辑</el-button>
 						<el-divider direction="vertical"></el-divider>
 						<el-popconfirm title="确定删除吗？" @confirm="table_del(scope.row, scope.$index)">
 							<template #reference>
-								<el-button link size="small" v-auth="'role.delete'" type="danger">删除</el-button>
+								<el-button link size="small" v-auth="'mpoint.delete'" type="danger">删除</el-button>
 							</template>
 						</el-popconfirm>
 					</template>
diff --git a/src/views/enm_coal/handoverLog.vue b/src/views/enm_coal/handoverLog.vue
index a386155a..9feefcbf 100644
--- a/src/views/enm_coal/handoverLog.vue
+++ b/src/views/enm_coal/handoverLog.vue
@@ -1,143 +1,152 @@
 <template>
-    <el-container>
-      <el-header>
-            <div class="left-panel">
-              <div style="margin-right: 20px">交接班日志</div>
-              <el-date-picker
-                    v-model="query.time"
-                    type="date"
-                    value-format="YYYY-MM-DD"
-                    format="YYYY-MM-DD"
-                    placeholder="日志时间"
-                />
-              <el-select
-                  v-model="query.shift"
-                  placeholder="班次"
-                  clearable
-                  style="margin-left: 2px; width: 120px"
-              >
-                  <el-option
-                      v-for="item in optionsShift"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                  ></el-option>
-              </el-select>
-              <el-select
-                  v-model="query.team"
-                  placeholder="班组"
-                  clearable
-                  style="margin-left: 2px; width: 120px"
-              >
-                  <el-option
-                      v-for="item in options"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                  ></el-option>
-              </el-select>
-              <el-button
-                  type="primary"
-                  icon="el-icon-search"
-                  @click="handleQuery"
-              ></el-button>
+  <el-container>
+    <el-header>
+      <div class="left-panel">
+        <div style="margin-right: 20px">交接班日志</div>
+        <el-date-picker
+            v-model="query.start_time__gte"
+            type="date"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            format="YYYY-MM-DD"
+            placeholder="开始时间"
+            style=" width: 120px"
+        />
+        <el-date-picker
+            v-model="query.end_time__lt"
+            type="date"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            format="YYYY-MM-DD"
+            placeholder="结束时间"
+            style="margin-left: 2px; width: 120px"
+        />
+        <el-select
+            v-model="query.shift"
+            placeholder="班次"
+            clearable
+            style="margin-left: 2px; width: 120px"
+        >
+            <el-option
+                v-for="item in optionsShift"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+            ></el-option>
+        </el-select>
+        <el-select
+            v-model="query.team"
+            placeholder="班组"
+            clearable
+            style="margin-left: 2px; width: 120px"
+        >
+            <el-option
+                v-for="item in options"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+            ></el-option>
+        </el-select>
+        <el-button
+            type="primary"
+            icon="el-icon-search"
+            @click="handleQuery"
+        ></el-button>
+      </div>
+    </el-header>
+    <el-main class="nopadding">
+      <scTable
+        ref="table"
+        :apiObj="apiObj"
+        row-key="id"
+        stripe
+        :params="query"
+        highlightCurrentRow
+        @row-click="rowClick"
+      >
+          <el-table-column type="index" width="50"/>
+          <!-- <el-table-column label="关联工段" prop="mgroup_name"></el-table-column> -->
+          <el-table-column label="开始时间" prop="start_time">
+              <template #default="scope">
+                  <span>{{ scope.row.start_time.slice(0,16)}}</span>
+              </template>
+          </el-table-column>
+          <el-table-column label="结束时间" prop="end_time">
+              <template #default="scope">
+                  <span>{{ scope.row.end_time.slice(0,16)}}</span>
+              </template>
+          </el-table-column>
+          <el-table-column label="班组名称" prop="team_name"></el-table-column>
+          <el-table-column label="当前班次" prop="shift_name"></el-table-column>
+          <el-table-column label="班长" prop="leader_name"></el-table-column>
+          
+          <el-table-column label="检验时间">
+              <template #default="scope">
+                  <span v-if="scope.row.last_test_time">{{ scope.row.last_test_time.slice(0,16)}}</span>
+              </template>
+          </el-table-column>
+          <el-table-column label="操作" fixed="right" align="center" width="140">
+            <template #default="scope">
+              <el-button link size="small" @click="sflog_edit(scope.row)" type="primary">编辑</el-button>
+              <el-button link size="small" @click="sflog_check(scope.row)" type="primary">质量检验</el-button>
+              <el-button link size="small" @click="sflog_other(scope.row)" type="primary">其他能源</el-button>
+              <el-button link size="small" @click="sflog_export(scope.row)" type="success">报表</el-button>
+            </template>
+          </el-table-column>
+      </scTable>
+    </el-main>
+    <el-drawer v-model="limitedExport" size="60%" :show-close="false">
+      <template #header="{ close, titleId, titleClass }">
+        <h4 :id="titleId" :class="titleClass">交接班日志</h4>
+        <el-button type="danger" @click="close">
+          <el-icon class="el-icon--left"><CircleCloseFilled /></el-icon>
+          关闭
+        </el-button>
+      </template>
+      <el-main class="nopadding">
+          <div ref="print" id="myReport" class="printContainer">
+            <div style="margin-right: 20px;text-align: center;font-size: 16px;font-weight: bold;margin-bottom: 20px;">
+              <span v-if="sflogItem.end_time">{{sflogItem.end_time.slice(0,10)}}{{ sflogItem.shift_name }}</span>
+              <span v-if="sflogItem.team_name">{{ sflogItem.team_name }}</span>
+              交接班记录
             </div>
-          </el-header>
-          <el-main class="nopadding">
-            <scTable
-              ref="table"
-              :apiObj="apiObj"
-              row-key="id"
-              stripe
-              :params="query"
-              highlightCurrentRow
-              @row-click="rowClick"
-            >
-                <el-table-column type="index" width="50"/>
-                <!-- <el-table-column label="关联工段" prop="mgroup_name"></el-table-column> -->
-                <el-table-column label="开始时间" prop="start_time">
-                    <template #default="scope">
-                        <span>{{ scope.row.start_time.slice(0,16)}}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="结束时间" prop="end_time">
-                    <template #default="scope">
-                        <span>{{ scope.row.end_time.slice(0,16)}}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="班组名称" prop="team_name" width="80"></el-table-column>
-                <el-table-column label="当前班次" prop="shift_name" width="80"></el-table-column>
-                <el-table-column label="班长" prop="leader_name" width="80"></el-table-column>
-                
-                <el-table-column label="检验时间">
-                    <template #default="scope">
-                        <span v-if="scope.row.last_test_time">{{ scope.row.last_test_time.slice(0,16)}}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="操作" fixed="right" align="center" width="140">
-                  <template #default="scope">
-                    <el-button link size="small" @click="sflog_edit(scope.row)" type="primary">编辑</el-button>
-                    <el-button link size="small" @click="sflog_check(scope.row)" type="primary">质量检验</el-button>
-                    <el-button link size="small" @click="sflog_other(scope.row)" type="primary">其他能源</el-button>
-                    <el-button link size="small" @click="sflog_export(scope.row)" type="success">报表</el-button>
-                  </template>
-                </el-table-column>
-            </scTable>
-          </el-main>
-      <el-drawer v-model="limitedExport" size="60%" :show-close="false">
-        <template #header="{ close, titleId, titleClass }">
-          <h4 :id="titleId" :class="titleClass">交接班日志</h4>
-          <el-button type="danger" @click="close">
-            <el-icon class="el-icon--left"><CircleCloseFilled /></el-icon>
-            关闭
-          </el-button>
-        </template>
-        <el-main class="nopadding">
-            <div ref="print" id="myReport" class="printContainer">
-              <div style="margin-right: 20px;text-align: center;font-size: 16px;font-weight: bold;margin-bottom: 20px;">
-                <span v-if="sflogItem.end_time">{{sflogItem.end_time.slice(0,10)}}{{ sflogItem.shift_name }}</span>
-                <span v-if="sflogItem.team_name">{{ sflogItem.team_name }}</span>
-                交接班记录
-              </div>
-              <h3 style="text-align: center;display: flex;justify-content: space-around;">
-                  <span>2023.06.21</span>
-                  <span>白班</span>
-                  <span>甲班</span>    
-              </h3>
-              <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable">
-                  <tbody>
-                      <tr>
-                          <td class="numCell">产量（t）</td>
-                          <td class="numCell">{{value1}}</td>
-                          <td class="numCell">台时（t/h）</td>
-                          <td class="numCell">{{value3}}</td>
-                          <td class="numCell">运转时间（h）</td>
-                          <td class="numCell">{{value5}}</td>
-                      </tr>
-                      <tr>
-                          <td class="numCell">运转率（%）</td>
-                          <td class="numCell">{{value1}}</td>
-                          <td class="numCell">停机时长（h）</td>
-                          <td class="numCell">{{value3}}</td>
-                          <td class="numCell">煤磨分布电耗（KW·h/t）</td>
-                          <td class="numCell">{{value5}}</td>
-                      </tr>
-                      <tr>
-                          <td class="numCell">煤粉细度合格率（%）</td>
-                          <td class="numCell">{{value1}}</td>
-                          <td class="numCell">煤粉水分合格率（%）</td>
-                          <td class="numCell">{{value5}}</td>
-                      </tr>
-                      <tr>
-                          <td class="numCell">生产情况记录</td>
-                          <td class="numCell" colspan="5">时间、类别、原因、处置措施、处置人</td>
-                      </tr>
-                  </tbody>
-              </table>
-            </div>
-        </el-main>
-      </el-drawer>
-    </el-container>
+            <h3 style="text-align: center;display: flex;justify-content: space-around;">
+                <span>2023.06.21</span>
+                <span>白班</span>
+                <span>甲班</span>    
+            </h3>
+            <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable">
+                <tbody>
+                    <tr>
+                        <td class="numCell">产量（t）</td>
+                        <td class="numCell">{{value1}}</td>
+                        <td class="numCell">台时（t/h）</td>
+                        <td class="numCell">{{value3}}</td>
+                        <td class="numCell">运转时间（h）</td>
+                        <td class="numCell">{{value5}}</td>
+                    </tr>
+                    <tr>
+                        <td class="numCell">运转率（%）</td>
+                        <td class="numCell">{{value1}}</td>
+                        <td class="numCell">停机时长（h）</td>
+                        <td class="numCell">{{value3}}</td>
+                        <td class="numCell">煤磨分布电耗（KW·h/t）</td>
+                        <td class="numCell">{{value5}}</td>
+                    </tr>
+                    <tr>
+                        <td class="numCell">煤粉细度合格率（%）</td>
+                        <td class="numCell">{{value1}}</td>
+                        <td class="numCell">煤粉水分合格率（%）</td>
+                        <td class="numCell">{{value5}}</td>
+                    </tr>
+                    <tr>
+                        <td class="numCell">生产情况记录</td>
+                        <td class="numCell" colspan="5">时间、类别、原因、处置措施、处置人</td>
+                    </tr>
+                </tbody>
+            </table>
+          </div>
+      </el-main>
+    </el-drawer>
+  </el-container>
     <save-dialog
       v-if="dialog.save"
       ref="saveDialog"
@@ -157,8 +166,8 @@
       @success="handleCheckSuccess"
       @closed="dialog.save = false"
     ></quastat-dialog>
-  </template>
-  <script>
+</template>
+<script>
   import saveDialog from "./../enm_rm/handover_form.vue";
   import quastatDialog from "./../enm_rm/quastat_form.vue";
   import otherDialog from "./../enm_rm/other_form.vue";
@@ -174,6 +183,10 @@
         apiObj: this.$API.wpm.sflog.list,
         apiObj2: null,
         query: {
+          shift:'',
+          team:'',
+          end_time__lt:'',
+          start_time__gte:'',
           mgroup:'3347217512021835776',
         },
         deptId :'3347207082608115712',
@@ -197,8 +210,27 @@
         limitedExport:false,
       };
     },
-   
+   mounted(){
+      this.getTeam();
+      this.getShfit();
+   },
     methods: {
+      getTeam(){
+        let form ={};
+        form.page = 0;
+        form.belong_dept = this.deptId;
+        this.$API.mtm.team.list.req(form).then(res=>{
+          this.options = res;
+        })
+      },
+      getShfit(){
+        this.$API.mtm.shift.req({page:0}).then(res=>{
+          this.optionsShift = res;
+        })
+      },
+      handleQuery(){
+        this.$refs.table.queryData(this.query);
+      },
       sflog_export(){
         this.limitedExport = true;
       },
diff --git a/src/views/enm_coal/teamAnalysis.vue b/src/views/enm_coal/teamAnalysis.vue
index 5982127a..df08ec8b 100644
--- a/src/views/enm_coal/teamAnalysis.vue
+++ b/src/views/enm_coal/teamAnalysis.vue
@@ -8,7 +8,7 @@
                     value-format="YYYY"
                     format="YYYY"
                     placeholder="查询年份"
-                    style="margin-right: 6px;"
+                    class="headerSearch"
                 />
                 <el-button
                     type="primary"
diff --git a/src/views/enm_coal/workshopAnalysis.vue b/src/views/enm_coal/workshopAnalysis.vue
index 205f7adf..35a1bf68 100644
--- a/src/views/enm_coal/workshopAnalysis.vue
+++ b/src/views/enm_coal/workshopAnalysis.vue
@@ -8,7 +8,7 @@
                 value-format="YYYY"
                 format="YYYY"
                 placeholder="查询年份"
-                style="margin-right: 6px;"
+                class="headerSearch"
             />
             <el-button
                 type="primary"
diff --git a/src/views/enm_kiln/handoverLog.vue b/src/views/enm_kiln/handoverLog.vue
index 50ce3ad0..8bc204c9 100644
--- a/src/views/enm_kiln/handoverLog.vue
+++ b/src/views/enm_kiln/handoverLog.vue
@@ -1,160 +1,169 @@
 <template>
     <el-container>
       <el-header>
-            <div class="left-panel">
-              <div style="margin-right: 20px">交接班日志</div>
-              <el-date-picker
-                    v-model="query.time"
-                    type="date"
-                    value-format="YYYY-MM-DD"
-                    format="YYYY-MM-DD"
-                    placeholder="日志时间"
-                />
-              <el-select
-                  v-model="query.shift"
-                  placeholder="班次"
-                  clearable
-                  style="margin-left: 2px; width: 120px"
-              >
-                  <el-option
-                      v-for="item in optionsShift"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                  ></el-option>
-              </el-select>
-              <el-select
-                  v-model="query.team"
-                  placeholder="班组"
-                  clearable
-                  style="margin-left: 2px; width: 120px"
-              >
-                  <el-option
-                      v-for="item in options"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                  ></el-option>
-              </el-select>
-              <el-button
-                  type="primary"
-                  icon="el-icon-search"
-                  @click="handleQuery"
-              ></el-button>
+          <div class="left-panel">
+            <div style="margin-right: 20px">交接班日志</div>
+            <el-date-picker
+              v-model="query.start_time__gte"
+              type="date"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              format="YYYY-MM-DD"
+              placeholder="开始时间"
+              style=" width: 120px"
+          />
+          <el-date-picker
+              v-model="query.end_time__lt"
+              type="date"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              format="YYYY-MM-DD"
+              placeholder="结束时间"
+              style="margin-left: 2px; width: 120px"
+          />
+        <el-select
+            v-model="query.shift"
+            placeholder="班次"
+            clearable
+            style="margin-left: 2px; width: 120px"
+        >
+            <el-option
+                v-for="item in optionsShift"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+            ></el-option>
+        </el-select>
+        <el-select
+            v-model="query.team"
+            placeholder="班组"
+            clearable
+            style="margin-left: 2px; width: 120px"
+        >
+            <el-option
+                v-for="item in options"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+            ></el-option>
+        </el-select>
+        <el-button
+            type="primary"
+            icon="el-icon-search"
+            @click="handleQuery"
+        ></el-button>
+      </div>
+    </el-header>
+    <el-main class="nopadding">
+      <scTable
+        ref="table"
+        :apiObj="apiObj"
+        row-key="id"
+        stripe
+        :params="query"
+        highlightCurrentRow
+        @row-click="rowClick"
+      >
+          <el-table-column type="index" width="50"/>
+          <!-- <el-table-column label="关联工段" prop="mgroup_name"></el-table-column> -->
+          <el-table-column label="开始时间" prop="start_time">
+              <template #default="scope">
+                  <span>{{ scope.row.start_time.slice(0,16)}}</span>
+              </template>
+          </el-table-column>
+          <el-table-column label="结束时间" prop="end_time">
+              <template #default="scope">
+                  <span>{{ scope.row.end_time.slice(0,16)}}</span>
+              </template>
+          </el-table-column>
+          <el-table-column label="班组名称" prop="team_name" width="80"></el-table-column>
+          <el-table-column label="当前班次" prop="shift_name" width="80"></el-table-column>
+          <el-table-column label="班长" prop="leader_name" width="80"></el-table-column>
+          
+          <el-table-column label="检验时间">
+              <template #default="scope">
+                  <span v-if="scope.row.last_test_time">{{ scope.row.last_test_time.slice(0,16)}}</span>
+              </template>
+          </el-table-column>
+          <el-table-column label="操作" fixed="right" align="center" width="140">
+            <template #default="scope">
+              <el-button link size="small" @click="sflog_edit(scope.row)" type="primary">编辑</el-button>
+              <el-button link size="small" @click="sflog_check(scope.row)" type="primary">质量检验</el-button>
+              <el-button link size="small" @click="sflog_other(scope.row)" type="primary">其他能源</el-button>
+              <el-button link size="small" @click="sflog_export(scope.row)" type="success">报表</el-button>
+            </template>
+          </el-table-column>
+      </scTable>
+    </el-main>
+    <el-drawer v-model="limitedExport" size="60%" :show-close="false">
+      <template #header="{ close, titleId, titleClass }">
+        <h4 :id="titleId" :class="titleClass">交接班日志</h4>
+        <el-button type="danger" @click="close">
+          <el-icon class="el-icon--left"><CircleCloseFilled /></el-icon>
+          关闭
+        </el-button>
+      </template>
+      <el-main class="nopadding">
+          <div ref="print" id="myReport" class="printContainer">
+            <div style="margin-right: 20px;text-align: center;font-size: 16px;font-weight: bold;margin-bottom: 20px;">
+              <span v-if="sflogItem.end_time">{{sflogItem.end_time.slice(0,10)}}{{ sflogItem.shift_name }}</span>
+              <span v-if="sflogItem.team_name">{{ sflogItem.team_name }}</span>
+              交接班记录
             </div>
-          </el-header>
-          <el-main class="nopadding">
-            <scTable
-              ref="table"
-              :apiObj="apiObj"
-              row-key="id"
-              stripe
-              :params="query"
-              highlightCurrentRow
-              @row-click="rowClick"
-            >
-                <el-table-column type="index" width="50"/>
-                <!-- <el-table-column label="关联工段" prop="mgroup_name"></el-table-column> -->
-                <el-table-column label="开始时间" prop="start_time">
-                    <template #default="scope">
-                        <span>{{ scope.row.start_time.slice(0,16)}}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="结束时间" prop="end_time">
-                    <template #default="scope">
-                        <span>{{ scope.row.end_time.slice(0,16)}}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="班组名称" prop="team_name" width="80"></el-table-column>
-                <el-table-column label="当前班次" prop="shift_name" width="80"></el-table-column>
-                <el-table-column label="班长" prop="leader_name" width="80"></el-table-column>
-                
-                <el-table-column label="检验时间">
-                    <template #default="scope">
-                        <span v-if="scope.row.last_test_time">{{ scope.row.last_test_time.slice(0,16)}}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="操作" fixed="right" align="center" width="140">
-                  <template #default="scope">
-                    <el-button link size="small" @click="sflog_edit(scope.row)" type="primary">编辑</el-button>
-                    <el-button link size="small" @click="sflog_check(scope.row)" type="primary">质量检验</el-button>
-                    <el-button link size="small" @click="sflog_other(scope.row)" type="primary">其他能源</el-button>
-                    <el-button link size="small" @click="sflog_export(scope.row)" type="success">报表</el-button>
-                  </template>
-                </el-table-column>
-            </scTable>
-          </el-main>
-      <el-drawer v-model="limitedExport" size="60%" :show-close="false">
-        <template #header="{ close, titleId, titleClass }">
-          <h4 :id="titleId" :class="titleClass">交接班日志</h4>
-          <el-button type="danger" @click="close">
-            <el-icon class="el-icon--left"><CircleCloseFilled /></el-icon>
-            关闭
-          </el-button>
-        </template>
-        <el-main class="nopadding">
-            <div ref="print" id="myReport" class="printContainer">
-              <div style="margin-right: 20px;text-align: center;font-size: 16px;font-weight: bold;margin-bottom: 20px;">
-                <span v-if="sflogItem.end_time">{{sflogItem.end_time.slice(0,10)}}{{ sflogItem.shift_name }}</span>
-                <span v-if="sflogItem.team_name">{{ sflogItem.team_name }}</span>
-                交接班记录
-              </div>
-              <h3 style="text-align: center;display: flex;justify-content: space-around;">
-                  <span>2023.06.21</span>
-                  <span>白班</span>
-                  <span>甲班</span>    
-              </h3>
-              <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable">
-                  <tbody>
-                      <tr>
-                          <td class="numCell">产量（t）</td>
-                          <td class="numCell">{{value1}}</td>
-                          <td class="numCell">台时（t/h）</td>
-                          <td class="numCell">{{value3}}</td>
-                          <td class="numCell">运转时间（h）</td>
-                          <td class="numCell">{{value5}}</td>
-                      </tr>
-                      <tr>
-                          <td class="numCell">运转率（%）</td>
-                          <td class="numCell">{{value1}}</td>
-                          <td class="numCell">停机时长（h）</td>
-                          <td class="numCell">{{value3}}</td>
-                          <td class="numCell">单位产品分布电耗（KW·h/t）</td>
-                          <td class="numCell">{{value5}}</td>
-                      </tr>
-                      <tr>
-                          <td class="numCell">单位产品标煤耗（kgce/t）</td>
-                          <td class="numCell">{{value1}}</td>
-                          <td class="numCell">熟料立升重合格率</td>
-                          <td class="numCell">{{value3}}</td>
-                          <td class="numCell">熟料f-CaO合格率</td>
-                          <td class="numCell">{{value5}}</td>
-                      </tr>
-                      <tr>
-                         <td class="numCell">入窑生料细度合格率（%）</td>
-                          <td class="numCell">{{value5}}</td>
-                          <td class="numCell">入窑生料CaO合格率（%）</td>
-                          <td class="numCell">{{value1}}</td>
-                          <td class="numCell">入窑生料Fe₂O₃合格率（%）</td>
-                          <td class="numCell">{{value3}}</td>
-                      </tr>
-                      <tr>
-                          <td class="numCell">入窑生料水分合格率（%）</td>
-                          <td class="numCell">{{value1}}</td>
-                          <td class="numCell">单位成本（元/吨）</td>
-                          <td class="numCell">{{value3}}</td>
-                          <td class="numCell"></td>
-                          <td class="numCell"></td>
-                      </tr>
-                      <tr>
-                          <td class="numCell">生产情况记录</td>
-                          <td class="numCell" colspan="5">时间、类别、原因、处置措施、处置人</td>
-                      </tr>
-                  </tbody>
-              </table>
-            </div>
-        </el-main>
-      </el-drawer>
+            <h3 style="text-align: center;display: flex;justify-content: space-around;">
+                <span>2023.06.21</span>
+                <span>白班</span>
+                <span>甲班</span>    
+            </h3>
+            <table border="1" width="1000" cellspacing="0" :key="timeStamp" id="myTable">
+                <tbody>
+                    <tr>
+                        <td class="numCell">产量（t）</td>
+                        <td class="numCell">{{value1}}</td>
+                        <td class="numCell">台时（t/h）</td>
+                        <td class="numCell">{{value3}}</td>
+                        <td class="numCell">运转时间（h）</td>
+                        <td class="numCell">{{value5}}</td>
+                    </tr>
+                    <tr>
+                        <td class="numCell">运转率（%）</td>
+                        <td class="numCell">{{value1}}</td>
+                        <td class="numCell">停机时长（h）</td>
+                        <td class="numCell">{{value3}}</td>
+                        <td class="numCell">单位产品分布电耗（KW·h/t）</td>
+                        <td class="numCell">{{value5}}</td>
+                    </tr>
+                    <tr>
+                        <td class="numCell">单位产品标煤耗（kgce/t）</td>
+                        <td class="numCell">{{value1}}</td>
+                        <td class="numCell">熟料立升重合格率</td>
+                        <td class="numCell">{{value3}}</td>
+                        <td class="numCell">熟料f-CaO合格率</td>
+                        <td class="numCell">{{value5}}</td>
+                    </tr>
+                    <tr>
+                        <td class="numCell">入窑生料细度合格率（%）</td>
+                        <td class="numCell">{{value5}}</td>
+                        <td class="numCell">入窑生料CaO合格率（%）</td>
+                        <td class="numCell">{{value1}}</td>
+                        <td class="numCell">入窑生料Fe₂O₃合格率（%）</td>
+                        <td class="numCell">{{value3}}</td>
+                    </tr>
+                    <tr>
+                        <td class="numCell">入窑生料水分合格率（%）</td>
+                        <td class="numCell">{{value1}}</td>
+                        <td class="numCell">单位成本（元/吨）</td>
+                        <td class="numCell">{{value3}}</td>
+                        <td class="numCell"></td>
+                        <td class="numCell"></td>
+                    </tr>
+                    <tr>
+                        <td class="numCell">生产情况记录</td>
+                        <td class="numCell" colspan="5">时间、类别、原因、处置措施、处置人</td>
+                    </tr>
+                </tbody>
+            </table>
+          </div>
+      </el-main>
+    </el-drawer>
     </el-container>
     <save-dialog
       v-if="dialog.save"
@@ -193,6 +202,10 @@ import otherDialog from "./../enm_rm/other_form.vue";
         apiObj: this.$API.wpm.sflog.list,
         apiObj2: null,
         query: {
+          shift:'',
+          team:'',
+          end_time__lt:'',
+          start_time__gte:'',
           mgroup:'3347217246321065984',
         },
         
@@ -217,8 +230,27 @@ import otherDialog from "./../enm_rm/other_form.vue";
         limitedExport:false,
       };
     },
-   
+    mounted(){
+      this.getTeam();
+      this.getShfit();
+   },
     methods: {
+      getTeam(){
+        let form ={};
+        form.page = 0;
+        form.belong_dept = this.deptId;
+        this.$API.mtm.team.list.req(form).then(res=>{
+          this.options = res;
+        })
+      },
+      getShfit(){
+        this.$API.mtm.shift.req({page:0}).then(res=>{
+          this.optionsShift = res;
+        })
+      },
+      handleQuery(){
+        this.$refs.table.queryData(this.query);
+      },
       sflog_export(){
         this.limitedExport = true;
       },
diff --git a/src/views/enm_kiln/teamAnalysis.vue b/src/views/enm_kiln/teamAnalysis.vue
index a594f6f0..d205e336 100644
--- a/src/views/enm_kiln/teamAnalysis.vue
+++ b/src/views/enm_kiln/teamAnalysis.vue
@@ -8,7 +8,7 @@
                     value-format="YYYY"
                     format="YYYY"
                     placeholder="查询年份"
-                    style="margin-right: 6px;"
+                    class="headerSearch"
                 />
                 <el-button
                     type="primary"
diff --git a/src/views/enm_kiln/workshopAnalysis.vue b/src/views/enm_kiln/workshopAnalysis.vue
index af9ecf67..3d2382b7 100644
--- a/src/views/enm_kiln/workshopAnalysis.vue
+++ b/src/views/enm_kiln/workshopAnalysis.vue
@@ -8,7 +8,7 @@
                 value-format="YYYY"
                 format="YYYY"
                 placeholder="查询年份"
-                style="margin-right: 6px;"
+                class="headerSearch"
             />
             <el-button
                 type="primary"
diff --git a/src/views/enm_mill/handoverLog.vue b/src/views/enm_mill/handoverLog.vue
index 6187a250..7e59df77 100644
--- a/src/views/enm_mill/handoverLog.vue
+++ b/src/views/enm_mill/handoverLog.vue
@@ -4,38 +4,47 @@
             <div class="left-panel">
               <div style="margin-right: 20px">交接班日志</div>
               <el-date-picker
-                    v-model="query.time"
-                    type="date"
-                    value-format="YYYY-MM-DD"
-                    format="YYYY-MM-DD"
-                    placeholder="日志时间"
-                />
-              <el-select
-                  v-model="query.shift"
-                  placeholder="班次"
-                  clearable
-                  style="margin-left: 2px; width: 120px"
-              >
-                  <el-option
-                      v-for="item in optionsShift"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                  ></el-option>
-              </el-select>
-              <el-select
-                  v-model="query.team"
-                  placeholder="班组"
-                  clearable
-                  style="margin-left: 2px; width: 120px"
-              >
-                  <el-option
-                      v-for="item in options"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                  ></el-option>
-              </el-select>
+              v-model="query.start_time__gte"
+              type="date"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              format="YYYY-MM-DD"
+              placeholder="开始时间"
+              style=" width: 120px"
+          />
+          <el-date-picker
+              v-model="query.end_time__lt"
+              type="date"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              format="YYYY-MM-DD"
+              placeholder="结束时间"
+              style="margin-left: 2px; width: 120px"
+          />
+        <el-select
+            v-model="query.shift"
+            placeholder="班次"
+            clearable
+            style="margin-left: 2px; width: 120px"
+        >
+            <el-option
+                v-for="item in optionsShift"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+            ></el-option>
+        </el-select>
+        <el-select
+            v-model="query.team"
+            placeholder="班组"
+            clearable
+            style="margin-left: 2px; width: 120px"
+        >
+            <el-option
+                v-for="item in options"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+            ></el-option>
+        </el-select>
               <el-button
                   type="primary"
                   icon="el-icon-search"
@@ -174,6 +183,10 @@
         apiObj: this.$API.wpm.sflog.list,
         apiObj2: null,
         query: {
+          shift:'',
+          team:'',
+          end_time__lt:'',
+          start_time__gte:'',
           mgroup:'3347217651339837440',
         },
         deptId:'3347207316583170048',
@@ -197,8 +210,27 @@
         limitedExport:false,
       };
     },
-   
+    mounted(){
+      this.getTeam();
+      this.getShfit();
+   },
     methods: {
+      getTeam(){
+        let form ={};
+        form.page = 0;
+        form.belong_dept = this.deptId;
+        this.$API.mtm.team.list.req(form).then(res=>{
+          this.options = res;
+        })
+      },
+      getShfit(){
+        this.$API.mtm.shift.req({page:0}).then(res=>{
+          this.optionsShift = res;
+        })
+      },
+      handleQuery(){
+        this.$refs.table.queryData(this.query);
+      },
       sflog_export(){
         this.limitedExport = true;
       },
diff --git a/src/views/enm_mill/teamAnalysis.vue b/src/views/enm_mill/teamAnalysis.vue
index f6ac2edc..1027d801 100644
--- a/src/views/enm_mill/teamAnalysis.vue
+++ b/src/views/enm_mill/teamAnalysis.vue
@@ -8,7 +8,7 @@
                     value-format="YYYY"
                     format="YYYY"
                     placeholder="查询年份"
-                    style="margin-right: 6px;"
+                    class="headerSearch"
                 />
                 <el-button
                     type="primary"
diff --git a/src/views/enm_mill/workshopAnalysis.vue b/src/views/enm_mill/workshopAnalysis.vue
index 7e0ec425..3e026d28 100644
--- a/src/views/enm_mill/workshopAnalysis.vue
+++ b/src/views/enm_mill/workshopAnalysis.vue
@@ -8,7 +8,7 @@
                     value-format="YYYY"
                     format="YYYY"
                     placeholder="查询年份"
-                    style="margin-right: 6px;"
+                    class="headerSearch"
                 />
                 <el-select
                     v-model="query.type"
diff --git a/src/views/enm_pack/handoverLog.vue b/src/views/enm_pack/handoverLog.vue
index 5f22736f..94c968d8 100644
--- a/src/views/enm_pack/handoverLog.vue
+++ b/src/views/enm_pack/handoverLog.vue
@@ -1,89 +1,98 @@
 <template>
     <el-container>
       <el-header>
-            <div class="left-panel">
-              <div style="margin-right: 20px">交接班日志</div>
-              <el-date-picker
-                    v-model="query.time"
-                    type="date"
-                    value-format="YYYY-MM-DD"
-                    format="YYYY-MM-DD"
-                    placeholder="日志时间"
-                />
-              <el-select
-                  v-model="query.shift"
-                  placeholder="班次"
-                  clearable
-                  style="margin-left: 2px; width: 120px"
-              >
-                  <el-option
-                      v-for="item in optionsShift"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                  ></el-option>
-              </el-select>
-              <el-select
-                  v-model="query.team"
-                  placeholder="班组"
-                  clearable
-                  style="margin-left: 2px; width: 120px"
-              >
-                  <el-option
-                      v-for="item in options"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                  ></el-option>
-              </el-select>
-              <el-button
-                  type="primary"
-                  icon="el-icon-search"
-                  @click="handleQuery"
-              ></el-button>
-            </div>
-          </el-header>
-          <el-main class="nopadding">
-            <scTable
-              ref="table"
-              :apiObj="apiObj"
-              row-key="id"
-              stripe
-              :params="query"
-              highlightCurrentRow
-              @row-click="rowClick"
-            >
-                <el-table-column type="index" width="50"/>
-                <!-- <el-table-column label="关联工段" prop="mgroup_name"></el-table-column> -->
-                <el-table-column label="开始时间" prop="start_time">
-                    <template #default="scope">
-                        <span>{{ scope.row.start_time.slice(0,16)}}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="结束时间" prop="end_time">
-                    <template #default="scope">
-                        <span>{{ scope.row.end_time.slice(0,16)}}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="班组名称" prop="team_name"></el-table-column>
-                <el-table-column label="当前班次" prop="shift_name"></el-table-column>
-                <el-table-column label="班长" prop="leader_name"></el-table-column>
-                
-                <el-table-column label="检验时间">
-                    <template #default="scope">
-                        <span v-if="scope.row.last_test_time">{{ scope.row.last_test_time.slice(0,16)}}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="操作" fixed="right" align="center" width="100">
+        <div class="left-panel">
+          <div style="margin-right: 20px">交接班日志</div>
+          <el-date-picker
+          v-model="query.start_time__gte"
+          type="date"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          format="YYYY-MM-DD"
+          placeholder="开始时间"
+          style=" width: 120px"
+      />
+      <el-date-picker
+          v-model="query.end_time__lt"
+          type="date"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          format="YYYY-MM-DD"
+          placeholder="结束时间"
+          style="margin-left: 2px; width: 120px"
+      />
+    <el-select
+        v-model="query.shift"
+        placeholder="班次"
+        clearable
+        style="margin-left: 2px; width: 120px"
+    >
+        <el-option
+            v-for="item in optionsShift"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+        ></el-option>
+    </el-select>
+    <el-select
+        v-model="query.team"
+        placeholder="班组"
+        clearable
+        style="margin-left: 2px; width: 120px"
+    >
+        <el-option
+            v-for="item in options"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+        ></el-option>
+    </el-select>
+          <el-button
+              type="primary"
+              icon="el-icon-search"
+              @click="handleQuery"
+          ></el-button>
+        </div>
+        </el-header>
+        <el-main class="nopadding">
+          <scTable
+            ref="table"
+            :apiObj="apiObj"
+            row-key="id"
+            stripe
+            :params="query"
+            highlightCurrentRow
+            @row-click="rowClick"
+          >
+              <el-table-column type="index" width="50"/>
+              <!-- <el-table-column label="关联工段" prop="mgroup_name"></el-table-column> -->
+              <el-table-column label="开始时间" prop="start_time">
                   <template #default="scope">
-                    <el-button link size="small" @click="sflog_edit(scope.row)" type="primary">编辑</el-button>
-                    <!-- <el-button link size="small" @click="sflog_check(scope.row)" type="primary">质量检验</el-button> -->
-                    <!-- <el-button link size="small" @click="sflog_other(scope.row)" type="primary">其他能源</el-button> -->
-                    <el-button link size="small" @click="sflog_export(scope.row)" type="success">报表</el-button>
+                      <span>{{ scope.row.start_time.slice(0,16)}}</span>
                   </template>
-                </el-table-column>
-            </scTable>
-          </el-main>
+              </el-table-column>
+              <el-table-column label="结束时间" prop="end_time">
+                  <template #default="scope">
+                      <span>{{ scope.row.end_time.slice(0,16)}}</span>
+                  </template>
+              </el-table-column>
+              <el-table-column label="班组名称" prop="team_name"></el-table-column>
+              <el-table-column label="当前班次" prop="shift_name"></el-table-column>
+              <el-table-column label="班长" prop="leader_name"></el-table-column>
+              
+              <el-table-column label="检验时间">
+                  <template #default="scope">
+                      <span v-if="scope.row.last_test_time">{{ scope.row.last_test_time.slice(0,16)}}</span>
+                  </template>
+              </el-table-column>
+              <el-table-column label="操作" fixed="right" align="center" width="100">
+                <template #default="scope">
+                  <el-button link size="small" @click="sflog_edit(scope.row)" type="primary">编辑</el-button>
+                  <!-- <el-button link size="small" @click="sflog_check(scope.row)" type="primary">质量检验</el-button> -->
+                  <!-- <el-button link size="small" @click="sflog_other(scope.row)" type="primary">其他能源</el-button> -->
+                  <el-button link size="small" @click="sflog_export(scope.row)" type="success">报表</el-button>
+                </template>
+              </el-table-column>
+          </scTable>
+        </el-main>
       <el-drawer v-model="limitedExport" size="60%" :show-close="false">
         <template #header="{ close, titleId, titleClass }">
           <h4 :id="titleId" :class="titleClass">交接班日志</h4>
@@ -171,8 +180,27 @@ import saveDialog from "./../enm_rm/handover_form.vue";
         limitedExport:false,
       };
     },
-   
+    mounted(){
+      this.getTeam();
+      this.getShfit();
+   },
     methods: {
+      getTeam(){
+        let form ={};
+        form.page = 0;
+        form.belong_dept = this.deptId;
+        this.$API.mtm.team.list.req(form).then(res=>{
+          this.options = res;
+        })
+      },
+      getShfit(){
+        this.$API.mtm.shift.req({page:0}).then(res=>{
+          this.optionsShift = res;
+        })
+      },
+      handleQuery(){
+        this.$refs.table.queryData(this.query);
+      },
       sflog_export(){
         this.limitedExport = true;
       },
diff --git a/src/views/enm_pack/teamAnalysis.vue b/src/views/enm_pack/teamAnalysis.vue
index 2641d3a4..3d0df026 100644
--- a/src/views/enm_pack/teamAnalysis.vue
+++ b/src/views/enm_pack/teamAnalysis.vue
@@ -8,7 +8,7 @@
                     value-format="YYYY"
                     format="YYYY"
                     placeholder="查询年份"
-                    style="margin-right: 6px;"
+                    class="headerSearch"
                 />
                 <el-button
                     type="primary"
diff --git a/src/views/enm_pack/workshopAnalysis.vue b/src/views/enm_pack/workshopAnalysis.vue
index aee29796..a7e0d551 100644
--- a/src/views/enm_pack/workshopAnalysis.vue
+++ b/src/views/enm_pack/workshopAnalysis.vue
@@ -8,7 +8,7 @@
                 value-format="YYYY"
                 format="YYYY"
                 placeholder="查询年份"
-                style="margin-right: 6px;"
+                class="headerSearch"
             />
             <el-button
               type="primary"
diff --git a/src/views/enm_rm/handoverLog.vue b/src/views/enm_rm/handoverLog.vue
index aadbe11c..8b36f491 100644
--- a/src/views/enm_rm/handoverLog.vue
+++ b/src/views/enm_rm/handoverLog.vue
@@ -4,12 +4,21 @@
             <div class="left-panel">
               <div style="margin-right: 20px">交接班日志</div>
               <el-date-picker
-                    v-model="query.time"
-                    type="date"
-                    value-format="YYYY-MM-DD"
-                    format="YYYY-MM-DD"
-                    placeholder="日志时间"
-                />
+                  v-model="query.start_time__gte"
+                  type="date"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  format="YYYY-MM-DD"
+                  placeholder="开始时间"
+                  style=" width: 120px"
+              />
+              <el-date-picker
+                  v-model="query.end_time__lt"
+                  type="date"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  format="YYYY-MM-DD"
+                  placeholder="结束时间"
+                  style="margin-left: 2px; width: 120px"
+              />
               <el-select
                   v-model="query.shift"
                   placeholder="班次"
@@ -18,9 +27,9 @@
               >
                   <el-option
                       v-for="item in optionsShift"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.id"
                   ></el-option>
               </el-select>
               <el-select
@@ -31,9 +40,9 @@
               >
                   <el-option
                       v-for="item in options"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.id"
                   ></el-option>
               </el-select>
               <el-button
@@ -217,9 +226,26 @@ import otherDialog from "./other_form.vue";
       };
     },
    mounted(){
-    this.getTeam();
+      this.getTeam();
+      this.getShfit();
    },
     methods: {
+      getTeam(){
+        let form ={};
+        form.page = 0;
+        form.belong_dept = this.deptId;
+        this.$API.mtm.team.list.req(form).then(res=>{
+          this.options = res;
+        })
+      },
+      getShfit(){
+        this.$API.mtm.shift.req({page:0}).then(res=>{
+          this.optionsShift = res;
+        })
+      },
+      handleQuery(){
+        this.$refs.table.queryData(this.query);
+      },
       sflog_export(){
         this.limitedExport = true;
       },
@@ -244,14 +270,7 @@ import otherDialog from "./other_form.vue";
             this.$refs.saveDialog.open("edit").setData(row);
         });
       },
-      getTeam(){
-        let form ={};
-        form.page = 0;
-        form.belong_dept = this.deptId;
-        this.$API.mtm.team.list.req(form).then(res=>{
-          this.teamOptions = res;
-        })
-      },
+      
       //质量检验
       sflog_check(row){
         this.dialog.check = true;
diff --git a/src/views/enm_rm/teamAnalysis.vue b/src/views/enm_rm/teamAnalysis.vue
index f52e24de..01739ea5 100644
--- a/src/views/enm_rm/teamAnalysis.vue
+++ b/src/views/enm_rm/teamAnalysis.vue
@@ -8,7 +8,7 @@
                     value-format="YYYY"
                     format="YYYY"
                     placeholder="查询年份"
-                    style="margin-right: 6px;"
+                    class="headerSearch"
                 />
                 <el-button
                     type="primary"
diff --git a/src/views/enm_rm/workshopAnalysis.vue b/src/views/enm_rm/workshopAnalysis.vue
index 699a0b7a..8a51c814 100644
--- a/src/views/enm_rm/workshopAnalysis.vue
+++ b/src/views/enm_rm/workshopAnalysis.vue
@@ -3,13 +3,13 @@
         <el-header>
         <div class="left-panel">
             <el-date-picker
-                    v-model="query.year_s"
-                    type="year"
-                    value-format="YYYY"
-                    format="YYYY"
-                    placeholder="查询年份"
-                    style="margin-right: 6px;"
-                />
+                v-model="query.year_s"
+                type="year"
+                value-format="YYYY"
+                format="YYYY"
+                placeholder="查询年份"
+                class="headerSearch"
+            />
             <el-button
               type="primary"
               icon="el-icon-search"
diff --git a/src/views/enm_slag/handoverLog.vue b/src/views/enm_slag/handoverLog.vue
index 922e0f09..184dbc78 100644
--- a/src/views/enm_slag/handoverLog.vue
+++ b/src/views/enm_slag/handoverLog.vue
@@ -1,89 +1,98 @@
 <template>
     <el-container>
       <el-header>
-            <div class="left-panel">
-              <div style="margin-right: 20px">交接班日志</div>
-              <el-date-picker
-                    v-model="query.time"
-                    type="date"
-                    value-format="YYYY-MM-DD"
-                    format="YYYY-MM-DD"
-                    placeholder="日志时间"
-                />
-              <el-select
-                  v-model="query.shift"
-                  placeholder="班次"
-                  clearable
-                  style="margin-left: 2px; width: 120px"
-              >
-                  <el-option
-                      v-for="item in optionsShift"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                  ></el-option>
-              </el-select>
-              <el-select
-                  v-model="query.team"
-                  placeholder="班组"
-                  clearable
-                  style="margin-left: 2px; width: 120px"
-              >
-                  <el-option
-                      v-for="item in options"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                  ></el-option>
-              </el-select>
-              <el-button
-                  type="primary"
-                  icon="el-icon-search"
-                  @click="handleQuery"
-              ></el-button>
-            </div>
-          </el-header>
-          <el-main class="nopadding">
-            <scTable
-              ref="table"
-              :apiObj="apiObj"
-              row-key="id"
-              stripe
-              :params="query"
-              highlightCurrentRow
-              @row-click="rowClick"
-            >
-                <el-table-column type="index" width="50"/>
-                <!-- <el-table-column label="关联工段" prop="mgroup_name"></el-table-column> -->
-                <el-table-column label="开始时间" prop="start_time">
-                    <template #default="scope">
-                        <span>{{ scope.row.start_time.slice(0,16)}}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="结束时间" prop="end_time">
-                    <template #default="scope">
-                        <span>{{ scope.row.end_time.slice(0,16)}}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="班组名称" prop="team_name"></el-table-column>
-                <el-table-column label="当前班次" prop="shift_name"></el-table-column>
-                <el-table-column label="班长" prop="leader_name"></el-table-column>
-                
-                <el-table-column label="检验时间">
-                    <template #default="scope">
-                        <span v-if="scope.row.last_test_time">{{ scope.row.last_test_time.slice(0,16)}}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="操作" fixed="right" align="center" width="150">
-                  <template #default="scope">
-                    <el-button link size="small" @click="sflog_edit(scope.row)" type="primary">编辑</el-button>
-                    <!-- <el-button link size="small" @click="sflog_check(scope.row)" type="primary">质量检验</el-button> -->
-                    <el-button link size="small" @click="sflog_other(scope.row)" type="primary">其他能源</el-button>
-                    <el-button link size="small" @click="sflog_export(scope.row)" type="success">报表</el-button>
-                  </template>
-                </el-table-column>
-            </scTable>
-          </el-main>
+        <div class="left-panel">
+          <div style="margin-right: 20px">交接班日志</div>
+          <el-date-picker
+              v-model="query.start_time__gte"
+              type="date"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              format="YYYY-MM-DD"
+              placeholder="开始时间"
+              style=" width: 120px"
+          />
+          <el-date-picker
+              v-model="query.end_time__lt"
+              type="date"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              format="YYYY-MM-DD"
+              placeholder="结束时间"
+              style="margin-left: 2px; width: 120px"
+          />
+          <el-select
+              v-model="query.shift"
+              placeholder="班次"
+              clearable
+              style="margin-left: 2px; width: 120px"
+          >
+              <el-option
+                  v-for="item in optionsShift"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+              ></el-option>
+          </el-select>
+          <el-select
+              v-model="query.team"
+              placeholder="班组"
+              clearable
+              style="margin-left: 2px; width: 120px"
+          >
+              <el-option
+                  v-for="item in options"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+              ></el-option>
+          </el-select>
+          <el-button
+              type="primary"
+              icon="el-icon-search"
+              @click="handleQuery"
+          ></el-button>
+        </div>
+      </el-header>
+      <el-main class="nopadding">
+        <scTable
+          ref="table"
+          :apiObj="apiObj"
+          row-key="id"
+          stripe
+          :params="query"
+          highlightCurrentRow
+          @row-click="rowClick"
+        >
+            <el-table-column type="index" width="50"/>
+            <!-- <el-table-column label="关联工段" prop="mgroup_name"></el-table-column> -->
+            <el-table-column label="开始时间" prop="start_time">
+                <template #default="scope">
+                    <span>{{ scope.row.start_time.slice(0,16)}}</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="结束时间" prop="end_time">
+                <template #default="scope">
+                    <span>{{ scope.row.end_time.slice(0,16)}}</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="班组名称" prop="team_name"></el-table-column>
+            <el-table-column label="当前班次" prop="shift_name"></el-table-column>
+            <el-table-column label="班长" prop="leader_name"></el-table-column>
+            
+            <el-table-column label="检验时间">
+                <template #default="scope">
+                    <span v-if="scope.row.last_test_time">{{ scope.row.last_test_time.slice(0,16)}}</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" fixed="right" align="center" width="150">
+              <template #default="scope">
+                <el-button link size="small" @click="sflog_edit(scope.row)" type="primary">编辑</el-button>
+                <!-- <el-button link size="small" @click="sflog_check(scope.row)" type="primary">质量检验</el-button> -->
+                <el-button link size="small" @click="sflog_other(scope.row)" type="primary">其他能源</el-button>
+                <el-button link size="small" @click="sflog_export(scope.row)" type="success">报表</el-button>
+              </template>
+            </el-table-column>
+        </scTable>
+      </el-main>
       <el-drawer v-model="limitedExport" size="60%" :show-close="false">
         <template #header="{ close, titleId, titleClass }">
           <h4 :id="titleId" :class="titleClass">交接班日志</h4>
@@ -173,8 +182,27 @@
         limitedExport:false,
       };
     },
-   
+    mounted(){
+      this.getTeam();
+      this.getShfit();
+   },
     methods: {
+      getTeam(){
+        let form ={};
+        form.page = 0;
+        form.belong_dept = this.deptId;
+        this.$API.mtm.team.list.req(form).then(res=>{
+          this.options = res;
+        })
+      },
+      getShfit(){
+        this.$API.mtm.shift.req({page:0}).then(res=>{
+          this.optionsShift = res;
+        })
+      },
+      handleQuery(){
+        this.$refs.table.queryData(this.query);
+      },
       sflog_export(){
         this.limitedExport = true;
       },
diff --git a/src/views/enm_slag/teamAnalysis.vue b/src/views/enm_slag/teamAnalysis.vue
index 52081791..6c11af3e 100644
--- a/src/views/enm_slag/teamAnalysis.vue
+++ b/src/views/enm_slag/teamAnalysis.vue
@@ -8,7 +8,7 @@
                     value-format="YYYY"
                     format="YYYY"
                     placeholder="查询年份"
-                    style="margin-right: 6px;"
+                    class="headerSearch"
                 />
                 <el-button
                     type="primary"
diff --git a/src/views/enm_slag/workshopAnalysis.vue b/src/views/enm_slag/workshopAnalysis.vue
index 90d0e686..e40f1480 100644
--- a/src/views/enm_slag/workshopAnalysis.vue
+++ b/src/views/enm_slag/workshopAnalysis.vue
@@ -3,13 +3,13 @@
         <el-header>
         <div class="left-panel">
             <el-date-picker
-                    v-model="query.year_s"
-                    type="year"
-                    value-format="YYYY"
-                    format="YYYY"
-                    placeholder="查询年份"
-                    style="margin-right: 6px;"
-                />
+                v-model="query.year_s"
+                type="year"
+                value-format="YYYY"
+                format="YYYY"
+                placeholder="查询年份"
+                class="headerSearch"
+            />
             <el-button
               type="primary"
               icon="el-icon-search"
diff --git a/src/views/ungrouped/costing.vue b/src/views/ungrouped/costing.vue
index e76a04f2..615c136d 100644
--- a/src/views/ungrouped/costing.vue
+++ b/src/views/ungrouped/costing.vue
@@ -8,7 +8,7 @@
                   placeholder="工段"
                   clearable
                   @change="mgroupChange"
-                  style="margin-left: 2px; width: 200px"
+                  class="headerSearch"
                 >
                   <el-option
                   v-for="item in mgroupOptions"
@@ -21,6 +21,7 @@
                     v-model="query.type"
                     placeholder="查询类型"
                     clearable
+                    class="headerSearch"
                     @change="typeCange"
                   >
                     <el-option
@@ -36,6 +37,7 @@
                     value-format="YYYY-MM-DD"
                     format="YYYY-MM-DD"
                     placeholder="日"
+                    class="headerSearch"
                     v-if="query.type==0"
                 />
                 <!-- 选择班次 -->
@@ -44,7 +46,7 @@
                     v-model="query.shift"
                     placeholder="班次"
                     clearable
-                    style="margin-left: 2px; width: 120px"
+                    class="headerSearch"
                 >
                 <el-option
                     v-for="item in optionsShift"
@@ -59,6 +61,7 @@
                     value-format="YYYY-MM"
                     format="YYYY-MM"
                     placeholder="月份"
+                    class="headerSearch"
                     v-if="query.type==1"
                 />
                 <el-date-picker
@@ -67,6 +70,7 @@
                     value-format="YYYY"
                     format="YYYY"
                     placeholder="年份"
+                    class="headerSearch"
                     v-if="query.type==2"
                 />
                 <el-button
diff --git a/src/views/ungrouped/energy.vue b/src/views/ungrouped/energy.vue
index 5f0cce1c..bb34720f 100644
--- a/src/views/ungrouped/energy.vue
+++ b/src/views/ungrouped/energy.vue
@@ -7,7 +7,7 @@
                   placeholder="车间"
                   clearable
                   @change="deptChange"
-                  style="margin-left: 2px; width: 200px"
+                  class="headerSearch"
                 >
                   <el-option
                   v-for="item in deptOptions"
@@ -20,6 +20,7 @@
                     v-model="query.type"
                     placeholder="查询类型"
                     clearable
+                    class="headerSearch"
                     @change="typeCange"
                 >
                     <el-option
@@ -36,6 +37,7 @@
                     format="YYYY-MM"
                     placeholder="查询月份"
                     v-if="query.type==0"
+                    class="headerSearch"
                 />
                 <el-date-picker
                     v-model="query.year"
@@ -44,6 +46,7 @@
                     format="YYYY"
                     placeholder="查询年份"
                     v-if="query.type==1"
+                    class="headerSearch"
                 />
                 <el-date-picker
                     v-model="query.yearStart"
@@ -52,8 +55,8 @@
                     format="YYYY"
                     placeholder="起始年份"
                     v-if="query.type==2"
+                    class="headerSearch"
                 />
-                
                 <el-button
                 type="primary"
                 icon="el-icon-search"
diff --git a/src/views/ungrouped/feeset.vue b/src/views/ungrouped/feeset.vue
index e0b59e9e..f08ded41 100644
--- a/src/views/ungrouped/feeset.vue
+++ b/src/views/ungrouped/feeset.vue
@@ -2,27 +2,27 @@
 	<el-container>
 		<el-header>
 			<div class="left-panel">
-				<el-date-picker
+				<!-- <el-date-picker
                     v-model="query.year"
                     type="year"
                     value-format="YYYY"
                     format="YYYY"
                     placeholder="年"
 					style="width: 120px;margin-right: 5px;"
-                />
+                /> -->
 				<el-date-picker
-                    v-model="query.month"
+                    v-model="query.date"
                     type="month"
                     value-format="YYYY-MM"
                     format="YYYY-MM"
                     placeholder="月"
-					style="width: 120px;margin-right: 5px;"
+					class="headerSearch"
                 />
 				<el-select
 					v-model="query.fee"
 					placeholder="费用类型"
 					clearable
-					style="width: 120px;margin-right: 5px;"
+					class="headerSearch"
 				>
 					<el-option
 						v-for="item in feeOptions"
@@ -35,7 +35,7 @@
 					v-model="query.mgroup"
 					placeholder="工段"
 					clearable
-					style="width: 120px;margin-right: 5px;"
+					class="headerSearch"
 				>
 					<el-option
 						v-for="item in options"
@@ -47,9 +47,8 @@
 				<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
 			</div>
 			<div class="right-panel">
-				<el-button type="primary" icon="el-icon-plus" @click="table_add" v-auth="'role.create'"></el-button>
+				<el-button type="primary" icon="el-icon-plus" @click="table_add" v-auth="'feeset.create'"></el-button>
 			</div>
-			
 		</el-header>
 		<el-main class="nopadding">
 			<scTable ref="table" :apiObj="apiObj" row-key="id">
@@ -65,11 +64,11 @@
 				</el-table-column>
 				<el-table-column label="操作" fixed="right" align="center" width="140">
 					<template #default="scope">
-						<el-button link size="small" @click="table_edit(scope.row)" v-auth="'team.update'" type="primary">编辑</el-button>
+						<el-button link size="small" @click="table_edit(scope.row)" v-auth="'feeset.update'" type="primary">编辑</el-button>
 						<el-divider direction="vertical"></el-divider>
 						<el-popconfirm title="确定删除吗？" @confirm="table_del(scope.row, scope.$index)">
 							<template #reference>
-								<el-button link size="small" v-auth="'role.delete'" type="danger">删除</el-button>
+								<el-button link size="small" v-auth="'feeset.delete'" type="danger">删除</el-button>
 							</template>
 						</el-popconfirm>
 					</template>
@@ -95,8 +94,7 @@
 			return {
 				apiObj: this.$API.fim.feeset.list,
 				query: {
-					year:'',
-					month:'',
+					date:'',
 					fee:'',
 					mgroup:'',
 				},
@@ -156,7 +154,14 @@
 			},
 			//搜索
 			handleQuery(){
-				this.$refs.table.queryData(this.query)
+				let year = this.query.date.split('-')[0];
+				let month = this.query.date.split('-')[1];
+				let query = {};
+				query.year = Number(year);
+				query.month = Number(month);
+				query.fee =this.query.fee;
+				query.mgroup =this.query.mgroup;
+				this.$refs.table.queryData(query)
 			},
 			//本地更新数据
 			//新增岗位后更新数据
diff --git a/src/views/ungrouped/goalSetting.vue b/src/views/ungrouped/goalSetting.vue
index 5b026cef..2cf8a29d 100644
--- a/src/views/ungrouped/goalSetting.vue
+++ b/src/views/ungrouped/goalSetting.vue
@@ -2,50 +2,51 @@
 	<el-container>
 		<el-header>
 			<div class="left-panel">
-				<el-button type="primary" icon="el-icon-plus" @click="roleAdd" v-auth="'role.create'"></el-button>
+				<el-date-picker
+					v-model="query.year"
+					type="year"
+					format="YYYY"
+					value-format="YYYY"
+					placeholder="年份"
+					class="headerSearch"
+				/>
+				<el-select
+					v-model="query.mgroup"
+					placeholder="关联工段"
+					clearable
+					class="headerSearch"
+				>
+					<el-option
+					v-for="item in mgroupOptions"
+					:key="item.id"
+					:label="item.name"
+					:value="item.id"
+					></el-option>
+				</el-select>
+				<el-select
+					v-model="query.goal_cate"
+					placeholder="目标种类"
+					clearable
+					class="headerSearch"
+				>
+					<el-option
+					v-for="item in goalOptions"
+					:key="item.id"
+					:label="item.name"
+					:value="item.id"
+					></el-option>
+				</el-select>
+				<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
 			</div>
 			<div class="right-panel">
-				<div class="right-panel-search">
-                    <el-date-picker
-                            v-model="query.year"
-                            type="year"
-                            format="YYYY"
-                            value-format="YYYY"
-                            placeholder="年份"
-                        />
-                        <el-select
-                            v-model="query.mgroup"
-                            placeholder="关联工段"
-                            clearable
-                        >
-                            <el-option
-                            v-for="item in mgroupOptions"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                            ></el-option>
-                        </el-select>
-                        <el-select
-                            v-model="query.goal_cate"
-                            placeholder="目标种类"
-                            clearable
-                        >
-                            <el-option
-                            v-for="item in goalOptions"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                            ></el-option>
-                        </el-select>
-					<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
-				</div>
+				<el-button type="primary" icon="el-icon-plus" @click="roleAdd" v-auth="'goal.create'"></el-button>
 			</div>
 		</el-header>
 		<el-main class="nopadding">
-			<scTable ref="table" :apiObj="apiObj" row-key="id" @selection-change="selectionChange" hidePagination>
+			<scTable ref="table" :apiObj="apiObj" row-key="id" @selection-change="selectionChange">
 				<el-table-column label="#" type="index" width="50"></el-table-column>
-				<el-table-column label="工段" prop="mgroup_name" min-width="100"></el-table-column>
-				<el-table-column label="目标（项目）" prop="goal_cate_name" min-width="100"></el-table-column>
+				<el-table-column label="工段" prop="mgroup_name" width="80"></el-table-column>
+				<el-table-column label="目标（项目）" prop="goal_cate_name" min-width="120"></el-table-column>
 				<el-table-column label="1月" prop="goal_val_1"></el-table-column>
 				<el-table-column label="2月" prop="goal_val_2"></el-table-column>
 				<el-table-column label="3月" prop="goal_val_3"></el-table-column>
@@ -61,11 +62,11 @@
 				<el-table-column label="年目标值" prop="goal_val"></el-table-column>
 				<el-table-column label="操作" fixed="right" align="center" width="100">
 					<template #default="scope">
-						<el-button link size="small" @click="roleEdit(scope.row)" v-auth="'team.update'" type="primary">编辑</el-button>
+						<el-button link size="small" @click="roleEdit(scope.row)" v-auth="'goal.update'" type="primary">编辑</el-button>
 						<el-divider direction="vertical"></el-divider>
 						<el-popconfirm title="确定删除吗？" @confirm="handleDel(scope.row)">
 							<template #reference>
-								<el-button link size="small" v-auth="'role.delete'" type="danger">删除</el-button>
+								<el-button link size="small" v-auth="'goal.delete'" type="danger">删除</el-button>
 							</template>
 						</el-popconfirm>
 					</template>
diff --git a/src/views/ungrouped/material.vue b/src/views/ungrouped/material.vue
index fb7fa4dd..381ddf5a 100644
--- a/src/views/ungrouped/material.vue
+++ b/src/views/ungrouped/material.vue
@@ -2,17 +2,16 @@
 	<el-container>
 		<el-header>
 			<div class="left-panel">
-				<el-button type="primary" icon="el-icon-plus" @click="table_add" v-auth="'role.create'"></el-button>
+				<el-input style="margin-right: 5px;" v-model="query.search" placeholder="产品名称" clearable></el-input>
+				<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
 			</div>
 			<div class="right-panel">
-				<div class="right-panel-search">
-					<el-input v-model="query.search" placeholder="产品名称" clearable @keyup.enter="handleQuery"></el-input>
-					<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
-				</div>
+				<el-button type="primary" icon="el-icon-plus" @click="table_add" v-auth="'material.create'"></el-button>
 			</div>
+			
 		</el-header>
 		<el-main class="nopadding">
-			<scTable ref="table" :apiObj="apiObj" row-key="id" @selection-change="selectionChange" hidePagination>
+			<scTable ref="table" :apiObj="apiObj" row-key="id" @selection-change="selectionChange">
 				<el-table-column label="#" type="index" width="50"></el-table-column>
 				<el-table-column label="名称" prop="name" min-width="100"></el-table-column>
 				<el-table-column label="标识" prop="code" min-width="100"></el-table-column>
@@ -29,11 +28,11 @@
 				</el-table-column> -->
 				<el-table-column label="操作" fixed="right" align="center" width="140">
 					<template #default="scope">
-						<el-button link size="small" @click="table_edit(scope.row)" v-auth="'team.update'" type="primary">编辑</el-button>
+						<el-button link size="small" @click="table_edit(scope.row)" v-auth="'material.update'" type="primary">编辑</el-button>
 						<el-divider direction="vertical"></el-divider>
 						<el-popconfirm title="确定删除吗？" @confirm="roleDel(scope.row, scope.$index)">
 							<template #reference>
-								<el-button link size="small" v-auth="'role.delete'" type="danger">删除</el-button>
+								<el-button link size="small" v-auth="'material.delete'" type="danger">删除</el-button>
 							</template>
 						</el-popconfirm>
 					</template>
diff --git a/src/views/ungrouped/mgroup.vue b/src/views/ungrouped/mgroup.vue
index b42013b9..c98b4e4e 100644
--- a/src/views/ungrouped/mgroup.vue
+++ b/src/views/ungrouped/mgroup.vue
@@ -2,13 +2,11 @@
 	<el-container>
 		<el-header>
 			<div class="left-panel">
-				<el-button type="primary" icon="el-icon-plus" @click="table_add" v-auth="'role.create'"></el-button>
+				<el-input style="margin-right: 5px;" v-model="query.search" placeholder="名称" clearable></el-input>
+				<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
 			</div>
 			<div class="right-panel">
-				<div class="right-panel-search">
-					<el-input v-model="query.search" placeholder="测点集名称" clearable @keyup.enter="handleQuery"></el-input>
-					<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
-				</div>
+				<el-button type="primary" icon="el-icon-plus" @click="table_add" v-auth="'mgroup.create'"></el-button>
 			</div>
 		</el-header>
 		<el-main class="nopadding">
@@ -20,16 +18,15 @@
 						<span>{{ cates_[scope.row.cate] }}</span>
 					</template>
 				</el-table-column>
-				<!-- <el-table-column label="主要产品" prop="product" min-width="150"></el-table-column> -->
 				<el-table-column label="所属部门" prop="belong_dept_name" min-width="150"></el-table-column>
 				<el-table-column label="创建时间" prop="create_time" min-width="150"></el-table-column>
 				<el-table-column label="操作" fixed="right" align="center" width="140">
 					<template #default="scope">
-						<el-button link size="small" @click="table_edit(scope.row)" v-auth="'team.update'" type="primary">编辑</el-button>
+						<el-button link size="small" @click="table_edit(scope.row)" v-auth="'mgroup.update'" type="primary">编辑</el-button>
 						<el-divider direction="vertical"></el-divider>
 						<el-popconfirm title="确定删除吗？" @confirm="table_del(scope.row, scope.$index)">
 							<template #reference>
-								<el-button link size="small" v-auth="'role.delete'" type="danger">删除</el-button>
+								<el-button link size="small" v-auth="'mgroup.delete'" type="danger">删除</el-button>
 							</template>
 						</el-popconfirm>
 					</template>
diff --git a/src/views/ungrouped/priceset.vue b/src/views/ungrouped/priceset.vue
index 3289fc4e..727dcf7d 100644
--- a/src/views/ungrouped/priceset.vue
+++ b/src/views/ungrouped/priceset.vue
@@ -3,18 +3,18 @@
 		<el-header>
 			<div class="left-panel">
 				<el-date-picker
-                    v-model="query.month"
+                    v-model="query.monthData"
                     type="month"
                     value-format="YYYY-MM"
                     format="YYYY-MM"
                     placeholder="月"
-					style="width: 120px;margin-right: 5px;"
+					class="headerSearch"
                 />
 				<el-select
-					v-model="query.fee"
+					v-model="query.material"
 					placeholder="物料"
 					clearable
-					style="width: 120px;margin-right: 5px;"
+					class="headerSearch"
 				>
 					<el-option
 						v-for="item in options"
@@ -26,7 +26,7 @@
 				<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
 			</div>
 			<div class="right-panel">
-				<el-button type="primary" icon="el-icon-plus" @click="table_add" v-auth="'role.create'"></el-button>
+				<el-button type="primary" icon="el-icon-plus" @click="table_add" v-auth="'priceset.create'"></el-button>
 			</div>
 			
 		</el-header>
@@ -39,11 +39,11 @@
 				<el-table-column label="单价" prop="price_unit" min-width="150"></el-table-column>
 				<el-table-column label="操作" fixed="right" align="center" width="140">
 					<template #default="scope">
-						<el-button link size="small" @click="table_edit(scope.row)" v-auth="'team.update'" type="primary">编辑</el-button>
+						<el-button link size="small" @click="table_edit(scope.row)" v-auth="'priceset.update'" type="primary">编辑</el-button>
 						<el-divider direction="vertical"></el-divider>
 						<el-popconfirm title="确定删除吗？" @confirm="table_del(scope.row, scope.$index)">
 							<template #reference>
-								<el-button link size="small" v-auth="'role.delete'" type="danger">删除</el-button>
+								<el-button link size="small" v-auth="'priceset.delete'" type="danger">删除</el-button>
 							</template>
 						</el-popconfirm>
 					</template>
@@ -69,8 +69,7 @@
 			return {
 				apiObj: this.$API.fim.priceset.list,
 				query: {
-					year:'',
-					month:'',
+					monthData:'',
 					material:'',
 				},
                 dialog: {
@@ -121,7 +120,13 @@
 			},
 			//搜索
 			handleQuery(){
-				this.$refs.table.queryData(this.query)
+				let year = this.query.monthData.split('-')[0];
+				let month = this.query.monthData.split('-')[1];
+				let query = {};
+				query.year = Number(year);
+				query.month = Number(month);
+				query.material =this.query.material;
+				this.$refs.table.queryData(query)
 			},
 			//本地更新数据
 			//新增岗位后更新数据
diff --git a/src/views/ungrouped/quality.vue b/src/views/ungrouped/quality.vue
index 5a1bff72..71a2de24 100644
--- a/src/views/ungrouped/quality.vue
+++ b/src/views/ungrouped/quality.vue
@@ -7,7 +7,7 @@
                   placeholder="车间"
                   clearable
                   @change="deptChange"
-                  style="margin-left: 2px; width: 200px"
+                  class="headerSearch"
                 >
                   <el-option
                   v-for="item in deptOptions"
@@ -20,6 +20,7 @@
                     v-model="query.type"
                     placeholder="查询类型"
                     clearable
+                    class="headerSearch"
                     @change="typeCange"
                   >
                     <el-option
@@ -36,6 +37,7 @@
                     value-format="YYYY"
                     format="YYYY"
                     placeholder="年份"
+                    class="headerSearch"
                     v-if="query.type==1"
                 />
                 <el-date-picker
@@ -44,17 +46,9 @@
                     value-format="YYYY-MM"
                     format="YYYY-MM"
                     placeholder="月份"
+                    class="headerSearch"
                     v-if="query.type==0"
                 />
-
-                <!-- <el-date-picker
-                    v-model="query.day"
-                    type="date"
-                    value-format="YYYY-MM-DD"
-                    format="YYYY-MM-DD"
-                    placeholder="日"
-                    v-if="query.type==0"
-                /> -->
                 <el-button
                 type="primary"
                 icon="el-icon-search"
diff --git a/src/views/ungrouped/report.vue b/src/views/ungrouped/report.vue
index 6c3cdde1..dcd8ff26 100644
--- a/src/views/ungrouped/report.vue
+++ b/src/views/ungrouped/report.vue
@@ -7,6 +7,7 @@
                     v-model="type"
                     placeholder="查询类型"
                     clearable
+                    class="headerSearch"
                     @change="typeCange"
                   >
                     <el-option
@@ -157,7 +158,7 @@
                 });
             },
             
-            
+            getTableData(){},
             handlePrint() {
                 this.$PRINT('#myReport');
             },
diff --git a/src/views/ungrouped/team.vue b/src/views/ungrouped/team.vue
index 1d8d6d7f..54243c7b 100644
--- a/src/views/ungrouped/team.vue
+++ b/src/views/ungrouped/team.vue
@@ -2,7 +2,7 @@
 	<el-container>
 		<el-header>
 			<div class="left-panel">
-				<el-button type="primary" icon="el-icon-plus" @click="roleAdd" v-auth="'role.create'"></el-button>
+				<el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-auth="'team.create'"></el-button>
 			</div>
 			<div class="right-panel">
 				<div class="right-panel-search">
@@ -20,11 +20,11 @@
 				<el-table-column label="创建时间" prop="create_time" min-width="150"></el-table-column>
 				<el-table-column label="操作" fixed="right" align="center" width="140">
 					<template #default="scope">
-						<el-button link size="small" @click="roleEdit(scope.row)" v-auth="'team.update'" type="primary">编辑</el-button>
+						<el-button link size="small" @click="handleEdit(scope.row)" v-auth="'team.update'" type="primary">编辑</el-button>
 						<el-divider direction="vertical"></el-divider>
-						<el-popconfirm title="确定删除吗？" @confirm="roleDel(scope.row, scope.$index)">
+						<el-popconfirm title="确定删除吗？" @confirm="handleDel(scope.row, scope.$index)">
 							<template #reference>
-								<el-button link size="small" v-auth="'role.delete'" type="danger">删除</el-button>
+								<el-button link size="small" v-auth="'team.delete'" type="danger">删除</el-button>
 							</template>
 						</el-popconfirm>
 					</template>
@@ -106,7 +106,6 @@
 			}
 		},
 		mounted() {
-			this.getList();
 			this.getGroup();
 		},
 		methods: {
@@ -120,13 +119,8 @@
 					this.group = res.results;
 				});
 			},
-			//获取班组列表
-			getList(){
-				var res = this.$API.system.role.list.req();
-				this.tableData = res.results;
-			},
 			//添加班组
-			roleAdd(){
+			handleAdd(){
 				this.limitedVisible = true;
 				this.type = "add";
 				this.form = Object.assign({}, defaultForm);
@@ -158,14 +152,13 @@
 			},
 
 			//编辑班组
-			roleEdit(row){
+			handleEdit(row){
 				this.type='edit';
 				this.form=row;
 				this.limitedVisible = true;
 			},
-
 			//删除班组
-			async roleDel(row){
+			async handleDel(row){
 				var id = row.id;
 				var res = await this.$API.mtm.team.delete.req(id);
 				if(res.err_msg){