From 43e115a7de2c763c36d79e610a3abb1d833ea892 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 05 八月 2024 10:21:52 +0800
Subject: [PATCH] 修改发货报表
---
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue | 89 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 76 insertions(+), 13 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 de10f4d..acc7fcd 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
@@ -4,11 +4,13 @@
import request from "@/utils/request";
import {ElMessage} from "element-plus";
import {changeFilterEvent, filterChanged} from "@/hook"
+import domZIndex from 'dom-zindex'
import {indexOf} from "xe-utils";
import {addListener, toolbarButtonClickEvent} from "@/hook/mouseMove";
import userInfo from "@/stores/userInfo"
import { useI18n } from 'vue-i18n'
import footSum from "@/hook/footSum"
+domZIndex.setCurrent(3000)
//璇█鑾峰彇
const { t } = useI18n()
let brokenVisible = ref(false)
@@ -131,6 +133,7 @@
titleUploadData.value.qualityInspector=user.user.userName
}
+
gridOptions.toolbarConfig.buttons.push(button)
}
// getQuantity()
@@ -228,6 +231,13 @@
{
code: 'clearChecked',
name: t('basicData.clearSelection'),
+ prefixIcon: 'vxe-icon-indicator',
+ visible: true,
+ disabled: false
+ },
+ {
+ code: 'SecondaryBreakage',
+ name: "娆＄牬鐩稿悓",
prefixIcon: 'vxe-icon-indicator',
visible: true,
disabled: false
@@ -408,13 +418,26 @@
break
}
case 'update': {
- getQuantity()
- const errMap = await $grid.validate(true)
- if (errMap) {
- ElMessage.error(t('basicData.msg.checkoutLose'))
- return
- }
- saveReportingWork(0,'update')
+ //鏍规嵁琛ョ墖鐘舵�佸垽鏂槸鍚﹁兘淇敼
+ request.post(`/reportingWork/getPatchCondition/${route.query.reportingWorkId}`).then(async (res) => {
+ if (res.code == 200) {
+ if (res.data > 0) {
+ ElMessage.error("璇ユ姤宸ュ寘鍚凡琛ョ墖鏁版嵁锛屼笉鍙慨鏀�!")
+ return
+ } else {
+ getQuantity()
+ const errMap = await $grid.validate(true)
+ if (errMap) {
+ ElMessage.error(t('basicData.msg.checkoutLose'))
+ return
+ }
+ saveReportingWork(0, 'update')
+ }
+ } else {
+ ElMessage.warning(res.msg)
+ }
+ })
+
break
}
}
@@ -479,6 +502,36 @@
item[result.cell] = ''
}
})
+ }
+ }
+ break
+ }
+ case 'SecondaryBreakage' : {
+ let result = toolbarButtonClickEvent()
+ if (result.cell === "breakageQuantity"){
+ if (result) {
+ const dataList = xGrid.value.getTableData().visibleData
+ const seenOrders = {}
+ dataList.forEach((item, index) => {
+ const list = item.damageDetails
+ if (list!== null || list.length > 0){
+ const { order_number, damageDetails, breakageQuantity } = item;
+ // 濡傛灉 order_number 杩樻病鏈夊鐞嗚繃
+ if (!seenOrders[order_number]) {
+ // 璁板綍绗竴涓嚭鐜扮殑 damageDetails 鍜� breakageQuantity
+ seenOrders[order_number] = {
+ damageDetails,
+ breakageQuantity
+ };
+ } else {
+ // 灏嗗悗缁殑 damageDetails 鍜� breakageQuantity 鏇存柊涓虹涓�涓殑
+ item.damageDetails = seenOrders[order_number].damageDetails;
+ item.breakageQuantity = seenOrders[order_number].breakageQuantity;
+ }
+ }
+
+ })
+ console.log(dataList)
}
}
break
@@ -569,7 +622,7 @@
},
{
field: 'responsiblePersonnel',
- title: t('reportingWorks.responsiblePersonnel'),
+ title: '璐ｄ换淇℃伅',
editRender: {name: 'input', attrs: {placeholder: ''}}
},
@@ -785,7 +838,6 @@
}
}
-
titleUploadData.value.creator = user.user.userName
titleUploadData.value.creatorId = user.user.userId
const requestDetailData = xGrid.value.getTableData().fullData.filter((row) => {
@@ -801,7 +853,9 @@
const requestData = {
title:titleUploadData.value,
detail:xGrid.value.getTableData().fullData,
- type:state//瀹℃牳鐘舵��
+ type:state,//瀹℃牳鐘舵��
+ userId:user.user.userId,
+ userName:user.user.userName,
}
gridOptions.toolbarConfig.buttons[0].disabled=true
gridOptions.toolbarConfig.buttons[1].disabled=true
@@ -815,7 +869,6 @@
}
const saveReportingWorkRequest = (requestData) =>{
- //request.post(`/reportingWork/saveReportingWorkLog`, requestData)
request.post(`/reportingWork/saveReportingWork`,requestData).then(res =>{
if (res.code == 200){
ElMessage.success(t('reportingWorks.successfulJobApplication'))
@@ -868,6 +921,7 @@
})
// 鏌ヨ璐ｄ换鐝粍
const computedResponsibleTeam = computed((responsibleProcess) => {
+ titleSelectJson.value.historyTeams.push({basic_name: user.user.userName, process: titleUploadData.value.thisProcess, basic_type: 'teamsgroups', basic_category: 179, id: 555})
return function (responsibleProcess){
return titleSelectJson.value.historyTeams.filter((item) => {
return item.process === responsibleProcess
@@ -1126,7 +1180,7 @@
}
onMounted(() => {
window.addEventListener('keypress', qrcodeScanner);
- // addListener(xGrid.value, gridOptions)
+ addListener(xGrid.value, gridOptions)
})
// 鍦ㄧ粍浠跺嵏杞芥椂绉婚櫎閿洏浜嬩欢鐩戝惉
@@ -1185,6 +1239,10 @@
if (column.field === 'breakageQuantity') {
return 'col-red'
}
+
+}
+const changeRowClass = ({ row, rowIndex, $rowIndex }) => {
+ return row?.rowClass
}
@@ -1356,8 +1414,9 @@
<vxe-grid
ref="xGrid"
class="mytable-scrollbar"
+ :row-class-name="changeRowClass"
max-height="100%"
- height="400px"
+ height="100%"
size="small"
v-bind="gridOptions"
v-on="gridEvents"
@@ -1560,4 +1619,8 @@
color: #fff;
}
+
+::v-deep(.latter) {
+ //display: none;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0