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/DailyMaintenanceStandardList.vue |   61 +++++++++++++++++++++++-------
 1 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/src/views/eam/DailyMaintenanceStandardList.vue b/src/views/eam/DailyMaintenanceStandardList.vue
index c2b817e..9f10714 100644
--- a/src/views/eam/DailyMaintenanceStandardList.vue
+++ b/src/views/eam/DailyMaintenanceStandardList.vue
@@ -1,6 +1,6 @@
 <template>
   <a-card
-    title="鍛ㄦ湡鎬т繚鍏绘爣鍑�"
+    title="浜岀骇淇濆吇鏍囧噯"
     :bordered='false'
   >
     <div class='table-page-search-wrapper'>
@@ -28,10 +28,10 @@
             :md='8'
             :sm='24'
           >
-            <a-form-item label='璁惧鍚嶇О'>
+            <a-form-item label='缁熶竴缂栧彿'>
               <a-input
-                placeholder='璇疯緭鍏ヨ澶囧悕绉�'
-                v-model='queryParam.name'
+                placeholder='璇疯緭鍏ョ粺涓�缂栧彿'
+                v-model='queryParam.equipmentNum'
               ></a-input>
             </a-form-item>
           </a-col>
@@ -102,6 +102,20 @@
         icon='reload'
         style='margin-left: 8px'
       >閲嶇疆</a-button>
+      <a-upload
+        name="file"
+        :showUploadList="false"
+        :multiple="false"
+        :headers="tokenHeader"
+        :action="importExcelUrl"
+        @change="handleImportExcel"
+      >
+        <a-button
+          type="primary"
+          icon="import"
+          v-has="'dailyMaintenanceStandard:import'"
+        >瀵煎叆</a-button>
+      </a-upload>
     </div>
 
     <!-- table鍖哄煙-begin -->
@@ -220,7 +234,7 @@
             <daily-maintenance-standard-detail :maintenanceStandardId='maintenanceStandardId' />
           </div>
         </a-tab-pane>
-        <a-tab-pane
+        <!-- <a-tab-pane
           tab='璁″垝鐢ㄦ枡'
           key="2"
         >
@@ -252,7 +266,7 @@
           >
             <maintenance-standard-work-instruction :maintenanceStandardId='maintenanceStandardId' />
           </div>
-        </a-tab-pane>
+        </a-tab-pane> -->
 
       </a-tabs>
     </div>
@@ -312,6 +326,11 @@
           dataIndex: 'num',
         },
         {
+          title: '鏍囧噯绫诲瀷',
+          align: 'center',
+          dataIndex: 'maintenanceTypeName',
+        },
+        {
           title: '绛惧鐘舵��',
           align: 'center',
           dataIndex: 'approvalStatusName',
@@ -336,11 +355,7 @@
           align: 'center',
           dataIndex: 'useDepartName',
         },
-        {
-          title: '娲惧伐鏂瑰紡',
-          align: 'center',
-          dataIndex: 'assignModeName',
-        },
+
         {
           title: '璐ｄ换鐝粍',
           align: 'center',
@@ -352,9 +367,19 @@
         //   dataIndex: 'specificEquipment',
         // },
         {
+          title: '瀹℃牳缁撴灉',
+          align: 'center',
+          dataIndex: 'maintenanceStandardUda1',
+        },
+        {
           title: '瀹℃牳鎰忚',
           align: 'center',
           dataIndex: 'auditFeedback',
+        },
+        {
+          title: '瀹℃壒缁撴灉',
+          align: 'center',
+          dataIndex: 'maintenanceStandardUda2',
         },
         {
           title: '瀹℃壒鎰忚',
@@ -439,12 +464,13 @@
         delete: '/eam/maintenanceStandard/delete',
         deleteBatch: '/eam/maintenanceStandard/deleteBatch',
         versionTakeEffect: "/eam/maintenanceStandard/versionTakeEffect",
+        importExcelUrl: "/eam/maintenanceStandard/importExcelOfTwoMaintenance",
       },
       /* 鍒嗛〉鍙傛暟 */
       ipagination: {
         current: 1,
-        pageSize: 5,
-        pageSizeOptions: ['5', '10', '50'],
+        pageSize: 20,
+        pageSizeOptions: ['5', '10', '20', '50'],
         showTotal: (total, range) => {
           return range[0] + '-' + range[1] + ' 鍏�' + total + '鏉�'
         },
@@ -453,7 +479,12 @@
         total: 0
       },
       maintenanceStandardId: '-1',
-      queryParam: { type: 'daily' }
+      queryParam: { type: 'daily', maintenanceType: '2' }
+    }
+  },
+  computed: {
+    importExcelUrl: function () {
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
     }
   },
   watch: {
@@ -568,7 +599,7 @@
 
     searchReset() {
       this.maintenanceStandardId = '-1'
-      this.queryParam = { type: 'daily' }
+      this.queryParam = { type: 'daily', maintenanceType: '2' }
       this.loadData(1);
     },
   }

--
Gitblit v1.9.3