Merge remote-tracking branch 'origin/main'

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; /* 将子元素推到容器的末端 */

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; /* 将子元素推到容器的末端 */

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="handleDetailSearch(row,index)" type="text" v-if="permission.inspectiontasks_view">详情</el-button>
-        <el-button @click="resultAdd(row)" type="text">上传巡检结果</el-button>
+        <el-button @click="resultAdd(row)" type="text" v-if="permission.inspectiontasks_uploadRes">上传巡检结果</el-button>
-        <el-button @click="rowDel(row)" type="text">删除</el-button>
+        <el-button @click="rowDel(row)" type="text" v-if="permission.inspectiontasks_delete">删除</el-button>
       </template>
     </avue-crud>
     <el-dialog title="上传处理结果"

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;

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="handleDetailSearch(row,index)" type="text" v-if="permission.material_view">查看</el-button>
-        <el-button @click="rowDel(row)" type="text">删除</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',

src/views/spares/materialDetail.vue

@@ -240,7 +240,12 @@
                 label: "name",
                 value: "code",
               },
-              span: 8
+              span: 8,
+              rules: [{
+                required: true,
+                message: "请输入所属仓库",
+                trigger: "blur"
+              }]
             },
             {
               label: "供应商统一社会信用代码",
@@ -653,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; /* 将子元素推到容器的末端 */