From 738f76adfcbf102dfbf890b044ba9a25a034cb8c Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 27 三月 2024 16:17:38 +0800
Subject: [PATCH] 1、用户管理页面修改身份字段名称为首页权限并调整其选项值 2、按照新需求完成客户操作工进入后页面所有布局100% 3、调整全局页脚内容

---
 src/views/eam/EquipmentChangeList.vue |   59 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/src/views/eam/EquipmentChangeList.vue b/src/views/eam/EquipmentChangeList.vue
index 55b82d5..5b05dac 100644
--- a/src/views/eam/EquipmentChangeList.vue
+++ b/src/views/eam/EquipmentChangeList.vue
@@ -60,12 +60,13 @@
         style='margin-top: 15px'
         @click='handleAdd'
         type='primary'
+        v-has="'equipmentChange:add'"
         icon='plus'
       >鏂板
       </a-button>
       <a-button
         v-if="selectedRowKeys.length > 0  && (selectionRows[0].auditStatus==='notSubmitted' || selectionRows[0].auditStatus==='Rejected')"
-        @click='handleSubmit' type='primary' icon='check'>鎻愪氦
+        @click='handleSubmit' type='primary' icon='check' v-has="'equipmentChange:submitAndCancel'">鎻愪氦
       </a-button>
       <a-button v-if="selectedRowKeys.length > 0  && selectionRows[0].auditStatus === 'pendingApproval'"
                 @click='handleRevocation' type='primary' icon='rollback'>鎾ゅ洖
@@ -85,13 +86,13 @@
           @click='onClearSelected'
         >娓呯┖</a>
       </div>
-
+<!--X杞存粦鍔�      :scroll="{ x: 'calc(1400px + 50%)', y: 900 }"-->
       <a-table
         ref='table'
         size='middle'
         bordered
         rowKey='id'
-        :scroll="{ x: 'calc(1400px + 50%)', y: 900 }"
+        :scroll="{ x: true }"
         :columns='columns'
         :dataSource='dataSource'
         :pagination='ipagination'
@@ -100,16 +101,23 @@
         :customRow='clickThenSelect'
         @change='handleTableChange'
       >
-
-       <span
+        <template slot="num" slot-scope="text" >
+          <a-tooltip placement="top" :title="text" trigger="hover">
+            <div>
+              <template slot="title"> </template>
+              <p style="cusor:pointer; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; width: 130px;">{{ text }}</p>
+            </div>
+          </a-tooltip>
+        </template>
+<!--       <span
          slot='action'
          slot-scope='text, record'
        >
-          <a v-if="record.auditStatus === 'notSubmitted'" @click='handleEdit(record)'>缂栬緫</a>
+          <a v-if="record.auditStatus === 'notSubmitted' || record.auditStatus === 'Rejected'" @click='handleEdit(record)'>缂栬緫</a>
           <a v-if="record.auditStatus === 'pendingApproval'" @click='handleApprove(record)'>瀹℃壒</a>
 
-          <a-divider v-if="record.auditStatus === 'notSubmitted'" type='vertical' />
-        <a-dropdown v-if="record.auditStatus === 'notSubmitted'">
+          <a-divider v-if="record.auditStatus === 'notSubmitted' || record.auditStatus === 'Rejected'" type='vertical' />
+        <a-dropdown v-if="record.auditStatus === 'notSubmitted' || record.auditStatus === 'Rejected'">
                         <a class='ant-dropdown-link'>鏇村 <a-icon type='down' /></a>
                         <a-menu slot='overlay'>
                             <a-menu-item>
@@ -121,8 +129,34 @@
 
                         </a-menu>
                     </a-dropdown>
-        </span>
+        </span>-->
+        <span
+          slot='action'
+          slot-scope='text, record'
+        >
+          <a v-if="record.auditStatus === 'notSubmitted' || record.auditStatus === 'Rejected'" @click='handleEdit(record)' v-has="'equipmentChange:edit'">缂栬緫</a>
+          <a v-if="record.auditStatus === 'pendingApproval'" @click='handleApprove(record)'>瀹℃壒</a>
 
+          <a-divider
+            v-if="record.auditStatus === 'notSubmitted' || record.auditStatus === 'Rejected' || record.auditStatus === 'pendingApproval'"
+            type='vertical'
+          />
+        <a-dropdown>
+                        <a class='ant-dropdown-link'>鏇村 <a-icon type='down' /></a>
+                        <a-menu slot='overlay'>
+                           <a-menu-item>
+                            <a @click='handleDetail(record)'>璇︽儏</a>
+                            </a-menu-item>
+                            <a-menu-item v-if="record.auditStatus === 'notSubmitted'||record.auditStatus === 'Rejected'" v-has="'equipmentChange:delete'">
+                                <a-popconfirm title='纭畾鍒犻櫎鍚�?'
+                                              @confirm='() => handleDelete(record.id)'>
+                                    <a>鍒犻櫎</a>
+                                </a-popconfirm>
+                            </a-menu-item>
+
+                        </a-menu>
+                    </a-dropdown>
+        </span>
       </a-table>
       <a-tabs defaultActiveKey='1'>
         <a-tab-pane
@@ -133,7 +167,7 @@
             class='table-operator'
             style='margin:-16px'
           >
-            <equipment-change-detail :equipmentChangeId='equipmentChangeId' />
+            <equipment-change-detail :equipmentChangeId='equipmentChangeId'/>
           </div>
         </a-tab-pane>
 
@@ -189,7 +223,10 @@
         {
           title: '鍗曟嵁鍙�',
           align: 'center',
-          dataIndex: 'num'
+          dataIndex: 'num',
+          scopedSlots: { customRender: 'num' },
+          width: 100,
+          ellipsis: true,
         },
         {
           title: '鍒涘缓浜�',

--
Gitblit v1.9.3