From 5bf14644a85c956c8ca148d3b1333e62e431d6b4 Mon Sep 17 00:00:00 2001 From: hongchao <3228015117@qq.com> Date: Tue, 21 Jan 2025 13:37:59 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E7=AD=BE=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/material/part/partAccept/index.vue | 19 +- .../part/partArrived/component/home.vue | 16 +- .../material/purchase/goodsAccept/detail.vue | 2 +- .../purchase/goodsArrived/component/home.vue | 170 ++++++++++-------- 4 files changed, 132 insertions(+), 75 deletions(-) diff --git a/src/views/material/part/partAccept/index.vue b/src/views/material/part/partAccept/index.vue index 7b7e1a13..ceeceff6 100644 --- a/src/views/material/part/partAccept/index.vue +++ b/src/views/material/part/partAccept/index.vue @@ -224,7 +224,7 @@ /> @@ -257,15 +257,23 @@ " >
-
+
供应科：{{printData.supplyDept}}
-
+ +
+
+ 生产技术科： + + + +
@@ -329,6 +337,11 @@ import { passAll,rejectAll } from '@/api/part/partAccept'; openPrint: false, printData: {}, printTableData: [], + productionTechDeptOptions: [ + { value: '0', label: '张三' }, + { value: '1', label: '李四' }, + { value: '2', label: '王五' }, + ], }; }, created() { diff --git a/src/views/material/part/partArrived/component/home.vue b/src/views/material/part/partArrived/component/home.vue index a6c3ebe4..a517e17a 100644 --- a/src/views/material/part/partArrived/component/home.vue +++ b/src/views/material/part/partArrived/component/home.vue @@ -332,10 +332,18 @@
-
+ +
+
+ 生产技术科： + + + +
@@ -426,6 +434,12 @@ export default { printTableData: [], // 供应商 supplierStr: "", + + productionTechDeptOptions: [ + { value: '0', label: '张三' }, + { value: '1', label: '李四' }, + { value: '2', label: '王五' }, + ], }; }, created() { diff --git a/src/views/material/purchase/goodsAccept/detail.vue b/src/views/material/purchase/goodsAccept/detail.vue index 150be3f2..1139bb86 100644 --- a/src/views/material/purchase/goodsAccept/detail.vue +++ b/src/views/material/purchase/goodsAccept/detail.vue @@ -402,7 +402,7 @@ export default { console.log(param); acceptInnerVerifyer(param).then((response) => { if (response.code == 200) { - this.$modal.msgSuccess("操作成功"); + this.$modal.msgSuccess(response.msg); this.confirmShow = false; this.getList(); this.$refs.multipleTable.clearSelection(); diff --git a/src/views/material/purchase/goodsArrived/component/home.vue b/src/views/material/purchase/goodsArrived/component/home.vue index 621833bb..4fae16cb 100644 --- a/src/views/material/purchase/goodsArrived/component/home.vue +++ b/src/views/material/purchase/goodsArrived/component/home.vue @@ -133,67 +133,83 @@ @pagination="getList" /> - - -
- -
- 机具设备到货验收单 -
-
-
- 单据编号： -
-
- 生产厂家（供应商）： -
-
- 到货日期： -
-
- - - - - - - - - - - - - - - - + + +
+ +
+ 机具设备到货验收单 +
+
+
+ 单据编号：{{printData.code}} +
+
+ 生产厂家（供应商）：{{printData.supplierName}} +
+
+ 到货日期：{{printData.arrivalDate}} +
+
+ + + + + + + + + + + + + + + + -
-
-
- 供应科： -
-
-
-
- 生产技术科： -
-
-
-
- 库管班： -
+
+
+
供应科：
+
+
+ +
+
+
+ +
+
生产技术科：
+
+
+ +
+
+
+
+
库管班：
+
+
+ +
+
+ +
+
+
-
- -
- -
- 打 印 - 关 闭 -
- +
+ 打 印 + 关 闭 +
+ @@ -263,7 +279,7 @@ import { bmNoticeInfo, delPeople, } from "@/api/purchase/goodsArrived"; - +import {getPurchaseCheckFormByTaskId } from "@/api/purchase/goodsAccept"; export default { name: "Home", dicts: ["purchase_task_status"], @@ -547,25 +563,25 @@ export default { //获取验收单数据 getPrintTable(taskId) { - getAcceptanceForm({ taskId: taskId }).then((response) => { + getPurchaseCheckFormByTaskId(taskId).then((response) => { this.printData = response.data; - this.printTableData = response.data.checkDetailsList; + this.printTableData = response.data.materialList; - let supplierList = []; - this.printTableData.forEach((e) => { - if (e.supplier) { - supplierList.push(e.supplier); - } - }); - supplierList = [...new Set(supplierList)]; + // let supplierList = []; + // this.printTableData.forEach((e) => { + // if (e.supplier) { + // supplierList.push(e.supplier); + // } + // }); + // supplierList = [...new Set(supplierList)]; - this.supplierStr = supplierList.join(","); + // this.supplierStr = supplierList.join(","); }); }, //查看验收单 handlePrint(row) { // this.query.taskId = row.taskId - // this.getPrintTable(row.taskId) + this.getPrintTable(row.taskId) this.openPrint = true; this.title = "机具设备到货验收单"; }, @@ -613,6 +629,20 @@ export default { }; diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 69a39a11..b99f1338 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -84,7 +84,7 @@ - + From 1f76e51498ffa66515e76a73aa45b058ad5e0ea9 Mon Sep 17 00:00:00 2001 From: hongchao <3228015117@qq.com> Date: Tue, 21 Jan 2025 16:18:59 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=85=8D=E4=BB=B6=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/part/partArrived.js | 9 + src/views/material/part/partAccept/detail.vue | 6 +- src/views/material/part/partAccept/index.vue | 339 ++++++++---------- .../part/partArrived/component/addTools.vue | 2 +- .../part/partArrived/component/home.vue | 99 ++--- 5 files changed, 206 insertions(+), 249 deletions(-) diff --git a/src/api/part/partArrived.js b/src/api/part/partArrived.js index b04c76db..34c27975 100644 --- a/src/api/part/partArrived.js +++ b/src/api/part/partArrived.js @@ -61,4 +61,13 @@ export function getPartTypeFileList(query) { method: 'get', params: query }) +} + +//根据任务id查询入库单 +export function getInBoundForm(query) { + return request({ + url: '/material/part_arrived/getInBoundForm', + method: 'get', + params: query + }) } \ No newline at end of file diff --git a/src/views/material/part/partAccept/detail.vue b/src/views/material/part/partAccept/detail.vue index 9936180f..2d42745a 100644 --- a/src/views/material/part/partAccept/detail.vue +++ b/src/views/material/part/partAccept/detail.vue @@ -148,12 +148,12 @@ :show-overflow-tooltip="true" /> - + /> --> {{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }} - + - + @@ -132,178 +132,156 @@ @pagination="getList" /> - - -
- -
- 机具配件到货验收单 -
-
-
- 单据编号：{{printData.code}} -
-
- 生产厂家（供应商）：{{printData.supplierName}} -
- -
- 到货日期：{{printData.arrivalDate}} -
-
- - - - - - - - - - - - - - - - - - - - -
-
-
- 供应科：{{printData.supplyDept}} -
-
- - -
-
- 生产技术科： - - - -
-
- -
-
- 库管班：{{printData.warehouseTeam}} -
-
-
- + + +
+ +
+ 机具配件到货入库单 +
+
+
+ 单据编号：{{printData.code}} +
+
+ 生产厂家（供应商）：{{printData.supplier}}
-
- 打 印 - 关 闭 +
+ 到货日期：{{printData.arrivalTime}}
- - +
+ + + + + + + + + + + +
+
+
+ 供应科： +
+
+ + +
+
+ 生产技术科： + +
+
+ +
+
+ 库管班： +
+
+
+ +
+ +
+ 打 印 + 关 闭 +
+