From c047f3ed02e9dc685909ef76e911d76701502823 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 28 Mar 2024 16:13:50 +0800
Subject: [PATCH] =?UTF-8?q?2024-03-28=20=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/eam/eamFeedBack.vue         |  2 +-
 .../modules/eam/eamWorkOrderForCheck.vue      |  2 +-
 .../modules/eam/eamWorkOrderForDefect.vue     |  2 +-
 .../modules/partspare/inventorystock.vue      | 48 +++++++++++++++++++
 .../partspare/partspare-add-or-update.vue     |  6 +--
 .../reportWorkOrder/reportCheckOrder.vue      |  2 +-
 .../reportWorkOrder/reportDefectOrder.vue     |  2 +-
 7 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/src/views/modules/eam/eamFeedBack.vue b/src/views/modules/eam/eamFeedBack.vue
index 63f1649..a6d2716 100644
--- a/src/views/modules/eam/eamFeedBack.vue
+++ b/src/views/modules/eam/eamFeedBack.vue
@@ -168,7 +168,7 @@
     </el-dialog>
 
     <!-- 新增 -->
-    <el-dialog title="设备故障报备" :close-on-click-modal="false" v-drag :visible.sync="saveModalFlag" width="500px">
+    <el-dialog title="设备故障报备" top="25vh" :close-on-click-modal="false" v-drag :visible.sync="saveModalFlag" width="500px">
       <el-form :inline="true" label-position="top" :model="saveModalData" :rules="saveRules" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item label="BU" prop="bu" :rules="saveRules.bu">
           <el-select v-model="saveModalData.bu" placeholder="请选择" :disabled="modalDisableFlag" style="width: 456px">
diff --git a/src/views/modules/eam/eamWorkOrderForCheck.vue b/src/views/modules/eam/eamWorkOrderForCheck.vue
index e2b8e7d..ef58355 100644
--- a/src/views/modules/eam/eamWorkOrderForCheck.vue
+++ b/src/views/modules/eam/eamWorkOrderForCheck.vue
@@ -148,7 +148,7 @@
       layout="total, sizes, prev, pager, next, jumper">
     </el-pagination>
 
-    <el-dialog title="执行结果" :close-on-click-modal="false" v-drag :visible.sync="detailModelFlag" width="1200px">
+    <el-dialog title="执行结果" top="8vh" :close-on-click-modal="false" v-drag :visible.sync="detailModelFlag" width="1200px">
       <el-form :inline="true" label-position="top">
         <el-form-item :label="'工单号'">
           <el-input v-model="saveData.orderNo" disabled style="width: 221px"></el-input>
diff --git a/src/views/modules/eam/eamWorkOrderForDefect.vue b/src/views/modules/eam/eamWorkOrderForDefect.vue
index 5cb9dc3..cf5107d 100644
--- a/src/views/modules/eam/eamWorkOrderForDefect.vue
+++ b/src/views/modules/eam/eamWorkOrderForDefect.vue
@@ -198,7 +198,7 @@
       </el-footer>
     </el-dialog>
 
-    <el-dialog title="执行结果" :close-on-click-modal="false" v-drag :visible.sync="detailModelFlag" width="960px">
+    <el-dialog title="执行结果" top="22vh" :close-on-click-modal="false" v-drag :visible.sync="detailModelFlag" width="960px">
       <el-form :inline="true" label-position="top">
         <el-form-item :label="'设备编码'">
           <el-input v-model="detailData.objectID" disabled style="width: 221px"></el-input>
