From b09c93a7880b00791bb259150e9b6f24ffb37ab7 Mon Sep 17 00:00:00 2001
From: yangzhicheng <dayu123@qq.com>
Date: Wed, 17 Jul 2024 15:52:38 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=BF=85=E9=A1=BB?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/spares/materialDetail.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/views/spares/materialDetail.vue b/src/views/spares/materialDetail.vue
index 4614e43..4627085 100644
--- a/src/views/spares/materialDetail.vue
+++ b/src/views/spares/materialDetail.vue
@@ -240,7 +240,12 @@
                 label: "name",
                 value: "code",
               },
-              span: 8
+              span: 8,
+              rules: [{
+                required: true,
+                message: "请输入所属仓库",
+                trigger: "blur"
+              }]
             },
             {
               label: "供应商统一社会信用代码",

From f7077da8ad155275bfe0bd8e0c5bed927c9ad762 Mon Sep 17 00:00:00 2001
From: yangzhicheng <dayu123@qq.com>
Date: Wed, 17 Jul 2024 16:02:31 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=97=B6=20=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E4=B8=8D=E5=8F=AF=E7=82=B9=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inspection/inspectionPlanDetail.vue  | 14 +++++++++++++-
 src/views/inspection/inspectionrouteDetail.vue | 14 +++++++++++++-
 src/views/spares/materialDetail.vue            | 14 +++++++++++++-
 3 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/src/views/inspection/inspectionPlanDetail.vue b/src/views/inspection/inspectionPlanDetail.vue
index bd8d2bd..a8578f0 100644
--- a/src/views/inspection/inspectionPlanDetail.vue
+++ b/src/views/inspection/inspectionPlanDetail.vue
@@ -261,22 +261,34 @@
 </script>
 
 <style>
-.frame_class input.el-input__inner {
+
+.frame_class .el-input__inner,
+.frame_class .el-textarea__inner {
   border: none;
   box-shadow: none;
   outline: none;
   pointer-events: none;
 }
+
 .frame_class .el-input__icon {
   display: none;
 }
+
 .frame_class .el-input--prefix .el-input__inner {
   padding-left: 15px;
 }
+
 .frame_class input::placeholder {
   color: transparent;
   display: none; /* 默认隐藏 */
 }
+
+.frame_class div.el-select--small {
+  border: none;
+  box-shadow: none;
+  outline: none;
+  pointer-events: none;
+}
 .container {
   display: flex;
   justify-content: flex-end; /* 将子元素推到容器的末端 */
diff --git a/src/views/inspection/inspectionrouteDetail.vue b/src/views/inspection/inspectionrouteDetail.vue
index f4c7f51..bc3e3f7 100644
--- a/src/views/inspection/inspectionrouteDetail.vue
+++ b/src/views/inspection/inspectionrouteDetail.vue
@@ -218,22 +218,34 @@
 </script>
 
 <style>
-.frame_class input.el-input__inner {
+
+.frame_class .el-input__inner,
+.frame_class .el-textarea__inner {
   border: none;
   box-shadow: none;
   outline: none;
   pointer-events: none;
 }
+
 .frame_class .el-input__icon {
   display: none;
 }
+
 .frame_class .el-input--prefix .el-input__inner {
   padding-left: 15px;
 }
+
 .frame_class input::placeholder {
   color: transparent;
   display: none; /* 默认隐藏 */
 }
+
+.frame_class div.el-select--small {
+  border: none;
+  box-shadow: none;
+  outline: none;
+  pointer-events: none;
+}
 .container {
   display: flex;
   justify-content: flex-end; /* 将子元素推到容器的末端 */
diff --git a/src/views/spares/materialDetail.vue b/src/views/spares/materialDetail.vue
index 4627085..ddf5f94 100644
--- a/src/views/spares/materialDetail.vue
+++ b/src/views/spares/materialDetail.vue
@@ -658,22 +658,34 @@
   background-color: #1e9fff !important;
   color: #FFFFFF !important;
 }
-.frame_class input.el-input__inner {
+.frame_class .el-input__inner,
+.frame_class .el-textarea__inner {
   border: none;
   box-shadow: none;
   outline: none;
   pointer-events: none;
 }
+
 .frame_class .el-input__icon {
   display: none;
 }
+
 .frame_class .el-input--prefix .el-input__inner {
   padding-left: 15px;
 }
+
 .frame_class input::placeholder {
   color: transparent;
   display: none; /* 默认隐藏 */
 }
+
+.frame_class div.el-select--small {
+  border: none;
+  box-shadow: none;
+  outline: none;
+  pointer-events: none;
+}
+
 .container {
   display: flex;
   justify-content: flex-end; /* 将子元素推到容器的末端 */

From 0163051880eb47842e40e02b1de972dced9a836b Mon Sep 17 00:00:00 2001
From: Dayu <1010@qq.com>
Date: Wed, 17 Jul 2024 16:19:40 +0800
Subject: [PATCH 3/4] =?UTF-8?q?bug=20=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/spares/material.vue | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/views/spares/material.vue b/src/views/spares/material.vue
index 8ca54a0..c434b2b 100644
--- a/src/views/spares/material.vue
+++ b/src/views/spares/material.vue
@@ -30,27 +30,31 @@
         <el-button type="primary"
                    size="small"
                    plain
-                   @click="handleDetailAdd">新增
+                   @click="handleDetailAdd"
+                   v-if="permission.material_add">新增
         </el-button>
         <el-button type="primary"
                    size="small"
                    plain
-                   @click="handleIn">入库
+                   @click="handleIn"
+                   v-if="permission.material_entry">入库
         </el-button>
         <el-button type="primary"
                    size="small"
                    plain
-                   @click="handleOut">出库
+                   @click="handleOut"
+                   v-if="permission.material_out">出库
         </el-button>
         <el-button type="primary"
                    size="small"
                    plain
-                   @click="handleExport()">导出
+                   @click="handleExport()"
+                   v-if="permission.material_export">导出
         </el-button>
       </template>
       <template #menu="{row,index,size}">
-        <el-button @click="handleDetailSearch(row,index)" type="text">查看</el-button>
-        <el-button @click="rowDel(row)" type="text">删除</el-button>
+        <el-button @click="handleDetailSearch(row,index)" type="text" v-if="permission.material_view">查看</el-button>
+        <el-button @click="rowDel(row)" type="text" v-if="permission.material_delete">删除</el-button>
       </template>
     </avue-crud>
     <el-dialog title="入库信息"
@@ -276,7 +280,11 @@
               },
               event: {
                 change: (val) => {
-                  if (!val) return
+                  if (!val) {
+                    this.inForm.materialName = '';
+                    this.inForm.model = '';
+                    this.inForm.warehouse = '';
+                  }
                   if (val) {
                     request({
                       url: '/api/spares/material/getDetailList',
@@ -368,7 +376,11 @@
               },
               event: {
                 change: (val) => {
-                  if (!val) return
+                  if (!val) {
+                    this.outForm.materialName = '';
+                    this.outForm.model = '';
+                    this.outForm.warehouse = '';
+                  }
                   if (val) {
                     request({
                       url: '/api/spares/material/getDetailList',

From 52adc5f92b1dbce99a9a499447e30c303ea38e21 Mon Sep 17 00:00:00 2001
From: Dayu <1010@qq.com>
Date: Wed, 17 Jul 2024 16:26:46 +0800
Subject: [PATCH 4/4] =?UTF-8?q?bug=20=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inspection/inspectiontasks.vue       | 18 +++++++++++-------
 src/views/inspection/inspectiontasksDetail.vue | 14 +++++++++++---
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/views/inspection/inspectiontasks.vue b/src/views/inspection/inspectiontasks.vue
index bb77f13..dc1479a 100644
--- a/src/views/inspection/inspectiontasks.vue
+++ b/src/views/inspection/inspectiontasks.vue
@@ -31,28 +31,32 @@
         <el-button type="primary"
                    size="small"
                    plain
-                   @click="handleDetailAdd">新增
+                   @click="handleDetailAdd"
+                   v-if="permission.inspectiontasks_add">新增
         </el-button>
         <el-button type="primary"
                    size="small"
                    plain
-                   @click="handleAction">启动
+                   @click="handleAction"
+                   v-if="permission.inspectiontasks_action">启动
         </el-button>
         <el-button type="primary"
                    size="small"
                    plain
-                   @click="handleStop">停止
+                   @click="handleStop"
+                   v-if="permission.inspectiontasks_stop">停止
         </el-button>
         <el-button type="primary"
                    size="small"
                    plain
-                   @click="handleExport()">导出
+                   @click="handleExport()"
+                   v-if="permission.inspectiontasks_export">导出
         </el-button>
       </template>
       <template #menu="{row,index,size}">
-        <el-button @click="handleDetailSearch(row,index)" type="text">详情</el-button>
-        <el-button @click="resultAdd(row)" type="text">上传巡检结果</el-button>
-        <el-button @click="rowDel(row)" type="text">删除</el-button>
+        <el-button @click="handleDetailSearch(row,index)" type="text" v-if="permission.inspectiontasks_view">详情</el-button>
+        <el-button @click="resultAdd(row)" type="text" v-if="permission.inspectiontasks_uploadRes">上传巡检结果</el-button>
+        <el-button @click="rowDel(row)" type="text" v-if="permission.inspectiontasks_delete">删除</el-button>
       </template>
     </avue-crud>
     <el-dialog title="上传处理结果"
diff --git a/src/views/inspection/inspectiontasksDetail.vue b/src/views/inspection/inspectiontasksDetail.vue
index 29174bc..c3c4970 100644
--- a/src/views/inspection/inspectiontasksDetail.vue
+++ b/src/views/inspection/inspectiontasksDetail.vue
@@ -29,12 +29,12 @@
           <el-button type="primary"
                      size="large"
                      @click="handleFormSubmit"
-                     v-if="addUpdateShowButton">
+                     v-if="addUpdateShowButton && permission.inspectiontasks_add">
                      确定</el-button>
           <el-button type="primary"
                      size="small"
                      @click="seachToUpdate"
-                     v-if="shouldShowButton">
+                     v-if="shouldShowButton && permission.inspectiontasks_edit">
                       修改</el-button>
        </span>
     </div>
@@ -509,7 +509,8 @@ export default {
   background-color: #3366cc !important;
   color: #FFFFFF !important;
 }
-.information_class input.el-input__inner {
+.information_class .el-input__inner,
+.information_class .el-textarea__inner {
   border: none;
   box-shadow: none;
   outline: none;
@@ -525,10 +526,17 @@ export default {
   color: transparent;
   display: none; /* 默认隐藏 */
 }
+
 .container {
   display: flex;
   justify-content: flex-end; /* 将子元素推到容器的末端 */
 }
+.information_class div.el-select--small {
+  border: none;
+  box-shadow: none;
+  outline: none;
+  pointer-events: none;
+}
 
 .check_status_class {
   display: flex;