From 57de3b8b2f4ac04dd423a622284af8369deecef5 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Fri, 20 Sep 2019 12:20:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=BB=93=E7=AE=97=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=EF=BC=88=E8=BD=A6=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InvoiceSettlementApplication1/index.vue   | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
index 448e5fd0..6f6ecfac 100644
--- a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
+++ b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
@@ -9,7 +9,7 @@
 
     <el-card>
       <h4 style="margin-top: 5px">发票结算申请单</h4>
-      <el-table id="expandTable" :data="tableData1" border highlight-current-row style="width: 100%;height: 300px;overflow:auto" size="mini" @row-click="searchTable2">
+      <el-table id="expandTable" :data="tableData1" border highlight-current-row style="width: 100%;" height="350px" size="mini" @row-click="searchTable2">
         <el-table-column type="expand">
           <template slot-scope="scope">
             <el-form label-position="left" inline class="demo-table-expand">
@@ -42,12 +42,12 @@
             </el-form>
           </template>
         </el-table-column>
-        <el-table-column label="供应商" align="center" min-width="200">
+        <el-table-column label="供应商" align="center" width="170" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="发票号" align="center" min-width="100">
+        <el-table-column label="发票号" align="center" width="130">
           <template slot-scope="scope">
             {{ scope.row.发票号 }}
           </template>
@@ -57,17 +57,17 @@
             {{ scope.row.发票金额 }}
           </template>
         </el-table-column>
-        <el-table-column label="申请人" align="center" min-width="70">
+        <el-table-column label="申请人" align="center" width="100">
           <template slot-scope="scope">
             {{ scope.row.申请人姓名 ? scope.row.申请人姓名 : '未提交' }}
           </template>
         </el-table-column>
-        <el-table-column label="申请时间" align="center" min-width="120">
+        <el-table-column label="申请时间" align="center" width="130">
           <template slot-scope="scope">
             {{ scope.row.申请时间 ? scope.row.申请时间 : '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="采购审批" align="center" min-width="60">
+        <el-table-column label="采购审批" align="center" width="80">
           <template slot-scope="scope">
             {{ scope.row.审批人1姓名 ? scope.row.审批人1姓名 : '未审批' }}
           </template>
@@ -77,7 +77,7 @@
             {{ scope.row.审批1时间 ? scope.row.审批1时间 : '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="财务审批" align="center" min-width="60">
+        <el-table-column label="财务审批" align="center" width="80">
           <template slot-scope="scope">
             {{ scope.row.审批人2姓名 ? scope.row.审批人2姓名 : '未审批' }}
           </template>
@@ -87,7 +87,7 @@
             {{ scope.row.审批2时间 ? scope.row.审批2时间 : '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="总经理审批" align="center" min-width="70">
+        <el-table-column label="总经理审批" align="center" width="100">
           <template slot-scope="scope">
             {{ scope.row.审批人3姓名 ? scope.row.审批人3姓名 : '未审批' }}
           </template>
@@ -124,12 +124,12 @@
       <el-input v-model="invoiceNumber" size="small" placeholder="请选择发票结算申请单" readonly/>
       <el-button :disabled="disabled" type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="addInStoreRecord()">追加入库记录</el-button>
       <el-table :data="tableData2" border highlight-current-row style="width: 100%;max-height: 250px;" height="250px" size="mini">
-        <el-table-column label="名称" align="center" min-width="100">
+        <el-table-column label="名称" align="center" width="120">
           <template slot-scope="scope">
             {{ scope.row.采购物料名称 || scope.row.离线物料名称 || scope.row.采购零件名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="图号或型号" align="center" min-width="100">
+        <el-table-column label="图号或型号" align="center" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.采购物料型号 || scope.row.离线物料型号 || scope.row.采购零件图号 }}
           </template>
@@ -139,12 +139,12 @@
             {{ scope.row.采购物料规格 || scope.row.离线物料规格 || scope.row.采购零件规格 }}
           </template>
         </el-table-column>
-        <el-table-column label="供应商" align="center" min-width="150">
+        <el-table-column label="供应商" align="center" min-width="150" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="合同编号" align="center" min-width="100">
+        <el-table-column label="合同编号" align="center" width="120">
           <template slot-scope="scope">
             {{ scope.row.采购合同编号 || scope.row.离线合同编号 }}
           </template>