diff --git a/src/api/ManufacturingCenter/TraceabilityOfParts.js b/src/api/ManufacturingCenter/TraceabilityOfParts.js index 64b1947c..79b07e3a 100644 --- a/src/api/ManufacturingCenter/TraceabilityOfParts.js +++ b/src/api/ManufacturingCenter/TraceabilityOfParts.js @@ -10,8 +10,8 @@ export function SelectPart() { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: '车间生产管理工艺_零件工艺计划_查询数据_状态_新_MESWORK', - param: '项目流水号_check=' + arguments[0] + '&项目流水号=' + arguments[1] + '&机床流水号_check=' + arguments[2] + '&机床流水号=' + arguments[3] + '&组件流水号_check=' + arguments[4] + '&组件流水号=' + arguments[5] + '&零件图号_check=' + arguments[6] + '&零件图号=' + arguments[7] + '&考核状态_check=' + arguments[8] + '&考核状态=' + arguments[9] + '&单件是否外协_check=' + arguments[10] + '&单件是否外协=' + arguments[11] + '&时间=' + arguments[12] + '&机加工开始时间=' + arguments[13] + '&机加工结束时间=' + arguments[14] + '&零件类型=' + arguments[15] + '&工艺计划流水号=' + arguments[16] + name: '车间生产管理工艺_零件追溯_零件查询', + param: '零件图号=' + arguments[0] } }) } diff --git a/src/views/ManufacturingCenter/GroupMatching/index.vue b/src/views/ManufacturingCenter/GroupMatching/index.vue index d469982e..73851bda 100644 --- a/src/views/ManufacturingCenter/GroupMatching/index.vue +++ b/src/views/ManufacturingCenter/GroupMatching/index.vue @@ -549,16 +549,12 @@ export default { }) }, searchTable() { - if (this.Machine === '' || this.Machine === null) { - this.$message.warning('请先选择机床组号') - } else { - if (this.PartType === '标准件') { - this.searchTable0() - } else if (this.PartType === '外购件') { - this.searchTable1() - } else if (this.PartType === '基本件') { - this.searchTable2() - } + if (this.PartType === '标准件') { + this.searchTable0() + } else if (this.PartType === '外购件') { + this.searchTable1() + } else if (this.PartType === '基本件') { + this.searchTable2() } }, searchTable0() { // 查询标准件 diff --git a/src/views/ManufacturingCenter/InventoryQuery/index.vue b/src/views/ManufacturingCenter/InventoryQuery/index.vue index 5b6fb524..b9dd542f 100644 --- a/src/views/ManufacturingCenter/InventoryQuery/index.vue +++ b/src/views/ManufacturingCenter/InventoryQuery/index.vue @@ -116,7 +116,7 @@ export default { param[3] = ['物料规格', this.materialSpec] param[4] = ['物料型号_check', check3] param[5] = ['物料型号', this.materialModel] - var Data = this.CreateData('00', '报表_采购部仓库_库存_查询', param) + var Data = this.CreateData('2001', '报表_采购部仓库_库存_查询', param) this.exportExcel_NPOI(Data) }, // 初始化数据 diff --git a/src/views/ManufacturingCenter/TraceabilityOfParts/index.vue b/src/views/ManufacturingCenter/TraceabilityOfParts/index.vue index b59c78e1..82b97258 100644 --- a/src/views/ManufacturingCenter/TraceabilityOfParts/index.vue +++ b/src/views/ManufacturingCenter/TraceabilityOfParts/index.vue @@ -251,7 +251,7 @@ export default { querySearch(queryString, cb) { this.restaurantsPick = [] if (this.searchPick !== '' && this.searchPick !== null) { - SelectPart(0, '', 0, '', 0, '', 1, this.searchPick, 0, '', 0, '', 0, '', '', '', '').then(response => { + SelectPart(this.searchPick).then(response => { const res = response.data res.forEach(item => { this.restaurantsPick.push({ diff --git a/src/views/PurchasingCenter/FundApproval3/index.vue b/src/views/PurchasingCenter/FundApproval3/index.vue index 7f8f18b0..1a9511f7 100644 --- a/src/views/PurchasingCenter/FundApproval3/index.vue +++ b/src/views/PurchasingCenter/FundApproval3/index.vue @@ -18,7 +18,7 @@ {{ scope.row.姓名 }} - + @@ -51,12 +51,12 @@ {{ scope.row.采购合同编号 ? scope.row.采购合同编号 : scope.row.离线合同编号 }} - + - + @@ -85,17 +85,17 @@ {{ scope.row.数量 }} - + - + - + diff --git a/src/views/WorkshopProcurement/FundApproval3/index.vue b/src/views/WorkshopProcurement/FundApproval3/index.vue index 8f5a782a..b5157441 100644 --- a/src/views/WorkshopProcurement/FundApproval3/index.vue +++ b/src/views/WorkshopProcurement/FundApproval3/index.vue @@ -168,7 +168,7 @@ {{ scope.row.姓名 }} - + diff --git a/src/views/WorkshopProcurement/InvoiceSettlementApprove1/index.vue b/src/views/WorkshopProcurement/InvoiceSettlementApprove1/index.vue index 5244c229..c0314997 100644 --- a/src/views/WorkshopProcurement/InvoiceSettlementApprove1/index.vue +++ b/src/views/WorkshopProcurement/InvoiceSettlementApprove1/index.vue @@ -10,38 +10,38 @@

到票结算申请单

- - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - -