更新
This commit is contained in:
@@ -287,10 +287,10 @@
|
|||||||
</el-table>
|
</el-table>
|
||||||
</el-card>
|
</el-card>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col style="width: 900px;margin-left: 10px">
|
<el-col style="width: 920px;margin-left: 10px">
|
||||||
<el-card>
|
<el-card>
|
||||||
<el-table :data="tableData6" border size="mini" style="width: 100%" height="300px">
|
<el-table :data="tableData6" border size="mini" style="width: 100%" height="300px">
|
||||||
<el-table-column label="序号" type="index" align="center" width="45px"/>
|
<el-table-column label="序号" type="index" align="center" width="50px"/>
|
||||||
<el-table-column label="零件名称" show-overflow-tooltip align="center" width="90px">
|
<el-table-column label="零件名称" show-overflow-tooltip align="center" width="90px">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
{{ scope.row.物料名称 }}
|
{{ scope.row.物料名称 }}
|
||||||
|
|||||||
@@ -56,7 +56,6 @@
|
|||||||
:row-class-name="tableRowClassName"
|
:row-class-name="tableRowClassName"
|
||||||
size="mini"
|
size="mini"
|
||||||
border
|
border
|
||||||
stripe
|
|
||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
height="500px"
|
height="500px"
|
||||||
highlight-current-row
|
highlight-current-row
|
||||||
|
|||||||
@@ -28,17 +28,17 @@
|
|||||||
<el-table v-loading="" :data="tableData2" :summary-method="getSummaries1" show-summary border style="width: 100%;max-height: 700px;" height="700px">
|
<el-table v-loading="" :data="tableData2" :summary-method="getSummaries1" show-summary border style="width: 100%;max-height: 700px;" height="700px">
|
||||||
<el-table-column label="零件名称" align="center" width="150">
|
<el-table-column label="零件名称" align="center" width="150">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
{{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.组件名称 }}
|
{{ scope.row.零件名称 }}
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="图号或型号" align="center" width="150">
|
<el-table-column label="图号或型号" align="center" width="150">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
{{ scope.row.物料型号 ? scope.row.物料型号 : scope.row.组号 }}
|
{{ scope.row.图号或型号 }}
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="材料或规格" align="center" width="100">
|
<el-table-column label="材料或规格" align="center" width="100">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
{{ scope.row.材料 ? scope.row.材料 : scope.row.物料规格 }}
|
{{ scope.row.材料或规格 }}
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="数量" align="center" width="100">
|
<el-table-column label="数量" align="center" width="100">
|
||||||
@@ -62,7 +62,7 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { initProject, searchProjectTotal1, searchProjectTotal2 } from '@/api/WorkshopProcurement/ProjectTotalSearch'
|
import { initProject, searchProjectTotal2 } from '@/api/WorkshopProcurement/ProjectTotalSearch'
|
||||||
import { mapGetters } from 'vuex'
|
import { mapGetters } from 'vuex'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
@@ -99,16 +99,8 @@ export default {
|
|||||||
},
|
},
|
||||||
searchTable1() {
|
searchTable1() {
|
||||||
if (this.projectValue) {
|
if (this.projectValue) {
|
||||||
searchProjectTotal1(this.projectValue).then(response => {
|
|
||||||
this.tableData = response.data
|
|
||||||
})
|
|
||||||
searchProjectTotal2(this.projectValue).then(response => {
|
searchProjectTotal2(this.projectValue).then(response => {
|
||||||
this.tableData2 = response.data
|
this.tableData2 = response.data
|
||||||
for (let i = 0; i < response.data.length; i++) {
|
|
||||||
if (response.data[i].物料型号 === null || response.data[i].物料型号 === '') {
|
|
||||||
response.data[i].物料型号 = response.data[i].零件图号
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
this.$message.error('请选择项目')
|
this.$message.error('请选择项目')
|
||||||
@@ -164,3 +156,4 @@ export default {
|
|||||||
width:300px
|
width:300px
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user