From 1509f3e92bf848344baab20ae5ade0f5fc225c00 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Sat, 25 May 2024 11:49:15 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=89=A9=E6=96=99=E9=99=8D=E7=BA=A7?= =?UTF-8?q?=E7=94=9F=E6=88=90=E6=96=B0=E5=8C=85=E8=A3=85=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../relegateRecord/relegateRecordMain.data.ts | 8 +++ .../relegate/relegateRequest/index.vue | 24 ++++---- .../relegateRequestMain.data.ts | 59 +++++++++++++++++++ 3 files changed, 79 insertions(+), 12 deletions(-) diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/relegateRecordMain.data.ts b/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/relegateRecordMain.data.ts index 8dd1b54a5..bce38edda 100644 --- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/relegateRecordMain.data.ts +++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/relegateRecordMain.data.ts @@ -257,6 +257,14 @@ export const RelegateRecordDetail = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '包装规格', + field: 'packUnit', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '到包装号', field: 'toPackingNumber', diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue index 5a6e71b0a..a78524fba 100644 --- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue +++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue @@ -141,12 +141,12 @@ RelegateRequestDetail.allSchemas.tableFormColumns.map(item => { key: 'available', value: 'TRUE', isMainValue: false - },{ - message: '请选择从仓库代码！', - key: 'warehouseCode', - value: 'fromWarehouseCode', - isMainValue: true - } + },{ + message: '请选择从仓库代码！', + key: 'warehouseCode', + value: 'fromWarehouseCode', + isMainValue: true + } ] item.form.componentProps.searchCondition = [ { @@ -255,12 +255,12 @@ const butttondata = (row, $index) => { return [] } return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['2','3','4']),hasPermi:'wms:relegate-request-main:close'}), // 关闭 - defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:relegate-request-main:reAdd'}), //重新添加 - defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:relegate-request-main:submit'}), // 提交审批 - defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:relegate-request-main:refused'}), // 驳回 - defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:relegate-request-main:agree'}), // 审批通过 - defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:relegate-request-main:handle'}), // 处理 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['2','3','4']),hasPermi:'wms:relegate-request-main:close'}), // 关闭 + defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:relegate-request-main:reAdd'}), //重新添加 + defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:relegate-request-main:submit'}), // 提交审批 + defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:relegate-request-main:refused'}), // 驳回 + defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:relegate-request-main:agree'}), // 审批通过 + defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:relegate-request-main:handle'}), // 处理 defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:relegate-request-main:update' }), // 编辑 // defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:relegate-request-main:delete' }), // 删除 ] 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 8c6bda653..31dbe345f 100644 --- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts +++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts @@ -13,6 +13,10 @@ import { Balance } from '@/views/wms/inventoryManage/balance/balance.data' import * as LocationApi from '@/api/wms/location' import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data' + +import * as ItempackageApi from '@/api/wms/itempackage' +import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data' + import * as confgiApi from '@/api/infra/config' // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值 const queryParams = { @@ -293,6 +297,7 @@ export const RelegateRequestDetailRules = reactive({ available: [required], departmentCode: [required], concurrencyStamp: [required], + packUnit: [required], }) export const RelegateRequestDetail = useCrudSchemas(reactive([ @@ -531,6 +536,60 @@ export const RelegateRequestDetail = useCrudSchemas(reactive([ width: 120 }, }, + { + label: '到库位代码', + field: 'toLocationCode', + sort: 'custom', + tableForm:{ + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择到库位代码', + searchField: 'code', + searchTitle: '库位信息', + searchAllSchemas: Location.allSchemas, + searchPage: LocationApi.selectBusinessTypeToLocation, + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择到库位代码', + searchField: 'code', + searchTitle: '库位信息', + searchAllSchemas: Location.allSchemas, + searchPage: LocationApi.selectBusinessTypeToLocation, + } + }, + table: { + width: 120 + }, + }, + { + label: '包装规格', + field: 'packUnit', + sort: 'custom', + tableForm:{ + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择包装规格', + searchField: 'packUnit', + searchTitle: '包装规格', + searchAllSchemas: Itempackaging.allSchemas, + searchPage: ItempackageApi.getItempackagingPage, + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择包装规格', + searchField: 'packUnit', + searchTitle: '包装规格', + searchAllSchemas: Itempackaging.allSchemas, + searchPage: ItempackageApi.getItempackagingPage, + } + }, + table: { + width: 120 + }, + }, { label: '到库区类型', field: 'toAreaTypes', From aefe16e606d191d997daac848e2d58ce04de5be7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Sat, 25 May 2024 11:49:46 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts b/src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts index 79863758b..03cf1a684 100644 --- a/src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts +++ b/src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts @@ -4,6 +4,8 @@ import { dateFormatter } from '@/utils/formatTime' // 表单校验 export const MesBarCodeRules = reactive({ available: [required], + lowerLim: [required], + partNumber: [required], }) export const MesBarCode = useCrudSchemas(reactive([ From 8079c4f25af7f5259192b6df7a63763edf7684f5 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Sat, 25 May 2024 11:51:42 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=8E=BB=E9=99=A4debugger?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/SearchTable/src/SearchTable.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/SearchTable/src/SearchTable.vue b/src/components/SearchTable/src/SearchTable.vue index 5e10c4025..9acc52faf 100644 --- a/src/components/SearchTable/src/SearchTable.vue +++ b/src/components/SearchTable/src/SearchTable.vue @@ -93,7 +93,7 @@ const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, s HeadButttondata.value = [ defaultButtons.defaultFilterBtn(null), // 筛选 ] -debugger + searchDialogVisible.value = true formFieldRef.value = formField searchFieldRef.value = searchField From 24a8874df73fb3c6f9911e1d22a708bf76b5eddf Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Sat, 25 May 2024 11:53:21 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=20=E9=80=80=E8=B4=A7=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=95=B0=E9=87=8F=E5=AD=97=E6=AE=B5=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=80=80=E8=B4=A7=E6=95=B0=E9=87=8F=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturnJobMain.data.ts | 26 ++++++++--------- .../purchasereturnRecordMain.data.ts | 28 +++++++++---------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts index 14699c0c1..8cad3f9ab 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts @@ -837,21 +837,21 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive([ sortTableDefault: 18, hiddenInMain:true, }, - { - label: '数量', - field: 'qty', - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'InputNumber', - }, - sortTableDefault: 12, - }, + // { + // label: '数量', + // field: 'qty', + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // component: 'InputNumber', + // }, + // sortTableDefault: 12, + // }, { label: '退货数量', - field: 'returnedQty', + field: 'qty', sort: 'custom', table: { width: 150 diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts index 9b8147bd6..23eae21a2 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts @@ -484,7 +484,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive( }, { label: '退货数量', - field: 'returnedQty', + field: 'qty', sort: 'custom', table: { width: 150 @@ -733,19 +733,19 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive( sortSearchDefault: 7, hiddenInMain: true }, - { - label: '数量', - field: 'qty', - sort: 'custom', - table: { - width: 150 - }, - isTable:true, - sortTableDefault: 1005, - form: { - component: 'InputNumber', - } - }, + // { + // label: '数量', + // field: 'qty', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable:true, + // sortTableDefault: 1005, + // form: { + // component: 'InputNumber', + // } + // }, { label: '计量单位', field: 'uom', From b0fd164fd5c7c8eb3064bc8c366392cd5883ca1b Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Sat, 25 May 2024 14:06:34 +0800 Subject: [PATCH 5/5] =?UTF-8?q?WMS=20=E5=BA=93=E5=86=85=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E7=AE=A1=E7=90=86->=E8=B0=83=E6=8B=A8=E5=87=BA=E5=BA=93->?= =?UTF-8?q?=E8=B0=83=E6=8B=A8=E5=87=BA=E5=BA=93=E7=94=B3=E8=AF=B7=20?= =?UTF-8?q?=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4=E5=BF=85=E5=A1=AB=E9=A1=B9?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../transferissueRequestMain/transferissueRequestMain.data.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts index 5fa888a32..5ad9b5c71 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts @@ -534,6 +534,9 @@ export const TransferissueRequestMainRules = reactive({ remark: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], + dueTime: [ + { required: true, message: '请选择截止时间', trigger: 'change' } + ], }) /**