From e50fa16b6dbc4e7c50d5fbdbc04d2a556ca01c4e Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 02 十二月 2024 11:26:36 +0800
Subject: [PATCH] 补片流程卡调整
---
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue | 29 +++++++++++++----------------
1 files changed, 13 insertions(+), 16 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 8a74085..9caaeb7 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
@@ -104,7 +104,7 @@
layer= res.data.layer
//娣诲姞琛ョ墖鐘舵�佸垪
- let column = {field: 'patchStatusOther', width: 90,title: res.data.title}
+ let column = {field: 'patchStatusOther', width: 90,title: t('reportingWorks.patchCondition')}
gridOptions.columns.push(column)
const s01Values = [];
@@ -355,8 +355,12 @@
return new Error(t('reportingWorks.enterIntegerGreaterThanEqualTo'))
}else if((row.completedQuantity*1+brokenNum*1)>row.quantity*1){
return new Error((`${row.completedQuantity}+${brokenNum}>${row.quantity}`))
+ }else if(row.quantity_card<row.completedQuantity){
+ return new Error(t('reportingWorks.pleaseNumber10'))
}
- if(titleUploadData.value.reportingWorkId!=null && row.completedQuantity<row.minQuantity){
+ const completedNum =
+ (row.completedQuantity === undefined || row.completedQuantity===null || row.completedQuantity==='') ? 0 : row.completedQuantity
+ if(titleUploadData.value.reportingWorkId!=null && completedNum>row.minQuantity){
return new Error(`${t('reportingWorks.pleaseGreaterThanOrEqual1')}
${row.minQuantity}
${t('reportingWorks.pleaseGreaterThanOrEqual2')}`)
@@ -793,13 +797,12 @@
//绗竴娆″姞杞芥暟鎹�
let groupChangeProcess = ref(false)//鐢ㄤ簬鏈彮缁勬樉绀洪棶棰�
-request.post(`/reportingWork/selectProcess`).then((res) => {
+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
- console.log(user.user.address)
groupChangeProcess.value = true
if (user.user.address==='鎶�鏈儴澶氭洸' || user.user.address==='澶硅兌'){
groupChangeProcess.value = false
@@ -1095,7 +1098,7 @@
//璁惧涓嬫媺妗�
titleSelectJson.value.deviceType = res.data.device
//鐝粍涓嬫媺妗�
- titleSelectJson.value.teamsType = res.data.teams
+ //titleSelectJson.value.teamsType = res.data.teams
//褰撳墠娴佺▼鍗″伐搴�
titleSelectJson.value.thisProcessType = res.data.thisProcess
//鍘嗗彶鐝粍
@@ -1300,7 +1303,7 @@
return row?.rowClass
}
-const editConfig = reactive({
+const editConfigDisable = reactive({
trigger: 'click',
mode: 'cell',
beforeEditMethod ({ row }) {
@@ -1311,13 +1314,6 @@
}
})
-const editDisabledEvent = ({ row, column }) => {
- VxeUI.modal.message({
- content: '绂佹缂栬緫',
- status: 'error'
- })
- console.log('绂佹缂栬緫', column.field, row)
-}
</script>
<template>
@@ -1494,8 +1490,7 @@
v-on="gridEvents"
@edit-closed="editClosedEvent"
:cell-class-name="cellClassName"
- :edit-config="editConfig"
- @edit-disabled="editDisabledEvent"
+ :edit-config="editConfigDisable"
>
@@ -1503,7 +1498,9 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input v-model="option.data" type="type" @input="changeFilterEvent($event, option, $panel)"/>
+ <input v-model="option.data" type="type"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
--
Gitblit v1.8.0