diff --git a/src/views/modules/partspare/inventorystock.vue b/src/views/modules/partspare/inventorystock.vue
index 6a44d3d..4cf3fca 100644
--- a/src/views/modules/partspare/inventorystock.vue
+++ b/src/views/modules/partspare/inventorystock.vue
@@ -273,6 +273,30 @@ export default {
           fixed: '',
           columnWidth: 140,
         }, {
+          columnProp: 'maxStock',
+          headerAlign: "center",
+          align: "right",
+          columnLabel: '最高库存数量',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 140,
+        }, {
+          columnProp: 'minStock',
+          headerAlign: "center",
+          align: "right",
+          columnLabel: '最低库存数量',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 140,
+        },{
           columnProp: 'spec',
           headerAlign: "center",
           align: "right",
@@ -386,6 +410,30 @@ export default {
           fixed: '',
           columnWidth: 140,
         }, {
+          columnProp: 'maxStock',
+          headerAlign: "center",
+          align: "right",
+          columnLabel: '最高库存数量',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 140,
+        }, {
+          columnProp: 'minStock',
+          headerAlign: "center",
+          align: "right",
+          columnLabel: '最低库存数量',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 140,
+        },{
           columnProp: 'spec',
           headerAlign: "center",
           align: "left",
diff --git a/src/views/modules/partspare/partspare-add-or-update.vue b/src/views/modules/partspare/partspare-add-or-update.vue
index 3fbc568..0494610 100644
--- a/src/views/modules/partspare/partspare-add-or-update.vue
+++ b/src/views/modules/partspare/partspare-add-or-update.vue
@@ -29,15 +29,15 @@
           <el-input v-model="dataForm.umid"></el-input>
         </el-form-item>
         <el-form-item required label="预计使用寿命">
-          <el-input-number :min="0" style="width: 146px" v-model="dataForm.estUseQty" :step="2"
+          <el-input-number :min="0" style="width: 146px" v-model="dataForm.estUseQty"
                            step-strictly></el-input-number>
         </el-form-item>
         <el-form-item required label="最高库存数量">
-          <el-input-number :min="0" style="width: 146px" v-model="dataForm.maxStock" :step="2"
+          <el-input-number :min="0" style="width: 146px" v-model="dataForm.maxStock"
                            step-strictly></el-input-number>
         </el-form-item>
         <el-form-item required label="最低库存数量">
-          <el-input-number :min="0" style="width: 146px" v-model="dataForm.minStock" :step="2"
+          <el-input-number :min="0" style="width: 146px" v-model="dataForm.minStock"
                            step-strictly></el-input-number>
         </el-form-item>
         <el-form-item required label="状态">
diff --git a/src/views/modules/reportWorkOrder/reportCheckOrder.vue b/src/views/modules/reportWorkOrder/reportCheckOrder.vue
index ed67f29..96404bc 100644
--- a/src/views/modules/reportWorkOrder/reportCheckOrder.vue
+++ b/src/views/modules/reportWorkOrder/reportCheckOrder.vue
@@ -118,7 +118,7 @@
       layout="total, sizes, prev, pager, next, jumper">
     </el-pagination>
 
-    <el-dialog title="执行点检工单" :close-on-click-modal="false" v-drag :visible.sync="detailModelFlag" width="1200px">
+    <el-dialog title="执行点检工单" top="8vh" :close-on-click-modal="false" v-drag :visible.sync="detailModelFlag" width="1200px">
       <el-form :inline="true" label-position="top" @keyup.enter.native="getDataList()">
         <el-form-item :label="'工单号'">
           <el-input v-model="saveData.orderNo" disabled style="width: 221px"></el-input>
diff --git a/src/views/modules/reportWorkOrder/reportDefectOrder.vue b/src/views/modules/reportWorkOrder/reportDefectOrder.vue
index 614b84d..02d9e53 100644
--- a/src/views/modules/reportWorkOrder/reportDefectOrder.vue
+++ b/src/views/modules/reportWorkOrder/reportDefectOrder.vue
@@ -130,7 +130,7 @@
       layout="total, sizes, prev, pager, next, jumper">
     </el-pagination>
 
-    <el-dialog title="执行维修工单" :close-on-click-modal="false" v-drag :visible.sync="detailModelFlag" width="1200px">
+    <el-dialog title="执行维修工单" top="22vh" :close-on-click-modal="false" v-drag :visible.sync="detailModelFlag" width="1200px">
       <el-form :inline="true" label-position="top" @keyup.enter.native="getDataList()">
         <el-form-item :label="'工单号'">
           <el-input v-model="saveData.orderNo" disabled style="width: 221px"></el-input>