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/views/pp/reportingWorks/AddReportingWork.vue | 95 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 69 insertions(+), 26 deletions(-)
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 816f8fc..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,
@@ -90,9 +92,19 @@
let inputDisabled = ref(false)
-onMounted(() =>{
+onMounted(async () =>{
+ await initTiltle()
if(route.query.processId !== undefined && route.query.processId!=='' && route.query.processId!=null ){
titleUploadData.value.processId = route.query.processId
+ //褰撹川妫�瀹℃牳鍚庡姞杞芥槑缁嗕俊鎭�
+ if(route.query.reviewStatus === '1'){
+ if(titleUploadData.value.thisProcess !== undefined
+ && titleUploadData.value.thisProcess!==''
+ && titleUploadData.value.thisProcess!=null){
+ getWork()
+ getQuantity()
+ }
+ }
}
//route.query.reportingWorkId = 'BG2403150004'
//鍒ゆ柇鏄惁浼犲叆鎶ュ伐缂栧彿
@@ -339,6 +351,13 @@
},
{field: 'completed', width: 90, title:t('reportingWorks.completed'),},
{field: 'onceBroken', width: 90, title: t('reportingWorks.onceBroken'),},
+ {
+ field: 'reviewed_state',
+ title: t('processCard.reviewedState'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
],
//琛ㄥ崟楠岃瘉
@@ -779,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
}
-
})
@@ -795,23 +814,26 @@
//绗竴娆″姞杞芥暟鎹�
let groupChangeProcess = ref(false)//鐢ㄤ簬鏈彮缁勬樉绀洪棶棰�
-request.post(`/reportingWork/selectProcess/${user.user.userId}`).then((res) => {
- if (res.code == 200) {
- titleSelectJson.value.processType = res.data.process
- if(user.user.address!==null && user.user.address!==''){
- titleUploadData.value.thisProcess = user.user.address
- titleUploadData.value.teamsGroupsName = user.user.userName
- groupChangeProcess.value = true
- if (user.user.address==='鎶�鏈儴澶氭洸' || user.user.address==='澶硅兌'){
- groupChangeProcess.value = false
+const initTiltle = async () => {
+ await request.post(`/reportingWork/selectProcess/${user.user.userId}`).then((res) => {
+ if (res.code == 200) {
+ titleSelectJson.value.processType = res.data.process
+ if(user.user.address!==null && user.user.address!==''){
+ titleUploadData.value.thisProcess = user.user.address
+ titleUploadData.value.teamsGroupsName = user.user.userName
+ groupChangeProcess.value = true
+ if (user.user.address==='鎶�鏈儴澶氭洸' || user.user.address==='澶硅兌'){
+ groupChangeProcess.value = false
+ }
+ gridOptions.toolbarConfig.buttons[1].visible=false
}
- gridOptions.toolbarConfig.buttons[1].visible=false
- }
- } else {
- ElMessage.warning(res.msg)
- }
-})
+ } else {
+ ElMessage.warning(res.msg)
+ }
+ })
+}
+
function checkSameNumForId(data, targetId) {
// 鍒濆鍖栦竴涓璞℃潵瀛樺偍閬囧埌鐨刬d鍙婂叾瀵瑰簲鐨刵um鍊�
@@ -944,13 +966,15 @@
reviewState = 'review'
}
request.post(`/reportingWork/updateReportingWork/${reviewState}`,requestData).then(res =>{
- if (res.code == 200){
+ if (res.code == 200 && res.data===true){
ElMessage.success(t('reportingWorks.successfulModificationOfWorkApplication'))
router.push({path:'/main/reportingWorks/AddReportingWork',
query:{
processId:titleUploadData.value.processId,
random:Math.random()}
})
+ } else {
+ ElMessage.warning(t('reportingWorks.changeFailed'))
}
})
}
@@ -1029,6 +1053,7 @@
router.push({path:'/main/reportingWorks/AddReportingWork',
query:{
processId:titleUploadData.value.processId,
+ reviewStatus:1,
random:Math.random()
}
})
@@ -1094,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
//鐝粍涓嬫媺妗�
@@ -1148,7 +1174,20 @@
//缁戝畾涓嬫柟琛ㄦ牸
detail.value = res.data.Detail
- xGrid.value.reloadData(detail.value)
+ // 浣跨敤map鏂规硶鏉ュ鐞嗘瘡涓璞�
+ let modifiedCollection = detail.value.map(item => {
+ if (item.reviewed_state === 1) {
+ return { ...item, reviewed_state: "宸插鏍�" };
+ }
+ else if (item.reviewed_state === 0) {
+ return { ...item, reviewed_state: "鏈鏍�" };
+ }
+ else {
+ // 鍏朵粬鎯呭喌淇濇寔涓嶅彉
+ return item;
+ }
+ });
+ xGrid.value.reloadData(modifiedCollection)
} else {
ElMessage.warning(res.msg)
}
@@ -1201,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
}
})
@@ -1213,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)=>{
--
Gitblit v1.8.0