diff --git a/src/api/Outsourcing/OutsourcingPartsQuery.js b/src/api/Outsourcing/OutsourcingPartsQuery.js new file mode 100644 index 00000000..f0a94fb9 --- /dev/null +++ b/src/api/Outsourcing/OutsourcingPartsQuery.js @@ -0,0 +1,27 @@ +import request from '@/utils/request' + +// 获取零件工序信息(零件号表中) +export function getprocedure(processPlan, single) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_零件工序_查询数据_根据工艺计划流水号_工艺名称简称_新', + param: '工艺计划流水号=' + processPlan + '=int&单件是否外协=' + single + '=int' + } + }) +} +// 查询外协零件 +export function searchTable(check, supplierNameValue, check1, MaterialsValue, pageSize, pageCurrent) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理_外协零件_查询数据', + param: '外协厂家_check=' + check + '&外协厂家=' + supplierNameValue + '&外协状态_check=' + check1 + '&外协状态=' + MaterialsValue, + Pagination: pageCurrent + '&' + pageSize + } + }) +} diff --git a/src/api/PurchasingCenter/PurchasingEfficiencyAnalysis.js b/src/api/PurchasingCenter/PurchasingEfficiencyAnalysis.js new file mode 100644 index 00000000..134dc59f --- /dev/null +++ b/src/api/PurchasingCenter/PurchasingEfficiencyAnalysis.js @@ -0,0 +1,25 @@ +import request from '@/utils/request' + +export function getData(date1, date2) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_采购效率_查询数据_折线图', + param: '开始时间=' + date1 + '&结束时间=' + date2 + } + }) +} + +export function getData1(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_采购效率分析_查询', + param: '采购合同流水号=' + num + } + }) +} diff --git a/src/utils/request.js b/src/utils/request.js index 2954d36b..fc41e22d 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -26,7 +26,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx` export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` const service = axios.create({ - baseURL: `http://192.168.0.103:8074/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service diff --git a/src/views/Outsourcing/OutsourcingPartsQuery/index.vue b/src/views/Outsourcing/OutsourcingPartsQuery/index.vue new file mode 100644 index 00000000..dc6e2491 --- /dev/null +++ b/src/views/Outsourcing/OutsourcingPartsQuery/index.vue @@ -0,0 +1,231 @@ + + + + + diff --git a/src/views/PurchasingCenter/PurchasingEfficiencyAnalysis/index.vue b/src/views/PurchasingCenter/PurchasingEfficiencyAnalysis/index.vue new file mode 100644 index 00000000..e7383d2c --- /dev/null +++ b/src/views/PurchasingCenter/PurchasingEfficiencyAnalysis/index.vue @@ -0,0 +1,127 @@ + + + + + diff --git a/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue b/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue index ca7244ef..18b68fc3 100644 --- a/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue +++ b/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue @@ -144,6 +144,7 @@ export default { }, created() { this.fetchData() + this.getTableData() }, methods: { fetchData() { diff --git a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue index 8db5c472..2a778128 100644 --- a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue +++ b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue @@ -699,9 +699,9 @@ export default { height: 30px; } .el-table .adopt{ - background: limegreen; + background: #9BD7FC; } .el-table .NotThrough{ - background: palevioletred; + background: #FF9759; }