From 59fad861422a7e85f84781793afa34bdf7ed3575 Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Fri, 13 Jun 2025 16:23:43 +0800 Subject: [PATCH 1/5] =?UTF-8?q?YT-2742:=E5=B7=B2=E5=8F=91=E6=9C=AA?= =?UTF-8?q?=E7=BB=93=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliverRequestMain.data.ts | 24 ++++++++++++++++- .../unfinishedShipmentMain.data.ts | 26 +++++++++---------- 2 files changed, 36 insertions(+), 14 deletions(-) diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index 25a5fd066..13e8f5f40 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -839,7 +839,29 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ // } // } // }, - +{ + label: '客户订单号', + field: 'customerOrderNumber', + sort: 'custom', + table: { + width: 180 + }, + isSearch: false, + search: { + component: 'Input', + }, + isTable: true, + isTableForm:false, + hiddenInMain:true, + isForm: false, + isDetail:false, + form: { + component: 'Input', + componentProps: { + + } + } + }, { label: '品番', field: 'itemCode', diff --git a/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts index 2850d2e52..01055f86b 100644 --- a/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts +++ b/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts @@ -233,19 +233,19 @@ export const UnfinishedShipmentDetail = useCrudSchemas(reactive([ value: 0 } }, - // { - // label: '已结数量', - // field: 'finishdQuantity', - // sort: 'custom', - // table: { - // width: 150, - // }, - // isTableForm:false, - // form: { - // component: 'InputNumber', - // value: 0 - // } - // }, + { + label: '已结数量', + field: 'finishdQuantity', + sort: 'custom', + table: { + width: 150, + }, + isTableForm:false, + form: { + component: 'InputNumber', + value: 0 + } + }, { label: '销售单价', field: 'unitPrice', From 6997c0daaf1f196865c805019cf558d170d9ed50 Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Mon, 16 Jun 2025 16:47:50 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=BF=BB=E5=8C=85=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=AB=98=E7=BA=A7=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventoryManage/balance/balance.data.ts | 135 ++++++++++++++++++ .../packageoverRequestMain.data.ts | 6 +- 2 files changed, 138 insertions(+), 3 deletions(-) diff --git a/src/views/wms/inventoryManage/balance/balance.data.ts b/src/views/wms/inventoryManage/balance/balance.data.ts index 5e2ee2708..f477f3390 100644 --- a/src/views/wms/inventoryManage/balance/balance.data.ts +++ b/src/views/wms/inventoryManage/balance/balance.data.ts @@ -669,6 +669,141 @@ export const BalancePopWindow = useCrudSchemas( ]) ) +/** + * @returns {Array} 库存余额弹窗(翻包申请用) + */ +export const BalancePopWindowPackageOver = useCrudSchemas( + reactive([ + { + label: '品番', + field: 'itemCode', + sort: 'custom', + table: { + width: 150 + }, + isSearch: true + }, + { + label: '品名', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + isSearch: true + }, + { + label: '背番', + field: 'backNumber', + sort: 'custom', + table: { + width: 150 + }, + //hiddenSearchHigh: true,// 高级筛选中隐藏 + isSearch: true + }, + { + label: '描述', + field: 'itemDesc2', + sort: 'custom', + table: { + width: 150 + }, + hiddenSearchHigh: true,// 高级筛选中隐藏 + isSearch: true + }, + { + label: '品番类型', + field: 'itemType', + sort: 'custom', + dictType: DICT_TYPE.ITEM_TYPE, + dictClass: 'string', + isSearch: true, + table: { + width: 100 + } + }, + { + label: '库存数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber' + } + }, + { + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + } + }, + { + label: '批次', + field: 'batch', + sort: 'custom', + table: { + width: 150 + }, + isSearch: true + }, + { + label: '库存状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + } + }, + { + label: '库位代码', + field: 'locationCode', + sort: 'custom', + table: { + width: 150 + }, + isSearch: true + }, + { + label: '包装规格', + field: 'packUnit', + sort: 'custom', + table: { + width: 150 + } + }, + { + label: '包装数量', + field: 'packQty', + sort: 'custom', + table: { + width: 150 + } + }, + // TODO: 临时添加 方便操作 + // { + // label: '操作', + // field: 'action', + // isDetail: false, + // isForm: false, + // table: { + // width: 200, + // fixed: 'right' + // } + // } + ]) +) + export const TransactionTab = useCrudSchemas(reactive([ { diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts index ef0161b98..6a8d8cba8 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts @@ -9,7 +9,7 @@ import * as ItempackagingApi from '@/api/wms/itempackage' import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data' import * as BalanceApi from '@/api/wms/balance' -import { BalancePopWindow } from '@/views/wms/inventoryManage/balance/balance.data' +import { BalancePopWindow,BalancePopWindowPackageOver } from '@/views/wms/inventoryManage/balance/balance.data' // 获取自动提交自动通过自动执行，跳过任务直接生成记录的默认值 const queryParams = { @@ -536,7 +536,7 @@ export const PackageoverRequestDetail = useCrudSchemas( searchListPlaceholder: '请选择品番', // 输入框占位文本 searchField: 'itemCode', // 查询弹窗赋值字段 searchTitle: '库存余额信息', // 查询弹窗标题 - searchAllSchemas: BalancePopWindow.allSchemas, // 查询弹窗所需类 + searchAllSchemas: BalancePopWindowPackageOver.allSchemas, // 查询弹窗所需类 searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法 searchCondition: [ { @@ -559,7 +559,7 @@ export const PackageoverRequestDetail = useCrudSchemas( searchListPlaceholder: '请选择品番', // 输入框占位文本 searchField: 'itemCode', // 查询弹窗赋值字段 searchTitle: '库存余额信息', // 查询弹窗标题 - searchAllSchemas: BalancePopWindow.allSchemas, // 查询弹窗所需类 + searchAllSchemas: BalancePopWindowPackageOver.allSchemas, // 查询弹窗所需类 searchPage: BalanceApi.getBalancePage, // 查询弹窗所需分页方法 searchCondition: [ { From 6e8e566f94b5ffdf455dba43b45f5c136b86051c Mon Sep 17 00:00:00 2001 From: zhang_li Date: Mon, 16 Jun 2025 17:00:30 +0800 Subject: [PATCH 3/5] =?UTF-8?q?YT-2754=E3=80=8A=E7=BF=BB=E5=8C=85=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E3=80=8B=E7=9A=84=E3=80=90=E6=89=93=E5=8D=B0=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E3=80=91=E6=8C=89=E9=92=AE=EF=BC=8C=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E7=82=B9=E5=87=BB=E8=BF=87=E6=8C=89=E9=92=AE?= =?UTF-8?q?=EF=BC=8C=E3=80=90=E6=89=93=E5=8D=B0=E6=A0=87=E7=AD=BE=E3=80=91?= =?UTF-8?q?=E7=9A=84=E9=A2=9C=E8=89=B2=E5=8F=98=E4=B8=BA=E9=BB=84=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../packageoverMain/packageoverRecordMain/index.vue | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue index 4e45e85c0..3ae08570a 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue @@ -130,12 +130,21 @@ const butttondata = (row,$index) => { if(findIndex>-1&&findIndex<$index){ return [] } - return [defaultButtons.mainListPointBtn(null)] // 标签打印 + return [defaultButtons.mainListPointBtn({ + label: t(`ts.打印标签`).replace('ts.', ''), + name: 'point', + hide: false, + type: row.isClick?'warning':'primary', + color: '', + link: true, // 文本展现按钮 + hasPermi: '' + })] // 标签打印 } // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { if (val == 'point') { // 标签打印 + row.isClick = true handlePoint(row) } } From 4af7af1ec8d224499a44c7d45b9840a19737c0f3 Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Mon, 16 Jun 2025 17:15:57 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=BF=BB=E5=8C=85=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E8=83=8C=E7=95=AA=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../packageoverRequestMain.data.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts index 6a8d8cba8..e089a7d0f 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts @@ -594,7 +594,15 @@ export const PackageoverRequestDetail = useCrudSchemas( table: { width: 150 }, - isTableForm: false, + tableForm: { + disabled: true + }, + form: { + componentProps: { + disabled: true + } + }, + isTableForm: true, isSearch: true, isForm: false }, From f8742873695e2d9355685205fe82258a46d7b011 Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Tue, 17 Jun 2025 08:24:58 +0800 Subject: [PATCH 5/5] =?UTF-8?q?YT-2687:=E5=A2=9E=E5=8A=A0=E3=80=8A?= =?UTF-8?q?=E8=A1=A5=E6=96=99=E4=BB=BB=E5=8A=A1=E3=80=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repleinshJobMain/repleinshJobMain.data.ts | 1 + .../repleinshRecordMain.data.ts | 20 ++++++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts index 7dc9f71fc..edf65acf1 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts +++ b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts @@ -23,6 +23,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isSearch:true, sortTableDefault: 1, }, // { diff --git a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts index b342d661c..852be8c4a 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts +++ b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts @@ -32,20 +32,22 @@ export const RepleinshRecordMain = useCrudSchemas(reactive([ label: '申请单号', field: 'requestNumber', sort: 'custom', + isSearch:true, table: { width: 180 }, sortTableDefault:1, }, - // { - // label: '任务单号', - // field: 'jobNumber', - // sort: 'custom', - // table: { - // width: 180 - // }, - // sortTableDefault: 2, - // }, + { + label: '任务单号', + field: 'jobNumber', + sort: 'custom', + table: { + width: 180 + }, + isSearch:true, + sortTableDefault: 2, + }, // { // label: '供应商代码', // field: 'supplierCode',