zhibinlv
/
WZC2
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

客户推拆申请和记录字段调整

dev_web_online
陈薪名 2 years ago
parent
9d5339bf10
commit
a45562aa7a
4 changed files with 55 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      fe/PC/src/utils/detailsTableColumns/index.js
  2. 33
      fe/PC/src/utils/tableColumns/index.js
  3. 27
      fe/PC/src/utils/tabsDesTions/index.js
  4. 14
      fe/PC/src/views/finishedProductManage/dismantle/customerDismantleNote.vue

19
fe/PC/src/utils/detailsTableColumns/index.js
View File

@ -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' },
// -----------------------------------------------------------------------
]
// 生产退库申请 已调整

33
fe/PC/src/utils/tableColumns/index.js
View File

@ -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 = [

27
fe/PC/src/utils/tabsDesTions/index.js
View File

@ -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

14
fe/PC/src/views/finishedProductManage/dismantle/customerDismantleNote.vue
View File

@ -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 => {

Write Preview
Loading…
Cancel
Save