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

完成项目工时查询修改质检页面

Browse Source
This commit is contained in:
yanggongyan
2020-02-06 17:18:26 +08:00
parent ecd3de3cd5 a87eefe580
commit 327cd13384
44 changed files with 1483 additions and 559 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -321,7 +321,7 @@ export default {
this.dialogFormVisible2 = true
},
deleteProcess() {
this.$confirm('确定删除该合同?', '提示', {
this.$confirm('确定删除?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'

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

@@ -173,7 +173,7 @@ export default {
firstLevel.children = []
for (let j = 0; j < response.data.length; j++) {
firstLevel.children.push({
label: (response.data[j].零件图号 ? response.data[j].零件图号 : '无零件图号') + '\xa0\xa0\xa0\xa0\xa0\xa0' + (response.data[j].规格 ? response.data[j].规格 : '') + '\xa0\xa0\xa0\xa0\xa0\xa0' + (response.data[j].投产总数量 ? response.data[j].投产总数量 : '') + '..........' + (response.data[j].零件名称 ? response.data[j].零件名称 : '无零件名称') + (response.data[j].零件类型 === 1 ? '\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0' + response.data[j].考核状态名称 : (response.data[j].零件类型 === 2 ? '\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0制造采购' : '\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0外购')),
label: (response.data[j].零件图号 ? response.data[j].零件图号 : '无零件图号') + '\xa0\xa0\xa0\xa0\xa0\xa0' + (response.data[j].规格 ? response.data[j].规格 : '') + '\xa0\xa0\xa0\xa0\xa0\xa0' + (response.data[j].投产总数量 ? response.data[j].投产总数量 : '') + '..........' + (response.data[j].零件名称 ? response.data[j].零件名称 : '无零件名称') + (response.data[j].零件类型 === 1 ? '\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0自制：' + response.data[j].考核状态名称 : (response.data[j].零件类型 === 2 ? '\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0制造采购' : '\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0外购：' + response.data[j].采购状态)),
value: response.data[j].工艺计划流水号,
考核状态: response.data[j].考核状态,
采购状态: response.data[j].采购状态,

109
src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue
View File

@@ -17,16 +17,16 @@
:label="item.label"
:value="item.value"/>
</el-select>
<span>分组</span>
<el-select v-model="partValue" clearable filterable size="small" style="margin-right:10px;width: 80px" placeholder="分组">
<el-option
v-for="item in part"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>规格及型号</span>
<el-input v-model="specificationValue" clearable size="small" style="margin-right:10px;width: 150px" placeholder="规格型号"/>
<!-- <span>分组</span>-->
<!-- <el-select v-model="partValue" clearable filterable size="small" style="margin-right:10px;width: 80px" placeholder="分组">-->
<!-- <el-option-->
<!-- v-for="item in part"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value"/>-->
<!-- </el-select>-->
<!-- <span>规格及型号</span>-->
<!-- <el-input v-model="specificationValue" clearable size="small" style="margin-right:10px;width: 150px" placeholder="规格型号"/>-->
<span>加工总工时（小时）:</span>
<el-input v-model="totalProcessingHours" clearable size="small" style="margin-right:10px;width: 100px"/>
<span>计划总工时（小时）:</span>
@@ -34,89 +34,94 @@
<el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchTable()">查询</el-button>
</el-card>
<el-card>
<el-table :data="tableData" highlight-current-row border style="width: 100%;" size="mini" height="300">
<el-table-column label="跟单号" align="center" min-width="200">
<el-table :data="tableData" highlight-current-row border style="width: 100%;" size="mini" height="700">
<el-table-column label="跟单号" align="center" min-width="150">
<template slot-scope="scope">
{{ scope.row.跟单号 }}
</template>
</el-table-column>
<el-table-column label="序号" align="center" min-width="200">
<el-table-column label="序号" align="center" min-width="70">
<template slot-scope="scope">
{{ scope.row.序号 }}
</template>
</el-table-column>
<el-table-column label="工序名" align="center" min-width="200">
<el-table-column label="工序名" align="center" min-width="90">
<template slot-scope="scope">
{{ scope.row.工序名 }}
</template>
</el-table-column>
<el-table-column label="计划数量" align="center" min-width="200">
<el-table-column label="计划数量" align="center" min-width="70">
<template slot-scope="scope">
{{ scope.row.计划数量 }}
</template>
</el-table-column>
<el-table-column label="计划准备工时" align="center" min-width="200">
<el-table-column label="计划准备工时" align="center" min-width="70">
<template slot-scope="scope">
{{ scope.row.计划准备工时 }}
</template>
</el-table-column>
<el-table-column label="单件计划工时" align="center" min-width="200">
<el-table-column label="单件计划工时" align="center" min-width="70">
<template slot-scope="scope">
{{ scope.row.单件计划工时 }}
</template>
</el-table-column>
<el-table-column label="计划工时（分）" align="center" min-width="200">
<el-table-column label="计划工时（分）" align="center" min-width="70">
<template slot-scope="scope">
{{ scope.row.计划工时 }}
</template>
</el-table-column>
<el-table-column label="计划加工日期" align="center" min-width="200">
<el-table-column label="计划加工日期" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.计划加工日期 }}
</template>
</el-table-column>
<el-table-column label="加工数量" align="center" min-width="200">
<el-table-column label="加工数量" align="center" min-width="70">
<template slot-scope="scope">
{{ scope.row.加工数量 }}
</template>
</el-table-column>
<el-table-column label="加工准备工时" align="center" min-width="200">
<el-table-column label="加工准备工时" align="center" min-width="70">
<template slot-scope="scope">
{{ scope.row.加工准备工时 }}
</template>
</el-table-column>
<el-table-column label="单件加工工时" align="center" min-width="200">
<template slot-scope="scope">
{{ scope.row.单件加工工时 }}
</template>
</el-table-column>
<el-table-column label="加工工时（分）" align="center" min-width="200">
<el-table-column label="加工工时（分）" align="center" min-width="70">
<template slot-scope="scope">
{{ scope.row.加工工时 }}
</template>
</el-table-column>
<el-table-column label="加工日期" align="center" min-width="200">
<el-table-column label="加工日期" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.加工日期 }}
</template>
</el-table-column>
<el-table-column label="图号及规格" align="center" min-width="200">
<el-table-column label="图号及规格" align="center" min-width="150">
<template slot-scope="scope">
{{ scope.row.图号及规格 }}
</template>
</el-table-column>
<el-table-column label="制品名称" align="center" min-width="200">
<el-table-column label="制品名称" align="center" min-width="150">
<template slot-scope="scope">
{{ scope.row.制品名称 }}
</template>
</el-table-column>
</el-table>
<div class="block" style="margin: 10px 0;">
<el-pagination
:current-page="PageCurrent"
:page-sizes="[10, 20, 30, 40, 1000]"
:page-size="PageSize"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
</el-card>
</div>
</template>
<script>
import { initProject, initMachine } from '@/api/ManufacturingCenter/ProjectPlanningQuery'
import { initProject, initMachine, searchatabledata } from '@/api/ManufacturingCenter/ContractDetailsInquiry'
export default {
data() {
return {
@@ -129,7 +134,10 @@ export default {
specificationValue: '', // 规格型号
totalProcessingHours: '', // 加工总工时
totalPlannedHours: '', // 计划总工时
tableData: [] // 详情表
tableData: [], // 详情表
PageCurrent: 1,
PageSize: 1000,
total: 0
}
},
created() {
@@ -150,6 +158,43 @@ export default {
})
}
})
}, // 查询按钮
searchTable() {
this.tableData = []
searchatabledata(this.projectValue, this.machineValue, this.PageCurrent, this.PageSize).then(response => {
if (response.data.rows.length !== 0) {
for (let i = 0; i < response.data.rows.length; i++) {
this.tableData.push({
跟单号: response.data.rows[i].跟单号,
序号: response.data.rows[i].工序顺序,
工序名: response.data.rows[i].工艺名称,
计划数量: response.data.rows[i].批次数量,
计划准备工时: response.data.rows[i].准结定额工时,
单件计划工时: response.data.rows[i].单件定额工时,
计划工时: Number(response.data.rows[i].批次数量) * (Number(response.data.rows[i].单件定额工时) + Number(response.data.rows[i].准结定额工时)),
计划加工日期: response.data.rows[i].计划日期.split(' ')[0],
加工数量: response.data.rows[i].批次数量,
加工准备工时: response.data.rows[i].修补准结工时,
加工工时: response.data.rows[i].设备工时,
加工日期: response.data.rows[i].操作时间,
图号及规格: response.data.rows[i].机床图号,
制品名称: response.data.rows[i].零件名称
})
this.totalProcessingHours += Number(response.data.rows[i].设备工时)
this.totalPlannedHours += Number(Number(response.data.rows[i].批次数量) * (Number(response.data.rows[i].单件定额工时) + Number(response.data.rows[i].准结定额工时)))
}
}
this.total = response.data.total
})
},
handleSizeChange(val) {
this.PageCurrent = 1
this.PageSize = val
this.searchTable()
},
handleCurrentChange(val) {
this.PageCurrent = val
this.searchTable()
}
}
}

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

