From 2473f4ce35cda8dcd1194618c5d22c2e5b0354e3 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 01 三月 2024 17:38:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/equipment/equipment/index.vue |   51 ++++++++++++++++++++++++++-------------------------
 1 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/src/views/equipment/equipment/index.vue b/src/views/equipment/equipment/index.vue
index 20afc4b..418e866 100644
--- a/src/views/equipment/equipment/index.vue
+++ b/src/views/equipment/equipment/index.vue
@@ -68,7 +68,7 @@
       multipleSelection: [],
       uploadInfo: {
         // 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl
-        isShow: true,
+        isShow: false,
         url: '/mes/equipment/upload'
       },
       diaPrintTab: false,
@@ -97,6 +97,7 @@
           // 璁惧缂栧彿
           {
             minWidth: '30',
+            width: '200',
             prop: 'number',
             label: '璁惧缂栧彿',
             sort: true,
@@ -110,8 +111,19 @@
           // 璁惧鍚嶇О
           {
             minWidth: '30',
+            width: '100',
             prop: 'name',
             label: '璁惧鍚嶇О',
+            sort: true,
+            isTrue: true,
+            isSearch: true,
+            searchInfoType: 'text'
+          },
+          // 鐘舵��
+          {
+            minWidth: '30',
+            prop: 'state',
+            label: '鐘舵��',
             sort: true,
             isTrue: true,
             isSearch: true,
@@ -151,15 +163,15 @@
             searchInfoType: 'text'
           },
           // 閭
-          {
-            minWidth: '30',
-            prop: 'email',
-            label: '閭',
-            sort: true,
-            isTrue: true,
-            isSearch: false,
-            searchInfoType: 'text'
-          },
+          // {
+          //   minWidth: '30',
+          //   prop: 'email',
+          //   label: '閭',
+          //   sort: true,
+          //   isTrue: true,
+          //   isSearch: false,
+          //   searchInfoType: 'text'
+          // },
           // 渚涘簲鍟�
           {
             minWidth: '30',
@@ -193,7 +205,7 @@
           // 鍒堕�犳棩鏈�
           {
             minWidth: '150',
-            width: '250',
+            width: '100',
             prop: 'manufactureDate',
             label: '鍒堕�犳棩鏈�',
             sort: true,
@@ -205,7 +217,7 @@
           // 瀹夎鏃ユ湡
           {
             minWidth: '150',
-            width: '250',
+            width: '100',
             prop: 'installDate',
             label: '瀹夎鏃ユ湡',
             sort: true,
@@ -213,16 +225,6 @@
             isSearch: true,
             formatter: this.formatReceiveTime,
             searchInfoType: 'datetimerange'
-          },
-          // 鐘舵��
-          {
-            minWidth: '30',
-            prop: 'state',
-            label: '鐘舵��',
-            sort: true,
-            isTrue: true,
-            isSearch: true,
-            searchInfoType: 'text'
           }
         ],
         toolbar: [],
@@ -247,7 +249,6 @@
     ...mapGetters(['permissions'])
   },
   created() {
-    this.uploadInfo.isShow = this.permissions.equipment_equipment_upload
     if(this.permissions.equipment_equipment_add){
       this.table.toolbar.push({
             text: '鏂板',
@@ -306,7 +307,7 @@
                 printable: 'printRaw',//椤甸潰
                 type: "html",//鏂囨。绫诲瀷
                   maxWidth:450,
-                  targetStyles:['*'],                 
+                  targetStyles:['*'],
                   style: `@page {
                     margin:0;
                     padding: 0;
@@ -329,7 +330,7 @@
     pullEquipFun(){
       this.table.toolbar.find((e) => e.text === '鍚屾').loading = true
       pullEquip().then(res=>{
-        this.$message.success(res.data.data.msg)
+        this.$message.success(res.data.msg)
         this.table.toolbar.find((e) => e.text === '鍚屾').loading = false
       }).catch(error=>{
         this.$message.error("鍚屾澶辫触",error)

--
Gitblit v1.9.3