From fd6e935f391501358357f3e6bc1957764510b8bc Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期三, 13 十二月 2023 16:47:05 +0800
Subject: [PATCH] 修改

---
 src/views/eam/EquipmentOfLine.vue |   41 ++++++++++++++++++++++++++++++++++-------
 1 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/src/views/eam/EquipmentOfLine.vue b/src/views/eam/EquipmentOfLine.vue
index 6a33fba..3335ca5 100644
--- a/src/views/eam/EquipmentOfLine.vue
+++ b/src/views/eam/EquipmentOfLine.vue
@@ -61,7 +61,7 @@
         @click="searchReset"
         icon="reload"
       >閲嶇疆</a-button>
-      <a-button @click="handleAdd" type="primary" icon="plus" v-has="'equipmentAccount:add&delete&import&Edit'">鏂板</a-button>
+      <a-button @click="handleAdd" type="primary" icon="plus" v-has="'line:add&edit&delete'">鏂板</a-button>
       <!-- <a-button type="primary" icon="download" @click="handleExportXls('璁惧鍙拌处')" v-has="'equipmentAccount:outport'">瀵煎嚭</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import"  v-has="'equipmentAccount:add&delete&import&Edit'">瀵煎叆</a-button>
@@ -78,7 +78,7 @@
 
       <a-table
         ref="table"
-        size="middle"
+        size="small"
         bordered
         rowKey="id"
         :scroll="{x:true}"
@@ -119,20 +119,21 @@
         >璇︽儏</a>
         <a-divider type="vertical" />
         <a @click="handleEdit(record)" >缂栬緫</a>
+        <a-divider type="vertical" />
         <a-dropdown>
           <a class="ant-dropdown-link">
             鏇村
             <a-icon type="down" />
           </a>
           <a-menu slot="overlay">
-            <a-menu-item  v-has="'equipmentAccount:add&delete&import&Edit'">
+            <a-menu-item  v-has="'line:add&edit&delete'">
              
             </a-menu-item>
             <a-menu-item>
               <a-popconfirm
                 title="纭畾鍒犻櫎鍚�?"
                 @confirm="() => handleDelete(record.id)"
-                v-has="'equipmentAccount:add&delete&import&Edit'"
+                v-has="'line:add&edit&delete'"
               >
                 <a>鍒犻櫎</a>
               </a-popconfirm>
@@ -159,7 +160,7 @@
   import '@/assets/less/TableExpand.less'
   import JSearchSelectTag from '../../components/dict/JSearchSelectTag.vue'
   import EquipmentOfLineModal from './modules/line/EquipmentOfLineModal.vue'
-  import EquipmentListOfLine from './modules/line/EquipmentListOfLine.vue'
+  import EquipmentListOfLine from './modules/line/EquipmentListOfLine'
   export default {
     name: "EquipmentOfLine",
     mixins:[JeecgListMixin,mixinDevice],
@@ -188,16 +189,43 @@
           title: '鐢熶骇绾跨紪鐮�',
           align: "center",
           dataIndex: 'num',
+          width: 200,
         },
         {
           title: '鐢熶骇绾垮悕绉�',
           align: "center",
           dataIndex: 'name',
+          width: 200,
+        },
+        {
+          title: '浣跨敤閮ㄩ棬',
+          align: "center",
+          dataIndex: 'useId_dictText',
+          width: 150,
+        },
+        {
+          title: '缁存姢閮ㄩ棬',
+          align: "center",
+          dataIndex: 'manageId_dictText',
+          width: 150,
+        },
+        {
+          title: '缁翠慨鐝粍',
+          align: "center",
+          dataIndex: 'teamId_dictText',
+          width: 150,
+        },
+        {
+          title: '宸ュ尯',
+          align: "center",
+          dataIndex: 'factoryModelId_dictText',
+          width: 150,
         },
         {
           title: '璁惧鎬绘暟',
           align: "center",
           dataIndex: 'sumOfEquipment',
+          width: 150,
         },
         {
           title: '鎿嶄綔',
@@ -206,8 +234,7 @@
           scopedSlots: {
             customRender: 'action',
           },
-          width: 147,
-          fixed: 'right',
+          width: 150,
         },
         ],
         url: {

--
Gitblit v1.9.3