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

Merge branch 'master' of ssh://192.168.1.149:29418/高精2.0

Browse Source
This commit is contained in:
chenjianan
2018-11-26 11:32:21 +08:00
parent 670a1e20df 73cc3258b8
commit b30a59c37f
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/Inventory/ExchangePart/index.vue
View File

@@ -109,12 +109,12 @@
</el-table-column> </el-table-column>
<el-table-column label="机床名称" align="center" min-width="80"> <el-table-column label="机床名称" align="center" min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床名称 }} {{ scope.row.机床图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="组件名称" align="center" min-width="80"> <el-table-column label="组件名称" align="center" min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.组件名称 }} {{ scope.row.组号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="物料名称" align="center" min-width="80"> <el-table-column label="物料名称" align="center" min-width="80">
@@ -149,12 +149,12 @@
</el-table-column> </el-table-column>
<el-table-column label="机床名称" align="center" min-width="80"> <el-table-column label="机床名称" align="center" min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床名称 }} {{ scope.row.机床图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="组件名称" align="center" min-width="80"> <el-table-column label="组件名称" align="center" min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.组件名称 }} {{ scope.row.组号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="物料名称" align="center" min-width="80"> <el-table-column label="物料名称" align="center" min-width="80">

12
src/views/Inventory/InventoryCheck/index.vue
View File

@@ -142,7 +142,7 @@
</el-table-column> </el-table-column>
<el-table-column label="出库时间" align="center" min-width="80"> <el-table-column label="出库时间" align="center" min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.出库时间 }} {{ scope.row.出库日期 ? scope.row.出库日期.split(' ')[0] : '' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="领用者" align="center" min-width="80"> <el-table-column label="领用者" align="center" min-width="80">
@@ -299,7 +299,7 @@
</el-table-column> </el-table-column>
<el-table-column label="出库时间" align="center" min-width="80"> <el-table-column label="出库时间" align="center" min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.出库时间 }} {{ scope.row.出库时间 ? scope.row.出库时间.split(' ')[0] : '' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="领用者" align="center" min-width="80"> <el-table-column label="领用者" align="center" min-width="80">
@@ -451,7 +451,7 @@
</el-table-column> </el-table-column>
<el-table-column label="出库时间" align="center" min-width="80"> <el-table-column label="出库时间" align="center" min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.出库时间 }} {{ scope.row.出库时间 ? scope.row.出库时间.split(' ')[0] : '' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="领用者" align="center" min-width="80"> <el-table-column label="领用者" align="center" min-width="80">
@@ -615,7 +615,7 @@
</el-table-column> </el-table-column>
<el-table-column label="出库时间" align="center" min-width="80"> <el-table-column label="出库时间" align="center" min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.出库时间 }} {{ scope.row.出库时间 ? scope.row.到货时间.split(' ')[0] : '' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="领用者" align="center" min-width="80"> <el-table-column label="领用者" align="center" min-width="80">
@@ -777,7 +777,7 @@
</el-table-column> </el-table-column>
<el-table-column label="出库时间" align="center" min-width="80"> <el-table-column label="出库时间" align="center" min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.出库时间 }} {{ scope.row.出库时间 ? scope.row.出库时间.split(' ')[0] : '' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="领用者" align="center" min-width="80"> <el-table-column label="领用者" align="center" min-width="80">
@@ -937,7 +937,7 @@
</el-table-column> </el-table-column>
<el-table-column label="出库时间" align="center" min-width="80"> <el-table-column label="出库时间" align="center" min-width="80">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.出库时间 }} {{ scope.row.出库时间 ? scope.row.出库时间.split(' ')[0] : '' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="领用者" align="center" min-width="80"> <el-table-column label="领用者" align="center" min-width="80">