diff --git a/src/api/ManufacturingCenter/CreateWarehousePurchasing.js b/src/api/ManufacturingCenter/CreateWarehousePurchasing.js new file mode 100644 index 00000000..7194f0ca --- /dev/null +++ b/src/api/ManufacturingCenter/CreateWarehousePurchasing.js @@ -0,0 +1,88 @@ +import request from '@/utils/request' + +// 查询库存数 +export function searchInventoryNum(pageCurrent, pageSize, check1, val1, check2, val2, check3, val3, check4, state1, state2) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_离线合同_物料余量_查询数据', + param: `物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&库存状态_check=${check4}&库存状态=${state1}&采购状态=${state2}`, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 新增采购明细单 +export function submitaddpurchasingdetailsform(name, applicant) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_仓库采购_表单_新增', + param: `表单名称=${name}&申请人=${applicant}` + } + }) +} +// 查询采购明细单 +export function searchpurchasingDetailsForm(pageCurrent, pageSize, name) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_仓库采购_表单_查询', + param: `表单名称=${name}`, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 查询采购表单 +export function confirmEditpurchasingDetailsForm(name, id) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_仓库采购_表单_编辑', + param: `表单名称=${name}&id=${id}` + } + }) +} +// 查询采购表单 +export function openDeletepurchasingDetailsForm(id) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_仓库采购_表单_删除', + param: `id=${id}` + } + }) +} +// 选入物料信息 +export function addmateriel(formNumber, materielGroup) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_仓库采购_表单明细_增加数据', + param: `表单编号=${formNumber}&物料流水号组=${materielGroup}` + } + }) +} +// 查询采购明细 +export function searchtable2(formNumber) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_仓库采购_表单明细_增加数据', + param: `表单编号=${formNumber}` + } + }) +} diff --git a/src/views/Assembly/AssemblyQualityInspection/index.vue b/src/views/Assembly/AssemblyQualityInspection/index.vue index ccc0d7d8..44c6d4ca 100644 --- a/src/views/Assembly/AssemblyQualityInspection/index.vue +++ b/src/views/Assembly/AssemblyQualityInspection/index.vue @@ -41,34 +41,34 @@ - + - + - + - + - + - + diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue index f619d519..431b6412 100644 --- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue +++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue @@ -256,27 +256,27 @@

正在加工零件列表

- + - + - + - + - + @@ -286,17 +286,17 @@ {{ scope.row.批次数量 }} - + - + - + @@ -326,27 +326,27 @@

待加工零件列表

- + - + - + - + - + @@ -356,17 +356,17 @@ {{ scope.row.批次数量 }} - + - + - + diff --git a/src/views/Inventory/CreatePickingList/index.vue b/src/views/Inventory/CreatePickingList/index.vue index 7c7a2d3a..323db2a9 100644 --- a/src/views/Inventory/CreatePickingList/index.vue +++ b/src/views/Inventory/CreatePickingList/index.vue @@ -27,27 +27,27 @@ - + - + - + + date - + - + @@ -83,27 +83,27 @@ - + - + - + - + - + @@ -134,27 +134,27 @@ - + - + - + - + - + @@ -203,7 +203,7 @@ - + @@ -213,17 +213,17 @@ {{ scope.row.操作日期.split(' ')[0] }} - + - + - + - + - + - + @@ -62,22 +62,22 @@ - + - + - + - + diff --git a/src/views/Inventory/OfflinePartOut/index.vue b/src/views/Inventory/OfflinePartOut/index.vue index b4561956..231d1dbc 100644 --- a/src/views/Inventory/OfflinePartOut/index.vue +++ b/src/views/Inventory/OfflinePartOut/index.vue @@ -15,22 +15,22 @@ - + - + - + - + diff --git a/src/views/Inventory/OfflinePartsStorage/index.vue b/src/views/Inventory/OfflinePartsStorage/index.vue index 18a1089f..477fc245 100644 --- a/src/views/Inventory/OfflinePartsStorage/index.vue +++ b/src/views/Inventory/OfflinePartsStorage/index.vue @@ -22,19 +22,19 @@ - + - + - + @@ -264,7 +264,17 @@ export default { this.supplierName = '' this.contractNumber = '' } - this.table1 = res.data + // this.table1 = res.data + res.data.map(v => { + this.table1.push({ + 离线合同编号: v.离线合同编号, + 物料名称: v.物料名称, + 规格型号: v.物料规格 + v.物料型号, + 数量: v.数量, + 到货数量: v.到货数量, + 本次到货数量: v.本次到货数量 + }) + }) this.oldVal1 = '' }, // 多选 diff --git a/src/views/Inventory/PurchaseInRecord/index.vue b/src/views/Inventory/PurchaseInRecord/index.vue index a38cd6ee..5c096ba6 100644 --- a/src/views/Inventory/PurchaseInRecord/index.vue +++ b/src/views/Inventory/PurchaseInRecord/index.vue @@ -48,19 +48,19 @@ 查询 -

