From a45562aa7a8d0cad252b6584e8be350a7f2814a7 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, 15 Apr 2023 13:38:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=8E=A8=E6=8B=86=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E5=92=8C=E8=AE=B0=E5=BD=95=E5=AD=97=E6=AE=B5=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/utils/detailsTableColumns/index.js | 19 +++++++---- fe/PC/src/utils/tableColumns/index.js | 33 ++++++++++++------- fe/PC/src/utils/tabsDesTions/index.js | 27 ++++++++------- .../dismantle/customerDismantleNote.vue | 14 ++++---- 4 files changed, 55 insertions(+), 38 deletions(-) diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js index 58f9a6cb7..e989406f0 100644 --- a/fe/PC/src/utils/detailsTableColumns/index.js +++ b/fe/PC/src/utils/detailsTableColumns/index.js @@ -1738,24 +1738,23 @@ export const FISDeliverNote = [ // { label: "标包计量单位", prop: 'stdPackUom' }, // ----------------------------------------------------------------------- ] -// 客户退拆申请 已调整 +// 客户退拆申请 20230415 export const customerDismantle = [ { label: "退拆物品代码", prop: "itemCode" }, { label: "物品名称", prop: "itemName" }, - { label: "物品描述", prop: "itemDesc1" }, - { label: "预定开工日", prop: "preStartTime",type: "dateTime" }, + { label: "物品描述1", prop: "itemDesc1" }, + { label: "物品描述2", prop: "itemDesc2" }, { label: "退拆数量", prop: "qty" }, { label: "单位", prop: 'uom' }, { label: "扣账库位", prop: "locationCode" }, { label: "扣账ERP库位", prop: 'locationErpCode' }, - { label: "转移工时", prop: "workHour" }, { label: "缴库库位", prop: 'rawLocationCode' }, { label: "原料ERP库位", prop: 'rawLocationErpCode' }, - { label: "转移料号（子零件号）", prop: 'rawItemCode' }, - { label: "转移量（子零件）", prop: 'rawQty' }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "创建者ID", prop: 'creatorId' }, // ----------------------------------------------------------------------- { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + { label: "上次修改者ID", prop: 'lastModifierId' }, { label: "任务编号", prop: 'number',width:orderWidth }, { label: "备注", prop: 'remark' }, { label: "Bom版本", prop: 'bomVersion' }, @@ -1763,7 +1762,15 @@ export const customerDismantle = [ { label: "库区", prop: 'locationArea' }, { label: "原料库位组", prop: 'rawLocationGroup' }, { label: "原料库区", prop: 'rawLocationArea' }, + { label: "原料仓库", prop: 'rawWarehouseCode' }, { label: "仓库代码", prop: 'warehouseCode' }, + { label: "主表ID", prop: "masterID" }, + { label: "事务ID", prop: "tenantId" }, + { label: "ID", prop: 'id' }, + // { label: "预定开工日", prop: "preStartTime",type: "dateTime" }, + // { label: "转移工时", prop: "workHour" }, + // { label: "转移料号（子零件号）", prop: 'rawItemCode' }, + // { label: "转移量（子零件）", prop: 'rawQty' }, // ----------------------------------------------------------------------- ] // 生产退库申请 已调整 diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index a5378dbef..8d0201aac 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -2371,7 +2371,7 @@ export const FISDeliverNote = [ // { label: "目标ERP库位代码", prop: 'toLocationErpCode' }, // ----------------------------------------------------------------------- ] -// 客户退拆申请 已调整 +// 客户退拆申请 20230415 export const customerDismantle = [ { label: "退拆申请单号", @@ -2381,23 +2381,28 @@ export const customerDismantle = [ width: orderWidth }, { label: "状态", prop: 'requestStatus', type: "tagFilter", filters: "requestStatus" }, - { label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "操作员", prop: "worker" }, // ----------------------------------------------------------------------- + { label: "创建时间", prop: "creationTime",type: "dateTime" }, + { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, - { label: "公司", prop: 'company' }, { label: "班次", prop: 'shift' }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "仓库", prop: 'warehouseCode' }, { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" }, { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" }, { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" }, { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" }, { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" }, + { label: "车间", prop: 'workshop' }, + { label: "事务ID", prop: "tenantId" }, + { label: "ID", prop: "id" }, + // { label: "公司", prop: 'company' }, + // { label: "仓库", prop: 'warehouseCode' }, // ----------------------------------------------------------------------- ] -// 客户退拆记录 已调整 +// 客户退拆记录 20230415 export const customerDismantleNote = [ { label: "退拆记录单号", @@ -2406,23 +2411,26 @@ export const customerDismantleNote = [ type: "name", width: orderWidth }, - { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "操作员", prop: "worker" }, - // ----------------------------------------------------------------------- - { label: "生效时间", prop: "activeDate",type: "dateTime" }, { label: "班次", prop: 'shift' }, + { label: "车间", prop: 'workshop' }, { label: "回收时间", prop: "recycleTime",type: "dateTime" }, + { label: "生效时间", prop: "activeDate",type: "dateTime" }, + { label: "操作员", prop: "worker" }, + // ----------------------------------------------------------------------- + { label: "创建时间", prop: "creationTime",type: "dateTime" }, + { label: "创建者ID", prop: 'creatorId' }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, - { label: "公司", prop: 'company' }, { label: "申请编号", prop: 'requestNumber', width:orderWidth }, + { label: "事务ID", prop: "tenantId" }, + // { label: "公司", prop: 'company' }, // ----------------------------------------------------------------------- ] -// 客户退拆记录-明细【即回冲记录】 已调整 +// 客户退拆记录-明细【即回冲记录】 20230415 export const customerDismantleBackFlushNote = [ { label: "退拆物品号", prop: "itemCode" }, { label: "物品名称", prop: "itemName" }, - { label: "物品描述", prop: "itemDesc1", }, { label: "预定开工日", prop: "preStartTime" ,type: "dateTime", }, { label: "退拆数量", prop: "qty" }, { label: "扣账库位", prop: 'locationCode' }, @@ -2430,6 +2438,7 @@ export const customerDismantleBackFlushNote = [ { label: "缴库库位", prop: 'rawLocationCode' }, { label: "转移料号（子零件号）", prop: 'rawItemCode' }, { label: "转移量（子零件）", prop: 'rawQty' }, + // { label: "物品描述", prop: "itemDesc1", }, ] // 生产退库申请 已调整 export const productionReturnRequest = [ diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js index e57b7b5f3..dbb5e2814 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -1743,50 +1743,49 @@ export const FISDeliverNote = [ // { label: "目标ERP库位代码", prop: 'toLocationErpCode' }, // ----------------------------------------------------------------------- ] -// 客户退拆申请 已调整 1 +// 客户退拆申请 20230415 export const customerDismantle = [ { label: "退拆申请单号", prop: "number" }, { label: "状态", prop: 'requestStatus', type: "tagFilter", filters: "requestStatus" }, - { label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "操作员", prop: "worker" }, // ----------------------------------------------------------------------- + { label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "创建者ID", prop: "creatorId" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "上次修改者ID", prop: "lastModifierId" }, { label: "备注", prop: 'remark' }, { label: "事务ID", prop: "tenantId" }, { label: "车间", prop: 'workshop' }, - { label: "公司", prop: 'company' }, { label: "班次", prop: 'shift' }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "仓库", prop: 'warehouseCode' }, { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" }, { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" }, { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" }, { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" }, { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" }, { label: "ID", prop: 'id' }, + // { label: "公司", prop: 'company' }, + // { label: "仓库", prop: 'warehouseCode' }, // ----------------------------------------------------------------------- ] -// 客户退拆记录 已调整 1 +// 客户退拆记录 20230415 export const customerDismantleNote = [ { label: "退拆记录单号", prop: "number" }, - { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "操作员", prop: "worker" }, // ----------------------------------------------------------------------- + { label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "创建者ID", prop: "creatorId" }, - { label: "生效时间", prop: "activeDate",type: "dateTime" }, - { label: "回收时间", prop: "recycleTime" ,type: "dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "上次修改者ID", prop: "lastModifierId" }, - { label: "申请单号", prop: 'requestNumber' }, { label: "备注", prop: 'remark' }, - { label: "公司", prop: 'company' }, + { label: "事务ID", prop: "tenantId" }, + { label: "操作员", prop: "worker" }, + { label: "生效时间", prop: "activeDate",type: "dateTime" }, + { label: "回收时间", prop: "recycleTime" ,type: "dateTime" }, { label: "班次", prop: 'shift' }, { label: "车间", prop: 'workshop' }, - { label: "事务ID", prop: "tenantId" }, - { label: "仓库", prop: 'warehouseCode' }, - { label: "ID", prop: 'id' }, + { label: "申请单号", prop: 'requestNumber' }, + // { label: "仓库", prop: 'warehouseCode' }, + // { label: "公司", prop: 'company' }, // ----------------------------------------------------------------------- ] // 生产退库申请 已调整 1 diff --git a/fe/PC/src/views/finishedProductManage/dismantle/customerDismantleNote.vue b/fe/PC/src/views/finishedProductManage/dismantle/customerDismantleNote.vue index 6ac8dfd42..0e34d1029 100644 --- a/fe/PC/src/views/finishedProductManage/dismantle/customerDismantleNote.vue +++ b/fe/PC/src/views/finishedProductManage/dismantle/customerDismantleNote.vue @@ -133,12 +133,14 @@ export default { } else { this.propsData = res } - this.propsData.itemCode = this.propsData.noteAndBackFlushDetails[0].itemCode - this.propsData.locationCode = this.propsData.noteAndBackFlushDetails[0].locationCode - this.propsData.qty = this.propsData.noteAndBackFlushDetails[0].qty - this.propsData.rawLocationCode = this.propsData.noteAndBackFlushDetails[0].rawLocationCode - this.propsData.preStartTime = this.propsData.noteAndBackFlushDetails[0].preStartTime - this.propsData.workHour = this.propsData.noteAndBackFlushDetails[0].workHour + if (this.propsData.noteAndBackFlushDetails.length > 0) { + this.propsData.itemCode = this.propsData.noteAndBackFlushDetails[0].itemCode + this.propsData.locationCode = this.propsData.noteAndBackFlushDetails[0].locationCode + this.propsData.qty = this.propsData.noteAndBackFlushDetails[0].qty + this.propsData.rawLocationCode = this.propsData.noteAndBackFlushDetails[0].rawLocationCode + this.propsData.preStartTime = this.propsData.noteAndBackFlushDetails[0].preStartTime + this.propsData.workHour = this.propsData.noteAndBackFlushDetails[0].workHour + } this.inlineDialogCallback() }) .catch(err => {