From 67c2a2165644b4f83b3a87a641814cab65f57a84 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Fri, 19 Aug 2022 16:12:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E6=94=B6=E5=AF=B9=E8=B4=A6=20=202022?=
=?UTF-8?q?=E5=B9=B48=E6=9C=8819=E6=97=A5=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/knifemold/tool-info.js | 40 +-
.../modules/knifemold/tool-oi-record.vue | 33 +-
src/views/modules/knifemold/tool-receipt.vue | 768 ++++++++++++++++++
3 files changed, 823 insertions(+), 18 deletions(-)
create mode 100644 src/views/modules/knifemold/tool-receipt.vue
diff --git a/src/api/knifemold/tool-info.js b/src/api/knifemold/tool-info.js
index ed09dbd..3b2b4c0 100644
--- a/src/api/knifemold/tool-info.js
+++ b/src/api/knifemold/tool-info.js
@@ -1,43 +1,53 @@
-import { createAPI } from "@/utils/httpRequest.js";
+import {createAPI} from "@/utils/httpRequest.js";
// 获取工具主信息信息
-export const getToolHeaderData = data => createAPI(`toolInfo/getToolHeaderData`,'POST',data)
+export const getToolHeaderData = data => createAPI(`toolInfo/getToolHeaderData`, 'POST', data)
// 获取工具明细信息信息
-export const getToolDetailList = data => createAPI(`toolInfo/getToolDetailList`,'POST',data)
+export const getToolDetailList = data => createAPI(`toolInfo/getToolDetailList`, 'POST', data)
// 获取工具维护记录
-export const getToolInstanceIdUseHist = data => createAPI(`toolInfo/getToolInstanceIdUseHist`,'POST',data)
+export const getToolInstanceIdUseHist = data => createAPI(`toolInfo/getToolInstanceIdUseHist`, 'POST', data)
// 获取工具使用记录
-export const getSfdcToolingHistList = data => createAPI(`toolInfo/getSfdcToolingHistList`,'POST',data)
+export const getSfdcToolingHistList = data => createAPI(`toolInfo/getSfdcToolingHistList`, 'POST', data)
// 获取工具使用记录
-export const getToolHeaderList = data => createAPI(`toolInfo/getToolHeaderList`,'POST',data)
+export const getToolHeaderList = data => createAPI(`toolInfo/getToolHeaderList`, 'POST', data)
// 编辑 工具主表信息
-export const editToolHeader = data => createAPI(`toolInfo/editToolHeader`,'POST',data)
+export const editToolHeader = data => createAPI(`toolInfo/editToolHeader`, 'POST', data)
+
// 保存 工具主表信息
-export const saveToolHeader = data => createAPI(`toolInfo/saveToolHeader`,'POST',data)
+export const saveToolHeader = data => createAPI(`toolInfo/saveToolHeader`, 'POST', data)
// deleteToolHeader
-export const deleteToolHeader = data => createAPI(`toolInfo/deleteToolHeader`,'POST',data)
-
+export const deleteToolHeader = data => createAPI(`toolInfo/deleteToolHeader`, 'POST', data)
// 获取工具使用记录
-export const updateToolDetail = data => createAPI(`toolInfo/updateToolDetail`,'POST',data)
+export const updateToolDetail = data => createAPI(`toolInfo/updateToolDetail`, 'POST', data)
// 添加工具实例
-export const saveToolInfoDetail = data => createAPI(`toolInfo/saveToolInfoDetail`,'POST',data)
+export const saveToolInfoDetail = data => createAPI(`toolInfo/saveToolInfoDetail`, 'POST', data)
// 获取工具打印
-export const printTool = data => createAPI(`toolMan/printTool`,'POST',data)
+export const printTool = data => createAPI(`toolMan/printTool`, 'POST', data)
// 获取工具信息
-export const getToolInfoList = data => createAPI(`toolInfo/getToolInfoList`,'POST',data)
+export const getToolInfoList = data => createAPI(`toolInfo/getToolInfoList`, 'POST', data)
// 获取出入库信息
-export const getToolTransInfoList = data => createAPI(`toolInfo/getToolTransInfoList`,'POST',data)
+export const getToolTransInfoList = data => createAPI(`toolInfo/getToolTransInfoList`, 'POST', data)
+
+// 工具接收信息
+export const getPoReceiptList = data => createAPI(`toolInfo/getPoReceiptList`, 'POST', data)
+
+// 接收对账
+export const updatePoReceiptList = data => createAPI(`toolInfo/updatePoReceiptList`, 'POST', data)
+
+// 取消对账
+export const updatePoReceiptListR = data => createAPI(`toolInfo/updatePoReceiptListR`, 'POST', data)
+
diff --git a/src/views/modules/knifemold/tool-oi-record.vue b/src/views/modules/knifemold/tool-oi-record.vue
index 596992f..c5513a3 100644
--- a/src/views/modules/knifemold/tool-oi-record.vue
+++ b/src/views/modules/knifemold/tool-oi-record.vue
@@ -43,7 +43,7 @@
-
+
@@ -450,6 +450,7 @@
exportHeader: [this.$route.meta.title],
exportFooter: [],
exportDefaultValue: "",
+ exportDataList: []
// 导出 end
}
@@ -464,6 +465,7 @@
},
methods: {
// --------------- 业务 -------------------
+ // 列表查询
getDataList() {
this.dataListLoading = true
this.queryTool.limit = this.pageSize
@@ -478,6 +480,29 @@
this.dataListLoading = false
})
},
+ // 导出查询
+ async getExportDataList() {
+ this.dataListLoading = true
+ let queryTool = {
+ limit: 9999999,
+ page: 1,
+ supplierId: this.queryTool.supplierId,
+ toolId: this.queryTool.toolId,
+ toolInstanceId: this.queryTool.toolInstanceId,
+ locationId: this.queryTool.locationId,
+ toolDescription: this.queryTool.toolDescription,
+ startDate: this.queryTool.startDate,
+ endDate: this.queryTool.endDate,
+ transNo: this.queryTool.transNo,
+ transTypes: this.queryTool.transTypes
+ }
+ await getToolTransInfoList(queryTool).then(({data}) => {
+ if (data.code == 0) {
+ this.exportDataList = data.data.list
+ }
+ this.dataListLoading = false
+ })
+ },
getBaseData(val) {
if (this.tagNo === 3) {
this.queryTool.supplierId = val.SupplierID
@@ -620,11 +645,13 @@
let s = eval("(" + json + ")")
return s
},
- createExportData() {
+ async createExportData() {
+ await this.getExportDataList()
// 点击导出按钮之后,开始导出数据之前的执行函数,返回值为需要下载的数据
- return this.dataList;
+ return this.exportDataList;
},
startDownload() {
+
},
finishDownload() {
}
diff --git a/src/views/modules/knifemold/tool-receipt.vue b/src/views/modules/knifemold/tool-receipt.vue
new file mode 100644
index 0000000..e8e691f
--- /dev/null
+++ b/src/views/modules/knifemold/tool-receipt.vue
@@ -0,0 +1,768 @@
+
+
+
+
+ {{ buttons.search }}
+ {{ buttons.defaultTable }}
+
+ {{ buttons.settingTable }}
+ {{ buttons.receiveList }}
+
+ {{ buttons.download }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{'供应商编码'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row[item.columnProp] }}
+ ![]()
+
+
+
+
+ 完成对账
+ 取消对账
+
+
+
+
+
+
+
+
+
+
+
+
+