From 6146ab970705d0233a12b9fe475f9756e3271aa1 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 02 四月 2025 08:43:16 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/BasicTable.vue | 2 --
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java | 2 ++
north-glass-erp/src/main/java/com/example/erp/config/StpInterfaceImpl.java | 2 --
north-glass-erp/src/main/resources/application.yml | 3 +++
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue | 23 +++++++++++++++--------
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue | 3 ++-
6 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/BasicTable.vue b/north-glass-erp/northglass-erp/src/components/BasicTable.vue
index 1744a32..8244a59 100644
--- a/north-glass-erp/northglass-erp/src/components/BasicTable.vue
+++ b/north-glass-erp/northglass-erp/src/components/BasicTable.vue
@@ -139,8 +139,6 @@
gridOptions.columns = props.childrenData.columns
getReportData()
addListener(xGrid.value,gridOptions)
-
-
})
function filterChanged(column){
//gridOptions.loading=true
diff --git a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
index b630836..7eb9d2e 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
@@ -23,6 +23,8 @@
const user=userInfo()
//瀹氫箟琛ㄥご鏁版嵁
const titleUploadData = ref({
+ //鏄惁鍚堢墖宸ュ簭
+ laminating:'',
reportingWorkId: null,
//娴佺▼鍗″彿
processId: null,
@@ -796,11 +798,11 @@
})
const maxQuantity = Math.max(...equalByOrderNum.map(item =>item.breakageQuantity || 0))
let process = titleUploadData.value.thisProcess
+ let laminating = titleUploadData.value.laminating
equalByOrderNum.forEach((row) =>{
- if (process=='澶硅兌' || process=='涓┖' || process=='鍖呰' ||process=='鎵撹兌鍜岀矘妗�'){
+ if (laminating == 'laminating'){
row.completedQuantity= brokenRow.value.quantity*1-maxQuantity
}
-
})
@@ -1117,6 +1119,7 @@
titleUploadData.value = res.data.data
titleUploadData.value.processId = processId
titleUploadData.value.teamsGroupsName = user.user.userName
+ titleUploadData.value.laminating = res.data.laminating
//璁惧涓嬫媺妗�
titleSelectJson.value.deviceType = res.data.device
//鐝粍涓嬫媺妗�
@@ -1237,9 +1240,10 @@
const editClosedEvent = ({ row, column }) => {
let process = titleUploadData.value.thisProcess
+ let laminating = titleUploadData.value.laminating
if (column.property==='completedQuantity') {
xGrid.value.getTableData().fullData.forEach((item, index) =>{
- if(item.order_number===row.order_number && (process=='澶硅兌' || process=='涓┖' || process=='鍖呰' ||process=='鎵撹兌鍜岀矘妗�')){
+ if(item.order_number===row.order_number && laminating == 'laminating'){
item.completedQuantity=row.completedQuantity
}
})
@@ -1249,12 +1253,15 @@
const getQuantity = () => {
titleUploadData.value.thisCompletedQuantity = 0
titleUploadData.value.thisWornQuantity = 0
+ let laminating = titleUploadData.value.laminating
const arr = xGrid.value.getTableData().fullData
- const returnArr = arr.filter((obj, index, self) =>
- self.findIndex((t) => t.order_number === obj.order_number) === index
- )
-
-
+ //鏍规嵁鏄惁鍚堢墖宸ュ簭杩囨护
+ const returnArr =
+ laminating === "laminating"
+ ? arr.filter((obj, index, self) =>
+ self.findIndex((t) => t.order_number === obj.order_number) === index
+ )
+ : arr;
let sumBreak = 0
let sumQuantity = 0
returnArr.forEach((item)=>{
diff --git a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue
index 5c0b6c4..1b806bb 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue
@@ -192,7 +192,7 @@
//鐐瑰嚮鏌ヨ
const getWorkOrder = () => {
-
+ gridOptions.loading = true
let startTime = form.date1[0]
let endTime = form.date1[1]
let inputVal = form.orderId
@@ -274,6 +274,7 @@
total.dataTotal = res.data.total.total*1
total.pageTotal=parseInt(res.data.total)
pageNum.value=1
+ total.value = res.data.footSum
produceList = deepClone(res.data.data)
// 浣跨敤map鏂规硶鏉ュ鐞嗘瘡涓璞�
let modifiedCollection = produceList.map(item => {
diff --git a/north-glass-erp/src/main/java/com/example/erp/config/StpInterfaceImpl.java b/north-glass-erp/src/main/java/com/example/erp/config/StpInterfaceImpl.java
index de38cd4..1e5386d 100644
--- a/north-glass-erp/src/main/java/com/example/erp/config/StpInterfaceImpl.java
+++ b/north-glass-erp/src/main/java/com/example/erp/config/StpInterfaceImpl.java
@@ -11,8 +11,6 @@
/**
* 鑷畾涔夋潈闄愯璇佹帴鍙ｆ墿灞曪紝Sa-Token 灏嗕粠姝ゅ疄鐜扮被鑾峰彇姣忎釜璐﹀彿鎷ユ湁鐨勬潈闄愮爜
*
- * @author kong
- * @since 2022-10-13
*/
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
index 47698ae..1eb8bb5 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
@@ -206,6 +206,8 @@
map.put("historyTeams", reportingWorkMapper.historyTeamsMp(processIdStr, process));
//鍘嗗彶宸ュ簭
map.put("historyProcess", reportingWorkMapper.SelectHistoryProcessMp(historyProcess, process));
+ //鏄惁鍚堢墖宸ュ簭
+ map.put("laminating", laminating);
}
return map;
}
diff --git a/north-glass-erp/src/main/resources/application.yml b/north-glass-erp/src/main/resources/application.yml
index fce62a7..fa7851d 100644
--- a/north-glass-erp/src/main/resources/application.yml
+++ b/north-glass-erp/src/main/resources/application.yml
@@ -5,6 +5,9 @@
ip: localhost
port: 3306
+#sa-token:
+# timeout: 86400
+
spring:
datasource:
--
Gitblit v1.8.0