diff --git a/src/api/Inventory/DirectPart.js b/src/api/Inventory/DirectPart.js index dd91a708..1afd3ca0 100644 --- a/src/api/Inventory/DirectPart.js +++ b/src/api/Inventory/DirectPart.js @@ -7,7 +7,7 @@ export function initProject() { method: 'post', data: { type: '1', - name: 'PDM_项目名称_查询数据' + name: 'PDM_项目名称_查询数据_按时间排序' } }) } diff --git a/src/api/Inventory/ExchangePart.js b/src/api/Inventory/ExchangePart.js index ba5d4098..aa5ea965 100644 --- a/src/api/Inventory/ExchangePart.js +++ b/src/api/Inventory/ExchangePart.js @@ -7,7 +7,7 @@ export function initProject() { method: 'post', data: { type: '1', - name: 'PDM_项目名称_查询数据' + name: 'PDM_项目名称_查询数据_按时间排序' } }) } diff --git a/src/api/Inventory/InventoryCheck.js b/src/api/Inventory/InventoryCheck.js index 620d6d3e..99c7cdc7 100644 --- a/src/api/Inventory/InventoryCheck.js +++ b/src/api/Inventory/InventoryCheck.js @@ -7,7 +7,7 @@ export function initProject() { method: 'post', data: { type: '1', - name: 'PDM_项目名称_查询数据' + name: 'PDM_项目名称_查询数据_按时间排序' } }) } diff --git a/src/api/Inventory/OfflinePartOut.js b/src/api/Inventory/OfflinePartOut.js index 43f4afde..a8175c7b 100644 --- a/src/api/Inventory/OfflinePartOut.js +++ b/src/api/Inventory/OfflinePartOut.js @@ -7,7 +7,7 @@ export function initProject() { method: 'post', data: { type: '1', - name: 'PDM_项目名称_查询数据' + name: 'PDM_项目名称_查询数据_按时间排序' } }) } diff --git a/src/api/Inventory/PartsReplacement.js b/src/api/Inventory/PartsReplacement.js index bcfccbbf..4bebb323 100644 --- a/src/api/Inventory/PartsReplacement.js +++ b/src/api/Inventory/PartsReplacement.js @@ -6,7 +6,7 @@ export function initProject() { method: 'post', data: { type: '1', - name: 'PDM_项目名称_查询数据' + name: 'PDM_项目名称_查询数据_按时间排序' } }) } diff --git a/src/api/Inventory/PickingList.js b/src/api/Inventory/PickingList.js index 2d87cc63..d0a337d7 100644 --- a/src/api/Inventory/PickingList.js +++ b/src/api/Inventory/PickingList.js @@ -7,7 +7,7 @@ export function initProject() { method: 'post', data: { type: '1', - name: 'PDM_项目名称_查询数据' + name: 'PDM_项目名称_查询数据_按时间排序' } }) } diff --git a/src/api/Inventory/SubstitutePart.js b/src/api/Inventory/SubstitutePart.js index fb0cb20d..56405778 100644 --- a/src/api/Inventory/SubstitutePart.js +++ b/src/api/Inventory/SubstitutePart.js @@ -7,7 +7,7 @@ export function initProject() { method: 'post', data: { type: '1', - name: 'PDM_项目名称_查询数据' + name: 'PDM_项目名称_查询数据_按时间排序' } }) } diff --git a/src/api/PurchasingCenter/OfflineContractRequestFund.js b/src/api/PurchasingCenter/OfflineContractRequestFund.js index ea8e9add..2f5e2215 100644 --- a/src/api/PurchasingCenter/OfflineContractRequestFund.js +++ b/src/api/PurchasingCenter/OfflineContractRequestFund.js @@ -1,27 +1,38 @@ import request from '@/utils/request' // 查询请款表 -export function searchRequestFund(pageCurrent, pageSize, check1, start, end) { +export function searchRequestFund(pageCurrent, pageSize, check1, start, end, check2, num) { return request({ url: '', method: 'post', data: { type: '1', name: '采购管理_离线合同_请款_查询数据', - param: `时间段_check=${check1}&开始时间=${start}&结束时间=${end}`, + param: `时间段_check=${check1}&开始时间=${start}&结束时间=${end}&供应商流水号_check=${check2}&供应商流水号=${num}`, Pagination: pageCurrent + '&' + pageSize } }) } -// 查询离线合同待请款信息 -export function searchOfflineContract(num) { +// 查询供应商 +export function searchSupplier() { return request({ url: '', method: 'post', data: { type: '1', - name: '采购管理_离线合同_待请款_查询数据', - param: `供应商流水号=${num}` + name: '采购管理_供应商_查询数据_根据条件' + } + }) +} +// 查询离线合同待请款信息 +export function searchOfflineContract(check, num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_离线合同_查询数据', + param: `供应商流水号_check=${check}&供应商流水号=${num}` } }) } @@ -61,3 +72,15 @@ export function cancelRequestFund(num) { } }) } +// 查询离线合同明细 +export function searchMateriel(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_离线合同明细_查询数据', + param: `离线合同流水号=${num}` + } + }) +} diff --git a/src/api/PurchasingCenter/ProjectTotalSearch.js b/src/api/PurchasingCenter/ProjectTotalSearch.js index 8e4a7c1e..f6538aa4 100644 --- a/src/api/PurchasingCenter/ProjectTotalSearch.js +++ b/src/api/PurchasingCenter/ProjectTotalSearch.js @@ -7,7 +7,7 @@ export function initProject() { method: 'post', data: { type: '1', - name: 'PDM_项目名称_查询数据' + name: 'PDM_项目名称_查询数据_按时间排序' } }) } diff --git a/src/api/PurchasingCenter/ReceiveCheck.js b/src/api/PurchasingCenter/ReceiveCheck.js index 7491a60d..33932f2d 100644 --- a/src/api/PurchasingCenter/ReceiveCheck.js +++ b/src/api/PurchasingCenter/ReceiveCheck.js @@ -7,7 +7,7 @@ export function initProject() { method: 'post', data: { type: '1', - name: 'PDM_项目名称_查询数据' + name: 'PDM_项目名称_查询数据_按时间排序' } }) } 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 f4f36407..81241138 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 // 请求超时时间git diff --git a/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue b/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue index d3fa6b2d..bc579e1b 100644 --- a/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue +++ b/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue @@ -14,6 +14,14 @@ range-separator="～" start-placeholder="开始日期" end-placeholder="结束日期"/> + 供应商： + + + - +