From 03337032e4bda520868418f60d74244a0cfea1bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Sun, 7 Apr 2024 17:29:15 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90nev=E6=9A=82=E5=AD=98=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/api/wms-api.js | 2 +- fe/PC/src/router/index.js | 97 +++++++-- fe/PC/src/utils/detailsTableColumns/index.js | 194 +++++++++++++++++- fe/PC/src/utils/tableColumns/index.js | 68 +++++- fe/PC/src/utils/tabsDesTions/index.js | 67 ++++++ .../ThirdLocationManage/ThirdLocationJob.vue | 93 +++++++++ .../ThirdLocationManage/ThirdLocationNote.vue | 93 +++++++++ .../ThirdLocationRequest.vue | 93 +++++++++ .../customerReturn/customerReturnNote.vue | 93 +++++++++ .../dismantle/StepsFormTree/index.vue | 2 +- .../dismantle/customerDismantleJob.vue | 86 +++++--- 11 files changed, 834 insertions(+), 54 deletions(-) create mode 100644 fe/PC/src/views/ThirdLocationManage/ThirdLocationJob.vue create mode 100644 fe/PC/src/views/ThirdLocationManage/ThirdLocationNote.vue create mode 100644 fe/PC/src/views/ThirdLocationManage/ThirdLocationRequest.vue create mode 100644 fe/PC/src/views/finishedProductManage/customerReturn/customerReturnNote.vue diff --git a/fe/PC/src/api/wms-api.js b/fe/PC/src/api/wms-api.js index 647a198e3..0a2b660d4 100644 --- a/fe/PC/src/api/wms-api.js +++ b/fe/PC/src/api/wms-api.js @@ -650,7 +650,7 @@ export function getBomByComponentList(code) { // 客户退拆-获取bom（树状） export function getBomByComponentTree(code) { return request({ - url: baseURL + 'basedata/bom/get-bom-tree-by-code/?component=' + code, + url: baseURL + 'basedata/bom/get-bom-tree-by-code/?productCode=' + code, method: 'get' }) } diff --git a/fe/PC/src/router/index.js b/fe/PC/src/router/index.js index 14b7f543f..3e70a3b79 100644 --- a/fe/PC/src/router/index.js +++ b/fe/PC/src/router/index.js @@ -254,22 +254,22 @@ export const constantRoutes = [ } }] }, - { - path: '/', - component: Layout, - redirect: '/gridlayout', - hidden: true, - children: [{ - path: 'FISDeliverJob', - component: () => import('@/views/finishedProductManage/deliver/FISDeliverJob.vue'), - name: 'FISDeliverJob', - meta: { - keepAlive : true, - title: '成品发运任务', - icon: '成品发运任务', - } - }] - }, + // { + // path: '/', + // component: Layout, + // redirect: '/gridlayout', + // hidden: true, + // children: [{ + // path: 'FISDeliverJob', + // component: () => import('@/views/finishedProductManage/deliver/FISDeliverJob.vue'), + // name: 'FISDeliverJob', + // meta: { + // keepAlive : true, + // title: '成品发运任务', + // icon: '成品发运任务', + // } + // }] + // }, { path: '/', component: Layout, @@ -526,8 +526,73 @@ export const constantRoutes = [ } }] }, + { + path: '/', + component: Layout, + redirect: '/gridlayout', + hidden: true, + children: [{ + path: 'ThirdLocationRequest', + component: () => import('@/views/ThirdLocationManage/ThirdLocationRequest.vue'), + name: 'ThirdLocationRequest', + meta: { + keepAlive : true, + title: '三方库申请', + icon: '成品发运任务', + } + }] + }, + { + path: '/', + component: Layout, + redirect: '/gridlayout', + hidden: true, + children: [{ + path: 'ThirdLocationJob', + component: () => import('@/views/ThirdLocationManage/ThirdLocationJob.vue'), + name: 'ThirdLocationJob', + meta: { + keepAlive : true, + title: '三方库任务', + icon: '成品发运任务', + } + }] + }, + { + path: '/', + component: Layout, + redirect: '/gridlayout', + hidden: true, + children: [{ + path: 'ThirdLocationNote', + component: () => import('@/views/ThirdLocationManage/ThirdLocationNote.vue'), + name: 'ThirdLocationNote', + meta: { + keepAlive : true, + title: '三方库记录', + icon: '成品发运任务', + } + }] + }, + { + path: '/', + component: Layout, + redirect: '/gridlayout', + hidden: true, + children: [{ + path: 'customerReturnNote', + component: () => import('@/views/finishedProductManage/customerReturn/customerReturnNote.vue'), + name: 'customerReturnNote', + meta: { + keepAlive : true, + title: '客户退货', + icon: '成品发运任务', + } + }] + }, ] + /** * asyncRoutes * the routes that need to be dynamically loaded based on user roles diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js index e6e186a30..3a6727728 100644 --- a/fe/PC/src/utils/detailsTableColumns/index.js +++ b/fe/PC/src/utils/detailsTableColumns/index.js @@ -3758,7 +3758,7 @@ export const IssueNoteZS = [ { label: "目标ERP库位", prop: 'toLocationErpCode' }, { label: "在途库位", prop: 'onTheWayLocationCode' }, // ----------------------------------------------------------------------- - { label: "生效日期", prop: "arriveDate", type: "dateTime" }, + { label: "到货日期", prop: "arriveDate", type: "dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "任务编号", prop: 'number',width: orderWidth }, @@ -3929,7 +3929,7 @@ export const IssueNotePT = [ { label: "目标ERP库位", prop: 'toLocationErpCode' }, { label: "在途库位", prop: 'onTheWayLocationCode' }, // ----------------------------------------------------------------------- - { label: "生效日期", prop: "arriveDate", type: "dateTime" }, + { label: "到货日期", prop: "arriveDate", type: "dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "任务编号", prop: 'number',width: orderWidth }, @@ -4100,7 +4100,7 @@ export const IssueNoteZP = [ { label: "目标ERP库位", prop: 'toLocationErpCode' }, { label: "在途库位", prop: 'onTheWayLocationCode' }, // ----------------------------------------------------------------------- - { label: "生效日期", prop: "arriveDate", type: "dateTime" }, + { label: "到货日期", prop: "arriveDate", type: "dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "任务编号", prop: 'number',width: orderWidth }, @@ -4271,7 +4271,7 @@ export const LibraryShiftNote = [ { label: "目标ERP库位", prop: 'toLocationErpCode' }, { label: "在途库位", prop: 'onTheWayLocationCode' }, // ----------------------------------------------------------------------- - { label: "生效日期", prop: "arriveDate", type: "dateTime" }, + { label: "到货日期", prop: "arriveDate", type: "dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "任务编号", prop: 'number',width: orderWidth }, @@ -4324,4 +4324,190 @@ export const LibraryShiftNote = [ // { label: "ID", prop: 'id' }, // { label: "主表ID", prop: "masterID" }, // ************** 确定隐藏 ************************ +] + +// 三方库申请 +export const ThirdLocationRequest = [ + { label: "物品代码", prop: "itemCode", fixed: "left", }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述1", prop: "itemDesc1" }, + { label: "物品描述2", prop: "itemDesc2" }, + { label: "计量单位", prop: "uom" }, + { label: "数量", prop: "qty" }, + { label: "已发数量", prop: "issuedQty"}, + { label: "已收数量", prop: "receivedQty"}, + { label: "已发未收数量", prop: "toBeIssuedQty"}, + { label: "请求未收数量", prop: "notFinishQty"}, + { label: "标包数量", prop: "stdPackQty"}, + { label: _Public.remark, prop: "remark" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, +] +// 三方库任务 +export const ThirdLocationJob = [ + { label: "物品代码", prop: "itemCode", fixed: "left", }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述1", prop: "itemDesc1" }, + { label: "物品描述2", prop: "itemDesc2" }, + { label: "标包数量", prop: "stdPackQty"}, + { label: "单位", prop: "uom" }, + { label: "库存状态", type: "filter", filters: "inventoryStage", prop: "status" }, + { label: "推荐箱码", prop: "recommendPackingCode" }, + { label: "实际箱码", prop: "handledPackingCode" }, + { label: "推荐数量", prop: "recommendQty" }, + { label: "实际数量", prop: 'handledQty' }, + { label: "目标ERP库位", prop: 'toLocationErpCode' }, + { label: "请求库位", prop: 'requestLocationCode' }, + { label: "在途库位", prop: 'onTheWayLocationCode' }, + { label: "目标库位", prop: "toLocationCode" }, + { label: "目标库区", prop: 'toLocationArea' }, + { label: "目标库位组", prop: 'toLocationGroup' }, + { label: "目标仓库", prop: 'toWarehouseCode' }, + { label: "推荐库位", prop: 'recommendFromLocationCode' }, + { label: "实际库位", prop: 'handledFromLocationCode' }, + { label: "推荐区域", prop: 'recommendFromLocationArea' }, + { label: "实际区域", prop: 'handledFromLocationArea' }, + { label: "推荐分组", prop: 'recommendFromLocationGroup' }, + { label: "实际分组", prop: 'handledFromLocationGroup' }, + { label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' }, + { label: "实际ERP库位", prop: 'handledFromLocationErpCode' }, + { label: "推荐仓库", prop: 'recommendFromWarehouseCode' }, + { label: "实际仓库", prop: 'handledFromWarehouseCode' }, + { label: "推荐批次", prop: 'recommendLot' }, + { label: "实际批次", prop: "handledLot" }, + { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, + { label: "实际供应商批次", prop: 'handledSupplierBatch' }, + { label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" }, + { label: "实际到货时间", prop: 'handledArriveDate', type: "dateTime" }, + { label: "推荐生产时间", prop: 'recommendProduceDate', type: "dateTime" }, + { label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" }, + { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" }, + { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" }, + { label: "过期时间", prop: 'expiredTime',type: "dateTime" }, + { label: "计划开始时间", prop: 'planBeginTime',type: "dateTime" }, + { label: "生产线", prop: 'prodLine' }, + { label: "工作中心", prop: 'workStation' }, + { label: "工序", prop: 'operation' }, + { label: "取整后数量", prop: 'roundedQty' }, + { label: "每次配送数量", prop: 'deliveryQty' }, + { label: _Names.distributionType, prop: "distributionType", type: "filter", filters: "distributionType" }, + { label: _Names.truncType, prop: "truncType", type: "filter", filters: "truncType" }, + { label: _Names.plannedSplitRule, prop: "plannedSplitRule", type: "filter", filters: "plannedSplitRule" }, + { label: "备注", prop: 'remark' }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, +] +// 三方库记录 +export const ThirdLocationNote = [ + { label: "物品代码", prop: "itemCode", fixed: "left", }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述1", prop: "itemDesc1" }, + { label: "物品描述2", prop: "itemDesc2" }, + { label: "单位", prop: "uom" }, + { label: "数量", prop: "qty" }, + { label: "标包数量", prop: 'stdPackQty' }, + { label: "供应商批次", prop: 'supplierBatch' }, + { label: "来源库位", prop: "fromLocationCode" }, + { label: "目标库位", prop: 'toLocationCode' }, + { label: "在途库位", prop: "onTheWayLocationCode" }, + { label: "来源库区", prop: 'fromLocationArea' }, + { label: "目标库区", prop: 'toLocationArea' }, + { label: "来源库位组", prop: 'fromLocationGroup' }, + { label: "目标库位组", prop: 'toLocationGroup' }, + { label: "来源ERP库位", prop: 'fromLocationErpCode' }, + { label: "目标ERP库位", prop: 'toLocationErpCode' }, + { label: "来源批次", prop: 'fromLot' }, + { label: "目标批次", prop: 'toLot' }, + { label: "来源箱码", prop: 'fromPackingCode' }, + { label: "目标箱码", prop: 'toPackingCode' }, + { label: "来源仓库", prop: 'fromWarehouseCode' }, + { label: "目标仓库", prop: 'toWarehouseCode' }, + { label: "推荐数量", prop: 'recommendQty' }, + { label: "实际数量", prop: "handledQty" }, + { label: "推荐箱码", prop: "recommendPackingCode" }, + { label: "实际箱码", prop: "handledPackingCode" }, + { label: "推荐库位", prop: 'recommendFromLocationCode' }, + { label: "实际库位", prop: 'handledFromLocationCode' }, + { label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' }, + { label: "实际ERP库位", prop: 'handledFromLocationErpCode' }, + { label: "推荐区域", prop: 'recommendFromLocationArea' }, + { label: "实际区域", prop: 'handledFromLocationArea' }, + { label: "推荐批次", prop: "recommendLot" }, + { label: "实际批次", prop: "handledLot" }, + { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, + { label: "实际供应商批次", prop: 'handledSupplierBatch' }, + { label: "推荐分组", prop: 'recommendFromLocationGroup' }, + { label: "实际分组", prop: 'handledFromLocationGroup' }, + { 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: 'recommendFromWarehouseCode' }, + { label: "实际仓库", prop: 'handledFromWarehouseCode' }, + { label: "备注", prop: 'remark' }, + { label: "生产线", prop: 'prodLine' }, + { label: "工作中心", prop: 'workStation' }, + { label: "发料时间", prop: 'issueTime', type: "dateTime" }, + { label: "到货日期", prop: "arriveDate", type: "dateTime" }, + { label: "过期时间", prop: 'expiredTime' }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, +] + +// 客户退货记录 +export const customerReturnNote = [ + { label: "物品代码", prop: "itemCode", fixed: "left", }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述1", prop: "itemDesc1" }, + { label: "物品描述2", prop: "itemDesc2" }, + { label: "单位", prop: "uom" }, + { label: "数量", prop: "qty" }, + { label: "标包数量", prop: 'stdPackQty' }, + { label: "供应商批次", prop: 'supplierBatch' }, + { label: "来源库位", prop: "fromLocationCode" }, + { label: "目标库位", prop: 'toLocationCode' }, + { label: "来源库区", prop: 'fromLocationArea' }, + { label: "目标库区", prop: 'toLocationArea' }, + { label: "来源库位组", prop: 'fromLocationGroup' }, + { label: "目标库位组", prop: 'toLocationGroup' }, + { label: "来源ERP库位", prop: 'fromLocationErpCode' }, + { label: "目标ERP库位", prop: 'toLocationErpCode' }, + { label: "来源批次", prop: 'fromLot' }, + { label: "目标批次", prop: 'toLot' }, + { label: "来源箱码", prop: 'fromPackingCode' }, + { label: "目标箱码", prop: 'toPackingCode' }, + { label: "来源仓库", prop: 'fromWarehouseCode' }, + { label: "目标仓库", prop: 'toWarehouseCode' }, + { label: "推荐数量", prop: 'recommendQty' }, + { label: "实际数量", prop: "handledQty" }, + { label: "推荐箱码", prop: "recommendPackingCode" }, + { label: "实际箱码", prop: "handledPackingCode" }, + { label: "推荐库位", prop: 'recommendToLocationCode' }, + { label: "实际库位", prop: 'handledToLocationCode' }, + { label: "推荐库区", prop: 'recommendToLocationArea' }, + { label: "实际库区", prop: 'handledToLocationArea' }, + { label: "推荐ERP库位", prop: 'recommendToLocationErpCode' }, + { label: "实际ERP库位", prop: 'handledToLocationErpCode' }, + { label: "推荐批次", prop: "recommendLot" }, + { label: "实际批次", prop: "handledLot" }, + { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, + { label: "实际供应商批次", prop: 'handledSupplierBatch' }, + { label: "推荐分组", prop: 'recommendToLocationGroup' }, + { label: "实际分组", prop: 'handledToLocationGroup' }, + { 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: 'recommendToWarehouseCode' }, + { label: "实际仓库", prop: 'handledToWarehouseCode' }, + { label: "备注", prop: 'remark' }, + { label: "到货日期", prop: "arriveDate", type: "dateTime" }, + { label: "生产时间", prop: 'produceDate', type: "dateTime" }, + { label: "过期时间", prop: 'expiredTime' }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] \ 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 3baf36f16..fe246d036 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -1801,7 +1801,7 @@ export const automaticCallNote = [ { label: "叫料请求类型", prop: 'requestType' }, { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" }, - { label: "确认时间", prop: 'confirmTime' }, + { label: "确认时间", prop: 'confirmTime',type: "dateTime" }, // ************** 确认隐藏 ************************ // { label: "事务ID", prop: "tenantId" }, // { label: "上次修改者ID", prop: "lastModifierId" }, @@ -4622,6 +4622,72 @@ export const LibraryShiftNote = [ // ************** 确认隐藏 ************************ ] +// 三方库申请 +export const ThirdLocationRequest = [ + { label: "申请单号", prop: "number", fixed: "left", type: "name" }, + { label: "状态", prop: "requestStatus",type: "tagFilter", filters: "requestStatus" }, + { label: _Public.remark, prop: "remark" }, + { label: "操作员", prop: 'worker' }, + { label: "生产线", prop: 'prodLine' }, + { label: "目标库位代码", prop: "toLocationCode" }, + { label: "目标ERP库位", prop: "toLocationErpCode" }, + { label: "来源库位代码集", prop: 'fromLocationCodeJsonList' }, + { label: "生效日期", prop: 'activeDate', type: "dateTime" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, +] +// 三方库任务 +export const ThirdLocationJob = [ + { label: "任务单号", prop: "number", fixed: "left", type: "name" }, + { label: "申请单号", prop: 'requestNumber' }, + { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" }, + { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" }, + { label: "承接者用户名", prop: 'acceptUserName' }, + { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, + { label: "完成者用户名", prop: 'completeUserName' }, + { label: "完成时间", prop: 'completeTime', type: "dateTime" }, + { label: "操作员", prop: "worker" }, + { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, + { label: "备注", prop: 'remark' }, + { label: "任务描述", prop: 'jobDescription' }, + { label: "工作组", prop: 'workGroupCode' }, + { label: "优先级", prop: 'priority' }, + { label: "优先级增量", prop: 'priorityIncrement' }, + { label: "叫料请求类型", prop: 'requestType' }, + { label: "上游任务编号", prop: 'upStreamJobNumber' }, + { label: "生产线", prop: 'prodLine' }, + { label: "车间", prop: 'workshop' }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, +] +// 三方库记录 +export const ThirdLocationNote = [ + { label: "记录单号", prop: "number", fixed: "left", type: "name" }, + { label: "申请单号", prop: 'requestNumber',width: orderWidth }, + { label: "任务单号", prop: 'jobNumber',width: orderWidth }, + { label: "备注", prop: 'remark' }, + { label: "操作员", prop: 'worker' }, + { label: "生效日期", prop: 'activeDate', type: "dateTime" }, + { label: "车间", prop: 'workshop' }, + { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, + { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" }, + { label: "确认时间", prop: 'confirmTime',type: "dateTime" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, +] + +// 客户退货记录 +export const customerReturnNote = [ + { label: "记录单号", prop: "number", fixed: "left", type: "name" }, + { label: "任务单号", prop: "jobNumber", width:orderWidth }, + { label: "退料单号", prop: "productionReturnRequestNumber", width:orderWidth }, + { label: "备注", prop: 'remark' }, + { label: "操作员", prop: 'worker' }, + { label: "生效日期", prop: 'activeDate', type: "dateTime" }, + { label: "退料时间", prop: 'returnTime', type: "dateTime" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, +] // 字段说明 // showProp: true //隐藏该字段的高级筛选+列表排序 // sortable: false //隐藏该字段的列表排序 diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js index 29aa832d8..e83842c22 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -3443,3 +3443,70 @@ export const LibraryShiftNote = [ // { label: "ID", prop: 'id' }, // ************** 确认隐藏 ************************ ] + +// 三方库申请 +export const ThirdLocationRequest = [ + { label: "申请单号", prop: "number"}, + { label: "状态", prop: "requestStatus",type: "tagFilter", filters: "requestStatus" }, + { label: _Public.remark, prop: "remark" }, + { label: "操作员", prop: 'worker' }, + { label: "生产线", prop: 'prodLine' }, + { label: "目标库位代码", prop: "toLocationCode" }, + { label: "目标ERP库位", prop: "toLocationErpCode" }, + { label: "来源库位代码Json", prop: 'fromLocationCodeJsonList' }, + { label: "生效日期", prop: 'activeDate', type: "dateTime" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, +] +// 三方库任务 +export const ThirdLocationJob = [ + { label: "任务单号", prop: "number", fixed: "left", type: "name" }, + { label: "申请单号", prop: 'requestNumber' }, + { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" }, + { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" }, + { label: "承接者用户名", prop: 'acceptUserName' }, + { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, + { label: "完成者用户名", prop: 'completeUserName' }, + { label: "完成时间", prop: 'completeTime', type: "dateTime" }, + { label: "操作员", prop: "worker" }, + { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, + { label: "备注", prop: 'remark' }, + { label: "任务描述", prop: 'jobDescription' }, + { label: "工作组", prop: 'workGroupCode' }, + { label: "优先级", prop: 'priority' }, + { label: "优先级增量", prop: 'priorityIncrement' }, + { label: "叫料请求类型", prop: 'requestType' }, + { label: "上游任务编号", prop: 'upStreamJobNumber' }, + { label: "生产线", prop: 'prodLine' }, + { label: "车间", prop: 'workshop' }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, +] +// 三方库记录 +export const ThirdLocationNote = [ + { label: "记录单号", prop: "number", fixed: "left", type: "name" }, + { label: "申请单号", prop: 'requestNumber' }, + { label: "任务单号", prop: 'jobNumber' }, + { label: "备注", prop: 'remark' }, + { label: "操作员", prop: 'worker' }, + { label: "生效日期", prop: 'activeDate', type: "dateTime" }, + { label: "车间", prop: 'workshop' }, + { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, + { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" }, + { label: "确认时间", prop: 'confirmTime',type: "dateTime" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, +] + +// 客户退货记录 +export const customerReturnNote = [ + { label: "记录单号", prop: "number", fixed: "left", type: "name" }, + { label: "任务单号", prop: "jobNumber" }, + { label: "退料单号", prop: "productionReturnRequestNumber" }, + { label: "备注", prop: 'remark' }, + { label: "操作员", prop: 'worker' }, + { label: "生效日期", prop: 'activeDate', type: "dateTime" }, + { label: "退料时间", prop: 'returnTime', type: "dateTime" }, + { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, +] \ No newline at end of file diff --git a/fe/PC/src/views/ThirdLocationManage/ThirdLocationJob.vue b/fe/PC/src/views/ThirdLocationManage/ThirdLocationJob.vue new file mode 100644 index 000000000..24a3e67c4 --- /dev/null +++ b/fe/PC/src/views/ThirdLocationManage/ThirdLocationJob.vue @@ -0,0 +1,93 @@ + + + \ No newline at end of file diff --git a/fe/PC/src/views/ThirdLocationManage/ThirdLocationNote.vue b/fe/PC/src/views/ThirdLocationManage/ThirdLocationNote.vue new file mode 100644 index 000000000..b5edc9687 --- /dev/null +++ b/fe/PC/src/views/ThirdLocationManage/ThirdLocationNote.vue @@ -0,0 +1,93 @@ + + + \ No newline at end of file diff --git a/fe/PC/src/views/ThirdLocationManage/ThirdLocationRequest.vue b/fe/PC/src/views/ThirdLocationManage/ThirdLocationRequest.vue new file mode 100644 index 000000000..c21fcbb91 --- /dev/null +++ b/fe/PC/src/views/ThirdLocationManage/ThirdLocationRequest.vue @@ -0,0 +1,93 @@ + + + \ No newline at end of file diff --git a/fe/PC/src/views/finishedProductManage/customerReturn/customerReturnNote.vue b/fe/PC/src/views/finishedProductManage/customerReturn/customerReturnNote.vue new file mode 100644 index 000000000..92a1a4af1 --- /dev/null +++ b/fe/PC/src/views/finishedProductManage/customerReturn/customerReturnNote.vue @@ -0,0 +1,93 @@ + + + \ No newline at end of file diff --git a/fe/PC/src/views/finishedProductManage/dismantle/StepsFormTree/index.vue b/fe/PC/src/views/finishedProductManage/dismantle/StepsFormTree/index.vue index 8a3d1b7be..07f97f531 100644 --- a/fe/PC/src/views/finishedProductManage/dismantle/StepsFormTree/index.vue +++ b/fe/PC/src/views/finishedProductManage/dismantle/StepsFormTree/index.vue @@ -53,7 +53,7 @@ 父级物料代码：{{ propsData.details[0].itemCode }} {_select_ids.push(item.id)}) + if(!_isSelectData || _isSelectData.length <= 0){ + this.$warningMsg("请选择数据") + return + } + // this.bomList.forEach(item=>{ + // if() + // }) + // this.checkSelectDG(_isSelectData) + console.log(111,_isSelectData) + console.log(222,this.bomList) + console.log(333,_select_ids) + return + this.submitHttp() + }, + // 提交请求 + submitHttp(){ + this.bomList.forEach((item,index)=>{ + let _item = { + itemCode: item.component, + qty: _tableList[index].qty, + locationCode: _tableList[index].rawLocationCode, + locationArea: _tableList[index].rawLocationArea, + locationGroup: _tableList[index].rawLocationGroup, + locationErpCode: _tableList[index].rawLocationErpCode, + warehouseCode: _tableList[index].warehouseCode, + } + _data.details[0].materialDetails.push(_item) + }) + this.Loading.appMainLoading = true + this.submitRes = null + productionRecycleJobHandle(_jobInfo.id,_data).then(res => { + this.Loading.appMainLoading = false + this.submitRes = res + resolve(); + }).catch(err => { + this.Loading.appMainLoading = false + reject(); + }) + }, stepsSubmit (val) { // 提交 return new Promise((resolve, reject) => { @@ -339,33 +390,7 @@ export default { let _data = JSON.parse(JSON.stringify(_jobInfo)) _data.details[0].materialDetails = [],//目前规定明细中肯定只有一个子数据 _data.details[0].qty = Number(this.CreateFormData.qty) - // todo:检查所选数据，同级选择等情况处理 - let _isSelectData = this.$refs.StepsFormTree_Ref.selectData - console.log(3333,_isSelectData) - console.log(3333,this.bomList) - return - this.bomList.forEach((item,index)=>{ - let _item = { - itemCode: item.component, - qty: _tableList[index].qty, - locationCode: _tableList[index].rawLocationCode, - locationArea: _tableList[index].rawLocationArea, - locationGroup: _tableList[index].rawLocationGroup, - locationErpCode: _tableList[index].rawLocationErpCode, - warehouseCode: _tableList[index].warehouseCode, - } - _data.details[0].materialDetails.push(_item) - }) - this.Loading.appMainLoading = true - this.submitRes = null - productionRecycleJobHandle(_jobInfo.id,_data).then(res => { - this.Loading.appMainLoading = false - this.submitRes = res - resolve(); - }).catch(err => { - this.Loading.appMainLoading = false - reject(); - }) + this.checkSelectData() }); }, stepsCloseHandle(data){ @@ -376,7 +401,6 @@ export default { PalletlFunction (val) { return new Promise((resolve, reject) => { if(val == 0){ - console.log(this.CreateFormData.qty) this.Loading.appMainLoading = true // 获取接口生成bom列表 let _itemInfo = this.propsData.details[0] @@ -392,7 +416,7 @@ export default { itemCode:item.component, parentCode:item.product, // details的qty是否要乘以主表的qty值 - qty:Number(item.componentQty)*this.CreateFormData.qty, + qty:Number(item.componentQty) * Number(this.CreateFormData.qty), locationCode:_itemInfo.rawLocationCode, locationArea:_itemInfo.rawLocationArea, locationGroup:_itemInfo.rawLocationGroup,