This commit is contained in:
caoxinyu
2019-09-24 08:23:38 +08:00
29 changed files with 172 additions and 166 deletions

View File

@@ -29,6 +29,7 @@
:data="tableData"
:summary-method="getSummaries"
style="width: 100%"
highlight-current-row
height="400"
size="mini"
show-summary
@@ -71,7 +72,7 @@
</el-table-column>
<el-table-column align="center" label="操作" fixed="right">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="processingStatus(scope.row)">查看加工进度</el-button>
<el-button type="primary" plain size="mini" @click="processingStatus(scope.row)">查看加工进度</el-button>
</template>
</el-table-column>
</el-table>
@@ -316,7 +317,7 @@
@current-change="handleCurrentChange5"/>
</div>
</el-card>
<el-dialog :visible.sync="dialogFormVisible2" title="选择机床" center style="min-height: 300px">
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible2" title="选择机床" center style="min-height: 300px">
<el-table
:data="tableData6"
style="width:100%;max-height: 300px;display: inline-block"
@@ -377,7 +378,7 @@
</div>
</el-dialog>
<el-dialog :visible.sync="dialogFormVisible3" title="选择组号" center style="min-height: 300px">
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible3" title="选择组号" center style="min-height: 300px">
<el-table
:data="tableData7"
style="width:100%;max-height: 300px;display: inline-block"
@@ -428,7 +429,7 @@
</div>
</el-dialog>
<el-dialog :visible.sync="dialogFormVisible4" title="零件加工进度" center style="min-height: 300px">
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible4" :title="titleaa" center style="min-height: 300px">
<el-table
:data="tableData5"
style="width: 100%;max-height: 400px;"
@@ -480,6 +481,8 @@ import { initProject, searchTable, searchmachine, searchgroup, searchPurchaseTab
export default {
data() {
return {
titleaa: '',
零件图号: '',
entryNameValue: null, // 项目流水号
entryName: [], // 项目数组
machineToolNumber: '', // 机床图号
@@ -658,6 +661,7 @@ export default {
},
processingStatus(row) {
this.dialogFormVisible4 = true
this.titleaa = row.零件图号
processingStatus(row.工艺计划流水号).then(response => {
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].计划日期 !== '' && response.data[i].计划日期 !== null) {

View File

@@ -1,7 +1,7 @@
<template>
<div class="app-container">
<el-card>
<el-col :span="12">
<el-col style="width: 530px">
<el-form label-width="270px" label-position="right" class="Time">
<el-form-item v-show="false">
<el-radio-group v-model="radio" size="small">

View File

@@ -14,7 +14,6 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
</el-option>
</el-select>
<el-button size="small" type="success" icon="el-icon-search" style="margin: 10px 0 0 10px" @click="asd()">查询</el-button>
<span>分组:</span>
<el-select v-model="NumValue" size="small" style="margin-top:10px;width: 220px" filterable clearable placeholder="机床组号">
<el-option
@@ -65,13 +64,13 @@
<el-table-column
type="selection"
align="center"
width="35"/>
<el-table-column label="零件图号" align="center" width="300">
width="50"/>
<el-table-column label="零件图号" align="center" width="200">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" align="center" width="200">
<el-table-column label="零件名称" align="center" width="300">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
@@ -733,7 +732,6 @@ export default {
this.getTable()
},
methods: {
asd() {},
// TABLE每行颜色
tableRowClassName({ row, rowIndex }) {
if (rowIndex === 1) {

View File

@@ -87,7 +87,7 @@
size="small"
value-format="yyyy-MM-dd"
placeholder="选择日期"/>
<el-tooltip effect="dark" content="设定设备参数有效时间" placement="top">
<el-tooltip effect="dark" content="设定设备参数有效时间" placement="top" open-delay="1200">
<el-button type="primary" size="small" icon="el-icon-setting" style="margin-left:10px" @click="setUp">设定</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="生成有效时间内设备加工能力" placement="top">