diff --git a/index.html b/index.html index c727e55c..32210826 100644 --- a/index.html +++ b/index.html @@ -8,31 +8,7 @@
- + 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/InboundCard.js b/src/api/Inventory/InboundCard.js index 616a0857..04c53795 100644 --- a/src/api/Inventory/InboundCard.js +++ b/src/api/Inventory/InboundCard.js @@ -33,14 +33,14 @@ export function searchInventory() { }) } // 入库记录查询 -export function searchInbound(data1, data2, data3) { +export function searchInbound(...data) { return request({ url: '', method: 'post', data: { type: '1', name: '库存管理_入库记录_采购部查询', - param: '采购合同流水号=' + data1 + '&到货时间=' + data2 + '&仓库流水号=' + data3 + param: `采购合同流水号_check=${data[0]}&采购合同流水号=${data[1]}&到货时间_check=${data[2]}&到货开始时间=${data[3]}&到货结束时间=${data[4]}&仓库流水号_check=${data[5]}&仓库流水号=${data[6]}` } }) } 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/ManufacturingCenter/MachiningSequenceAdjustment.js b/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js index dc57f8fb..e4320d48 100644 --- a/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js +++ b/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js @@ -1,6 +1,17 @@ import request from '@/utils/request' -// 初始化 工位 +// 初始化 人员和工位 export function getMachine() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_加工顺序调整_查询工位及人员' + } + }) +} +// 获取工位 +export function getMachine2() { return request({ url: '', method: 'post', @@ -46,3 +57,15 @@ export function JurisdictionControl(num1, num2) { } }) } +// 所有工序 +export function getTable2(stepNumber) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序', + param: '项目流水号_check=0&项目流水号=0&机床流水号_check=0&机床流水号=0&组件流水号_check=0&组件流水号=0&零件图号_check=1=string&零件图号=' + stepNumber + '=string&是否查询全部数据=1=string&单件是否外协=1&考核状态=6=int' + } + }) +} diff --git a/src/api/ManufacturingCenter/ProcessingStatusEdit.js b/src/api/ManufacturingCenter/ProcessingStatusEdit.js index 913bdf76..967b1234 100644 --- a/src/api/ManufacturingCenter/ProcessingStatusEdit.js +++ b/src/api/ManufacturingCenter/ProcessingStatusEdit.js @@ -17,8 +17,7 @@ export function getMachines() { method: 'post', data: { type: '1', - name: '车间生产管理工艺_传递后_机床名称_加工进度修改模块查询', - param: '是否传递=2=int&考核状态=6=int&工艺任务分配状态=2=int&定额任务分配状态=2=int&单件是否外协=1=int' + name: '车间生产管理工艺_传递后_机床名称_加工进度修改模块查询_MESWORK' } }) } diff --git a/src/api/PurchasingCenter/CreateInquirySheet.js b/src/api/PurchasingCenter/CreateInquirySheet.js index cb6176a7..f1c797f6 100644 --- a/src/api/PurchasingCenter/CreateInquirySheet.js +++ b/src/api/PurchasingCenter/CreateInquirySheet.js @@ -171,3 +171,15 @@ export function editInquirySheet(num1, num2, num3) { } }) } +// 编辑询价单 +export function saveOrder(num1, num2, num3) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_询价单明细_保存数据', + param: `询价单明细流水号组=${num1}&数量组=${num2}&备注组=${num3}` + } + }) +} diff --git a/src/api/PurchasingCenter/CreatePurchaseContract.js b/src/api/PurchasingCenter/CreatePurchaseContract.js index 68a160f5..5ffac52f 100644 --- a/src/api/PurchasingCenter/CreatePurchaseContract.js +++ b/src/api/PurchasingCenter/CreatePurchaseContract.js @@ -32,7 +32,7 @@ export function doneContract(...params) { data: { type: '2', name: '采购管理_采购合同_增加数据', - param: `采购合同编号=${params[0]}&采购合同名称=${params[1]}&交货日期=${params[2]}&支付日期=${params[3]}&支付方式=${params[4]}&开票信息=${params[5]}&其他说明=${params[6]}&合同总额=${params[7]}&采购员流水号=${params[8]}&供应商流水号=${params[9]}&单价是否含税=${params[10]}&组件零件流水号组=${params[11]}&组件零件基本件流水号组=${params[12]}&数量组=${params[13]}&单价组=${params[14]}&交货期组=${params[15]}&合同内容\\=${params[16]}` + param: `采购合同编号=${params[0]}\\&采购合同名称=${params[1]}\\&交货日期=${params[2]}\\&支付日期=${params[3]}\\&支付方式=${params[4]}\\&开票信息=${params[5]}\\&其他说明=${params[6]}\\&合同总额=${params[7]}\\&采购员流水号=${params[8]}\\&供应商流水号=${params[9]}\\&单价是否含税=${params[10]}\\&组件零件流水号组=${params[11]}\\&组件零件基本件流水号组=${params[12]}\\&数量组=${params[13]}\\&单价组=${params[14]}\\&交货期组=${params[15]}\\&合同内容\\=${params[16]}` } }) } diff --git a/src/api/PurchasingCenter/InvoiceSettlementApplication.js b/src/api/PurchasingCenter/InvoiceSettlementApplication.js new file mode 100644 index 00000000..97df2770 --- /dev/null +++ b/src/api/PurchasingCenter/InvoiceSettlementApplication.js @@ -0,0 +1,111 @@ +import request from '@/utils/request' + +// 根据条件查发票结算申请单 +export function searchTable1(...group) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_发票结算申请单_查询数据', + param: `发票号_check=${group[0]}&发票号=${group[1]}`, + Pagination: group[2] + '&' + group[3] + } + }) +} +// 编辑发票结算申请单 +export function submitEdit(...group) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_发票结算申请单_修改数据', + param: `发票号=${group[0]}&发票金额=${group[1]}&已付款项=${group[2]}&尚欠金额=${group[3]}&税额=${group[4]}&是否费用类=${group[5]}&备注=${group[6]}&发票结算申请单流水号=${group[7]}` + } + }) +} +// 删除发票结算申请单 +export function submitDelete(...group) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_发票结算申请单_删除数据', + param: `发票结算申请单流水号=${group[0]}` + } + }) +} +// 提交申请 发票结算申请单 +export function submitApply(...group) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_发票结算申请单_提交申请', + param: `发票结算申请单流水号=${group[0]}&申请人=${group[1]}` + } + }) +} +// 发票结算申请单明细列表 +export function searchTable2(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_发票结算申请单明细_查询数据', + param: `发票结算申请单流水号=${num}` + } + }) +} +// 入库单查询 +export function searchInboundCard(data1, data2) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_采购入库单_入库单查询', + param: '入库单号_check=' + data1 + '&入库单号=' + data2 + } + }) +} +// 入库单明细查询 +export function searchInboundCardDetail(data1) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_采购入库单_入库单明细_查询数据', + param: '采购入库单流水号=' + data1 + } + }) +} +// 发票结算申请单明细增加 +export function addTable2(data, group) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_发票结算申请单明细_增加数据', + param: '发票结算申请单流水号=' + data + '&采购入库单流水号组=' + group + } + }) +} +// 发票结算申请单明细删除 +export function deleteTable2(group) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_发票结算申请单明细_删除数据', + param: '发票结算申请单明细流水号组=' + group + } + }) +} diff --git a/src/api/PurchasingCenter/InvoiceSettlementApprove.js b/src/api/PurchasingCenter/InvoiceSettlementApprove.js new file mode 100644 index 00000000..6c8898e1 --- /dev/null +++ b/src/api/PurchasingCenter/InvoiceSettlementApprove.js @@ -0,0 +1,51 @@ +import request from '@/utils/request' + +// 根据条件查发票结算申请单 +export function searchTable1(...group) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_发票结算申请单_查询数据', + param: `时间段_check=${group[0]}&开始日期=${group[1]}&结束日期=${group[2]}&是否提交=1`, + Pagination: group[3] + '&' + group[4] + } + }) +} +// 发票结算申请单明细列表 +export function searchTable2(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_发票结算申请单明细_查询数据', + param: `发票结算申请单流水号=${num}` + } + }) +} +// 入库单明细查询 +export function searchInboundCardDetail(data1) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_采购入库单_入库单明细_查询数据', + param: '采购入库单流水号=' + data1 + } + }) +} +// 执行审批 +export function excuteApprove(...data) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_发票结算申请单_执行审批', + param: `发票结算申请单流水号=${data[0]}&人员编号=${data[1]}&审批代号=${data[2]}` + } + }) +} diff --git a/src/api/PurchasingCenter/MaterialManagement.js b/src/api/PurchasingCenter/MaterialManagement.js index ab4513ce..3d258b15 100644 --- a/src/api/PurchasingCenter/MaterialManagement.js +++ b/src/api/PurchasingCenter/MaterialManagement.js @@ -82,7 +82,7 @@ export function addData(MaterialVariety, MaterialName, FullNameOfMaterial, Mater data: { type: '2', name: '库存管理_物料主文件_基本_增加数据', - param: '物料品种流水号=' + MaterialVariety + '&物料名称=' + MaterialName + '&物料全名=' + FullNameOfMaterial + '&物料规格=' + MaterialSpecification + '&物料型号=' + MaterialModel + '&计量单位流水号=' + MeasurementUnitValue + '&物料来源流水号=' + MaterialSourceValue + '&供货商流水号=' + supplierValue1 + param: '物料品种流水号=' + MaterialVariety + '&物料名称\\=' + MaterialName + '&物料全名\\=' + FullNameOfMaterial + '&物料规格\\=' + MaterialSpecification + '&物料型号\\=' + MaterialModel + '&计量单位流水号=' + MeasurementUnitValue + '&物料来源流水号=' + MaterialSourceValue + '&供货商流水号=' + supplierValue1 } }) } @@ -93,7 +93,7 @@ export function editData(MaterialValue, MaterialVariety, MaterialName, FullNameO data: { type: '2', name: '库存管理_物料主文件_基本_修改数据', - param: '物料流水号=' + MaterialValue + '&物料品种流水号=' + MaterialVariety + '&物料名称=' + MaterialName + '&物料全名=' + FullNameOfMaterial + '&物料规格=' + MaterialSpecification + '&物料型号=' + MaterialModel + '&计量单位流水号=' + MeasurementUnitValue + '&物料来源流水号=' + MaterialSourceValue + '&供货商流水号=' + supplierValue1 + param: '物料流水号=' + MaterialValue + '&物料品种流水号=' + MaterialVariety + '&物料名称\\=' + MaterialName + '&物料全名\\=' + FullNameOfMaterial + '&物料规格\\=' + MaterialSpecification + '&物料型号\\=' + MaterialModel + '&计量单位流水号=' + MeasurementUnitValue + '&物料来源流水号=' + MaterialSourceValue + '&供货商流水号=' + supplierValue1 } }) } diff --git a/src/api/PurchasingCenter/OfflineContract.js b/src/api/PurchasingCenter/OfflineContract.js index 2088e18d..2995bcc8 100644 --- a/src/api/PurchasingCenter/OfflineContract.js +++ b/src/api/PurchasingCenter/OfflineContract.js @@ -122,15 +122,27 @@ export function deleteMateriel(num) { } }) } +// 保存离线合同 +export function saveOfflineContact(contractNum, total, partGroup, numGroup, priceGroup, dateGroup, remarkGroup) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_离线合同_保存合同', + param: `离线合同流水号=${contractNum}&合同总额=${total}&离线合同明细流水号组=${partGroup}&数量组=${numGroup}&单价组=${priceGroup}&交货期要求组=${dateGroup}&备注组=${remarkGroup}` + } + }) +} // 生成离线合同 -export function doneOfflineContact(contractNum, total, partGroup, numGroup, priceGroup) { +export function doneOfflineContact(contractNum, total, partGroup, numGroup, priceGroup, dateGroup, remarkGroup) { return request({ url: '', method: 'post', data: { type: '2', name: '采购管理_离线合同_生成合同', - param: `离线合同流水号=${contractNum}&合同总额=${total}&离线合同明细流水号组=${partGroup}&数量组=${numGroup}&单价组=${priceGroup}` + param: `离线合同流水号=${contractNum}&合同总额=${total}&离线合同明细流水号组=${partGroup}&数量组=${numGroup}&单价组=${priceGroup}&交货期要求组=${dateGroup}&备注组=${remarkGroup}` } }) } diff --git a/src/api/PurchasingCenter/OfflineContractRequestFund.js b/src/api/PurchasingCenter/OfflineContractRequestFund.js index 2c72eb31..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}` } }) } @@ -55,9 +66,21 @@ export function cancelRequestFund(num) { url: '', method: 'post', data: { - type: '2', + type: '1', name: '采购管理_离线合同_请款_删除数据', param: `离线合同请款流水号=${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/PurchaseContractRequestFund.js b/src/api/PurchasingCenter/PurchaseContractRequestFund.js index bdcc0daf..f4210aca 100644 --- a/src/api/PurchasingCenter/PurchaseContractRequestFund.js +++ b/src/api/PurchasingCenter/PurchaseContractRequestFund.js @@ -65,7 +65,7 @@ export function cancelRequestFund(num1) { url: '', method: 'post', data: { - type: '2', + type: '1', name: '采购管理_采购请款表_删除数据', param: '采购请款流水号=' + num1 } 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/icons/svg/InvoiceSettlementApplication.svg b/src/icons/svg/InvoiceSettlementApplication.svg new file mode 100644 index 00000000..6640f8dc --- /dev/null +++ b/src/icons/svg/InvoiceSettlementApplication.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/InvoiceSettlementApprove.svg b/src/icons/svg/InvoiceSettlementApprove.svg new file mode 100644 index 00000000..300ca023 --- /dev/null +++ b/src/icons/svg/InvoiceSettlementApprove.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/utils/request.js b/src/utils/request.js index 908de161..81241138 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -22,7 +22,7 @@ const service = axios.create({ 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 // 请求超时时间 + timeout: 1500000 // 请求超时时间git }) // request拦截器 diff --git a/src/views/Inventory/InboundCard/index.vue b/src/views/Inventory/InboundCard/index.vue index b812aef5..7d1e941d 100644 --- a/src/views/Inventory/InboundCard/index.vue +++ b/src/views/Inventory/InboundCard/index.vue @@ -11,14 +11,21 @@ :label="item.label" :value="item.value"/> - 入库日期 + 到货时间 + placeholder="选择开始日期"/> ~ + 仓库: - + + + + - + - + - + - + - + - + @@ -164,35 +176,25 @@ + - 入库单编号 + 入库单编号： 查询 创建 选入 + - - - + + @@ -200,7 +202,7 @@ {{ scope.row.仓库名称 }} - + @@ -212,7 +214,7 @@ @@ -220,7 +222,7 @@ {{ scope.row.业务号 }} - + @@ -230,17 +232,17 @@ {{ scope.row.姓名 }} - + - + - + @@ -252,9 +254,9 @@ @@ -268,16 +270,7 @@ @size-change="handleSizeChange2" @current-change="handleCurrentChange2"/> - + - + - + - + - + +
-
+

