From dbc353df202c4ac1eb482043ca987cf644200737 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 17 Aug 2023 14:10:49 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inventory/DeviceInspectPlanAuditModify.vue | 2 +-
 src/views/inventory/DeviceInspectPlanModify.vue      | 2 +-
 src/views/inventory/DeviceInspectTakeAdd.vue         | 2 +-
 src/views/inventory/DeviceInspectTakeAuditModify.vue | 2 +-
 src/views/inventory/DeviceInspectTakeSelect.vue      | 4 ++--
 src/views/inventory/DeviceProjectSet.vue             | 2 +-
 src/views/inventory/DeviceRepairOrderAudit.vue       | 2 +-
 src/views/inventory/DeviceRepairOrderAuditModify.vue | 2 +-
 src/views/inventory/DeviceRepairOrderDetails.vue     | 2 +-
 src/views/inventory/DeviceRepairOrderModify.vue      | 2 +-
 src/views/inventory/DeviceRepairOrderNew.vue         | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/views/inventory/DeviceInspectPlanAuditModify.vue b/src/views/inventory/DeviceInspectPlanAuditModify.vue
index df6ec423..3bfa8a4b 100644
--- a/src/views/inventory/DeviceInspectPlanAuditModify.vue
+++ b/src/views/inventory/DeviceInspectPlanAuditModify.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card style="margin: 5px;margin-top: -20px">
+    <el-card style="margin-top: -10px">
       <el-form :model="inspectPlan" ref="formRef" :rules="formRules" label-width="120px" style="margin-bottom: -15px">
         <el-button-group style="display: flex;margin: 0px 0 10px 85%; height: 35px">
           <el-button type="primary" @click.native="submit(2)">审核通过</el-button>
diff --git a/src/views/inventory/DeviceInspectPlanModify.vue b/src/views/inventory/DeviceInspectPlanModify.vue
index 34a95fd6..cedd385e 100644
--- a/src/views/inventory/DeviceInspectPlanModify.vue
+++ b/src/views/inventory/DeviceInspectPlanModify.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card style="margin: 5px;margin-top: -20px">
+    <el-card style="margin-top: -10px">
       <el-form :model="inspectPlan" ref="formRef" :rules="formRules" label-width="120px" style="margin-bottom: -15px">
         <el-button-group style="display: flex;margin: 0px 0 10px 80%; height: 35px">
           <el-button
diff --git a/src/views/inventory/DeviceInspectTakeAdd.vue b/src/views/inventory/DeviceInspectTakeAdd.vue
index 544444d9..8ca211ee 100644
--- a/src/views/inventory/DeviceInspectTakeAdd.vue
+++ b/src/views/inventory/DeviceInspectTakeAdd.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card style="margin: 5px;margin-top: -20px">
+    <el-card style="margin-top: -10px">
       <el-form :model="inspectTake" ref="formRef" label-width="120px" style="margin-bottom: -15px" :rules="rules">
         <el-button-group style="display: flex;margin: 0px 0 10px 75%; height: 35px" v-if="type != 3">
           <el-button
diff --git a/src/views/inventory/DeviceInspectTakeAuditModify.vue b/src/views/inventory/DeviceInspectTakeAuditModify.vue
index aa63588f..27469360 100644
--- a/src/views/inventory/DeviceInspectTakeAuditModify.vue
+++ b/src/views/inventory/DeviceInspectTakeAuditModify.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card style="margin: 5px;margin-top: -20px">
+    <el-card style="margin-top: -10px">
       <el-form :model="inspectTake" ref="formRef" label-width="120px" style="margin-bottom: -15px">
         <el-button-group style="display: flex;margin: 0px 0 10px 90%; height: 35px">
           <el-button type="primary" v-if="type != 5" @click.native="submit(type)">提交</el-button>
diff --git a/src/views/inventory/DeviceInspectTakeSelect.vue b/src/views/inventory/DeviceInspectTakeSelect.vue
index b1b73c6e..e269433d 100644
--- a/src/views/inventory/DeviceInspectTakeSelect.vue
+++ b/src/views/inventory/DeviceInspectTakeSelect.vue
@@ -144,7 +144,7 @@
         <el-table-column label="提醒时间" prop="remindTime" width="150"></el-table-column>
         <el-table-column label="巡检人" prop="inspectName" width="150"></el-table-column>
         <el-table-column label="预计结束时间时间" prop="expectedTime" width="150"></el-table-column>
-        <el-table-column label="操作">
+        <el-table-column label="操作" fixed="right" width="100">
           <template slot-scope="scope">
             <el-button
                 type="text"
@@ -196,7 +196,7 @@
             <div style="color: #1890ff;" @click="showImgViewer(scope.row)">{{ scope.row.inspectImage }}</div>
           </template>
         </el-table-column>
-        <el-table-column label="操作" width="100">
+        <el-table-column label="操作" width="100" >
           <template slot-scope="scope">
             <el-button
               type="text"
