diff --git a/src/api/Inventory/StockInquiry.js b/src/api/Inventory/StockInquiry.js index bba59417..b1bca8ce 100644 --- a/src/api/Inventory/StockInquiry.js +++ b/src/api/Inventory/StockInquiry.js @@ -40,8 +40,7 @@ export function getTable(num1, num2, num3, num4, num5, num6, pageCurrent, pageSi ModularID: router.currentRoute.path, type: '1', name: '车间生产管理工艺_库存管理_基本件库存查询', - param: '机床流水号_check=' + num1 + '&机床流水号=' + num2 + '&组件流水号_check=' + num3 + '&组件流水号=' + num4 + '&零件图号_check=' + num5 + '&零件图号=' + num6, - Pagination: pageCurrent + '&' + pageSize + param: '机床流水号_check=' + num1 + '&机床流水号=' + num2 + '&组件流水号_check=' + num3 + '&组件流水号=' + num4 + '&零件图号_check=' + num5 + '&零件图号=' + num6 + `&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output` } }) } diff --git a/src/utils/curd.js b/src/utils/curd.js index 1bef3311..297b279a 100644 --- a/src/utils/curd.js +++ b/src/utils/curd.js @@ -1,4 +1,5 @@ import { ExcelDownLoad } from '@/utils/request' +import request from '@/utils/request' import { type } from './tool' // type判断传入值的类型，比typeof更详细 export default { @@ -52,6 +53,14 @@ export default { var numn = JSON.stringify(obj[0]) return numn } + // 新通讯11/12---< + Vue.prototype.ExecDatabase = function(num) { + return request({ + url: '', + method: 'post', + data: num + }) + } // 高精原CreateData // Vue.prototype.CreateData = function(type, name, data, pageSize, pageList) { // var paramStr = '' diff --git a/src/views/Assembly/SparePartsOutStockRecord/index.vue b/src/views/Assembly/SparePartsOutStockRecord/index.vue index 87acf530..95b47a39 100644 --- a/src/views/Assembly/SparePartsOutStockRecord/index.vue +++ b/src/views/Assembly/SparePartsOutStockRecord/index.vue @@ -158,7 +158,6 @@ export default { }, methods: { sortChange(column) { - console.log(column + '-' + column.prop + '-' + column.order, 11111) if (column.prop === '零件名称') { this.ordername = 1 } else if (column.prop === '零件图号') { diff --git a/src/views/Assembly/TypicalAssemblyMaintenance/index.vue b/src/views/Assembly/TypicalAssemblyMaintenance/index.vue index f06eeda4..90bb5fa6 100644 --- a/src/views/Assembly/TypicalAssemblyMaintenance/index.vue +++ b/src/views/Assembly/TypicalAssemblyMaintenance/index.vue @@ -335,9 +335,7 @@ export default { this.form2.序号 = row.序号 this.form2.装配任务 = row.装配任务 this.Group = '' - console.log(row, 1111) this.form2.组件 = (row.组件流水号.split(',')).map(Number) - console.log(this.form2.组件) }, submitAdd() { this.GroupNumberValue1 = this.form2.组件[0] diff --git a/src/views/Inventory/PurchaseInRecord/index.vue b/src/views/Inventory/PurchaseInRecord/index.vue index 54aa8850..d1be6b22 100644 --- a/src/views/Inventory/PurchaseInRecord/index.vue +++ b/src/views/Inventory/PurchaseInRecord/index.vue @@ -191,7 +191,6 @@ 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 diff --git a/src/views/Inventory/StockInquiry/index.vue b/src/views/Inventory/StockInquiry/index.vue index 4eefc0e7..6c93e6ff 100644 --- a/src/views/Inventory/StockInquiry/index.vue +++ b/src/views/Inventory/StockInquiry/index.vue @@ -194,11 +194,11 @@ export default { this.number ? this.checkbox_number = 1 : this.checkbox_number = 0 this.tableData1 = [] getTable(this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, this.pageCurrent, this.pageSize).then(response => { - if (response.data.total === 0) { + if (response.data.result.length === 0) { this.listLoading1 = false } else { - this.tableData1 = response.data.rows - this.total = response.data.total + this.tableData1 = response.data.result + this.total = parseInt(response.data.output[0].ItemCount) this.listLoading1 = false } }) diff --git a/src/views/ManufacturingCenter/AddingOrder/index.vue b/src/views/ManufacturingCenter/AddingOrder/index.vue index 1e3a5ed4..a4937a78 100644 --- a/src/views/ManufacturingCenter/AddingOrder/index.vue +++ b/src/views/ManufacturingCenter/AddingOrder/index.vue @@ -24,14 +24,15 @@ 删除加序 - + { + this.loading0 = false }) }, getID(row) { @@ -465,6 +471,9 @@ export default { }, // 获取工序表 getCurrentRow(row) { + if (row === null) { + return + } this.completeTime = '' this.dateOfProduction = '' this.processSerialNumber = '' @@ -490,7 +499,6 @@ export default { } } }) - console.log(this.tableData1, 123) }, // 补加完成日期 EditData() { this.dialogFormVisible = true @@ -499,6 +507,7 @@ export default { this.form.完成时间 = '' }, getRow(row) { + if (row === null) return this.Id = row.ID this.completeTime = row.完成日期 this.dateOfProduction = row.排产日期 diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue index 0b9a6f0c..e0483a81 100644 --- a/src/views/ManufacturingCenter/InitialProduction/index.vue +++ b/src/views/ManufacturingCenter/InitialProduction/index.vue @@ -622,7 +622,6 @@ export default { this.dialogFormVisible10 = true }, typeChange() { - console.log(Cookie.get('machineValue'), 1111111) this.toolNumValue = '' this.toolNum = [] this.NumValue = '' diff --git a/src/views/ManufacturingCenter/OwnTimeStatistics/index.vue b/src/views/ManufacturingCenter/OwnTimeStatistics/index.vue index 9d94fc4f..6822792a 100644 --- a/src/views/ManufacturingCenter/OwnTimeStatistics/index.vue +++ b/src/views/ManufacturingCenter/OwnTimeStatistics/index.vue @@ -70,7 +70,6 @@ export default { methods: { fetchData() { this.project = [] - console.log(1111) initProject().then(response => { for (let i = 0; i < response.data.length; i++) { this.project.push({ diff --git a/src/views/ManufacturingCenter/ProcessingStatus/index.vue b/src/views/ManufacturingCenter/ProcessingStatus/index.vue index fff065c3..6e3f0436 100644 --- a/src/views/ManufacturingCenter/ProcessingStatus/index.vue +++ b/src/views/ManufacturingCenter/ProcessingStatus/index.vue @@ -541,7 +541,6 @@ export default { this.length = 0 getTable(this.checkbox_project, this.project, this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, 1, this.startTime_check, this.startTime, this.endTime_check, this.endTime, this.pageCurrent, this.pageSize).then(response => { this.length = parseInt(response.data.total) - console.log(response.data.rows, 11111) for (let i = 0; i < response.data.rows.length; i++) { // 声明二维数组 this.num111.push(response.data.rows[i].工艺计划流水号) this.零件图号.push(response.data.rows[i].零件图号) diff --git a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue index 9b6ac9c5..eae41a51 100644 --- a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue +++ b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue @@ -28,7 +28,7 @@ - + - - - - - @@ -137,9 +168,9 @@ export default { startTime: getNowShotTime(), // 开始时间 endTime: getNowShotTime(), // 结束时间 tableData: [], // 操作者工时统计 - loading: '', + loading: false, tableData2: [], // 工序统计表 - loading2: '', + loading2: false, pageCurrent: 1, pageSize: 10000, total: 0, @@ -147,7 +178,17 @@ export default { pageSize2: 10000, total2: 0, timeCheck: '', - operater: '' + operater: '', + row: [], + dialogVisible1: false, + form1: { + 完成数量: '', + 录入工时: '', + 录入准结: '', + 备注: '' + }, + 加工时间: 0, + 剩余数量: 0 } }, created() { @@ -178,6 +219,7 @@ export default { // 获取工序表 searchTable2(row) { this.loading2 = true + this.row = row this.tableData2 = [] this.pageCurrent2 = 1 var STime = '' @@ -185,7 +227,6 @@ export default { STime = this.startTime + ' 00:00:00' ETime = this.endTime + ' 23:59:59' searchtable2(row.人员编号, STime, ETime, this.pageCurrent2, this.pageSize2).then(response => { - console.log(response.data, 222) if (response.data.rows.length !== 0) { this.tableData2 = response.data.rows } @@ -193,6 +234,66 @@ export default { this.total2 = response.data.total }) }, + handleEdit(row) { + var param = [] + param[0] = ['工序流水号', row.工序流水号] + param[1] = ['完成过程流水号', row.完成过程流水号] + var Data1 = this.CreateData('11', 'MES_机加工MES_修改完成工时数量查询', param) + this.ExecDatabase(Data1).then(response => { + this.剩余数量 = response.data[0].剩余数量 + this.完成过程流水号 = row.完成过程流水号 + this.工序流水号 = row.工序流水号 + this.完成数量_原 = row.完成数量 + this.form1.录入工时 = row.修补单件工时 + this.form1.录入准结 = row.修补工时 + this.form1.备注 = row.备注 + this.加工时间 = this.form1.录入工时 + this.form1.完成数量 = row.完成数量 + this.timeChange() + this.dialogVisible1 = true + }) + }, + callOff1() { + this.dialogVisible1 = false + }, + timeChange() { + if (this.form1.完成数量 > 0) { + this.加工时间 = this.form1.录入工时 * this.form1.完成数量 + } else { + this.加工时间 = this.form1.录入工时 + } + }, + submit1() { + this.工位号 = this.$route.query.OPNAME + var param = [] + param[0] = ['工序流水号', this.工序流水号] + param[1] = ['完成过程流水号', this.完成过程流水号] + param[2] = ['完成数量', this.form1.完成数量] + param[3] = ['完成数量_原', this.完成数量_原] + param[4] = ['录入工时', this.form1.录入工时] + param[5] = ['录入准结', this.form1.录入准结] + param[6] = ['备注', this.form1.备注] + var Data1 = this.CreateData('11', 'MES_机加工MES_编辑备注_Vue_New', param) + this.ExecDatabase(Data1).then(response => { + if (response.data[0].result === 1) { + console.log('成功，数量减少 1') + } else if (response.data[0].result === 2) { + console.log('失败，工序状态已为4，不能继续增加 2') + this.$message.error('此工序已经全部完成，不能继续增加数量！') + } else if (response.data[0].result === 3) { + console.log('失败，剩余数量不足 3') + this.$message.error('检测到数量变化，请重新修改完成数量！') + } else if (response.data[0].result === 4) { + console.log('成功，数量增加，增加后工序状态完成 4') + } else if (response.data[0].result === 5) { + console.log('成功，数量增加，增加后工序状态仍未完成 5') + } else if (response.data[0].result === 6) { + console.log('成功，未修改数量 6') + } + this.searchTable2(this.row) + this.dialogVisible1 = false + }) + }, handleSizeChange2(val) { this.pageCurrent2 = 1 this.pageSize2 = val diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue index 8c54e73f..0edf9b84 100644 --- a/src/views/MarketingCenter/ContractInformationManagement/index.vue +++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue @@ -983,7 +983,6 @@ export default { // 提交添加或者修改 submit(formName) { this.$refs[formName].validate((valid) => { - console.log(valid, 111111) if (valid) { if (this.temp === 1) { this.addTableData1() diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue index 10f762a5..4e990571 100644 --- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue +++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue @@ -1351,7 +1351,6 @@ export default { // 2020 03 04 刘路加表头排序 // 1 供货商 2 机床图号 3 物料名称 4 物料型号 sortChange(column, prop, order) { - console.log(column + '-' + column.prop + '-' + column.order, 11111) if (column.prop === '供货商') { this.ordername = 1 } else if (column.prop === '机床图号') { diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue index 10d98cad..1668409c 100644 --- a/src/views/PurchasingCenter/OfflineContract/index.vue +++ b/src/views/PurchasingCenter/OfflineContract/index.vue @@ -1042,7 +1042,6 @@ export default { }) }, tabClick(tab) { - console.log(tab.name, 1111) if (tab.name === '外购件') { this.tabName = '外购件' this.searchTable11() @@ -1388,7 +1387,6 @@ export default { }) }, saveContract() { - console.log(11111) this.totalPrice = 0 this.partGroup = [] this.numGroup = [] diff --git a/src/views/TechnologyCenter/ImportChangeParts/index.vue b/src/views/TechnologyCenter/ImportChangeParts/index.vue index a435d54e..068df5bc 100644 --- a/src/views/TechnologyCenter/ImportChangeParts/index.vue +++ b/src/views/TechnologyCenter/ImportChangeParts/index.vue @@ -188,9 +188,7 @@ export default { manufacturer, remarks, classificationCode - console.log(this.worksheet[j].M2.v.substring(0, 1)) this.group = this.worksheet[j].M2.v.substring(0, this.worksheet[j].M2.v.indexOf('-')) + '组' - console.log(this.worksheet[j].J2.v.substring(0, 2), 11111111111) if (this.worksheet[j].M2.v.substring(0, 1) === '9' && this.worksheet[j].J2.v.substring(0, 2) === '整改') { const response = await isExit(this.projectValue, this.worksheet[j].F2.v) const res = response.data diff --git a/src/views/TechnologyCenter/ImportParts/specificationData.vue b/src/views/TechnologyCenter/ImportParts/specificationData.vue index e7cd11b3..b746a5b0 100644 --- a/src/views/TechnologyCenter/ImportParts/specificationData.vue +++ b/src/views/TechnologyCenter/ImportParts/specificationData.vue @@ -499,7 +499,6 @@ export default { }, getMachineNames() { getMachineNames(this.machineValue).then(response => { - console.log(response.data, 1111) this.machineName = response.data[0].机床名称 this.machineNum = response.data[0].机床数量 }) diff --git a/src/views/TechnologyCenter/QueryParts/index.vue b/src/views/TechnologyCenter/QueryParts/index.vue index 4bec95a8..442d395c 100644 --- a/src/views/TechnologyCenter/QueryParts/index.vue +++ b/src/views/TechnologyCenter/QueryParts/index.vue @@ -403,7 +403,6 @@ export default { this.dialogFormVisible = true }, tableRowClassName1({ row }) { - console.log(row, 11111) if (row.是否加急件 === '1') { return 'isUrgentItem1' } diff --git a/src/views/WorkshopProcurement/OfflineProcurement/index.vue b/src/views/WorkshopProcurement/OfflineProcurement/index.vue index 16bb7e33..7e0191bd 100644 --- a/src/views/WorkshopProcurement/OfflineProcurement/index.vue +++ b/src/views/WorkshopProcurement/OfflineProcurement/index.vue @@ -411,7 +411,6 @@ export default { }, // 按零件图号 组号 材料排序 sortChange(column) { - console.log(column + '-' + column.prop + '-' + column.order, 11111) if (column.prop === '组号') { this.ordername = 1 } else if (column.prop === '零件图号') { diff --git a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue index c00b1c55..59faa355 100644 --- a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue +++ b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue @@ -643,7 +643,6 @@ export default { xhr.responseType = 'blob' xhr.onload = function() { if (xhr.status === 200) { - console.log(xhr, 1111) const name = xhr.getResponseHeader('content-disposition').split('=')[1] cb(xhr.response, name) } diff --git a/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue b/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue index eee1c839..665ddfdb 100644 --- a/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue +++ b/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue @@ -251,7 +251,6 @@ export default { }, // 按供应商名称，下单日期，零件名称，材料 sortChange(column) { - console.log(column + '-' + column.prop + '-' + column.order, 11111) if (column.prop === '供应商名称') { this.ordername = 1 } else if (column.prop === '零件名称') { diff --git a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue index cce4759b..fb2c3ddf 100644 --- a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue +++ b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue @@ -362,7 +362,6 @@ export default { } }, searchTable02(row) { // 查看详情（请款信息包含的合同） - console.log(row, 1111) // if (this.a === 1) { // this.expands.push(row.采购计划请款流水号) // this.b = row.采购计划请款流水号 diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue index 1da42cbc..0e28b773 100644 --- a/src/views/layout/components/Navbar.vue +++ b/src/views/layout/components/Navbar.vue @@ -263,7 +263,6 @@ export default { }) }, comfirmUrgentItem() { - console.log(1111) searchUrgentItem().then(res => { if (res.data.length > 0) { this.noticeContractJJ = null