diff --git a/src/api/TechnologyCenter/QueryParts.js b/src/api/TechnologyCenter/QueryParts.js index 772fec3c..978af21b 100644 --- a/src/api/TechnologyCenter/QueryParts.js +++ b/src/api/TechnologyCenter/QueryParts.js @@ -6,7 +6,7 @@ export function projectSelect() { method: 'post', data: { type: '1', - name: 'PDM_项目名称_查询数据' + name: 'PDM_项目名称_查询数据_按时间排序' } }) } diff --git a/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js b/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js new file mode 100644 index 00000000..791ef478 --- /dev/null +++ b/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js @@ -0,0 +1,15 @@ +import request from '@/utils/request' + +// 查询库存数 +export function searchInventoryNum(pageCurrent, pageSize, check1, name, check2, state1, state2) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_离线合同_物料余量_查询数据', + param: `物料名称_check=${check1}&物料名称=${name}&库存状态_check=${check2}&库存状态=${state1}&采购状态=${state2}`, + Pagination: pageCurrent + '&' + pageSize + } + }) +} diff --git a/src/api/WorkshopProcurement/ProjectTotalSearch.js b/src/api/WorkshopProcurement/ProjectTotalSearch.js index eb903600..049db1a5 100644 --- a/src/api/WorkshopProcurement/ProjectTotalSearch.js +++ b/src/api/WorkshopProcurement/ProjectTotalSearch.js @@ -7,7 +7,7 @@ export function initProject() { method: 'post', data: { type: '1', - name: 'PDM_项目名称_查询数据' + name: 'PDM_项目名称_查询数据_按时间排序' } }) } diff --git a/src/utils/request.js b/src/utils/request.js index d45a05a4..908de161 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -19,7 +19,7 @@ const service = axios.create({ // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, - baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, + baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`, // baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 diff --git a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue new file mode 100644 index 00000000..1baf494e --- /dev/null +++ b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue @@ -0,0 +1,979 @@ + + + + +