From d49f39681a68fd819ac687d67b6352ba386d0d13 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 25 四月 2024 12:12:08 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before into master

---
 src/views/equipment/equipment/index.vue |   63 ++++++++++++++++---------------
 1 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/src/views/equipment/equipment/index.vue b/src/views/equipment/equipment/index.vue
index 462fdcc..30d6457 100644
--- a/src/views/equipment/equipment/index.vue
+++ b/src/views/equipment/equipment/index.vue
@@ -22,7 +22,7 @@
     <el-dialog title="鏍囩鍒楄〃" :visible.sync="diaPrintTab" width="500px" top="5vh">
       <div style="width:100%;height:400px;overflow-y: auto;">
         <div class="dia_body" id="printRaw">
-          <el-card class="box-card" v-for="(tem, i) in multipleSelection" :key="i" style="margin-bottom: 10px; font-size: 16px !important;">
+          <el-card class="box-card" v-for="(tem, i) in multipleSelection" :key="i" style="margin-bottom: 10px; font-size: 16px !important;page-break-before:always;page-break-after: always;">
             <el-row>
               <el-col :span="8" :offset="1">搴忓彿锛�</el-col>
               <el-col :span="7" style="font-weight: bold;">{{ tem.id }}</el-col>
@@ -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,
@@ -147,19 +159,19 @@
             label: '浣嶇疆',
             sort: true,
             isTrue: true,
-            isSearch: false,
+            isSearch: true,
             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',
@@ -167,7 +179,7 @@
             label: '渚涘簲鍟�',
             sort: true,
             isTrue: true,
-            isSearch: false,
+            isSearch: true,
             searchInfoType: 'text'
           },
           // 鍒堕�犲晢
@@ -177,7 +189,7 @@
             label: '鍒堕�犲晢',
             sort: true,
             isTrue: true,
-            isSearch: false,
+            isSearch: true,
             searchInfoType: 'text'
           },
           // 鍨嬪彿瑙勬牸
@@ -187,13 +199,13 @@
             label: '鍨嬪彿瑙勬牸',
             sort: true,
             isTrue: true,
-            isSearch: false,
+            isSearch: true,
             searchInfoType: 'text'
           },
           // 鍒堕�犳棩鏈�
           {
             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,11 +307,11 @@
                 printable: 'printRaw',//椤甸潰
                 type: "html",//鏂囨。绫诲瀷
                   maxWidth:450,
-                  targetStyles:['*'],                 
+                  targetStyles:['*'],
                   style: `@page {
                     margin:0;
                     padding: 0;
-                    size: 360px 170px;
+                    size: 360px 170px landscape;
                   }
                   html{
                     zoom:100%;
@@ -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