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

202025930lljv1

Browse Source
This commit is contained in:
liulujia@meswork.com
2020-02-05 09:30:27 +08:00
parent a8f4599c8b bf69da3d5b
commit 4d87709cdf
34 changed files with 905 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
dist.zip Normal file
View File

Binary file not shown.

8
src/api/ManufacturingCenter/Enter0therData.js
View File

@@ -21,25 +21,25 @@ export function fetchDate(month) {
} }
}) })
} }
export function saveDate(time, num, partNum, partName, procedure, num1, num2, num3, number, time1) { export function saveDate(num, partNum, procedure, num3, number, time1) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
data: { data: {
type: '2', type: '2',
name: '车间管理_其他数据_增加数据', name: '车间管理_其他数据_增加数据',
param: '加工日期=' + time + '&操作工流水号=' + num + '&零件图号=' + partNum + '&名称=' + partName + '&工序=' + procedure + '&责任人流水号=' + num1 + '&确认人流水号=' + num2 + '&录入人流水号=' + num3 + '&数量=' + number + '&单件工时=' + time1 param: '操作工流水号=' + num + '&零件图号=' + partNum + '&工序=' + procedure + '&录入人流水号=' + num3 + '&数量=' + number + '&单件工时=' + time1
} }
}) })
} }
export function editDate(ID, time, num, partNum, partName, procedure, num1, num2, num3, number, time1) { export function editDate(ID, num, partNum, procedure, num3, number, time1) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
data: { data: {
type: '2', type: '2',
name: '车间管理_其他数据_编辑数据', name: '车间管理_其他数据_编辑数据',
param: 'ID=' + ID + '&加工日期=' + time + '&操作工流水号=' + num + '&零件图号=' + partNum + '&名称=' + partName + '&工序=' + procedure + '&责任人流水号=' + num1 + '&确认人流水号=' + num2 + '&录入人流水号=' + num3 + '&数量=' + number + '&单件工时=' + time1 param: 'ID=' + ID + '&操作工流水号=' + num + '&零件图号=' + partNum + '&工序=' + procedure + '&录入人流水号=' + num3 + '&数量=' + number + '&单件工时=' + time1
} }
}) })
} }

16
src/api/ManufacturingCenter/InitialProduction.js
View File

@@ -50,50 +50,50 @@ export function getTable(num, pageList, pageSize) {
}) })
} }
// 投产 // 投产
export function production(num, a, b, d, e, f, g, h, i, j, k, l, m, n, o, p, q, x, s, t, u, v, w) { export function production(num, a, b, d, e, f, g, h, i, j, k, l, m, n, o, p, q, x, s, t, u, v, w, UrgentItem) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
data: { data: {
type: '2', type: '2',
name: '设备管理_可安排生产计划零件排序_制定组时间_同时传递', name: '设备管理_可安排生产计划零件排序_制定组时间_同时传递',
param: '组件零件基本件流水号=' + num + '=int&投产类型流水号=' + a + '=int&数据类型=' + b + '=int&投产批次=1=int&批次数量=' + d + '=string&计划开始时间=' + e + '=string&计划结束时间=' + f + '=string&工艺计划开始时间=' + g + '=string&工艺计划结束时间=' + h + '=string&定额计划开始时间=' + i + '=string&定额计划结束时间=' + j + '=string&计划编制计划开始时间=' + k + '=string&计划编制计划结束时间=' + l + '=string&机加工开始时间=' + m + '=string&机加工结束时间=' + n + '=string&单件外协时间=' + o + '=string&单件是否外协=' + p + '=int&单件是否外协分类=' + q + '=string&计划制定人员编号=' + x + '&材料流水号=' + s + '=int&是否临时件=' + t + '=int&是否难度件=' + u + '=string&是否着急=' + v + '=int&是否白图=' + w + '=int' param: '组件零件基本件流水号=' + num + '=int&投产类型流水号=' + a + '=int&数据类型=' + b + '=int&投产批次=1=int&批次数量=' + d + '=string&计划开始时间=' + e + '=string&计划结束时间=' + f + '=string&工艺计划开始时间=' + g + '=string&工艺计划结束时间=' + h + '=string&定额计划开始时间=' + i + '=string&定额计划结束时间=' + j + '=string&计划编制计划开始时间=' + k + '=string&计划编制计划结束时间=' + l + '=string&机加工开始时间=' + m + '=string&机加工结束时间=' + n + '=string&单件外协时间=' + o + '=string&单件是否外协=' + p + '=int&单件是否外协分类=' + q + '=string&计划制定人员编号=' + x + '&材料流水号=' + s + '=int&是否临时件=' + t + '=int&是否难度件=' + u + '=string&是否着急=' + v + '=int&是否白图=' + w + '=int&是否加急=' + UrgentItem + '=int'
} }
}) })
} }
// 合并投产 // 合并投产
export function production2(num1, num2, num, b, d, e, f, g, h, i, j, k, l, m, n, o, p, q, x, s, t, u, v, w) { export function production2(num1, num2, num, b, d, e, f, g, h, i, j, k, l, m, n, o, p, q, x, s, t, u, v, w, UrgentItem) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
data: { data: {
type: '2', type: '2',
name: '设备管理_可安排生产计划零件排序_制定组时间_同时传递_合并投产', name: '设备管理_可安排生产计划零件排序_制定组时间_同时传递_合并投产',
param: '零件图号=' + num1 + '&规格=' + num2 + '&机床流水号=' + num + '&投产类型流水号=' + 1 + '=int&数据类型=' + b + '=int&投产批次=1=int&批次数量=' + d + '=string&计划开始时间=' + e + '=string&计划结束时间=' + f + '=string&工艺计划开始时间=' + g + '=string&工艺计划结束时间=' + h + '=string&定额计划开始时间=' + i + '=string&定额计划结束时间=' + j + '=string&计划编制计划开始时间=' + k + '=string&计划编制计划结束时间=' + l + '=string&机加工开始时间=' + m + '=string&机加工结束时间=' + n + '=string&单件外协时间=' + o + '=string&单件是否外协=' + p + '=int&单件是否外协分类=' + q + '=string&计划制定人员编号=' + x + '&材料流水号=' + s + '=int&是否临时件=' + t + '=int&是否难度件=' + u + '=string&是否着急=' + v + '=int&是否白图=' + w + '=int' param: '零件图号=' + num1 + '&规格=' + num2 + '&机床流水号=' + num + '&投产类型流水号=' + 1 + '=int&数据类型=' + b + '=int&投产批次=1=int&批次数量=' + d + '=string&计划开始时间=' + e + '=string&计划结束时间=' + f + '=string&工艺计划开始时间=' + g + '=string&工艺计划结束时间=' + h + '=string&定额计划开始时间=' + i + '=string&定额计划结束时间=' + j + '=string&计划编制计划开始时间=' + k + '=string&计划编制计划结束时间=' + l + '=string&机加工开始时间=' + m + '=string&机加工结束时间=' + n + '=string&单件外协时间=' + o + '=string&单件是否外协=' + p + '=int&单件是否外协分类=' + q + '=string&计划制定人员编号=' + x + '&材料流水号=' + s + '=int&是否临时件=' + t + '=int&是否难度件=' + u + '=string&是否着急=' + v + '=int&是否白图=' + w + '=int&是否加急=' + UrgentItem + '=int'
} }
}) })
} }
// 备料投产 // 备料投产
export function production10(num, a, b, d, e, f, g, h, i, j, k, l, m, n, o, p, q, x, s, t, u, v, w) { export function production10(num, a, b, d, e, f, g, h, i, j, k, l, m, n, o, p, q, x, s, t, u, v, w, UrgentItem) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
data: { data: {
type: '2', type: '2',
name: '设备管理_可安排生产计划零件排序_制定组时间_同时传递_备料', name: '设备管理_可安排生产计划零件排序_制定组时间_同时传递_备料',
param: '组件零件基本件流水号=' + num + '=int&投产类型流水号=' + a + '=int&数据类型=' + b + '=int&投产批次=1=int&批次数量=' + d + '=string&计划开始时间=' + e + '=string&计划结束时间=' + f + '=string&工艺计划开始时间=' + g + '=string&工艺计划结束时间=' + h + '=string&定额计划开始时间=' + i + '=string&定额计划结束时间=' + j + '=string&计划编制计划开始时间=' + k + '=string&计划编制计划结束时间=' + l + '=string&机加工开始时间=' + m + '=string&机加工结束时间=' + n + '=string&单件外协时间=' + o + '=string&单件是否外协=' + p + '=int&单件是否外协分类=' + q + '=string&计划制定人员编号=' + x + '&材料流水号=' + s + '=int&是否临时件=' + t + '=int&是否难度件=' + u + '=string&是否着急=' + v + '=int&是否白图=' + w + '=int' param: '组件零件基本件流水号=' + num + '=int&投产类型流水号=' + a + '=int&数据类型=' + b + '=int&投产批次=1=int&批次数量=' + d + '=string&计划开始时间=' + e + '=string&计划结束时间=' + f + '=string&工艺计划开始时间=' + g + '=string&工艺计划结束时间=' + h + '=string&定额计划开始时间=' + i + '=string&定额计划结束时间=' + j + '=string&计划编制计划开始时间=' + k + '=string&计划编制计划结束时间=' + l + '=string&机加工开始时间=' + m + '=string&机加工结束时间=' + n + '=string&单件外协时间=' + o + '=string&单件是否外协=' + p + '=int&单件是否外协分类=' + q + '=string&计划制定人员编号=' + x + '&材料流水号=' + s + '=int&是否临时件=' + t + '=int&是否难度件=' + u + '=string&是否着急=' + v + '=int&是否白图=' + w + '=int&是否加急=' + UrgentItem + '=int'
} }
}) })
} }
// 合并备料投产 // 合并备料投产
export function production20(num1, num2, num, b, d, e, f, g, h, i, j, k, l, m, n, o, p, q, x, s, t, u, v, w) { export function production20(num1, num2, num, b, d, e, f, g, h, i, j, k, l, m, n, o, p, q, x, s, t, u, v, w, UrgentItem) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
data: { data: {
type: '2', type: '2',
name: '设备管理_可安排生产计划零件排序_制定组时间_同时传递_合并投产_备料', name: '设备管理_可安排生产计划零件排序_制定组时间_同时传递_合并投产_备料',
param: '零件图号=' + num1 + '&规格=' + num2 + '&机床流水号=' + num + '&投产类型流水号=' + 1 + '=int&数据类型=' + b + '=int&投产批次=1=int&批次数量=' + d + '=string&计划开始时间=' + e + '=string&计划结束时间=' + f + '=string&工艺计划开始时间=' + g + '=string&工艺计划结束时间=' + h + '=string&定额计划开始时间=' + i + '=string&定额计划结束时间=' + j + '=string&计划编制计划开始时间=' + k + '=string&计划编制计划结束时间=' + l + '=string&机加工开始时间=' + m + '=string&机加工结束时间=' + n + '=string&单件外协时间=' + o + '=string&单件是否外协=' + p + '=int&单件是否外协分类=' + q + '=string&计划制定人员编号=' + x + '&材料流水号=' + s + '=int&是否临时件=' + t + '=int&是否难度件=' + u + '=string&是否着急=' + v + '=int&是否白图=' + w + '=int' param: '零件图号=' + num1 + '&规格=' + num2 + '&机床流水号=' + num + '&投产类型流水号=' + 1 + '=int&数据类型=' + b + '=int&投产批次=1=int&批次数量=' + d + '=string&计划开始时间=' + e + '=string&计划结束时间=' + f + '=string&工艺计划开始时间=' + g + '=string&工艺计划结束时间=' + h + '=string&定额计划开始时间=' + i + '=string&定额计划结束时间=' + j + '=string&计划编制计划开始时间=' + k + '=string&计划编制计划结束时间=' + l + '=string&机加工开始时间=' + m + '=string&机加工结束时间=' + n + '=string&单件外协时间=' + o + '=string&单件是否外协=' + p + '=int&单件是否外协分类=' + q + '=string&计划制定人员编号=' + x + '&材料流水号=' + s + '=int&是否临时件=' + t + '=int&是否难度件=' + u + '=string&是否着急=' + v + '=int&是否白图=' + w + '=int&是否加急=' + UrgentItem + '=int'
} }
}) })
} }

