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-15 18:05:34 +08:00
parent aee7bd5966 f99edbf97f
commit 39a77099dc
12 changed files with 118 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue
View File

@@ -54,22 +54,22 @@
highlight-current-row
border
@row-click="fetchTableData2">
<el-table-column align="center" label="机床图号" width="120px" show-overflow-tooltip>
<el-table-column align="center" label="机床图号" width="120px" show-overflow-tooltip fixed>
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="组号" width="50px">
<el-table-column align="center" label="组号" width="50px" fixed>
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column align="center" label="零件图号" width="173px" show-overflow-tooltip>
<el-table-column align="center" label="零件图号" width="173px" show-overflow-tooltip fixed>
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="零件名称" width="129px" show-overflow-tooltip>
<el-table-column align="center" label="零件名称" width="129px" show-overflow-tooltip fixed>
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>

6
src/views/ManufacturingCenter/GroupMatching/index.vue
View File

@@ -22,6 +22,7 @@
</el-option>
</el-select>
<el-button type="primary" plain icon="el-icon-search" size="small" style="margin-left: 20px" @click="total=0;pageSize=50;pageCurrent=1;searchData();searchTable()">查询</el-button>
<el-button type="text" plain style="float: right;margin-right: 20px;margin-top: 5px" @click="turnTo()">组件状态查询</el-button>
</el-card>
<el-card>
<el-tabs v-model="PartType2" type="border-card" style="margin-top: 10px">
@@ -505,6 +506,9 @@ export default {
this.SearchMachine()
},
methods: {
turnTo() {
this.$router.push({ path: '/ManufacturingCenter/CompletionOfWorkshopComponents' })
},
searchData() {
this.totalNum = 0
this.loading = true
@@ -544,7 +548,6 @@ export default {
this.dialogFormVisible4 = true
this.titleaa = row.零件图号
processingStatus(row.工艺计划流水号).then(response => {
console.log(response.data, 1123)
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].计划日期 !== '' && response.data[i].计划日期 !== null) {
response.data[i].计划日期 = response.data[i].计划日期.split(' ')[0]
@@ -613,7 +616,6 @@ export default {
this.Group ? check2 = 1 : check2 = 0
searchTable02(check1, this.Machine, check2, this.Group, this.pageCurrent02, this.pageSize02).then(response => {
this.tableData02 = response.data.rows
console.log(response, 999)
this.total02 = response.data.total
})
},

12
src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue
View File

@@ -2,7 +2,6 @@
<div class="app-container bold-font">
<el-card>
<el-row>
<!-- <h3 style="display: inline-block;margin: 0">项目名称:</h3> -->
<el-select v-model="projectValue" filterable clearable size="small" style="margin-top:10px;width: 180px" placeholder="项目名称" @change="typeChange()">
<el-option
v-for="item in project"
@@ -10,7 +9,6 @@
:label="item.label"
:value="item.value"/>
</el-select>
<!-- <h3 style="display: inline-block;margin: 0 0 0 20px">机床名称:</h3> -->
<el-select v-model="toolNumValue" clearable filterable size="small" style="margin-bottom:10px;width: 180px" placeholder="机床名称">
<el-option
v-for="item in toolNum"
@@ -18,7 +16,6 @@
:label="item.label"
:value="item.value"/>
</el-select>
<!-- <h3 style="display: inline-block;margin: 0 0 0 20px">客户名称:</h3> -->
<el-input v-model="CustomerNameValue" placeholder="客户名称" size="small" clearable style="width:200px"/>
<el-button size="small" icon="el-icon-search" type="primary" plain style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button>
</el-row>
@@ -34,9 +31,8 @@
<el-row>
<el-col style="width: 1315px;">
<el-card>
<!--<h2 style="display: inline-block;margin: 0 0 10px 0">总计划:</h2>-->
<el-table v-loading="loading" :data="tableData" height="315" highlight-current-row style="margin-top: 5px;width: 100%;" border element-loading-text="拼命加载中" @row-click="rowClick">
<el-table-column label="项目编号" align="center" width="170px" fixed="left">
<el-table-column label="项目编号" align="center" width="100px" fixed="left">
<template slot-scope="scope">
<template v-if="scope.row.edit">
<el-input v-model="scope.row.项目编号" size="mini"/>
@@ -46,17 +42,17 @@
</template>
</template>
</el-table-column>
<el-table-column label="项目名称" align="center" min-width="160px" fixed="left">
<el-table-column label="项目名称" align="center" width="110px" fixed="left">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column label="机床图号" align="center" width="140px" fixed="left">
<el-table-column label="机床图号" align="center" width="100px" fixed="left">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="机床名称" align="center" width="280px" fixed="left">
<el-table-column label="机床名称" align="center" width="200px" fixed="left">
<template slot-scope="scope">
{{ scope.row.机床名称 }}
</template>