@@ -18,52 +18,72 @@
<el-tooltip :open-delay="1200" effect="dark" content="打印备料单" placement="top">
<el-button type="primary" size="small" icon="el-icon-printer" style="margin-left:10px" @click="exportTable('BL')">打印自家备料单</el-button>
</el-tooltip>
<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 140px" @click="exportExcel">导出</el-button>
<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>
<el-card>
<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
v-loading="loading"
:data="tableData"
height="760"
style="width: 1126px; margin: 3px 0"
size="mini"
border
stripe
sortable
highlight-current-row
element-loading-text="拼命加载中"
@sort-change="sortChange"
@selection-change="handleSelectionChange">
<!--<el-table v-loading="loading" :data="tableData" height="760" style="width: 1126px; margin: 3px 0" size="mini" border stripe highlight-current-row element-loading-text="拼命加载中" @selection-change="handleSelectionChange">-->
<el-table-column
type="selection"
width="55"
width="50"
align="center"/>
<el-table-column label="打印状态" prop="备料打印" align="center">
<el-table-column label="备料分配" prop="备料分配" align="center" width="90">
<template slot-scope="scope">
<el-tag v-if="scope.row.备料打印!=='0'" type="success" size="mini">已导出</el-tag>
<el-tag v-else type="warning" size="mini">未导出</el-tag>
<el-tag v-if="scope.row.备料打印 ==='1' && scope.row.是否外购备料==='0'" type="success" size="mini">自家</el-tag>
<el-tag v-if="scope.row.备料打印 ==='0' && scope.row.是否外购备料==='1'" type="success" size="mini">外购</el-tag>
<el-tag v-if="scope.row.备料打印 ==='0' && scope.row.是否外购备料==='0'" type="warning" size="mini">未分配</el-tag>
</template>
</el-table-column>
<el-table-column label="零件名称" prop="零件名称" align="center" >
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="零件图号" prop="零件图号" align="center" >
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="数量" align="center" >
<template slot-scope="scope">
{{ scope.row.批次数量 }}
</template>
</el-table-column>
<el-table-column label="材料" align="center" >
<template slot-scope="scope">
{{ scope.row.材料 }}
</template>
</el-table-column>
<el-table-column label="重量" align="center" >
<template slot-scope="scope">
{{ scope.row.重量 }}
</template>
</el-table-column>
<el-table-column label="备料" align="center">
<template slot-scope="scope">
{{ scope.row.工艺要求 }}
</template>
</el-table-column>
</el-table>
<el-table-column label="零件名称" prop="零件名称" align="center" width="280" sortable="custom" show-overflow-tooltip>
<el-table-column label="零件名称" prop="零件名称" align="center" width="250" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.零件名称 }}
</template>
</el-table-column>
<el-table-column label="零件图号" prop="零件图号" align="center" width="180" sortable="custom" show-overflow-tooltip>
<!--<el-table-column label="零件图号" prop="零件图号" align="center" width="180" show-overflow-tooltip>-->
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="数量" align="center" width="60">
<template slot-scope="scope">
{{ scope.row.批次数量 }}
</template>
</el-table-column>
<el-table-column label="材料" align="center" width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.材料 }}
</template>
</el-table-column>
<el-table-column label="重量" align="center" width="60" >
<template slot-scope="scope">
{{ scope.row.重量 }}
</template>
</el-table-column>
<el-table-column label="工艺要求" align="center" width="300" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.工艺要求 }}
</template>
</el-table-column>
</el-table-column></el-table>
<div class="block">
<el-pagination
v-if="!loading"
@@ -114,7 +134,7 @@
</template>
<script>
import { searchtable, searchtable2, edit, edit2 } from '@/api/ManufacturingCenter/CreatePreparationBill'
import { searchtable, searchtable2, edit, edit2, getExport } from '@/api/ManufacturingCenter/CreatePreparationBill'
import { exportExcelMethod } from './exportExcel'
import $ from 'jquery'
export default {
@@ -129,13 +149,31 @@ export default {
tableData: [], // 表格数据
total: null, // 总条数
pageSize: 30, // 每页显示条数
pageCurrent: 1 // 后台获取页
pageCurrent: 1, // 后台获取页
ordername: '',
order: ''
}
},
created() {
this.searchTable()
},
methods: {
sortChange(column, prop, order) {
console.log(column + '-' + column.prop + '-' + column.order, 11111)
this.ordername = column.prop
if (column.ordername === '零件名称') {
this.ordername = 1
} else if (column.ordername === '零件图号') { this.ordername = 2 } else {
this.ordername = ''
}
if (column.order === 'ascending') {
this.order = 1
} else if (column.order === 'descending') { this.order = 2 } else {
this.order = ''
}
this.searchTable()
},
exportTable() {
if (this.tableData2.length === 0) {
this.$message.warning('暂无数据')
@@ -160,32 +198,36 @@ export default {
} else {
this.partNamecheck = false
}
searchtable(this.partNamecheck, this.partName, !this.all, 0, this.pageCurrent, this.pageSize).then(response => {
if (response.data.total === 0) {
this.loading = false
} else {
searchtable(this.partNamecheck, this.partName, !this.all, 0, this.pageCurrent, this.pageSize, this.ordername, this.order).then(response => {
searchtable(this.partNamecheck, this.partName, !this.all, 0, this.pageCurrent, this.pageSize).then(response => {
console.log(response)
if (response.data.total === 0) {
this.loading = false
} else {
// this.tableData.push({
// 重量: response.data.rows[0].重量
// })
this.Data = response.data.rows
this.total = response.data.total
}
}).then(() => {
for (let i = 0; i < this.Data.length; i++) {
searchtable2(this.Data[i].工艺计划流水号).then(response => {
this.tableData.push({
工艺计划流水号: this.Data[i].工艺计划流水号,
零件名称: this.Data[i].零件名称,
零件图号: this.Data[i].零件图号,
备料打印: this.Data[i].备料打印,
工艺要求: response.data[0].工艺要求,
材料: this.Data[i].材料,
重量: this.Data[i].重量,
批次数量: this.Data[i].批次数量
this.Data = response.data.rows
this.total = response.data.total
}
}).then(() => {
for (let i = 0; i < this.Data.length; i++) {
searchtable2(this.Data[i].工艺计划流水号).then(response => {
this.tableData.push({
工艺计划流水号: this.Data[i].工艺计划流水号,
零件名称: this.Data[i].零件名称,
零件图号: this.Data[i].零件图号,
备料打印: this.Data[i].备料打印,
是否外购备料: this.Data[i].是否外购备料,
工艺要求: response.data[0].工艺要求,
材料: this.Data[i].材料,
重量: this.Data[i].重量,
批次数量: this.Data[i].批次数量
})
})
})
this.loading = false
}
this.loading = false
}
})
})
},
handleSelectionChange(val) {
@@ -242,9 +284,38 @@ export default {
handleCurrentChange(val) {
this.pageCurrent = val
this.searchTable()
},
exportExcel() {
if (this.partName !== '' && this.partName !== null) {
this.partNamecheck = true
} else {
this.partNamecheck = false
}
getExport(this.partNamecheck, this.partName, !this.all, 0).then(res => {
console.log(res.data)
import('@/vendor/Export2Excel').then(excel => {
const tHeader = ['备料分配', '零件名称', '零件图号', '数量', '材料', '重量', '工艺要求']
const filterVal = ['分配状态', '零件名称', '零件图号', '批次数量', '材料', '重量', '工艺要求']
const list = res.data
const data = this.formatJson(filterVal, list)
excel.export_json_to_excel({
header: tHeader,
data,
filename: '备料分配表',
autoWidth: true,
bookType: 'xlsx'
})
})
})
},
formatJson(filterVal, jsonData) {
return jsonData.map(v => filterVal.map(j => {
return v[j]
}))
}
}
}
</script>
<style scoped>

79
src/views/ManufacturingCenter/Enter0therData/index.vue
View File

@@ -2,16 +2,6 @@
<div class="app-container">
<el-card>
<el-row>
<el-date-picker
v-model="time"
size="small"
type="date"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
placeholder="加工日期"
style="width: 140px;margin-top: 10px"
clearable
@change="change"/>
<el-select v-model="Person" style="width:100px" placeholder="操作工" size="small" filterable clearable>
<el-option
v-for="item in Persons"
@@ -19,27 +9,12 @@
:label="item.label"
:value="item.value"/>
</el-select>
<el-input v-model="partNumber" size="small" placeholder="零件图号" style="width: 150px" clearable/>
<el-input v-model="partName" size="small" placeholder="零件名称" style="width: 140px" clearable/>
<el-input v-model="partNumber" size="small" placeholder="零件图号及名称" style="width: 200px" clearable/>
<el-input v-model="procedureName" size="small" placeholder="工序名称" style="width: 100px" clearable/>
<span>数量</span>
<el-input-number v-model="number" :min="0" :step="1" size="small" placeholder="数量" style="width: 120px" clearable/>
<span>单件工时</span>
<el-input-number v-model="workTime" :min="0" :step="1" size="small" placeholder="单件工时" style="width: 120px" clearable/>
<el-select v-model="PersonLiable" style="width:100px" placeholder="责任人" size="small" filterable clearable>
<el-option
v-for="item in Persons"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-select v-model="ConfirmingPerson" style="width:100px" placeholder="确认人" size="small" filterable clearable>
<el-option
v-for="item in Persons"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-row>
<el-row>
<el-button type="primary" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="saveDate">保存</el-button>
@@ -66,16 +41,11 @@
{{ scope.row.操作工姓名 }}
</template>
</el-table-column>
<el-table-column label="零件图号" align="center" width="150">
<el-table-column label="零件图号及名称" align="center" width="150">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="零件名称" align="center" width="150">
<template slot-scope="scope">
{{ scope.row.名称 }}
</template>
</el-table-column>
<el-table-column label="工序名称" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.工序 }}
@@ -91,16 +61,6 @@
{{ scope.row.单件工时 }}
</template>
</el-table-column>
<el-table-column label="责任人" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.责任人姓名 }}
</template>
</el-table-column>
<el-table-column label="确认人" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.确认人姓名 }}
</template>
</el-table-column>
<el-table-column label="录入人" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.录入人姓名 }}
@@ -116,7 +76,6 @@ import { mapGetters } from 'vuex'
export default {
data() {
return {
time: '',
Person: '',
Persons: [],
partNumber: '',
@@ -124,10 +83,8 @@ export default {
procedureName: '',
number: '',
workTime: '',
PersonLiable: '',
ConfirmingPerson: '',
tableData: [],
monthValue: ''
monthValue: new Date()
}
},
computed: {
@@ -141,11 +98,9 @@ export default {
},
created() {
this.searchPerson()
this.getNowFormatDate()
},
methods: {
change() {
console.log(this.time.slice(0, 7))
},
searchPerson() {
searchPerson().then(response => {
for (let i = 0; i < response.data.length; i++) {
@@ -156,6 +111,14 @@ export default {
}
})
},
getNowFormatDate() {
var year = this.monthValue.getFullYear()
var month = this.monthValue.getMonth() + 1
if (month >= 1 && month <= 9) {
month = '0' + month
}
this.monthValue = year + '-' + month
},
fetchDate() {
if (this.monthValue) {
fetchDate(this.monthValue).then(response => {
@@ -166,11 +129,10 @@ export default {
}
},
saveDate() {
if (this.time && this.Person && this.partNumber && this.partName && this.procedureName && this.number && this.workTime) {
saveDate(this.time, this.Person, this.partNumber, this.partName, this.procedureName, this.PersonLiable, this.ConfirmingPerson, this.id, this.number, this.workTime).then(response => {
if (this.Person && this.partNumber && this.procedureName && this.number && this.workTime) {
saveDate(this.Person, this.partNumber, this.procedureName, this.id, this.number, this.workTime).then(response => {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
this.monthValue = this.time.slice(0, 7)
this.RemoveDate()
this.fetchDate()
} else {
@@ -182,11 +144,10 @@ export default {
}
},
editDate() {
if (this.time && this.Person && this.partNumber && this.partName && this.procedureName && this.number && this.workTime) {
editDate(this.ID, this.time, this.Person, this.partNumber, this.partName, this.procedureName, this.PersonLiable, this.ConfirmingPerson, this.id, this.number, this.workTime).then(response => {
if (this.Person && this.partNumber && this.procedureName && this.number && this.workTime) {
editDate(this.ID, this.Person, this.partNumber, this.procedureName, this.id, this.number, this.workTime).then(response => {
if (response.data[0].result === '1') {
this.$message.success('编辑成功')
this.monthValue = this.time.slice(0, 7)
this.RemoveDate()
this.fetchDate()
} else {
@@ -218,26 +179,18 @@ export default {
})
},
RemoveDate() {
this.time = ''
this.Person = ''
this.partNumber = ''
this.partName = ''
this.number = 0
this.workTime = 0
this.procedureName = ''
this.PersonLiable = ''
this.ConfirmingPerson = ''
},
searchTable(row) {
this.time = row.加工日期
this.Person = row.操作工流水号
this.partNumber = row.零件图号
this.partName = row.名称
this.procedureName = row.工序
this.number = row.数量
this.workTime = row.单件工时
this.PersonLiable = row.责任人流水号
this.ConfirmingPerson = row.确认人流水号
this.ID = row.ID
}
}

130
src/views/ManufacturingCenter/EquipmentMonitoring/index.vue
View File

@@ -83,7 +83,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME136" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME136" :title="tooltip" style="position: relative;left:149px;top:395px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME136" :title="tooltip" style="position: relative;left:199px;top:395px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME136+fang" class="fang"/>-->
<div :id="OPNAME136+circle" class="circle" style="margin-left: 11px;"/>
@@ -91,9 +91,19 @@
</el-row>
</div>
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME150" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME150" :title="tooltip" style="position: relative;left:788px;top:10px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME150 }}</div>
<div :id="OPNAME150+circle" class="circle"/>
<!--<div :id="OPNAME102+fang" class="fang" style="margin-left: 9px"/>-->
</el-row>
</div>
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME102" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME102" :title="tooltip" style="position: relative;left:788px;top:76px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME102" :title="tooltip" style="position: relative;left:788px;top:50px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME102 }}</div>
<div :id="OPNAME102+circle" class="circle"/>
@@ -103,7 +113,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME103" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME103" :title="tooltip" style="position: relative;left:788px;top:71px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME103" :title="tooltip" style="position: relative;left:788px;top:41px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME103 }}</div>
<div :id="OPNAME103+circle" class="circle"/>
@@ -113,7 +123,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME104" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME104" :title="tooltip" style="position: relative;left:788px;top:66px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME104" :title="tooltip" style="position: relative;left:788px;top:36px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME104 }}</div>
<div :id="OPNAME104+circle" class="circle"/>
@@ -123,7 +133,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME105" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME105" :title="tooltip" style="position: relative;left:788px;top:61px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME105" :title="tooltip" style="position: relative;left:788px;top:31px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME105 }}</div>
<div :id="OPNAME105+circle" class="circle"/>
@@ -133,7 +143,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME145" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME145" :title="tooltip" style="position: relative;left:788px;top:55px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME145" :title="tooltip" style="position: relative;left:788px;top:25px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME145 }}</div>
<div :id="OPNAME145+circle" class="circle"/>
@@ -143,7 +153,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME106" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME106" :title="tooltip" style="position: relative;left:788px;top:50px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME106" :title="tooltip" style="position: relative;left:788px;top:20px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME106 }}</div>
<div :id="OPNAME106+circle" class="circle"/>
@@ -151,9 +161,19 @@
</el-row>
</div>
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME1061" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME1061" :title="tooltip" style="position: relative;left:788px;top:15px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME1061 }}</div>
<div :id="OPNAME1061+circle" class="circle"/>
<!--<div :id="OPNAME106+fang" class="fang" style="margin-left: 9px"/>-->
</el-row>
</div>
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME107" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME107" :title="tooltip" style="position: relative;left:788px;top:43px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME107" :title="tooltip" style="position: relative;left:788px;top:8px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME107 }}</div>
<div :id="OPNAME107+circle" class="circle"/>
@@ -163,7 +183,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME108" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME108" :title="tooltip" style="position: relative;left:788px;top:38px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME108" :title="tooltip" style="position: relative;left:788px;top:3px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME108 }}</div>
<div :id="OPNAME108+circle" class="circle"/>
@@ -173,7 +193,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME109" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME109" :title="tooltip" style="position: relative;left:788px;top:32px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME109" :title="tooltip" style="position: relative;left:788px;top:-3px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME109 }}</div>
<div :id="OPNAME109+circle" class="circle"/>
@@ -181,9 +201,19 @@
</el-row>
</div>
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME1091" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME1091" :title="tooltip" style="position: relative;left:788px;top:-8px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME1091 }}</div>
<div :id="OPNAME1091+circle" class="circle"/>
<!--<div :id="OPNAME109+fang" class="fang" style="margin-left: 9px"/>-->
</el-row>
</div>
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME110" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME110" :title="tooltip" style="position: relative;left:788px;top:27px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME110" :title="tooltip" style="position: relative;left:788px;top:-12px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME110 }}</div>
<div :id="OPNAME110+circle" class="circle"/>
@@ -193,7 +223,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME111" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME111" :title="tooltip" style="position: relative;left:788px;top:21px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME111" :title="tooltip" style="position: relative;left:788px;top:-18px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME111 }}</div>
<div :id="OPNAME111+circle" class="circle"/>
@@ -203,7 +233,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME112" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME112" :title="tooltip" style="position: relative;left:788px;top:15px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME112" :title="tooltip" style="position: relative;left:788px;top:-25px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME112 }}</div>
<div :id="OPNAME112+circle" class="circle"/>
@@ -213,7 +243,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME113" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME113" :title="tooltip" style="position: relative;left:889px;top:-300px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME113" :title="tooltip" style="position: relative;left:889px;top:-380px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME113 }}</div>
<div :id="OPNAME113+circle" class="circle"/>
@@ -223,7 +253,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME114" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME114" :title="tooltip" style="position: relative;left:889px;top:-245px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME114" :title="tooltip" style="position: relative;left:889px;top:-325px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME114 }}</div>
<div :id="OPNAME114+circle" class="circle"/>
@@ -233,7 +263,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME101" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME101" :title="tooltip" style="position: relative;left:895px;top:-225px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME101" :title="tooltip" style="position: relative;left:895px;top:-305px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME101 }}</div>
<div :id="OPNAME101+circle" class="circle"/>
@@ -243,7 +273,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME149" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME149" :title="tooltip" style="position: relative;left:895px;top:-190px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME149" :title="tooltip" style="position: relative;left:895px;top:-270px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME149 }}</div>
<div :id="OPNAME149+circle" class="circle"/>
@@ -253,7 +283,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME115" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME115" :title="tooltip" style="position: relative;left:895px;top:-186px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME115" :title="tooltip" style="position: relative;left:895px;top:-266px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME115 }}</div>
<div :id="OPNAME115+circle" class="circle"/>
@@ -263,7 +293,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME116" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME116" :title="tooltip" style="position: relative;left:895px;top:-152px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME116" :title="tooltip" style="position: relative;left:895px;top:-232px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME116 }}</div>
<div :id="OPNAME116+circle" class="circle"/>
@@ -273,7 +303,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME117" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME117" :title="tooltip" style="position: relative;left:895px;top:-150px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME117" :title="tooltip" style="position: relative;left:895px;top:-230px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME117 }}</div>
<div :id="OPNAME117+circle" class="circle"/>
@@ -283,7 +313,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME118" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME118" :title="tooltip" style="position: relative;left:1032px;top:-381px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME118" :title="tooltip" style="position: relative;left:1032px;top:-461px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME118+fang" class="fang"/>-->
<div :id="OPNAME118+circle" class="circle" style="margin-left: 13px"/>
@@ -293,7 +323,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME119" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME119" :title="tooltip" style="position: relative;left:1032px;top:-366px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME119" :title="tooltip" style="position: relative;left:1032px;top:-446px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME119+fang" class="fang"/>-->
<div :id="OPNAME119+circle" class="circle" style="margin-left: 13px"/>
@@ -303,7 +333,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME120" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME120" :title="tooltip" style="position: relative;left:1032px;top:-350px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME120" :title="tooltip" style="position: relative;left:1032px;top:-430px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME120+fang" class="fang"/>-->
<div :id="OPNAME120+circle" class="circle" style="margin-left: 13px"/>
@@ -313,7 +343,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME121" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME121" :title="tooltip" style="position: relative;left:1032px;top:-255px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME121" :title="tooltip" style="position: relative;left:1032px;top:-325px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME121+fang" class="fang"/>-->
<div :id="OPNAME121+circle" class="circle" style="margin-left: 13px"/>
@@ -323,7 +353,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME122" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME122" :title="tooltip" style="position: relative;left:1032px;top:-175px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME122" :title="tooltip" style="position: relative;left:1032px;top:-245px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME122+fang" class="fang"/>-->
<div :id="OPNAME122+circle" class="circle" style="margin-left: 13px"/>
@@ -333,7 +363,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME123" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME123" :title="tooltip" style="position: relative;left:1128px;top:-685px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME123" :title="tooltip" style="position: relative;left:1128px;top:-770px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME123+fang" class="fang"/>-->
<div :id="OPNAME123+circle" class="circle" style="margin-left: 13px"/>
@@ -343,7 +373,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME124" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME124" :title="tooltip" style="position: relative;left:1128px;top:-666px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME124" :title="tooltip" style="position: relative;left:1128px;top:-751px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME124+fang" class="fang"/>-->
<div :id="OPNAME124+circle" class="circle" style="margin-left: 13px"/>
@@ -353,7 +383,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME125" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME125" :title="tooltip" style="position: relative;left:1128px;top:-651px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME125" :title="tooltip" style="position: relative;left:1128px;top:-736px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME125+fang" class="fang"/>-->
<div :id="OPNAME125+circle" class="circle" style="margin-left: 13px"/>
@@ -363,7 +393,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME126" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME126" :title="tooltip" style="position: relative;left:1128px;top:-635px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME126" :title="tooltip" style="position: relative;left:1128px;top:-720px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME126+fang" class="fang"/>-->
<div :id="OPNAME126+circle" class="circle" style="margin-left: 13px"/>
@@ -373,7 +403,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME127" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME127" :title="tooltip" style="position: relative;left:1128px;top:-395px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME127" :title="tooltip" style="position: relative;left:1128px;top:-445px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME127+fang" class="fang"/>-->
<div :id="OPNAME127+circle" class="circle" style="margin-left: 13px"/>
@@ -383,7 +413,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME128" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME128" :title="tooltip" style="position: relative;left:1128px;top:-374px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME128" :title="tooltip" style="position: relative;left:1128px;top:-444px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME128+fang" class="fang"/>-->
<div :id="OPNAME128+circle" class="circle" style="margin-left: 13px"/>
@@ -393,7 +423,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME129" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME129" :title="tooltip" style="position: relative;left:1280px;top:-828px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME129" :title="tooltip" style="position: relative;left:1280px;top:-908px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME129+fang" class="fang"/>-->
<div :id="OPNAME129+circle" class="circle" style="margin-left: 13px"/>
@@ -403,7 +433,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME130" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME130" :title="tooltip" style="position: relative;left:1280px;top:-818px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME130" :title="tooltip" style="position: relative;left:1280px;top:-898px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME130+fang" class="fang"/>-->
<div :id="OPNAME130+circle" class="circle" style="margin-left: 13px"/>
@@ -413,7 +443,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME131" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME131" :title="tooltip" style="position: relative;left:1280px;top:-778px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME131" :title="tooltip" style="position: relative;left:1280px;top:-858px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME131+fang" class="fang"/>-->
<div :id="OPNAME131+circle" class="circle" style="margin-left: 13px"/>
@@ -423,7 +453,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME132" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME132" :title="tooltip" style="position: relative;left:1280px;top:-700px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME132" :title="tooltip" style="position: relative;left:1280px;top:-780px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME132+fang" class="fang"/>-->
<div :id="OPNAME132+circle" class="circle" style="margin-left: 13px"/>
@@ -433,7 +463,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME133" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME133" :title="tooltip" style="position: relative;left:1283px;top:-697px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME133" :title="tooltip" style="position: relative;left:1283px;top:-777px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME133+fang" class="fang"/>-->
<div :id="OPNAME133+circle" class="circle" style="margin-left: 10px"/>
@@ -441,9 +471,19 @@
</el-row>
</div>
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME1331" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME1331" :title="tooltip" style="position: relative;left:1283px;top:-777px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME1331+fang" class="fang"/>-->
<div :id="OPNAME1331+circle" class="circle" style="margin-left: 10px"/>
<div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME1331 }}</div>
</el-row>
</div>
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME134" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME134" :title="tooltip" style="position: relative;left:1280px;top:-605px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME134" :title="tooltip" style="position: relative;left:1280px;top:-705px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME134+fang" class="fang"/>-->
<div :id="OPNAME134+circle" class="circle" style="margin-left: 13px"/>
@@ -453,7 +493,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME135" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME135" :title="tooltip" style="position: relative;left:1280px;top:-590px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME135" :title="tooltip" style="position: relative;left:1280px;top:-630px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME135+fang" class="fang"/>-->
<div :id="OPNAME135+circle" class="circle" style="margin-left: 13px"/>
@@ -463,7 +503,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME146" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME146" :title="tooltip" style="position: relative;left:1460px;top:-1057px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME146" :title="tooltip" style="position: relative;left:1460px;top:-1167px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME135+fang" class="fang"/>-->
<!--<div :id="OPNAME146+circle" class="circle" style="margin-left: 13px"/>-->
@@ -473,7 +513,7 @@
</el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME148" placement="top" @mouseover.native.prevent="changeActive($event)">
<div slot="content">{{ tooltip1 }}<br>{{ tooltip2 }}<br>{{ tooltip3 }}<br>单击查看MES系统</div>
<div :id="OPNAME148" :title="tooltip" style="position: relative;left:1578px;top:-1085px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<div :id="OPNAME148" :title="tooltip" style="position: relative;left:1578px;top:-1195px; width: 100px;height: 28px;" @click="opclickshowPanel($event)">
<el-row>
<!--<div :id="OPNAME135+fang" class="fang"/>-->
<!--<div :id="OPNAME148+circle" class="circle" style="margin-left: 13px"/>-->
@@ -493,7 +533,7 @@
</el-tooltip>
<el-tooltip :id="机床总装" placement="bottom" @mouseover.native.prevent="changeActive($event)">
<div slot="content" style="max-height: 200px;overflow: auto" v-html="returns1"/>
<div :title="tooltip" style="position: relative;left:520px;top:-1170px; width: 100px;height: 28px;">
<div :title="tooltip" style="position: relative;left:520px;top:-1280px; width: 100px;height: 28px;">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ 机床总装 }}</div>
</el-row>
@@ -501,7 +541,7 @@
</el-tooltip>
<el-tooltip :id="部件装配" placement="bottom" @mouseover.native.prevent="changeActive($event)">
<div slot="content" style="max-height: 200px;overflow: auto" v-html="returns2"/>
<div :title="tooltip" style="position: relative;left:660px;top:-1198px; width: 100px;height: 28px;">
<div :title="tooltip" style="position: relative;left:660px;top:-1308px; width: 100px;height: 28px;">
<el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ 部件装配 }}</div>
</el-row>
@@ -536,9 +576,11 @@ export default {
OPNAME104: 'OP1040',
OPNAME105: 'OP1050',
OPNAME106: 'OP1060',
OPNAME1061: 'OP1061',
OPNAME107: 'OP1070',
OPNAME108: 'OP1080',
OPNAME109: 'OP1090',
OPNAME1091: 'OP1091',
OPNAME110: 'OP1100',
OPNAME111: 'OP1110',
OPNAME112: 'OP1120',
@@ -563,6 +605,7 @@ export default {
OPNAME131: 'OP1310',
OPNAME132: 'OP1320',
OPNAME133: 'OP1330',
OPNAME1331: 'OP1331',
OPNAME134: 'OP1340',
OPNAME135: 'OP1350',
OPNAME136: 'OP1360',
@@ -579,6 +622,7 @@ export default {
OPNAME147: 'OP1470',
OPNAME148: 'OP1480',
OPNAME149: 'OP1490',
OPNAME150: 'OP1500',
timer: null,
opname: ''
}
@@ -873,7 +917,7 @@ export default {
width: 1690px;
height: 830px;
/*border: 1px solid red;*/
background: url('../../../assets/img/img26.jpg') repeat;
background: url('../../../assets/img/StationLayout.jpg') repeat;
background-repeat:no-repeat;
background-size:100% 100%;-moz-background-size:100% 100%;
overflow: hidden;

21
src/views/ManufacturingCenter/InitialProduction/index.vue
View File

@@ -183,6 +183,9 @@
<el-tooltip :open-delay="1200" effect="dark" content="选中零件进行备料投产" placement="top">
<el-button :loading="listLoading3" type="success" size="small" style="float:right;" @click="production10">备料投产</el-button>
</el-tooltip>
<el-tooltip :open-delay="1200" effect="dark" content="将零件加急处理" placement="top">
<el-checkbox v-model="checked_UrgentItem" style="float:right;margin-top:10px;margin-right:10px">是否加急</el-checkbox>
</el-tooltip>
<el-tooltip :open-delay="1200" effect="dark" content="将不同组号中相同图号的零件合并" placement="top">
<el-checkbox v-model="checked_hebing" style="float:right;margin-top:10px;margin-right:10px">合并生产</el-checkbox>
</el-tooltip>
@@ -351,6 +354,8 @@ export default {
data() {
return {
checked_hebing: true,
checked_UrgentItem: false,
UrgentItem: 0,
maxmax: '',
clearTable: 0,
readonly: true,
@@ -874,6 +879,7 @@ export default {
// 投产
production() {
this.result = 0
this.UrgentItem = 0
if (this.time_machiningFinish === '' || this.time_machiningFinish === null) {
this.$message.error('请输入加工结束时间')
} else {
@@ -886,6 +892,9 @@ export default {
if (this.multipleSelection.length === 0) {
this.$message.error('请至少选择一个零件')
} else {
if (this.checked_UrgentItem === true) {
this.UrgentItem = 1
}
if (this.checked_hebing === true) {
this.listLoading3 = true
for (let i = 0; i < this.multipleSelection.length; i++) {
@@ -914,7 +923,7 @@ export default {
} else {
this.checked_baitu = 1
}
production2(this.multipleSelection[i].零件图号, this.multipleSelection[i].规格, this.toolNumValue, this.multipleSelection[i].数据类型, this.multipleSelection[i].投产总数量, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time_machiningFinish, this.time_planStart, this.multipleSelection[i].checked_waixie, this.multipleSelection[i].checked_dailiao, this.id, this.multipleSelection[i].材料流水号, this.radio, this.checked_gaonandu, this.multipleSelection[i].checked_zhaoji, this.checked_baitu).then(response => {
production2(this.multipleSelection[i].零件图号, this.multipleSelection[i].规格, this.toolNumValue, this.multipleSelection[i].数据类型, this.multipleSelection[i].投产总数量, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time_machiningFinish, this.time_planStart, this.multipleSelection[i].checked_waixie, this.multipleSelection[i].checked_dailiao, this.id, this.multipleSelection[i].材料流水号, this.radio, this.checked_gaonandu, this.multipleSelection[i].checked_zhaoji, this.checked_baitu, this.UrgentItem).then(response => {
this.result += parseInt(response.data[0].result)
if (this.result === this.multipleSelection.length) {
this.$message.success('投产成功')
@@ -962,7 +971,7 @@ export default {
} else {
this.checked_baitu = 1
}
production(this.multipleSelection[i].组件零件基本件流水号, this.multipleSelection[i].投产类型流水号, this.multipleSelection[i].数据类型, this.multipleSelection[i].投产总数量, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time_machiningFinish, this.time_planStart, this.multipleSelection[i].checked_waixie, this.multipleSelection[i].checked_dailiao, this.id, this.multipleSelection[i].材料流水号, this.radio, this.checked_gaonandu, this.multipleSelection[i].checked_zhaoji, this.checked_baitu).then(response => {
production(this.multipleSelection[i].组件零件基本件流水号, this.multipleSelection[i].投产类型流水号, this.multipleSelection[i].数据类型, this.multipleSelection[i].投产总数量, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time_machiningFinish, this.time_planStart, this.multipleSelection[i].checked_waixie, this.multipleSelection[i].checked_dailiao, this.id, this.multipleSelection[i].材料流水号, this.radio, this.checked_gaonandu, this.multipleSelection[i].checked_zhaoji, this.checked_baitu, this.UrgentItem).then(response => {
this.result += parseInt(response.data[0].result)
if (this.result === this.multipleSelection.length) {
this.$message.success('投产成功')
@@ -990,6 +999,7 @@ export default {
// 备料投产
production10() {
this.result = 0
this.UrgentItem = 0
if (this.time_machiningFinish === '' || this.time_machiningFinish === null) {
this.$message.error('请输入加工结束时间')
} else {
@@ -1002,6 +1012,9 @@ export default {
if (this.multipleSelection.length === 0) {
this.$message.error('请至少选择一个零件')
} else {
if (this.checked_UrgentItem === true) {
this.UrgentItem = 1
}
if (this.checked_hebing === true) {
this.listLoading3 = true
for (let i = 0; i < this.multipleSelection.length; i++) {
@@ -1030,7 +1043,7 @@ export default {
} else {
this.checked_baitu = 1
}
production20(this.multipleSelection[i].零件图号, this.multipleSelection[i].规格, this.toolNumValue, this.multipleSelection[i].数据类型, this.multipleSelection[i].投产总数量, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time_machiningFinish, this.time_planStart, this.multipleSelection[i].checked_waixie, this.multipleSelection[i].checked_dailiao, this.id, this.multipleSelection[i].材料流水号, this.radio, this.checked_gaonandu, this.multipleSelection[i].checked_zhaoji, this.checked_baitu).then(response => {
production20(this.multipleSelection[i].零件图号, this.multipleSelection[i].规格, this.toolNumValue, this.multipleSelection[i].数据类型, this.multipleSelection[i].投产总数量, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time_machiningFinish, this.time_planStart, this.multipleSelection[i].checked_waixie, this.multipleSelection[i].checked_dailiao, this.id, this.multipleSelection[i].材料流水号, this.radio, this.checked_gaonandu, this.multipleSelection[i].checked_zhaoji, this.checked_baitu, this.UrgentItem).then(response => {
this.result += parseInt(response.data[0].result)
if (this.result === this.multipleSelection.length) {
this.$message.success('投产成功')
@@ -1078,7 +1091,7 @@ export default {
} else {
this.checked_baitu = 1
}
production10(this.multipleSelection[i].组件零件基本件流水号, this.multipleSelection[i].投产类型流水号, this.multipleSelection[i].数据类型, this.multipleSelection[i].投产总数量, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time_machiningFinish, this.time_planStart, this.multipleSelection[i].checked_waixie, this.multipleSelection[i].checked_dailiao, this.id, this.multipleSelection[i].材料流水号, this.radio, this.checked_gaonandu, this.multipleSelection[i].checked_zhaoji, this.checked_baitu).then(response => {
production10(this.multipleSelection[i].组件零件基本件流水号, this.multipleSelection[i].投产类型流水号, this.multipleSelection[i].数据类型, this.multipleSelection[i].投产总数量, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time_machiningFinish, this.time_planStart, this.multipleSelection[i].checked_waixie, this.multipleSelection[i].checked_dailiao, this.id, this.multipleSelection[i].材料流水号, this.radio, this.checked_gaonandu, this.multipleSelection[i].checked_zhaoji, this.checked_baitu, this.UrgentItem).then(response => {
this.result += parseInt(response.data[0].result)
if (this.result === this.multipleSelection.length) {
this.$message.success('投产成功')

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

@@ -20,7 +20,7 @@
</el-select>
<el-input v-model="Partpaint" placeholder="零件号" clearable size="small" style="width: 180px;margin:0px 10px;"/>
<el-button type="success" class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 50;getTableData()">查询</el-button>
<el-button :disabled="Name===1" type="success" class="el-icon-search" size="small" style="margin-left: 220px;" @click="submit">完成</el-button>
<el-button :disabled="Name===1" type="success" class="el-icon-finished" size="small" style="margin-left: 220px;background-color: green" @click="submit">完成</el-button>
</el-card>
<el-row>
<el-card style="width: 50%; float: left">

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

@@ -47,7 +47,7 @@
{{ scope.row.修补准结工时 }}
</template>
</el-table-column>
<el-table-column align="center" label="实际工时" width="80px">
<el-table-column align="center" label="加工工时" width="80px">
<template slot-scope="scope">
{{ scope.row.设备工时 }}
</template>
@@ -67,7 +67,7 @@
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column align="center" label="日期" width="100px">
<el-table-column align="center" label="加工日期" width="100px">
<template slot-scope="scope">
{{ scope.row.操作时间.substr(0,10) }}
</template>
@@ -132,8 +132,8 @@ export default {
return
}
import('@/vendor/Export2Excel').then(excel => {
const tHeader = ['姓名', '图号', '跟单号', '序号', '工序名称', '录入准结工时', '实际工时', '合格数', '不合格数', '备注', '日期', '计划准结工时', '计划定额工时', '项目名称', '机床图号', '组号', '设计', '材料']
const filterVal = ['姓名', '零件图号_短', '跟单号', '工序顺序', '工艺名称', '修补准结工时', '设备工时', '合格数', '不合格数', '备注', '操作时间', '准结定额工时', '单件定额工时', '项目名称', '机床图号', '组号', '设计者', '材料']
const tHeader = ['日期', '姓名', '图号', '跟单号', '序号', '工序名称', '录入准结工时', '实际工时', '合格数', '不合格数', '备注', '计划准结工时', '计划定额工时', '项目名称', '机床图号', '组号', '设计', '材料']
const filterVal = ['操作时间', '姓名', '零件图号_短', '跟单号', '工序顺序', '工艺名称', '修补准结工时', '设备工时', '合格数', '不合格数', '备注', '准结定额工时', '单件定额工时', '项目名称', '机床图号', '组号', '设计者', '材料']
const list = this.tableData
const data = this.formatJson(filterVal, list)
excel.export_json_to_excel({

188
src/views/ManufacturingCenter/PartAssignment/index.vue
View File

@@ -95,6 +95,16 @@
{{ scope.row.机床数量 }}
</template>
</el-table-column>
<el-table-column label="零件总数量" align="center" width="90px">
<template slot-scope="scope">
{{ scope.row.总数量 }}
</template>
</el-table-column>
<el-table-column label="投产总数量" align="center" width="115px">
<template slot-scope="scope">
<el-input-number v-model="scope.row.投产总数量" :min="0" size="mini" style="width: 90px"/>
</template>
</el-table-column>
<el-table-column label="备注" align="center" width="90px">
<template slot-scope="scope">
{{ scope.row.零件备注 }}
@@ -140,6 +150,16 @@
{{ scope.row.机床数量 }}
</template>
</el-table-column>
<el-table-column label="零件总数量" align="center" width="90px">
<template slot-scope="scope">
{{ scope.row.总数量 }}
</template>
</el-table-column>
<el-table-column label="采购总数量" align="center" width="115px">
<template slot-scope="scope">
<el-input-number v-model="scope.row.采购总数量" :min="0" size="mini" style="width: 90px"/>
</template>
</el-table-column>
<el-table-column label="备注" align="center" width="120">
<template slot-scope="scope">
{{ scope.row.备注 }}
@@ -180,6 +200,16 @@
{{ scope.row.机床数量 }}
</template>
</el-table-column>
<el-table-column label="零件总数量" align="center" width="90px">
<template slot-scope="scope">
{{ scope.row.总数量 }}
</template>
</el-table-column>
<el-table-column label="采购总数量" align="center" width="115px">
<template slot-scope="scope">
<el-input-number v-model="scope.row.采购总数量" :min="0" size="mini" style="width: 90px"/>
</template>
</el-table-column>
<el-table-column label="备注" align="center" width="120">
<template slot-scope="scope">
{{ scope.row.备注 }}
@@ -601,6 +631,7 @@ export default {
MaterialSpecification: [],
MaterialModel: [],
NumberOfParts: [],
multipleSelection: [],
ReMarks: [],
projectName: '',
MachineToolNumber: '',
@@ -1113,67 +1144,29 @@ export default {
})
},
handleSelectionChange(val) {
if (this.PartType === '基本件') {
this.MaterialNum = []
this.BasicPartsNumber = []
this.MaterialName = []
this.PartToolNumber = []
this.Material = []
this.NumberOfParts = []
for (let i = 0; i < val.length; i++) {
this.MaterialNum[i] = val[i].物料流水号
this.BasicPartsNumber[i] = val[i].基本件流水号
this.MaterialName[i] = val[i].零件名称
this.PartToolNumber[i] = val[i].零件图号
this.Material[i] = val[i].材料
this.NumberOfParts[i] = val[i].零件数量
this.ReMarks[i] = val[i].零件备注
}
console.log(this.NumberOfParts, 1111)
} else if (this.PartType === '外购件') {
this.MaterialNum = []
this.MaterialCode = []
this.StandardPartsAndOutsourcing = []
this.MaterialName = []
this.MaterialSpecification = []
this.MaterialModel = []
this.NumberOfParts = []
for (let i = 0; i < val.length; i++) {
this.StandardPartsAndOutsourcing[i] = val[i].标准件和外购件流水号
this.MaterialNum[i] = val[i].物料流水号
this.MaterialCode[i] = val[i].物料代码
this.MaterialName[i] = val[i].物料名称
this.MaterialSpecification[i] = val[i].物料规格
this.MaterialModel[i] = val[i].物料型号
this.NumberOfParts[i] = val[i].零件数量
this.ReMarks[i] = val[i].备注
}
} else if (this.PartType === '标准件') {
this.MaterialNum = []
this.MaterialCode = []
this.StandardPartsAndOutsourcing = []
this.MaterialName = []
this.MaterialSpecification = []
this.MaterialModel = []
this.NumberOfParts = []
for (let i = 0; i < val.length; i++) {
this.StandardPartsAndOutsourcing[i] = val[i].标准件和外购件流水号
this.MaterialNum[i] = val[i].物料流水号
this.MaterialCode[i] = val[i].物料代码
this.MaterialName[i] = val[i].物料名称
this.MaterialSpecification[i] = val[i].物料规格
this.MaterialModel[i] = val[i].物料型号
this.NumberOfParts[i] = val[i].零件数量
this.ReMarks[i] = val[i].备注
}
}
this.multipleSelection = val
},
purchaseRequisition() {
if (this.RequisitionList !== '') {
if (this.time !== '' && this.time !== null) {
if (this.BasicPartsNumber.length !== 0 || this.StandardPartsAndOutsourcing.length !== 0) {
if (this.multipleSelection.length !== 0) {
this.result = 0
if (this.PartType === '基本件') {
this.MaterialNum = []
this.BasicPartsNumber = []
this.MaterialName = []
this.PartToolNumber = []
this.Material = []
this.NumberOfParts = []
for (let i = 0; i < this.multipleSelection.length; i++) {
this.MaterialNum[i] = this.multipleSelection[i].物料流水号
this.BasicPartsNumber[i] = this.multipleSelection[i].基本件流水号
this.MaterialName[i] = this.multipleSelection[i].零件名称
this.PartToolNumber[i] = this.multipleSelection[i].零件图号
this.Material[i] = this.multipleSelection[i].材料
this.NumberOfParts[i] = this.multipleSelection[i].投产总数量
this.ReMarks[i] = this.multipleSelection[i].零件备注
}
for (let i = 0; i < this.BasicPartsNumber.length; i++) {
purchaseRequisition(this.RequisitionList, this.projectName, this.projectFloatValue, this.MachineToolNumber, this.machineFloatValue, this.groupName, this.groupFloatValue, this.BasicPartsNumber[i], this.MaterialName[i], this.PartToolNumber[i], this.Material[i], this.NumberOfParts[i], 3, this.time, this.MaterialNum[i], this.ReMarks[i]).then(response => {
this.result += parseInt(response.data[0].result)
@@ -1204,6 +1197,23 @@ export default {
})
}
} else if (this.PartType === '外购件') {
this.MaterialNum = []
this.MaterialCode = []
this.StandardPartsAndOutsourcing = []
this.MaterialName = []
this.MaterialSpecification = []
this.MaterialModel = []
this.NumberOfParts = []
for (let i = 0; i < this.multipleSelection.length; i++) {
this.StandardPartsAndOutsourcing[i] = this.multipleSelection[i].标准件和外购件流水号
this.MaterialNum[i] = this.multipleSelection[i].物料流水号
this.MaterialCode[i] = this.multipleSelection[i].物料代码
this.MaterialName[i] = this.multipleSelection[i].物料名称
this.MaterialSpecification[i] = this.multipleSelection[i].物料规格
this.MaterialModel[i] = this.multipleSelection[i].物料型号
this.NumberOfParts[i] = this.multipleSelection[i].采购总数量
this.ReMarks[i] = this.multipleSelection[i].备注
}
for (let i = 0; i < this.StandardPartsAndOutsourcing.length; i++) {
purchaseRequisition1(this.RequisitionList, this.projectName, this.projectFloatValue, this.MachineToolNumber, this.machineFloatValue, this.groupName, this.groupFloatValue, this.StandardPartsAndOutsourcing[i], this.MaterialName[i], this.MaterialCode[i], this.MaterialSpecification[i], this.MaterialModel[i], this.NumberOfParts[i], 2, this.time, this.MaterialNum[i], this.ReMarks[i]).then(response => {
this.result += parseInt(response.data[0].result)
@@ -1234,6 +1244,23 @@ export default {
})
}
} else if (this.PartType === '标准件') {
this.MaterialNum = []
this.MaterialCode = []
this.StandardPartsAndOutsourcing = []
this.MaterialName = []
this.MaterialSpecification = []
this.MaterialModel = []
this.NumberOfParts = []
for (let i = 0; i < this.multipleSelection.length; i++) {
this.StandardPartsAndOutsourcing[i] = this.multipleSelection[i].标准件和外购件流水号
this.MaterialNum[i] = this.multipleSelection[i].物料流水号
this.MaterialCode[i] = this.multipleSelection[i].物料代码
this.MaterialName[i] = this.multipleSelection[i].物料名称
this.MaterialSpecification[i] = this.multipleSelection[i].物料规格
this.MaterialModel[i] = this.multipleSelection[i].物料型号
this.NumberOfParts[i] = this.multipleSelection[i].采购总数量
this.ReMarks[i] = this.multipleSelection[i].备注
}
for (let i = 0; i < this.StandardPartsAndOutsourcing.length; i++) {
purchaseRequisition1(this.RequisitionList, this.projectName, this.projectFloatValue, this.MachineToolNumber, this.machineFloatValue, this.groupName, this.groupFloatValue, this.StandardPartsAndOutsourcing[i], this.MaterialName[i], this.MaterialCode[i], this.MaterialSpecification[i], this.MaterialModel[i], this.NumberOfParts[i], 1, this.time, this.MaterialNum[i], this.ReMarks[i]).then(response => {
this.result += parseInt(response.data[0].result)
@@ -1276,8 +1303,23 @@ export default {
},
PurchasingDepartment() {
if (this.time !== '' && this.time !== null) {
if (this.BasicPartsNumber.length !== 0 || this.StandardPartsAndOutsourcing.length !== 0) {
if (this.multipleSelection.length !== 0) {
if (this.PartType === '基本件') {
this.MaterialNum = []
this.BasicPartsNumber = []
this.MaterialName = []
this.PartToolNumber = []
this.Material = []
this.NumberOfParts = []
for (let i = 0; i < this.multipleSelection.length; i++) {
this.MaterialNum[i] = this.multipleSelection[i].物料流水号
this.BasicPartsNumber[i] = this.multipleSelection[i].基本件流水号
this.MaterialName[i] = this.multipleSelection[i].零件名称
this.PartToolNumber[i] = this.multipleSelection[i].零件图号
this.Material[i] = this.multipleSelection[i].材料
this.NumberOfParts[i] = this.multipleSelection[i].投产总数量
this.ReMarks[i] = this.multipleSelection[i].零件备注
}
purchaseRequisition2(this.projectFloatValue, this.machineFloatValue, this.groupFloatValue, this.BasicPartsNumber, this.NumberOfParts, this.time).then(response => {
if (response.data[0].result !== '0') {
console.log(response.data[0].result)
@@ -1290,6 +1332,23 @@ export default {
}
})
} else {
this.MaterialNum = []
this.MaterialCode = []
this.StandardPartsAndOutsourcing = []
this.MaterialName = []
this.MaterialSpecification = []
this.MaterialModel = []
this.NumberOfParts = []
for (let i = 0; i < this.multipleSelection.length; i++) {
this.StandardPartsAndOutsourcing[i] = this.multipleSelection[i].标准件和外购件流水号
this.MaterialNum[i] = this.multipleSelection[i].物料流水号
this.MaterialCode[i] = this.multipleSelection[i].物料代码
this.MaterialName[i] = this.multipleSelection[i].物料名称
this.MaterialSpecification[i] = this.multipleSelection[i].物料规格
this.MaterialModel[i] = this.multipleSelection[i].物料型号
this.NumberOfParts[i] = this.multipleSelection[i].采购总数量
this.ReMarks[i] = this.multipleSelection[i].备注
}
PurchasingDepartment(this.groupFloatValue, this.StandardPartsAndOutsourcing, this.time, this.MaterialNum, this.NumberOfParts, this.projectFloatValue, this.machineFloatValue).then(response => {
if (response.data[0].result !== '0') {
this.$message.success('请购成功')
@@ -1315,7 +1374,22 @@ export default {
}
},
Production() {
if (this.PartType === '基本件' && this.BasicPartsNumber.length !== 0) {
if (this.PartType === '基本件' && this.multipleSelection.length !== 0) {
this.MaterialNum = []
this.BasicPartsNumber = []
this.MaterialName = []
this.PartToolNumber = []
this.Material = []
this.NumberOfParts = []
for (let i = 0; i < this.multipleSelection.length; i++) {
this.MaterialNum[i] = this.multipleSelection[i].物料流水号
this.BasicPartsNumber[i] = this.multipleSelection[i].基本件流水号
this.MaterialName[i] = this.multipleSelection[i].零件名称
this.PartToolNumber[i] = this.multipleSelection[i].零件图号
this.Material[i] = this.multipleSelection[i].材料
this.NumberOfParts[i] = this.multipleSelection[i].投产总数量
this.ReMarks[i] = this.multipleSelection[i].零件备注
}
Production(this.groupFloatValue, this.BasicPartsNumber, this.NumberOfParts, this.projectFloatValue, this.machineFloatValue).then(response => {
if (response.data[0].result !== '0') {
this.$message.success('投产成功')

22
src/views/ManufacturingCenter/ProcessPlanningNew/index.vue
View File

@@ -532,6 +532,7 @@ import {
getPartnames3,
getPartnames4,
modifyRemark,
insertOne1,
detailInfo
} from '@/api/ManufacturingCenter/ProcessPlanningNew'
import elInput from 'element-ui/packages/input'
@@ -697,6 +698,7 @@ export default {
result: 0,
oldNum: '',
newNum: '',
工艺是否更改: '',
// tableRecord: [],
materialName2: '',
material2: ''
@@ -1130,7 +1132,8 @@ export default {
label: response.data[i].零件图号,
value: response.data[i].工艺计划流水号,
machine: response.data[i].机床图号,
group: response.data[i].组号
group: response.data[i].组号,
update: response.data[i].工艺是否更改
})
}
})
@@ -1203,6 +1206,7 @@ export default {
this.material = response.data[0].材料流水号
this.materialName = response.data[0].材料
this.spec = response.data[0].原材料规格
this.工艺是否更改 = response.data[0].工艺是否更改
if (response.data[0].重量 === null) {
this.weight = ''
} else {
@@ -1509,13 +1513,13 @@ export default {
let 零件图号
let flag = 0
for (let i = 0; i < this.tableData.length; i++) {
saveApprove(this.tableData[i].工艺计划流水号, this.tableData[i].工艺编号, this.tableData[i].工艺要求, this.spec, this.tableData[i].工序顺序, this.tableData[i].工序间是否外协, this.tableData[i].工序流水号, this.material, '', '', this.CraftmenValue, this.tableData[i].工艺难度等级).then(() => {
saveApprove(this.tableData[i].工艺计划流水号, this.tableData[i].工艺编号, this.tableData[i].工艺要求, this.spec, this.tableData[i].工序顺序, this.tableData[i].工序间是否外协, this.tableData[i].工序流水号, this.material, '', '', this.CraftmenValue, this.tableData[i].工艺难度等级, this.工艺是否更改).then(() => {
for (let j = 0; j < this.partNum.length; j++) {
if (this.partNum[j].value === this.partNumValue) {
零件图号 = this.partNum[j].label
}
}
TableAddLi(this.tableData[i].单件定额工时, this.tableData[i].准结定额工时, 零件图号, this.tableData[i].工序流水号, this.tableData[i].工艺计划流水号).then(() => {
TableAddLi(this.tableData[i].单件定额工时, this.tableData[i].准结定额工时, 零件图号, this.tableData[i].工序流水号, this.tableData[i].工艺计划流水号, this.tableData[i].是否加序).then(() => {
flag++
if (flag === this.tableData.length) {
TableAddLi1(this.partNumValue, this.CraftmenValue).then(() => {
@@ -1544,9 +1548,15 @@ export default {
if (this.partNumValue === '') {
this.$message.error('请先选择一个零件')
} else {
insertOne(this.partNumValue, row.工序流水号).then(response => {
this.searchDetail()
})
if (this.工艺是否更改 === 1) {
insertOne1(this.partNumValue, row.工序流水号).then(response => {
this.searchDetail()
})
} else {
insertOne(this.partNumValue, row.工序流水号).then(response => {
this.searchDetail()
})
}
}
},
deleteOne(row) { // 删除行

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

@@ -30,6 +30,7 @@
<el-table
ref="multipleTable"
:data="tableData"
:row-class-name="tableRowClassName"
style="width: 1000px;"
size="mini"
height="750"
@@ -300,6 +301,7 @@ export default {
数量: response.data.rows[i].批次数量,
投产时间: response.data.rows[i].操作时间,
规格: response.data.rows[i].规格,
是否加急: response.data.rows[i].是否加急,
工艺员: '',
人员编号: '',
工艺计划流水号: response.data.rows[i].工艺计划流水号
@@ -318,6 +320,8 @@ export default {
工艺结束时间: response.data.rows[i].工艺计划结束时间,
数量: response.data.rows[i].批次数量,
投产时间: response.data.rows[i].操作时间,
规格: response.data.rows[i].规格,
是否加急: response.data.rows[i].是否加急,
工艺员: '',
人员编号: '',
工艺计划流水号: response.data.rows[i].工艺计划流水号
@@ -384,6 +388,12 @@ export default {
}
}
},
tableRowClassName({ row }) {
console.log(row.是否加急)
if (row.是否加急 === '1') {
return 'UrgentItem'
}
},
// 直接保存工艺
currency() {
if (this.multipleSelection.length === 0) {
@@ -433,3 +443,8 @@ export default {
margin-right: 10px;
}
</style>
<style>
.el-table .UrgentItem{
background: #ff7575;
}
</style>

151
src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
View File

@@ -1,7 +1,8 @@
<template>
<div class="app-container">
<el-card>
<el-button :disabled="isShow" type="info" size="small" style="margin: 0px 180px;float: right" @click="EditData">补录完成日期</el-button>
<!--<el-button :disabled="isShow" type="info" size="small" style="margin: 0px 180px;float: right" @click="EditData">补录完成日期</el-button>-->
<el-button :disabled="isDisabled" type="info" size="small" style="margin: 0px 180px;float: right" @click="EditConfirmNum">修改完成数量</el-button>
<el-select v-model="Machine" filterable clearable size="small" style="margin:0px 10px 0px 10px;width: 185px;" placeholder="机床号" @change="getGroup">
<el-option
v-for="item in Machines"
@@ -35,13 +36,18 @@
highlight-current-row
empty-text=" "
border
@current-change="getRow">
@row-click="getRow">
<el-table-column type="index" label="序号" width="50"/>
<el-table-column align="center" label="工艺名" show-overflow-tooltip min-width="70">
<template slot-scope="scope">
{{ scope.row.工艺名称 }}
</template>
</el-table-column>
<!--<el-table-column align="center" label="已完数量" show-overflow-tooltip min-width="70">-->
<!--<template slot-scope="scope">-->
<!--{{ scope.row.完成数量 }}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column align="center" label="质检" width="60">
<template slot-scope="scope">
{{ scope.row.序间质检 }}
@@ -57,11 +63,6 @@
{{ scope.row.操作者 }}
</template>
</el-table-column>
<!-- <el-table-column align="center" label="排产日期" width="95">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.排产日期 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column align="center" label="完成日期" width="95">
<template slot-scope="scope">
{{ scope.row.完成日期 }}
@@ -80,17 +81,12 @@
highlight-current-row
border
height="630"
@current-change="getCurrentRow">
@row-click="getCurrentRow">
<el-table-column type="index" align="center" label="跟单号" width="140">
<template slot-scope="scope">
<el-radio :label="scope.row.跟单号" v-model="radio"/>
</template>
</el-table-column>
<!-- <el-table-column align="center" label="跟单号" width="80">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.跟单号 }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column align="center" label="零件图号" show-overflow-tooltip width="200">
<template slot-scope="scope">
{{ scope.row.零件图号 }}
@@ -121,7 +117,7 @@
{{ scope.row.计划结束时间 }}
</template>
</el-table-column>
<el-table-column align="center" label="用户名称" show-overflow-tooltip width="110">
<el-table-column align="center" label="用户名称" show-overflow-tooltip min-width="110">
<template slot-scope="scope">
{{ scope.row.客户名称 }}
</template>
@@ -207,11 +203,39 @@
<el-button style="margin-left: 260px" @click="dialogFormVisible1 = false">取消</el-button>
<el-button type="primary" style="margin-top: 20px" @click="getName">确认</el-button>
</el-dialog>
<el-dialog :visible.sync="dialogFormVisible2" title="修改完成数量" center style="min-height: 300px" width="400px">
<el-form ref="form2" :model="form2" :rules="rules" label-position="left" label-width="90px" class="demo-ruleForm">
<el-row width="200px">
<el-form-item label="操作者：" prop="操作者" >
<el-select v-model="form2.操作者" filterable style="width: 200px" placeholder="无" @change="czzChange">
<el-option
v-for="item in 操作者"
: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>
</el-form-item>
</el-row>
<el-row width="200px">
<el-form-item label="数量：" prop="数量" >
<el-input-number :min="0" :max="max" v-model="form2.数量" placeholder="数量" style="width: 200px"/>
</el-form-item>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible2=false">取消</el-button>
<el-button type="primary" @click="submit2('form')" >确定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { getMachines, getGroups, getTable, gettabledata1, getTree, fn, getTable8, submitEdit, getExport } from '@/api/ManufacturingCenter/ProcessingStatusNew'
import { getMachines, getGroups, getTable, gettabledata1, getTree, fn, getTable8, submitEdit, getExport, searchWorkTime, submit2 } from '@/api/ManufacturingCenter/ProcessingStatusNew'
import Cookie from 'js-cookie'
export default {
@@ -257,7 +281,15 @@ export default {
ssks: '',
Number1: '', // 人员编号
row2: [],
khbmbh: ''
khbmbh: '',
isDisabled: true,
dialogFormVisible2: false,
form2: {
操作者: '',
数量: ''
},
操作者: [],
max: 0
}
},
created() {
@@ -265,6 +297,43 @@ export default {
this.getTable9()
},
methods: {
EditConfirmNum() {
this.form2.数量 = 0
this.操作者 = []
searchWorkTime(this.processSerialNumber).then(response => {
if (response.data.length !== 0) {
for (let i = 0; i < response.data.length; i++) {
this.操作者.push({
label: response.data[i].姓名,
value: response.data[i].人员编号,
value2: '完成数量:' + response.data[i].完成数量,
value3: response.data[i].批次数量
})
}
if (this.操作者.length !== 0) {
this.form2.操作者 = parseInt(this.操作者[0].value)
this.max = parseInt(this.操作者[0].value3) - 1
}
this.dialogFormVisible2 = true
} else {
this.$message.error('该工序暂无完成信息')
}
})
},
czzChange() {
for (let i = 0; i < this.操作者.length; i++) {
if (this.操作者[i].value === this.form2.操作者) {
this.form2.数量 = 0
this.max = parseInt(this.操作者[i].value3)
}
}
},
submit2() {
submit2(this.processSerialNumber, this.form2.数量, this.form2.操作者).then(response => {
this.getCurrentRow2(this.row2)
this.dialogFormVisible2 = false
})
},
formatJson(filterVal, jsonData) {
return jsonData.map(v => filterVal.map(j => {
return v[j]
@@ -353,6 +422,8 @@ export default {
}, // 按条件查询
getTableData() {
this.tableData = []
this.tableData1 = []
this.isDisabled = true
this.Loading = true
if (this.Machine === '') {
this.checkbox_Machine = 0
@@ -390,16 +461,18 @@ export default {
this.total = response.data.total
this.loading = false
})
}, // 获取工序表
},
// 获取工序表
getCurrentRow(row) {
this.isDisabled = true
this.completeTime = ''
this.dateOfProduction = ''
this.processSerialNumber = ''
this.radio = true
this.tableData1 = []
this.row2 = row
gettabledata1(row.工艺计划流水号).then(response => {
console.log(response, 1212121)
this.row2 = row.工艺计划流水号
gettabledata1(this.row2).then(response => {
console.log(response.data)
if (response.data.length !== 0) {
for (let i = 0; i < response.data.length; i++) {
this.tableData1.push({
@@ -411,12 +484,40 @@ export default {
不合格数量: response.data[i].不合格数量,
质检数量: response.data[i].数量,
工序流水号: response.data[i].工序流水号,
工序状态: response.data[i].工序状态
工序状态: response.data[i].工序状态,
完成数量: response.data[i].完成数量
})
}
}
})
}, // 补加完成日期
},
getCurrentRow2(row) {
this.isDisabled = true
this.completeTime = ''
this.dateOfProduction = ''
this.processSerialNumber = ''
this.radio = true
this.tableData1 = []
gettabledata1(this.row2).then(response => {
if (response.data.length !== 0) {
for (let i = 0; i < response.data.length; i++) {
this.tableData1.push({
工艺名称: response.data[i].工艺名称,
序间质检: response.data[i].质检结果,
排产日期: response.data[i].排产时间 ? response.data[i].排产时间.split(' ')[0] : '',
完成日期: response.data[i].工序完成日期 ? response.data[i].工序完成日期.split(' ')[0] : '',
操作者: response.data[i].操作者,
不合格数量: response.data[i].不合格数量,
质检数量: response.data[i].数量,
工序流水号: response.data[i].工序流水号,
工序状态: response.data[i].工序状态,
完成数量: response.data[i].完成数量
})
}
}
})
},
// 补加完成日期
EditData() {
this.dialogFormVisible = true
this.form.人员 = ''
@@ -427,11 +528,7 @@ export default {
this.completeTime = row.完成日期
this.dateOfProduction = row.排产日期
this.processSerialNumber = row.工序流水号
if (this.completeTime === '' && this.dateOfProduction !== '') {
this.isShow = false
} else {
this.isShow = true
}
if (this.processSerialNumber) { this.isDisabled = false } else { this.isDisabled = true }
},
dialogTableVisible() {
this.dialogFormVisible1 = true

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

@@ -176,9 +176,9 @@
<el-button size="medium" type="text" @click="toStatusQuery">零件状态查询</el-button>
</el-tooltip>
<el-divider direction="vertical"/>
<el-tooltip :open-delay="1000" effect="dark" content="转到加工进度查询模块" placement="top">
<el-button size="medium" type="text" @click="toProcessingStatus">加工进度查询</el-button>
</el-tooltip>
<!--<el-tooltip :open-delay="1000" effect="dark" content="转到加工进度查询模块" placement="top">-->
<!--<el-button size="medium" type="text" @click="toProcessingStatus">加工进度查询</el-button>-->
<!--</el-tooltip>-->
</el-row>
</div>
</div>
@@ -372,7 +372,7 @@ export default {
procedure: response.data[i].工艺名称,
planningTime: response.data[i].计划日期_短,
actualTime: response.data[i].完成日期_短 === null || response.data[i].完成日期_短 === '' ? '未完成' : response.data[i].完成日期_短,
name: response.data[i].完成日期_短 === null || response.data[i].完成日期_短 === '' ? '未完成' : response.data[i].员工姓名,
name: response.data[i].工序状态 === 4 ? response.data[i].员工姓名 : '未完成',
color: response.data[i].进度颜色
})
}