diff --git a/src/api/Assembly/QualityInspectionInformationInquiry.js b/src/api/Assembly/QualityInspectionInformationInquiry.js index e89968e0..126ff1f0 100644 --- a/src/api/Assembly/QualityInspectionInformationInquiry.js +++ b/src/api/Assembly/QualityInspectionInformationInquiry.js @@ -148,7 +148,7 @@ export function selecttable(check1, value1, check2, value2, check3, value3, chec type: '1', name: '质检管理_质量情况_查询数据', param: '机床流水号_check=' + check1 + '&机床流水号=' + value1 + '&组件流水号_check=' + check2 + '&组件流水号=' + value2 + '&零件名称_check=' + check3 + '&零件名称=' + value3 + - '&质检类型代码_check=' + check4 + '&质检类型代码=' + value4 + '&开始时间_check=' + check5 + '&开始时间=' + value5 + '&结束时间_check=' + check6 + '&结束时间=' + value6 + '&质检情况_check=' + check7 + '&质检情况=' + value7 + '&人员编号_check=' + check8 + '&人员编号=' + value8 + `8&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output` + '&质检类型代码_check=' + check4 + '&质检类型代码=' + value4 + '&开始时间_check=' + check5 + '&开始时间=' + value5 + '&结束时间_check=' + check6 + '&结束时间=' + value6 + '&质检情况_check=' + check7 + '&质检情况=' + value7 + '&人员编号_check=' + check8 + '&人员编号=' + value8 + `&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output` } }) } diff --git a/src/api/ManufacturingCenter/ScrappedSupplementaryInvestment.js b/src/api/ManufacturingCenter/ScrappedSupplementaryInvestment.js new file mode 100644 index 00000000..3b1b664c --- /dev/null +++ b/src/api/ManufacturingCenter/ScrappedSupplementaryInvestment.js @@ -0,0 +1,57 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' + +// 获取机床 +export function searchMachine() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: 'PDM_项目名称_查询数据' + } + }) +} +// 获取不合格处理文本 +export function searchProcessingResult() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '质检管理_不合格处理_查询数据' + } + }) +} +// 质检管理_质量情况_查询数据 +export function searchtable(check1, value1, check3, value3, check5, value5, value6, check8, value8, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '报废补投_车间补投_查询数据', + param: '机床流水号_check=' + check1 + '&机床流水号=' + value1 + '&零件名称_check=' + check3 + '&零件名称=' + value3 + '&时间段_check=' + check5 + '&开始时间=' + value5 + '&结束时间=' + value6 + '&处理结果_check=' + check8 + '&处理结果=' + value8 + `&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output` + } + }) +} +export function editSpare(CutCode, number, id) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '报废补投_提交报废_循环执行', + param: '工艺计划流水号组=' + CutCode + '&报废数量组=' + number + '&报废人=' + id + } + }) +} diff --git a/src/api/PurchasingCenter/PurchaseContractRequestFund.js b/src/api/PurchasingCenter/PurchaseContractRequestFund.js index fc36966d..740972f8 100644 --- a/src/api/PurchasingCenter/PurchaseContractRequestFund.js +++ b/src/api/PurchasingCenter/PurchaseContractRequestFund.js @@ -30,7 +30,7 @@ export function searchContract(check, num1, num2) { }) } // 查询请款表 -export function searchRequestFund(pageCurrent, pageSize, check1, start, end, check2, num, check3, id) { +export function searchRequestFund(pageCurrent, pageSize, check1, start, end, check2, num, check3) { return request({ url: '', method: 'post', @@ -39,7 +39,7 @@ export function searchRequestFund(pageCurrent, pageSize, check1, start, end, che ModularID: router.currentRoute.path, type: '1', name: '采购管理_采购合同_请款_查询数据', - param: `时间段_check=${check1}&开始时间=${start}&结束时间=${end}&供应商流水号_check=${check2}&供应商流水号=${num}&查询当前_check=${check3}&人员编号=${id}`, + param: `时间段_check=${check1}&开始时间=${start}&结束时间=${end}&供应商流水号_check=${check2}&供应商流水号=${num}&查询当前_check=${check3}`, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/api/WorkshopProcurement/OfflineProcurement.js b/src/api/WorkshopProcurement/OfflineProcurement.js index f85428f3..32e0d989 100644 --- a/src/api/WorkshopProcurement/OfflineProcurement.js +++ b/src/api/WorkshopProcurement/OfflineProcurement.js @@ -17,7 +17,7 @@ export function searchSupplier(check1, value1, check2, value2, check3, value3, c }) } // 创建采购单 -export function addPurchaseOrder(PurchaseOrderName, supplier) { +export function addPurchaseOrder(PurchaseOrderName, supplier, id) { return request({ url: '', method: 'post', @@ -26,7 +26,7 @@ export function addPurchaseOrder(PurchaseOrderName, supplier) { ModularID: router.currentRoute.path, type: '2', name: '备料管理_离线采购计划_增加数据', - param: `离线采购计划名称=${PurchaseOrderName}&供应商=${supplier}` + param: `离线采购计划名称=${PurchaseOrderName}&供应商=${supplier}&采购员=${id}` } }) } diff --git a/src/views/Inventory/CreatePickingList/index.vue b/src/views/Inventory/CreatePickingList/index.vue index 2185636e..5fdb5a45 100644 --- a/src/views/Inventory/CreatePickingList/index.vue +++ b/src/views/Inventory/CreatePickingList/index.vue @@ -267,7 +267,7 @@ 查询 创建领料单 - 选入物料 + 选入物料 删除领料单 移除领料明细 diff --git a/src/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue index 153eaf31..d137a751 100644 --- a/src/views/Inventory/MaterialOut/index.vue +++ b/src/views/Inventory/MaterialOut/index.vue @@ -54,7 +54,6 @@
- + + + - + + + + - + diff --git a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue index 7582519c..15106019 100644 --- a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue +++ b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue @@ -292,9 +292,9 @@ export default { }, timeChange() { if (this.form1.完成数量 > 0) { - this.加工时间 = Number(this.form1.录入工时) * Number(this.form1.完成数量) + Number(this.form1.录入准结) + this.加工时间 = Number(this.form1.录入工时) * Number(this.form1.完成数量) } else { - this.加工时间 = Number(this.form1.录入工时) + Number(this.form1.录入准结) + this.加工时间 = Number(this.form1.录入工时) } }, submit1() { diff --git a/src/views/ManufacturingCenter/ScrappedSupplementaryInvestment/index.vue b/src/views/ManufacturingCenter/ScrappedSupplementaryInvestment/index.vue new file mode 100644 index 00000000..108aead8 --- /dev/null +++ b/src/views/ManufacturingCenter/ScrappedSupplementaryInvestment/index.vue @@ -0,0 +1,325 @@ + + + + + + diff --git a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue index 93c4eb57..703f3003 100644 --- a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue +++ b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue @@ -470,12 +470,10 @@ export default { this.dateRange ? check1 = 1 : (check1 = 0, this.dateRange = '') this.supplierValue ? check2 = 1 : check2 = 0 this.searchAll === false ? check3 = 1 : check3 = 0 - searchRequestFund(this.pageCurrent1, this.pageSize1, check1, this.dateRange[0], this.dateRange[1], check2, this.supplierValue, check3, this.id).then(response => { + searchRequestFund(this.pageCurrent1, this.pageSize1, check1, this.dateRange[0], this.dateRange[1], check2, this.supplierValue, check3).then(response => { this.tableData1 = response.data.rows this.total1 = response.data.total }) - this.tableData2 = [] - this.gridData = [] this.totalSum = 0 this.totalPay = 0 searchPurchaseContract(1, check2, this.supplierValue).then(response => { diff --git a/src/views/WorkshopProcurement/OfflineProcurement/index.vue b/src/views/WorkshopProcurement/OfflineProcurement/index.vue index 096d660e..3233773e 100644 --- a/src/views/WorkshopProcurement/OfflineProcurement/index.vue +++ b/src/views/WorkshopProcurement/OfflineProcurement/index.vue @@ -522,7 +522,7 @@ export default { if (valid) { this.addPurchaseOrder_disable = true this.supplierName = this.form2.supplierNameValue - addPurchaseOrder(this.form2.计划名称, this.form2.supplierNameValue).then(response => { + addPurchaseOrder(this.form2.计划名称, this.form2.supplierNameValue, this.id).then(response => { if (response.data[0].result === '1') { this.$message.success('新建离线外购备料成功') this.searchTable() diff --git a/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue b/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue index 6b4bfe79..b9a56458 100644 --- a/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue +++ b/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue @@ -96,6 +96,11 @@ width="100"> + + +