diff --git a/src/api/ManufacturingCenter/ContractDetailsInquiry.js b/src/api/ManufacturingCenter/ContractDetailsInquiry.js new file mode 100644 index 00000000..e69de29b diff --git a/src/utils/request.js b/src/utils/request.js index 2cb92ad8..38f59628 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -18,7 +18,7 @@ export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // export const uploadPerson = `http://192.168.1.231:8411/submit/uploadPerson.ashx` export const uploadOP = `http://192.168.1.231:8411/submit/uploadOP.ashx` export const url = `http://192.168.1.231:8411/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 -export const ExcelDownLoad = 'http://192.168.1.231:8411/submit/downloadFile.ashx' // 导出excel +export const ExcelDownLoad = 'http:/192.168.1.231:8411/submit/downloadFile.ashx' // 导出excel // 技术中心程序发布时要更改下面所有的IP到0段 export const ServerIP = `http://192.168.1.231:8411/webpage/file/` export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231 diff --git a/src/views/Inventory/Inboundscanning/index.vue b/src/views/Inventory/Inboundscanning/index.vue index eaceafc5..92e3f4f7 100644 --- a/src/views/Inventory/Inboundscanning/index.vue +++ b/src/views/Inventory/Inboundscanning/index.vue @@ -11,15 +11,6 @@ 入库 - - 移除 - @@ -27,7 +18,6 @@ + + + @@ -122,17 +122,9 @@ export default { }, methods: { // 移除 - handleDelete() { - this.tableDataNum.splice(this.NUM, 1) - this.tableData.splice(this.NUM, 1) - this.NUM = '' - }, - tableRowClassName({ row, rowIndex }) { - console.log(rowIndex) - this.NUM = rowIndex - }, - searchData(index) { - this.NUM = index + handleDelete(index, row) { + this.tableDataNum.splice(index, 1) + this.tableData.splice(index, 1) }, // 获取人员编号 getpeopleid() { diff --git a/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue b/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue index e4e46fa8..809cac35 100644 --- a/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue +++ b/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue @@ -313,6 +313,8 @@ export default { } - diff --git a/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue b/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue new file mode 100644 index 00000000..e4cccfff --- /dev/null +++ b/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue @@ -0,0 +1,60 @@ + + + + + diff --git a/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue b/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue index affbd18b..4a51526e 100644 --- a/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue +++ b/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue @@ -37,19 +37,19 @@ {{ scope.row.工序顺序 }} - + - + - + @@ -132,8 +132,8 @@ export default { return } import('@/vendor/Export2Excel').then(excel => { - const tHeader = ['姓名', '图号', '跟单号', '序号', '工序名称', '准结工时', '定额工时', '合格数', '不合格数', '备注', '日期', '计划准结工时', '计划定额工时', '项目名称', '机床图号', '组号', '设计', '材料'] - const filterVal = ['姓名', '零件图号_短', '跟单号', '工序顺序', '工艺名称', '准结工时', '单件工时', '合格数', '不合格数', '备注', '操作时间', '准结定额工时', '单件定额工时', '项目名称', '机床图号', '组号', '设计者', '材料'] + const tHeader = ['姓名', '图号', '跟单号', '序号', '工序名称', '录入准结工时', '实际工时', '合格数', '不合格数', '备注', '日期', '计划准结工时', '计划定额工时', '项目名称', '机床图号', '组号', '设计', '材料'] + const filterVal = ['姓名', '零件图号_短', '跟单号', '工序顺序', '工艺名称', '修补准结工时', '设备工时', '合格数', '不合格数', '备注', '操作时间', '准结定额工时', '单件定额工时', '项目名称', '机床图号', '组号', '设计者', '材料'] const list = this.tableData const data = this.formatJson(filterVal, list) excel.export_json_to_excel({ diff --git a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue index ed3ac8d7..446d7eca 100644 --- a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue +++ b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue @@ -23,11 +23,11 @@ 查询 - + - + - + - + - + @@ -371,6 +371,7 @@ export default { this.tableData1 = [] this.row2 = row gettabledata1(row.工艺计划流水号).then(response => { + console.log(response, 1212121) if (response.data.length !== 0) { for (let i = 0; i < response.data.length; i++) { this.tableData1.push({ @@ -381,7 +382,8 @@ export default { 操作者: response.data[i].操作者, 不合格数量: response.data[i].不合格数量, 质检数量: response.data[i].数量, - 工序流水号: response.data[i].工序流水号 + 工序流水号: response.data[i].工序流水号, + 工序状态: response.data[i].工序状态 }) } } @@ -452,6 +454,12 @@ export default { if (parseInt(row.考核状态) > 6) { return 'CompleteColor' } + }, // 工序状态变色 + tableRowClassName1({ row, rowIndex }) { + row.index = rowIndex + if (parseInt(row.工序状态) > 3) { + return 'CompleteColor' + } }, // 重置表单 callOff(formName) { this.dialogFormVisible = false