From 90b09581193109d53bf5d82453211a83f59db795 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 25 Oct 2024 08:30:40 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreturn/customerreturnRequestMain/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index bd68d9462..c980f1d34 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -232,8 +232,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => if (type == 'tableForm') { if(formField=='itemCode'){ val.forEach(item=>{ - if(tableData.value.find(item1=>item1['itemCode'] == item['code'])){ - message.warning(`物料${item['code']}已经存在`) + if(tableData.value.find(item1=>item1['itemCode'] == item['itemCode']&&item1['batch'] == item['batch'])){ + message.warning(`物料${item['itemCode']}批次${item['batch']}已经存在`) return } const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) From 5e34912486ada6c57dc67c06b6c4aec7f11608ea Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 25 Oct 2024 08:46:51 +0800 Subject: [PATCH 2/7] =?UTF-8?q?HL-6322=E7=BA=BF=E8=BE=B9=E5=8E=9F=E6=96=99?= =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E4=B8=AD=E7=9A=84=E9=A1=B9=E7=9B=AE=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=98=AF=E5=90=A6=E4=B8=BA=E5=A1=AB=E5=86=99=E9=A1=B9?= =?UTF-8?q?=EF=BC=8C=E8=A6=81=E6=B1=82=E6=A0=B9=E6=8D=AE=E9=A2=86=E7=94=A8?= =?UTF-8?q?=E5=8E=9F=E5=9B=A0=E6=89=80=E9=80=89=E4=BB=A3=E7=A0=81=E6=8E=A7?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionscrapRequestMain/index.vue | 21 +++++++++++++++++++ .../productionscrapRequestMain.data.ts | 3 +++ 2 files changed, 24 insertions(+) diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue index 002bbac51..5096dda96 100644 --- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue +++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue @@ -299,6 +299,27 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => } if(formField == 'reasonCodeRequisition'){ setV['reasonCodeRequisition'] = val[0]['code'] + // 项目是否必填 + if(ProductionscrapRequestMainRules['projectCode']){ + ProductionscrapRequestMainRules['projectCode'][0].required = val[0]['isProject']=='TRUE' + } + ProductionscrapRequestMain.allSchemas.formSchema.forEach((item) => { + if (item.field == 'projectCode') { + //项目代码 + if(val[0]['isProject']=='TRUE'){ + //是-可编辑，可选择 + item.componentProps.enterSearch = true + item.componentProps.isSearchList = true + item.componentProps.disabled = false + }else{ + //否-不可编辑，内容为空 + setV['projectCode'] = '' + item.componentProps.enterSearch = false + item.componentProps.isSearchList = false + item.componentProps.disabled = true + } + } + }) } setV[formField] = val[0][searchField] tableData.value = [] // 重置明细数据 diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts index d13a65b4f..959141c48 100644 --- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts +++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts @@ -1453,6 +1453,9 @@ export const ProductionscrapRequestMain = useCrudSchemas( //表单校验 export const ProductionscrapRequestMainRules = reactive({ + projectCode: [ + { required: false, message: '请输入项目代码', trigger: 'blur' } + ], departmentCode: [ { required: true, message: '请输入部门', trigger: 'blur' } ], From d1550f2eb463da73bcc403272047720ae59b249c Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 25 Oct 2024 10:10:24 +0800 Subject: [PATCH 3/7] =?UTF-8?q?HL-6297=E5=AF=B9=E5=BA=94=E7=9A=84=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E4=BB=BB=E5=8A=A1=E5=92=8C=E6=A3=80=E9=AA=8C=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E8=BF=99=E5=9D=97=E4=B9=9F=E8=A6=81=E6=94=B9=E6=88=90?= =?UTF-8?q?=E4=B8=80=E6=A0=B7=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionJob/addForm.vue | 2 +- src/views/qms/inspectionRecord/detail.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue index 7741bcfd9..bd91e6563 100644 --- a/src/views/qms/inspectionJob/addForm.vue +++ b/src/views/qms/inspectionJob/addForm.vue @@ -131,7 +131,7 @@ label="描述" prop="inspectionJobCharacteristicsUpdateReqVO.description" > - diff --git a/src/views/qms/inspectionRecord/detail.vue b/src/views/qms/inspectionRecord/detail.vue index 107b2b1f7..0ee938b98 100644 --- a/src/views/qms/inspectionRecord/detail.vue +++ b/src/views/qms/inspectionRecord/detail.vue @@ -47,7 +47,7 @@ - From f94f72f7b3287a3232488cabc952352f2e1ca65f Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 25 Oct 2024 11:23:49 +0800 Subject: [PATCH 4/7] =?UTF-8?q?HL-6310WMS=20=E5=88=B6=E5=93=81=E4=B8=8A?= =?UTF-8?q?=E6=9E=B6=EF=BC=8C=E6=B2=A1=E6=9C=89=E6=8C=89=E7=85=A7=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E7=B1=BB=E5=9E=8B=E8=BF=9B=E8=A1=8C=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BD=99=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicDataManage/subject/mstr/index.vue | 1 + .../productputawayRequestMain.data.ts | 10 ++++++ .../productputawayAssembleRequestMain.data.ts | 32 +++++++++++++++++-- 3 files changed, 41 insertions(+), 2 deletions(-) diff --git a/src/views/wms/basicDataManage/subject/mstr/index.vue b/src/views/wms/basicDataManage/subject/mstr/index.vue index 616377da4..b49fba76e 100644 --- a/src/views/wms/basicDataManage/subject/mstr/index.vue +++ b/src/views/wms/basicDataManage/subject/mstr/index.vue @@ -68,6 +68,7 @@ import Detail from '@/components/Detail/src/Detail.vue' import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' const { loadStart, loadDone } = usePageLoading() +// 产品类 defineOptions({ name: 'Mstr' }) const message = useMessage() // 消息弹窗 diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts index f315502ab..2e77791d8 100644 --- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts +++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts @@ -475,6 +475,11 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive searchCondition: [{ key: 'businessType', value: businessTypeData.code, + }, + { + key: 'inOrOut', + value: 'out', + isMainValue: false }] }, form: { @@ -489,6 +494,11 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive searchCondition: [{ key: 'businessType', value: businessTypeData.code, + }, + { + key: 'inOrOut', + value: 'out', + isMainValue: false }] } } diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts index 006fc1ecf..3acc8dc13 100644 --- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts +++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts @@ -4,6 +4,7 @@ import * as getRequestsettingApi from '@/api/wms/requestsetting/index' import * as BalanceApi from '@/api/wms/balance' import { Balance } from '@/views/wms/inventoryManage/balance/balance.data' +import * as getBusinessTypeApi from '@/api/wms/businesstype/index' import { TableColumn } from '@/types/table' @@ -18,6 +19,7 @@ const queryParams = { const data = await getRequestsettingApi.getRequestsettingPage(queryParams) const requestsettingData =data?.list[0]||{} + // 获取当前操作人的部门 import { useUserStore } from '@/store/modules/user' const userStore = useUserStore() @@ -26,6 +28,14 @@ const userDept = userStore.userSelfInfo.dept userDept.id = userDept.id.toString() const userDeptArray:any = [userDept] +const businessTypeQueryParams = { + pageSize:10, + pageNo:1, + code:'ProductPutaway' +} +const businessTypeValue = await getBusinessTypeApi.getBusinesstypePage(businessTypeQueryParams) +const businessTypeData =businessTypeValue?.list[0]||{} + /** * @returns {Array} 制品上架申请主表 */ @@ -463,7 +473,16 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive searchField: 'itemCode', // 查询弹窗赋值字段 searchTitle: '库存余额信息', // 查询弹窗标题 searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类 - searchPage: BalanceApi.getBalancePage // 查询弹窗所需分页方法 + searchPage: BalanceApi.getBalancePageByBusinessTypeByItemType, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'businessType', + value: businessTypeData.code, + }, + { + key: 'inOrOut', + value: 'out', + isMainValue: false + }] }, form: { // labelMessage: '信息提示说明！！！', @@ -473,7 +492,16 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive searchField: 'itemCode', // 查询弹窗赋值字段 searchTitle: '库存余额信息', // 查询弹窗标题 searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类 - searchPage: BalanceApi.getBalancePage // 查询弹窗所需分页方法 + searchPage: BalanceApi.getBalancePageByBusinessTypeByItemType, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'businessType', + value: businessTypeData.code, + }, + { + key: 'inOrOut', + value: 'out', + isMainValue: false + }] } } }, From 63e4e6105abdec2caf2c6f23e09cd72e1a6f47cf Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 25 Oct 2024 11:58:45 +0800 Subject: [PATCH 5/7] =?UTF-8?q?HL-6297=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionJob/detail.vue | 2 +- src/views/qms/inspectionRecord/addForm.vue | 2 +- src/views/qms/inspectionScheme/detail.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/qms/inspectionJob/detail.vue b/src/views/qms/inspectionJob/detail.vue index a7d2a80e7..ebc7366a9 100644 --- a/src/views/qms/inspectionJob/detail.vue +++ b/src/views/qms/inspectionJob/detail.vue @@ -47,7 +47,7 @@ - diff --git a/src/views/qms/inspectionRecord/addForm.vue b/src/views/qms/inspectionRecord/addForm.vue index 7b267390b..a4b09f5ec 100644 --- a/src/views/qms/inspectionRecord/addForm.vue +++ b/src/views/qms/inspectionRecord/addForm.vue @@ -130,7 +130,7 @@ label="描述" prop="inspectionJobCharacteristicsUpdateReqVO.description" > - diff --git a/src/views/qms/inspectionScheme/detail.vue b/src/views/qms/inspectionScheme/detail.vue index 15a7af330..e409f9393 100644 --- a/src/views/qms/inspectionScheme/detail.vue +++ b/src/views/qms/inspectionScheme/detail.vue @@ -66,7 +66,7 @@ - + From 9c42f6e34bff0055f67cdde2321e5ea24465b828 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 25 Oct 2024 13:15:42 +0800 Subject: [PATCH 6/7] =?UTF-8?q?HL-6330WMS=20=E7=89=A9=E6=96=99=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E7=94=B3=E8=AF=B7=E6=96=B0=E5=A2=9E=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=98=8E=E7=BB=86=EF=BC=8C=E4=B8=8D=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E8=BE=93=E5=85=A5=E5=88=9B=E5=BB=BA=E4=BA=BA=EF=BC=8C?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=98=8E=E7=BB=86=E4=B8=AD=E7=9A=84=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../relegate/relegateRequest/relegateRequestMain.data.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts index e2ec64bb6..c1ee6008b 100644 --- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts +++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts @@ -613,6 +613,7 @@ export const RelegateRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm: false, isForm: false, isTable: true }, From 191f1309e7393d71289b78fa8f6046ea6404dba0 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 25 Oct 2024 15:20:50 +0800 Subject: [PATCH 7/7] =?UTF-8?q?HL-6313WMS=20=E5=BA=93=E5=AD=98=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=20=E6=96=B0=E5=A2=9E=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E9=80=9A=E8=BF=87=E8=BE=93=E5=85=A5=EF=BC=8C?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E7=9B=B8=E5=90=8C=E7=9A=84=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=EF=BC=8C=E5=BA=94=E8=AF=A5=E5=85=81=E8=AE=B8=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventoryinitRequestMain/inventoryinitRequestMain.data.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts index f1feeb46d..a29cf5e29 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts @@ -603,6 +603,7 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( width: 150 }, tableForm: { + isRepeat:true, enterSearch:true, isInpuFocusShow: true, // 开启查询弹窗 searchListPlaceholder: '请选择库位代码',