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

更新

Browse Source
This commit is contained in:
bryan sun
2019-10-23 19:04:14 +08:00
parent 8d7ed0ccdf
commit ea3bf600f3
63 changed files with 1031 additions and 547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
View File

@@ -89,9 +89,6 @@
</el-table>
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="发票号" sortable prop="发票号" min-width="120px">
=======
<el-table-column align="center" label="发票状态" min-width="100px">
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.是否请款) === 0" type="warning" size="mini">未请款</el-tag>
@@ -99,12 +96,11 @@
</template>
</el-table-column>
<el-table-column align="center" label="发票号" min-width="120px">
>>>>>>> b61c5180f7663ad09422c333eddaa302cafc0307
<template slot-scope="scope">
{{ scope.row.发票号 }}
</template>
</el-table-column>
<el-table-column align="center" label="开票时间" sortable prop="开票时间" min-width="100px">
<el-table-column align="center" label="开票时间" prop="开票时间" min-width="100px">
<template slot-scope="scope">
{{ scope.row.开票时间 }}
</template>
@@ -114,7 +110,7 @@
{{ scope.row.开票金额 }}
</template>
</el-table-column>
<el-table-column align="center" label="供应商" sortable prop="供应商名称" min-width="200px" show-overflow-tooltip>
<el-table-column align="center" label="供应商" prop="供应商名称" min-width="200px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>