diff --git a/src/api/PurchasingCenter/CreateInquirySheet.js b/src/api/PurchasingCenter/CreateInquirySheet.js index f0f8d699..8cedc41c 100644 --- a/src/api/PurchasingCenter/CreateInquirySheet.js +++ b/src/api/PurchasingCenter/CreateInquirySheet.js @@ -82,7 +82,7 @@ export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2 method: 'post', data: { type: '1', - name: '采购管理_采购部采购_查询物料_分配后', + name: 'xqs_采购管理_采购部采购_查询物料_分配后_带库存', param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&零件类型=${val7}`, Pagination: pageCurrent + '&' + pageSize } @@ -156,9 +156,9 @@ export function createInquirySheet(num1, id, num2, remark) { url: '', method: 'post', data: { - type: '2', + type: '1', name: '采购管理_询价单_增加数据', - param: `询价单编号=${num1}&采购员=${id}&供应商流水号=${num2}&备注=${remark}&identity=1=output` + param: `询价单编号=${num1}&采购员=${id}&供应商流水号=${num2}&备注=${remark}` } }) } diff --git a/src/api/PurchasingCenter/CreatePurchaseContract.js b/src/api/PurchasingCenter/CreatePurchaseContract.js index 06fb7d44..67c36d98 100644 --- a/src/api/PurchasingCenter/CreatePurchaseContract.js +++ b/src/api/PurchasingCenter/CreatePurchaseContract.js @@ -1,18 +1,28 @@ import request from '@/utils/request' // 初始化供应商 -export function initSupplier(num) { +export function initSupplier() { return request({ url: '', method: 'post', data: { type: '3', - name: `SELECT distinct 供应商流水号,供应商名称 -FROM 采购管理_询价单_视图 -where not EXISTS (select * from 采购管理_采购合同_采购部 where 是否启用 = 1 and 是否未通过 is null and 询价单编号 = 采购合同编号) and 采购员流水号 = ${num}` + name: `SELECT distinct * from 采购管理_供应商` } }) } +// export function initSupplier(num) { +// return request({ +// url: '', +// method: 'post', +// data: { +// type: '3', +// name: `SELECT distinct 供应商流水号,供应商名称 +// FROM 采购管理_询价单_视图 +// where not EXISTS (select * from 采购管理_采购合同_采购部 where 是否启用 = 1 and 是否未通过 is null and 询价单编号 = 采购合同编号) and 采购员流水号 = ${num}` +// } +// }) +// } // 查询询价单列表 表1 export function searchInquirySheet(check1, value1, check2, value2, check3, id, check4, supplier) { return request({ diff --git a/src/api/PurchasingCenter/MaterialManagement.js b/src/api/PurchasingCenter/MaterialManagement.js index 6919ba92..491b0464 100644 --- a/src/api/PurchasingCenter/MaterialManagement.js +++ b/src/api/PurchasingCenter/MaterialManagement.js @@ -1,5 +1,16 @@ import request from '@/utils/request' +export function getSupplier1(check, num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_供货商_查询数据_根据条件', + param: '供货商_check=' + check + '=int&供货商=' + num + } + }) +} export function AddGonghuoshang(num) { return request({ url: '', diff --git a/src/api/PurchasingCenter/PurchaseTaskAllocate.js b/src/api/PurchasingCenter/PurchaseTaskAllocate.js index 2b1e345a..f326320b 100644 --- a/src/api/PurchasingCenter/PurchaseTaskAllocate.js +++ b/src/api/PurchasingCenter/PurchaseTaskAllocate.js @@ -76,8 +76,8 @@ export function searchTable1(...params) { method: 'post', data: { type: '1', - name: '采购管理_采购部采购_查询物料_分配后', - param: `物料类别流水号_check=${params[2]}&物料类别流水号=${params[3]}&物料品种流水号_check=${params[4]}&物料品种流水号=${params[5]}&项目流水号_check=${params[6]}&项目流水号=${params[7]}&机床流水号_check=${params[8]}&机床流水号=${params[9]}&组件流水号_check=${params[10]}&组件流水号=${params[11]}&物料名称_check=${params[12]}&物料名称=${params[13]}&物料状态编号=${params[14]}&物料规格_check=${params[15]}&物料规格=${params[16]}&物料型号_check=${params[17]}&物料型号=${params[18]}&零件类型=${params[19]}`, + name: 'xqs_采购管理_采购部采购_查询物料_分配后', + param: `物料类别流水号_check=${params[2]}&物料类别流水号=${params[3]}&物料品种流水号_check=${params[4]}&物料品种流水号=${params[5]}&项目流水号_check=${params[6]}&项目流水号=${params[7]}&机床流水号_check=${params[8]}&机床流水号=${params[9]}&组件流水号_check=${params[10]}&组件流水号=${params[11]}&物料名称_check=${params[12]}&物料名称=${params[13]}&物料状态编号=${params[14]}&物料规格_check=${params[15]}&物料规格=${params[16]}&物料型号_check=${params[17]}&物料型号=${params[18]}&零件类型=${params[19]}&时间段_check=${params[20]}&开始时间=${params[21]}&结束时间=${params[22]}`, Pagination: params[0] + '&' + params[1] } }) diff --git a/src/api/WorkshopProcurement/NewArrivalList.js b/src/api/WorkshopProcurement/NewArrivalList.js new file mode 100644 index 00000000..85e039b5 --- /dev/null +++ b/src/api/WorkshopProcurement/NewArrivalList.js @@ -0,0 +1,99 @@ +import request from '@/utils/request' + +// 查询采购单 +export function searchPurchaseOrder(pageCurrent, pageSize, check1, num, check2, name) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '备料管理_采购计划_查询数据_到货', + param: `采购单号_check=${check1}&采购单号=${num}&供应商名称_check=${check2}&供应商名称=${name}`, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 查询采购计划明细 +export function searchMateriel(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '备料管理_采购计划明细_查询数据_未选入', + param: `采购计划流水号=${num}` + } + }) +} +// 查询到货单 +export function searchArriveOrder(pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '备料管理_到货单查询', + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 新增到货单 +export function addPurchaseOrder(num1, num2, num3, num4, num5) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '备料管理_新增到货单', + param: `材料=${num1}&单位=${num2}&数量=${num3}&金额=${num4}&备注=${num5}` + } + }) +} +// 编辑采购单 +export function editPurchaseOrder(num1, num2, num3, num4, num5, num6) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '备料管理_编辑到货单', + param: `材料=${num1}&单位=${num2}&数量=${num3}&金额=${num4}&备注=${num5}&到货单流水号=${num6}` + } + }) +} +// 删除采购单 +export function deletePurchaseOrder(PurchaseOrderNameValue) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '备料管理_删除到货单', + param: `到货单流水号=${PurchaseOrderNameValue}` + } + }) +} +// 查询采购计划明细 +export function searchTable5(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '备料管理_到货单明细查询', + param: `到货单流水号=${num}` + } + }) +} +// 选入 +export function addMateriel(num1, num2, num3) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '备料管理_到货单明细_选入', + param: `到货单流水号=${num1}&工艺计划流水号组=${num2}&采购计划明细流水号组=${num3}` + } + }) +} diff --git a/src/icons/svg/ProcurementInquiry.svg b/src/icons/svg/ProcurementInquiry.svg new file mode 100644 index 00000000..60fcb677 --- /dev/null +++ b/src/icons/svg/ProcurementInquiry.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue index 8f23d390..2f0081e5 100644 --- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue +++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue @@ -9,7 +9,7 @@ 查询全部 - + 导出备料单 diff --git a/src/views/ManufacturingCenter/InventoryQuery/index.vue b/src/views/ManufacturingCenter/InventoryQuery/index.vue index c325af8e..4d24e170 100644 --- a/src/views/ManufacturingCenter/InventoryQuery/index.vue +++ b/src/views/ManufacturingCenter/InventoryQuery/index.vue @@ -12,7 +12,7 @@ 查询 - + - + + diff --git a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue index d7df3f20..3fa952ee 100644 --- a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue +++ b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue @@ -292,7 +292,7 @@ @@ -435,7 +435,6 @@ export default { methods: { searchData() { searchData1(this.contractNumValue).then(response => { - console.log(response.data, 222) for (let j = 0; j < response.data.length; j++) { response.data[j].物料计划到货时间 = (response.data[j].物料计划到货时间).split(' ')[0] } diff --git a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue index 9310adc5..f697dd8c 100644 --- a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue +++ b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue @@ -182,9 +182,9 @@ {{ scope.row.批次数量 }} - + @@ -368,7 +368,7 @@ -
+
@@ -389,7 +389,7 @@

江苏高精机电装备有限公司

{{ 计划完成日期 }}
- +
@@ -397,7 +397,7 @@ - + @@ -407,7 +407,7 @@ - +
序号 图号材料 单位 数量请购重量成品尺寸（长、宽、高） 备注
{{ list.材料 }} {{ list.单位 }} {{ list.批次数量 }}{{ list.重量 }}{{ list.成品尺寸 }} {{ list.备注1 }}
@@ -423,6 +423,7 @@ import { initPartDrawing, searchPurchasedMaterials, searchPurchaseOrder, searchS import QRCode from 'qrcode' import $ from 'jquery' import { mapGetters } from 'vuex' + export default { name: '', // 采购计划 data() { @@ -555,13 +556,7 @@ export default { } }, saveWeight(index, row) { - var reg = /^[0-9]*$/ - if (!reg.test(row.重量1)) { - this.$message.error('请输入正确的重量') - row.重量1 = '' - } else { - saveWeight(row.采购计划明细流水号, row.重量1, row.备注1, row.单价) - } + saveWeight(row.采购计划明细流水号, row.成品尺寸, row.备注1, row.单价) }, saveMoney(index, row) { var reg = /^[0-9]*$/ @@ -569,11 +564,11 @@ export default { this.$message.error('请输入正确的单价') row.单价 = '' } else { - saveWeight(row.采购计划明细流水号, row.重量1, row.备注1, row.单价) + saveWeight(row.采购计划明细流水号, row.成品尺寸, row.备注1, row.单价) } }, saveRemarks(index, row) { - saveWeight(row.采购计划明细流水号, row.重量1, row.备注1, row.单价) + saveWeight(row.采购计划明细流水号, row.成品尺寸, row.备注1, row.单价) }, // ///////////////////////////////////////////////////////////////////////////////////////0529新加↑ useqrcode(contractNum) { @@ -777,7 +772,6 @@ export default { this.计划完成日期 = row.计划完成日期.split(' ')[0] this.下单日期 = row.下单日期.split(' ')[0] searchMateriel(this.purchasingOrderNumber).then(response => { - console.log(response.data) this.tableData3 = response.data }) }, @@ -863,7 +857,7 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { - const htmlNode = $('#cjn').html() + const htmlNode = $('#WGBLD').html() const body = $('body') body.children().hide() const printNode = $(htmlNode) diff --git a/src/views/WorkshopProcurement/NewArrivalList/index.vue b/src/views/WorkshopProcurement/NewArrivalList/index.vue new file mode 100644 index 00000000..5fe1a994 --- /dev/null +++ b/src/views/WorkshopProcurement/NewArrivalList/index.vue @@ -0,0 +1,499 @@ + + + + + diff --git a/src/views/login/index.vue b/src/views/login/index.vue index eb19fd82..2d85fa83 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -17,7 +17,7 @@ - +