From 7df3e868bd8de7a5353dfc8dfb785743247a2b12 Mon Sep 17 00:00:00 2001
From: liuyiliang <azc78910>
Date: Wed, 24 Jul 2024 13:41:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/page/index/tags.vue                       |  3 ++
 src/styles/element-ui.scss                    |  3 ++
 src/views/leger/equipmentledgerDetail.vue     | 12 ++---
 src/views/leger/toolinventoryrecordDetail.vue | 12 ++---
 src/views/smart/operationticketDetail.vue     | 12 ++---
 src/views/smart/workorderDetail.vue           |  8 +--
 src/views/smart/workpermitDetail.vue          | 12 ++---
 src/views/spares/material.vue                 |  8 +--
 src/views/wel/index.vue                       | 52 ++++++++-----------
 9 files changed, 57 insertions(+), 65 deletions(-)

diff --git a/src/page/index/tags.vue b/src/page/index/tags.vue
index 05257e2..ee52d48 100644
--- a/src/page/index/tags.vue
+++ b/src/page/index/tags.vue
@@ -87,6 +87,9 @@ export default {
       window.removeEventListener("mousedown", this.watchContextmenu);
     },
     handleContextmenu(event) {
+      if (this.contextmenuFlag) {
+        return false;
+      }
       let target = event.target;
       // 解决 https://github.com/d2-projects/d2-admin/issues/54
       let flag = false;
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 76990e4..469e308 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -87,3 +87,6 @@ table {
 .el-table__header th {
   line-height: 49px; /* 设置你想要的行高 */
 }
+.el-table {
+  height: 540px !important;
+}
diff --git a/src/views/leger/equipmentledgerDetail.vue b/src/views/leger/equipmentledgerDetail.vue
index 1a6ad91..8b38c37 100644
--- a/src/views/leger/equipmentledgerDetail.vue
+++ b/src/views/leger/equipmentledgerDetail.vue
@@ -64,16 +64,16 @@
       </span>
      <div class="container">
        <span >
-          <el-button type="primary"
-                     size="large"
-                     @click="handleFormSubmit"
-                     v-if="addUpdateShowButton && permission.equipmentledger_add">
-                     确定</el-button>
           <el-button type="default"
-                     size="large"
+                     size="small"
                      @click="back"
                      v-if="addUpdateShowButton ">
                      取消</el-button>
+         <el-button type="primary"
+                    size="small"
+                    @click="handleFormSubmit"
+                    v-if="addUpdateShowButton && permission.equipmentledger_add">
+                     确定</el-button>
           <el-button type="primary"
                      size="small"
                       @click="auditing"
diff --git a/src/views/leger/toolinventoryrecordDetail.vue b/src/views/leger/toolinventoryrecordDetail.vue
index 8ef8906..f2880ad 100644
--- a/src/views/leger/toolinventoryrecordDetail.vue
+++ b/src/views/leger/toolinventoryrecordDetail.vue
@@ -100,16 +100,16 @@
       </span>
     <div class="container">
        <span >
-          <el-button type="primary"
-                     size="large"
-                     @click="handleFormSubmit"
-                     v-if="addUpdateShowButton && permission.toolinventoryrecord_add">
-                     确定</el-button>
           <el-button type="default"
-                     size="large"
+                     size="small"
                      @click="back"
                      v-if="addUpdateShowButton ">
                      取消</el-button>
+         <el-button type="primary"
+                    size="small"
+                    @click="handleFormSubmit"
+                    v-if="addUpdateShowButton && permission.toolinventoryrecord_add">
+                     确定</el-button>
           <el-button type="primary"
                      size="small"
                      @click="auditing"
diff --git a/src/views/smart/operationticketDetail.vue b/src/views/smart/operationticketDetail.vue
index 8cff9d5..8576423 100644
--- a/src/views/smart/operationticketDetail.vue
+++ b/src/views/smart/operationticketDetail.vue
@@ -51,16 +51,16 @@
       </span>
     <div class="container">
        <span >
-         <el-button type="primary"
-                              size="large"
-                              @click="handleFormSubmit"
-                              v-if="addUpdateShowButton">
-                     确定</el-button>
          <el-button type="default"
-                              size="large"
+                              size="small"
                               @click="back"
                               v-if="addUpdateShowButton">
                      取消</el-button>
+          <el-button type="primary"
+                     size="small"
+                     @click="handleFormSubmit"
+                     v-if="addUpdateShowButton">
+                     确定</el-button>
          <el-button type="primary"
                     size="small"
                     @click="handleDetailcls"
diff --git a/src/views/smart/workorderDetail.vue b/src/views/smart/workorderDetail.vue
index 322f9d8..21eeda9 100644
--- a/src/views/smart/workorderDetail.vue
+++ b/src/views/smart/workorderDetail.vue
@@ -22,6 +22,7 @@
       </span>
     <div class="container">
        <span>
+          <el-button size="small" @click="back" v-if="!shouldShowButton">取消</el-button>
           <el-button type="primary" size="small" @click="handleFormSubmit" v-if="addupdateShowButton && permission.workorder_add">确定</el-button>
           <el-button type="primary" size="small" @click="auditing" v-if="shouldShowButton && permission.workorder_audit">审核</el-button>
           <el-button type="primary" size="small" @click="reject" v-if="shouldShowButton && permission.workorder_reject">驳回</el-button>
@@ -337,12 +338,7 @@
         });
       },
       back() {
-        if (this.$route.query.frameMode == "add") {
-          this.$router.push({path: "/smart/workorder"});
-        } else {
-          this.updateToSearch();
-          this.$router.push({path: "/smart/workorder"});
-        }
+        this.updateToSearch();
       },
       updateToSearch() {
         this.tab1_option.column[1].disabled = false;
diff --git a/src/views/smart/workpermitDetail.vue b/src/views/smart/workpermitDetail.vue
index d16f26c..348f668 100644
--- a/src/views/smart/workpermitDetail.vue
+++ b/src/views/smart/workpermitDetail.vue
@@ -45,16 +45,16 @@
       </span>
      <div class="container">
        <span >
-          <el-button type="primary"
-                     size="large"
-                     @click="handleFormSubmit"
-                     v-if="addUpdateShowButton && permission.workpermit_add">
-                     确定</el-button>
           <el-button type="default"
-                     size="large"
+                     size="small"
                      @click="back"
                      v-if="addUpdateShowButton">
                      取消</el-button>
+         <el-button type="primary"
+                    size="small"
+                    @click="handleFormSubmit"
+                    v-if="addUpdateShowButton && permission.workpermit_add">
+                     确定</el-button>
          <el-button type="primary"
                     size="small"
                     @click="closeTicket"
diff --git a/src/views/spares/material.vue b/src/views/spares/material.vue
index b5d81ab..9c7a4aa 100644
--- a/src/views/spares/material.vue
+++ b/src/views/spares/material.vue
@@ -68,9 +68,9 @@
         <!--                 :upload-after="uploadAfter">-->
       </avue-form>
       <span slot="footer" class="dialog-footer">
-            <el-button @click="inBox = false">取 消</el-button>
+            <el-button @click="inBox = false" size="small">取 消</el-button>
             <el-button type="primary"
-                       @click="submitIn">确 定</el-button>
+                       @click="submitIn" size="small">确 定</el-button>
           </span>
     </el-dialog>
     <el-dialog title="出库信息"
@@ -84,9 +84,9 @@
         <!--                 :upload-after="uploadAfter">-->
       </avue-form>
       <span slot="footer" class="dialog-footer">
-            <el-button @click="outBox = false">取 消</el-button>
+            <el-button @click="outBox = false" size="small">取 消</el-button>
             <el-button type="primary"
-                       @click="submitOut">确 定</el-button>
+                       @click="submitOut" size="small">确 定</el-button>
           </span>
     </el-dialog>
   </basic-container>
diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index c25c6f7..d735219 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -32,73 +32,63 @@
             <p class="notification-title"><i class="el-icon-s-check el-icon-home"></i>  今日待审核</p>
             <el-skeleton :rows="8" animated v-show="auditSkeleton"/>
             <div class="overflowList" v-show="!auditSkeleton">
-              <el-empty v-if="!homePageData.workOrderAudit
-                            && !homePageData.supplierInfoAudit
-                            && !homePageData.manufacturerInfoAudit
-                            && !homePageData.warehouseAudit
-                            && !homePageData.workPermitAudit
-                            && !homePageData.materialAudit
-                            && !homePageData.workOperationTicketAudit
-                            && !homePageData.toolInventoryRecordsAudit
-                            && !homePageData.equipmentLedgerAudit">
-              </el-empty>
               <div class="el-collapse">
-                <div v-show="(homePageData.equipmentLedgerAudit && homePageData.equipmentLedgerAudit.length) || (homePageData.toolInventoryRecordsAudit && homePageData.toolInventoryRecordsAudit.length)">
+                <div v-show="(permission.equipmentledger_audit && homePageData.equipmentLedgerAudit && homePageData.equipmentLedgerAudit.length) || (permission.toolinventoryrecord_audit && homePageData.toolInventoryRecordsAudit && homePageData.toolInventoryRecordsAudit.length)">
                   <div class="el-collapse-item">
                     <div class="el-audit-head"><span class="el-collapse-span">待审核设备台账</span></div>
                   </div>
-                  <div class="el-collapse-item" v-for="(item, index) in homePageData.equipmentLedgerAudit" :key="index">
+                  <div v-if="permission.equipmentledger_audit" class="el-collapse-item" v-for="(item, index) in homePageData.equipmentLedgerAudit" :key="index">
                     <div class="el-collapse-item__header" @click="skip('/leger/equipmentledgerDetail', item.id)"><span class="el-collapse-span">{{item.eqLedgerCode}}号设备台账待审核</span></div>
                   </div>
-                  <div class="el-collapse-item" v-for="(item, index) in homePageData.toolInventoryRecordsAudit" :key="index">
+                  <div v-if="permission.toolinventoryrecord_audit" class="el-collapse-item" v-for="(item, index) in homePageData.toolInventoryRecordsAudit" :key="index">
                     <div class="el-collapse-item__header" @click="skip('/leger/toolinventoryrecordDetail', item.id)"><span class="el-collapse-span">{{item.toolsCodeId}}号工器具编码待审核</span></div>
                   </div>
                 </div>
-                <div v-show="(homePageData.workOperationTicketAudit && homePageData.workOperationTicketAudit.length > 0) || (homePageData.workPermitAudit && homePageData.workPermitAudit.length > 0)">
+                <div v-show="(permission.operationticket_audit && homePageData.workOperationTicketAudit && homePageData.workOperationTicketAudit.length > 0) || (permission.workpermit_audit && homePageData.workPermitAudit && homePageData.workPermitAudit.length > 0)">
                   <div class="el-collapse-item">
                     <div class="el-audit-head"><span class="el-collapse-span">待审核智能两票</span></div>
                   </div>
                   <div class="el-collapse-item" v-for="(item, index) in homePageData.workOperationTicketAudit" :key="index">
-                    <div class="el-collapse-item__header" @click="skip('/smart/operationticketDetail', item.id)"><span class="el-collapse-span">{{item.operationTicketNo}}号操作票待审核</span></div>
+                    <div v-if="permission.operationticket_audit" class="el-collapse-item__header" @click="skip('/smart/operationticketDetail', item.id)"><span class="el-collapse-span">{{item.operationTicketNo}}号操作票待审核</span></div>
                   </div>
                   <div class="el-collapse-item" v-for="(item, index) in homePageData.workPermitAudit" :key="index">
-                    <div class="el-collapse-item__header" @click="skip('/smart/workpermitDetail', item.id)"><span class="el-collapse-span">{{item.workTicketNo}}号工作票待审核</span></div>
+                    <div v-if="permission.workpermit_audit" class="el-collapse-item__header" @click="skip('/smart/workpermitDetail', item.id)"><span class="el-collapse-span">{{item.workTicketNo}}号工作票待审核</span></div>
                   </div>
                 </div>
-                <div v-show="(homePageData.warehouseAudit && homePageData.warehouseAudit.length) ||
-                 (homePageData.manufacturerInfoAudit && homePageData.manufacturerInfoAudit.length) ||
-                  (homePageData.supplierInfoAudit && homePageData.supplierInfoAudit.length) ||
-                   (homePageData.materialAudit && homePageData.materialAudit.length) ||
-                    (homePageData.inboundAudit && homePageData.inboundAudit.length) ||
-                     (homePageData.outboundAudit && homePageData.outboundAudit.length)">
+                <div v-show="(permission.warehouse_audit && homePageData.warehouseAudit && homePageData.warehouseAudit.length > 0) ||
+                 (permission.manufacturerinfo_audit && homePageData.manufacturerInfoAudit && homePageData.manufacturerInfoAudit.length > 0) ||
+                  (permission.supplierinfo_audit && homePageData.supplierInfoAudit && homePageData.supplierInfoAudit.length > 0) ||
+                   (permission.material_auditing && homePageData.materialAudit && homePageData.materialAudit.length > 0) ||
+                    (permission.material_auditing && homePageData.inboundAudit && homePageData.inboundAudit.length > 0) ||
+                     (permission.material_auditing && homePageData.outboundAudit && homePageData.outboundAudit.length > 0)">
                   <div class="el-collapse-item">
                     <div class="el-audit-head"><span class="el-collapse-span">待审核备件管理</span></div>
                   </div>
                   <div class="el-collapse-item" v-for="(item, index) in homePageData.warehouseAudit" :key="index">
-                    <div class="el-collapse-item__header" @click="skip('/spares/warehouse', item.id)"><span class="el-collapse-span">{{item.code}}号仓库待审核</span></div>
+                    <div v-if="permission.warehouse_audit" class="el-collapse-item__header" @click="skip('/spares/warehouse', item.id)"><span class="el-collapse-span">{{item.code}}号仓库待审核</span></div>
                   </div>
                   <div class="el-collapse-item" v-for="(item, index) in homePageData.materialAudit" :key="index">
-                    <div class="el-collapse-item__header" @click="skip('/spares/material', item.id)"><span class="el-collapse-span">{{item.materialNo}}号物资待审核</span></div>
+                    <div v-if="permission.manufacturerinfo_audit" class="el-collapse-item__header" @click="skip('/spares/material', item.id)"><span class="el-collapse-span">{{item.materialNo}}号物资待审核</span></div>
                   </div>
                   <div class="el-collapse-item" v-for="(item, index) in homePageData.manufacturerInfoAudit" :key="index">
-                    <div class="el-collapse-item__header" @click="skip('/spares/manufacturerinfo', item.id)"><span class="el-collapse-span">{{item.creditCode}}号制造商待审核</span></div>
+                    <div v-if="permission.supplierinfo_audit" class="el-collapse-item__header" @click="skip('/spares/manufacturerinfo', item.id)"><span class="el-collapse-span">{{item.creditCode}}号制造商待审核</span></div>
                   </div>
                   <div class="el-collapse-item" v-for="(item, index) in homePageData.supplierInfoAudit" :key="index">
-                    <div class="el-collapse-item__header" @click="skip('/spares/supplierinfo', item.id)"><span class="el-collapse-span">{{item.creditCode}}号供应商待审核</span></div>
+                    <div v-if="permission.material_auditing" class="el-collapse-item__header" @click="skip('/spares/supplierinfo', item.id)"><span class="el-collapse-span">{{item.creditCode}}号供应商待审核</span></div>
                   </div>
                   <div class="el-collapse-item" v-for="(item, index) in homePageData.inboundAudit" :key="index">
-                    <div class="el-collapse-item__header" @click="skip2('/spares/materialDetail', item.materialNo, 'in')"><span class="el-collapse-span">{{item.inboundNo}}号入库待审核</span></div>
+                    <div v-if="permission.material_auditing" class="el-collapse-item__header" @click="skip2('/spares/materialDetail', item.materialNo, 'in')"><span class="el-collapse-span">{{item.inboundNo}}号入库待审核</span></div>
                   </div>
                   <div class="el-collapse-item" v-for="(item, index) in homePageData.outboundAudit" :key="index">
-                    <div class="el-collapse-item__header" @click="skip2('/spares/materialDetail', item.materialNo, 'out')"><span class="el-collapse-span">{{item.outboundNo}}号出库待审核</span></div>
+                    <div v-if="permission.material_auditing" class="el-collapse-item__header" @click="skip2('/spares/materialDetail', item.materialNo, 'out')"><span class="el-collapse-span">{{item.outboundNo}}号出库待审核</span></div>
                   </div>
                 </div>
-                <div v-show="homePageData.workOrderAudit && homePageData.workOrderAudit.length > 0">
+                <div v-show="permission.workorder_audit && homePageData.workOrderAudit && homePageData.workOrderAudit.length > 0">
                   <div class="el-collapse-item">
                     <div class="el-audit-head"><span class="el-collapse-span">待审核工单</span></div>
                   </div>
                   <div class="el-collapse-item" v-for="(item, index) in homePageData.workOrderAudit" :key="index">
-                    <div class="el-collapse-item__header" @click="skip('/workorder/detail', item.id)"><span class="el-collapse-span">{{item.workOrderNo}}号工单待审核</span></div>
+                    <div v-if="permission.workorder_audit" class="el-collapse-item__header" @click="skip('/workorder/detail', item.id)"><span class="el-collapse-span">{{item.workOrderNo}}号工单待审核</span></div>
                   </div>
                 </div>
               </div>
@@ -130,7 +120,7 @@
       };
     },
     computed: {
-      ...mapGetters(["userInfo"]),
+      ...mapGetters(["permission"]),
     },
     mounted() {
       this.auditLoad();