marymelisa 4 years ago
parent
commit
d3239a5bf9

+ 3 - 3
src/views/business/purchase/setup.ts

@@ -63,13 +63,13 @@ export function btnAndComp() {
     // 打开新增页的弹窗 返回打开弹窗的方法
     // 打开新增页的弹窗 返回打开弹窗的方法
     const { openAction: addAction } = openModal('addCustomInfo');
     const { openAction: addAction } = openModal('addCustomInfo');
     // 创建详情页并写入右键菜单列表(每个页面都有,写死)
     // 创建详情页并写入右键菜单列表(每个页面都有,写死)
-    // detailButton('customDetail', contextMenuList);
+    detailButton('customDetail', contextMenuList);
     // 通过code跟弹窗建立联系 返回写入右键的方法
     // 通过code跟弹窗建立联系 返回写入右键的方法
-    // const { action: deleteAction } = permissionButton('purchase_pending_someprice', '点价登记', contextMenuList);
+    const { action: deleteAction } = permissionButton('purchase_pending_someprice', '点价登记', contextMenuList);
 
 
     const stop = watchEffect(() => {
     const stop = watchEffect(() => {
         // 判断是否有权限 有就写入
         // 判断是否有权限 有就写入
-        // hasPermission('custom_info_btn_delete') && deleteAction();
+        hasPermission('custom_info_btn_delete') && deleteAction();
     });
     });
     return {
     return {
         stop,
         stop,

+ 25 - 24
src/views/information/custom/compoments/filterTable/index.vue

@@ -104,32 +104,33 @@ export default defineComponent({
     .conditionSelect + .conditionSelect {
     .conditionSelect + .conditionSelect {
         margin-left: 10px;
         margin-left: 10px;
     }
     }
-    .selectBtn.ant-btn {
-        margin-left: 10px;
-        width: 80px;
-        height: 30px;
-        line-height: 31px;
-        text-align: center;
-        background: linear-gradient(0deg, @m-grey15 0%, @m-grey16 98%);
+    
+}
+.selectBtn.ant-btn {
+    margin-left: 10px;
+    width: 80px;
+    height: 30px;
+    line-height: 31px;
+    text-align: center;
+    background: linear-gradient(0deg, @m-grey15 0%, @m-grey16 98%);
+    border: 0;
+    color: @m-white0;
+    font-size: 14px;
+    .rounded-corners(3px);
+    &:hover,
+    &:focus {
+        background: linear-gradient(0deg, @m-grey15-hover 0%, @m-grey16-hover 98%);
+        color: rgba(@m-white0, 0.8);
         border: 0;
         border: 0;
-        color: @m-white0;
-        font-size: 14px;
-        .rounded-corners(3px);
-        &:hover,
-        &:focus {
-            background: linear-gradient(0deg, @m-grey15-hover 0%, @m-grey16-hover 98%);
-            color: rgba(@m-white0, 0.8);
-            border: 0;
-        }
     }
     }
-    .operBtn.ant-btn:extend(.selectBtn.ant-btn) {
-        background: linear-gradient(0deg, @m-blue6 0%, @m-blue7 99%);
-        &:hover,
-        &:focus {
-            background: linear-gradient(0deg, @m-blue6-hover 0%, @m-blue7-hover 99%);
-            color: rgba(@m-white0, 0.8);
-            border: 0;
-        }
+}
+.operBtn.ant-btn:extend(.selectBtn.ant-btn) {
+    background: linear-gradient(0deg, @m-blue6 0%, @m-blue7 99%);
+    &:hover,
+    &:focus {
+        background: linear-gradient(0deg, @m-blue6-hover 0%, @m-blue7-hover 99%);
+        color: rgba(@m-white0, 0.8);
+        border: 0;
     }
     }
 }
 }
 </style>;
 </style>;