2025.06.03 1、问题编号：100613 问题描述：维修记录没有时间筛选功能

目前换线专家组维修工单、设备维修组维修工单都有维修记录功能 2、问题编号：200029 问题描述：维保项目清单里的维保项目可以自定义排序，保养方便维保模板里的维保项目目前不可以自定义排序，点检模板里的点检项目同理，可以参考QMS里的检验模板
7 months ago · c42e7c8b2f
5 changed files with 181 additions and 8 deletions
--- a/src/api/eam/eam.js
+++ b/src/api/eam/eam.js
@ -256,3 +256,8 @@ export const checkWorkOrders = data => createAPI(`/pms/eam/checkWorkOrders`,'pos

 // 换线专家组维修执行 转单
 export const updateRepairTypes = data => createAPI(`/pms/eam/updateRepairTypes`,'post',data)
+
+// 维保模版点检模版项目上下移
+export const goUpItemEam = data => createAPI(`/pms/eam/goUpItemEam`,'post',data)
+export const goDownItemEam = data => createAPI(`/pms/eam/goDownItemEam`,'post',data)
+
--- a/src/views/modules/eam/eamMaintenanceModel.vue
+++ b/src/views/modules/eam/eamMaintenanceModel.vue
@ -162,13 +162,18 @@
        </el-form-item>
        <el-form-item label=" ">
          <el-button type="primary" @click="addFastModal()">新增</el-button>
+          <el-button type="primary" @click="goUp()">上移</el-button>
+          <el-button type="primary" @click="goDown()">下移</el-button>
        </el-form-item>
      </el-form>
      <el-table
        :height="300"
        :data="detailList"
        border
+        @row-click="itemClickRow"
        v-loading="dataListLoading"
+        ref="detailTable"
+        highlight-current-row
        style="width: 100%;">
        <el-table-column
          v-for="(item,index) in columnDetailList" :key="index"
@ -379,7 +384,9 @@
    getItemLists,
    deleteModalDetail, // 项目单删
    getSiteAndBuByUserName,
-    getRoleByUserName
+    getRoleByUserName,
+    goUpItemEam,
+    goDownItemEam,
  } from "@/api/eam/eam.js"
  import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
  import Chooselist from '@/views/modules/common/Chooselist_eam'
@ -806,6 +813,9 @@
          itemDesc: '',
          itemType: 'B',
          valueTypeDb: '',
+        },
+        currentRow:{
+
        },
        //---------快速添加----------
        fastAddFlag: false,
@ -1257,6 +1267,10 @@
        this.$refs.itemTable1.toggleRowSelection(row)
      },

+      itemClickRow(row){
+        this.currentRow= JSON.parse(JSON.stringify(row))
+      },
+
      // 已有项目
      itemClickRow2 (row) {
        this.$refs.itemTable2.toggleRowSelection(row)
@ -1341,6 +1355,42 @@
        })
      },

+      goUp() {
+        goUpItemEam(this.currentRow).then(({data}) => {
+          if (data && data.code === 0) {
+            searchModalDetails(this.detailData).then(({data}) => {
+              this.detailList = data.rows
+              for (let i = 0; i <this.detailList.length ; i++) {
+                if(this.detailList[i].itemNo===this.currentRow.itemNo){
+                  this.$refs.detailTable.setCurrentRow(this.detailList[i]);
+                  this.currentRow=JSON.parse(JSON.stringify(this.detailList[i]))
+                  this.$message.success('操作成功')
+                }
+              }
+              //this.objectSearch()
+            })
+          }
+        })
+
+      },
+      goDown() {
+        goDownItemEam(this.currentRow).then(({data}) => {
+          if (data && data.code === 0) {
+            searchModalDetails(this.detailData).then(({data}) => {
+              this.detailList = data.rows
+              for (let i = 0; i <this.detailList.length ; i++) {
+                if(this.detailList[i].itemNo===this.currentRow.itemNo){
+                  this.$refs.detailTable.setCurrentRow(this.detailList[i]);
+                  this.currentRow=JSON.parse(JSON.stringify(this.detailList[i]))
+                  this.$message.success('操作成功')
+                }
+              }
+            })
+          }
+        })
+
+      },
+
      // 动态列开始 获取 用户保存的 格式列
      async getTableUserColumn (tableId, columnId) {
        let queryTableUser = {
--- a/src/views/modules/eam/eamPropertiesModel.vue
+++ b/src/views/modules/eam/eamPropertiesModel.vue
@ -161,12 +161,17 @@
        </el-form-item>
        <el-form-item label=" ">
          <el-button type="primary" @click="addFastModal()">新增</el-button>
+          <el-button type="primary" @click="goUp()">上移</el-button>
+          <el-button type="primary" @click="goDown()">下移</el-button>
        </el-form-item>
      </el-form>
      <el-table
        :height="300"
        :data="detailList"
        border
+        @row-click="itemClickRow"
+        ref="detailTable"
+        highlight-current-row
        style="width: 100%;">
        <el-table-column
          v-for="(item,index) in columnDetailList" :key="index"
@ -357,7 +362,9 @@
    getItemLists,
    deleteModalDetail, // 单删
    getSiteAndBuByUserName,
-    getRoleByUserName
+    getRoleByUserName,
+    goUpItemEam,
+    goDownItemEam,
  } from "@/api/eam/eam.js"
  import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
  import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
@ -783,6 +790,9 @@
          itemDesc: '',
          itemType:'A',
          valueTypeDb:'',
+        },
+        currentRow:{
+
        },
        //---------快速添加----------
        fastAddFlag: false,
