From c42e7c8b2fc433e6f9ca6a7ebb3d0ac5df05e660 Mon Sep 17 00:00:00 2001
From: jiayang yue <jiayang.yue@xujiesoft.com>
Date: Tue, 3 Jun 2025 12:10:13 +0800
Subject: [PATCH] =?UTF-8?q?2025.06.03=201=E3=80=81=09=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7=EF=BC=9A100613=20=20=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=EF=BC=9A=E7=BB=B4=E4=BF=AE=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=97=B6=E9=97=B4=E7=AD=9B=E9=80=89=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=20=20=20=20=20=20=20=20=20=20=20=20=E7=9B=AE=E5=89=8D?=
 =?UTF-8?q?=E6=8D=A2=E7=BA=BF=E4=B8=93=E5=AE=B6=E7=BB=84=E7=BB=B4=E4=BF=AE?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E3=80=81=E8=AE=BE=E5=A4=87=E7=BB=B4=E4=BF=AE?=
 =?UTF-8?q?=E7=BB=84=E7=BB=B4=E4=BF=AE=E5=B7=A5=E5=8D=95=E9=83=BD=E6=9C=89?=
 =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E8=AE=B0=E5=BD=95=E5=8A=9F=E8=83=BD=202?=
 =?UTF-8?q?=E3=80=81=09=E9=97=AE=E9=A2=98=E7=BC=96=E5=8F=B7=EF=BC=9A200029?=
 =?UTF-8?q?=20=20=E9=97=AE=E9=A2=98=E6=8F=8F=E8=BF=B0=EF=BC=9A=E7=BB=B4?=
 =?UTF-8?q?=E4=BF=9D=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95=E9=87=8C=E7=9A=84?=
 =?UTF-8?q?=E7=BB=B4=E4=BF=9D=E9=A1=B9=E7=9B=AE=E5=8F=AF=E4=BB=A5=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=8E=92=E5=BA=8F=EF=BC=8C=E4=BF=9D=E5=85=BB?=
 =?UTF-8?q?=E6=96=B9=E4=BE=BF=20=E7=BB=B4=E4=BF=9D=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E9=87=8C=E7=9A=84=E7=BB=B4=E4=BF=9D=E9=A1=B9=E7=9B=AE=E7=9B=AE?=
 =?UTF-8?q?=E5=89=8D=E4=B8=8D=E5=8F=AF=E4=BB=A5=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=EF=BC=8C=E7=82=B9=E6=A3=80=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E9=87=8C=E7=9A=84=E7=82=B9=E6=A3=80=E9=A1=B9=E7=9B=AE=E5=90=8C?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E5=8F=AF=E4=BB=A5=E5=8F=82=E8=80=83QMS?=
 =?UTF-8?q?=E9=87=8C=E7=9A=84=E6=A3=80=E9=AA=8C=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/eam/eam.js                            |  5 ++
 src/views/modules/eam/eamMaintenanceModel.vue | 52 ++++++++++++++++++-
 src/views/modules/eam/eamPropertiesModel.vue  | 52 ++++++++++++++++++-
 .../modules/eam/eamWorkOrderForDefect.vue     | 40 ++++++++++++--
 .../modules/eam/eamWorkOrderForDefect2.vue    | 40 ++++++++++++--
 5 files changed, 181 insertions(+), 8 deletions(-)

diff --git a/src/api/eam/eam.js b/src/api/eam/eam.js
index ba9ee37..2719352 100644
--- 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)
+
diff --git a/src/views/modules/eam/eamMaintenanceModel.vue b/src/views/modules/eam/eamMaintenanceModel.vue
index 126169f..06c4d99 100644
--- 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 = {
diff --git a/src/views/modules/eam/eamPropertiesModel.vue b/src/views/modules/eam/eamPropertiesModel.vue
index a9aba94..e23b297 100644
--- 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 = {
diff --git a/src/views/modules/eam/eamWorkOrderForDefect.vue b/src/views/modules/eam/eamWorkOrderForDefect.vue
index 3964841..c882505 100644
--- 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) {
diff --git a/src/views/modules/eam/eamWorkOrderForDefect2.vue b/src/views/modules/eam/eamWorkOrderForDefect2.vue
index 0bd504f..6402536 100644
--- 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) {