From 3ad02364ce97ab8188d18c52695c8b57b1e47ea6 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 23 一月 2024 08:40:37 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
index 62cec04..f2b4c5b 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
@@ -37,7 +37,7 @@
   keepSource: true,//淇濇寔婧愭暟鎹�
   align: 'center',//鏂囧瓧灞呬腑
   stripe:true,//鏂戦┈绾�
-  rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+  rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
   id: 'CustomerList',
   showFooter: true,//鏄剧ず鑴�
   printConfig: {},
@@ -127,20 +127,20 @@
     },
   ],//table body瀹為檯鏁版嵁
   //鑴氶儴姹傚拰
-  footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
-    let footList=['7','8','9','10']
-    return[
-      columns.map((column, columnIndex) => {
-        if (columnIndex === 0) {
-          return '鍚堣:'
-        }
-        if (footList.includes(column.field)) {
-          return sumNum(data, column.field)
-        }
-        return ''
-      })
-    ]
-  }
+  // footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
+  //   let footList=['7','8','9','10']
+  //   return[
+  //     columns.map((column, columnIndex) => {
+  //       if (columnIndex === 0) {
+  //         return '鍚堣:'
+  //       }
+  //       if (footList.includes(column.field)) {
+  //         return sumNum(data, column.field)
+  //       }
+  //       return ''
+  //     })
+  //   ]
+  // }
 
 })
 
@@ -184,17 +184,17 @@
 </script>
 
 <template>
-  <div class="main-div-customer">
+  <div class="main-div-customer" >
     <div id="selectForm">
       <el-row :gutter="0">
-        <el-input placeholder="閿�鍞崟鍙�" v-model="form.name" style="width: 150px"/>
+        <el-input placeholder="閿�鍞崟鍙�" v-model="form.name" value="NG23110102" style="width: 150px"/>
         &nbsp;&nbsp;
         <el-button type="primary">鏌ヨ</el-button>
       </el-row>
 
     </div>
     <vxe-grid
-        max-height="100%"
+       height="400px"
         @filter-change="filterChanged"
         class="mytable-scrollbar"
         ref="xGrid"

--
Gitblit v1.8.0