From 1765a6a2c2c41418383ebae06dd6d454b25026b6 Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Tue, 6 Aug 2024 15:01:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E4=BB=B6=E5=B7=A5=E8=B5=84=E6=8A=A5?=
=?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/mes/unitPrice.js | 1 -
src/api/mes/unitPriceReport.js | 24 +-
src/api/system/user.js | 8 +
src/assets/icons/svg/print.svg | 5 +
src/views/mes/unitpriceReport/index.vue | 407 ++++++++++++++----
src/views/mes/unitpriceReport/selectOrder.vue | 158 +++++++
6 files changed, 513 insertions(+), 90 deletions(-)
create mode 100644 src/assets/icons/svg/print.svg
create mode 100644 src/views/mes/unitpriceReport/selectOrder.vue
diff --git a/src/api/mes/unitPrice.js b/src/api/mes/unitPrice.js
index f39eeee..a7a492e 100644
--- a/src/api/mes/unitPrice.js
+++ b/src/api/mes/unitPrice.js
@@ -16,7 +16,6 @@ export function getUnitPrice(picId) {
method: 'get'
});
}
-
// 新增unitPrice
export function addUnitPrice(data) {
return request({
diff --git a/src/api/mes/unitPriceReport.js b/src/api/mes/unitPriceReport.js
index 847ccf5..417d7c8 100644
--- a/src/api/mes/unitPriceReport.js
+++ b/src/api/mes/unitPriceReport.js
@@ -8,12 +8,7 @@ export function listUnitPriceReport(query) {
params: query
});
}
-// export function getReport(id) {
-// return request({
-// url: '/mes/unitPriceReport/' + id,
-// method: 'get'
-// });
-// }
+
// 查询【计件工资】详细
export function getReport(id) {
return request({
@@ -29,3 +24,20 @@ export function updateUnitPriceReport(data) {
data: data
});
}
+// 新增
+// 计件工资统计
+export function addUnitPriceReport(data) {
+ return request({
+ url: '/mes/unitPriceReport',
+ method: 'post',
+ data: data
+ });
+}
+// 查询生产工单列表--顶级母
+export function listWorkorderLevel0(query) {
+ return request({
+ url: '/plan/pro/workorder/listLevel0',
+ method: 'get',
+ params: query
+ });
+}
diff --git a/src/api/system/user.js b/src/api/system/user.js
index 3b071f9..c464094 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -17,6 +17,14 @@ export function getUser(userId) {
method: 'get'
})
}
+// 查询用户详细-通过工号
+export function getUserByUserName(data) {
+ return request({
+ url: '/system/user/getInfoByUserName/',
+ method: 'post',
+ data: data
+ })
+}
// 新增用户
export function addUser(data) {
diff --git a/src/assets/icons/svg/print.svg b/src/assets/icons/svg/print.svg
new file mode 100644
index 0000000..3f17cb3
--- /dev/null
+++ b/src/assets/icons/svg/print.svg
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/src/views/mes/unitpriceReport/index.vue b/src/views/mes/unitpriceReport/index.vue
index 498d4e9..6faaa9e 100644
--- a/src/views/mes/unitpriceReport/index.vue
+++ b/src/views/mes/unitpriceReport/index.vue
@@ -42,10 +42,10 @@
@keyup.enter.native="handleQuery"
/>
-
+
@@ -69,16 +69,15 @@
-
-
-
-
-
-
-
-
-
-
+ 补录
+
-
+
@@ -281,16 +280,243 @@
取 消
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PC
+
+
+
+
+
+
+ 小时
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+