From 5b6d7fdf358af58c443746d5f19d935e851d34d6 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Wed, 13 Nov 2019 09:07:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=90=88=E5=90=8C=E8=AF=B7?=
 =?UTF-8?q?=E6=AC=BE=E4=BF=9D=E7=95=99=E4=B8=A4=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PurchaseContractRequestFund/index.vue       | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
index bb9dcd53..cf83fd6a 100644
--- a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
@@ -141,17 +141,17 @@
         </el-table-column>
         <el-table-column label="单价" align="center" min-width="100" prop="单价">
           <template slot-scope="scope">
-            {{ scope.row.单价 }}
+            {{ parseFloat(scope.row.单价||0).toFixed(2) }}
           </template>
         </el-table-column>
         <el-table-column label="合计" align="center" min-width="100" prop="合计">
           <template slot-scope="scope">
-            {{ parseFloat(scope.row.单价||0) * parseInt(scope.row.数量||0) }}
+            {{ (parseFloat(scope.row.单价||0) * parseInt(scope.row.数量||0)).toFixed(2) }}
           </template>
         </el-table-column>
         <el-table-column label="交货期要求" align="center" min-width="100" prop="交货期要求">
           <template slot-scope="scope">
-            {{ scope.row.合同类型 === 1 ? scope.row.交货期.split(' ')[0] : scope.row.交货期要求 }}
+            {{ scope.row.合同类型 === 1 ? scope.row.交货期.split(' ')[0] === '1900-01-01' ? '-' : scope.row.交货期.split(' ')[0] : scope.row.交货期要求 }}
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center" min-width="150" prop="备注">
@@ -178,7 +178,7 @@
       <!--<el-button type="success" size="small" icon="el-icon-search" style="margin: 0 10px 10px 10px" @click="searchTable01()">查询</el-button>-->
       <el-table v-loading="" :data="tableData01" border style="max-height: 300px;" height="300px" size="mini" @selection-change="handleSelectionChange">
         <el-table-column :selectable="selectable" type="selection" align="center" width="45"/>
-        <el-table-column label="采购合同编号" align="center" min-width="100" show-overflow-tooltip>
+        <el-table-column label="采购合同编号" align="center" min-width="140" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.采购合同编号 }}
           </template>
@@ -188,11 +188,6 @@
             {{ scope.row.采购合同名称 }}
           </template>
         </el-table-column>
-        <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" width="70">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
@@ -218,7 +213,7 @@
             {{ scope.row.申请中金额 }}
           </template>
         </el-table-column>
-        <el-table-column label="请款金额" align="center" min-width="140" prop="请款金额">
+        <el-table-column label="请款金额" align="center" min-width="180" prop="请款金额">
           <template slot-scope="scope">
             <el-input-number :max="scope.row.合同总额 - scope.row.已付金额 - scope.row.申请中金额" :disabled="(scope.row.合同总额 - scope.row.已付金额 - scope.row.申请中金额) === 0" :min="0" v-model="scope.row.请款金额" :precision="2" size="mini" controls-position="right" style="width: 100%;"/>
           </template>
@@ -364,7 +359,7 @@ export default {
                 return prev
               }
             }, 0)
-            sums[index] += ' 元'
+            sums[index] = sums[index].toFixed(2) + ' 元'
           } else {
             sums[index] = 'N/A'
           }