20
src/api/ManufacturingCenter/ProcessPlanningNew.js
View File

@@ -322,6 +322,18 @@ export function insertOne(num0, num1) {
} }
}) })
} }
// 主界面主表插入功能
export function insertOne1(num0, num1) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_零件工序_修改数据_工艺计划流水号和工序流水号_更改',
param: '工艺计划流水号=' + num0 + '=int&工序流水号=' + num1 + '=int'
}
})
}
// 主界面主表删除功能 // 主界面主表删除功能
export function deleteOne(num0, num1) { export function deleteOne(num0, num1) {
return request({ return request({
@@ -371,14 +383,14 @@ export function saveMaterial(num0, num1) {
}) })
} }
// 核准保存 // 核准保存
export function saveApprove(num0, num1, request0, spec, num2, outhelp, num3, num4, weight, area, num5, level) { export function saveApprove(num0, num1, request0, spec, num2, outhelp, num3, num4, weight, area, num5, level, num6) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
data: { data: {
type: '2', type: '2',
name: '车间生产管理工艺_零件工序_增加数据_同时修改工艺计划', name: '车间生产管理工艺_零件工序_增加数据_同时修改工艺计划',
param: '工艺计划流水号=' + num0 + '&工艺编号=' + num1 + '&工艺要求=' + request0 + '&原材料规格=' + spec + '&工序顺序=' + num2 + '&工序间是否外协=' + outhelp + '&工序流水号=' + num3 + '&材料流水号=' + num4 + '&重量=' + weight + '&面积=' + area + '&工艺人员编号=' + num5 + '&工艺难度等级=' + level param: '工艺计划流水号=' + num0 + '&工艺编号=' + num1 + '&工艺要求=' + request0 + '&原材料规格=' + spec + '&工序顺序=' + num2 + '&工序间是否外协=' + outhelp + '&工序流水号=' + num3 + '&材料流水号=' + num4 + '&重量=' + weight + '&面积=' + area + '&工艺人员编号=' + num5 + '&工艺难度等级=' + level + '&工艺是否更改=' + num6
} }
}) })
} }
@@ -492,14 +504,14 @@ export function TableAddLi1(a, b) {
}) })
} }
// 已编制定额保存 // 已编制定额保存
export function TableAddLi(a, b, c, num0, num1) { export function TableAddLi(a, b, c, num0, num1, num2) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
data: { data: {
type: '2', type: '2',
name: '车间生产管理工艺_零件工序_增加数据_修改数据', name: '车间生产管理工艺_零件工序_增加数据_修改数据',
param: '单件定额工时=' + a + '=string&准结定额工时=' + b + '=string&零件图号=' + c + '=string&工序流水号=' + num0 + '=int&工艺计划流水号=' + num1 + '=int' param: '单件定额工时=' + a + '=string&准结定额工时=' + b + '=string&零件图号=' + c + '=string&工序流水号=' + num0 + '=int&工艺计划流水号=' + num1 + '=int&是否加序=' + num2 + '=int'
} }
}) })
} }

23
src/api/ManufacturingCenter/ProcessingStatusNew.js
View File

