diff --git a/src/api/Inventory/PurchaseInRecord.js b/src/api/Inventory/PurchaseInRecord.js index 5fb510cd..fdd302a6 100644 --- a/src/api/Inventory/PurchaseInRecord.js +++ b/src/api/Inventory/PurchaseInRecord.js @@ -11,7 +11,7 @@ export function initMachineProject() { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: 'PDM_项目名称_查询数据' + name: '采购管理_仓库采购_入库记录_机床图号_查询' } }) } @@ -24,7 +24,7 @@ export function searchGroup(num) { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: 'PDM_组件名称_查询数据', + name: '采购管理_仓库采购_入库记录_组件名称_查询', param: '机床流水号=' + num } }) diff --git a/src/api/Inventory/PurchaseOutRecord.js b/src/api/Inventory/PurchaseOutRecord.js index d3d27a86..fbe7b148 100644 --- a/src/api/Inventory/PurchaseOutRecord.js +++ b/src/api/Inventory/PurchaseOutRecord.js @@ -11,7 +11,8 @@ export function initMachineProject() { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: 'PDM_项目名称_查询数据' + // name: 'PDM_项目名称_查询数据' + name: '采购管理_仓库采购_出库记录_机床图号_查询' } }) } @@ -24,7 +25,8 @@ export function searchGroup(num) { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: 'PDM_组件名称_查询数据', + // name: 'PDM_组件名称_查询数据', + name: '采购管理_仓库采购_出库记录_组件名称_查询', param: '机床流水号=' + num } }) diff --git a/src/api/ManufacturingCenter/PartAssignment.js b/src/api/ManufacturingCenter/PartAssignment.js index 5e78160f..56b04b14 100644 --- a/src/api/ManufacturingCenter/PartAssignment.js +++ b/src/api/ManufacturingCenter/PartAssignment.js @@ -11,7 +11,8 @@ export function initProject() { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: 'PDM_项目名称_查询数据' + // name: 'PDM_项目名称_查询数据' + name: '制造中心_制造_零件分配_机床编号_查询' } }) } @@ -38,7 +39,7 @@ export function searchgroup(num) { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: 'PDM_组件名称_查询数据', + name: '制造中心_制造_零件分配_组号_查询', param: '机床流水号=' + num } }) diff --git a/src/api/ManufacturingCenter/ProcessingStatusNew.js b/src/api/ManufacturingCenter/ProcessingStatusNew.js index 225b798a..c918388c 100644 --- a/src/api/ManufacturingCenter/ProcessingStatusNew.js +++ b/src/api/ManufacturingCenter/ProcessingStatusNew.js @@ -176,3 +176,28 @@ export function submit2(num, num1, num2) { } }) } +export function submitEdit3(num, num1, num2, num3, num4) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '车间生产管理工艺_修补完成数量_增加数据', + param: `工序流水号=${num}&操作者编号=${num1}&完成数量=${num2}&修补工时=${num3}&完成时间=${num4}` + } + }) +} +export function getPerson_Form3() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间生产管理工艺_追溯加工过程_操作者查询' + } + }) +} diff --git a/src/api/WorkshopProcurement/RequestOutsourcingMaterials.js b/src/api/WorkshopProcurement/RequestOutsourcingMaterials.js index 68bd754c..03a0e2d7 100644 --- a/src/api/WorkshopProcurement/RequestOutsourcingMaterials.js +++ b/src/api/WorkshopProcurement/RequestOutsourcingMaterials.js @@ -87,3 +87,4 @@ export function cancelRequestFund(num) { } }) } + diff --git a/src/assets/img/StationLayout.jpg b/src/assets/img/StationLayout.jpg index ffac2acc..5185b9a0 100644 Binary files a/src/assets/img/StationLayout.jpg and b/src/assets/img/StationLayout.jpg differ diff --git a/src/assets/img/StationLayout.psd b/src/assets/img/StationLayout.psd index c5201241..b05addcc 100644 Binary files a/src/assets/img/StationLayout.psd and b/src/assets/img/StationLayout.psd differ diff --git a/src/views/Assembly/SparePartsOutStockRecord/index.vue b/src/views/Assembly/SparePartsOutStockRecord/index.vue index 4385f57b..87acf530 100644 --- a/src/views/Assembly/SparePartsOutStockRecord/index.vue +++ b/src/views/Assembly/SparePartsOutStockRecord/index.vue @@ -22,46 +22,58 @@ 零件图号: - + 时间区间: - ~ - + format="yyyy-MM-dd" + range-separator="～" + start-placeholder="开始日期" + end-placeholder="结束日期"/> + + + + + + + + + + + + + + + 查询 - + - + - + - + @@ -93,6 +105,35 @@ import { initProject, searchgroup, selecttable } from '@/api/Assembly/SpareParts export default { data() { return { + dateRange: '', + expands: [], + pickerOptions: { + shortcuts: [{ + text: '上季度', + onClick(picker) { + const end = new Date() + const start = new Date() + start.setTime(end.getTime() - 3600 * 1000 * 24 * 30 * 3) + picker.$emit('pick', [start, end]) + } + }, { + text: '过去半年', + onClick(picker) { + const end = new Date() + const start = new Date() + start.setTime(end.getTime() - 3600 * 1000 * 24 * 366 / 2) + picker.$emit('pick', [start, end]) + } + }, { + text: '过去一年', + onClick(picker) { + const end = new Date() + const start = new Date() + start.setTime(end.getTime() - 3600 * 1000 * 24 * 365) + picker.$emit('pick', [start, end]) + } + }] + }, PartDrawingNumber: '', startTime: '', endTime: '', @@ -164,9 +205,9 @@ export default { if (this.machineNumberValue !== '' && this.machineNumberValue !== null) { this.check1 = 1 } else { this.check1 = 0 } if (this.groupNumberValue !== '' && this.groupNumberValue !== null) { this.check2 = 1 } else { this.check2 = 0 } if (this.PartDrawingNumber !== '' && this.PartDrawingNumber !== null) { this.check3 = 1 } else { this.check3 = 0 } - if (this.startTime === '' || this.startTime === null) { this.startTime_check = 0 } else { this.startTime_check = 1 } - if (this.endTime === '' || this.endTime === null) { this.endTime_check = 0 } else { this.endTime_check = 1 } - selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.PartDrawingNumber, this.startTime_check, this.startTime, this.endTime_check, this.endTime, this.pageCurrent, this.pageSize, this.ordername, this.order).then(response => { + this.dateRange ? this.startTime_check = 1 : (this.startTime_check = 0, this.dateRange = '') + this.dateRange ? this.endTime_check = 1 : (this.endTime_check = 0, this.dateRange = '') + selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.PartDrawingNumber, this.startTime_check, this.dateRange[0], this.endTime_check, this.dateRange[1], this.pageCurrent, this.pageSize, this.ordername, this.order).then(response => { this.tableData1 = response.data.rows this.loading = false this.total = response.data.total diff --git a/src/views/Inventory/PurchaseInRecord/index.vue b/src/views/Inventory/PurchaseInRecord/index.vue index e0b0cd28..7be537c8 100644 --- a/src/views/Inventory/PurchaseInRecord/index.vue +++ b/src/views/Inventory/PurchaseInRecord/index.vue @@ -1,8 +1,8 @@ - + @@ -92,6 +102,7 @@ export default { name: 'PurchaseInRecord', data() { return { + date: [], machineValue: '', machine: [], groupValue: '', @@ -106,6 +117,11 @@ export default { total1: 0 } }, + watch: { + groupValue() { + this.searchRecord() + } + }, created() { this.fetchData() }, @@ -164,6 +180,9 @@ export default { label: response.data[i].组号 }) } + if (response.data.length > 0) { + this.groupValue = this.group[0].value + } }) }, searchRecord() { @@ -172,6 +191,7 @@ export default { this.searchRecord1() }, searchRecord1() { + console.log(111111) let check1, check2, check3, check4, check5, check6, check7 this.projectValue ? check1 = 1 : check1 = 0 this.machineValue ? check2 = 1 : check2 = 0 @@ -180,6 +200,8 @@ export default { this.spec ? check5 = 1 : check5 = 0 this.model ? check6 = 1 : check6 = 0 this.inTime ? check7 = 1 : (check7 = 0, this.inTime = '') + this.tableData = '' + this.total1 = 0 searchRecord1(check1, this.projectValue, check2, this.machineValue, check3, this.groupValue, check4, this.name, check5, this.spec, check6, this.model, check7, this.inTime[0], this.inTime[1], this.pageCurrent1, this.pageSize1).then(res => { this.tableData1 = res.data.rows this.total1 = res.data.total diff --git a/src/views/Inventory/PurchaseOutRecord/index.vue b/src/views/Inventory/PurchaseOutRecord/index.vue index 948f0dbe..dfdb79a7 100644 --- a/src/views/Inventory/PurchaseOutRecord/index.vue +++ b/src/views/Inventory/PurchaseOutRecord/index.vue @@ -1,8 +1,8 @@ - + @@ -108,6 +118,11 @@ export default { outTime: '' // 出库时间 } }, + watch: { + groupValue() { + this.searchRecord() + } + }, created() { this.fetchData() }, @@ -125,7 +140,7 @@ export default { this.name ? check4 = 1 : check4 = 0 this.spec ? check5 = 1 : check5 = 0 this.model ? check6 = 1 : check6 = 0 - this.inTime ? check7 = 1 : (check7 = 0, this.inTime = '') + this.outTime ? check7 = 1 : (check7 = 0, this.outTime = '') var param = [] param[0] = ['项目流水号_check', check1] param[1] = ['项目流水号', this.projectValue] @@ -139,9 +154,9 @@ export default { param[9] = ['规格', this.spec] param[10] = ['图号或型号_check', check6] param[11] = ['图号或型号', this.model] - param[12] = ['入库时间_check', check7] - param[13] = ['入库开始时间', this.inTime[0]] - param[14] = ['入库结束时间', this.inTime[1]] + param[12] = ['出库时间_check', check7] + param[13] = ['出库开始时间', this.outTime[0]] + param[14] = ['出库结束时间', this.outTime[1]] var Data = this.CreateData('00', '报表_采购部仓库_出库记录_查询', param) this.exportExcel_NPOI(Data) }, @@ -166,6 +181,9 @@ export default { label: response.data[i].组号 }) } + if (response.data.length > 0) { + this.groupValue = this.group[0].value + } }) }, searchRecord() { @@ -177,7 +195,8 @@ export default { this.spec ? check5 = 1 : check5 = 0 this.model ? check6 = 1 : check6 = 0 this.outTime ? check7 = 1 : (check7 = 0, this.outTime = '') - console.log(this.outTime, 999) + this.tableData = [] + this.total1 = 0 searchRecord(check1, this.projectValue, check2, this.machineValue, check3, this.groupValue, check4, this.name, check5, this.spec, check6, this.model, check7, this.outTime[0], this.outTime[1], this.pageCurrent1, this.pageSize1).then(res => { this.tableData = res.data.rows this.total1 = res.data.total diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue index 5cb0b46b..ef4311f0 100644 --- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue +++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue @@ -1,35 +1,39 @@ - + - + - + @@ -327,4 +331,21 @@ export default { + diff --git a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue index 633cbdc3..96424075 100644 --- a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue +++ b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue @@ -532,49 +532,76 @@ - -
-
+
+ +
+ +
{{ 机床总装 }}
- - -
-
+
+
+ +
+ +
{{ 部件装配 }}
- +
- -
-
- -
设备开机
电流计正常工作
工控机关机
- 电脑关机 - -
-
-
- 设备开机 -
-
-
- 设备工作 -
-
-
- 设备关机 -
-
-
- 电流计故障 -
- + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + +
+
+ + + + + + + + + + +
@@ -586,6 +613,8 @@ import { mapGetters } from 'vuex' // 暂无用 export default { data() { return { + tableData1: '', + tableData2: '', returns1: '', returns2: '', fang: '_fang', @@ -668,6 +697,12 @@ export default { this.connect() // this.getwork_state() this.getOP_state() + getZongzhuang().then(res2 => { + this.tableData1 = res2.data + }) + getBuzhuang().then(res3 => { + this.tableData2 = res3.data + }) // this.timer = setInterval(this.getwork_state, 60 * 1000) // 工位状态 60秒 一刷新 }, beforeDestroy() { @@ -711,7 +746,7 @@ export default { }, // 工位电流值 // 1停机灰色 2开机黄色 3运行绿色 4报警红色 - // 0 电流计故障 蓝闪 1 设备关机 灰闪 2 设备开机 黄闪 3 设备工作 绿闪 10断网或电脑关机 灰色 + // 0 电流计故障 蓝 1 设备关机 灰 2 设备开机 黄 3 设备工作 绿 10断网或电脑关机 透明 getOP_state() { getOP_state().then(response => { for (let i = 0; i < response.data.length; i++) { @@ -720,31 +755,31 @@ export default { $('#' + response.data[i].工位号 + '_circle').removeClass('circle3') $('#' + response.data[i].工位号 + '_circle').removeClass('circle2') $('#' + response.data[i].工位号 + '_circle').removeClass('circle4') - $('#' + response.data[i].工位号 + '_circle').addClass('circle1') // 黄色闪 + $('#' + response.data[i].工位号 + '_circle').addClass('circle1') // 黄色 } else if (response.data[i].状态代码 === '3') { $('#' + response.data[i].工位号 + '_circle').removeClass('circle3') $('#' + response.data[i].工位号 + '_circle').removeClass('circle1') $('#' + response.data[i].工位号 + '_circle').removeClass('circle2') $('#' + response.data[i].工位号 + '_circle').removeClass('circle4') - $('#' + response.data[i].工位号 + '_circle').addClass('circle') // 绿色闪 + $('#' + response.data[i].工位号 + '_circle').addClass('circle') // 绿色 } else if (response.data[i].状态代码 === '0') { $('#' + response.data[i].工位号 + '_circle').removeClass('circle') $('#' + response.data[i].工位号 + '_circle').removeClass('circle1') $('#' + response.data[i].工位号 + '_circle').removeClass('circle2') $('#' + response.data[i].工位号 + '_circle').removeClass('circle4') - $('#' + response.data[i].工位号 + '_circle').addClass('circle3') // 蓝色闪 + $('#' + response.data[i].工位号 + '_circle').addClass('circle3') // 蓝色 } else if (response.data[i].状态代码 === '1') { $('#' + response.data[i].工位号 + '_circle').removeClass('circle') $('#' + response.data[i].工位号 + '_circle').removeClass('circle1') $('#' + response.data[i].工位号 + '_circle').removeClass('circle3') $('#' + response.data[i].工位号 + '_circle').removeClass('circle4') - $('#' + response.data[i].工位号 + '_circle').addClass('circle2') // 灰色闪 + $('#' + response.data[i].工位号 + '_circle').addClass('circle2') // 灰色 } else { $('#' + response.data[i].工位号 + '_circle').removeClass('circle3') $('#' + response.data[i].工位号 + '_circle').removeClass('circle1') $('#' + response.data[i].工位号 + '_circle').removeClass('circle') $('#' + response.data[i].工位号 + '_circle').removeClass('circle2') - $('#' + response.data[i].工位号 + '_circle').addClass('circle4') // 灰色 + $('#' + response.data[i].工位号 + '_circle').addClass('circle4') // 灰色圈 } } }) @@ -759,6 +794,7 @@ export default { this.returns2 = '' if ($event.path[2].id === '机床总装') { getZongzhuang().then(res2 => { + // this.tableData1 = res2.data if (res2.data.length !== 0) { this.returns1 = '
总装机床：
' for (let i = 0; i < res2.data.length; i++) { @@ -771,6 +807,7 @@ export default { }) } else if ($event.path[2].id === '部件装配') { getBuzhuang().then(res3 => { + this.tableData2 = res3.data if (res3.data.length !== 0) { this.returns2 = '
部件装配：
' for (let i = 0; i < res3.data.length; i++) { @@ -848,7 +885,19 @@ export default { this.tooltip3 = '加工零件：' + response.data[0].零件图号_零件工艺计划 } getOP_state2($event.path[2].id).then(res => { - if (res.data[0].状态代码 === '1') { this.tooltip2 = '设备状态：关机' } else if (res.data[0].状态代码 === '2') { this.tooltip2 = '设备状态：等待' } else if (res.data[0].状态代码 === '3') { this.tooltip2 = '设备状态：运行' } else if (res.data[0].状态代码 === '4') { this.tooltip2 = '设备状态：报警' } + if (res.data[0].状态代码 === '0') { + this.tooltip2 = '设备状态：设备报警' + } else if (res.data[0].状态代码 === '1') { + this.tooltip2 = '设备状态：关机' + } else if (res.data[0].状态代码 === '2') { + this.tooltip2 = '设备状态：等待' + } else if (res.data[0].状态代码 === '3') { + this.tooltip2 = '设备状态：运行' + } else if (res.data[0].状态代码 === '4') { + this.tooltip2 = '设备状态：报警' + } else if (res.data[0].状态代码 === '10') { + this.tooltip2 = '设备状态：工位电脑关闭' + } }) }) } @@ -960,7 +1009,7 @@ export default { background-size:100% 100%;-moz-background-size:100% 100%; overflow: hidden; } - /*绿色闪*/ + /*绿色*/ .circle{ float: left; width: 10px; @@ -969,9 +1018,9 @@ export default { border-radius: 50%; -moz-border-radius: 50%; -webkit-border-radius: 50%; - background: url('../../../assets/img/greenTwinkle.gif'); + /*background: url('../../../assets/img/greenTwinkle.gif');*/ } - /*黄色闪*/ + /*黄色*/ .circle1{ float: left; width: 10px; @@ -980,9 +1029,9 @@ export default { border-radius: 50%; -moz-border-radius: 50%; -webkit-border-radius: 50%; - background: url('../../../assets/img/yellowTwinkle.gif'); + /*background: url('../../../assets/img/yellowTwinkle.gif');*/ } - /*灰色闪*/ + /*灰色*/ .circle2{ float: left; width: 10px; @@ -991,25 +1040,26 @@ export default { border-radius: 50%; -moz-border-radius: 50%; -webkit-border-radius: 50%; - background: url('../../../assets/img/grayTwinkle.gif'); + /*background: url('../../../assets/img/grayTwinkle.gif');*/ } - /*蓝色闪*/ + /*红色*/ .circle3{ float: left; width: 10px; height: 10px; - background-color:dodgerblue; + background-color:red; border-radius: 50%; -moz-border-radius: 50%; -webkit-border-radius: 50%; - background: url('../../../assets/img/blueTwinkle.gif'); + /*background: url('../../../assets/img/blueTwinkle.gif');*/ } - /*灰色*/ + /*灰色圈*/ .circle4{ float: left; width: 10px; height: 10px; - background-color:gray; + border:2px solid gray; + background-color:transparent; border-radius: 50%; -moz-border-radius: 50%; -webkit-border-radius: 50%; @@ -1027,3 +1077,71 @@ export default { background-color:#FFBB00 ; } + diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue index f268c55d..80d85d9a 100644 --- a/src/views/ManufacturingCenter/InitialProduction/index.vue +++ b/src/views/ManufacturingCenter/InitialProduction/index.vue @@ -10,7 +10,7 @@ - + - + - 查询 - 导出 + 查询 + 导出
- + - + diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue index 03955470..0bbb19fa 100644 --- a/src/views/ManufacturingCenter/PartAssignment/index.vue +++ b/src/views/ManufacturingCenter/PartAssignment/index.vue @@ -1,9 +1,9 @@