采购合同件

+

采购合同入库

- + - + - + @@ -70,12 +70,12 @@ {{ scope.row.入库数量 }} - + - + @@ -92,19 +92,19 @@ @size-change="handleSizeChange1" @current-change="handleCurrentChange1"/> -

离线合同件

+

离线合同入库

- + - + - + @@ -114,12 +114,12 @@ {{ scope.row.入库数量 }} - + - + diff --git a/src/views/Inventory/PurchasePartsStorage/index.vue b/src/views/Inventory/PurchasePartsStorage/index.vue index 46c9373a..7989198a 100644 --- a/src/views/Inventory/PurchasePartsStorage/index.vue +++ b/src/views/Inventory/PurchasePartsStorage/index.vue @@ -30,19 +30,19 @@ - + - + - + @@ -317,7 +317,17 @@ export default { this.$set(v, '本次到货数量', v.数量 - v.到货数量) return v }) - this.table1 = res.data + // this.table1 = res.data + res.data.map(v => { + this.table1.push({ + 合同编号: v.合同编号, + 物料名称: v.物料名称, + 规格型号: v.物料规格 + v.物料型号, + 数量: v.数量, + 到货数量: v.到货数量, + 本次到货数量: v.本次到货数量 + }) + }) } else if (this.TypeValue === 3) { if (this.contractValue) { this.contractValue_check = 1 } else { this.contractValue_check = 0 } const param = { diff --git a/src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue b/src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue new file mode 100644 index 00000000..a9fcd084 --- /dev/null +++ b/src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue @@ -0,0 +1,469 @@ + + + + + diff --git a/src/views/ManufacturingCenter/InventoryQuery/index.vue b/src/views/ManufacturingCenter/InventoryQuery/index.vue index 4d24e170..facb157f 100644 --- a/src/views/ManufacturingCenter/InventoryQuery/index.vue +++ b/src/views/ManufacturingCenter/InventoryQuery/index.vue @@ -13,27 +13,27 @@ - + - + - + - + - + diff --git a/src/views/Outsourcing/OutsourcingQCSearch/index.vue b/src/views/Outsourcing/OutsourcingQCSearch/index.vue index b3d648f8..80c1f1bc 100644 --- a/src/views/Outsourcing/OutsourcingQCSearch/index.vue +++ b/src/views/Outsourcing/OutsourcingQCSearch/index.vue @@ -8,12 +8,12 @@ 查询 - + - + diff --git a/src/views/PurchasingCenter/ArrivalStateSearch/index.vue b/src/views/PurchasingCenter/ArrivalStateSearch/index.vue index 6f34a521..992ad58d 100644 --- a/src/views/PurchasingCenter/ArrivalStateSearch/index.vue +++ b/src/views/PurchasingCenter/ArrivalStateSearch/index.vue @@ -31,7 +31,7 @@ height="400px" size="mini" @row-click="searchTable2"> - + @@ -41,17 +41,17 @@ {{ scope.row.采购合同名称 }} - + - + - + diff --git a/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue b/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue index 01510b03..062a27e9 100644 --- a/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue +++ b/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue @@ -14,22 +14,22 @@

