meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://123.56.95.229:10010/r/高精

Browse Source
This commit is contained in:
liushuai
2020-05-14 18:17:09 +08:00
parent 990052a70e f0e3cbe42f
commit 2503108a9b
8 changed files with 67 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
View File

@@ -157,7 +157,7 @@
<!-- <h4 style="margin-top: 5px;margin-bottom: 0px;display: inline-block;width: 150px;">发票结算申请单明细</h4>-->
<!-- <span>发票号：</span>-->
<!-- <el-input v-model="invoiceNumber" size="small" placeholder="请选择发票结算申请单" readonly/>-->
<el-table :data="tableData2" border highlight-current-row style="width: 100%;max-height: 250px;" height="250px" size="mini">
<el-table :data="tableData2" border highlight-current-row style="width: 100%;max-height: 450px;" height="450px" size="mini">
<el-table-column label="名称" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.采购物料名称 || scope.row.离线物料名称 || scope.row.采购零件名称 }}

6
src/views/PurchasingCenter/OfflineContract/index.vue
View File

@@ -46,17 +46,17 @@
@selection-change="handleSelectionChange1"
@select="handleSelection">
<el-table-column :selectable="selectable" align="center" width="43" type="selection"/>
<el-table-column label="名称" align="center" prop="物料名称" width="100" show-overflow-tooltip>
<el-table-column fixed label="名称" align="center" prop="物料名称" width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column label="规格" align="center" prop="物料规格" width="120" show-overflow-tooltip>
<el-table-column fixed label="规格" align="center" prop="物料规格" width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料规格 }}
</template>
</el-table-column>
<el-table-column label="型号" prop="物料型号" align="center" width="100" show-overflow-tooltip>
<el-table-column fixed label="型号" prop="物料型号" align="center" width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料型号 }}
</template>

12
src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
View File

@@ -110,28 +110,28 @@
<el-col :span="10">
<el-card>
<el-table :data="gridData" :summary-method="getSummaries2" border highlight-current-row size="mini" show-summary @row-click="searchContract">
<el-table-column width="100" align="center" label="合同编号">
<el-table-column min-width="110" align="center" label="合同编号" show-overflow-tooltip="">
<template slot-scope="scope">
{{ scope.row.采购合同编号 ? scope.row.采购合同编号 : scope.row.离线合同编号 }}
</template>
</el-table-column>
<el-table-column width="110" align="center" label="合同总额(元)" prop="合同总额">
<el-table-column width="105" align="center" label="合同总额(元)" prop="合同总额">
<template slot-scope="scope">
<span v-if="scope.row.合同总额">{{ scope.row.合同总额 ? parseFloat(scope.row.合同总额).toFixed(2) : 0 }}</span>
<span v-if="scope.row.离线合同总额">{{ scope.row.离线合同总额 ? parseFloat(scope.row.离线合同总额).toFixed(2) : 0 }}</span>
</template>
</el-table-column>
<el-table-column width="110" align="center" label="到货金额(元)" prop="到货金额">
<el-table-column width="105" align="center" label="到货金额(元)" prop="到货金额">
<template slot-scope="scope">
{{ parseFloat(scope.row.到货金额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column width="110" align="center" label="已付金额(元)" prop="已付金额">
<el-table-column width="105" align="center" label="已付金额(元)" prop="已付金额">
<template slot-scope="scope">
{{ parseFloat(scope.row.已付金额).toFixed(2) }}
</template>
</el-table-column>
<el-table-column width="110" align="center" label="请款金额(元)" prop="请款金额">
<el-table-column width="105" align="center" label="请款金额(元)" prop="请款金额">
<template slot-scope="scope">
{{ parseFloat(scope.row.请款金额).toFixed(2) }}
</template>
@@ -142,7 +142,7 @@
<el-col :span="14">
<el-card>
<el-table :data="tableData2" :summary-method="getSummaries" border height="450px" size="mini" stripe show-summary>
<el-table-column label="物料名称" align="center" min-width="120">
<el-table-column label="物料名称" align="center" min-width="110">
<template slot-scope="scope">
{{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.零件名称 }}
</template>