From df85764203947543c0ced0a0cdf8b7299f6b40ff Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 28 五月 2024 13:28:22 +0800
Subject: [PATCH] 优化

---
 src/views/equipment/metering/index.vue |   85 ++++++++++++++++++++++++------------------
 1 files changed, 48 insertions(+), 37 deletions(-)

diff --git a/src/views/equipment/metering/index.vue b/src/views/equipment/metering/index.vue
index 3f858da..ae5a837 100644
--- a/src/views/equipment/metering/index.vue
+++ b/src/views/equipment/metering/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="printMetering">
-            <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="10" :offset="3">搴忓彿锛�</el-col>
                 <el-col :span="10" style="font-weight: bold;">{{ i + 1 }}</el-col>
@@ -38,7 +38,7 @@
               <el-row>
                 <el-col :span="10" :offset="3">璁惧浜岀淮鐮侊細</el-col>
                 <el-col :span="10">
-                  <vueQr :text="tem.code" :size="80" :margin="2"></vueQr>
+                  <vueQr :text="tem.code+'id@'+tem.id" :size="80" :margin="2"></vueQr>
                 </el-col>
               </el-row>
             </el-card>
@@ -51,7 +51,7 @@
       </el-dialog>
     </div>
   </template>
-  
+
   <script>
   import { delObj, fetchList,pullEquip } from '@/api/equipment/metering'
   import TableForm from './metering-form'
@@ -68,8 +68,8 @@
         multipleSelection: [],
         uploadInfo: {
           // 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl
-          Download:false,
-         isShow: true,
+          download:false,
+          isShow: true,
           url: '/mes/equipmentDevice/upload'
         },
         prelang: 'workstation',
@@ -97,6 +97,7 @@
             // 璁惧缂栧彿
             {
               minWidth: '30',
+              width: '100',
               prop: 'code',
               label: '璁惧缂栧彿',
               sort: true,
@@ -110,6 +111,7 @@
             // 璁惧鍚嶇О
             {
               minWidth: '30',
+              width: '100',
               prop: 'name',
               label: '璁惧鍚嶇О',
               sort: true,
@@ -145,7 +147,7 @@
  // 鍒堕�犳棩鏈�
  {
               minWidth: '150',
-              width: '250',
+              width: '150',
               prop: 'createTime',
               label: '鏍″噯鏃堕棿',
               sort: true,
@@ -154,10 +156,10 @@
               isSearch: true,
               searchInfoType: 'datetime'
             },
-           
+
             {
               minWidth: '150',
-              width: '250',
+              width: '150',
               prop: 'updateTime',
               label: '鏍″噯鍒版湡鏃堕棿',
               sort: true,
@@ -261,16 +263,6 @@
             },
           ],
           toolbar: [
-            {
-              text: '鏂板',
-              type: 'primary',
-              fun: this.addOrUpdateHandle
-            },
-            {
-              text: '鏍囩鎵撳嵃',
-              type: 'primary',
-              fun: this.labelPrint
-            },
             // {
             //   text: '鍚屾',
             //   type: 'primary',
@@ -278,22 +270,7 @@
             //   fun: this.pullEquipFun
             // }
           ],
-          operator: [
-            {
-              text: '淇敼',
-              icon: 'el-icon-edit',
-              type: 'text',
-              size: 'small',
-              fun: this.addOrUpdateHandle
-            },
-            {
-              text: '鍒犻櫎',
-              icon: 'el-icon-delete',
-              type: 'text',
-              size: 'small',
-              fun: this.deleteHandle
-            }
-          ],
+          operator: null,
           operatorConfig: {
             fixed: 'right',
             label: '鎿嶄綔',
@@ -315,6 +292,41 @@
       ...mapGetters(['permissions'])
     },
     created() {
+      this.uploadInfo.isShow = this.permissions.equipment_metering_upload
+      if(this.permissions.equipment_metering_add){
+        this.table.toolbar.push({
+              text: '鏂板',
+              type: 'primary',
+              fun: this.addOrUpdateHandle
+            })
+      }
+      if(this.permissions.equipment_metering_labelprint){
+        this.table.toolbar.push({
+                text: '鏍囩鎵撳嵃',
+                type: 'primary',
+                fun: this.labelPrint
+              })
+      }
+      let arr = []
+      if(this.permissions.equipment_metering_edit){
+        arr.push({
+              text: '淇敼',
+              icon: 'el-icon-edit',
+              type: 'text',
+              size: 'small',
+              fun: this.addOrUpdateHandle
+            })
+      }
+      if(this.permissions.equipment_metering_del){
+        arr.push({
+              text: '鍒犻櫎',
+              icon: 'el-icon-delete',
+              type: 'text',
+              size: 'small',
+              fun: this.deleteHandle
+            })
+      }
+      this.table.operator = arr.length>0 ? arr : null
       remote('work_shop').then((response) => {
         if (response.data.code === 0) {
           this.workshopList = response.data.data
@@ -330,11 +342,11 @@
               printable: 'printMetering',//椤甸潰
               type: "html",//鏂囨。绫诲瀷
                 maxWidth:450,
-                targetStyles:['*'],                 
+                targetStyles:['*'],
                 style: `@page {
                   margin:0;
                   padding: 0;
-                  size: 360px 170px;
+                  size: 360px 170px landscape;
                 }
                 html{
                   zoom:100%;
@@ -413,4 +425,3 @@
     }
   }
   </script>
-  
\ No newline at end of file

--
Gitblit v1.9.3