diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js
index 4f12c87dc..418e95c2a 100644
--- a/fe/PC/src/utils/detailsTableColumns/index.js
+++ b/fe/PC/src/utils/detailsTableColumns/index.js
@@ -3405,4 +3405,45 @@ export const Kitting = [
{ label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
{ label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
{ label: _Public.remark, prop: "remark" },
+]
+
+
+// 空器具呼叫任务
+export const callEmptyUtensilJob = [
+ { label: "物品代码", prop: "itemCode", fixed: "left" },
+ { label: "物品名称", prop: "itemName" },
+ { label: "物品描述1", prop: "itemDesc1" },
+ { label: "物品描述2", prop: "itemDesc2" },
+ { label: "包装数量", prop: "stdPackQty" },
+ { label: "单位", prop: "uom" },
+ { label: "来源库位", prop: 'fromLocationCode' },
+ { label: "目标库位", prop: 'toLocationCode' },
+ { label: "推荐数量", prop: "recommendQty" },
+ { label: "实际数量", prop: 'handledQty' },
+ { label: "单据号", prop: 'number' },
+ { label: "推荐生产时间", prop: "recommendProduceDate", type: "dateTime" },
+ { label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" },
+ { label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" },
+ { label: "实际到货时间", prop: "handledArriveDate", type: "dateTime" },
+ { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" },
+ { label: "实际过期时间", prop: "handledExpireDate", type: "dateTime" },
+ { label: "推荐箱码", prop: "recommendPackingCode" },
+ { label: "实际箱码", prop: "handledPackingCode" },
+ { label: "推荐批次", prop: "recommendLot" },
+ { label: "实际批次", prop: 'handledLot' },
+ { label: "推荐供应商批次", prop: 'recommendSupplierBatch' },
+ { label: "实际供应商批次", prop: 'handledSupplierBatch' },
+ { label: "推荐库位", prop: 'recommendFromLocationCode' },
+ { label: "实际库位", prop: 'handledFromLocationCode' },
+ { label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' },
+ { label: "实际ERP库位", prop: 'handledFromLocationErpCode' },
+ { label: "推荐分组", prop: 'recommendFromLocationGroup' },
+ { label: "实际分组", prop: 'handledFromLocationGroup' },
+ { label: "推荐区域", prop: 'recommendFromLocationArea' },
+ { label: "实际区域", prop: 'handledFromLocationArea' },
+ { label: "推荐仓库", prop: 'recommendFromWarehouseCode' },
+ { label: "实际仓库", prop: 'handledFromWarehouseCode' },
+ { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+ { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+ { label: "备注", prop: 'remark' },
]
\ No newline at end of file
diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index 7f794d62e..c1b433cca 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -2647,7 +2647,7 @@ export const InventoryBalance = [
{ label: "物品名称", prop: 'itemName' },
{ label: "物品描述1", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: "配置", prop: "item_configurationFromFE",showProp:true },
{ label: "库存数量", prop: "qty",isNumber:true },
{ label: "计量单位", prop: "uom" },
{ label: "批次", prop: "lot" },
@@ -2689,7 +2689,7 @@ export const InventoryBalanceActive = [
{ label: "物品名称", prop: 'itemName' },
{ label: "物品描述1", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: "配置", prop: "item_configurationFromFE",showProp:true },
{ label: "库存数量", prop: "qty",isNumber:true },
{ label: "计量单位", prop: "uom" },
{ label: "批次", prop: "lot" },
@@ -2732,7 +2732,7 @@ export const InventoryTransaction = [
{ label: "物品名称", prop: "itemName" },
{ label: "物品描述1", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: "配置", prop: "item_configurationFromFE",showProp:true },
{ label: "事务分类", prop: "transType",type: "filter", filters: "TransTypeBase" },
{ label: "子事务类型", prop: "transSubType", type: "filter", filters: "transSubType" },
{ label: "出库/入库", prop: "transInOut",type: "filter", filters: "transInOutStatus" },
@@ -2906,9 +2906,9 @@ export const safetyStockWarning = [
fixed: "left",
type: "name"
},
- { label: "物品描述1", prop: "item_desc1FromFE" },
- { label: "物品描述2", prop: "item_desc2FromFE" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: "物品描述1", prop: "item_desc1FromFE",showProp:true },
+ { label: "物品描述2", prop: "item_desc2FromFE",showProp:true },
+ { label: "配置", prop: "item_configurationFromFE",showProp:true },
{ label: "最小库存", prop: 'minStock' },
{ label: "最大库存", prop: 'maxStock' },
{ label: "安全库存", prop: 'safetyStock' },
@@ -4062,6 +4062,34 @@ export const Kitting = [
{ label: _Public.remark, prop: "remark" },
]
+// 空器具呼叫任务
+export const callEmptyUtensilJob = [
+ {
+ label: "任务编号",
+ prop: "number",
+ fixed: "left",
+ type: "name",
+ width: orderWidth
+ },
+ { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
+ { label: "器具呼叫号码", prop: 'containerRequestNumber' },
+ { label: "器具类型", prop: 'containerType' },
+ { label: "器具规格", prop: 'specificationsType' },
+ { label: "呼叫库位代码", prop: 'requestLocationCode' },
+ { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
+ { label: "任务描述", prop: 'jobDescription' },
+ { label: "备注", prop: 'remark' },
+ { label: "操作员", prop: 'worker' },
+ { label: "上游任务编号", prop: 'upStreamJobNumber' },
+ { label: "创建时间", prop: "creationTime",type: "dateTime" },
+ { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
+ { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
+ { label: "承接者用户名", prop: 'acceptUserName' },
+ { label: "完成时间", prop: 'completeTime', type: "dateTime" },
+ { label: "完成者用户名", prop: 'completeUserName' },
+ { label: "优先级", prop: 'priority' },
+ { label: "优先级增量", prop: 'priorityIncrement' },
+]
// 字段说明
// showProp: true //隐藏该字段的高级筛选+列表排序
diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js
index ec81aa33a..21c950bd2 100644
--- a/fe/PC/src/utils/tabsDesTions/index.js
+++ b/fe/PC/src/utils/tabsDesTions/index.js
@@ -2935,3 +2935,26 @@ export const Kitting = [
{ label: _Public.remark, prop: "remark" },
]
+// 空器具呼叫任务
+export const callEmptyUtensilJob = [
+ { label: "任务编号", prop: "number" },
+ { label: "状态", prop: "status",type: "tagFilter", filters: "jobStatus" },
+ { label: "器具呼叫号码", prop: 'containerRequestNumber' },
+ { label: "器具类型", prop: 'containerType' },
+ { label: "器具规格", prop: 'specificationsType' },
+ { label: "呼叫库位代码", prop: 'requestLocationCode' },
+ { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
+ { label: "任务描述", prop: 'jobDescription' },
+ { label: "备注", prop: 'remark' },
+ { label: "操作员", prop: 'worker' },
+ { label: "上游任务编号", prop: 'upStreamJobNumber' },
+ { label: "创建时间", prop: "creationTime",type: "dateTime" },
+ { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
+ { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
+ { label: "承接者用户名", prop: 'acceptUserName' },
+ { label: "完成时间", prop: 'completeTime', type: "dateTime" },
+ { label: "完成者用户名", prop: 'completeUserName' },
+ { label: "优先级", prop: 'priority' },
+ { label: "优先级增量", prop: 'priorityIncrement' },
+]
+
diff --git a/fe/PC/src/views/finishedProductManage/emptyUtensil/callEmptyUtensilJob.vue b/fe/PC/src/views/finishedProductManage/emptyUtensil/callEmptyUtensilJob.vue
new file mode 100644
index 000000000..3c7f38ee7
--- /dev/null
+++ b/fe/PC/src/views/finishedProductManage/emptyUtensil/callEmptyUtensilJob.vue
@@ -0,0 +1,111 @@
+
+
+
+
+
+
(displayDialog.detailsDialog = val)"
+ @drawerbutton="drawerbutton"
+ @handleCommand="drawerHandle"
+ @close-value="closeValue"
+ :tableColumns="detailsTableColumns"
+ :totalCount="totalCountDetails"
+ :MaxResultCount="MaxResultCountDetails"
+ @alterResultCountDetails="alterResultCountDetails"
+ @alertoldSkipCountDetails="alertoldSkipCountDetails"
+ >
+
+
+
+
+
+
+
\ No newline at end of file