采 购 入 库 单

@@ -385,13 +379,13 @@
- - - - - - + + + + + + @@ -405,7 +399,7 @@ - + @@ -423,8 +417,8 @@
存货编码
{{ index + 1 }} {{ list.名称 }}{{ list.规格 }}{{ list.规格 + list.型号 }} {{ list.零件图号 }} {{ list.数量 }} {{ list.本币单价 }}
- 制单人:{{ '李鑫' }} - 审核人:{{ '李鑫' }} + 制单人: + 审核人:
@@ -433,6 +427,7 @@ 打印
+ @@ -526,6 +521,7 @@ 确定 + @@ -636,6 +632,8 @@ export default { ShopContractValue: '', // 车间采购合同流水号 Inventory: [], InventoryValue: '', + InboundStartDate: '', + InboundEndDate: '', InboundDate: '', listLoading: '', tableData: [], @@ -701,6 +699,7 @@ export default { created() { this.searchContractData() this.searchInventoryData() + this.searchInboundCard1() }, methods: { searchContractData() { // 查询合同 @@ -743,7 +742,11 @@ export default { searchPartinfo() { this.tableData = [] this.listLoading = true - searchInbound(this.ContractValue, this.InboundDate, this.InventoryValue).then(response => { + let check1, check2, check3 + this.ContractValue ? check1 = 1 : check1 = 0 + this.InboundStartDate && this.InboundEndDate ? check2 = 1 : (check2 = 0, this.InboundStartDate = null, this.InboundEndDate = null) + this.InventoryValue ? check3 = 1 : check3 = 0 + searchInbound(check1, this.ContractValue, check2, this.InboundStartDate, this.InboundEndDate, check3, this.InventoryValue).then(response => { for (let i = 0; i < response.data.length; i++) { if (response.data[i].组件零件流水号 === 0) { response.data[i].物料名称 = response.data[i].零件名称 @@ -786,6 +789,7 @@ export default { addInboundCard(this.form.inboundDay, this.form.house, this.form.contract, this.form.arrive, this.form.affairPeople, this.form.affair, this.form.arriveDay, this.form.affirType, this.form.purchaseType, this.form.inboundType, this.form.note).then(response => { if (response.data[0].result === '1') { this.$message.success('增加成功') + this.searchInboundCard1() this.dialogVisible1 = false } else { this.$message.error('增加失败') @@ -867,6 +871,7 @@ export default { editInboundCard(this.DetailNumber, this.form.inboundDay, this.form.house, this.form.contract, this.form.arrive, this.form.affairPeople, this.form.affair, this.form.arriveDay, this.form.affirType, this.form.purchaseType, this.form.inboundType, this.form.note).then(response => { if (response.data[0].result === '1') { this.$message.success('修改成功') + this.searchInboundCard1() this.dialogVisible2 = false } else { this.$message.error('修改失败') @@ -879,11 +884,10 @@ export default { searchDetail(row) { this.DetailNumber = row.采购入库单流水号 searchInboundCardDetail(this.DetailNumber).then(response => { - const data = response.data - for (let i = 0; i < data[i].length; i++) { - data[i].数量 = parseInt(data[i].数量) + for (let i = 0; i < response.data.length; i++) { + response.data[i].数量 = parseInt(response.data[i].数量) } - this.tableData4 = data + this.tableData4 = response.data }) }, // 删除领料单 @@ -1007,6 +1011,7 @@ export default { this.inbondCard[13] = row.备注 this.DetailNumber = row.采购入库单流水号 searchInboundCardDetail(this.DetailNumber).then(response => { + console.log(this.tableData4) this.tableData4 = response.data return this.tableData4 }).then(data => { @@ -1035,6 +1040,18 @@ export default { diff --git a/src/views/Outsourcing/PreorderAssociation/index.vue b/src/views/Outsourcing/PreorderAssociation/index.vue index db9112cd..2fd68a08 100644 --- a/src/views/Outsourcing/PreorderAssociation/index.vue +++ b/src/views/Outsourcing/PreorderAssociation/index.vue @@ -295,61 +295,11 @@ export default { edit2(row.工序流水号, row.工艺计划流水号, 1).then(response => { this.$message.success('工序外协状态更改成功') }) - }).then(() => { - this.loading2 = true - this.checkBox = [] - this.tableData2 = [] - searchTable2(this.num1).then(response => { - if (response.data.length === 0) { - this.loading0 = false - } else { - for (let i = 0; i < response.data.length; i++) { - if (response.data[i].工序间是否外协 === 1) { - this.checkBox.push(false) - } else { - this.checkBox.push(true) - } - } - for (let i = 0; i < response.data.length; i++) { - response.data[i].机加工开始时间 = response.data[i].机加工开始时间.split(' ')[0] - response.data[i].机加工结束时间 = response.data[i].机加工结束时间.split(' ')[0] - response.data[i].计划日期 = response.data[i].计划日期.split(' ')[0] - } - this.tableData2 = response.data - } - }).then(() => { - this.loading2 = false - }) }) } else { this.InOut = 1 edit(row.工序流水号, this.InOut).then(response => { this.$message.success('工序外协状态更改成功') - }).then(() => { - this.loading2 = true - this.checkBox = [] - this.tableData2 = [] - searchTable2(this.num1).then(response => { - if (response.data.length === 0) { - this.loading0 = false - } else { - for (let i = 0; i < response.data.length; i++) { - if (response.data[i].工序间是否外协 === 1) { - this.checkBox.push(false) - } else { - this.checkBox.push(true) - } - } - for (let i = 0; i < response.data.length; i++) { - response.data[i].机加工开始时间 = response.data[i].机加工开始时间.split(' ')[0] - response.data[i].机加工结束时间 = response.data[i].机加工结束时间.split(' ')[0] - response.data[i].计划日期 = response.data[i].计划日期.split(' ')[0] - } - this.tableData2 = response.data - } - }).then(() => { - this.loading2 = false - }) }) } }, diff --git a/src/views/PurchasingCenter/ArrivalStateSearch/index.vue b/src/views/PurchasingCenter/ArrivalStateSearch/index.vue index 91030159..b433f16c 100644 --- a/src/views/PurchasingCenter/ArrivalStateSearch/index.vue +++ b/src/views/PurchasingCenter/ArrivalStateSearch/index.vue @@ -62,7 +62,7 @@ diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue index 93330a41..5ffdedab 100644 --- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue +++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue @@ -26,8 +26,8 @@ :data="tableData11" :row-class-name="tableRowClassName" border - style="width: 100%;max-height: 300px;" - height="300px" + style="width: 100%;max-height: 600px;" + height="600px" size="mini" @selection-change="handleSelectionChange1"> @@ -48,11 +48,21 @@ {{ scope.row.物料计划到货时间.split(' ')[0] }} - + + + + + + + - + + + + + + + - + @@ -278,33 +297,55 @@ layout="total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange2" @current-change="handleCurrentChange2"/> + 导出 + 保存 - - + + - + - + - + - + + + + + + + + + + + + +