@@ -129,3 +129,26 @@ where s1.group_idx= 1`
} }
}) })
} }
export function searchWorkTime(code) {
return request({
url: '',
method: 'post',
data: {
type: 1,
name: '车间生产管理工艺_零件工艺计划_完成零件数量状态更改查询',
param: '工序流水号=' + code + '=int'
}
})
}
export function submit2(num, num1, num2) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_零件工艺计划_完成零件数量状态更改',
param: `工序流水号=${num}&完成数量=${num1}&操作者=${num2}`
}
})
}

12
src/api/Outsourcing/OutsourcingTaskExecution.js
View File

@@ -47,6 +47,18 @@ export function getTable1(check, partNumber) {
} }
}) })
} }
// 打回
export function getBack(processPlan) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_外协零件_打回',
param: '工艺计划流水号=' + processPlan
}
})
}
// 获取零件工序信息（零件号表中） // 获取零件工序信息（零件号表中）
export function getprocedure(processPlan, single) { export function getprocedure(processPlan, single) {
return request({ return request({

12
src/api/TechnologyCenter/ImportParts.js
View File

@@ -23,6 +23,18 @@ export function isExit(projectNum, machineNum) {
} }
}) })
} }
// 替换
export function updateNum(num, id) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: 'PDM_零件明细表_外购件和标准件_数据导入保存_更改物料流水号',
param: `物料流水号=${num}&id=${id}`
}
})
}
export function isExit1(projectNum, machineNum, groupNum) { export function isExit1(projectNum, machineNum, groupNum) {
return request({ return request({
url: '', url: '',

11
src/api/TechnologyCenter/QueryParts.js
View File

@@ -91,3 +91,14 @@ export function getFileData(MachineDrawValue) {
} }
}) })
} }
export function addUrgentItem(groupValue, partValue, partName, partMumber, basic, ID) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: 'PDM_零件明细表_加急件_增加',
param: `图号或者型号=${partValue}&零件名称=${partName}&零件数量=${partMumber}&零件备注=${basic}&组件流水号=${groupValue}&加件人流水号=${ID}`
}
})
}

BIN
src/assets/img/StationLayout.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 303 KiB

BIN
src/assets/img/StationLayout.psd Normal file
View File

Binary file not shown.

41
src/utils/request.js
View File

@@ -1,33 +1,34 @@
import axios from 'axios' import axios from 'axios'
export const wsuri = `ws://192.168.1.232:61101//WebMoudule//websocket` export const wsuri = `ws://123.56.95.229:61101//WebMoudule//websocket`
export const name = `OP8888` export const name = `OP8888`
export const name1 = `OP1000` export const name1 = `OP1000`
export const name3 = `OP2000` export const name3 = `OP2000`
export const name4 = `OP9999` export const name4 = `OP9999`
// 创建axios实例 // 创建axios实例
export const readFile = `http://192.168.1.231:8411/webpage/file/` // invoice
export const readImg = `http://192.168.1.231:8411/webpage/img/` // delivery/MS/performancebond export const readFile = `http://123.56.95.229:8010/webpage/file/` // invoice
export const upload = `http://192.168.1.231:8411/submit/uploadFile.ashx` // ContractInformationManagement export const readImg = `http://123.56.95.229:8010/webpage/img/` // delivery/MS/performancebond
export const upload2 = `http://192.168.1.231:8411/submit/upload2.ashx` // delivery export const upload = `http://123.56.95.229:8010/submit/uploadFile.ashx` // ContractInformationManagement
export const upload3 = `http://192.168.1.231:8411/submit/upload3.ashx` // performancebond export const upload2 = `http://123.56.95.229:8010/submit/upload2.ashx` // delivery
export const uploadInvoiceScan = `http://192.168.1.231:8411/submit/uploadInvoiceScan.ashx` // invoice export const upload3 = `http://123.56.95.229:8010/submit/upload3.ashx` // performancebond
export const uploadInvoiceScan1 = `http://192.168.1.231:8411/submit/uploadInvoiceScan1.ashx` // invoice(workshop) export const uploadInvoiceScan = `http://123.56.95.229:8010/submit/uploadInvoiceScan.ashx` // invoice
export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement export const uploadInvoiceScan1 = `http://123.56.95.229:8010/submit/uploadInvoiceScan1.ashx` // invoice(workshop)
export const uploadPerson = `http://192.168.1.231:8411/submit/uploadPerson.ashx` export const download = `http://123.56.95.229:8010/submit/downloadFile.ashx` // ContractInformationManagement
export const uploadOP = `http://192.168.1.231:8411/submit/uploadOP.ashx` export const uploadPerson = `http://123.56.95.229:8010/submit/uploadPerson.ashx`
export const url = `http://192.168.1.188:8045/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 export const uploadOP = `http://123.56.95.229:8010/submit/uploadOP.ashx`
export const ExcelDownLoad = 'http://192.168.1.188:8045/submit/downloadFile.ashx' // 导出excel export const url = `http://123.56.95.229:8010/submit/MESCommonBase.ashx` // 采购件入库、离线件入库
export const ExcelWaiGou = 'http://192.168.1.167:8045/submit/excel.ashx' // 导出excel export const ExcelDownLoad = 'http://123.56.95.229:8010/submit/downloadFile.ashx' // 导出excel
export const ExcelWaiGou = 'http://123.56.95.229:8010/submit/excel.ashx' // 导出excel
// 技术中心程序发布时要更改下面所有的IP到0段 // 技术中心程序发布时要更改下面所有的IP到0段
export const ServerIP = `http://192.168.1.231:8411/webpage/file/` export const ServerIP = `http://123.56.95.229:8010/webpage/file/`
export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231 export const uploadFileMachine = `http://123.56.95.229:8010/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231
export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFileMachine.ashx` // 机床总图 发布时改成0.231 export const downloadFileMachine = `http://123.56.95.229:8010/submit/downloadFileMachine.ashx` // 机床总图 发布时改成0.231
export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx` export const MESUploadFile = `http://123.56.95.229:8010/submit/MESUploadFile.ashx`
export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` export const MESDownloadFile = `http://123.56.95.229:8010/submit/MESDownloadFile.ashx`
const service = axios.create({ const service = axios.create({
baseURL: `http://localhost:8045/submit/MESCommonBase.ashx`, baseURL: `http://123.56.95.229:8010/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间 timeout: 1500000 // 请求超时时间
}) })
export default service export default service

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

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

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

@@ -173,7 +173,7 @@ export default {
firstLevel.children = [] firstLevel.children = []
for (let j = 0; j < response.data.length; j++) { for (let j = 0; j < response.data.length; j++) {
firstLevel.children.push({ 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].工艺计划流水号, value: response.data[j].工艺计划流水号,
考核状态: response.data[j].考核状态, 考核状态: response.data[j].考核状态,
采购状态: response.data[j].采购状态, 采购状态: response.data[j].采购状态,

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

@@ -31,6 +31,86 @@
<el-input v-model="totalProcessingHours" clearable size="small" style="margin-right:10px;width: 100px"/> <el-input v-model="totalProcessingHours" clearable size="small" style="margin-right:10px;width: 100px"/>
<span>计划总工时（小时）:</span> <span>计划总工时（小时）:</span>
<el-input v-model="totalPlannedHours" clearable size="small" style="margin-right:10px;width: 100px"/> <el-input v-model="totalPlannedHours" clearable size="small" style="margin-right:10px;width: 100px"/>
<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">
<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">
<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">
<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">
<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">
<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">
<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">
<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">
<template slot-scope="scope">
{{ scope.row.制品名称 }}
</template>
</el-table-column>
</el-table>
</el-card> </el-card>
</div> </div>
</template> </template>
@@ -48,7 +128,8 @@ export default {
partValue: '', partValue: '',
specificationValue: '', // 规格型号 specificationValue: '', // 规格型号
totalProcessingHours: '', // 加工总工时 totalProcessingHours: '', // 加工总工时
totalPlannedHours: '' // 计划总工时 totalPlannedHours: '', // 计划总工时
tableData: [] // 详情表
} }
}, },
created() { created() {

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

@@ -20,6 +20,7 @@
</el-tooltip> </el-tooltip>
<el-tooltip :open-delay="1000" effect="dark" content="导出备料分配单" placement="top"> <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 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-tooltip>
</el-row> </el-row>
</el-card> </el-card>
@@ -38,6 +39,7 @@
element-loading-text="拼命加载中" element-loading-text="拼命加载中"
@sort-change="sortChange" @sort-change="sortChange"
@selection-change="handleSelectionChange"> @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 <el-table-column
type="selection" type="selection"
width="50" width="50"
@@ -50,36 +52,38 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="零件名称" prop="零件名称" align="center" width="280" sortable="custom" show-overflow-tooltip> <el-table-column label="零件名称" prop="零件名称" align="center" width="280" sortable="custom" show-overflow-tooltip>
<template slot-scope="scope"> <el-table-column label="零件名称" prop="零件名称" align="center" width="250" show-overflow-tooltip>
{{ scope.row.零件名称 }} <template slot-scope="scope">
</template> {{ scope.row.零件名称 }}
</el-table-column> </template>
<el-table-column label="零件图号" prop="零件图号" align="center" width="180" sortable="custom" show-overflow-tooltip> </el-table-column>
<template slot-scope="scope"> <el-table-column label="零件图号" prop="零件图号" align="center" width="180" sortable="custom" show-overflow-tooltip>
{{ scope.row.零件图号 }} <!--<el-table-column label="零件图号" prop="零件图号" align="center" width="180" show-overflow-tooltip>-->
</template> <template slot-scope="scope">
</el-table-column> {{ scope.row.零件图号 }}
<el-table-column label="数量" align="center" width="60"> </template>
<template slot-scope="scope"> </el-table-column>
{{ scope.row.批次数量 }} <el-table-column label="数量" align="center" width="60">
</template> <template slot-scope="scope">
</el-table-column> {{ scope.row.批次数量 }}
<el-table-column label="材料" align="center" width="120" show-overflow-tooltip> </template>
<template slot-scope="scope"> </el-table-column>
{{ scope.row.材料 }} <el-table-column label="材料" align="center" width="120" show-overflow-tooltip>
</template> <template slot-scope="scope">
</el-table-column> {{ scope.row.材料 }}
<el-table-column label="重量" align="center" width="60" > </template>
<template slot-scope="scope"> </el-table-column>
{{ scope.row.重量 }} <el-table-column label="重量" align="center" width="60" >
</template> <template slot-scope="scope">
</el-table-column> {{ scope.row.重量 }}
<el-table-column label="工艺要求" align="center" width="300" show-overflow-tooltip> </template>
<template slot-scope="scope"> </el-table-column>
{{ scope.row.工艺要求 }} <el-table-column label="工艺要求" align="center" width="300" show-overflow-tooltip>
</template> <template slot-scope="scope">
</el-table-column> {{ scope.row.工艺要求 }}
</el-table> </template>
</el-table-column>
</el-table-column></el-table>
<div class="block"> <div class="block">
<el-pagination <el-pagination
v-if="!loading" v-if="!loading"
@@ -195,33 +199,35 @@ export default {
this.partNamecheck = false this.partNamecheck = false
} }
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, this.ordername, this.order).then(response => {
console.log(response) searchtable(this.partNamecheck, this.partName, !this.all, 0, this.pageCurrent, this.pageSize).then(response => {
if (response.data.total === 0) { console.log(response)
this.loading = false if (response.data.total === 0) {
} else { this.loading = false
} else {
// this.tableData.push({ // this.tableData.push({
// 重量: response.data.rows[0].重量 // 重量: response.data.rows[0].重量
// }) // })
this.Data = response.data.rows this.Data = response.data.rows
this.total = response.data.total this.total = response.data.total
} }
}).then(() => { }).then(() => {
for (let i = 0; i < this.Data.length; i++) { for (let i = 0; i < this.Data.length; i++) {
searchtable2(this.Data[i].工艺计划流水号).then(response => { searchtable2(this.Data[i].工艺计划流水号).then(response => {
this.tableData.push({ this.tableData.push({
工艺计划流水号: this.Data[i].工艺计划流水号, 工艺计划流水号: this.Data[i].工艺计划流水号,
零件名称: this.Data[i].零件名称, 零件名称: this.Data[i].零件名称,
零件图号: this.Data[i].零件图号, 零件图号: this.Data[i].零件图号,
备料打印: this.Data[i].备料打印, 备料打印: this.Data[i].备料打印,
是否外购备料: this.Data[i].是否外购备料, 是否外购备料: this.Data[i].是否外购备料,
工艺要求: response.data[0].工艺要求, 工艺要求: response.data[0].工艺要求,
材料: this.Data[i].材料, 材料: this.Data[i].材料,
重量: this.Data[i].重量, 重量: this.Data[i].重量,
批次数量: this.Data[i].批次数量 批次数量: this.Data[i].批次数量
})
}) })
}) this.loading = false
this.loading = false }
} })
}) })
}, },
handleSelectionChange(val) { handleSelectionChange(val) {
@@ -286,6 +292,7 @@ export default {
this.partNamecheck = false this.partNamecheck = false
} }
getExport(this.partNamecheck, this.partName, !this.all, 0).then(res => { getExport(this.partNamecheck, this.partName, !this.all, 0).then(res => {
console.log(res.data)
import('@/vendor/Export2Excel').then(excel => { import('@/vendor/Export2Excel').then(excel => {
const tHeader = ['备料分配', '零件名称', '零件图号', '数量', '材料', '重量', '工艺要求'] const tHeader = ['备料分配', '零件名称', '零件图号', '数量', '材料', '重量', '工艺要求']
const filterVal = ['分配状态', '零件名称', '零件图号', '批次数量', '材料', '重量', '工艺要求'] const filterVal = ['分配状态', '零件名称', '零件图号', '批次数量', '材料', '重量', '工艺要求']

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

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

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

@@ -83,7 +83,7 @@
</el-tooltip> </el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME136" placement="top" @mouseover.native.prevent="changeActive($event)"> <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 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> <el-row>
<!--<div :id="OPNAME136+fang" class="fang"/>--> <!--<div :id="OPNAME136+fang" class="fang"/>-->
<div :id="OPNAME136+circle" class="circle" style="margin-left: 11px;"/> <div :id="OPNAME136+circle" class="circle" style="margin-left: 11px;"/>
@@ -91,9 +91,19 @@
</el-row> </el-row>
</div> </div>
</el-tooltip> </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)"> <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 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> <el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME102 }}</div> <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"/> <div :id="OPNAME102+circle" class="circle"/>
@@ -103,7 +113,7 @@
</el-tooltip> </el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME103" placement="top" @mouseover.native.prevent="changeActive($event)"> <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 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> <el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME103 }}</div> <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"/> <div :id="OPNAME103+circle" class="circle"/>
@@ -113,7 +123,7 @@
</el-tooltip> </el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME104" placement="top" @mouseover.native.prevent="changeActive($event)"> <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 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> <el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME104 }}</div> <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"/> <div :id="OPNAME104+circle" class="circle"/>
@@ -123,7 +133,7 @@
</el-tooltip> </el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME105" placement="top" @mouseover.native.prevent="changeActive($event)"> <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 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> <el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME105 }}</div> <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"/> <div :id="OPNAME105+circle" class="circle"/>
@@ -133,7 +143,7 @@
</el-tooltip> </el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME145" placement="top" @mouseover.native.prevent="changeActive($event)"> <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 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> <el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME145 }}</div> <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"/> <div :id="OPNAME145+circle" class="circle"/>
@@ -143,7 +153,7 @@
</el-tooltip> </el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME106" placement="top" @mouseover.native.prevent="changeActive($event)"> <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 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> <el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME106 }}</div> <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"/> <div :id="OPNAME106+circle" class="circle"/>
@@ -151,9 +161,19 @@
</el-row> </el-row>
</div> </div>
</el-tooltip> </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)"> <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 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> <el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME107 }}</div> <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"/> <div :id="OPNAME107+circle" class="circle"/>
@@ -163,7 +183,7 @@
</el-tooltip> </el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME108" placement="top" @mouseover.native.prevent="changeActive($event)"> <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 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> <el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME108 }}</div> <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"/> <div :id="OPNAME108+circle" class="circle"/>
@@ -173,7 +193,7 @@
</el-tooltip> </el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME109" placement="top" @mouseover.native.prevent="changeActive($event)"> <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 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> <el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME109 }}</div> <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"/> <div :id="OPNAME109+circle" class="circle"/>
@@ -181,9 +201,19 @@
</el-row> </el-row>
</div> </div>
</el-tooltip> </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)"> <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 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> <el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME110 }}</div> <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"/> <div :id="OPNAME110+circle" class="circle"/>
@@ -193,7 +223,7 @@
</el-tooltip> </el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME111" placement="top" @mouseover.native.prevent="changeActive($event)"> <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 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> <el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME111 }}</div> <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"/> <div :id="OPNAME111+circle" class="circle"/>
@@ -203,7 +233,7 @@
</el-tooltip> </el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME112" placement="top" @mouseover.native.prevent="changeActive($event)"> <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 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> <el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME112 }}</div> <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"/> <div :id="OPNAME112+circle" class="circle"/>
@@ -213,7 +243,7 @@
</el-tooltip> </el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME113" placement="top" @mouseover.native.prevent="changeActive($event)"> <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 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> <el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME113 }}</div> <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"/> <div :id="OPNAME113+circle" class="circle"/>
@@ -223,7 +253,7 @@
</el-tooltip> </el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME114" placement="top" @mouseover.native.prevent="changeActive($event)"> <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 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> <el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME114 }}</div> <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"/> <div :id="OPNAME114+circle" class="circle"/>
@@ -233,7 +263,7 @@
</el-tooltip> </el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME101" placement="top" @mouseover.native.prevent="changeActive($event)"> <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 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> <el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME101 }}</div> <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"/> <div :id="OPNAME101+circle" class="circle"/>
@@ -243,7 +273,7 @@
</el-tooltip> </el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME149" placement="top" @mouseover.native.prevent="changeActive($event)"> <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 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> <el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME149 }}</div> <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"/> <div :id="OPNAME149+circle" class="circle"/>
@@ -253,7 +283,7 @@
</el-tooltip> </el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME115" placement="top" @mouseover.native.prevent="changeActive($event)"> <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 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> <el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME115 }}</div> <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"/> <div :id="OPNAME115+circle" class="circle"/>
@@ -263,7 +293,7 @@
</el-tooltip> </el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME116" placement="top" @mouseover.native.prevent="changeActive($event)"> <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 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> <el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME116 }}</div> <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"/> <div :id="OPNAME116+circle" class="circle"/>
@@ -273,7 +303,7 @@
</el-tooltip> </el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME117" placement="top" @mouseover.native.prevent="changeActive($event)"> <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 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> <el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME117 }}</div> <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"/> <div :id="OPNAME117+circle" class="circle"/>
@@ -283,7 +313,7 @@
</el-tooltip> </el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME118" placement="top" @mouseover.native.prevent="changeActive($event)"> <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 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> <el-row>
<!--<div :id="OPNAME118+fang" class="fang"/>--> <!--<div :id="OPNAME118+fang" class="fang"/>-->
<div :id="OPNAME118+circle" class="circle" style="margin-left: 13px"/> <div :id="OPNAME118+circle" class="circle" style="margin-left: 13px"/>
@@ -293,7 +323,7 @@
</el-tooltip> </el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME119" placement="top" @mouseover.native.prevent="changeActive($event)"> <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 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> <el-row>
<!--<div :id="OPNAME119+fang" class="fang"/>--> <!--<div :id="OPNAME119+fang" class="fang"/>-->
<div :id="OPNAME119+circle" class="circle" style="margin-left: 13px"/> <div :id="OPNAME119+circle" class="circle" style="margin-left: 13px"/>
@@ -303,7 +333,7 @@
</el-tooltip> </el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME120" placement="top" @mouseover.native.prevent="changeActive($event)"> <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 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> <el-row>
<!--<div :id="OPNAME120+fang" class="fang"/>--> <!--<div :id="OPNAME120+fang" class="fang"/>-->
<div :id="OPNAME120+circle" class="circle" style="margin-left: 13px"/> <div :id="OPNAME120+circle" class="circle" style="margin-left: 13px"/>
@@ -313,7 +343,7 @@
</el-tooltip> </el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME121" placement="top" @mouseover.native.prevent="changeActive($event)"> <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 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> <el-row>
<!--<div :id="OPNAME121+fang" class="fang"/>--> <!--<div :id="OPNAME121+fang" class="fang"/>-->
<div :id="OPNAME121+circle" class="circle" style="margin-left: 13px"/> <div :id="OPNAME121+circle" class="circle" style="margin-left: 13px"/>
@@ -323,7 +353,7 @@
</el-tooltip> </el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME122" placement="top" @mouseover.native.prevent="changeActive($event)"> <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 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> <el-row>
<!--<div :id="OPNAME122+fang" class="fang"/>--> <!--<div :id="OPNAME122+fang" class="fang"/>-->
<div :id="OPNAME122+circle" class="circle" style="margin-left: 13px"/> <div :id="OPNAME122+circle" class="circle" style="margin-left: 13px"/>
@@ -333,7 +363,7 @@
</el-tooltip> </el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME123" placement="top" @mouseover.native.prevent="changeActive($event)"> <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 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> <el-row>
<!--<div :id="OPNAME123+fang" class="fang"/>--> <!--<div :id="OPNAME123+fang" class="fang"/>-->
<div :id="OPNAME123+circle" class="circle" style="margin-left: 13px"/> <div :id="OPNAME123+circle" class="circle" style="margin-left: 13px"/>
@@ -343,7 +373,7 @@
</el-tooltip> </el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME124" placement="top" @mouseover.native.prevent="changeActive($event)"> <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 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> <el-row>
<!--<div :id="OPNAME124+fang" class="fang"/>--> <!--<div :id="OPNAME124+fang" class="fang"/>-->
<div :id="OPNAME124+circle" class="circle" style="margin-left: 13px"/> <div :id="OPNAME124+circle" class="circle" style="margin-left: 13px"/>
@@ -353,7 +383,7 @@
</el-tooltip> </el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME125" placement="top" @mouseover.native.prevent="changeActive($event)"> <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 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> <el-row>
<!--<div :id="OPNAME125+fang" class="fang"/>--> <!--<div :id="OPNAME125+fang" class="fang"/>-->
<div :id="OPNAME125+circle" class="circle" style="margin-left: 13px"/> <div :id="OPNAME125+circle" class="circle" style="margin-left: 13px"/>
@@ -363,7 +393,7 @@
</el-tooltip> </el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME126" placement="top" @mouseover.native.prevent="changeActive($event)"> <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 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> <el-row>
<!--<div :id="OPNAME126+fang" class="fang"/>--> <!--<div :id="OPNAME126+fang" class="fang"/>-->
<div :id="OPNAME126+circle" class="circle" style="margin-left: 13px"/> <div :id="OPNAME126+circle" class="circle" style="margin-left: 13px"/>
@@ -373,7 +403,7 @@
</el-tooltip> </el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME127" placement="top" @mouseover.native.prevent="changeActive($event)"> <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 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> <el-row>
<!--<div :id="OPNAME127+fang" class="fang"/>--> <!--<div :id="OPNAME127+fang" class="fang"/>-->
<div :id="OPNAME127+circle" class="circle" style="margin-left: 13px"/> <div :id="OPNAME127+circle" class="circle" style="margin-left: 13px"/>
@@ -383,7 +413,7 @@
</el-tooltip> </el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME128" placement="top" @mouseover.native.prevent="changeActive($event)"> <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 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> <el-row>
<!--<div :id="OPNAME128+fang" class="fang"/>--> <!--<div :id="OPNAME128+fang" class="fang"/>-->
<div :id="OPNAME128+circle" class="circle" style="margin-left: 13px"/> <div :id="OPNAME128+circle" class="circle" style="margin-left: 13px"/>
@@ -393,7 +423,7 @@
</el-tooltip> </el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME129" placement="top" @mouseover.native.prevent="changeActive($event)"> <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 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> <el-row>
<!--<div :id="OPNAME129+fang" class="fang"/>--> <!--<div :id="OPNAME129+fang" class="fang"/>-->
<div :id="OPNAME129+circle" class="circle" style="margin-left: 13px"/> <div :id="OPNAME129+circle" class="circle" style="margin-left: 13px"/>
@@ -403,7 +433,7 @@
</el-tooltip> </el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME130" placement="top" @mouseover.native.prevent="changeActive($event)"> <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 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> <el-row>
<!--<div :id="OPNAME130+fang" class="fang"/>--> <!--<div :id="OPNAME130+fang" class="fang"/>-->
<div :id="OPNAME130+circle" class="circle" style="margin-left: 13px"/> <div :id="OPNAME130+circle" class="circle" style="margin-left: 13px"/>
@@ -413,7 +443,7 @@
</el-tooltip> </el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME131" placement="top" @mouseover.native.prevent="changeActive($event)"> <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 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> <el-row>
<!--<div :id="OPNAME131+fang" class="fang"/>--> <!--<div :id="OPNAME131+fang" class="fang"/>-->
<div :id="OPNAME131+circle" class="circle" style="margin-left: 13px"/> <div :id="OPNAME131+circle" class="circle" style="margin-left: 13px"/>
@@ -423,7 +453,7 @@
</el-tooltip> </el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME132" placement="top" @mouseover.native.prevent="changeActive($event)"> <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 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> <el-row>
<!--<div :id="OPNAME132+fang" class="fang"/>--> <!--<div :id="OPNAME132+fang" class="fang"/>-->
<div :id="OPNAME132+circle" class="circle" style="margin-left: 13px"/> <div :id="OPNAME132+circle" class="circle" style="margin-left: 13px"/>
@@ -433,7 +463,7 @@
</el-tooltip> </el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME133" placement="top" @mouseover.native.prevent="changeActive($event)"> <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 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> <el-row>
<!--<div :id="OPNAME133+fang" class="fang"/>--> <!--<div :id="OPNAME133+fang" class="fang"/>-->
<div :id="OPNAME133+circle" class="circle" style="margin-left: 10px"/> <div :id="OPNAME133+circle" class="circle" style="margin-left: 10px"/>
@@ -441,9 +471,19 @@
</el-row> </el-row>
</div> </div>
</el-tooltip> </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)"> <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 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> <el-row>
<!--<div :id="OPNAME134+fang" class="fang"/>--> <!--<div :id="OPNAME134+fang" class="fang"/>-->
<div :id="OPNAME134+circle" class="circle" style="margin-left: 13px"/> <div :id="OPNAME134+circle" class="circle" style="margin-left: 13px"/>
@@ -453,7 +493,7 @@
</el-tooltip> </el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME135" placement="top" @mouseover.native.prevent="changeActive($event)"> <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 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> <el-row>
<!--<div :id="OPNAME135+fang" class="fang"/>--> <!--<div :id="OPNAME135+fang" class="fang"/>-->
<div :id="OPNAME135+circle" class="circle" style="margin-left: 13px"/> <div :id="OPNAME135+circle" class="circle" style="margin-left: 13px"/>
@@ -463,7 +503,7 @@
</el-tooltip> </el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME146" placement="top" @mouseover.native.prevent="changeActive($event)"> <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 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> <el-row>
<!--<div :id="OPNAME135+fang" class="fang"/>--> <!--<div :id="OPNAME135+fang" class="fang"/>-->
<!--<div :id="OPNAME146+circle" class="circle" style="margin-left: 13px"/>--> <!--<div :id="OPNAME146+circle" class="circle" style="margin-left: 13px"/>-->
@@ -473,7 +513,7 @@
</el-tooltip> </el-tooltip>
<el-tooltip :enterable="false" :id="OPNAME148" placement="top" @mouseover.native.prevent="changeActive($event)"> <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 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> <el-row>
<!--<div :id="OPNAME135+fang" class="fang"/>--> <!--<div :id="OPNAME135+fang" class="fang"/>-->
<!--<div :id="OPNAME148+circle" class="circle" style="margin-left: 13px"/>--> <!--<div :id="OPNAME148+circle" class="circle" style="margin-left: 13px"/>-->
@@ -493,7 +533,7 @@
</el-tooltip> </el-tooltip>
<el-tooltip :id="机床总装" placement="bottom" @mouseover.native.prevent="changeActive($event)"> <el-tooltip :id="机床总装" placement="bottom" @mouseover.native.prevent="changeActive($event)">
<div slot="content" style="max-height: 200px;overflow: auto" v-html="returns1"/> <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> <el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ 机床总装 }}</div> <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ 机床总装 }}</div>
</el-row> </el-row>
@@ -501,7 +541,7 @@
</el-tooltip> </el-tooltip>
<el-tooltip :id="部件装配" placement="bottom" @mouseover.native.prevent="changeActive($event)"> <el-tooltip :id="部件装配" placement="bottom" @mouseover.native.prevent="changeActive($event)">
<div slot="content" style="max-height: 200px;overflow: auto" v-html="returns2"/> <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> <el-row>
<div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ 部件装配 }}</div> <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ 部件装配 }}</div>
</el-row> </el-row>
@@ -536,9 +576,11 @@ export default {
OPNAME104: 'OP1040', OPNAME104: 'OP1040',
OPNAME105: 'OP1050', OPNAME105: 'OP1050',
OPNAME106: 'OP1060', OPNAME106: 'OP1060',
OPNAME1061: 'OP1061',
OPNAME107: 'OP1070', OPNAME107: 'OP1070',
OPNAME108: 'OP1080', OPNAME108: 'OP1080',
OPNAME109: 'OP1090', OPNAME109: 'OP1090',
OPNAME1091: 'OP1091',
OPNAME110: 'OP1100', OPNAME110: 'OP1100',
OPNAME111: 'OP1110', OPNAME111: 'OP1110',
OPNAME112: 'OP1120', OPNAME112: 'OP1120',
@@ -563,6 +605,7 @@ export default {
OPNAME131: 'OP1310', OPNAME131: 'OP1310',
OPNAME132: 'OP1320', OPNAME132: 'OP1320',
OPNAME133: 'OP1330', OPNAME133: 'OP1330',
OPNAME1331: 'OP1331',
OPNAME134: 'OP1340', OPNAME134: 'OP1340',
OPNAME135: 'OP1350', OPNAME135: 'OP1350',
OPNAME136: 'OP1360', OPNAME136: 'OP1360',
@@ -579,6 +622,7 @@ export default {
OPNAME147: 'OP1470', OPNAME147: 'OP1470',
OPNAME148: 'OP1480', OPNAME148: 'OP1480',
OPNAME149: 'OP1490', OPNAME149: 'OP1490',
OPNAME150: 'OP1500',
timer: null, timer: null,
opname: '' opname: ''
} }
@@ -873,7 +917,7 @@ export default {
width: 1690px; width: 1690px;
height: 830px; height: 830px;
/*border: 1px solid red;*/ /*border: 1px solid red;*/
background: url('../../../assets/img/img26.jpg') repeat; background: url('../../../assets/img/StationLayout.jpg') repeat;
background-repeat:no-repeat; background-repeat:no-repeat;
background-size:100% 100%;-moz-background-size:100% 100%; background-size:100% 100%;-moz-background-size:100% 100%;
overflow: hidden; 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-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-button :loading="listLoading3" type="success" size="small" style="float:right;" @click="production10">备料投产</el-button>
</el-tooltip> </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-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-checkbox v-model="checked_hebing" style="float:right;margin-top:10px;margin-right:10px">合并生产</el-checkbox>
</el-tooltip> </el-tooltip>
@@ -351,6 +354,8 @@ export default {
data() { data() {
return { return {
checked_hebing: true, checked_hebing: true,
checked_UrgentItem: false,
UrgentItem: 0,
maxmax: '', maxmax: '',
clearTable: 0, clearTable: 0,
readonly: true, readonly: true,
@@ -874,6 +879,7 @@ export default {
// 投产 // 投产
production() { production() {
this.result = 0 this.result = 0
this.UrgentItem = 0
if (this.time_machiningFinish === '' || this.time_machiningFinish === null) { if (this.time_machiningFinish === '' || this.time_machiningFinish === null) {
this.$message.error('请输入加工结束时间') this.$message.error('请输入加工结束时间')
} else { } else {
@@ -886,6 +892,9 @@ export default {
if (this.multipleSelection.length === 0) { if (this.multipleSelection.length === 0) {
this.$message.error('请至少选择一个零件') this.$message.error('请至少选择一个零件')
} else { } else {
if (this.checked_UrgentItem === true) {
this.UrgentItem = 1
}
if (this.checked_hebing === true) { if (this.checked_hebing === true) {
this.listLoading3 = true this.listLoading3 = true
for (let i = 0; i < this.multipleSelection.length; i++) { for (let i = 0; i < this.multipleSelection.length; i++) {
@@ -914,7 +923,7 @@ export default {
} else { } else {
this.checked_baitu = 1 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) this.result += parseInt(response.data[0].result)
if (this.result === this.multipleSelection.length) { if (this.result === this.multipleSelection.length) {
this.$message.success('投产成功') this.$message.success('投产成功')
@@ -962,7 +971,7 @@ export default {
} else { } else {
this.checked_baitu = 1 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) this.result += parseInt(response.data[0].result)
if (this.result === this.multipleSelection.length) { if (this.result === this.multipleSelection.length) {
this.$message.success('投产成功') this.$message.success('投产成功')
@@ -990,6 +999,7 @@ export default {
// 备料投产 // 备料投产
production10() { production10() {
this.result = 0 this.result = 0
this.UrgentItem = 0
if (this.time_machiningFinish === '' || this.time_machiningFinish === null) { if (this.time_machiningFinish === '' || this.time_machiningFinish === null) {
this.$message.error('请输入加工结束时间') this.$message.error('请输入加工结束时间')
} else { } else {
@@ -1002,6 +1012,9 @@ export default {
if (this.multipleSelection.length === 0) { if (this.multipleSelection.length === 0) {
this.$message.error('请至少选择一个零件') this.$message.error('请至少选择一个零件')
} else { } else {
if (this.checked_UrgentItem === true) {
this.UrgentItem = 1
}
if (this.checked_hebing === true) { if (this.checked_hebing === true) {
this.listLoading3 = true this.listLoading3 = true
for (let i = 0; i < this.multipleSelection.length; i++) { for (let i = 0; i < this.multipleSelection.length; i++) {
@@ -1030,7 +1043,7 @@ export default {
} else { } else {
this.checked_baitu = 1 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) this.result += parseInt(response.data[0].result)
if (this.result === this.multipleSelection.length) { if (this.result === this.multipleSelection.length) {
this.$message.success('投产成功') this.$message.success('投产成功')
@@ -1078,7 +1091,7 @@ export default {
} else { } else {
this.checked_baitu = 1 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) this.result += parseInt(response.data[0].result)
if (this.result === this.multipleSelection.length) { if (this.result === this.multipleSelection.length) {
this.$message.success('投产成功') this.$message.success('投产成功')

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

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

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

@@ -95,6 +95,16 @@
{{ scope.row.机床数量 }} {{ scope.row.机床数量 }}
</template> </template>
</el-table-column> </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"> <el-table-column label="备注" align="center" width="90px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件备注 }} {{ scope.row.零件备注 }}
@@ -140,6 +150,16 @@
{{ scope.row.机床数量 }} {{ scope.row.机床数量 }}
</template> </template>
</el-table-column> </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"> <el-table-column label="备注" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.备注 }} {{ scope.row.备注 }}
@@ -180,6 +200,16 @@
{{ scope.row.机床数量 }} {{ scope.row.机床数量 }}
</template> </template>
</el-table-column> </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"> <el-table-column label="备注" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.备注 }} {{ scope.row.备注 }}
@@ -601,6 +631,7 @@ export default {
MaterialSpecification: [], MaterialSpecification: [],
MaterialModel: [], MaterialModel: [],
NumberOfParts: [], NumberOfParts: [],
multipleSelection: [],
ReMarks: [], ReMarks: [],
projectName: '', projectName: '',
MachineToolNumber: '', MachineToolNumber: '',
@@ -1113,67 +1144,29 @@ export default {
}) })
}, },
handleSelectionChange(val) { handleSelectionChange(val) {
if (this.PartType === '基本件') { this.multipleSelection = val
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].备注
}
}
}, },
purchaseRequisition() { purchaseRequisition() {
if (this.RequisitionList !== '') { if (this.RequisitionList !== '') {
if (this.time !== '' && this.time !== null) { if (this.time !== '' && this.time !== null) {
if (this.BasicPartsNumber.length !== 0 || this.StandardPartsAndOutsourcing.length !== 0) { if (this.multipleSelection.length !== 0) {
this.result = 0 this.result = 0
if (this.PartType === '基本件') { 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++) { 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 => { 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) this.result += parseInt(response.data[0].result)
@@ -1204,6 +1197,23 @@ export default {
}) })
} }
} else if (this.PartType === '外购件') { } 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++) { 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 => { 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) this.result += parseInt(response.data[0].result)
@@ -1234,6 +1244,23 @@ export default {
}) })
} }
} else if (this.PartType === '标准件') { } 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++) { 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 => { 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) this.result += parseInt(response.data[0].result)
@@ -1276,8 +1303,23 @@ export default {
}, },
PurchasingDepartment() { PurchasingDepartment() {
if (this.time !== '' && this.time !== null) { if (this.time !== '' && this.time !== null) {
if (this.BasicPartsNumber.length !== 0 || this.StandardPartsAndOutsourcing.length !== 0) { if (this.multipleSelection.length !== 0) {
if (this.PartType === '基本件') { 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 => { purchaseRequisition2(this.projectFloatValue, this.machineFloatValue, this.groupFloatValue, this.BasicPartsNumber, this.NumberOfParts, this.time).then(response => {
if (response.data[0].result !== '0') { if (response.data[0].result !== '0') {
console.log(response.data[0].result) console.log(response.data[0].result)
@@ -1290,6 +1332,23 @@ export default {
} }
}) })
} else { } 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 => { PurchasingDepartment(this.groupFloatValue, this.StandardPartsAndOutsourcing, this.time, this.MaterialNum, this.NumberOfParts, this.projectFloatValue, this.machineFloatValue).then(response => {
if (response.data[0].result !== '0') { if (response.data[0].result !== '0') {
this.$message.success('请购成功') this.$message.success('请购成功')
@@ -1315,7 +1374,22 @@ export default {
} }
}, },
Production() { 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 => { Production(this.groupFloatValue, this.BasicPartsNumber, this.NumberOfParts, this.projectFloatValue, this.machineFloatValue).then(response => {
if (response.data[0].result !== '0') { if (response.data[0].result !== '0') {
this.$message.success('投产成功') this.$message.success('投产成功')

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

@@ -532,6 +532,7 @@ import {
getPartnames3, getPartnames3,
getPartnames4, getPartnames4,
modifyRemark, modifyRemark,
insertOne1,
detailInfo detailInfo
} from '@/api/ManufacturingCenter/ProcessPlanningNew' } from '@/api/ManufacturingCenter/ProcessPlanningNew'
import elInput from 'element-ui/packages/input' import elInput from 'element-ui/packages/input'
@@ -697,6 +698,7 @@ export default {
result: 0, result: 0,
oldNum: '', oldNum: '',
newNum: '', newNum: '',
工艺是否更改: '',
// tableRecord: [], // tableRecord: [],
materialName2: '', materialName2: '',
material2: '' material2: ''
@@ -1130,7 +1132,8 @@ export default {
label: response.data[i].零件图号, label: response.data[i].零件图号,
value: response.data[i].工艺计划流水号, value: response.data[i].工艺计划流水号,
machine: 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.material = response.data[0].材料流水号
this.materialName = response.data[0].材料 this.materialName = response.data[0].材料
this.spec = response.data[0].原材料规格 this.spec = response.data[0].原材料规格
this.工艺是否更改 = response.data[0].工艺是否更改
if (response.data[0].重量 === null) { if (response.data[0].重量 === null) {
this.weight = '' this.weight = ''
} else { } else {
@@ -1509,13 +1513,13 @@ export default {
let 零件图号 let 零件图号
let flag = 0 let flag = 0
for (let i = 0; i < this.tableData.length; i++) { 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++) { for (let j = 0; j < this.partNum.length; j++) {
if (this.partNum[j].value === this.partNumValue) { if (this.partNum[j].value === this.partNumValue) {
零件图号 = this.partNum[j].label 零件图号 = 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++ flag++
if (flag === this.tableData.length) { if (flag === this.tableData.length) {
TableAddLi1(this.partNumValue, this.CraftmenValue).then(() => { TableAddLi1(this.partNumValue, this.CraftmenValue).then(() => {
@@ -1544,9 +1548,15 @@ export default {
if (this.partNumValue === '') { if (this.partNumValue === '') {
this.$message.error('请先选择一个零件') this.$message.error('请先选择一个零件')
} else { } else {
insertOne(this.partNumValue, row.工序流水号).then(response => { if (this.工艺是否更改 === 1) {
this.searchDetail() insertOne1(this.partNumValue, row.工序流水号).then(response => {
}) this.searchDetail()
})
} else {
insertOne(this.partNumValue, row.工序流水号).then(response => {
this.searchDetail()
})
}
} }
}, },
deleteOne(row) { // 删除行 deleteOne(row) { // 删除行

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

@@ -30,6 +30,7 @@
<el-table <el-table
ref="multipleTable" ref="multipleTable"
:data="tableData" :data="tableData"
:row-class-name="tableRowClassName"
style="width: 1000px;" style="width: 1000px;"
size="mini" size="mini"
height="750" 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].规格, 规格: 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].操作时间,
规格: 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() { currency() {
if (this.multipleSelection.length === 0) { if (this.multipleSelection.length === 0) {
@@ -433,3 +443,8 @@ export default {
margin-right: 10px; margin-right: 10px;
} }
</style> </style>
<style>
.el-table .UrgentItem{
background: #ff7575;
}
</style>

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

@@ -1,7 +1,8 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card> <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-select v-model="Machine" filterable clearable size="small" style="margin:0px 10px 0px 10px;width: 185px;" placeholder="机床号" @change="getGroup">
<el-option <el-option
v-for="item in Machines" v-for="item in Machines"
@@ -35,13 +36,18 @@
highlight-current-row highlight-current-row
empty-text=" " empty-text=" "
border border
@current-change="getRow"> @row-click="getRow">
<el-table-column type="index" label="序号" width="50"/> <el-table-column type="index" label="序号" width="50"/>
<el-table-column align="center" label="工艺名" show-overflow-tooltip min-width="70"> <el-table-column align="center" label="工艺名" show-overflow-tooltip min-width="70">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.工艺名称 }} {{ scope.row.工艺名称 }}
</template> </template>
</el-table-column> </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"> <el-table-column align="center" label="质检" width="60">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.序间质检 }} {{ scope.row.序间质检 }}
@@ -57,11 +63,6 @@
{{ scope.row.操作者 }} {{ scope.row.操作者 }}
</template> </template>
</el-table-column> </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"> <el-table-column align="center" label="完成日期" width="95">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.完成日期 }} {{ scope.row.完成日期 }}
@@ -80,17 +81,12 @@
highlight-current-row highlight-current-row
border border
height="630" height="630"
@current-change="getCurrentRow"> @row-click="getCurrentRow">
<el-table-column type="index" align="center" label="跟单号" width="140"> <el-table-column type="index" align="center" label="跟单号" width="140">
<template slot-scope="scope"> <template slot-scope="scope">
<el-radio :label="scope.row.跟单号" v-model="radio"/> <el-radio :label="scope.row.跟单号" v-model="radio"/>
</template> </template>
</el-table-column> </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"> <el-table-column align="center" label="零件图号" show-overflow-tooltip width="200">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件图号 }} {{ scope.row.零件图号 }}
@@ -121,7 +117,7 @@
{{ scope.row.计划结束时间 }} {{ scope.row.计划结束时间 }}
</template> </template>
</el-table-column> </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"> <template slot-scope="scope">
{{ scope.row.客户名称 }} {{ scope.row.客户名称 }}
</template> </template>
@@ -207,11 +203,39 @@
<el-button style="margin-left: 260px" @click="dialogFormVisible1 = false">取消</el-button> <el-button style="margin-left: 260px" @click="dialogFormVisible1 = false">取消</el-button>
<el-button type="primary" style="margin-top: 20px" @click="getName">确认</el-button> <el-button type="primary" style="margin-top: 20px" @click="getName">确认</el-button>
</el-dialog> </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> </div>
</template> </template>
<script> <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' import Cookie from 'js-cookie'
export default { export default {
@@ -257,7 +281,15 @@ export default {
ssks: '', ssks: '',
Number1: '', // 人员编号 Number1: '', // 人员编号
row2: [], row2: [],
khbmbh: '' khbmbh: '',
isDisabled: true,
dialogFormVisible2: false,
form2: {
操作者: '',
数量: ''
},
操作者: [],
max: 0
} }
}, },
created() { created() {
@@ -265,6 +297,43 @@ export default {
this.getTable9() this.getTable9()
}, },
methods: { 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) { formatJson(filterVal, jsonData) {
return jsonData.map(v => filterVal.map(j => { return jsonData.map(v => filterVal.map(j => {
return v[j] return v[j]
@@ -353,6 +422,8 @@ export default {
}, // 按条件查询 }, // 按条件查询
getTableData() { getTableData() {
this.tableData = [] this.tableData = []
this.tableData1 = []
this.isDisabled = true
this.Loading = true this.Loading = true
if (this.Machine === '') { if (this.Machine === '') {
this.checkbox_Machine = 0 this.checkbox_Machine = 0
@@ -390,16 +461,18 @@ export default {
this.total = response.data.total this.total = response.data.total
this.loading = false this.loading = false
}) })
}, // 获取工序表 },
// 获取工序表
getCurrentRow(row) { getCurrentRow(row) {
this.isDisabled = true
this.completeTime = '' this.completeTime = ''
this.dateOfProduction = '' this.dateOfProduction = ''
this.processSerialNumber = '' this.processSerialNumber = ''
this.radio = true this.radio = true
this.tableData1 = [] this.tableData1 = []
this.row2 = row this.row2 = row.工艺计划流水号
gettabledata1(row.工艺计划流水号).then(response => { gettabledata1(this.row2).then(response => {
console.log(response, 1212121) console.log(response.data)
if (response.data.length !== 0) { if (response.data.length !== 0) {
for (let i = 0; i < response.data.length; i++) { for (let i = 0; i < response.data.length; i++) {
this.tableData1.push({ 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].工序流水号,
工序状态: 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() { EditData() {
this.dialogFormVisible = true this.dialogFormVisible = true
this.form.人员 = '' this.form.人员 = ''
@@ -427,11 +528,7 @@ export default {
this.completeTime = row.完成日期 this.completeTime = row.完成日期
this.dateOfProduction = row.排产日期 this.dateOfProduction = row.排产日期
this.processSerialNumber = row.工序流水号 this.processSerialNumber = row.工序流水号
if (this.completeTime === '' && this.dateOfProduction !== '') { if (this.processSerialNumber) { this.isDisabled = false } else { this.isDisabled = true }
this.isShow = false
} else {
this.isShow = true
}
}, },
dialogTableVisible() { dialogTableVisible() {
this.dialogFormVisible1 = true 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-button size="medium" type="text" @click="toStatusQuery">零件状态查询</el-button>
</el-tooltip> </el-tooltip>
<el-divider direction="vertical"/> <el-divider direction="vertical"/>
<el-tooltip :open-delay="1000" effect="dark" content="转到加工进度查询模块" placement="top"> <!--<el-tooltip :open-delay="1000" effect="dark" content="转到加工进度查询模块" placement="top">-->
<el-button size="medium" type="text" @click="toProcessingStatus">加工进度查询</el-button> <!--<el-button size="medium" type="text" @click="toProcessingStatus">加工进度查询</el-button>-->
</el-tooltip> <!--</el-tooltip>-->
</el-row> </el-row>
</div> </div>
</div> </div>
@@ -372,7 +372,7 @@ export default {
procedure: response.data[i].工艺名称, procedure: response.data[i].工艺名称,
planningTime: response.data[i].计划日期_短, planningTime: response.data[i].计划日期_短,
actualTime: response.data[i].完成日期_短 === null || response.data[i].完成日期_短 === '' ? '未完成' : 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].进度颜色 color: response.data[i].进度颜色
}) })
} }

19
src/views/Outsourcing/OutsourcingTaskExecution/index.vue
View File

@@ -4,6 +4,7 @@
<span>零件号:</span> <span>零件号:</span>
<el-input v-model="partNumber" size="small" placeholder="零件号" clearable style="width:200px"/> <el-input v-model="partNumber" size="small" placeholder="零件号" clearable style="width:200px"/>
<el-button type="success" size="mini" icon="el-icon-search" style="margin-left:10px" @click="getList()">查询</el-button> <el-button type="success" size="mini" icon="el-icon-search" style="margin-left:10px" @click="getList()">查询</el-button>
<el-button type="danger" size="mini" icon="el-icon-caret-right" style="margin-left:10px" @click="getBack()">打回车间</el-button>
<el-table <el-table
v-loading="loading1" v-loading="loading1"
ref="multipleTable" ref="multipleTable"
@@ -327,7 +328,7 @@
</template> </template>
<script> <script>
import { initOutHelp, getTable, getData1, getTable1, getprocedure, searchManufactor, spareParts, addTable, editData, deleteData, insertParts, getParts, getPrice, editData1, deleteData1, getNumber } from '@/api/Outsourcing/OutsourcingTaskExecution' import { initOutHelp, getTable, getData1, getTable1, getprocedure, searchManufactor, spareParts, addTable, editData, deleteData, insertParts, getParts, getPrice, editData1, deleteData1, getNumber, getBack } from '@/api/Outsourcing/OutsourcingTaskExecution'
import { getExplorer, method5, Cleanup } from '@/vendor/exportExcel' import { getExplorer, method5, Cleanup } from '@/vendor/exportExcel'
import { convertCurrency } from '@/vendor/int2Chinese' import { convertCurrency } from '@/vendor/int2Chinese'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
@@ -1339,6 +1340,22 @@ export default {
handleSelectionChange(val) { handleSelectionChange(val) {
this.processNum = val this.processNum = val
}, },
getBack() {
if (this.processNum.length !== 0) {
this.result = 0
for (let i = 0; i < this.processNum.length; i++) {
getBack(this.processNum[i].工艺计划流水号).then(response => {
this.result += parseInt(response.data[0].result)
if (this.processNum.length === this.result) {
this.$message.success('打回成功')
this.getList()
}
})
}
} else {
this.$message.warning('请勾选要打回的零件')
}
},
// 选入零件 // 选入零件
getSpareParts() { getSpareParts() {
if (this.Number !== null) { if (this.Number !== null) {

8
src/views/PurchasingCenter/CreateInquirySheet/index.vue
View File

@@ -179,13 +179,15 @@
</el-table-column> </el-table-column>
<el-table-column label="库存(BZ)" align="center" min-width="70" prop="库存"> <el-table-column label="库存(BZ)" align="center" min-width="70" prop="库存">
<template slot-scope="scope"> <template slot-scope="scope">
{{ Number(scope.row.零件类型) === 1 ? scope.row.库存 = Number(scope.row.货位存量 ? scope.row.货位存量 : 0) - Number(scope.row.占用数量) : '-' }} {{ scope.row.库存 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="使用库存数量" align="center" min-width="105" prop="使用库存数"> <el-table-column label="使用库存数量" align="center" min-width="105" prop="使用库存数">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="Number(scope.row.零件类型) !== 1">-</span> <template v-if="scope.row.库存 === '0'">
<el-input-number v-if="Number(scope.row.零件类型) === 1" v-model="scope.row.使用库存数" :min="0" :max="Number(scope.row.零件数量) > (Number(scope.row.货位存量) - Number(scope.row.占用数量)) ? (Number(scope.row.货位存量) - Number(scope.row.占用数量) + Number(scope.row.使用库存数)) : Number(scope.row.零件数量)" :disabled="(Number(scope.row.货位存量) - Number(scope.row.占用数量)) === 0 || parseInt(scope.row.采购状态编号)===3" size="mini" style="width: 90px" @change="changeNumber(scope.row)"/> —
</template>
<el-input-number v-else v-model="scope.row.使用库存数" :min="0" :max="Number(scope.row.零件数量) > (Number(scope.row.货位存量) - Number(scope.row.占用数量)) ? (Number(scope.row.货位存量) - Number(scope.row.占用数量) + Number(scope.row.使用库存数)) : Number(scope.row.零件数量)" :disabled="(Number(scope.row.货位存量) - Number(scope.row.占用数量)) === 0 || parseInt(scope.row.采购状态编号)===3" size="mini" style="width: 90px" @change="changeNumber(scope.row)"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="已用滞货" align="center" min-width="70"> <el-table-column label="已用滞货" align="center" min-width="70">

35
src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
View File

@@ -164,6 +164,15 @@
{{ scope.row.供货商 }} {{ scope.row.供货商 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
@click="handle(scope.row)">替换
</el-button>
</template>
</el-table-column>
</el-table> </el-table>
</el-card> </el-card>
@@ -339,7 +348,7 @@
<script> <script>
import { sleep } from '../../../utils/tool' import { sleep } from '../../../utils/tool'
import { unSpecificationQuery1, specificationQuery1, unSpecificationQueryWB1, specificationQueryWB1, deleteBasicParts, deleteBWParts, getMaterial, getMaterialWB, searchMaterialWB, updateRow, updateRowWB, transferMX1, update, searchOldParts, getMachineNames, transferWG1, allDelete, update1, searchMaterial1 } from '../../../api/TechnologyCenter/ImportParts' import { unSpecificationQuery1, updateNum, specificationQuery1, unSpecificationQueryWB1, specificationQueryWB1, deleteBasicParts, deleteBWParts, getMaterial, getMaterialWB, searchMaterialWB, updateRow, updateRowWB, transferMX1, update, searchOldParts, getMachineNames, transferWG1, allDelete, update1, searchMaterial1 } from '../../../api/TechnologyCenter/ImportParts'
export default { export default {
name: 'SpecificationData', name: 'SpecificationData',
props: { props: {
@@ -383,6 +392,7 @@ export default {
oldPartsValue: '', oldPartsValue: '',
Number: '', Number: '',
Type: '', Type: '',
NumId: '', // 物料流水号
PartsValue: [], PartsValue: [],
PartsValueNum: '', PartsValueNum: '',
type: 0, // 零件类型 暂定1为基本件，2为外购件和标准件 type: 0, // 零件类型 暂定1为基本件，2为外购件和标准件
@@ -547,6 +557,7 @@ export default {
}, },
searchMaterial1(row) { searchMaterial1(row) {
console.log(row) console.log(row)
this.NumId = row.id
searchMaterial1(row.图号或者型号, row.名称, row.规格).then(response => { searchMaterial1(row.图号或者型号, row.名称, row.规格).then(response => {
this.tableData10 = response.data this.tableData10 = response.data
console.log(response.data) console.log(response.data)
@@ -638,6 +649,28 @@ export default {
console.log(`编辑类型发生错误`) console.log(`编辑类型发生错误`)
} }
}, },
handle(row) {
this.$confirm('是否替换?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
updateNum(row.物料流水号, this.NumId).then(response => {
if (response.data[0].result === '1') {
this.$message.success('替换成功')
this.tableData10 = []
this.fetchData()
} else {
this.$message.error('替换失败')
}
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消替换'
})
})
},
cancel() { cancel() {
this.dialogFormVisible = false this.dialogFormVisible = false
}, },

1
src/views/TechnologyCenter/ImportParts/index.vue
View File

@@ -341,6 +341,7 @@ export default {
return return
} else { } else {
if (this.worksheet[j].M2.v.substring(0, 1) !== '9') { if (this.worksheet[j].M2.v.substring(0, 1) !== '9') {
console.log(this.worksheet[j].P1, 123344)
this.worksheet[j].G1 ? establishment = this.worksheet[j].G1.v : establishment = '' this.worksheet[j].G1 ? establishment = this.worksheet[j].G1.v : establishment = ''
this.worksheet[j].I1 ? proofread = this.worksheet[j].I1.v : proofread = '' this.worksheet[j].I1 ? proofread = this.worksheet[j].I1.v : proofread = ''
this.worksheet[j].L1 ? review = this.worksheet[j].L1.v : review = '' this.worksheet[j].L1 ? review = this.worksheet[j].L1.v : review = ''

43
src/views/TechnologyCenter/ImportParts/specificationData.vue
View File

@@ -144,11 +144,6 @@
highlight-current-row highlight-current-row
border border
stripe> stripe>
<el-table-column
label="序号"
align="center"
type="index"
width="50"/>
<el-table-column align="center" label="物料名称" show-overflow-tooltip> <el-table-column align="center" label="物料名称" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料名称 }} {{ scope.row.物料名称 }}
@@ -169,6 +164,15 @@
{{ scope.row.供货商 }} {{ scope.row.供货商 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
@click="handle(scope.row)">替换
</el-button>
</template>
</el-table-column>
</el-table> </el-table>
</el-card> </el-card>
</el-col> </el-col>
@@ -279,7 +283,7 @@
<script> <script>
import { sleep } from '../../../utils/tool' import { sleep } from '../../../utils/tool'
import { unSpecificationQuery, unSpecificationQueryWB, specificationQueryWB, specificationQuery, deleteBasicParts, deleteBWParts, getMaterial, getMaterialWB, searchMaterialWB, updateRow, updateRowWB, transferMX, transferWG, allDelete, searchMaterial1, getMachineNames } from '../../../api/TechnologyCenter/ImportParts' import { unSpecificationQuery, unSpecificationQueryWB, specificationQueryWB, specificationQuery, deleteBasicParts, deleteBWParts, getMaterial, getMaterialWB, searchMaterialWB, updateRow, updateRowWB, transferMX, transferWG, allDelete, searchMaterial1, getMachineNames, updateNum } from '../../../api/TechnologyCenter/ImportParts'
export default { export default {
name: 'SpecificationData', name: 'SpecificationData',
props: { props: {
@@ -316,6 +320,7 @@ export default {
pageSize: 10, pageSize: 10,
total: 0, total: 0,
title: '', title: '',
NumId: '',
materials: [], materials: [],
dialogFormVisible: false, dialogFormVisible: false,
type: 0, // 零件类型 暂定1为基本件，2为外购件和标准件 type: 0, // 零件类型 暂定1为基本件，2为外购件和标准件
@@ -346,7 +351,8 @@ export default {
pageCurrentMaterial: 1, pageCurrentMaterial: 1,
pageSizeMaterial: 10, pageSizeMaterial: 10,
totalMaterial: 0, totalMaterial: 0,
loadingMaterial: false loadingMaterial: false,
multipleSelection: []
} }
}, },
computed: { computed: {
@@ -403,6 +409,28 @@ export default {
return 'rgb196' return 'rgb196'
} }
}, },
handle(row) {
this.$confirm('是否替换?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
updateNum(row.物料流水号, this.NumId).then(response => {
if (response.data[0].result === '1') {
this.$message.success('替换成功')
this.tableData10 = []
this.fetchData()
} else {
this.$message.error('替换失败')
}
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消替换'
})
})
},
async fetchData() { async fetchData() {
this.pageCurrent = 1 this.pageCurrent = 1
this.tableData10 = [] this.tableData10 = []
@@ -519,6 +547,7 @@ export default {
} }
}, },
searchMaterial1(row) { searchMaterial1(row) {
this.NumId = row.id
searchMaterial1(row.图号或者型号, row.名称, row.规格).then(response => { searchMaterial1(row.图号或者型号, row.名称, row.规格).then(response => {
this.tableData10 = response.data this.tableData10 = response.data
}) })

87
src/views/TechnologyCenter/QueryParts/index.vue
View File

@@ -26,6 +26,7 @@
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<el-button icon="el-icon-search" type="success" size="small" @click="pageCurrentWB = 1;pageSizeWB = 1000;pageCurrent = 1;pageSize = 1000;getTableData()">查询</el-button> <el-button icon="el-icon-search" type="success" size="small" @click="pageCurrentWB = 1;pageSizeWB = 1000;pageCurrent = 1;pageSize = 1000;getTableData()">查询</el-button>
<el-button icon="el-icon-circle-plus-outline" type="primary" size="small" @click="openUrgentItem()">加急件</el-button>
</el-card> </el-card>
<el-card> <el-card>
<div v-for="(file, key) in hadFile" :key="key"> <div v-for="(file, key) in hadFile" :key="key">
@@ -262,11 +263,49 @@
@current-change="handleCurrentChangeWB"/> @current-change="handleCurrentChangeWB"/>
</div> </div>
</el-card> </el-card>
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="添加加急件" center style="min-height: 300px" width="500px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="100px" class="demo-ruleForm">
<el-form-item label="机床号" prop="机床号" style="margin-left: 70px">
<el-select v-model="form.机床号" placeholder="选择机床" filterable clearable size="small" style="width:200px" @change="getGroupSelect1">
<el-option
v-for="item in machine"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
<el-form-item label="组号" prop="组号" style="margin-left: 70px">
<el-select v-model="form.组号" placeholder="选择组号" filterable clearable size="small" style="width:200px">
<el-option
v-for="item in group1"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
<el-form-item label="零件图号" prop="零件图号" style="margin-left: 70px">
<el-input v-model="form.零件图号" placeholder="零件图号" size="small" style="width:200px" clearable/>
</el-form-item>
<el-form-item label="零件名称" prop="零件名称" style="margin-left: 70px">
<el-input v-model="form.零件名称" placeholder="零件名称" size="small" style="width:200px" clearable/>
</el-form-item>
<el-form-item label="零件数量" prop="零件数量" style="margin-left: 70px">
<el-input v-model="form.零件数量" placeholder="零件数量" size="small" style="width:200px" clearable/>
</el-form-item>
<el-form-item label="零件备注" prop="零件备注" style="margin-left: 70px">
<el-input v-model="form.零件备注" placeholder="零件备注" size="small" style="width:200px" clearable/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff('form')">取消</el-button>
<el-button type="primary" @click="submit('form')">确定</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { machineSelect, groupSelect, basicPartsData, deleteBasicParts, purchasePartsData, deletePurchaseData, getFileData } from '@/api/TechnologyCenter/QueryParts' import { machineSelect, groupSelect, basicPartsData, deleteBasicParts, purchasePartsData, deletePurchaseData, getFileData, addUrgentItem } from '@/api/TechnologyCenter/QueryParts'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import { ServerIP } from '@/utils/request' import { ServerIP } from '@/utils/request'
export default { export default {
@@ -277,8 +316,10 @@ export default {
machine: [], machine: [],
groupValue: '', groupValue: '',
group: [], group: [],
group1: [],
loading: false, loading: false,
loadingWB: false, loadingWB: false,
dialogFormVisible: false,
total: 0, total: 0,
tableData: [], tableData: [],
tableDataWB: [], tableDataWB: [],
@@ -287,6 +328,21 @@ export default {
pageCurrentWB: 1, pageCurrentWB: 1,
pageSizeWB: 1000, pageSizeWB: 1000,
totalWB: 0, totalWB: 0,
form: {
机床号: '',
组号: '',
零件图号: '',
零件名称: '',
零件数量: '',
零件备注: ''
},
rules: {
机床号: [{ required: true, message: '请选择机床', trigger: 'change' }],
组号: [{ required: true, message: '请选择组号', trigger: 'change' }],
零件图号: [{ required: true, message: '请输入零件图号', trigger: 'blur' }],
零件名称: [{ required: true, message: '请输入零件名称', trigger: 'blur' }],
零件数量: [{ required: true, message: '请输入零件数量', trigger: 'blur' }]
},
hadFile: [] hadFile: []
} }
}, },
@@ -357,6 +413,29 @@ export default {
getGroupSelect(val) { getGroupSelect(val) {
this.getSelect(groupSelect, ['组号', '组件流水号'], 'group', val) this.getSelect(groupSelect, ['组号', '组件流水号'], 'group', val)
}, },
getGroupSelect1() {
this.form.组号 = ''
this.getSelect(groupSelect, ['组号', '组件流水号'], 'group1', this.form.机床号)
},
callOff(formName) {
this.dialogFormVisible = false
this.$refs[formName].resetFields()
},
submit(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
addUrgentItem(this.form.组号, this.form.零件图号, this.form.零件名称, this.form.零件数量, this.form.零件备注, this.id).then(response => {
if (response.data[0].result === '1') {
this.$message.success('添加成功')
this.getTableData()
this.dialogFormVisible = false
} else {
this.$message.error('添加成功')
}
})
}
})
},
getTableData() { getTableData() {
this.getFileData(this.machineValue) this.getFileData(this.machineValue)
console.log(this.hadFile, 88899) console.log(this.hadFile, 88899)
@@ -398,6 +477,12 @@ export default {
}) })
}) })
}, },
openUrgentItem() {
if (this.$refs['form'] !== undefined) {
this.$refs['form'].resetFields()
}
this.dialogFormVisible = true
},
handleDelete(row) { handleDelete(row) {
if (row.基本件流水号) { if (row.基本件流水号) {
this.deleteRow(deleteBasicParts, row.基本件流水号, function() { this.deleteRow(deleteBasicParts, row.基本件流水号, function() {

14
src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
View File

@@ -110,7 +110,8 @@
{{ scope.row.采购单名称 }} {{ scope.row.采购单名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="供应商" prop="供应商名称" align="center" min-width="200" width="200" show-overflow-tooltip> <!--<el-table-column label="供应商" prop="供应商名称" align="center" min-width="200" width="200" show-overflow-tooltip>-->
<el-table-column label="供应商" prop="供应商名称" align="center" min-width="200" width="230" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供应商名称 }} {{ scope.row.供应商名称 }}
</template> </template>
@@ -161,6 +162,17 @@
<!--@size-change="handleSizeChange2"--> <!--@size-change="handleSizeChange2"-->
<!--@current-change="handleCurrentChange2"/>--> <!--@current-change="handleCurrentChange2"/>-->
<!--</div>--> <!--</div>-->
<div class="block">
<el-pagination
:current-page="pageCurrent2"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize2"
:total="total2"
style="display:inline-block;width:40%;float: right;margin-right: 60px"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange2"
@current-change="handleCurrentChange2"/>
</div>
<el-table v-loading="" :data="tableData3" border highlight-current-row stripe style="margin: 3px 0" height="455px" size="mini"> <el-table v-loading="" :data="tableData3" border highlight-current-row stripe style="margin: 3px 0" height="455px" size="mini">
<el-table-column label="备料状态" align="center" width="80"> <el-table-column label="备料状态" align="center" width="80">
<template slot-scope="scope"> <template slot-scope="scope">

1
src/views/WorkshopProcurement/NewArrivalList/index.vue
View File

@@ -84,6 +84,7 @@
<el-card style="width: 54%;float: left;margin-left: 10px"> <el-card style="width: 54%;float: left;margin-left: 10px">
<span>到货单明细</span> <span>到货单明细</span>
<el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px" @click="downloadExcel()">导出</el-button> <el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px" @click="downloadExcel()">导出</el-button>
<!--<el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px" @click="downloadExcel()">导出</el-button>-->
<el-table <el-table
v-loading="" v-loading=""
:data="tableData5" :data="tableData5"

2
src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
View File

@@ -309,7 +309,7 @@ export default {
tableData1: [], tableData1: [],
tableData01: [], tableData01: [],
tableData4: [], tableData4: [],
dateRange: '', // dateRange: '',
gridData: [], gridData: [],
check1: 0, check1: 0,
check2: 0, check2: 0,

86
src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
View File

@@ -78,47 +78,51 @@
<el-table-column label="请款人" align="center" min-width="80" width="100"> <el-table-column label="请款人" align="center" min-width="80" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.姓名 }} {{ scope.row.姓名 }}
</template> <el-table-column label="请款时间" align="center" min-width="150" prop="date">
</el-table-column> <template slot-scope="scope">
<el-table-column label="请款金额" align="center" min-width="90" width="90" prop="请款金额"> {{ scope.row.请款时间 | formatTime }}
<template slot-scope="scope"> </template>
{{ parseFloat(scope.row.请款金额).toFixed(2) }} </el-table-column>
</template> <el-table-column label="请款金额" align="center" min-width="90" width="90" prop="请款金额">
</el-table-column> <template slot-scope="scope">
<el-table-column label="审批情况内容" width="100" align="center"> {{ parseFloat(scope.row.请款金额).toFixed(2) }}
<template slot-scope="scope"> </template>
<el-tag v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="mini">未审批</el-tag> </el-table-column>
<el-tag v-if="Number(scope.row.审批情况流水号)===1" type="success" size="mini">已通过</el-tag> <el-table-column label="审批情况内容" width="100" align="center">
<el-tag v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="mini">不通过</el-tag> <template slot-scope="scope">
</template> <el-tag v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="mini">未审批</el-tag>
</el-table-column> <el-tag v-if="Number(scope.row.审批情况流水号)===1" type="success" size="mini">已通过</el-tag>
<el-table-column label="未通过审批原因" width="110" align="center"> <el-tag v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="mini">不通过</el-tag>
<template slot-scope="scope"> {{ parseFloat(scope.row.请款金额).toFixed(2) }}
{{ scope.row.未通过审批原因 === '通过' ? '—' : scope.row.未通过审批原因 }} </template>
</template> </el-table-column>
</el-table-column> <el-table-column label="未通过审批原因" width="110" align="center">
<el-table-column label="付款情况" width="100" align="center"> <template slot-scope="scope">
<template slot-scope="scope"> {{ scope.row.未通过审批原因 === '通过' ? '—' : scope.row.未通过审批原因 }}
<el-tag v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="mini">未操作</el-tag> </template>
<el-tag v-if="Number(scope.row.付款情况流水号)===1" type="success" size="mini">已同意</el-tag> </el-table-column>
<el-tag v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="mini">不同意</el-tag> <el-table-column label="付款情况" width="100" align="center">
</template> <template slot-scope="scope">
</el-table-column> <el-tag v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="mini">未操作</el-tag>
<el-table-column label="未付款原因" width="100" align="center"> <el-tag v-if="Number(scope.row.付款情况流水号)===1" type="success" size="mini">已同意</el-tag>
<template slot-scope="scope"> <el-tag v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="mini">不同意</el-tag>
{{ scope.row.未付款原因 === '通过' ? '—' : scope.row.未付款原因 }} </template>
</template> </el-table-column>
</el-table-column> <el-table-column label="未付款原因" width="100" align="center">
<el-table-column label="操作" align="center" width="80"> <template slot-scope="scope">
<template slot-scope="scope"> {{ scope.row.未付款原因 === '通过' ? '—' : scope.row.未付款原因 }}
<el-tooltip effect="dark" content="取消请款" placement="top"> </template>
<div style="display: inline-block"> </el-table-column>
<el-button :disabled="Number(scope.row.审批情况流水号)!==3" type="text" size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="cancelRequestFund(scope.row)"/> <el-table-column label="操作" align="center" width="80">
</div> <template slot-scope="scope">
</el-tooltip> <el-tooltip effect="dark" content="取消请款" placement="top">
</template> <div style="display: inline-block">
</el-table-column> <el-button :disabled="Number(scope.row.审批情况流水号)!==3" type="text" size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="cancelRequestFund(scope.row)"/>
</el-table> </div>
</el-tooltip>
</template>
</el-table-column>
</template></el-table-column></el-table>
<div class="block" style="margin-top: 10px;"> <div class="block" style="margin-top: 10px;">
<el-pagination <el-pagination
:current-page="pageCurrent1" :current-page="pageCurrent1"