This commit is contained in:
bryan sun
2019-10-24 15:45:13 +08:00
parent a6fee1fea0
commit f65eb643fb
20 changed files with 520 additions and 532 deletions

View File

@@ -2,7 +2,7 @@
<div class="app-container">
<el-card>
<span>项目名称</span>
<el-select v-model="projectValue" placeholder="请选择项目名称" filterable size="small">
<el-select v-model="projectValue" placeholder="请选择项目名称" style="margin: 0px 20px 0px 0px" filterable size="small">
<el-option
v-for="item in project"
:key="item.value"
@@ -10,7 +10,7 @@
:value="item.value"/>
</el-select>
<span>机床图号</span>
<el-select v-model="machineValue" placeholder="请选择机床图号" filterable size="small">
<el-select v-model="machineValue" placeholder="请选择机床图号" style="margin: 0px 20px 0px 0px" filterable size="small">
<el-option
v-for="item in machine"
:key="item.value"
@@ -19,7 +19,7 @@
</el-select>
<span>组号</span>
<el-select v-model="groupValue" placeholder="请选择组号" filterable size="small">
<el-select v-model="groupValue" placeholder="请选择组号" style="margin: 0px 20px 0px 0px" filterable size="small">
<el-option
v-for="item in group"
:key="item.value"
@@ -36,7 +36,7 @@
<div>
<span style="font-size: 20px">基本件三表数量</span>
<el-tooltip :open-delay="1000" effect="dark" content="删除基本件三表数量" placement="top">
<el-button style="float: right;margin-bottom: 20px" type="danger" size="small" @click="alldelete()">全部删除</el-button>
<el-button style="float: right;margin-bottom: 3px" type="danger" size="small" @click="alldelete()">全部删除</el-button>
</el-tooltip>
</div>
<el-table
@@ -144,22 +144,22 @@
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="pageCurrent"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChanges"
@current-change="handleCurrentChanges"/>
</div>
<!-- <div class="block" style="margin-top: 10px;">-->
<!-- <el-pagination-->
<!-- :current-page="pageCurrent"-->
<!-- :page-sizes="[10, 20, 30, 40]"-->
<!-- :page-size="pageSize"-->
<!-- :total="total"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- @size-change="handleSizeChanges"-->
<!-- @current-change="handleCurrentChanges"/>-->
<!-- </div>-->
</el-card>
<el-card>
<div>
<span style="font-size: 20px">外购件和标准件三表数量</span>
<el-tooltip :open-delay="1000" effect="dark" content="删除外购件和标准件数量" placement="top">
<el-button style="float: right;margin-bottom: 20px" type="danger" size="small" @click="alldeleteWB()">全部删除</el-button>
<el-button style="float: right;margin-bottom: 3px" type="danger" size="small" @click="alldeleteWB()">全部删除</el-button>
</el-tooltip>
</div>
<el-table
@@ -240,16 +240,16 @@
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px">
<el-pagination
:current-page="pageCurrentWB"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSizeWB"
:total="totalWB"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChangeWB"
@current-change="handleCurrentChangeWB"/>
</div>
<!-- <div class="block" style="margin-top: 10px">-->
<!-- <el-pagination-->
<!-- :current-page="pageCurrentWB"-->
<!-- :page-sizes="[10, 20, 30, 40]"-->
<!-- :page-size="pageSizeWB"-->
<!-- :total="totalWB"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- @size-change="handleSizeChangeWB"-->
<!-- @current-change="handleCurrentChangeWB"/>-->
<!-- </div>-->
</el-card>
<el-card>
<div>
@@ -303,17 +303,17 @@
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="pageCurrent1"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize1"
:total="total1"
style="width:50%;display:inline-block;"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange1"
@current-change="handleCurrentChange1"/>
</div>
<!-- <div class="block" style="margin-top: 10px;">-->
<!-- <el-pagination-->
<!-- :current-page="pageCurrent1"-->
<!-- :page-sizes="[10, 20, 30, 40]"-->
<!-- :page-size="pageSize1"-->
<!-- :total="total1"-->
<!-- style="width:50%;display:inline-block;"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- @size-change="handleSizeChange1"-->
<!-- @current-change="handleCurrentChange1"/>-->
<!-- </div>-->
</div>
</el-card>
<el-card>
@@ -362,17 +362,17 @@
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="pageCurrent2"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize2"
:total="total2"
style="float:left"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange2"
@current-change="handleCurrentChange2"/>
</div>
<!-- <div class="block" style="margin-top: 10px;">-->
<!-- <el-pagination-->
<!-- :current-page="pageCurrent2"-->
<!-- :page-sizes="[10, 20, 30, 40]"-->
<!-- :page-size="pageSize2"-->
<!-- :total="total2"-->
<!-- style="float:left"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- @size-change="handleSizeChange2"-->
<!-- @current-change="handleCurrentChange2"/>-->
<!-- </div>-->
</el-card>
<el-card>
<div style="font-size: 20px">未分配采购零件数量</div>
@@ -433,17 +433,17 @@
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
:current-page="pageCurrent3"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize3"
:total="total3"
style="display:inline-block;width:50%"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange3"
@current-change="handleCurrentChange3"/>
</div>
<!-- <div class="block">-->
<!-- <el-pagination-->
<!-- :current-page="pageCurrent3"-->
<!-- :page-sizes="[10, 20, 30, 40]"-->
<!-- :page-size="pageSize3"-->
<!-- :total="total3"-->
<!-- style="display:inline-block;width:50%"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- @size-change="handleSizeChange3"-->
<!-- @current-change="handleCurrentChange3"/>-->
<!-- </div>-->
</el-tab-pane>
<el-tab-pane label="基本件">
<el-table :data="tableData4" size="mini" style="max-height: 320px" height="320px" border>
@@ -496,17 +496,17 @@
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
:current-page="pageCurrent4"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize4"
:total="total4"
style="display:inline-block;width:50%"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange4"
@current-change="handleCurrentChange4"/>
</div>
<!-- <div class="block">-->
<!-- <el-pagination-->
<!-- :current-page="pageCurrent4"-->
<!-- :page-sizes="[10, 20, 30, 40]"-->
<!-- :page-size="pageSize4"-->
<!-- :total="total4"-->
<!-- style="display:inline-block;width:50%"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- @size-change="handleSizeChange4"-->
<!-- @current-change="handleCurrentChange4"/>-->
<!-- </div>-->
</el-tab-pane>
</el-tabs>
</el-card>
@@ -515,7 +515,7 @@
<span style="font-size: 20px">临时表</span>
<el-button style="float: right" type="danger" size="small" @click="alldelete5()">全部删除</el-button>
</div>
<el-tabs v-model="activeName" style="margin-top: 20px" type="border-card" @tab-click="searchTable5();searchTable6()">
<el-tabs v-model="activeName" style="margin-top: 10px" type="border-card" @tab-click="searchTable5();searchTable6()">
<el-tab-pane label="标准件和外购件" name="1">
<el-table :data="tableData5" size="mini" style="max-height: 320px" height="320px" border>
<el-table-column align="center" label="项目" min-width="100px">
@@ -562,17 +562,17 @@
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
:current-page="pageCurrent5"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize5"
:total="total5"
style="display:inline-block;width:50%"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange5"
@current-change="handleCurrentChange5"/>
</div>
<!-- <div class="block">-->
<!-- <el-pagination-->
<!-- :current-page="pageCurrent5"-->
<!-- :page-sizes="[10, 20, 30, 40]"-->
<!-- :page-size="pageSize5"-->
<!-- :total="total5"-->
<!-- style="display:inline-block;width:50%"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- @size-change="handleSizeChange5"-->
<!-- @current-change="handleCurrentChange5"/>-->
<!-- </div>-->
</el-tab-pane>
<el-tab-pane label="基本件" name="2">
<el-table :data="tableData6" size="mini" style="max-height: 320px" height="320px" border>
@@ -615,17 +615,17 @@
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
:current-page="pageCurrent6"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize6"
:total="total6"
style="display:inline-block;width:50%"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange6"
@current-change="handleCurrentChange6"/>
</div>
<!-- <div class="block">-->
<!-- <el-pagination-->
<!-- :current-page="pageCurrent6"-->
<!-- :page-sizes="[10, 20, 30, 40]"-->
<!-- :page-size="pageSize6"-->
<!-- :total="total6"-->
<!-- style="display:inline-block;width:50%"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- @size-change="handleSizeChange6"-->
<!-- @current-change="handleCurrentChange6"/>-->
<!-- </div>-->
</el-tab-pane>
</el-tabs>
</el-card>
@@ -677,7 +677,7 @@ export default {
dialogFormVisible3: false,
loading: false,
loadingWB: false,
total: 0,
// total: 0,
tableData: [],
tableData1: [],
tableData2: [],
@@ -687,32 +687,32 @@ export default {
tableData6: [],
tableData7: [],
tableDataWB: [],
pageCurrent: 1,
pageSize: 10,
pageCurrent1: 1,
pageSize1: 10,
total1: 0,
pageCurrent2: 1,
pageSize2: 10,
total2: 0,
pageCurrent3: 1,
pageSize3: 10,
total3: 0,
pageCurrent4: 1,
pageSize4: 10,
total4: 0,
pageCurrent5: 1,
pageSize5: 10,
total5: 0,
pageCurrent6: 1,
pageSize6: 10,
total6: 0,
// pageCurrent: 1,
// pageSize: 10,
// pageCurrent1: 1,
// pageSize1: 10,
// total1: 0,
// pageCurrent2: 1,
// pageSize2: 10,
// total2: 0,
// pageCurrent3: 1,
// pageSize3: 10,
// total3: 0,
// pageCurrent4: 1,
// pageSize4: 10,
// total4: 0,
// pageCurrent5: 1,
// pageSize5: 10,
// total5: 0,
// pageCurrent6: 1,
// pageSize6: 10,
// total6: 0,
pageCurrent7: 1,
pageSize7: 10,
total7: 0,
pageCurrentWB: 1,
pageSizeWB: 10,
totalWB: 0
total7: 0
// pageCurrentWB: 1,
// pageSizeWB: 10,
// totalWB: 0
}
},
computed: {
@@ -871,12 +871,12 @@ export default {
const machine_check = this.machineValue ? 1 : 0
const group_check = this.groupValue ? 1 : 0
this.loading = true
basicPartsData(project_check, this.projectValue, machine_check, this.machineValue, group_check, this.groupValue, this.pageSize, this.pageCurrent).then(response => {
basicPartsData(project_check, this.projectValue, machine_check, this.machineValue, group_check, this.groupValue).then(response => {
this.loading = false
const res = response.data
this.total = res.total
// console.log(this.tableData)
this.tableData = res.rows.map(item => {
this.tableData = res.map(item => {
if (item.整改类型 === '1') {
item.整改类型 = '新增'
} else if (item.整改类型 === '2') {
@@ -888,11 +888,11 @@ export default {
})
})
this.loadingWB = true
purchasePartsData(this.groupValue, this.pageCurrentWB, this.pageSizeWB).then(response => {
purchasePartsData(this.groupValue).then(response => {
this.loadingWB = false
const data = response.data
this.totalWB = data.total
this.tableDataWB = data.rows.map(item => {
this.tableDataWB = data.map(item => {
console.log(item)
item.零件类型 = item.零件类型 === '2' ? '外购件' : '标准件'
return item
@@ -901,22 +901,22 @@ export default {
},
getTable() {
this.tableData1 = []
getTable(this.groupValue, this.pageCurrent1, this.pageSize1).then(response => {
getTable(this.groupValue).then(response => {
this.total1 = parseInt(response.data.total)
this.tableData1 = []
for (let i = 0; i < response.data.rows.length; i++) {
for (let i = 0; i < response.data.length; i++) {
this.tableData1.push({
零件图号: response.data.rows[i].零件图号,
零件名称: response.data.rows[i].零件名称,
投产总数量: response.data.rows[i].投产总数量,
最大投产批次: response.data.rows[i].最大投产批次,
已投产数量: response.data.rows[i].已投产数量,
未投产数量: response.data.rows[i].未投产数量,
零件类型名称: response.data.rows[i].零件类型名称,
组件零件基本件流水号: response.data.rows[i].组件零件基本件流水号,
投产类型流水号: response.data.rows[i].投产类型流水号,
数据类型: response.data.rows[i].数据类型,
材料流水号: response.data.rows[i].材料流水号
零件图号: response.data[i].零件图号,
零件名称: response.data[i].零件名称,
投产总数量: response.data[i].投产总数量,
最大投产批次: response.data[i].最大投产批次,
已投产数量: response.data[i].已投产数量,
未投产数量: response.data[i].未投产数量,
零件类型名称: response.data[i].零件类型名称,
组件零件基本件流水号: response.data[i].组件零件基本件流水号,
投产类型流水号: response.data[i].投产类型流水号,
数据类型: response.data[i].数据类型,
材料流水号: response.data[i].材料流水号
})
}
})
@@ -939,21 +939,21 @@ export default {
} else {
this.checked_partNumber = false
}
getTable1(this.checked_entryName, '', this.checked_toolNum, this.machineValue, this.checked_Num, this.groupValue, this.checked_partNumber, this.partNumber, this.pageCurrent2, this.pageSize2).then(response => {
for (let i = 0; i < response.data.rows.length; i++) {
response.data.rows[i].机加工开始时间_长日期 = response.data.rows[i].机加工开始时间_长日期.substring(0, response.data.rows[i].机加工开始时间_长日期.indexOf(' '))
response.data.rows[i].机加工结束时间_长日期 = response.data.rows[i].机加工结束时间_长日期.substring(0, response.data.rows[i].机加工结束时间_长日期.indexOf(' '))
getTable1(this.checked_entryName, '', this.checked_toolNum, this.machineValue, this.checked_Num, this.groupValue, this.checked_partNumber, this.partNumber).then(response => {
for (let i = 0; i < response.data.length; i++) {
response.data[i].机加工开始时间_长日期 = response.data[i].机加工开始时间_长日期.substring(0, response.data[i].机加工开始时间_长日期.indexOf(' '))
response.data[i].机加工结束时间_长日期 = response.data[i].机加工结束时间_长日期.substring(0, response.data[i].机加工结束时间_长日期.indexOf(' '))
}
this.total2 = parseInt(response.data.total)
for (let i = 0; i < response.data.rows.length; i++) {
for (let i = 0; i < response.data.length; i++) {
this.tableData2.push({
零件图号: response.data.rows[i].零件图号,
零件名称: response.data.rows[i].零件名称,
投产数量: response.data.rows[i].投产数量,
机加工开始时间: response.data.rows[i].机加工开始时间_长日期,
机加工结束时间: response.data.rows[i].机加工结束时间_长日期,
工序数量: response.data.rows[i].工序数量,
工艺计划流水号: response.data.rows[i].工艺计划流水号
零件图号: response.data[i].零件图号,
零件名称: response.data[i].零件名称,
投产数量: response.data[i].投产数量,
机加工开始时间: response.data[i].机加工开始时间_长日期,
机加工结束时间: response.data[i].机加工结束时间_长日期,
工序数量: response.data[i].工序数量,
工艺计划流水号: response.data[i].工艺计划流水号
})
}
})
@@ -963,8 +963,8 @@ export default {
this.projectValue ? check2 = 1 : check2 = 0
this.machineValue ? check0 = 1 : check0 = 0
this.groupValue ? check1 = 1 : check1 = 0
searchTable1(this.pageCurrent3, this.pageSize3, check2, this.projectValue, check0, this.machineValue, check1, this.groupValue).then(response => {
this.tableData3 = response.data.rows
searchTable1(check2, this.projectValue, check0, this.machineValue, check1, this.groupValue).then(response => {
this.tableData3 = response.data
this.total3 = response.data.total
})
},
@@ -973,8 +973,8 @@ export default {
this.projectValue ? check2 = 1 : check2 = 0
this.machineValue ? check0 = 1 : check0 = 0
this.groupValue ? check1 = 1 : check1 = 0
searchTable2(this.pageCurrent4, this.pageSize4, check2, this.projectValue, check0, this.machineValue, check1, this.groupValue).then(response => {
this.tableData4 = response.data.rows
searchTable2(check2, this.projectValue, check0, this.machineValue, check1, this.groupValue).then(response => {
this.tableData4 = response.data
this.total4 = response.data.total
})
},
@@ -983,9 +983,9 @@ export default {
this.projectName ? check2 = 1 : check2 = 0
this.machineName ? check0 = 1 : check0 = 0
this.groupName ? check1 = 1 : check1 = 0
searchTable5(this.pageCurrent6, this.pageSize6, check2, this.projectName, check0, this.machineName, check1, this.groupName).then(response => {
searchTable5(check2, this.projectName, check0, this.machineName, check1, this.groupName).then(response => {
console.log(response, 5, this.activeName)
this.tableData5 = response.data.rows
this.tableData5 = response.data
this.total5 = response.data.total
})
},
@@ -995,9 +995,9 @@ export default {
this.machineName ? check0 = 1 : check0 = 0
this.groupName ? check1 = 1 : check1 = 0
// console.log(this.projectName, this.machineName, this.groupName, 44)
searchTable6(this.pageCurrent6, this.pageSize6, check2, this.projectName, check0, this.machineName, check1, this.groupName).then(response => {
searchTable6(check2, this.projectName, check0, this.machineName, check1, this.groupName).then(response => {
console.log(response, 6)
this.tableData6 = response.data.rows
this.tableData6 = response.data
this.total6 = response.data.total
})
},
@@ -1126,78 +1126,78 @@ export default {
})
}
},
handleSizeChanges(val) {
this.pageCurrent = 1
this.pageSize = val
this.getTableData()
},
handleCurrentChanges(val) {
this.pageCurrent = val
this.getTableData()
},
handleSizeChangeWB(val) {
this.pageCurrentWB = 1
this.pageSizeWB = val
this.getTableData()
},
handleCurrentChangeWB(val) {
this.pageCurrentWB = val
this.getTableData()
},
handleSizeChange1(val) {
this.pageCurrent1 = 1
this.pageSize1 = val
this.getTable()
},
handleCurrentChange1(val) {
this.pageCurrent1 = val
this.getTable()
},
handleSizeChange2(val) {
this.pageSize2 = val
this.pageCurrent2 = 1
this.getTable1()
},
handleCurrentChange2(val) {
this.pageCurrent2 = val
this.getTable1()
},
handleSizeChange3(val) {
this.pageSize3 = val
this.pageCurrent3 = 1
this.searchTable1()
},
handleCurrentChange3(val) {
this.pageCurrent3 = val
this.searchTable1()
},
handleSizeChange4(val) {
this.pageSize4 = val
this.pageCurrent4 = 1
this.searchTable2()
},
handleCurrentChange4(val) {
this.pageCurrent4 = val
this.searchTable2()
},
handleSizeChange5(val) {
this.pageSize5 = val
this.pageCurrent5 = 1
this.searchTable5()
},
handleCurrentChange5(val) {
this.pageCurrent5 = val
this.searchTable5()
},
handleSizeChange6(val) {
this.pageSize6 = val
this.pageCurrent6 = 1
this.searchTable6()
},
handleCurrentChange6(val) {
this.pageCurrent6 = val
this.searchTable6()
},
// handleSizeChanges(val) {
// this.pageCurrent = 1
// this.pageSize = val
// this.getTableData()
// },
// handleCurrentChanges(val) {
// this.pageCurrent = val
// this.getTableData()
// },
// handleSizeChangeWB(val) {
// this.pageCurrentWB = 1
// this.pageSizeWB = val
// this.getTableData()
// },
// handleCurrentChangeWB(val) {
// this.pageCurrentWB = val
// this.getTableData()
// },
// handleSizeChange1(val) {
// this.pageCurrent1 = 1
// this.pageSize1 = val
// this.getTable()
// },
// handleCurrentChange1(val) {
// this.pageCurrent1 = val
// this.getTable()
// },
// handleSizeChange2(val) {
// this.pageSize2 = val
// this.pageCurrent2 = 1
// this.getTable1()
// },
// handleCurrentChange2(val) {
// this.pageCurrent2 = val
// this.getTable1()
// },
// handleSizeChange3(val) {
// this.pageSize3 = val
// this.pageCurrent3 = 1
// this.searchTable1()
// },
// handleCurrentChange3(val) {
// this.pageCurrent3 = val
// this.searchTable1()
// },
// handleSizeChange4(val) {
// this.pageSize4 = val
// this.pageCurrent4 = 1
// this.searchTable2()
// },
// handleCurrentChange4(val) {
// this.pageCurrent4 = val
// this.searchTable2()
// },
// handleSizeChange5(val) {
// this.pageSize5 = val
// this.pageCurrent5 = 1
// this.searchTable5()
// },
// handleCurrentChange5(val) {
// this.pageCurrent5 = val
// this.searchTable5()
// },
// handleSizeChange6(val) {
// this.pageSize6 = val
// this.pageCurrent6 = 1
// this.searchTable6()
// },
// handleCurrentChange6(val) {
// this.pageCurrent6 = val
// this.searchTable6()
// },
handleSizeChange7(val) {
this.pageSize7 = val
this.pageCurrent7 = 1
@@ -1212,7 +1212,7 @@ export default {
</script>
<style scoped>
span{
margin: 20px;
}
/*span{*/
/* margin: 20px;*/
/*}*/
</style>