@ -1201,6 +1211,10 @@
        this.$refs.itemTable1.toggleRowSelection(row);
      },

+      itemClickRow(row){
+        this.currentRow= JSON.parse(JSON.stringify(row))
+      },
+
      // 已有项目
      itemClickRow2 (row) {
        this.$refs.itemTable2.toggleRowSelection(row);
@ -1281,6 +1295,42 @@
        })
      },

+      goUp() {
+        goUpItemEam(this.currentRow).then(({data}) => {
+          if (data && data.code === 0) {
+            searchModalDetails(this.detailData).then(({data}) => {
+              this.detailList = data.rows
+              for (let i = 0; i <this.detailList.length ; i++) {
+                if(this.detailList[i].itemNo===this.currentRow.itemNo){
+                  this.$refs.detailTable.setCurrentRow(this.detailList[i]);
+                  this.currentRow=JSON.parse(JSON.stringify(this.detailList[i]))
+                  this.$message.success('操作成功')
+                }
+              }
+              //this.objectSearch()
+            })
+          }
+        })
+
+      },
+      goDown() {
+        goDownItemEam(this.currentRow).then(({data}) => {
+          if (data && data.code === 0) {
+            searchModalDetails(this.detailData).then(({data}) => {
+              this.detailList = data.rows
+              for (let i = 0; i <this.detailList.length ; i++) {
+                if(this.detailList[i].itemNo===this.currentRow.itemNo){
+                  this.$refs.detailTable.setCurrentRow(this.detailList[i]);
+                  this.currentRow=JSON.parse(JSON.stringify(this.detailList[i]))
+                  this.$message.success('操作成功')
+                }
+              }
+            })
+          }
+        })
+
+      },
+
      // 动态列开始 获取 用户保存的 格式列
      async getTableUserColumn (tableId, columnId) {
        let queryTableUser = {
--- a/src/views/modules/eam/eamWorkOrderForDefect.vue
+++ b/src/views/modules/eam/eamWorkOrderForDefect.vue
@ -454,7 +454,33 @@
            </div>
          </el-tab-pane>
          <el-tab-pane label="维修记录" name="history_record">
-            <div class="rq ">
+            <div class="rq " style="margin-top: -10px">
+              <el-form :inline="true" label-position="top" style="margin-top: 0px">
+                <el-form-item :label="'维修时间'">
+                  <el-date-picker
+                    style="width: 120px"
+                    v-model="detailData.startDate"
+                    type="date"
+                    value-format="yyyy-MM-dd"
+                    placeholder="选择日期">
+                  </el-date-picker>
+                </el-form-item>
+                <el-form-item style="margin-top: 23px;">
+                  <laber style="margin-left: -9px;font-size: 19px">&#10142</laber>
+                </el-form-item>
+                <el-form-item :label="' '">
+                  <el-date-picker
+                    style="width: 120px"
+                    v-model="detailData.endDate"
+                    type="date"
+                    value-format="yyyy-MM-dd"
+                    placeholder="选择日期">
+                  </el-date-picker>
+                </el-form-item>
+                <el-form-item :label="' '">
+                  <el-button v-if="!authSearch" @click="queryHistoryRecord()">查询</el-button>
+                </el-form-item>
+              </el-form>
              <el-table
                :height="295"
                :data="historyRecordList"
@ -1368,7 +1394,9 @@ export default {
        checkAssessment: '',
        checkNotes: '',
        knowledgeFlag: '',
-        shutdownWarranty: ''
+        shutdownWarranty: '',
+        startDate: '',
+        endDate: ''
      },
      detailModelFlag: false,
      descImages: [],
@ -2142,6 +2170,10 @@ export default {
        ...row,
        shutdownWarranty: row.repairReportingType === '设备故障' ? '是' : '否'
      }
+      // startDate为当前日期年月日，date类型
+      this.detailData.startDate = new Date()
+      // endDate为当前日期年月日加一个月，date类型
+      this.detailData.endDate = new Date(new Date().setMonth(new Date().getMonth() + 1))
      this.activeTable = 'inspection_form'
      this.detailModelFlag = true
    },
@ -2419,7 +2451,9 @@ export default {
        objectID: this.detailData.objectID,
        functionType: 'C',
        limit: this.pageSize2,
-        page: this.pageIndex2
+        page: this.pageIndex2,
+        startDate: this.detailData.startDate,
+        endDate: this.detailData.endDate,
      }
      queryHistoryRecord(tempData).then(({data}) => {
        if (data && data.code === 0) {
--- a/src/views/modules/eam/eamWorkOrderForDefect2.vue
+++ b/src/views/modules/eam/eamWorkOrderForDefect2.vue
@ -454,7 +454,33 @@
            </div>
          </el-tab-pane>
          <el-tab-pane label="维修记录" name="history_record">
-            <div class="rq ">
+            <div class="rq " style="margin-top: -10px">
+              <el-form :inline="true" label-position="top" style="margin-top: 0px">
+                <el-form-item :label="'维修时间'">
+                  <el-date-picker
+                    style="width: 120px"
+                    v-model="detailData.startDate"
+                    type="date"
+                    value-format="yyyy-MM-dd"
+                    placeholder="选择日期">
+                  </el-date-picker>
+                </el-form-item>
+                <el-form-item style="margin-top: 23px;">
+                  <laber style="margin-left: -9px;font-size: 19px">&#10142</laber>
+                </el-form-item>
+                <el-form-item :label="' '">
+                  <el-date-picker
+                    style="width: 120px"
+                    v-model="detailData.endDate"
+                    type="date"
+                    value-format="yyyy-MM-dd"
+                    placeholder="选择日期">
+                  </el-date-picker>
+                </el-form-item>
+                <el-form-item :label="' '">
+                  <el-button v-if="!authSearch" @click="queryHistoryRecord()">查询</el-button>
+                </el-form-item>
+              </el-form>
              <el-table
                :height="295"
                :data="historyRecordList"
@ -1368,7 +1394,9 @@ export default {
        checkAssessment: '',
        checkNotes: '',
        knowledgeFlag: '',
-        shutdownWarranty: ''
+        shutdownWarranty: '',
+        startDate: '',
+        endDate: ''
      },
      detailModelFlag: false,
      descImages: [],
@ -2143,6 +2171,10 @@ export default {
        ...row,
        shutdownWarranty: row.repairReportingType === '设备故障' ? '是' : '否'
      }
+      // startDate为当前日期年月日，date类型
+      this.detailData.startDate = new Date()
+      // endDate为当前日期年月日加一个月，date类型
+      this.detailData.endDate = new Date(new Date().setMonth(new Date().getMonth() + 1))
      this.activeTable = 'inspection_form'
      this.detailModelFlag = true
    },
@ -2419,7 +2451,9 @@ export default {
        objectID: this.detailData.objectID,
        functionType: 'C',
        limit: this.pageSize2,
-        page: this.pageIndex2
+        page: this.pageIndex2,
+        startDate: this.detailData.startDate,
+        endDate: this.detailData.endDate,
      }
      queryHistoryRecord(tempData).then(({data}) => {
        if (data && data.code === 0) {