From af3e11b96d4924beeb3d6e6ce341b67405c5440d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Tue, 26 Mar 2024 14:05:41 +0800 Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deviceInternalAudit.data.ts | 10 ++++ .../countadjustPlan/countadjustPlan.data.ts | 4 ++ src/views/eam/item/itemApplyMain/index.vue | 46 +++++++++---------- 3 files changed, 37 insertions(+), 23 deletions(-) diff --git a/src/views/eam/device/deviceInternalAudit/deviceInternalAudit.data.ts b/src/views/eam/device/deviceInternalAudit/deviceInternalAudit.data.ts index 72e02a2..93aacd2 100644 --- a/src/views/eam/device/deviceInternalAudit/deviceInternalAudit.data.ts +++ b/src/views/eam/device/deviceInternalAudit/deviceInternalAudit.data.ts @@ -5,33 +5,43 @@ import { dateFormatter } from '@/utils/formatTime' export const DeviceInternalAuditRules = reactive({ personer: [ { required: true, message: '请输入人员', trigger: 'blur' }, + ], fitOut: [ { required: true, message: '请输入装配', trigger: 'blur' }, + { max: 200, message: '不得超过200', trigger: 'blur' } ], coating: [ { required: true, message: '请输入涂装', trigger: 'blur' }, + { max: 200, message: '不得超过200', trigger: 'blur' } ], injectionMolding: [ { required: true, message: '请输入注塑', trigger: 'blur' }, + { max: 200, message: '不得超过200', trigger: 'blur' } ], business: [ { required: true, message: '请输入商务', trigger: 'blur' }, + { max: 200, message: '不得超过200', trigger: 'blur' } ], laboratory: [ { required: true, message: '请输入实验室', trigger: 'blur' }, + { max: 200, message: '不得超过200', trigger: 'blur' } ], it: [ { required: true, message: '请输入IT', trigger: 'blur' }, + { max: 200, message: '不得超过200', trigger: 'blur' } ], qualityDepartment: [ { required: true, message: '请输入质量保障部', trigger: 'blur' }, + { max: 200, message: '不得超过200', trigger: 'blur' } ], materialFlow: [ { required: true, message: '请输入物流', trigger: 'blur' }, + { max: 200, message: '不得超过200', trigger: 'blur' } ], moldPre: [ { required: true, message: '请输入模具前期', trigger: 'blur' }, + { max: 200, message: '不得超过200', trigger: 'blur' } ], }) diff --git a/src/views/eam/item/countadjustPlan/countadjustPlan.data.ts b/src/views/eam/item/countadjustPlan/countadjustPlan.data.ts index 195361b..c1e5d3c 100644 --- a/src/views/eam/item/countadjustPlan/countadjustPlan.data.ts +++ b/src/views/eam/item/countadjustPlan/countadjustPlan.data.ts @@ -4,6 +4,10 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' export const CountadjustPlanRules = reactive({ number: [required], name: [required], + classification: [ + { required: true, message: '请选择盘点类型', trigger: 'blur' } + ], + }) export const CountadjustPlan = useCrudSchemas(reactive([ diff --git a/src/views/eam/item/itemApplyMain/index.vue b/src/views/eam/item/itemApplyMain/index.vue index 0800d72..aa43f08 100644 --- a/src/views/eam/item/itemApplyMain/index.vue +++ b/src/views/eam/item/itemApplyMain/index.vue @@ -39,9 +39,7 @@ :apiCreate="ItemApplyDetailApi.createItemApplyDetail" :apiUpdate="ItemApplyDetailApi.updateItemApplyDetail" :apiPage="ItemApplyDetailApi.getItemApplyDetailPage" :apiDelete="ItemApplyDetailApi.deleteItemApplyDetail" @searchTableSuccessDetail="searchTableSuccessDetail" @detailSubmitForm='detailSubmitForm' - :isShowAddBtn="isShowAddBtn" - :detailButtonIsShow="detailButtonIsShow" - /> + :isShowAddBtn="isShowAddBtn" :detailButtonIsShow="detailButtonIsShow" /> 0) { subList.forEach((item) => { - if (item.itemNumber == val[0]['itemNumber']) { + if (item.itemNumber == val[0]['itemNumber'] &&item.isInAccount == val[0]['isInAccount'] + ) { flag = true; } }) @@ -95,13 +94,13 @@ } row[formField] = val[0][searchField] row['itemNumber'] = val[0]['itemNumber'] - row['isRadeIn'] = val[0]['isInAccount'] + row['isInAccount'] = val[0]['isInAccount'] row['currentQty'] = val[0]['qty'] row['available'] = val[0]['available'] } if (formField == 'deviceNumber') { row['deviceNumber'] = val[0]['number'] - } + } } else { const setV = {} setV[formField] = val[0][searchField] @@ -115,20 +114,21 @@ const setV = {} setV[formField] = val[0][searchField] if (formField == 'itemNumber') { - setV['itemNumber'] = val[0]['itemNumber'] - setV['isRadeIn'] = val[0]['isInAccount'] + setV['itemNumber'] = val[0]['itemNumber'] + + setV['isInAccount'] = val[0]['isInAccount'] setV['currentQty'] = val[0]['qty'] setV['available'] = val[0]['available'] } else if (formField == 'deviceNumber') { setV['deviceNumber'] = val[0]['number'] - } + } formRef.setValues(setV) }) - } - const formSelectChange = (field, val, row) => { - if (field == 'type') { - row['deviceNumber'] = "" - } + } + const formSelectChange = (field, val, row) => { + if (field == 'type') { + row['deviceNumber'] = "" + } } // 子表新增的时候选择表格之后需要会显得字段 @@ -171,7 +171,7 @@ } else if (val == 'refresh') { // 刷新 getList() } else if (val == 'filtrate') { // 筛选 - } + } } // 根据状态返回该按钮是否显示 @@ -228,12 +228,12 @@ /** 详情操作 */ const detailRef = ref() const openDetail = (row : any, titleName : any, titleValue : any) => { - if(row.status!='0'){ - isShowAddBtn.value=false - detailButtonIsShow.value=true - }else{ - isShowAddBtn.value=true - detailButtonIsShow.value=false + if (row.status != '0') { + isShowAddBtn.value = false + detailButtonIsShow.value = true + } else { + isShowAddBtn.value = true + detailButtonIsShow.value = false } detailRef.value.openDetail(row, titleName, titleValue, 'basicItemApplyMain') } @@ -348,7 +348,7 @@ formRef.dialogVisible = false await detailRef.value.getList() } - }catch { + } catch { } finally { formRef.formLoading = false } @@ -360,4 +360,4 @@ getList() importTemplateData.templateUrl = await ItemApplyMainApi.importTemplate() }) - +