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

83
src/views/ManufacturingCenter/StatusQuery/index.vue
View File

@@ -2,11 +2,11 @@
<div class="app-container">
<el-card>
<el-row>
<span>项目名称:</span>
<!-- <span>项目名称:</span>-->
<el-select
v-model="entryNameValue"
placeholder="项目名称"
style="width:200px;margin-top: 10px"
style="width:200px;margin: 10px 10px 0px 10px"
size="small"
clearable
filterable
@@ -17,20 +17,18 @@
:label="item.label"
:value="item.value"/>
</el-select>
<span>机床图号:</span>
<el-input v-model="machineToolNumber" placeholder="机床号" size="small" readonly clearable style="width:200px" @change="empty1">
<!-- <span>机床图号:</span>-->
<el-input v-model="machineToolNumber" placeholder="机床号" size="small" readonly clearable style="width:200px;margin: 10px 10px 0px 10px" @change="empty1">
<el-button slot="append" icon="el-icon-search" @click="SearchMachine" />
</el-input>
<span>组号:</span>
<el-input v-model="groupNumber" placeholder="组号" size="small" readonly clearable style="width:200px">
<!-- <span>组号:</span>-->
<el-input v-model="groupNumber" placeholder="组号" size="small" readonly clearable style="width:200px;margin: 10px 10px 0px 10px">
<el-button slot="append" icon="el-icon-search" @click="searchGroupList" />
</el-input>
</el-row>
<el-row>
<span>零件图号:</span>
<el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width:200px;margin-top: 10px"/>
<span>零件状态:</span>
<el-select v-model="partStateValue" placeholder="零件状态" size="small" clearable style="width:200px">
<!-- <span>零件图号:</span>-->
<el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width:200px;margin: 10px 10px 0px 10px"/>
<!-- <span>零件状态:</span>-->
<el-select v-model="partStateValue" placeholder="零件状态" size="small" clearable style="width:200px;margin: 10px 10px 0px 10px">
<el-option
v-for="item in partState"
:key="item.value"
@@ -47,13 +45,15 @@
<!--</el-select>-->
<el-button type="success" icon="el-icon-search" size="small" style="margin: 15px 0 0 10px" @click="pageCurrent=1;pageSize=20;total=0;searchData()">查询</el-button>
</el-row>
<!-- <el-row>-->
<!-- </el-row>-->
</el-card>
<el-card>
<el-table
v-loading="loading0"
:data="tableData"
style="width: 100%;max-height: 600px"
height="600"
style="width: 100%"
height="780"
stripe
size="mini"
highlight-current-row
@@ -112,16 +112,16 @@
<!--</template>-->
<!--</el-table-column>-->
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="pageCurrent"
:page-sizes="[10, 20, 30, 40, 50]"
:page-size="pageSize"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
<!-- <div class="block" style="margin-top: 10px;">-->
<!-- <el-pagination-->
<!-- :current-page="pageCurrent"-->
<!-- :page-sizes="[10, 20, 30, 40, 50]"-->
<!-- :page-size="pageSize"-->
<!-- :total="total"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- @size-change="handleSizeChange"-->
<!-- @current-change="handleCurrentChange"/>-->
<!-- </div>-->
</el-card>
<el-dialog :title="title" :visible.sync="dialogFormVisible4" center style="min-height: 300px" width="400px">
<el-form label-position="left" label-width="110px" class="demo-ruleForm">
@@ -272,8 +272,8 @@ export default {
partState: [], // 零件状态数组
partTypeValue: null, // 零件类型
num: null,
pageCurrent: 1,
pageSize: 20,
// pageCurrent: 1,
// pageSize: 20,
pageCurrent1: 1,
pageSize1: 20,
pageCurrent2: 1,
@@ -282,7 +282,7 @@ export default {
tableData6: [],
tableData: [],
state: null,
total: null,
// total: null,
total1: null,
total2: null,
title: '',
@@ -352,16 +352,15 @@ export default {
this.check5 = 0
}
this.loading0 = true
searchTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.partNumber, this.check4, this.partStateValue, this.check5, this.partTypeValue, this.pageSize, this.pageCurrent).then(response => {
for (let i = 0; i < response.data.rows.length; i++) {
response.data.rows[i].考核状态 = parseInt(response.data.rows[i].考核状态) - 2
if (response.data.rows[i].传递时间 !== undefined || response.data.rows[i].hasOwnProperty('传递时间')) {
response.data.rows[i].传递时间 = response.data.rows[i].传递时间.split(' ', 2)[0]
searchTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.partNumber, this.check4, this.partStateValue, this.check5, this.partTypeValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
response.data[i].考核状态 = parseInt(response.data[i].考核状态) - 2
if (response.data[i].传递时间 !== undefined || response.data[i].hasOwnProperty('传递时间')) {
response.data[i].传递时间 = response.data[i].传递时间.split(' ', 2)[0]
}
}
this.loading0 = false
this.tableData = response.data.rows
this.total = parseInt(response.data.total)
this.tableData = response.data
})
},
getList() { // 初始化项目名称
@@ -454,14 +453,14 @@ export default {
cancel() { // 取消
this.dialogFormVisible4 = false
},
handleSizeChange(val) {
this.pageSize = val
this.searchData()
},
handleCurrentChange(val) {
this.pageCurrent = val
this.searchData()
},
// handleSizeChange(val) {
// this.pageSize = val
// this.searchData()
// },
// handleCurrentChange(val) {
// this.pageCurrent = val
// this.searchData()
// },
handleSizeChange1(val) {
this.pageSize1 = val
this.SearchMachine()