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

a

Browse Source
This commit is contained in:
zhangdingyu
2019-09-24 14:37:03 +08:00
parent c42c2ef297
commit f7a4975c0a
11 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/ManufacturingCenter/ActualTimeSupplement/index.vue
View File

@@ -52,7 +52,7 @@
<el-card>
<el-table
:data="tableData"
:stripe="true"
stripe
height="550"
size="mini"
highlight-current-row

2
src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
View File

@@ -28,7 +28,7 @@
:data="tableData"
:row-key="getRowKeys"
:expand-row-keys="expands"
stripe="true"
stripe
size="mini"
highlight-current-row
border

10
src/views/ManufacturingCenter/ProcessingStatus/index.vue
View File

@@ -48,7 +48,9 @@
type="date"
placeholder="选择日期"/>
<el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="getTableData();pageCurrent=1;pageSize=10;total = 0">查询</el-button>
<el-button type="warning" class="el-icon-download" size="small" style="margin: 10px 0 0 10px" @click="exportExcel">导出</el-button>
<el-tooltip :open-delay="1000" effect="dark" content="导出所选机床的加工进度" placement="top">
<el-button type="warning" class="el-icon-download" size="small" style="margin: 10px 0 0 10px" @click="exportExcel">导出</el-button>
</el-tooltip>
</el-row>
</el-card>
@@ -392,9 +394,9 @@ export default {
}
}
},
// created() {
// this.getMachine()
// },
created() {
this.getMachine()
},
methods: {
formatJson(filterVal, jsonData) {
return jsonData.map(v => filterVal.map(j => {

2
src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
View File

@@ -50,7 +50,7 @@
v-loading="listLoading1"
id="ProcessingStatusEdit"
:data="tableData1"
:stripe="true"
stripe
class="table"
size="mini"
highlight-current-row

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

@@ -17,7 +17,7 @@
:label="item.label"
:value="item.value"/>
</el-select>
<span>机床号:</span>
<span>机床图号:</span>
<el-input v-model="machineToolNumber" placeholder="机床号" size="small" readonly clearable style="width:200px" @change="empty1">
<el-button slot="append" icon="el-icon-search" @click="SearchMachine" />
</el-input>
@@ -27,7 +27,7 @@
</el-input>
</el-row>
<el-row>
<span>零件号:</span>
<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">
@@ -54,7 +54,7 @@
:data="tableData"
style="width: 100%;max-height: 600px"
height="600"
stripe="true"
stripe
size="mini"
highlight-current-row
border>
@@ -69,12 +69,12 @@
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column align="center" label="零件图号" min-width="160px">
<el-table-column align="center" label="零件图号" width="160px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="零件名称" min-width="170px">
<el-table-column align="center" label="零件名称" width="120px">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
@@ -89,7 +89,7 @@
{{ scope.row.传递时间 }}
</template>
</el-table-column>
<el-table-column align="center" label="零件状态" width="750px">
<el-table-column align="center" label="零件状态" min-width="400px">
<template slot-scope="scope">
<el-steps :active="scope.row.考核状态" finish-status="success" simple>
<el-step title="投产" />

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

@@ -32,7 +32,7 @@
highlight-current-row
height="380"
size="mini"
stripe="true"
stripe
style="width: 100%;"
border
element-loading-text="拼命加载中"
@@ -65,7 +65,7 @@
</div>
</el-col>
<el-col :span="17" style="margin-left: 30px;">
<el-table v-loading="loading2" :data="tableData2" height="380" size="mini" stripe="true" highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
<el-table v-loading="loading2" :data="tableData2" height="380" size="mini" stripe highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
<el-table-column label="零件图号" align="center" width="150px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
@@ -131,7 +131,7 @@
</el-card>
<el-card>
<el-col :span="6">
<el-table v-loading="loading3" :data="tableData3" stripe="true" size="mini" highlight-current-row height="380" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable5">
<el-table v-loading="loading3" :data="tableData3" stripe size="mini" highlight-current-row height="380" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable5">
<el-table-column label="机床编号" align="center" width="110px">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
@@ -160,7 +160,7 @@
</div>
</el-col>
<el-col :span="17" style="margin-left: 30px;">
<el-table v-loading="loading4" :data="tableData4" size="mini" height="380" stripe="true" highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
<el-table v-loading="loading4" :data="tableData4" size="mini" height="380" stripe highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
<el-table-column label="机床编号" align="center">
<template slot-scope="scope">
{{ scope.row.机床图号 }}