diff --git a/src/api/Inventory/OfflinePartOut.js b/src/api/Inventory/OfflinePartOut.js index a8175c7b..9295448d 100644 --- a/src/api/Inventory/OfflinePartOut.js +++ b/src/api/Inventory/OfflinePartOut.js @@ -12,14 +12,14 @@ export function initProject() { }) } // 机床查询 -export function searchmachine(check, num) { +export function searchmachine(num) { return request({ url: '', method: 'post', data: { type: '1', name: 'PDM_机床名称_查询数据', - param: '项目流水号_check=' + check + '&项目流水号=' + num + param: '项目流水号_check=1&项目流水号=' + num } }) } @@ -36,14 +36,15 @@ export function searchTeam(machineNumber) { }) } // 初始化物料 -export function searchPart(data1) { +export function searchPart(...params) { return request({ url: '', method: 'post', data: { type: '1', name: '库存管理_离线外购件_出库查询', - param: '离线合同编号=' + data1 + param: `物料名称_check=${params[0]}&物料名称=${params[1]}&物料规格_check=${params[2]}&物料规格=${params[3]}&物料型号_check=${params[4]}&物料型号=${params[5]}`, + Pagination: params[6] + '&' + params[7] } }) } @@ -60,26 +61,27 @@ export function searchPeople(data1) { }) } // 离线件出库 -export function outlinePartOut(data1, data2, data3, data4, data5, data6, data7, data8, data9, data10) { +export function outlinePartOut(data2, data3, data4, data5, data6, data7, data8, data9, data10) { return request({ url: '', method: 'post', data: { type: '2', name: '库存管理_离线采购件_零件出库', - param: '离线合同明细流水号=' + data1 + '&领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&备注=' + data5 + '&项目流水号=' + data6 + '&机床流水号=' + data7 + '&组件流水号=' + data8 + '&物料流水号=' + data9 + '&出库人员流水号=' + data10 + param: '领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&备注=' + data5 + '&项目流水号=' + data6 + '&机床流水号=' + data7 + '&组件流水号=' + data8 + '&物料流水号=' + data9 + '&出库人员流水号=' + data10 } }) } // 查询出库记录 -export function outRecord(data1) { +export function outRecord(...params) { return request({ url: '', method: 'post', data: { type: '1', name: '库存管理_离线外购件出库_出库记录', - param: '离线合同明细流水号=' + data1 + param: '物料流水号=' + params[0], + Pagination: params[1] + '&' + params[2] } }) } diff --git a/src/api/Inventory/PartOut.js b/src/api/Inventory/PartOut.js index 066a83bb..3b82dfd3 100644 --- a/src/api/Inventory/PartOut.js +++ b/src/api/Inventory/PartOut.js @@ -1,14 +1,15 @@ import request from '@/utils/request' // 领料单查询 -export function searchList(listNumber_check, listNumber) { +export function searchList(listNumber_check, listNumber, pageCurrent, pageSize) { return request({ url: '', method: 'post', data: { type: '1', name: '车间装配管理_领料单_领料单查询', - param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber + param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber, + Pagination: pageCurrent + '&' + pageSize } }) } diff --git a/src/api/ManufacturingCenter/ProcessingStatus.js b/src/api/ManufacturingCenter/ProcessingStatus.js index bd59c21e..d157775b 100644 --- a/src/api/ManufacturingCenter/ProcessingStatus.js +++ b/src/api/ManufacturingCenter/ProcessingStatus.js @@ -49,14 +49,14 @@ export function getTable(stepNumber, a, b, c, d, e, f, g, i, j, k, l, m, pageCur }) } -export function getTable2(stepNumber, a, b, c, d, e, g, i) { +export function getTable2(stepNumber) { return request({ url: '', method: 'post', data: { type: '1', - name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序', - param: '项目流水号_check=' + stepNumber + '=string&项目流水号=' + a + '=string&机床流水号_check=' + b + '=string&机床流水号=' + c + '=string&组件流水号_check=' + d + '=string&组件流水号=' + e + '=string&零件图号_check=1=string&零件图号=' + g + '=string&是否查询全部数据=1=string&单件是否外协=' + i + '=string&考核状态=6=int' + name: '车间生产管理工艺_加工进度查询_查询', + param: '工艺计划流水号=' + stepNumber } }) } diff --git a/src/api/ManufacturingCenter/ProcessingStatusEdit.js b/src/api/ManufacturingCenter/ProcessingStatusEdit.js index d75ab8ab..28bed7e4 100644 --- a/src/api/ManufacturingCenter/ProcessingStatusEdit.js +++ b/src/api/ManufacturingCenter/ProcessingStatusEdit.js @@ -47,14 +47,14 @@ export function getTable(stepNumber, a, b, c, d, e, f, g, h, i, j, k, pageCurren }) } -export function getTable2(stepNumber, a, b, c, d, e, g) { +export function getTable2(stepNumber) { return request({ url: '', method: 'post', data: { type: '1', - name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序_加工进度修改', - param: '项目流水号_check=' + stepNumber + '=string&项目流水号=' + a + '=string&机床流水号_check=' + b + '=string&机床流水号=' + c + '=string&组件流水号_check=' + d + '=string&组件流水号=' + e + '=string&零件图号_check=1=string&零件图号=' + g + '=string&是否查询全部数据=1=string&单件是否外协=0' + name: '车间生产管理工艺_加工进度修改2_查询', + param: '工艺计划流水号=' + stepNumber } }) } diff --git a/src/api/ManufacturingCenter/machiningHoursStatistics.js b/src/api/ManufacturingCenter/machiningHoursStatistics.js new file mode 100644 index 00000000..749c2705 --- /dev/null +++ b/src/api/ManufacturingCenter/machiningHoursStatistics.js @@ -0,0 +1,28 @@ +import request from '@/utils/request' + +// 查询人员总工工时 +export function searchtable(num1, num2, num3, num4, num5, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_工时统计_查询数据', + param: '操作者_check=' + num1 + '&操作者=' + num2 + '&时间_check=' + num3 + '&开始时间=' + num4 + '&结束时间=' + num5, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 查询人员具体工序 +export function searchtable2(num1, num2, num3, num4, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_工时统计按人员查询_查询数据', + param: '工作者编号=' + num1 + '&时间_check=' + num2 + '&开始时间=' + num3 + '&结束时间=' + num4, + Pagination: pageCurrent + '&' + pageSize + } + }) +} diff --git a/src/api/PurchasingCenter/ProjectTotalSearch.js b/src/api/PurchasingCenter/ProjectTotalSearch.js index f6538aa4..ea0da409 100644 --- a/src/api/PurchasingCenter/ProjectTotalSearch.js +++ b/src/api/PurchasingCenter/ProjectTotalSearch.js @@ -11,15 +11,39 @@ export function initProject() { } }) } +// 机床查询 +export function searchMachine(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_机床名称_查询数据', + param: '项目流水号_check=1&项目流水号=' + num + } + }) +} +// 分组查询 +export function searchGroup(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_组件名称_查询数据', + param: '机床流水号=' + num + } + }) +} // 初始化项目金额统计表 -export function searchProjectTotal(num) { +export function searchProjectTotal(check1, num1, check2, num2, check3, num3) { return request({ url: '', method: 'post', data: { type: '1', name: '采购管理_项目采购总价_查询数据', - param: `项目流水号=${num}` + param: `项目流水号_check=${check1}&项目流水号=${num1}&机床流水号_check=${check2}&机床流水号=${num2}&组件流水号_check=${check3}&组件流水号=${num3}` } }) } diff --git a/src/api/PurchasingCenter/ReceiveCheck.js b/src/api/PurchasingCenter/ReceiveCheck.js index 33932f2d..ad68cd63 100644 --- a/src/api/PurchasingCenter/ReceiveCheck.js +++ b/src/api/PurchasingCenter/ReceiveCheck.js @@ -11,15 +11,39 @@ export function initProject() { } }) } +// 机床查询 +export function searchMachine(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_机床名称_查询数据', + param: '项目流水号_check=1&项目流水号=' + num + } + }) +} +// 分组查询 +export function searchGroup(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_组件名称_查询数据', + param: '机床流水号=' + num + } + }) +} // 初始化项目金额统计表 -export function searchReceiveCheck(check, num) { +export function searchReceiveCheck(check1, num1, check2, num2, check3, num3) { return request({ url: '', method: 'post', data: { type: '1', name: '采购管理_领用核算_查询数据', - param: `项目流水号_check=${check}&项目流水号=${num}` + param: `项目流水号_check=${check1}&项目流水号=${num1}&机床流水号_check=${check2}&机床流水号=${num2}&组件流水号_check=${check3}&组件流水号=${num3}` } }) } diff --git a/src/api/TechnologyCenter/CreatePackingList.js b/src/api/TechnologyCenter/CreatePackingList.js index 7189ec4b..b436f4cc 100644 --- a/src/api/TechnologyCenter/CreatePackingList.js +++ b/src/api/TechnologyCenter/CreatePackingList.js @@ -6,7 +6,7 @@ export function projectSelect() { method: 'post', data: { type: '1', - name: 'PDM_项目名称_查询数据' + name: 'PDM_项目名称_查询数据_按时间排序' } }) } diff --git a/src/api/WorkshopProcurement/FundApproval.js b/src/api/WorkshopProcurement/FundApproval.js index c8ff277f..dc333c70 100644 --- a/src/api/WorkshopProcurement/FundApproval.js +++ b/src/api/WorkshopProcurement/FundApproval.js @@ -1,52 +1,63 @@ import request from '@/utils/request' -// 查询审核/审批/付款 +// 查询审批/付款 export function initApproval(pageCurrent, pageSize, state) { return request({ url: '', method: 'post', data: { type: '1', - name: '采购管理_请款表_查询数据_审核审批', - param: `审核_审批_付款状态=${state}`, + name: '车间采购管理_采购合同_审批付款_查询数据', + param: `审批_付款状态=${state}`, Pagination: pageCurrent + '&' + pageSize } }) } -// 执行审核/审批/付款 +// 执行审批/付款 export function execApproval(num1, num2, reason, person, state) { return request({ url: '', method: 'post', data: { type: '2', - name: '采购管理_请款表_修改数据_审核审批', - param: `采购科请款流水号=${num1}&审核_审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审核_审批_付款状态=${state}` + name: '车间采购管理_采购合同_审批付款_修改数据', + param: `采购合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state}` } }) } -// 查询车间合同审核/审批/付款 +// 查询车间合同审批/付款 export function initApproval1(pageCurrent, pageSize, state) { return request({ url: '', method: 'post', data: { type: '1', - name: '车间采购管理_请款表_查询数据_审核审批', - param: `审核_审批_付款状态=${state}`, + name: '车间采购管理_采购合同_审批付款_查询数据', + param: `审批_付款状态=${state}`, Pagination: pageCurrent + '&' + pageSize } }) } -// 执行车间合同审核/审批/付款 +export function searchRequsetFundDetail3(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间采购管理_采购合同_请款明细_查询数据', + param: `采购合同请款流水号=${num}` + } + }) +} +// 执行车间合同审批/付款 export function execApproval1(num1, num2, reason, person, state) { return request({ url: '', method: 'post', data: { type: '2', - name: '采购管理_请款表_修改数据_审核审批', - param: `采购科请款流水号=${num1}&审核_审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审核_审批_付款状态=${state}` + name: '车间采购管理_采购合同_审批付款_修改数据', + param: `采购合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${state}` } }) } diff --git a/src/api/WorkshopProcurement/InvoiceSettlementApplication1.js b/src/api/WorkshopProcurement/InvoiceSettlementApplication1.js new file mode 100644 index 00000000..fe0d5835 --- /dev/null +++ b/src/api/WorkshopProcurement/InvoiceSettlementApplication1.js @@ -0,0 +1,146 @@ +import request from '@/utils/request' + +// 查询供应商 +export function searchSupplier() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_供应商_查询数据_根据条件' + } + }) +} +// 根据条件查发票结算申请单 +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 searchPurchase(data) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间采购管理_采购合同_查询数据', + param: '供应商流水号_check=1&供应商流水号=' + data + } + }) +} +// 根据供应商查询离线合同 +export function searchOffline(data) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间采购管理_离线合同_查询数据', + param: '供应商流水号_check=1&供应商流水号=' + data + } + }) +} +// 查询采购合同明细 +export function searchPurchaseDetail(data) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间采购管理_采购合同明细_查询数据', + param: '采购合同流水号=' + data + } + }) +} +// 查询离线合同明细 +export function searchOfflineDetail(data) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间采购管理_离线合同明细_查询数据', + param: '离线合同流水号=' + data + } + }) +} +// 发票结算申请单明细增加-1采购/2离线 +export function addTable2(data, group1, group2, type) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间采购管理_发票结算申请单明细_增加数据', + param: '发票结算申请单流水号=' + data + '&合同明细流水号组=' + group1 + '&到票数量组=' + group2 + '&合同类型=' + type + } + }) +} +// 发票结算申请单明细删除 +export function deleteTable2(data) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间采购管理_发票结算申请单明细_删除数据', + param: '发票结算申请单明细流水号=' + data + } + }) +} diff --git a/src/api/WorkshopProcurement/InvoiceSettlementApprove1.js b/src/api/WorkshopProcurement/InvoiceSettlementApprove1.js new file mode 100644 index 00000000..84d6c7f6 --- /dev/null +++ b/src/api/WorkshopProcurement/InvoiceSettlementApprove1.js @@ -0,0 +1,39 @@ +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 excuteApprove(...data) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间采购管理_发票结算申请单_执行审批', + param: `发票结算申请单流水号=${data[0]}&人员编号=${data[1]}&审批代号=${data[2]}` + } + }) +} diff --git a/src/api/WorkshopProcurement/OfflineContractRequestFund1.js b/src/api/WorkshopProcurement/OfflineContractRequestFund1.js index 9c14ec59..922c91e3 100644 --- a/src/api/WorkshopProcurement/OfflineContractRequestFund1.js +++ b/src/api/WorkshopProcurement/OfflineContractRequestFund1.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}` } }) } diff --git a/src/api/WorkshopProcurement/PurchaseContractRequestFund1.js b/src/api/WorkshopProcurement/PurchaseContractRequestFund1.js new file mode 100644 index 00000000..dac0b585 --- /dev/null +++ b/src/api/WorkshopProcurement/PurchaseContractRequestFund1.js @@ -0,0 +1,73 @@ +import request from '@/utils/request' + +// 查询请款表 +export function searchRequestFund(pageCurrent, pageSize, check1, start, end, check2, num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间采购管理_采购合同_请款_查询数据', + param: `时间段_check=${check1}&开始时间=${start}&结束时间=${end}&供应商流水号_check=${check2}&供应商流水号=${num}`, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 查询供应商 +export function searchSupplier() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_供应商_查询数据_根据条件' + } + }) +} +export function submitRequestFund(contractGroup, sumGroup, supplier, money, person) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间采购管理_采购合同_请款_增加数据', + param: `采购合同流水号组=${contractGroup}&合同总额组=${sumGroup}&供应商流水号=${supplier}&请款金额=${money}&请款人=${person}` + } + }) +} +// 查询离线合同待请款信息 +export function searchRequsetFundDetail(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间采购管理_采购合同_请款明细_查询数据', + param: `采购合同请款流水号=${num}` + } + }) +} +// 取消请款 +export function cancelRequestFund(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间采购管理_采购合同_请款_删除数据', + param: `采购合同请款流水号=${num}` + } + }) +} +// 查询离线合同待请款信息 +export function searchPurchaseContract(check, num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间采购管理_采购合同_查询数据', + param: `供应商流水号_check=${check}&供应商流水号=${num}` + } + }) +} diff --git a/src/icons/svg/InvoiceSettlementApplication1.svg b/src/icons/svg/InvoiceSettlementApplication1.svg new file mode 100644 index 00000000..6640f8dc --- /dev/null +++ b/src/icons/svg/InvoiceSettlementApplication1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/InvoiceSettlementApprove1.svg b/src/icons/svg/InvoiceSettlementApprove1.svg new file mode 100644 index 00000000..300ca023 --- /dev/null +++ b/src/icons/svg/InvoiceSettlementApprove1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/PurchaseContractRequestFund1.svg b/src/icons/svg/PurchaseContractRequestFund1.svg new file mode 100644 index 00000000..a5c6b119 --- /dev/null +++ b/src/icons/svg/PurchaseContractRequestFund1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/PurchaseSituationSearch.svg b/src/icons/svg/PurchaseSituationSearch.svg new file mode 100644 index 00000000..a0560fb7 --- /dev/null +++ b/src/icons/svg/PurchaseSituationSearch.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/utils/request.js b/src/utils/request.js index 7b2655fc..0a45cef9 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -13,6 +13,7 @@ export const upload = `http://192.168.1.231:8411/submit/uploadFile.ashx` // Cont export const upload2 = `http://192.168.1.231:8411/submit/upload2.ashx` // delivery export const upload3 = `http://192.168.1.231:8411/submit/upload3.ashx` // performancebond export const uploadInvoiceScan = `http://192.168.1.231:8411/submit/uploadInvoiceScan.ashx` // invoice +export const uploadInvoiceScan1 = `http://192.168.1.231:8411/submit/uploadInvoiceScan1.ashx` // invoice(workshop) export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement const service = axios.create({ // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, diff --git a/src/views/Inventory/InventoryManagement/index.vue b/src/views/Inventory/InventoryManagement/index.vue index 1f6d153a..85a0cd31 100644 --- a/src/views/Inventory/InventoryManagement/index.vue +++ b/src/views/Inventory/InventoryManagement/index.vue @@ -1,16 +1,10 @@ - + - + -
+
- - +
+