diff --git a/src/views/inventory/DeviceProjectSet.vue b/src/views/inventory/DeviceProjectSet.vue
index 4b56e007..f92f7f0f 100644
--- a/src/views/inventory/DeviceProjectSet.vue
+++ b/src/views/inventory/DeviceProjectSet.vue
@@ -278,7 +278,7 @@ export default {
       this.deviceRepairOrder = row;
     },
     deleteDialog(rowId) {
-      this.$confirm('此操作将永久删除该领用记录, 是否继续?', '提示', {
+      this.$confirm('此操作将永久删除该维保设备清单, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
diff --git a/src/views/inventory/DeviceRepairOrderAudit.vue b/src/views/inventory/DeviceRepairOrderAudit.vue
index 49d4cb4b..0e30fd62 100644
--- a/src/views/inventory/DeviceRepairOrderAudit.vue
+++ b/src/views/inventory/DeviceRepairOrderAudit.vue
@@ -358,7 +358,7 @@ export default {
         });
     },
     deleteDialog(rowId) {
-      this.$confirm('此操作将永久删除该领用记录, 是否继续?', '提示', {
+      this.$confirm('此操作将永久删除该报修单, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
diff --git a/src/views/inventory/DeviceRepairOrderAuditModify.vue b/src/views/inventory/DeviceRepairOrderAuditModify.vue
index 4cf866d0..cd2c6fe1 100644
--- a/src/views/inventory/DeviceRepairOrderAuditModify.vue
+++ b/src/views/inventory/DeviceRepairOrderAuditModify.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card style="margin: 5px;margin-top: -20px">
+    <el-card style="margin-top: -10px">
       <el-form :model="repairOrder" ref="dataForm" label-width="100px"  :rules="formRules" style="margin-bottom: -15px" >
         <el-button-group style="display: flex;margin: 0px 0 10px 80%; height: 35px">
           <!--<el-button-->
diff --git a/src/views/inventory/DeviceRepairOrderDetails.vue b/src/views/inventory/DeviceRepairOrderDetails.vue
index 598170c1..3724fed9 100644
--- a/src/views/inventory/DeviceRepairOrderDetails.vue
+++ b/src/views/inventory/DeviceRepairOrderDetails.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card style="margin: 5px;margin-top: -20px">
+    <el-card style="margin-top: -10px">
       <el-form :model="repairOrder" ref="dataForm" label-width="120px" style="margin-bottom: -15px">
 
         <el-row>
diff --git a/src/views/inventory/DeviceRepairOrderModify.vue b/src/views/inventory/DeviceRepairOrderModify.vue
index b283eb2b..52d289d0 100644
--- a/src/views/inventory/DeviceRepairOrderModify.vue
+++ b/src/views/inventory/DeviceRepairOrderModify.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card style="margin: 5px;margin-top: -20px">
+    <el-card style="margin-top: -10px">
       <el-form :model="repairOrder" ref="dataForm" label-width="120px" style="margin-bottom: -15px" :rules="formRules">
         <el-button-group style="display: flex;margin: 0px 0 10px 80%; height: 35px">
           <el-button
diff --git a/src/views/inventory/DeviceRepairOrderNew.vue b/src/views/inventory/DeviceRepairOrderNew.vue
index f5e8d036..e812fe5b 100644
--- a/src/views/inventory/DeviceRepairOrderNew.vue
+++ b/src/views/inventory/DeviceRepairOrderNew.vue
@@ -374,7 +374,7 @@ export default {
       });
     },
     deleteDialog(rowId) {
-      this.$confirm('此操作将永久删除该领用记录, 是否继续?', '提示', {
+      this.$confirm('此操作将永久删除该报修单, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

From 51c2ebc91b5e4fe82cff6f69263ace4b1025a376 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Fri, 18 Aug 2023 14:51:20 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=88=86=E6=94=AF?=
 =?UTF-8?q?=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inventory/AssetManage.vue | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/views/inventory/AssetManage.vue b/src/views/inventory/AssetManage.vue
index 9763dba3..b17673da 100644
--- a/src/views/inventory/AssetManage.vue
+++ b/src/views/inventory/AssetManage.vue
@@ -56,17 +56,17 @@
           <el-table-column label="规格型号" prop="ggxh" width="180"></el-table-column>
           <el-table-column label="医疗器械注册/备案人名称" prop="ylqxzcrbarmc" width="180"></el-table-column>
           <el-table-column label="批准文号" prop="zczbhhzbapzbh" width="180"></el-table-column>
-          <el-table-column label="操作" >
-            <template slot-scope="scope">
-              <el-button
-                type="text"
-                size="small"
-                @click.native.stop="addMAOrder(scope.row)"
-              >养护
-              </el-button
-              >
-            </template>
-          </el-table-column>
+<!--          <el-table-column label="操作" >-->
+          <!--            <template slot-scope="scope">-->
+          <!--              <el-button-->
+          <!--                type="text"-->
+          <!--                size="small"-->
+          <!--                @click.native.stop="addMAOrder(scope.row)"-->
+          <!--              >养护-->
+          <!--              </el-button-->
+          <!--              >-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
         </el-table>
       </el-tab-pane>
     </el-tabs>