diff --git a/src/api/Inventory/PurchaseOutRecord.js b/src/api/Inventory/PurchaseOutRecord.js index 834d473a..27505231 100644 --- a/src/api/Inventory/PurchaseOutRecord.js +++ b/src/api/Inventory/PurchaseOutRecord.js @@ -36,14 +36,14 @@ export function searchGroup(num) { }) } // 查询记录 -export function searchRecord(check1, project, check2, machine, check3, group, check4, name, check5, spec, check6, model, pageCurrent, pageSize) { +export function searchRecord(check1, project, check2, machine, check3, group, check4, name, check5, spec, check6, model, check7, time1, time2, pageCurrent, pageSize) { return request({ url: '', method: 'post', data: { type: '1', name: `库存管理_出库记录_查询数据`, - param: `项目流水号_check=${check1}&项目流水号=${project}&机床流水号_check=${check2}&机床流水号=${machine}&组件流水号_check=${check3}&组件流水号=${group}&名称_check=${check4}&名称=${name}&规格_check=${check5}&规格=${spec}&图号或型号_check=${check6}&图号或型号=${model}`, + param: `项目流水号_check=${check1}&项目流水号=${project}&机床流水号_check=${check2}&机床流水号=${machine}&组件流水号_check=${check3}&组件流水号=${group}&名称_check=${check4}&名称=${name}&规格_check=${check5}&规格=${spec}&图号或型号_check=${check6}&图号或型号=${model}&出库时间_check=${check7}&出库开始时间=${time1}&出库结束时间=${time2}`, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/api/PurchasingCenter/CreatePurchaseContract.js b/src/api/PurchasingCenter/CreatePurchaseContract.js index 1d0ed42e..d9372430 100644 --- a/src/api/PurchasingCenter/CreatePurchaseContract.js +++ b/src/api/PurchasingCenter/CreatePurchaseContract.js @@ -72,3 +72,25 @@ export function savePrice(price, num1, num2) { } }) } +// 实时保存单价 +export function saveContractHeader(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '4', + name: `update 采购管理_询价单 set 交货日期 = '${params[0]}' , 开票信息 = '${params[1]}' , 支付日期 = '${params[2]}' , 支付方式 = '${params[3]}' , 其他说明 = '${params[4]}' where 询价单流水号 = ${params[5]}` + } + }) +} +// 获取合同头 +export function searchContractHeader(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '3', + name: `select * from 采购管理_询价单 where 询价单流水号 = ${params[0]}` + } + }) +} diff --git a/src/api/PurchasingCenter/PurchaseSituationSearch.js b/src/api/PurchasingCenter/PurchaseSituationSearch.js index b650c6eb..b2fcf305 100644 --- a/src/api/PurchasingCenter/PurchaseSituationSearch.js +++ b/src/api/PurchasingCenter/PurchaseSituationSearch.js @@ -49,3 +49,27 @@ export function searchTable2(...params) { } }) } +// 查询表1标准件和外购件无分页 +export function searchTable1Export(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_采购部采购_查询物料_分配后_加供应商', + param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件类型=${params[4]}` + } + }) +} +// 查询表1基本件无分页 +export function searchTable2Export(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_采购部采购_查询物料_基本件_分配后_加供应商', + param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}` + } + }) +} diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss index 010d5007..4988153f 100644 --- a/src/styles/element-ui.scss +++ b/src/styles/element-ui.scss @@ -31,6 +31,9 @@ background-color: rgb(98, 157, 209); color: white; } + .el-tree-node__content>.el-tree-node__expand-icon{ + display: none; + } .el-table td, .is-leaf{ background-color: rgb(213, 230, 347); color: black; diff --git a/src/views/Inventory/OfflinePartOut/index.vue b/src/views/Inventory/OfflinePartOut/index.vue index 64fb6c4e..b9c4bab8 100644 --- a/src/views/Inventory/OfflinePartOut/index.vue +++ b/src/views/Inventory/OfflinePartOut/index.vue @@ -342,11 +342,6 @@ export default { }, // 打开表单 parOut(row) { - if (this.$refs['form'] !== undefined) { - this.$refs['form'].resetFields() - } - this.form.MachineValue = '' - this.form.GroupNumValue = '' this.dialogFormVisible = true this.locateNumber = row.货位流水号 this.materialNumber = row.物料流水号 diff --git a/src/views/Inventory/PurchaseOutRecord/index.vue b/src/views/Inventory/PurchaseOutRecord/index.vue index ff5b534f..3a1ab531 100644 --- a/src/views/Inventory/PurchaseOutRecord/index.vue +++ b/src/views/Inventory/PurchaseOutRecord/index.vue @@ -32,6 +32,17 @@ 图号或型号: + 出库时间: + 查询 @@ -99,7 +110,8 @@ export default { tableData: [], pageSize1: 10, pageCurrent1: 1, - total1: 0 + total1: 0, + outTime: '' // 出库时间 } }, mounted() { @@ -134,14 +146,15 @@ export default { }) }, searchRecord() { - let check1, check2, check3, check4, check5, check6 + let check1, check2, check3, check4, check5, check6, check7 this.projectValue ? check1 = 1 : check1 = 0 this.machineValue ? check2 = 1 : check2 = 0 this.groupValue ? check3 = 1 : check3 = 0 this.name ? check4 = 1 : check4 = 0 this.spec ? check5 = 1 : check5 = 0 this.model ? check6 = 1 : check6 = 0 - searchRecord(check1, this.projectValue, check2, this.machineValue, check3, this.groupValue, check4, this.name, check5, this.spec, check6, this.model, this.pageCurrent1, this.pageSize1).then(res => { + this.outTime ? check7 = 1 : check7 = 0 + searchRecord(check1, this.projectValue, check2, this.machineValue, check3, this.groupValue, check4, this.name, check5, this.spec, check6, this.model, check7, this.outTime[0] || '', this.outTime[1] || '', this.pageCurrent1, this.pageSize1).then(res => { this.tableData = res.data.rows this.total1 = res.data.total }) diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue index cac62937..8df97c6b 100644 --- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue +++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue @@ -92,6 +92,11 @@ {{ scope.row.机床图号 }} + + +