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

更新

Browse Source
This commit is contained in:
liushuai
2019-09-19 19:52:46 +08:00
parent faab73c1fa
commit aef7132f40
49 changed files with 733 additions and 585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,7 @@
v-model="startTime1"
value-format="yyyy-MM-dd"
size="small"
style="width: 160px"
style="width: 160px;margin-top: 10px"
type="date"
placeholder="选择日期"/>
<span class="demonstration">~</span>
@@ -37,7 +37,7 @@
</el-row>
<el-row>
<span>操作者:</span>
<el-input v-model="workerName" placeholder="操作者" size="small" clearable style="width:200px"/>
<el-input v-model="workerName" placeholder="操作者" size="small" clearable style="width:200px; margin-top: 10px;margin-bottom: 10px"/>
<span>零件图号:</span>
<el-input v-model="partNumber" placeholder="零件图号" size="small" clearable style="width:200px"/>
<span>工艺名称:</span>
@@ -48,8 +48,15 @@
</el-card>
<el-card>
<el-table :data="tableData" height="650" style="width: 100%;" border>
<el-table-column label="序号" type="index" align="center" width="50"/>
<el-table
:data="tableData"
height="440"
stripe="true"
size="mini"
highlight-current-row
style="width: 100%;"
border>
<el-table-column label="序号" type="index" align="center" width="55"/>
<el-table-column label="零件图号" align="center" min-width="150px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
@@ -60,12 +67,12 @@
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="完成数量" align="center" min-width="80px">
<el-table-column label="完成数量" align="center" min-width="100px">
<template slot-scope="scope">
{{ scope.row.完成数量 }}
</template>
</el-table-column>
<el-table-column label="工艺名称" align="center" min-width="80px">
<el-table-column label="工艺名称" align="center" min-width="100px">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
@@ -85,7 +92,7 @@
{{ scope.row.加工完成时间 || '—' }}
</template>
</el-table-column>
<el-table-column label="实际工时" align="center" min-width="80px">
<el-table-column label="实际工时" align="center" min-width="100px">
<template slot-scope="scope">
{{ scope.row.实际加工时间段 || '—' }}
</template>
@@ -116,20 +123,22 @@
{{ scope.row.修补人 || '—' }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="240px" fixed="right">
<el-table-column label="操作" align="center" min-width="300" fixed="right">
<template slot-scope="scope">
<el-button v-if="scope.row.isEditing" type="mini" size="mini" icon="el-icon-circle-check-outline" @click="confirmEdit(scope.row)">确定</el-button>
<el-button v-if="scope.row.isEditing" class="cancel-btn" size="mini" type="warning" @click="cancelEdit(scope.row)">取消</el-button>
<el-button v-if="scope.row.isEditing" type="mini" plain size="mini" icon="el-icon-circle-check-outline" @click="confirmEdit(scope.row)">确定</el-button>
<el-button v-if="scope.row.isEditing" class="cancel-btn" plain size="mini" type="warning" @click="cancelEdit(scope.row)">取消</el-button>
<el-button
v-else
:disabled="!(scope.row.加工开始时间 || scope.row.加工完成时间)"
size="mini"
plain
type="primary"
class="el-icon-edit"
@click="handleEdit(scope.row)">编辑</el-button>
<el-button
:disabled="!!(scope.row.加工开始时间 || scope.row.加工完成时间)"
size="mini"
plain
type="danger"
class="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button>
@@ -526,4 +535,7 @@ export default {
span{
margin: 10px 0 10px 10px;
}
.el-card{
margin: 0px;
}
</style>

28
src/views/ManufacturingCenter/CreatePreparationBill/index.vue
View File

@@ -3,48 +3,48 @@
<el-card>
<el-row>
<span>零件图号:</span>
<el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:200px"/>
<el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button>
<el-checkbox v-model="all" size="mini">查询全部</el-checkbox>
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="exportTable('BL')">导出备料单</el-button>
<el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:200px;margin: 3px 0"/>
<el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=30; pageCurrent=1;searchTable()">查询</el-button>
<el-checkbox v-model="all" size="small">查询全部</el-checkbox>
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left:0px" @click="exportTable('BL')">导出备料单</el-button>
<el-button type="primary" size="small" icon="el-icon-success" style="margin-left:10px" @click="edit()">自家备料</el-button>
<el-button type="primary" size="small" icon="el-icon-success" style="margin-left:10px" @click="edit2()">外购备料</el-button>
</el-row>
</el-card>
<el-card>
<el-table v-loading="loading" :data="tableData" height="580" style="width: 100%;" border element-loading-text="拼命加载中" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="tableData" height="760" style="width: 100%;margin: 3px 0" size="mini" border stripe highlight-current-row element-loading-text="拼命加载中" @selection-change="handleSelectionChange">
<el-table-column
type="selection"
width="55"
align="center"/>
<el-table-column label="打印状态" width="100" align="center">
<el-table-column label="打印状态" align="center">
<template slot-scope="scope">
<el-tag v-if="scope.row.备料打印!=='0'" type="success" size="small">已导出</el-tag>
<el-tag v-else type="warning" size="small">未导出</el-tag>
<el-tag v-if="scope.row.备料打印!=='0'" type="success" size="mini">已导出</el-tag>
<el-tag v-else type="warning" size="mini">未导出</el-tag>
</template>
</el-table-column>
<el-table-column label="零件名称" align="center" width="220px">
<el-table-column label="零件名称" align="center" >
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="零件图号" align="center" width="240px">
<el-table-column label="零件图号" align="center" >
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="数量" align="center" width="100px">
<el-table-column label="数量" align="center" >
<template slot-scope="scope">
{{ scope.row.批次数量 }}
</template>
</el-table-column>
<el-table-column label="材料" align="center" width="100px">
<el-table-column label="材料" align="center" >
<template slot-scope="scope">
{{ scope.row.材料 }}
</template>
</el-table-column>
<el-table-column label="重量" align="center" width="100px">
<el-table-column label="重量" align="center" >
<template slot-scope="scope">
{{ scope.row.重量 }}
</template>
@@ -119,7 +119,7 @@ export default {
Data: [],
tableData: [], // 表格数据
total: null, // 总条数
pageSize: 10, // 每页显示条数
pageSize: 30, // 每页显示条数
pageCurrent: 1 // 后台获取页
}
},

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

@@ -1118,4 +1118,7 @@ export default {
span{
margin: 10px 0 10px 10px;
}
.el-card{
margin: 1px;
}
</style>

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

@@ -23,10 +23,21 @@
</el-card>
<el-card>
<el-table v-loading="loading0" :data="tableData" :row-key="getRowKeys" :expand-row-keys="expands" height="650" style="width: 100%;" border @expand-change="searchTable2">
<el-table-column type="expand">
<el-table
v-loading="loading0"
:data="tableData"
:row-key="getRowKeys"
:expand-row-keys="expands"
stripe="true"
size="mini"
highlight-current-row
border
height="500"
style="width: 100%;"
@expand-change="searchTable2">
<el-table-column label="明细" align="center" type="expand" width="55">
<template slot-scope="scope">
<el-table :data="tableData2" border style="text-align: center" size="mini">
<el-table :data="tableData2" class="subTableHeader" border style="text-align: center" size="mini">
<el-table-column label="零件加工计划进度(工艺名称,计划完成时间,实际完成时间,员工名称)" >
<el-table-column label="[1]" align="center" width="120px">
<template slot-scope="scope">
@@ -242,29 +253,29 @@
</el-table>
</template>
</el-table-column>
<el-table-column label="零件名称" align="center" width="220px">
<el-table-column label="零件名称" align="center" width="180px">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="零件图号" align="center" width="270px">
<el-table-column label="零件图号" align="center" width="200px">
<template slot-scope="scope">
{{ scope.row.零件图号_短 }}
</template>
</el-table-column>
<el-table-column label="待加工工序" align="center">
<el-table-column label="待加工工序" align="center" min-width="200px">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<el-table-column label="操作" width="300" align="center">
<el-table-column label="操作" width="490px" align="center">
<template slot-scope="scope">
<div>
<el-button size="mini" icon="el-icon-arrow-up" type="primary" @click="upOne(scope.row)"/>
<el-button size="mini" icon="el-icon-arrow-down" type="primary" @click="downOne(scope.row)"/>
<el-button size="mini" icon="el-icon-upload2" type="primary" @click="TOP(scope.row)"/>
<el-button size="mini" icon="el-icon-download" type="primary" @click="Down(scope.row)"/>
<el-button size="mini" icon="el-icon-delete" type="danger" @click="outParts(scope.row)"/>
<el-button size="mini" icon="el-icon-arrow-up" type="primary" plain @click="upOne(scope.row)"/>
<el-button size="mini" icon="el-icon-arrow-down" type="primary" plain @click="downOne(scope.row)"/>
<el-button size="mini" icon="el-icon-upload2" type="primary" plain @click="TOP(scope.row)"/>
<el-button size="mini" icon="el-icon-download" type="primary" plain @click="Down(scope.row)"/>
<el-button size="mini" icon="el-icon-delete" type="danger" plain @click="outParts(scope.row)"/>
</div>
</template>
</el-table-column>
@@ -657,4 +668,7 @@ export default {
background-color: lightgreen;
border: 1px solid #1f2d3d;
}
.el-card{
margin: 0px;
}
</style>

115
src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
View File

@@ -1,33 +1,14 @@
<template>
<div>
<el-card>
<span>机床号:</span>
<el-select v-model="Machine" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="机床号" @change="getGroup()">
<el-option
v-for="item in Machines"
:key="item.value"
:label="item.label"
:value="item.value">
<div style="float: left">{{ item.label }}</div>
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
</el-option>
</el-select>
<span>组号:</span>
<el-select v-model="Group" size="small" clearable placeholder="组号" style="margin-top:10px;width: 180px;">
<el-option
v-for="item in Groups"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>零件图号:</span>
<el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:200px"/>
<el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:200px;margin: 3px 0"/>
<el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button>
<el-button size="small" icon="el-icon-success" type="primary" style="margin-left: 10px" @click="edit2()">自家备料确认</el-button>
<el-button size="small" icon="el-icon-success" type="primary" style="margin-left: 10px" @click="back()">打回</el-button>
</el-card>
<el-card>
<el-table v-loading="loading" :data="tableData" height="580" style="width: 100%;" border element-loading-text="拼命加载中" @selection-change="handleSelectionChange2">
<el-table v-loading="loading" :data="tableData" height="350" style="width: 100%;margin: 3px 0" size="mini" border stripe highlight-current-row element-loading-text="拼命加载中" @selection-change="handleSelectionChange2">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="零件名称" align="center" width="220px">
<template slot-scope="scope">
@@ -52,6 +33,7 @@
:page-sizes="[10, 20, 30, 40, 100]"
:page-size="pageSize"
:total="total"
style="margin: 3px 0"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
@@ -60,12 +42,12 @@
<el-card>
<span>零件图号:</span>
<el-input v-model="partName2" placeholder="零件图号" size="small" clearable style="width:200px"/>
<el-input v-model="partName2" placeholder="零件图号" size="small" clearable style="width:200px;margin: 3px 0"/>
<el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="total2=0;pageSize2=10; pageCurrent2=1;searchTable2()">查询</el-button>
<el-button size="small" icon="el-icon-success" type="primary" style="margin-left: 10px" @click="edit()">外购备料确认</el-button>
</el-card>
<el-card>
<el-table v-loading="loading2" :data="tableData2" height="580" style="width: 100%;" border element-loading-text="拼命加载中" @selection-change="handleSelectionChange">
<el-table v-loading="loading2" :data="tableData2" height="350" style="width: 100%;margin: 3px 0" size="mini" border stripe highlight-current-row element-loading-text="拼命加载中" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="零件名称" align="center" width="220px">
<template slot-scope="scope">
@@ -110,17 +92,11 @@
</template>
<script>
import { getMachines, getGroups, searchtable, searchtable2, searchtable3, change2, change3, edit } from '@/api/ManufacturingCenter/MaterialArrivalManagement'
import { searchtable, searchtable2, searchtable3, change2, change3, edit } from '@/api/ManufacturingCenter/MaterialArrivalManagement'
import { mapGetters } from 'vuex'
import Cookie from 'js-cookie'
export default {
data() {
return {
Machine: '',
Machines: [],
Group: '',
Groups: [],
arrest2: [],
editTime: '',
bianliang1: [],
@@ -152,21 +128,10 @@ export default {
'userId'
])
},
watch: {
// 如果路由有变化，会再次执行该方法
'$route': {
handler(route) {
const _this = this
if (route.name === 'MaterialArrivalManagement') {
_this.getMachine()
}
}
}
created() {
this.searchTable()
this.searchTable2()
},
// created() {
// this.searchTable()
// this.searchTable2()
// },
methods: {
handleSelectionChange2(val) {
this.arrest2 = val
@@ -186,67 +151,17 @@ export default {
})
}
},
getMachine() {
if (Cookie.get('machineValue') !== undefined) {
this.Machine = ''
this.Machines = []
this.Group = ''
this.Groups = []
getMachines().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.Machines.push({
label: response.data[i].机床图号,
value: response.data[i].机床流水号,
value2: response.data[i].项目名称
})
}
}).then(() => {
this.Machine = parseInt(Cookie.get('machineValue'))
this.getGroup()
this.Group = parseInt(Cookie.get('group'))
this.searchTable()
Cookie.remove('machineValue')
Cookie.remove('group')
this.searchTable2()
})
} else {
this.Machine = ''
this.Machines = []
this.Group = ''
this.Groups = []
getMachines().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.Machines.push({
label: response.data[i].机床图号,
value: response.data[i].机床流水号,
value2: response.data[i].项目名称
})
}
})
this.searchTable()
}
},
getGroup() {
this.Group = ''
this.Groups = []
getGroups(this.Machine).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.Groups.push({
label: response.data[i].组号,
value: response.data[i].组件流水号
})
}
})
},
// 查询表格数据
searchTable() {
this.loading = true
this.tableData = []
this.Data = []
if (this.Machine) { this.Machinecheck = true } else { this.Machinecheck = false }
if (this.Group) { this.Groupcheck = true } else { this.Groupcheck = false }
if (this.partName) { this.partNamecheck = true } else { this.partNamecheck = false }
searchtable(this.Machinecheck, this.Machine, this.Groupcheck, this.Group, this.partNamecheck, this.partName, 0, this.pageCurrent, this.pageSize).then(response => {
if (this.partName !== '' && this.partName !== null) {
this.partNamecheck = true
} else {
this.partNamecheck = false
}
searchtable(this.partNamecheck, this.partName, 0, this.pageCurrent, this.pageSize).then(response => {
if (response.data.total === 0) {
this.loading = false
} else {

3
src/views/ManufacturingCenter/OwnTimeStatistics/index.vue
View File

@@ -201,4 +201,7 @@ export default {
span{
margin: 10px 0 10px 10px;
}
.el-card{
margin: 1px;
}
</style>

81
src/views/ManufacturingCenter/ParseQuery/index.vue
View File

@@ -12,10 +12,9 @@
placeholder="请输入内容"
@clear="clearMachine"
@select="handleSelect"/>
<el-tag style="margin-left: 10px; color: black" type="info">未开始</el-tag>
<el-tag style="background: orange; color: black">进行中</el-tag>
<el-tag style="background: lightgreen; color: black">已完成</el-tag>
<el-tag style="background: red; color: black">已拖期</el-tag>
<el-tag style="margin-left: 10px; background: #EAEAEA; color: black">未开始</el-tag>
<el-tag style="background: #7eaced; color: black">进行中</el-tag>
<el-tag style="background: #ff9759; color: black">已完成</el-tag>
</el-card>
<el-card>
<div class="main">
@@ -23,139 +22,139 @@
<div :class="[isActive ? color[22] : 'white']" class="module" style="position: relative;left: 1770px;top:220px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：装配部<br>根据营销部门发出发货请求，<br>装配部进行发货</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv23">发货<br>{{ `${data[0].发货百分比}%` }}</el-button>
<el-button :disabled="disabled" :class="[isActive ? color[22] : 'white']" type="text" @click="searchDiv23">发货<br>{{ `${data[0].发货百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[21] : 'white']" class="module" style="position: relative;left: 1580px;top:220px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：质检部<br>对机床进行总装调试</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv22">总装调试<br>{{ `${data[0].总装调试百分比}%` }}</el-button>
<el-button :disabled="disabled" :class="[isActive ? color[21] : 'white']" type="text" @click="searchDiv22">总装调试<br>{{ `${data[0].总装调试百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[20] : 'white']" class="module" style="position: relative;left: 1390px;top:220px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：质检部<br>对机床重要部件进行检测</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv21">装配质检<br>{{ `${data[0].装配质检百分比}%` }}</el-button>
<el-button :disabled="disabled" :class="[isActive ? color[20] : 'white']" type="text" @click="searchDiv21">装配质检<br>{{ `${data[0].装配质检百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[19] : 'white']" class="module" style="position: relative;left: 1185px;top:105px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：电气部<br>电气部长制定装配计划，<br>并记录计划执行情况</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv6">电气装配<br>{{ `${data[0].电气装配百分比}%` }}</el-button>
<el-button :disabled="disabled" :class="[isActive ? color[19] : 'white']" type="text" @click="searchDiv6">电气装配<br>{{ `${data[0].电气装配百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[18] : 'white']" class="module" style="position: relative;left: 1100px;top:176px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content"><br>角色：装配部长<br>装配部长制定装配计划，<br>并记录计划执行情况</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv5">机械装配<br>{{ `${data[0].机械装配百分比}%` }}</el-button>
<el-button :disabled="disabled" :class="[isActive ? color[18] : 'white']" type="text" @click="searchDiv5">机械装配<br>{{ `${data[0].机械装配百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[17] : 'white']" class="module" style="position: relative;left: 1015px;top:247px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：冷作车间主任<br>冷作车间主任制定冷作计划，<br>并记录计划执行情况</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv7">冷作<br>{{ `${data[0].冷作百分比}%` }}</el-button>
<el-button :disabled="disabled" :class="[isActive ? color[17] : 'white']" type="text" @click="searchDiv7">冷作<br>{{ `${data[0].冷作百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[16] : 'white']" class="module" style="position: relative;left: 930px;top:319px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：油漆车间主任<br>油漆车间主任制定装配计划，<br>并记录计划执行情况</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv8">油漆<br>{{ `${data[0].油漆百分比}%` }}</el-button>
<el-button :disabled="disabled" :class="[isActive ? color[16] : 'white']" type="text" @click="searchDiv8">油漆<br>{{ `${data[0].油漆百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[15] : 'white']" class="module" style="position: relative;left: 695px;top:220px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：装配部长<br>此模块用于查询某机床是否达到装配条件，<br>即采购件与自制件是否成组配套</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv9">成组配套<br>{{ `${data[0].成组配套百分比}%` }}</el-button>
<el-button :disabled="disabled" :class="[isActive ? color[15] : 'white']" type="text" @click="searchDiv9">成组配套<br>{{ `${data[0].成组配套百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[14] : 'white']" class="module" style="position: relative;left: 455px;top:55px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：质检部<br>对自制件进行检测</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv12">自制质检<br>{{ `${data[0].自制质检百分比}%` }}</el-button>
<el-button :disabled="disabled" :class="[isActive ? color[14] : 'white']" type="text" @click="searchDiv12">自制质检<br>{{ `${data[0].自制质检百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[13] : 'white']" class="module" style="position: relative;left: 373px;top:283px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：质检部<br>对采购件进行检测</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv19">采购质检<br>{{ `${data[0].采购质检百分比}%` }}</el-button>
<el-button :disabled="disabled" :class="[isActive ? color[13] : 'white']" type="text" @click="searchDiv19">采购质检<br>{{ `${data[0].采购质检百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[12] : 'white']" class="module" style="position: relative;left: 160px;top:110px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：金工车间<br>接收加工任务并使用<br>MES工作站进行报工</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv10">车间加工<br>{{ `${data[0].车间加工百分比}%` }}</el-button>
<el-button :disabled="disabled" :class="[isActive ? color[12] : 'white']" type="text" @click="searchDiv10">车间加工<br>{{ `${data[0].车间加工百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[11] : 'white']" class="module" style="position: relative;left: -25px;top:-1px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：外协员<br>进行外协加工</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv18">工序外协<br>{{ `${data[0].工序外协百分比}%` }}</el-button>
<el-button :disabled="disabled" :class="[isActive ? color[11] : 'white']" type="text" @click="searchDiv18">工序外协<br>{{ `${data[0].工序外协百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[10] : 'white']" class="module" style="position: relative;left: -230px;top:54px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：计划员<br>针对做完工艺定额的零件进行排查</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv15">能力平衡<br>{{ `${data[0].能力平衡百分比}%` }}</el-button>
<el-button :disabled="disabled" :class="[isActive ? color[10] : 'white']" type="text" @click="searchDiv15">能力平衡<br>{{ `${data[0].能力平衡百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[9] : 'white']" class="module" style="position: relative;left: -415px;top:54px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：工艺部<br>制定零件定额</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv14">定额<br>{{ `${data[0].定额百分比}%` }}</el-button>
<el-button :disabled="disabled" :class="[isActive ? color[9] : 'white']" type="text" @click="searchDiv14">定额<br>{{ `${data[0].定额百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[8] : 'white']" class="module" style="position: relative;left: -597px;top:54px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：工艺部<br>制定零件工艺</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv13">工艺<br>{{ `${data[0].工艺百分比}%` }}</el-button>
<el-button :disabled="disabled" :class="[isActive ? color[8] : 'white']" type="text" @click="searchDiv13">工艺<br>{{ `${data[0].工艺百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[7] : 'white']" class="module" style="position: relative;left: -805px;top:1px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：下料员<br>对于钢板等自家备料<br>下料员需要在系统确认备料<br>并通知金工领料</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv11">自家备料<br>{{ `${data[0].自家备料百分比}%` }}</el-button>
<el-button :disabled="disabled" :class="[isActive ? color[7] : 'white']" type="text" @click="searchDiv11">自家备料<br>{{ `${data[0].自家备料百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[0] : 'white']" class="module" style="position: relative;left: -1350px;top:222px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：营销内勤<br>负责创建项目及机床的基础信息，<br>此部分作为系统数据的源头</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv1">签订合同<br>{{ `${data[0].签订合同百分比}%` }}</el-button>
<el-button :disabled="disabled" :class="[isActive ? color[0] : 'white']" type="text" @click="searchDiv1">签订合同<br>{{ `${data[0].签订合同百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[1] : 'white']" class="module" style="position: relative;left: -1336px;top:222px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：技术员<br>负责导入三表(零件)，<br>组件在项目启动会时提出，<br>由制造总监导入</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv2">产品设计<br>{{ `${data[0].产品设计百分比}%` }}</el-button>
<el-button :disabled="disabled" :class="[isActive ? color[1] : 'white']" type="text" @click="searchDiv2">产品设计<br>{{ `${data[0].产品设计百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[6] : 'white']" class="module" style="position: relative;left: -1057px;top:110px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：下料员<br>外购物料到货后，由下料员确认备料，<br>并通知金工领料</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv20">外购备料<br>{{ `${data[0].外购备料百分比}%` }}</el-button>
<el-button :disabled="disabled" :class="[isActive ? color[6] : 'white']" type="text" @click="searchDiv20">外购备料<br>{{ `${data[0].外购备料百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[2] : 'white']" class="module" style="position: relative;left: -1405px;top:222px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：计划员<br>计划员负责将三表中的零件按实际情况分配为：<br>自制件、采购部采购件、制造部采购件三类</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv3">零件分配<br>{{ `${data[0].零件分配百分比}%` }}</el-button>
<el-button :disabled="disabled" :class="[isActive ? color[2] : 'white']" type="text" @click="searchDiv3">零件分配<br>{{ `${data[0].零件分配百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[3] : 'white']" class="module" style="position: relative;left: -1350px;top:63px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：计划员<br>计划员分配零件后，<br>在生产计划下达模块<br>可查看到自家加工的零件任务，<br>计划员需要将这些零件投产</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv4">自制件<br>{{ `${data[0].自制件百分比}%` }}</el-button>
<el-button :disabled="disabled" :class="[isActive ? color[3] : 'white']" type="text" @click="searchDiv4">自制件<br>{{ `${data[0].自制件百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[5] : 'white']" class="module" style="position: relative;left: -1435px;top:223px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：制造部长<br>计划员分配零件后，<br>将分配到制造部的采购件进行采购</div>
<el-button :disabled="disabled" type="text" style="color: black;line-height: 19px" @click="searchDiv17">车间采购<br>{{ `${data[0].车间采购百分比}%` }}</el-button>
<el-button :disabled="disabled" :class="[isActive ? color[5] : 'white']" type="text" @click="searchDiv17">车间采购<br>{{ `${data[0].车间采购百分比}%` }}</el-button>
</el-tooltip>
</div>
<div :class="[isActive ? color[4] : 'white']" class="module" style="position: relative;left: -548px;top:300px; width: 80px;height: 48px;">
<el-tooltip placement="top">
<div slot="content">角色：采购部<br>计划员分配零件后，<br>将分配到采购部的采购件进行采购</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv16">采购部采购<br>{{ `${data[0].采购部采购百分比}%` }}</el-button>
<el-button :disabled="disabled" :class="[isActive ? color[4] : 'white']" type="text" @click="searchDiv16">采购部采购<br>{{ `${data[0].采购部采购百分比}%` }}</el-button>
</el-tooltip>
</div>
</div>
@@ -2212,6 +2211,7 @@ export default {
}).then(res => {
this.isActive = true
this.data = res.data
console.log(res)
if (res.data[0].签订合同状态 === 1) { this.color[0] = 'white' } else if (res.data[0].签订合同状态 === 2) { this.color[0] = 'yellow' } else if (res.data[0].签订合同状态 === 3) { this.color[0] = 'green' } else if (res.data[0].签订合同状态 === 4) { this.color[0] = 'red' }
if (res.data[0].产品设计状态 === 1) { this.color[1] = 'white' } else if (res.data[0].产品设计状态 === 2) { this.color[1] = 'yellow' } else if (res.data[0].产品设计状态 === 3) { this.color[1] = 'green' } else if (res.data[0].产品设计状态 === 4) { this.color[1] = 'red' }
if (res.data[0].零件分配状态 === 1) { this.color[2] = 'white' } else if (res.data[0].零件分配状态 === 2) { this.color[2] = 'yellow' } else if (res.data[0].零件分配状态 === 3) { this.color[2] = 'green' } else if (res.data[0].零件分配状态 === 4) { this.color[2] = 'red' }
@@ -2298,7 +2298,7 @@ export default {
res.data[0].付款百分比 !== '' && res.data[0].付款百分比 !== null ? this.dataDiv1.付款百分比 = res.data[0].付款百分比 : this.dataDiv1.付款百分比 = 0
if (res.data[0].价值评估 === '高') {
this.valueDiv1 = 6
} else if (res.data[0].价值评估 === '高') {
} else if (res.data[0].价值评估 === '中') {
this.valueDiv1 = 3
} else {
this.valueDiv1 = 1
@@ -2424,6 +2424,14 @@ export default {
shadowBlur: 10,
shadowOffsetX: 0,
shadowColor: 'rgba(0, 0, 0, 0.5)'
},
normal: {
color: function(params) {
var colorList = [
'gray', '#ff9759', '#7eaced'
]
return colorList[params.dataIndex]
}
}
}
}
@@ -4324,13 +4332,19 @@ export default {
background: red;
}
.yellow{
background: orange;
background: #7eaced;
color: black;
font-weight: bold;
}
.green{
background: lightgreen;
background: #ff9759;
color: black;
font-weight: bold;
}
.white{
background: white;
background: #EAEAEA;
color: black;
font-weight: bold;
}
.el-card{
margin: 5px 10px 5px 10px;
@@ -4343,7 +4357,6 @@ export default {
}
.module{
border-radius: 6px;
border: 1px solid black;
/*background-color: white;*/
display: inline-block;
}
@@ -4352,12 +4365,12 @@ export default {
}
.process{
text-align: center;
margin-left: 80px;
margin-left: 30px;
margin-top: 20px;
width: 1858px;
height: 400px;
/*border: 1px solid red;*/
background: url('../../../assets/img/img4.png') repeat;
background: url('../../../assets/img/img10.png') repeat;
background-repeat:no-repeat;
background-size:100% 100%;-moz-background-size:100% 100%;
}

4
src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
View File

@@ -98,7 +98,7 @@
</el-tooltip>
</div>
</el-card>
<el-dialog :visible.sync="dialogFormVisiblePeople" title="工艺流程单" center>
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisiblePeople" :title="title" center>
<div v-if="tableData2.length">
<table class="tg">
<tr>
@@ -193,6 +193,7 @@ export default {
tableData2: [],
tableData3: [],
dialogFormVisiblePeople: false,
title: '',
机床号: '',
组号: '',
零件图号: '',
@@ -286,6 +287,7 @@ export default {
searchtable1(row.工艺计划流水号).then(response => {
this.tableData2 = response.data
this.dialogFormVisiblePeople = true
this.title = row.零件名称 + '工艺流程单'
})
},
handleSelectionChange(val) {

11
src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue
View File

@@ -201,6 +201,7 @@
:data="tableData"
class="processTable"
border
highlight-current-row
style="width: 100%;min-height: 400px;"
size="mini">
<el-table-column prop="num" label="序号" width="45" align="center" type="index"/>
@@ -279,7 +280,7 @@
</el-table>
</el-card>
<el-dialog :visible.sync="dialogMaterial" title="物料选择" center width="400px">
<el-dialog v-el-drag-dialog :visible.sync="dialogMaterial" title="物料选择" center width="400px">
<el-input v-model="input" placeholder="材质" size="small" style="width:200px"/>
<el-button type="success" size="small" icon="el-icon-search" style="margin: 0 0 10px 10px" @click="total=0;pageCurrent=1;pageSize=10;searchMaterial()">查询
</el-button>
@@ -306,7 +307,7 @@
<el-button type="primary" size="small" @click="selectMaterial2()">提交</el-button>
</div>
</el-dialog>
<el-dialog :visible.sync="dialogFormVisible2" title="工艺名称、工艺要求选择" center width="400px">
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible2" title="工艺名称、工艺要求选择" center width="400px">
<el-form ref="form2" :model="form2" label-position="left" label-width="125px" class="demo-ruleForm">
<el-form-item label="工艺名称分类">
<el-select v-model="processNameClassValue" filterable placeholder="分类" size="small" @change="cChange()">
@@ -341,7 +342,7 @@
</el-form>
</el-dialog>
<el-dialog :visible.sync="dialogFormVisible" title="工艺选择" center width="800px">
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="工艺选择" center width="800px">
<el-form ref="form" :model="form" label-position="left" label-width="125px" class="demo-ruleForm">
<el-row>
<el-col :span="24">
@@ -396,7 +397,7 @@
</el-form>
</el-dialog>
<el-dialog :visible.sync="dialogFormVisible1" title="已完工艺选择" center width="800px">
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="已完工艺选择" center width="800px">
<el-form ref="form1" :model="form1" label-position="left" label-width="80px" class="demo-ruleForm">
<el-row>
<el-col :span="10">
@@ -471,7 +472,7 @@
</el-form>
</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="tableData3" size="mini" style="width: 97%;max-height: 300px" height="300" highlight-current-row border @row-click="selectPerson">
<el-table-column align="center" label="考勤编号" width="150">
<template slot-scope="scope">

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

@@ -89,7 +89,7 @@
</div>
</el-card>
<el-dialog :visible.sync="dialogFormVisible" title="选择工艺定额人员" center>
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="选择工艺定额人员" center>
<el-table
:data="tableData2"
style="width: 100%;max-height: 200px"

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

@@ -3,7 +3,7 @@
<el-card>
<el-row>
<span>机床号:</span>
<el-select v-model="Machine" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="机床号" @change="getGroup()">
<el-select v-model="Machine" filterable clearable size="small" style="margin-top:10px;width: 180px" placeholder="机床号" @change="getGroup()">
<el-option
v-for="item in Machines"
:key="item.value"
@@ -534,6 +534,7 @@ export default {
this.length = 0
getTable(this.checkbox_project, this.project, this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, 1, this.startTime_check, this.startTime, this.endTime_check, this.endTime, this.pageCurrent, this.pageSize).then(response => {
this.length = parseInt(response.data.total)
console.log(response.data.rows, 11111)
for (let i = 0; i < response.data.rows.length; i++) { // 声明二维数组
this.num111.push(response.data.rows[i].工艺计划流水号)
this.零件图号.push(response.data.rows[i].零件图号)
@@ -639,4 +640,10 @@ export default {
background-color: lightgreen;
border: 1px solid #1f2d3d;
}
.el-card{
margin: 0px;
}
.table h4{
height: 19px;
}
</style>

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

@@ -1,6 +1,5 @@
<template>
<div class="app-container">
<el-card>
<el-row>
<span>机床号:</span>
@@ -24,12 +23,14 @@
</el-select>
<span>零件号:</span>
<el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 200px;"/>
</el-row>
<el-row>
<span class="demonstration">计划下达时间:</span>
<el-date-picker
v-model="startTime"
value-format="yyyy-MM-dd"
size="small"
style="width: 160px"
style="width: 160px;margin-top: 10px;margin-bottom: 10px"
type="date"
placeholder="选择日期"/>
<span class="demonstration">~</span>
@@ -47,14 +48,18 @@
<el-card>
<el-table
v-loading="listLoading1"
id="ProcessingStatusEdit"
:data="tableData1"
:stripe="true"
class="table"
size="mini"
highlight-current-row
border
height="650">
<el-table-column
label="序号"
align="center"
width="50"
width="55"
type="index"/>
<el-table-column
align="center"
@@ -772,4 +777,12 @@ export default {
background-color: lightgreen;
border: 1px solid #1f2d3d;
}
.el-card{
margin:1px;
}
</style>
<style>
.ProcessingStatusEdit td, .el-table th {
padding: 0px 0;
}
</style>

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

@@ -2,7 +2,7 @@
<div class="app-container">
<el-card>
<span>人员名称:</span>
<el-input v-model="personnelNumber" placeholder="请选择人员名称" class="input-with-select" readonly clearable size="small" style="width:200px;margin:3px;" @dblclick.native="dialogTableVisible"/>
<el-input v-model="personnelNumber" placeholder="请双击选择人员名称" class="input-with-select" clearable size="small" style="width:200px;margin:3px;" @dblclick.native="dialogTableVisible"/>
<el-button type="success" class="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent=1;pageSize=20;searchTable()">查询</el-button>
<el-button type="primary" class="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="editType1('form');param = 0">新增</el-button>
</el-card>
@@ -81,7 +81,7 @@
</div>
</el-card>
<el-dialog :title="title1" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="700px">
<el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="700px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="90px" class="demo-ruleForm">
<el-row>
<el-col :span="12">
@@ -174,7 +174,7 @@
</div>
</el-dialog>
<el-dialog :visible.sync="dialogFormVisible1" title="人员信息" center width="750px">
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="人员信息" center width="750px">
<div style="height: 500px">
<div style="float: left;margin-top: 10px;margin-left: 20px;overflow-y: scroll;height: 400px">
<el-tree
@@ -409,8 +409,8 @@ export default {
value: i + 1
})
}
this.form.yearNumberValue = this.a
this.form.monthNumberValue = 1
this.form.yearNumberValue = new Date().getFullYear()
this.form.monthNumberValue = new Date().getMonth() + 1
},
// 查询
searchTable() {

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

@@ -1,77 +1,80 @@
<template>
<div class="app-container">
<el-card>
<span>项目名称:</span>
<el-select
v-model="entryNameValue"
placeholder="项目名称"
style="width:200px"
size="small"
clearable
filterable
@change="empty">
<el-option
v-for="item in entryName"
:key="item.value"
: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">
<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">
<el-button slot="append" icon="el-icon-search" @click="searchGroupList" />
</el-input>
<span>零件号:</span>
<el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width:200px"/>
<span>零件状态:</span>
<el-select v-model="partStateValue" placeholder="零件状态" size="small" clearable style="width:200px">
<el-option
v-for="item in partState"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<!--<span>零件类型:</span>-->
<!--<el-select v-model="partTypeValue" placeholder="零件类型" size="small" clearable style="margin-top: 15px;width: 200px">-->
<!--<el-option-->
<!--v-for="item in partType"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<el-button type="success" icon="el-icon-search" size="small" style="margin: 15px 0 0 10px" @click="pageCurrent=1;pageSize=10;total=0;searchData()">查询</el-button>
<el-row>
<span>项目名称:</span>
<el-select
v-model="entryNameValue"
placeholder="项目名称"
style="width:200px;margin-top: 10px"
size="small"
clearable
filterable
@change="empty">
<el-option
v-for="item in entryName"
:key="item.value"
: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">
<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">
<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">
<el-option
v-for="item in partState"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<!--<span>零件类型:</span>-->
<!--<el-select v-model="partTypeValue" placeholder="零件类型" size="small" clearable style="margin-top: 15px;width: 200px">-->
<!--<el-option-->
<!--v-for="item in partType"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<el-button type="success" icon="el-icon-search" size="small" style="margin: 15px 0 0 10px" @click="pageCurrent=1;pageSize=10;total=0;searchData()">查询</el-button>
</el-row>
</el-card>
<el-card>
<el-table
v-loading="loading0"
:data="tableData"
style="width: 100%;max-height: 600px"
height="600"
stripe="true"
size="mini"
highlight-current-row
border>
<el-table-column align="center" label="序号" type="index" width="60px"/>
<el-table-column align="center" label="机床图号" width="170px">
<el-table-column align="center" label="序号" type="index" width="55px"/>
<el-table-column align="center" label="机床图号" width="150px">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="组号" width="140px">
<el-table-column align="center" label="组号" width="120px">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column align="center" label="零件图号" width="200px">
<el-table-column align="center" label="零件图号" min-width="160px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column align="center" label="零件名称" width="180px">
<el-table-column align="center" label="零件名称" min-width="170px">
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
@@ -120,7 +123,6 @@
@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">
<el-form-item label="零件状态">
@@ -490,4 +492,7 @@ export default {
span{
margin: 10px 0 10px 10px;
}
.el-card{
margin: 0px;
}
</style>

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

@@ -1,9 +1,8 @@
<template>
<div class="app-container">
<el-card>
<el-row>
<span>操作者:</span>
<span style="margin-left: 10px">操作者:</span>
<el-input v-model="workerName" placeholder="操作者" size="small" clearable style="width:200px"/>
<span class="demonstration">完成加工时间:</span>
<el-date-picker
@@ -27,7 +26,17 @@
</el-card>
<el-card>
<el-col :span="6">
<el-table v-loading="loading" :data="tableData" highlight-current-row height="500" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable2">
<el-table
v-loading="loading"
:data="tableData"
highlight-current-row
height="380"
size="mini"
stripe="true"
style="width: 100%;"
border
element-loading-text="拼命加载中"
@row-click="searchTable2">
<el-table-column label="操作者" align="center" width="110px">
<template slot-scope="scope">
{{ scope.row.姓名 }}
@@ -56,7 +65,7 @@
</div>
</el-col>
<el-col :span="17" style="margin-left: 30px;">
<el-table v-loading="loading2" :data="tableData2" height="500" style="width: 100%;" border element-loading-text="拼命加载中">
<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-column label="零件图号" align="center" width="150px">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
@@ -106,8 +115,8 @@
</el-col>
</el-card>
<el-card>
<span>机床编号:</span>
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="searchTable4();searchTable6()">
<span style="margin-left: 10px">机床编号:</span>
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin-top: 10px" clearable @change="searchTable4();searchTable6()">
<el-option
v-for="item in machineNumber"
:key="item.value"
@@ -117,12 +126,12 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option>
</el-select>
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="exportUninquirySheet2()">机床导出</el-button>
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="exportUninquirySheet3()">组件导出</el-button>
<el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px" @click="exportUninquirySheet2()">机床导出</el-button>
<el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px" @click="exportUninquirySheet3()">组件导出</el-button>
</el-card>
<el-card>
<el-col :span="6">
<el-table v-loading="loading3" :data="tableData3" highlight-current-row height="580" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable5">
<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-column label="机床编号" align="center" width="110px">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
@@ -151,7 +160,7 @@
</div>
</el-col>
<el-col :span="17" style="margin-left: 30px;">
<el-table v-loading="loading4" :data="tableData4" height="580" style="width: 100%;" border element-loading-text="拼命加载中">
<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-column label="机床编号" align="center">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
@@ -484,6 +493,6 @@ export default {
<style scoped>
.el-card{
margin-bottom: 10px;
margin-bottom: 1px;
}
</style>