diff --git a/package.json b/package.json index ab9634e9..c97b16c1 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "@xkeshi/vue-barcode": "^1.0.0", "axios": "0.18.0", "echarts": "^4.2.0-rc.2", - "element-ui": "2.4.6", + "element-ui": "2.8.2", "file-saver": "^1.3.8", "html2canvas": "^1.0.0-alpha.12", "jquery": "^3.3.1", diff --git a/src/api/Inventory/PurchaseInRecord.js b/src/api/Inventory/PurchaseInRecord.js new file mode 100644 index 00000000..e86dedea --- /dev/null +++ b/src/api/Inventory/PurchaseInRecord.js @@ -0,0 +1,63 @@ +import request from '@/utils/request' + +// 初始化项目 +export function initProject() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_项目名称_查询数据_按时间排序' + } + }) +} +// 机床查询 +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 searchRecord1(check1, project, check2, machine, check3, group, check4, name, check5, spec, check6, model, 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}`, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 查询离线件入库记录 +export function searchRecord2(check4, name, check5, spec, check6, model, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: `库存管理_入库记录_离线件_查询数据`, + param: `名称_check=${check4}&名称=${name}&规格_check=${check5}&规格=${spec}&图号或型号_check=${check6}&图号或型号=${model}`, + Pagination: pageCurrent + '&' + pageSize + } + }) +} diff --git a/src/api/Inventory/PurchaseOutRecord.js b/src/api/Inventory/PurchaseOutRecord.js index 54488e61..834d473a 100644 --- a/src/api/Inventory/PurchaseOutRecord.js +++ b/src/api/Inventory/PurchaseOutRecord.js @@ -36,36 +36,15 @@ export function searchGroup(num) { }) } // 查询记录 -export function searchRecord(project, machine, group, name, spec, model) { - let execName = `select PDM_机床名称.项目流水号,PDM_组件名称.机床流水号,出库记录.* from(select 组件流水号,名称,物料规格 as 规格,物料型号 as 图号或型号,出库数量,备注 as 领料人,滞货出库时间 as 出库时间 from 车间装配管理_领料单_领料单明细 where 滞货出库时间 is not null -union -select 组件流水号,物料名称 as 名称,物料规格 as 规格,物料型号 as 图号或型号,出库数量,备注 as 领料人,出库时间 from 库存管理_基础表_离线采购件出库 -inner join 库存管理_物料主文件_基本 on 库存管理_物料主文件_基本.物料流水号 = 库存管理_基础表_离线采购件出库.物料流水号 -union -select 组件流水号,物料名称 as 名称,物料规格 as 规格,物料型号 as 图号或型号,出库数量,库存管理_基础表_外购件出库.备注 as 领料人,出库时间 from 库存管理_基础表_外购件出库 -inner join 采购管理_采购合同明细_采购部 on 采购管理_采购合同明细_采购部.采购合同明细流水号 = 库存管理_基础表_外购件出库.采购合同明细流水号 -left join MRP_计划订单_组件零件清单 on MRP_计划订单_组件零件清单.组件零件流水号 = 采购管理_采购合同明细_采购部.组件零件流水号 -inner join MRP_计划订单_机床组件清单 on MRP_计划订单_机床组件清单.机床组件流水号 = MRP_计划订单_组件零件清单.机床组件流水号 -inner join 库存管理_物料主文件_基本 on 库存管理_物料主文件_基本.物料流水号 = MRP_计划订单_组件零件清单.物料流水号 -union -select 组件流水号,'' as 规格,零件图号 as 图号或型号,零件名称 as 名称,出库数量,库存管理_基础表_外购件出库.备注 as 领料人,出库时间 from 库存管理_基础表_外购件出库 -inner join 采购管理_采购合同明细_采购部 on 采购管理_采购合同明细_采购部.采购合同明细流水号 = 库存管理_基础表_外购件出库.采购合同明细流水号 -left join MRP_计划订单_组件零件清单_基本件_采购 on MRP_计划订单_组件零件清单_基本件_采购.组件零件基本件流水号 = 采购管理_采购合同明细_采购部.组件零件基本件流水号 -inner join PDM_零件明细表_基本件 on PDM_零件明细表_基本件.基本件流水号 = MRP_计划订单_组件零件清单_基本件_采购.基本件流水号 -) as 出库记录 inner join PDM_组件名称 on PDM_组件名称.组件流水号 = 出库记录.组件流水号 inner join PDM_机床名称 on PDM_机床名称.机床流水号 = PDM_组件名称.机床流水号 - where PDM_组件名称.组件流水号 is not null` - if (project) { execName += ` and PDM_机床名称.项目流水号 = ${project} ` } - if (machine) { execName += ` and PDM_组件名称.机床流水号 = ${machine} ` } - if (group) { execName += ` and PDM_组件名称.组件流水号 = ${group} ` } - if (name) { execName += ` and 出库记录.名称 like '%${name}%' ` } - if (spec) { execName += ` and 出库记录.规格 like '%${spec}%' ` } - if (model) { execName += ` and 出库记录.图号或型号 like '%${model}%' ` } +export function searchRecord(check1, project, check2, machine, check3, group, check4, name, check5, spec, check6, model, pageCurrent, pageSize) { return request({ url: '', method: 'post', data: { - type: '3', - name: execName + type: '1', + name: `库存管理_出库记录_查询数据`, + param: `项目流水号_check=${check1}&项目流水号=${project}&机床流水号_check=${check2}&机床流水号=${machine}&组件流水号_check=${check3}&组件流水号=${group}&名称_check=${check4}&名称=${name}&规格_check=${check5}&规格=${spec}&图号或型号_check=${check6}&图号或型号=${model}`, + Pagination: pageCurrent + '&' + pageSize } }) } diff --git a/src/api/PurchasingCenter/CreatePurchaseContract.js b/src/api/PurchasingCenter/CreatePurchaseContract.js index 1d305fc1..1732742c 100644 --- a/src/api/PurchasingCenter/CreatePurchaseContract.js +++ b/src/api/PurchasingCenter/CreatePurchaseContract.js @@ -1,14 +1,27 @@ import request from '@/utils/request' +// 初始化供应商 +export function initSupplier(num) { + return request({ + url: '', + method: 'post', + data: { + type: '3', + name: `SELECT distinct 供应商流水号,供应商名称 +FROM 采购管理_询价单_视图 +where 询价单编号 not in(select 采购合同编号 from 采购管理_采购合同_采购部 where 是否启用 = 1) and 采购员流水号 = ${num}` + } + }) +} // 查询询价单列表 表1 -export function searchInquirySheet(check1, value1, check2, value2, check3, id) { +export function searchInquirySheet(check1, value1, check2, value2, check3, id, check4, supplier) { return request({ url: '', method: 'post', data: { type: '1', name: '采购管理_询价单_查询数据', - param: `供应商名称_check=${check1}&供应商名称=${value1}&询价单编号_check=${check2}&询价单编号=${value2}&采购员流水号_check=${check3}&采购员流水号=${id}` + param: `供应商名称_check=${check1}&供应商名称=${value1}&询价单编号_check=${check2}&询价单编号=${value2}&采购员流水号_check=${check3}&采购员流水号=${id}&供应商流水号_check=${check4}&供应商流水号=${supplier}` } }) } diff --git a/src/icons/svg/PurchaseInRecord.svg b/src/icons/svg/PurchaseInRecord.svg new file mode 100644 index 00000000..bd787aef --- /dev/null +++ b/src/icons/svg/PurchaseInRecord.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/views/Inventory/OfflinePartOut/index.vue b/src/views/Inventory/OfflinePartOut/index.vue index 1d5340d0..64fb6c4e 100644 --- a/src/views/Inventory/OfflinePartOut/index.vue +++ b/src/views/Inventory/OfflinePartOut/index.vue @@ -153,7 +153,7 @@ - + - - + +
@@ -190,6 +190,13 @@ import { initProject, searchmachine, searchTeam, searchPart, searchPeople, outli import { mapGetters } from 'vuex' export default { data() { + const checkNum = (rule, value, callback) => { + if (value <= 0) { + callback(new Error('请输入正整数')) + } else { + callback() + } + } return { Project: [], Machine: [], @@ -209,7 +216,11 @@ export default { ProjectValue: [{ required: true, message: '请选择项目', trigger: 'blur' }], MachineValue: [{ required: true, message: '请选择机床', trigger: 'blur' }], GroupNumValue: [{ required: true, message: '请选择分组', trigger: 'blur' }], - DirectNumber: [{ required: true, message: '请输入直达件数量', trigger: 'blur' }] + DirectNumber: [ + { required: true, message: '请输入数量', trigger: 'blur' }, + { validator: checkNum, trigger: 'blur' } + ], + DirectNote: [{ required: true, message: '请输入领料人', trigger: 'blur' }] }, locateNumber: '', materialNumber: '', diff --git a/src/views/Inventory/PurchaseInRecord/index.vue b/src/views/Inventory/PurchaseInRecord/index.vue new file mode 100644 index 00000000..94c52eb5 --- /dev/null +++ b/src/views/Inventory/PurchaseInRecord/index.vue @@ -0,0 +1,245 @@ + + + + + diff --git a/src/views/Inventory/PurchaseOutRecord/index.vue b/src/views/Inventory/PurchaseOutRecord/index.vue index f5154354..ff5b534f 100644 --- a/src/views/Inventory/PurchaseOutRecord/index.vue +++ b/src/views/Inventory/PurchaseOutRecord/index.vue @@ -32,7 +32,7 @@ 图号或型号: - 查询 + 查询
@@ -66,6 +66,17 @@ +
+ +
@@ -85,11 +96,15 @@ export default { name: '', spec: '', model: '', - tableData: [] + tableData: [], + pageSize1: 10, + pageCurrent1: 1, + total1: 0 } }, mounted() { this.getSelect(initProject, ['项目名称', '项目流水号'], 'project') + this.searchRecord() }, methods: { projectChange() { @@ -119,13 +134,26 @@ export default { }) }, searchRecord() { - if (!this.projectValue) { - this.$message.warning('请选择项目') - return - } - searchRecord(this.projectValue, this.machineValue, this.groupValue, this.name, this.spec, this.model).then(res => { - this.tableData = res.data + let check1, check2, check3, check4, check5, check6 + 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.tableData = res.data.rows + this.total1 = res.data.total }) + }, + handleSizeChange1(val) { + this.pageSize1 = val + this.pageCurrent1 = 1 + this.searchRecord() + }, + handleCurrentChange1(val) { + this.pageCurrent1 = val + this.searchRecord() } } } diff --git a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue index 20f76a6e..f34f2e1b 100644 --- a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue +++ b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue @@ -51,6 +51,16 @@ border highlight-current-row @row-click="click"> + + + + + + - + @@ -144,12 +144,12 @@ {{ Number(scope.row.滞货数量) }} - + - + @@ -159,7 +159,7 @@
已采购 - + @@ -281,12 +281,12 @@ {{ scope.row.零件数量 }} - + - + @@ -296,7 +296,7 @@
询价单 询价单基础信息维护 - + @@ -343,7 +343,7 @@ {{ scope.row.供应商名称 }} - + @@ -353,9 +353,34 @@ {{ scope.row.传真 }} - + + + + + + + + + + + + + + + + @@ -381,6 +406,11 @@

询价单明细

+ + + - + - + @@ -806,7 +836,8 @@ export default { total12: 0, pageCurrent12: 1, pageSize12: 10, - supplierFilters: [{ text: '', value: '' }], + remarkFilters: [], + supplierFilters: [], tableData2: [], // 询价单列表 total2: 0, pageCurrent2: 1, @@ -1026,6 +1057,9 @@ export default { selectable(row, index) { // 控制某行是否可选 return (parseInt(row.询价状态编号) === 1 && parseInt(row.采购状态编号) === 1 && parseInt(row.是否确认) === 1) // 未询价&&未采购&&确认物料修改 }, + filterHandler0(value, row) { // 筛选备注 + return row['备注'] === value + }, filterHandler(value, row) { // 筛选供货商 return row['供货商'] === value }, @@ -1040,6 +1074,18 @@ export default { searchMaterial(this.pageCurrent11, this.pageSize11, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue).then(response => { this.tableData11 = response.data.rows this.total11 = response.data.total + const remark = [] + const supplier = [] + this.remarkFilters = [] + this.supplierFilters = [] + response.data.rows.map(v => { + if (!remark.includes(v.备注)) { + remark.push(v.备注) + supplier.push(v.供货商) + this.remarkFilters.push({ text: v.备注, value: v.备注 }) + this.supplierFilters.push({ text: v.供货商, value: v.供货商 }) + } + }) }) }, handleSizeChange11(val) { // 标准件和外购件列表分页 @@ -1062,6 +1108,18 @@ export default { searchPart(this.pageCurrent12, this.pageSize12, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.partNum, check2, this.partName, check3, this.partSpec, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue).then(response => { this.tableData12 = response.data.rows this.total12 = response.data.total + const remark = [] + const supplier = [] + this.remarkFilters = [] + this.supplierFilters = [] + response.data.rows.map(v => { + if (!remark.includes(v.备注)) { + remark.push(v.备注) + supplier.push(v.供货商) + this.remarkFilters.push({ text: v.备注, value: v.备注 }) + this.supplierFilters.push({ text: v.供货商, value: v.供货商 }) + } + }) }) }, handleSizeChange12(val) { // 基本件列表分页 diff --git a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue index a19f135c..9cd7e562 100644 --- a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue +++ b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue @@ -3,6 +3,17 @@ + + + + + + + @@ -14,11 +25,6 @@ - - - - - @@ -129,6 +135,9 @@ + + + ①选择合同模板： @@ -156,7 +165,7 @@