From ef1c796826db664a3397160338efd20eb41ec2e4 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Tue, 24 Sep 2024 10:13:40 +0800 Subject: [PATCH 1/6] =?UTF-8?q?HL-59571.=E6=89=B9=E9=87=8F=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=98=8E=E7=BB=86=E4=BC=9A=E5=AF=BC=E8=87=B4=E5=90=8C?= =?UTF-8?q?=E4=B8=80=E7=89=A9=E6=96=99=E9=87=8D=E5=A4=8D=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=EF=BC=8C=E6=9C=9F=E6=9C=9B=E5=90=8C=E4=B8=80=E7=89=A9=E6=96=99?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E9=87=8D=E5=A4=8D=E6=B7=BB=E5=8A=A0=202.?= =?UTF-8?q?=E5=85=88=E6=B7=BB=E5=8A=A0=E6=98=8E=E7=BB=86=EF=BC=8C=E5=90=8E?= =?UTF-8?q?=E5=A1=AB=E5=86=99=E6=88=96=E8=80=85=E6=9B=B4=E6=94=B9=E5=88=B0?= =?UTF-8?q?=E4=BB=93=E5=BA=93=EF=BC=8C=E4=BC=9A=E6=B8=85=E7=A9=BA=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E4=BF=A1=E6=81=AF=EF=BC=8C=E6=9C=9F=E6=9C=9B=E4=B8=8D?= =?UTF-8?q?=E5=BA=94=E8=AF=A5=E6=B8=85=E7=A9=BA=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionreturnRequestMain/index.vue | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue index 79d3b6643..64ad37286 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue @@ -205,15 +205,15 @@ const clearSearchInput = (formField) => { // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { - console.log('searchTableSuccess',formRef.formModel) + console.log('searchTableSuccess',formField, searchField, val, formRef, type, row) nextTick(async () => { if (type == 'tableForm') { // 明细查询页赋值 if(formField == 'itemCode') { - if(tableData.value.find(item1=>item1['itemCode'] == val[0]['itemCode'])){ - message.warning(`物料${val[0]['itemCode']}已经存在`) - return - } + // if(tableData.value.find(item1=>item1['itemCode'] == val[0]['itemCode'])){ + // message.warning(`物料${val[0]['itemCode']}已经存在`) + // return + // } let enableBuy = val[0]['enableBuy'] if(tableData.value.length>0){ enableBuy = tableData.value[0]['enableBuy'] @@ -227,6 +227,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => } val = val.filter(item=>item['enableBuy']==enableBuy) + let messageItemCodes = [] val.forEach(item=>{ const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) newRow['itemCode'] = item['itemCode'] @@ -242,8 +243,17 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => } newRow['packUnit'] = item['packUnit'] newRow['packQty'] = item['packQty'] - tableData.value.push(newRow) + if(tableData.value.find(item1=>item1['itemCode'] == item['itemCode'])){ + messageItemCodes.push(item['itemCode']) + }else{ + tableData.value.push(newRow) + } }) + if(messageItemCodes.length>0){ + message.warning(`物料${messageItemCodes.join(',')}已经存在`) + } + + // HL-4885 聂喜婷：@邱晨 @王宇飞 先把数量的校验拿掉 // 修改 tableform 属性 数量最大值设置为库存余额中数量 @@ -291,8 +301,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => // 来源工位代码 setV['workStationCode'] = val[0]['code'] setV['fromLocationCode'] = val[0]['rawLocationCode'] + tableData.value = [] // 重置明细数据 } - tableData.value = [] // 重置明细数据 formRef.setValues(setV) } }) From c77bc86f15418ef396200465b8f0ea31fa5b6bc8 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Tue, 24 Sep 2024 10:20:11 +0800 Subject: [PATCH 2/6] =?UTF-8?q?HL-5834=E6=96=B0=E5=A2=9E=E6=97=B6=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E6=A0=A1=E9=AA=8C=E9=80=80=E8=B4=A7=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E4=B8=BA0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturnRequestMOrderTypeMain/index.vue | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue index c058e8296..fe72a010c 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue @@ -193,7 +193,7 @@ import { getJmreportBaseUrl } from '@/utils/systemParam' import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' const { loadStart, loadDone } = usePageLoading() -// 采购退货申请 +// M类型采购退货申请 defineOptions({ name: 'PurchasereturnRequestMainNew' }) const message = useMessage() // 消息弹窗 @@ -994,7 +994,12 @@ const submitForm = async (formType, submitData) => { tableData.value.forEach((row, index) => { row['expireDate'] = row['expireTime']?addDay(row['produceDate'],row['expireTime']).valueOf():dayjs('2099-12-31').valueOf() }) - data.subList = tableData.value // 拼接子表数据参数 + // data.subList = tableData.value // 拼接子表数据参数 + data.subList = tableData.value.filter(item=>Number(item['qty'])>0) // 拼接子表数据参数 + if(data.subList.length<1){ + message.warning('至少有一条数据') + return + } formRef.value.formLoading = true try { if (formType === 'create') { From f719aa3ed57651d8fb1f3aad6c34ba78054aaa1a Mon Sep 17 00:00:00 2001 From: tengxiaofei <302828528@qq.com> Date: Tue, 24 Sep 2024 10:29:38 +0800 Subject: [PATCH 3/6] =?UTF-8?q?HL-6107=20Q2=E9=80=9A=E7=9F=A5=E5=8D=95?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=B1=95=E7=A4=BA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionQ2/index.vue | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/src/views/qms/inspectionQ2/index.vue b/src/views/qms/inspectionQ2/index.vue index a246fd85d..acdb4c3f6 100644 --- a/src/views/qms/inspectionQ2/index.vue +++ b/src/views/qms/inspectionQ2/index.vue @@ -700,19 +700,36 @@ const handleSend = async (id: number) => { /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { + if (row && row.claimAddress?.trim()) { row.filePathList = row.claimAddress.split(',') } + if (row && row.claimAddressName?.trim()) { + row.claimAddressNameList = row.claimAddressName.split(','); + } if (row && row.filePathList && row.filePathList.length > 0) { - row.filePathListView = row.filePathList.map((item) => { + row.filePathListView = row.filePathList.map((item, index) => { return { - name: item, + name: row.claimAddressNameList ? row.claimAddressNameList[index] || item : item, url: item } }) } + // if (row && row.claimAddress?.trim()) { + // row.filePathList = row.claimAddress.split(',') + // } + // + // if (row && row.filePathList && row.filePathList.length > 0) { + // row.filePathListView = row.filePathList.map((item) => { + // return { + // name: item, + // url: item + // } + // }) + // } + basicFormRef.value.open(type, row) if (!row || !row.claimAmount) { nextTick(() => { From 7e7a1d639545dc4091313733dc0190e6cc76d1ef Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Tue, 24 Sep 2024 10:33:43 +0800 Subject: [PATCH 4/6] =?UTF-8?q?M=E7=B1=BB=E5=9E=8B=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E9=80=80=E8=B4=A7=E7=94=B3=E8=AF=B7--=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturnRequestMOrderTypeMain.data.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/purchasereturnRequestMOrderTypeMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/purchasereturnRequestMOrderTypeMain.data.ts index fb8af115e..aa8b29ec4 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/purchasereturnRequestMOrderTypeMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/purchasereturnRequestMOrderTypeMain.data.ts @@ -279,14 +279,14 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive Date: Tue, 24 Sep 2024 10:41:19 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=96=E5=87=BA?= =?UTF-8?q?=E5=BA=93-=E6=8A=A5=E5=BA=9F=E5=87=BA=E5=BA=93=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E6=B7=BB=E5=8A=A0=E6=95=B0=E9=87=8F=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scrap/scrapRequestMain/scrapRequestMain.data.ts | 2 +- .../unplannedissueRequestMain/unplannedissueRequestMain.data.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts index 3c7194833..dbb4ae1da 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts @@ -1312,6 +1312,6 @@ export const ScrapRequestDetailRules = reactive({ ], reason: [ { required: true, message: '请输入报废原因', trigger: 'change' }, - { max: 200, message: '不得超过200个字符', trigger: 'blur' } + { max: 24, message: '不得超过24个字符', trigger: 'blur' } ], }) diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts index ecd638f82..1b077e35d 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts @@ -660,7 +660,7 @@ export const UnplannedissueRequestMainRules = reactive({ ], remarkMain: [ { required: true, message: '请输入单据备注', trigger: 'blur' }, - { max: 50, message: '不得超过50个字符', trigger: 'blur' } + { max: 24, message: '不得超过24个字符', trigger: 'blur' } ], usageDescription:[ { required: true, message: '请选择领用描述', trigger: 'blur' } From 4d60c10836d1025ecf2ee40d913b5efb1a48e7df Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Tue, 24 Sep 2024 12:11:59 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E7=9B=98=E7=82=B9=E8=AE=A1=E5=88=92loading?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/BasicForm/src/BasicFormWmsCount.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/BasicForm/src/BasicFormWmsCount.vue b/src/components/BasicForm/src/BasicFormWmsCount.vue index 398f38994..6ae5c8320 100644 --- a/src/components/BasicForm/src/BasicFormWmsCount.vue +++ b/src/components/BasicForm/src/BasicFormWmsCount.vue @@ -789,16 +789,16 @@ const submitForm = async () => { if (!valid) return // 针对主子表 明细校验 if (props.isBusiness) { - formLoading.value = true + // formLoading.value = true if (formType.value == 'create') { const validateForm = await tableFormRef.value.validateForm() if (!validateForm && props.tableFormDataLength) { if (props.tableData.length == 0) { message.warning('请填写明细信息！') - formLoading.value = false + // formLoading.value = false return } - formLoading.value = false + // formLoading.value = false return } // 主子表——提交请求 @@ -807,7 +807,7 @@ const submitForm = async () => { const data1 = unref(formRef1)?.formModel emit('submitForm', formType.value, { ...data, ...data1 }) } finally { - formLoading.value = false + // formLoading.value = false } } else { // 编辑 @@ -816,17 +816,17 @@ const submitForm = async () => { const data1 = unref(formRef1)?.formModel emit('submitForm', formType.value, { ...data }) } finally { - formLoading.value = false + // formLoading.value = false } } } else { // 基础数据单表——提交请求 - formLoading.value = true + // formLoading.value = true try { const data = unref(formRef)?.formModel emit('success', formType.value, data) } finally { - formLoading.value = false + // formLoading.value = false } } }