From 61e2240bb77f1dc6857f9eae6f669c3fbe85c0b1 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Wed, 12 Feb 2020 15:17:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E5=B1=80=E8=A1=A8=E5=A4=B4=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/styles/element-ui.scss                    |  4 ++
 .../PurchaseTaskAllocate/index.vue            | 42 -------------------
 .../OutsourcingMaterialsInvoice/index.vue     |  3 +-
 3 files changed, 5 insertions(+), 44 deletions(-)

diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 03e15f2b..2d695d7e 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -27,10 +27,14 @@
     }
   }
 }
+//表头全局样式
  .el-table th{
    background-color: #7eaced;
    color: white;/*修改表格头部背景*/
    line-height: 35px!important;
+   font-family: YouYuan!important;
+   font-Size: 14px!important;
+   font-weight:200!important
  }
  .el-table__row td{
    padding: 3px 0!important;
diff --git a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
index 8436d6c6..236510b9 100644
--- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
+++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
@@ -121,7 +121,6 @@
           <el-table
             v-loading="loading"
             :data="tableData0"
-            :header-cell-style="{fontFamily:'MicrosoftYaHeiUI',fontSize:'14px',fontWeight:200}"
             size="mini"
             height="740px"
             style="width: 1265px"
@@ -158,11 +157,6 @@
                 {{ scope.row.零件数量 }}
               </template>
             </el-table-column>
-            <!--<el-table-column align="center" label="项目名称" prop="项目名称" min-width="100px" width="140px">-->
-            <!--<template slot-scope="scope">-->
-            <!--{{ scope.row.项目名称 }}-->
-            <!--</template>-->
-            <!--</el-table-column>-->
             <el-table-column align="center" prop="机床图号" label="机床图号" min-width="100px" width="120px">
               <template slot-scope="scope">
                 {{ scope.row.机床图号 }}
@@ -193,31 +187,11 @@
                 {{ scope.row.供货商 }}
               </template>
             </el-table-column>
-            <!--<el-table-column :filters="source" :filter-method="filterSource" align="center" label="数据来源" min-width="90px" prop="零件类型">-->
-            <!--<template slot-scope="scope">-->
-            <!--{{ Number(scope.row.零件类型) === 1 ? 'BZ' : 'WG' }}-->
-            <!--</template>-->
-            <!--</el-table-column>-->
-            <!--<el-table-column align="center" label="计划到货时间" min-width="100px">-->
-            <!--<template slot-scope="scope">-->
-            <!--{{ scope.row.物料计划到货时间.split(' ')[0] }}-->
-            <!--</template>-->
-            <!--</el-table-column>-->
-            <!--<el-table-column align="center" label="生产分配时间" min-width="100px">-->
-            <!--<template slot-scope="scope">-->
-            <!--{{ scope.row.操作日期.split(' ')[0] }}-->
-            <!--</template>-->
-            <!--</el-table-column>-->
             <el-table-column v-if="radio==='2'" :filters="person" :filter-method="filterHandler" align="center" label="采购员" min-width="80px" prop="姓名">
               <template slot-scope="scope">
                 {{ scope.row.姓名 ? scope.row.姓名 : '—' }}
               </template>
             </el-table-column>
-            <!--<el-table-column align="center" label="采购分配时间" min-width="100px">-->
-            <!--<template slot-scope="scope">-->
-            <!--{{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '—' }}-->
-            <!--</template>-->
-            <!--</el-table-column>-->
             <el-table-column v-if="radio==='2'" align="center" label="撤回分配" min-width="100px" fixed="right">
               <template slot-scope="scope">
                 <el-tooltip :open-delay="1200" effect="dark" content="撤回已分配的采购任务" placement="top">
@@ -1154,20 +1128,4 @@ export default {
       line-height: 46px;
     }
   }
-  /*.el-table td.gutter,.el-table th.gutter{*/
-    /*width: 15px;*/
-    /*border-right-width: 0;*/
-    /*border-bottom-width: 0;*/
-    /*padding: 0;*/
-    /*background: red;*/
-  /*}*/
-</style>
-<style>
-  /*.el-table td.gutter,.el-table th.gutter{*/
-    /*width: 15px;*/
-    /*border-right-width: 0;*/
-    /*border-bottom-width: 0;*/
-    /*padding: 0;*/
-    /*background: white;*/
-  /*}*/
 </style>
diff --git a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
index 5cd1c569..2a7feb85 100644
--- a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
+++ b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
@@ -50,7 +50,6 @@
     <el-card style="float: left">
       <el-table
         :data="tableData1"
-        :header-cell-style="{fontFamily:'MicrosoftYaHeiUI',fontSize:'14px',fontWeight:200}"
         size="mini"
         style="margin-top: 3px"
         height="750px"
@@ -141,7 +140,7 @@
       </div>
     </el-card>
     <el-card style="float: left;margin-left: 5px">
-      <el-table :data="gridData" :header-cell-style="{fontFamily:'MicrosoftYaHeiUI',fontSize:'14px',fontWeight:200}" :summary-method="getSummaries" class="subTableHeader" show-summary border size="mini" style="width: 100%">
+      <el-table :data="gridData" :summary-method="getSummaries" class="subTableHeader" show-summary border size="mini" style="width: 100%">
         <el-table-column width="50" align="center" type="index" label="序号"/>
         <el-table-column label="到货单编号" align="center" width="120px">
           <template slot-scope="scope">