From 86afdead2ffc6ac4a1127ebe60e548f463561c48 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Wed, 26 Dec 2018 14:11:49 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E8=BF=9B=E5=BA=A6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ManufacturingCenter/ProcessingStatus/index.vue | 2 +- src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/ManufacturingCenter/ProcessingStatus/index.vue b/src/views/ManufacturingCenter/ProcessingStatus/index.vue index 6b52fb71..9574c768 100644 --- a/src/views/ManufacturingCenter/ProcessingStatus/index.vue +++ b/src/views/ManufacturingCenter/ProcessingStatus/index.vue @@ -554,7 +554,7 @@ export default { background-color: transparent; border: 0px solid white; } - .green{ + .lightgreen{ background-color: lightgreen; border: 1px solid #1f2d3d; } diff --git a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue index 8debe709..1587bcb9 100644 --- a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue +++ b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue @@ -565,6 +565,7 @@ 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 => { + console.log(response.data) this.liushuihao = response.data[0].工艺计划流水号 for (let k = 0; k < response.data.length; k++) { if (response.data[k].工艺计划流水号 === this.liushuihao) { @@ -724,7 +725,7 @@ export default { background-color: transparent; border: 0px solid white; } - .green{ + .lightgreen{ background-color: lightgreen; border: 1px solid #1f2d3d; } From 7e182b8cf45deae88c103d1e2d215026f3d01472 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Wed, 26 Dec 2018 14:13:41 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E8=BF=9B=E5=BA=A6?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue index 1587bcb9..a8a83d71 100644 --- a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue +++ b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue @@ -565,7 +565,6 @@ 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 => { - console.log(response.data) this.liushuihao = response.data[0].工艺计划流水号 for (let k = 0; k < response.data.length; k++) { if (response.data[k].工艺计划流水号 === this.liushuihao) { From 25cbc6f25ac297fd3cecec9779475b5cd82b563c Mon Sep 17 00:00:00 2001 From: lixin Date: Wed, 26 Dec 2018 18:58:15 +0800 Subject: [PATCH 3/9] lxbug --- src/api/Inventory/InboundCard.js | 13 +- src/views/Inventory/DirectPart/index.vue | 50 ++- src/views/Inventory/InboundCard/index.vue | 358 ++++++++++++------ src/views/Inventory/OfflinePurchase/index.vue | 4 +- 4 files changed, 285 insertions(+), 140 deletions(-) diff --git a/src/api/Inventory/InboundCard.js b/src/api/Inventory/InboundCard.js index 7d900b77..6bd7ba98 100644 --- a/src/api/Inventory/InboundCard.js +++ b/src/api/Inventory/InboundCard.js @@ -80,7 +80,18 @@ export function addInboundCard(data1, data2, data3, data4, data5, data6, data7, } }) } - +// 入库单删除 +export function deleteInboundCard(data1) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '库存管理_采购入库单_入库单删除', + param: '采购入库单流水号=' + data1 + } + }) +} // 入库单修改 export function editInboundCard(data0, data1, data2, data3, data4, data5, data6, data7, data8, data9, data10, data11) { return request({ diff --git a/src/views/Inventory/DirectPart/index.vue b/src/views/Inventory/DirectPart/index.vue index 33df0fd7..f2a68644 100644 --- a/src/views/Inventory/DirectPart/index.vue +++ b/src/views/Inventory/DirectPart/index.vue @@ -109,14 +109,14 @@ {{ scope.row.项目名称 }} - + - + @@ -124,9 +124,9 @@ {{ scope.row.采购合同编号 }} - + @@ -154,7 +154,7 @@ - + - + { + addDirectPart(this.form.DirectNumber, this.purchaseContractNumber, this.PeopleNumber, this.form.getPeople, this.form.DirectNumber, this.teamPart, this.teamBasicPart, this.projectNumber, this.machineNumber, this.teamNumber, this.materialName, this.form.DirectNote, this.materialtype, this.materialMode, this.partPicture).then(response => { if (response.data[0].result === '1') { this.$notify({ title: '成功', diff --git a/src/views/Inventory/InboundCard/index.vue b/src/views/Inventory/InboundCard/index.vue index 8067448c..9c883c3e 100644 --- a/src/views/Inventory/InboundCard/index.vue +++ b/src/views/Inventory/InboundCard/index.vue @@ -169,8 +169,9 @@ 查询 创建 - 选入 - 导出 + 选入 + + - + @@ -229,17 +230,17 @@ {{ scope.row.姓名 }} - + - + - + @@ -251,9 +252,9 @@ @@ -432,123 +433,197 @@ 打印 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- 取消 + 取消 确定
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
取消 - 确定 + 确定
+ + From bbbf7b0da3009c82678f66939777d35aa33b1f66 Mon Sep 17 00:00:00 2001 From: lixin Date: Fri, 28 Dec 2018 10:39:27 +0800 Subject: [PATCH 8/9] lx --- src/views/Inventory/InboundCard/index.vue | 48 ++++----- .../Inventory/InventoryManagement/index.vue | 1 - .../Inventory/PartsReplacement/index.vue | 100 +++++++++++++++++- 3 files changed, 117 insertions(+), 32 deletions(-) diff --git a/src/views/Inventory/InboundCard/index.vue b/src/views/Inventory/InboundCard/index.vue index 9c883c3e..8c4febc9 100644 --- a/src/views/Inventory/InboundCard/index.vue +++ b/src/views/Inventory/InboundCard/index.vue @@ -437,7 +437,7 @@ - + - + - + @@ -523,14 +523,14 @@
取消 - 确定 + 确定
- + - + - + @@ -616,7 +616,7 @@
取消 - 确定 + 确定
@@ -668,14 +668,7 @@ export default { rules: { // 表单验证规则 contract: [{ required: true, message: '请选择合同', trigger: 'blur' }], house: [{ required: true, message: '请选择仓库', trigger: 'blur' }], - inboundDay: [{ required: true, message: '请输入入库日期', trigger: 'blur' }], - arrive: [{ required: true, message: '请输入到货单号', trigger: 'blur' }], - affair: [{ required: true, message: '请输入业务号', trigger: 'blur' }], - affairPeople: [{ required: true, message: '请选择业务员', trigger: 'blur' }], - affirType: [{ required: true, message: '请输入入库日期', trigger: 'blur' }], - purchaseType: [{ required: true, message: '请输入业务类型', trigger: 'blur' }], - inboundType: [{ required: true, message: '请输入入库类别', trigger: 'blur' }], - note: [{ required: true, message: '请输入备注', trigger: 'blur' }] + inboundDay: [{ required: true, message: '请输入入库日期', trigger: 'blur' }] }, nameGroup: [], modelGroup: [], @@ -787,8 +780,8 @@ export default { this.dialogVisible1 = true }, // 增加入库单 - submitCard() { - this.$refs['form'].validate((valid) => { + submitCard(formName) { + this.$refs[formName].validate((valid) => { if (valid) { addInboundCard(this.form.inboundDay, this.form.house, this.form.contract, this.form.arrive, this.form.affairPeople, this.form.affair, this.form.arriveDay, this.form.affirType, this.form.purchaseType, this.form.inboundType, this.form.note).then(response => { if (response.data[0].result === '1') { @@ -862,13 +855,17 @@ export default { this.form.inboundType = row.入库类别 this.form.note = row.备注 }, - submitInboundCardInfor() { - editInboundCard(this.DetailNumber, this.form.inboundDay, this.form.house, this.form.contract, this.form.arrive, this.form.affairPeople, this.form.affair, this.form.arriveDay, this.form.affirType, this.form.purchaseType, this.form.inboundType, this.form.note).then(response => { - if (response.data[0].result === '1') { - this.$message.success('修改成功') - this.dialogVisible2 = false - } else { - this.$message.error('修改失败') + submitInboundCardInfor(form) { + this.$refs[form].validate((valid) => { + if (valid) { + editInboundCard(this.DetailNumber, this.form.inboundDay, this.form.house, this.form.contract, this.form.arrive, this.form.affairPeople, this.form.affair, this.form.arriveDay, this.form.affirType, this.form.purchaseType, this.form.inboundType, this.form.note).then(response => { + if (response.data[0].result === '1') { + this.$message.success('修改成功') + this.dialogVisible2 = false + } else { + this.$message.error('修改失败') + } + }) } }) }, @@ -883,7 +880,6 @@ export default { this.tableData4 = data }) }, - // 删除领料单 dropCard(row) { this.CardNumber = row.采购入库单流水号 diff --git a/src/views/Inventory/InventoryManagement/index.vue b/src/views/Inventory/InventoryManagement/index.vue index a0757d1d..a1fad173 100644 --- a/src/views/Inventory/InventoryManagement/index.vue +++ b/src/views/Inventory/InventoryManagement/index.vue @@ -535,7 +535,6 @@ export default { }, // 执行修改货位 LocateEdit() { - console.log(this.LocateNumber, this.form2.货位名称, this.form2.工作中心, this.form2.仓库流水号, this.form2.永久, this.form2.不可用量) alterLocate(this.LocateNumber, this.form2.货位名称, this.form2.工作中心, this.form2.仓库流水号, this.form2.永久, this.form2.不可用量).then(response => { this.dialogFormVisible2 = false if (response.data[0].result === '1') { diff --git a/src/views/Inventory/PartsReplacement/index.vue b/src/views/Inventory/PartsReplacement/index.vue index 909a80b3..644294ba 100644 --- a/src/views/Inventory/PartsReplacement/index.vue +++ b/src/views/Inventory/PartsReplacement/index.vue @@ -237,7 +237,7 @@ @@ -300,12 +300,77 @@ + + +
+
+

仓 库 补 投 单

+
+ + + + + + + + + + + + + + + + + + + + + +
补投单编号:{{ inbondCard[0] }}姓名:{{ inbondCard[1] }}
补投时间:{{ inbondCard[2] }}仓库名称:{{ inbondCard[3] }}
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
项目名称机床图号组号名称数量类型
{{ list.项目名称 }}{{ list.机床图号 }}{{ list.组号 }}{{ list.名称 }}{{ list.数量 }}{{ list.类型名称 }}
+
+
+ +
+ 取消 + 打印 +
+ From 90db55365a575a643b5de33ed76189dff08eed15 Mon Sep 17 00:00:00 2001 From: lixin Date: Fri, 28 Dec 2018 12:34:14 +0800 Subject: [PATCH 9/9] lxnew --- src/api/Inventory/OfflinePurchase.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/Inventory/OfflinePurchase.js b/src/api/Inventory/OfflinePurchase.js index de237229..c37abee8 100644 --- a/src/api/Inventory/OfflinePurchase.js +++ b/src/api/Inventory/OfflinePurchase.js @@ -20,7 +20,7 @@ export function addRequestCard(peoplenumber, housenumber) { method: 'post', data: { type: '2', - name: 'dbo.库存管理_离线请购单_请购单增加', + name: '库存管理_离线请购单_请购单增加', param: '请购人编号=' + peoplenumber + '&仓库流水号=' + housenumber } })