采购部采购件

+ + - + - + - - - - - - @@ -277,43 +229,53 @@ {{ scope.row.机床图号 }} - + - + - + + + + + + + - + - + - + - + -
+
- - +
+

车间采购件

+ + - - - - + - + - + + + + + + + - + - + + + + - + -
+
+ + + @@ -435,6 +402,9 @@ + + + @@ -538,8 +508,8 @@ export default { outNote: '' // 出库备注 }, rules2: { // 表单验证规则 - OutNumber: [{ required: true, message: '请输入出库数量', trigger: 'blur' }], - outNote: [{ required: true, message: '请输入出库备注', trigger: 'blur' }] + OutNumber: [{ required: true, message: '请输入出库数量', trigger: 'blur' }] + // outNote: [{ required: true, message: '请输入出库备注', trigger: 'blur' }] }, form3: { // 车间采购出库 OutNumber: '', // 出库数量 @@ -568,19 +538,19 @@ export default { listLoading3: false, PageCurrent: 1, PageSize: 10, - total: null, + total: 0, PageCurrent1: 1, PageSize1: 10, - total1: null, + total1: 0, PageCurrent2: 1, PageSize2: 10, - total2: null, + total2: 0, PageCurrent3: 1, PageSize3: 10, - total3: null, + total3: 0, PageCurrentx: 1, PageSizex: 10, - totalx: null, + totalx: 0, materialName: '', materialNumber: '', materialType: '', @@ -612,6 +582,8 @@ export default { created() { this.fetchData() this.getpeopleid() + this.searchListinfor() + this.searchPartinfo() }, methods: { fetchData() { @@ -621,7 +593,8 @@ export default { getpeopleid() { this.picikingPeople = this.id }, - searchMachine() { // 查询机床 + // 查询机床 + searchMachine() { this.MachineValue = '' this.Machine = [] this.GroupNumValue = '' @@ -640,7 +613,8 @@ export default { } }) }, - searchGroupList() { // 查询组号 + // 查询组号 + searchGroupList() { this.GroupNumValue = '' this.GroupNum = [] searchTeam(this.MachineValue).then(response => { @@ -652,18 +626,13 @@ export default { } }) }, + // 根据项目机床分组查零件/物料 searchPartinfo() { this.tableDataPurchase = [] this.tableDataBasic = [] - if (this.ProjectValue !== null && this.ProjectValue !== '') { - this.ProjectValue_check = 1 - } - if (this.MachineValue !== null && this.MachineValue !== '') { - this.MachineValue_check = 1 - } - if (this.GroupNumValue !== null && this.GroupNumValue !== '') { - this.GroupNumValue_check = 1 - } + this.ProjectValue ? this.ProjectValue_check = 1 : this.ProjectValue_check = 0 + this.MachineValue ? this.MachineValue_check = 1 : this.MachineValue_check = 0 + this.GroupNumValue ? this.GroupNumValue_check = 1 : this.GroupNumValue_check = 0 this.listLoading = true this.listLoading1 = true this.listLoadingx = true @@ -697,13 +666,12 @@ export default { this.tableDataBasic = response.data.rows this.listLoading1 = false this.total = response.data.total - console.log(response) }) searchHoursePart(this.PageCurrentx, this.PageSizex, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => { + console.log(response.data.rows) this.tableDataHouse = response.data.rows this.listLoadingx = false this.totalx = response.data.total - console.log(response) }) }, handleSizeChange(val) { @@ -746,7 +714,6 @@ export default { this.tableData1 = response.data.rows this.listLoading2 = false this.total2 = response.data.total - console.log(response) }) }, handleSizeChange2(val) { @@ -772,13 +739,21 @@ export default { }, // 增加领料单 addListinfor() { - addList(this.picikingPeople).then(response => { - if (response.data[0].result === '1') { - this.$message.success('增加成功') - this.searchListinfor() - } else { - this.$message.error('增加失败') - } + this.$confirm('确认创建新的领料单?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + addList(this.picikingPeople).then(response => { + if (response.data[0].result === '1') { + this.$message.success('增加成功') + this.searchListinfor() + } else { + this.$message.error('增加失败') + } + }) + }).catch(() => { + this.$message('已取消操作') }) }, // 删除领料单 @@ -789,14 +764,18 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { - dropList(this.pickingListNumberx).then(response => { - if (response.data[0].result === '1') { - this.$message.success('删除成功') - this.searchListinfor() - } else { - this.$message.error('数据占用') - } - }) + if (this.tableDataPicking.length === 0) { + dropList(this.pickingListNumberx).then(response => { + if (response.data[0].result === '1') { + this.$message.success('删除成功') + this.searchListinfor() + } else { + this.$message.error('数据占用') + } + }) + } else { + this.$message.error('数据占用') + } }).catch(() => { this.$message({ type: 'info', @@ -816,6 +795,7 @@ export default { if (response.data[0].result === '1') { this.$message.success('删除成功') this.searchListDetailt() + this.searchPartinfo() } else { this.$message.error('数据占用') } @@ -830,6 +810,7 @@ export default { // 选择领料单 chooseListinfor(row) { this.pickingListNumberx = row.领料单流水号 + this.pickingListNumber = row.领料单编号 this.searchListDetailt() }, // 增加基本件领料单明细 @@ -878,7 +859,7 @@ export default { }, // 增加外购件领料单明细 addListDetailinfor(row) { - this.form2 = [] + this.form2 = {} this.outType = 2 this.partProjectNumber = row.项目流水号 this.partProjectName = row.项目名称 @@ -905,7 +886,6 @@ export default { if (this.pickingListNumberx === '') { this.$message.error('请选择领料单') } else if (this.form2.OutNumber === '' || this.form2.OutNumber > this.enableOut) { - console.log(this.enableOut) this.$message.error('请正确输入领用数量') } else { this.$refs[formName].validate((valid) => { @@ -927,9 +907,9 @@ export default { }, // 增加车间采购领料单明细 addWorkshopDetailinfor(row) { - this.form3 = [] - this.outType = 3 console.log(row) + this.form3 = {} + this.outType = 3 this.partProjectNumber = row.项目流水号 this.partMachineNumber = row.机床流水号 this.partGroupNumber = row.组件流水号 @@ -953,10 +933,19 @@ export default { } else if (this.form3.OutNumber === '' || this.form3.OutNumber > this.enableOut) { this.$message.error('请正确输入领用数量') } else { + console.log(this.materialLocate) addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.form3.OutNumber, this.partType, this.form3.outNote, this.craftplannumber, this.receive, this.purchaseDetailNum, this.askPurchaseNumber, this.locatenumber, this.outType, this.materialLocate, this.materialName, this.materialType, this.materialNumber, this.partPiant, this.material).then(response => { if (response.data[0].result === '1') { this.$message.success('增加成功') this.searchPartinfo() + searchListDetail(this.pickingListNumberx).then(response => { + const data = response.data + for (let i = 0; i < data.length; i++) { + data[i].是否出库 === '1' ? data[i].是否禁用 = true : data[i].是否禁用 = false + } + this.tableDataPicking = data + }) + this.dialogFormVisibleWork = false } else { this.$message.error('增加失败') } @@ -964,7 +953,6 @@ export default { } } }) - this.dialogFormVisibleWork = false this.searchListinfor() this.searchListDetailt() }, @@ -1035,5 +1023,16 @@ export default { diff --git a/src/views/ManufacturingCenter/GroupMatching/index.vue b/src/views/ManufacturingCenter/GroupMatching/index.vue index 54545849..cab4d0d6 100644 --- a/src/views/ManufacturingCenter/GroupMatching/index.vue +++ b/src/views/ManufacturingCenter/GroupMatching/index.vue @@ -112,7 +112,6 @@ - + + + + @@ -177,7 +181,6 @@ { - console.log(response) + for (let i = 0; i < response.data.rows.length; i++) { + if (response.data.rows[i].到货时间 !== '' || response.data.rows[i].到货时间 !== null) { + response.data.rows[i].到货时间 = response.data.rows[i].到货时间.split(' ', 2)[0] + } + } this.tableDataPurchase = response.data.rows - this.listLoading1 = false this.total4 = parseInt(response.data.total) }) searchTable1(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent, this.pageSize).then(response => { - console.log(response) this.tableData1 = response.data.rows - this.listLoading2 = false this.total5 = parseInt(response.data.total) }) } else { @@ -946,22 +950,6 @@ export default { sums[index] = '入库数量' } else if (index === 7) { sums[index] = this.totalNum + ' 件' - // const values = data.map(item => item['入库时间']) - // console.log(values) - // if (!values.every(value => value !== '')) { - // sums[index] = values.reduce((prev, curr) => { - // const value = curr - // console.log(value) - // if (value !== '') { - // return this.totalNum1 + 1 - // } else { - // return this.totalNum1 - // } - // }, '') - // sums[index] += '件' - // } else { - // sums[index] = 'N/A' - // } } }) return sums diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue index 1fa02eb3..da0905d4 100644 --- a/src/views/ManufacturingCenter/InitialProduction/index.vue +++ b/src/views/ManufacturingCenter/InitialProduction/index.vue @@ -186,7 +186,7 @@ @current-change="handleCurrentChange"/> - 投产 + 投产
@@ -350,6 +350,7 @@ export default { jieguo: 0, value: '', title: null, + listLoading3: false, temp: 0, ComponentflowNumber: '', // 组件零件基本件流水号 TypeflowNumber: '', @@ -787,6 +788,7 @@ export default { }, // 投产 production() { + this.listLoading3 = true this.result = 0 if (this.time_machiningFinish === '' || this.time_machiningFinish === null) { this.$message.error('请输入加工结束时间') @@ -836,7 +838,9 @@ export default { this.checked_baitu = false this.checked_gaonandu = false this.tableData1 = [] + this.listLoading3 = false } else if (response.data[0].result === '0') { + this.listLoading3 = false this.$message.error('投产失败') } }) diff --git a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue index 2f4e06a2..6ac4d67d 100644 --- a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue +++ b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue @@ -189,7 +189,7 @@ export default { // 自家备料出库 handleChange1(row) { change(row.工艺计划流水号, row.重量, row.单价).then(() => { - handlechange(row.工序流水号, this.id) + handlechange(row.工序流水号, '0000') }).then(response => { this.searchTable() }) @@ -200,7 +200,7 @@ export default { searchTable2() { this.loading2 = true this.tableData2 = [] - this.Data = [] + this.Data2 = [] if (this.partName2 !== '' && this.partName2 !== null) { this.partNamecheck2 = 1 } else { @@ -210,19 +210,19 @@ export default { if (response.data.total === 0) { this.loading2 = false } else { - this.Data = response.data.rows + this.Data2 = response.data.rows this.total2 = response.data.total } }).then(() => { - for (let i = 0; i < this.Data.length; i++) { - searchtable2(this.Data[i].工艺计划流水号).then(response => { + for (let i = 0; i < this.Data2.length; i++) { + searchtable2(this.Data2[i].工艺计划流水号).then(response => { this.tableData2.push({ - 工艺计划流水号: this.Data[i].工艺计划流水号, - 零件名称: this.Data[i].零件名称, - 零件图号: this.Data[i].零件图号, - 重量1: this.Data[i].重量1, - 单价: this.Data[i].单价, - 备注1: this.Data[i].备注1, + 工艺计划流水号: this.Data2[i].工艺计划流水号, + 零件名称: this.Data2[i].零件名称, + 零件图号: this.Data2[i].零件图号, + 重量1: this.Data2[i].重量1, + 单价: this.Data2[i].单价, + 备注1: this.Data2[i].备注1, 工序流水号: response.data[0].工序流水号 }) }) @@ -240,7 +240,7 @@ export default { this.bianliang1.push(this.arrest[i].工艺计划流水号) this.bianliang2.push(this.arrest[i].工序流水号) } - change2(this.bianliang2, this.id, this.bianliang1).then(response => { + change2(this.bianliang2, '0000', this.bianliang1).then(response => { this.searchTable2() }) } diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue index 19203fd9..b286a08d 100644 --- a/src/views/ManufacturingCenter/PartAssignment/index.vue +++ b/src/views/ManufacturingCenter/PartAssignment/index.vue @@ -1087,7 +1087,6 @@ export default { }) }, handleSelectionChange(val) { - console.log(val) if (this.PartType === '基本件') { this.MaterialNum = [] this.BasicPartsNumber = [] @@ -1144,7 +1143,6 @@ export default { }, purchaseRequisition() { if (this.RequisitionList !== '') { - console.log(this.time) if (this.time !== '' && this.time !== null) { if (this.BasicPartsNumber.length !== 0 || this.StandardPartsAndOutsourcing.length !== 0) { this.result = 0 @@ -1152,9 +1150,7 @@ export default { for (let i = 0; i < this.BasicPartsNumber.length; i++) { purchaseRequisition(this.RequisitionList, this.projectName, this.projectFloatValue, this.MachineToolNumber, this.machineFloatValue, this.groupName, this.groupFloatValue, this.BasicPartsNumber[i], this.MaterialName[i], this.PartToolNumber[i], this.Material[i], this.NumberOfParts[i], 3, this.time, this.MaterialNum[i], this.ReMarks[i]).then(response => { this.result += parseInt(response.data[0].result) - console.log(this.result) if (this.result === this.BasicPartsNumber.length) { - console.log(1111) this.$message.success('请购成功') searchPart(this.groupFloatValue).then(response => { this.tableData1 = response.data diff --git a/src/views/ManufacturingCenter/ProcessingStatus/index.vue b/src/views/ManufacturingCenter/ProcessingStatus/index.vue index 775e66b9..e8462be2 100644 --- a/src/views/ManufacturingCenter/ProcessingStatus/index.vue +++ b/src/views/ManufacturingCenter/ProcessingStatus/index.vue @@ -458,6 +458,7 @@ export default { } else { this.endTime_check = 1 } + this.num111 = [] this.tableData1 = [] this.零件图号 = [] this.零件名称 = [] @@ -472,6 +473,7 @@ export default { getTable(this.checkbox_project, this.project, this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, 1, this.startTime_check, this.startTime, this.endTime_check, this.endTime, this.pageCurrent, this.pageSize).then(response => { this.length = parseInt(response.data.total) for (let i = 0; i < response.data.rows.length; i++) { // 声明二维数组 + this.num111.push(response.data.rows[i].工艺计划流水号) this.零件图号.push(response.data.rows[i].零件图号) this.零件名称.push(response.data.rows[i].零件名称) this.投产数量.push(response.data.rows[i].投产数量) @@ -484,31 +486,28 @@ export default { } if (this.零件图号.length !== 0) { for (let i = 0; i < this.零件图号.length; i++) { - getTable2(this.checkbox_project, this.project, this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.零件图号[i], 1).then(response => { - this.liushuihao = response.data[0].工艺计划流水号 + getTable2(this.num111[i]).then(response => { for (let k = 0; k < response.data.length; k++) { - if (response.data[k].工艺计划流水号 === this.liushuihao) { - this.process[i][k] = response.data[k].工艺名称简称 - this.planDate[i][k] = response.data[k].计划日期_短 - this.realDate[i][k] = response.data[k].完成日期_短 - if (response.data[k].工艺编号 === 29) { - response.data[k].员工姓名 = '备料' - } - if (response.data[k].工序间是否外协 === 2) { - response.data[k].员工姓名 = '外协' - } - if (response.data[k].员工姓名 === '超级管理员') { - response.data[k].员工姓名 = '无' - } - this.worker[i][k] = response.data[k].员工姓名 - if (response.data[k].工序状态 === 5) { // 灰色是已经完成 未入库 - this.colorCode[i][k] = 'grey' - } else { - this.colorCode[i][k] = response.data[k].进度颜色 - } - if (response.data[k].工序间是否外协 === 2) { - this.colorCode[i][k] = 'lightblue' - } + this.process[i][k] = response.data[k].工艺名称简称 + this.planDate[i][k] = response.data[k].计划日期_短 + this.realDate[i][k] = response.data[k].完成日期_短 + if (response.data[k].工艺编号 === 29) { + response.data[k].员工姓名 = '备料' + } + if (response.data[k].工序间是否外协 === 2) { + response.data[k].员工姓名 = '外协' + } + if (response.data[k].员工姓名 === '超级管理员') { + response.data[k].员工姓名 = '无' + } + this.worker[i][k] = response.data[k].员工姓名 + if (response.data[k].工序状态 === 5) { // 灰色是已经完成 未入库 + this.colorCode[i][k] = 'grey' + } else { + this.colorCode[i][k] = response.data[k].进度颜色 + } + if (response.data[k].工序间是否外协 === 2) { + this.colorCode[i][k] = 'lightblue' } } }).then(() => { diff --git a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue index ac6184ca..927b8644 100644 --- a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue +++ b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue @@ -372,6 +372,7 @@ import { isMachining, handlechange3, getTable8, getTree, fn, dialogtablevisible, export default { data() { return { + num111: [], // 零件图号去掉P后修改 Num2: '', gongyijihualiushuihao: [[]], midd: 0, @@ -557,6 +558,7 @@ export default { } else { this.endTime_check = 1 } + this.num111 = [] this.tableData1 = [] this.零件图号 = [] this.零件名称 = [] @@ -577,6 +579,7 @@ export default { } else { this.length = parseInt(response.data.total) for (let i = 0; i < response.data.rows.length; i++) { // 声明二维数组 + this.num111.push(response.data.rows[i].工艺计划流水号) this.零件图号.push(response.data.rows[i].零件图号) this.零件名称.push(response.data.rows[i].零件名称) this.投产数量.push(response.data.rows[i].投产数量) @@ -592,25 +595,22 @@ export default { } if (this.零件图号.length !== 0) { for (let i = 0; i < this.零件图号.length; i++) { - getTable2(this.checkbox_project, this.project, this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.零件图号[i]).then(response => { - this.liushuihao = response.data[0].工艺计划流水号 + getTable2(this.num111[i]).then(response => { for (let k = 0; k < response.data.length; k++) { - if (response.data[k].工艺计划流水号 === this.liushuihao) { - this.kaoqinbianhao[i][k] = response.data[k].工作者考勤编号 - this.gongxuliushuihao[i][k] = response.data[k].工序流水号 - this.gongyijihualiushuihao[i][k] = response.data[k].工艺计划流水号 - this.process[i][k] = response.data[k].工艺名称简称 - this.planDate[i][k] = response.data[k].计划日期_短 - this.worker[i][k] = response.data[k].员工姓名 - this.realDate[i][k] = response.data[k].完成日期_短 - if (response.data[k].工序状态 === 5) { // 灰色:停产，不允许修改，重新投产 - this.colorCode[i][k] = 'grey' - } else { - this.colorCode[i][k] = response.data[k].进度颜色 - } - if (response.data[k].工序间是否外协 === 2) { - this.colorCode[i][k] = 'lightblue' - } + this.kaoqinbianhao[i][k] = response.data[k].工作者考勤编号 + this.gongxuliushuihao[i][k] = response.data[k].工序流水号 + this.gongyijihualiushuihao[i][k] = response.data[k].工艺计划流水号 + this.process[i][k] = response.data[k].工艺名称简称 + this.planDate[i][k] = response.data[k].计划日期_短 + this.worker[i][k] = response.data[k].员工姓名 + this.realDate[i][k] = response.data[k].完成日期_短 + if (response.data[k].工序状态 === 5) { // 灰色:停产，不允许修改，重新投产 + this.colorCode[i][k] = 'grey' + } else { + this.colorCode[i][k] = response.data[k].进度颜色 + } + if (response.data[k].工序间是否外协 === 2) { + this.colorCode[i][k] = 'lightblue' } } }).then(() => { diff --git a/src/views/ManufacturingCenter/QuotaFormulation/index.vue b/src/views/ManufacturingCenter/QuotaFormulation/index.vue index f7dfed94..27c2a5ce 100644 --- a/src/views/ManufacturingCenter/QuotaFormulation/index.vue +++ b/src/views/ManufacturingCenter/QuotaFormulation/index.vue @@ -22,7 +22,7 @@ :label="item.label" :value="item.value"/> - 查询 + 未编制的数量{{ partNum.length }} {{ shuliang }}
diff --git a/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue new file mode 100644 index 00000000..ea29520e --- /dev/null +++ b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue @@ -0,0 +1,222 @@ + + + + diff --git a/src/views/Outsourcing/InterBudgetaryBudgets/index.vue b/src/views/Outsourcing/InterBudgetaryBudgets/index.vue index a5ae2b45..46dc5812 100644 --- a/src/views/Outsourcing/InterBudgetaryBudgets/index.vue +++ b/src/views/Outsourcing/InterBudgetaryBudgets/index.vue @@ -184,6 +184,7 @@ import { machine, getToolNum, getNum, searchPartNum1, searchTable, saveWeightAre export default { data() { return { + a: '', entryNameValue: '', entryName: [], // 项目名称 toolNumValue: '', @@ -383,12 +384,16 @@ export default { if (this.tableData.length === 0) { this.$message.error('请选择零件') } else { + this.a = 0 for (let i = 0; i < this.tableData.length; i++) { saveRowPrice(this.tableData[i].工序流水号, parseFloat(this.tableData[i].外协预算价格_计算), this.tableData[i].工艺计划流水号, this.cailiaofei).then(response => { + this.a += parseInt(response.data[0].result) + if (this.a === this.tableData.length) { + this.$message.success('保存成功') + this.searchPartNum() + } }) } - this.$message.success('保存成功') - this.searchPartNum() } }, handleSizeChange2(val) { diff --git a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue index 0503011f..b8db88a8 100644 --- a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue +++ b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue @@ -62,7 +62,7 @@ {{ scope.row.申请人姓名 ? scope.row.申请人姓名 : '未提交' }} - + @@ -72,7 +72,7 @@ {{ scope.row.审批人1姓名 ? scope.row.审批人1姓名 : '未审批' }} - + @@ -82,7 +82,7 @@ {{ scope.row.审批人2姓名 ? scope.row.审批人2姓名 : '未审批' }} - + @@ -92,7 +92,7 @@ {{ scope.row.审批人3姓名 ? scope.row.审批人3姓名 : '未审批' }} - + diff --git a/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue index 64b91dec..7e6533cd 100644 --- a/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue +++ b/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue @@ -62,7 +62,7 @@ {{ scope.row.申请人姓名 ? scope.row.申请人姓名 : '未提交' }} - + @@ -72,29 +72,29 @@ {{ scope.row.审批人1姓名 ? scope.row.审批人1姓名 : '未审批' }} - + - + - + diff --git a/src/views/PurchasingCenter/MaterialManagement/index.vue b/src/views/PurchasingCenter/MaterialManagement/index.vue index 6b7cbb26..cb6e050f 100644 --- a/src/views/PurchasingCenter/MaterialManagement/index.vue +++ b/src/views/PurchasingCenter/MaterialManagement/index.vue @@ -309,6 +309,11 @@ @click.native="param=1;openSupplier()"/> + + + Φ × ∠ — ○ ⊥ + +
diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue index 9803aece..8590800a 100644 --- a/src/views/PurchasingCenter/OfflineContract/index.vue +++ b/src/views/PurchasingCenter/OfflineContract/index.vue @@ -194,8 +194,8 @@ layout="total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange2" @current-change="handleCurrentChange2"/> - 生成 - 保存 + 生成 + 保存
@@ -235,7 +235,7 @@ @@ -853,9 +853,9 @@ export default { sums[index] = values.reduce((prev, curr) => { const value = Number(curr) if (!isNaN(value)) { - return prev + curr + return Number((prev + curr).toFixed(2)) } else { - return prev + return Number((prev).toFixed(2)) } }, 0) sums[index] += ' 元' @@ -1008,11 +1008,12 @@ export default { document.getElementsByClassName('tableData')[j].children[3].innerHTML = this.tableData3[j].物料型号 document.getElementsByClassName('tableData')[j].children[4].innerHTML = this.tableData3[j].数量 document.getElementsByClassName('tableData')[j].children[5].innerHTML = this.tableData3[j].单价 - document.getElementsByClassName('tableData')[j].children[6].innerHTML = this.tableData3[j].数量 * this.tableData3[j].单价 + document.getElementsByClassName('tableData')[j].children[6].innerHTML = (this.tableData3[j].数量 * this.tableData3[j].单价).toFixed(2) document.getElementsByClassName('tableData')[j].children[7].innerHTML = this.tableData3[j].交货期要求 document.getElementsByClassName('tableData')[j].children[8].innerHTML = this.tableData3[j].备注 - total += this.tableData3[j].数量 * this.tableData3[j].单价 + total += Number(this.tableData3[j].数量 * this.tableData3[j].单价) } + total = total.toFixed(2) document.getElementById('contractNum').innerHTML = row.离线合同编号 document.getElementById('contractName').innerHTML = row.离线合同名称 document.getElementById('supplier').innerHTML = row.供应商名称 diff --git a/src/views/PurchasingCenter/ProjectTotalSearch/index.vue b/src/views/PurchasingCenter/ProjectTotalSearch/index.vue index c3765ee3..18f4158d 100644 --- a/src/views/PurchasingCenter/ProjectTotalSearch/index.vue +++ b/src/views/PurchasingCenter/ProjectTotalSearch/index.vue @@ -2,13 +2,29 @@
项目名称: - + + 机床图号: + + + + 组号: + + + - + + + + @@ -35,6 +56,11 @@ {{ scope.row.名称 }} + + + diff --git a/src/views/TechnologyCenter/CreatePackingList/index.vue b/src/views/TechnologyCenter/CreatePackingList/index.vue index 8aa4088a..7d3e5aa3 100644 --- a/src/views/TechnologyCenter/CreatePackingList/index.vue +++ b/src/views/TechnologyCenter/CreatePackingList/index.vue @@ -476,7 +476,7 @@ - 毛中 + 毛重 净重
@@ -722,6 +722,11 @@ export default { }, addReceipt() { this.addForm('receiptForm') + for (let i = 0; i < this.project.length; i++) { + if (this.projectValue === this.project[i].value) { + this.receiptForm.名称 = this.project[i].label + } + } this.receiptVisible = true this.receiptTitle = `新增总装箱单` }, @@ -905,12 +910,14 @@ export default { }, exportTable() { const htmlNode = $('#cjn').html() - const body = $('body') + const body = $('body').attr('style', 'padding: 20px;margin: 0 auto;display: block;width: 800px;background: #fff;') body.children().hide() const printNode = $(htmlNode) body.append(printNode) window.print() + body.removeAttr('style') body.children().not('script').show() + body.children().not('#app').hide() printNode.remove() } } diff --git a/src/views/WorkshopProcurement/FundApproval2/index.vue b/src/views/WorkshopProcurement/FundApproval2/index.vue index a4aadc65..f0af6e1b 100644 --- a/src/views/WorkshopProcurement/FundApproval2/index.vue +++ b/src/views/WorkshopProcurement/FundApproval2/index.vue @@ -3,58 +3,44 @@ - - - - - - - - - - + - + - + - - - - - - - - - - + - + @@ -195,7 +181,7 @@ + + diff --git a/src/views/WorkshopProcurement/InvoiceSettlementApprove1/index.vue b/src/views/WorkshopProcurement/InvoiceSettlementApprove1/index.vue new file mode 100644 index 00000000..9d1d1cbf --- /dev/null +++ b/src/views/WorkshopProcurement/InvoiceSettlementApprove1/index.vue @@ -0,0 +1,281 @@ + + + + + diff --git a/src/views/WorkshopProcurement/OfflineContractRequestFund1/index.vue b/src/views/WorkshopProcurement/OfflineContractRequestFund1/index.vue index b2052f4d..b5c2367b 100644 --- a/src/views/WorkshopProcurement/OfflineContractRequestFund1/index.vue +++ b/src/views/WorkshopProcurement/OfflineContractRequestFund1/index.vue @@ -14,6 +14,14 @@ range-separator="～" start-placeholder="开始日期" end-placeholder="结束日期"/> + 供应商： + + + - +