diff --git a/src/api/ManufacturingCenter/EquipmentMonitoring.js b/src/api/ManufacturingCenter/EquipmentMonitoring.js index 3f2d58db..40faad87 100644 --- a/src/api/ManufacturingCenter/EquipmentMonitoring.js +++ b/src/api/ManufacturingCenter/EquipmentMonitoring.js @@ -91,7 +91,12 @@ export function getBuzhuang() { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '3', - name: 'SELECT 机床图号,组号,任务名称 FROM 车间管理_工作计划 inner join PDM_机床名称 on 车间管理_工作计划.机床流水号=PDM_机床名称.机床流水号 where 计划类型=1 and 是否工作=1 and 组号 <> \'\'' + name: '\n' + + 'SELECT dbo.PDM_机床名称.机床图号, dbo.车间管理_工作计划.组号, dbo.车间管理_工作计划.任务名称, dbo.PDM_项目名称.是否启用\n' + + 'FROM dbo.车间管理_工作计划 INNER JOIN\n' + + ' dbo.PDM_机床名称 ON dbo.车间管理_工作计划.机床流水号 = dbo.PDM_机床名称.机床流水号 INNER JOIN\n' + + ' dbo.PDM_项目名称 ON dbo.PDM_机床名称.项目流水号 = dbo.PDM_项目名称.项目流水号\n' + + 'WHERE (dbo.车间管理_工作计划.计划类型 = 1) AND (dbo.车间管理_工作计划.是否工作 = 1) AND (dbo.车间管理_工作计划.组号 <> \'\') AND (dbo.PDM_项目名称.是否启用 = 1)' } }) } diff --git a/src/api/WorkshopProcurement/ArrivalStateSearch.js b/src/api/WorkshopProcurement/ArrivalStateSearch.js index 29211ee2..c4ba58ff 100644 --- a/src/api/WorkshopProcurement/ArrivalStateSearch.js +++ b/src/api/WorkshopProcurement/ArrivalStateSearch.js @@ -24,7 +24,7 @@ export function searchArrivalState(num) { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: '车间管理_到货情况_查询数据_新_成组采购', + name: '车间管理_到货情况_查询数据_最新', param: `采购合同流水号=${num}` } }) diff --git a/src/views/Inventory/OfflinePartOut/index.vue b/src/views/Inventory/OfflinePartOut/index.vue index 9fc75916..ba51dbda 100644 --- a/src/views/Inventory/OfflinePartOut/index.vue +++ b/src/views/Inventory/OfflinePartOut/index.vue @@ -173,7 +173,7 @@ - + - + { + console.log(response, 1111) this.tableData = response.data.result this.total = parseInt(response.data.output[0].ItemCount) this.loading = false diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue index e718d3dc..54b7be4b 100644 --- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue +++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue @@ -633,7 +633,7 @@ plain icon="el-icon-search" style="margin:0px 10px" - @click="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()">查询 + @click="pageCurrent2=1;pageSize2=100;total2=0;searchTable2()">查询 {