采购件列表

- + - + - + - + @@ -83,22 +83,22 @@

滞货件列表

- + - + - + - + diff --git a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue index a256aeef..37992640 100644 --- a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue +++ b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue @@ -41,12 +41,12 @@ - + - + @@ -56,12 +56,12 @@ {{ scope.row.发票金额 }} - + - + diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue index 3039db15..925dc19d 100644 --- a/src/views/PurchasingCenter/OfflineContract/index.vue +++ b/src/views/PurchasingCenter/OfflineContract/index.vue @@ -48,29 +48,29 @@ size="mini" @selection-change="handleSelectionChange1"> - + - + - + - + - + @@ -80,22 +80,22 @@ {{ scope.row.物料类别 }} - + - + - + - + @@ -302,7 +302,7 @@ 全部到货 - + @@ -312,17 +312,17 @@ {{ scope.row.离线合同名称 }} - + - + - + diff --git a/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue b/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue index 6c98f5ff..c5205a53 100644 --- a/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue +++ b/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue @@ -33,17 +33,17 @@

请款表

- + - + - + diff --git a/src/views/PurchasingCenter/PayStateSearch/index.vue b/src/views/PurchasingCenter/PayStateSearch/index.vue index 3026cfb7..5e01d065 100644 --- a/src/views/PurchasingCenter/PayStateSearch/index.vue +++ b/src/views/PurchasingCenter/PayStateSearch/index.vue @@ -54,7 +54,7 @@ - + @@ -64,32 +64,32 @@ {{ scope.row.采购合同名称 }} - + - + - + - + - + - + - + @@ -120,19 +120,19 @@ {{ scope.row.采购合同名称 }} - + - + - + - + diff --git a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue index 8f3231a6..25c1c42e 100644 --- a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue +++ b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue @@ -39,7 +39,7 @@ - + - + - + - + @@ -67,12 +67,12 @@ {{ scope.row.物料型号 }} - + - + @@ -97,7 +97,7 @@ {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.已到货数量 || scope.row.离线到货数量 || '—' }} - + @@ -127,7 +127,7 @@ - + - + - + - + @@ -155,12 +155,12 @@ {{ scope.row.物料型号 }} - + - + @@ -185,7 +185,7 @@ {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.已到货数量 || scope.row.离线到货数量 || '—' }} - + @@ -215,7 +215,7 @@ - + - + - + - + @@ -243,7 +243,7 @@ {{ scope.row.零件图号 }} - + @@ -253,7 +253,7 @@ {{ scope.row.材料 }} - + @@ -278,7 +278,7 @@ {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.已到货数量 || '—' }} - + diff --git a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue index 1edcb51b..76b2257f 100644 --- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue +++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue @@ -137,7 +137,7 @@ - + - + - + @@ -160,27 +160,27 @@ {{ scope.row.组号 }} - + - + - + - + - + @@ -195,7 +195,7 @@ {{ scope.row.备注 }} - + @@ -354,7 +354,7 @@ - + - + - + @@ -377,27 +377,27 @@ {{ scope.row.组号 }} - + - + - + - + - + @@ -412,7 +412,7 @@ {{ scope.row.备注 }} - + @@ -545,7 +545,7 @@ - + - + - + - + - + - + - + @@ -598,7 +598,7 @@ {{ scope.row.备注 }} - + diff --git a/src/views/PurchasingCenter/SetPayPlan/index.vue b/src/views/PurchasingCenter/SetPayPlan/index.vue index f50827f9..fbc8d73e 100644 --- a/src/views/PurchasingCenter/SetPayPlan/index.vue +++ b/src/views/PurchasingCenter/SetPayPlan/index.vue @@ -70,17 +70,17 @@ - + - + - +