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

【nev-pc】字段调整

ag_report_nev
安虹睿 10 months ago
parent
f4811b3166
commit
bdc983f38c
2 changed files with 38 additions and 42 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. 34
      fe/PC/src/utils/tableColumns/index.js
  2. 46
      fe/PC/src/utils/tabsDesTions/index.js

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

@ -1014,7 +1014,7 @@ export const PurchaseReceiptJob = [
{ label: "完成时间", prop: "completeTime",type: "dateTime" },
{ label: _Public.worker, prop: 'worker' },
{ label: "承接者用户名", prop: 'acceptUserName' },
{ label: "承接时间", prop: 'acceptTime', type: "dateTime" },
// { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
{ label: "完成者用户名", prop: 'completeUserName' },
{ label: "时间窗口", prop: 'timeWindow' },
{ label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
@ -1388,7 +1388,7 @@ export const IssueJob = [
{ label: "优先级增量", prop: 'priorityIncrement' },
{ label: "工作组", prop: 'workGroupCode' },
{ label: "承接者用户名", prop: 'acceptUserName' },
{ label: "承接时间", prop: 'acceptTime', type: "dateTime" },
// { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
{ label: "完成者用户名", prop: 'completeUserName' },
{ label: "任务描述", prop: 'jobDescription' },
{ label: "叫料请求类型", prop: 'requestType' },
@ -1463,7 +1463,7 @@ export const automaticCallJob = [
{ label: "优先级增量", prop: 'priorityIncrement' },
{ label: "工作组", prop: 'workGroupCode' },
{ label: "承接者用户名", prop: 'acceptUserName' },
{ label: "承接时间", prop: 'acceptTime', type: "dateTime" },
// { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
{ label: "完成者用户名", prop: 'completeUserName' },
{ label: "任务描述", prop: 'jobDescription' },
{ label: "叫料请求类型", prop: 'requestType' },
@ -1792,7 +1792,7 @@ export const DeliverJob = [
{ label: "优先级增量", prop: 'priorityIncrement' },
{ label: "工作组", prop: 'workGroupCode' },
{ label: "承接者用户名", prop: 'acceptUserName' },
{ label: "承接时间", prop: 'acceptTime', type: "dateTime" },
// { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
{ label: "完成者用户名", prop: 'completeUserName' },
{ label: "完成时间", prop: 'completeTime', type: "dateTime" },
{ label: "任务描述", prop: 'jobDescription' },
@ -1917,7 +1917,7 @@ export const customerDismantleJob = [
},
{ label: "申请单号", prop: "requestNumber",width: orderWidth },
{ label: "状态", prop: "jobStatus", type: "tagFilter", filters: "jobStatus" },
{ label: "承接时间", prop: 'acceptTime', type: "dateTime" },
// { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
{ label: "承接者用户名", prop: 'acceptUserName' },
{ label: "完成时间", prop: 'completeTime', type: "dateTime" },
{ label: "完成者用户名", prop: 'completeUserName' },
@ -2004,7 +2004,7 @@ export const productionReturnJob = [
{ label: "优先级增量", prop: 'priorityIncrement' },
{ label: "工作组", prop: 'workGroupCode' },
{ label: "承接者用户名", prop: 'acceptUserName' },
{ label: "承接时间", prop: 'acceptTime', type: "dateTime" },
// { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
{ label: "完成者用户名", prop: 'completeUserName' },
{ label: "完成时间", prop: 'completeTime', type: "dateTime" },
{ label: "任务描述", prop: 'jobDescription' },
@ -3400,8 +3400,8 @@ export const IssueJobZS = [
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
// { label: "要货单号", prop: 'kittingRequestNumber'},
{ label: "承接者用户名", prop: 'claimsUserName' },
{ label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" },
{ label: "承接者用户名", prop: 'claimsUserName' },
{ label: "完成者用户名", prop: 'completeUserName' },
{ label: "完成时间", prop: 'completeTime',type: "dateTime" },
// { label: "任务描述", prop: 'jobDescription' },
@ -3444,8 +3444,8 @@ export const IssueJobPT = [
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
{ label: "承接者用户名", prop: 'claimsUserName' },
{ label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" },
{ label: "承接者用户名", prop: 'claimsUserName' },
{ label: "完成者用户名", prop: 'completeUserName' },
{ label: "完成时间", prop: 'completeTime',type: "dateTime" },
{ label: "生产线", prop: 'prodLine' },
@ -3486,8 +3486,8 @@ export const IssueJobZP = [
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
{ label: "承接者用户名", prop: 'claimsUserName' },
{ label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" },
{ label: "承接者用户名", prop: 'claimsUserName' },
{ label: "完成者用户名", prop: 'completeUserName' },
{ label: "完成时间", prop: 'completeTime',type: "dateTime" },
{ label: "生产线", prop: 'prodLine' },
@ -3528,8 +3528,8 @@ export const IssueJobBP = [
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
{ label: "承接者用户名", prop: 'claimsUserName' },
{ label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" },
{ label: "承接者用户名", prop: 'claimsUserName' },
{ label: "完成者用户名", prop: 'completeUserName' },
{ label: "完成时间", prop: 'completeTime',type: "dateTime" },
{ label: "生产线", prop: 'prodLine' },
@ -3570,8 +3570,8 @@ export const KittingIssueJob = [
{ label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
{ label: "承接者用户名", prop: 'claimsUserName' },
{ label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" },
{ label: "承接者用户名", prop: 'claimsUserName' },
// { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
{ label: "完成者用户名", prop: 'completeUserName' },
{ label: "完成时间", prop: 'completeTime',type: "dateTime" },
@ -3648,9 +3648,9 @@ export const ThirdLocationJob = [
{ label: "申请单号", prop: 'requestNumber' },
{ label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
// { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
// { label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" },
{ label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" },
{ label: "承接者用户名", prop: 'claimsUserName' },
{ label: "承接时间", prop: 'completeTime', type: "dateTime" },
// { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
// { label: "完成者用户名", prop: 'completeUserName' },
// { label: "完成时间", prop: 'completeTime', type: "dateTime" },
{ label: "操作员", prop: "worker" },
@ -3700,7 +3700,7 @@ export const pageLock = [
// 底盘查询
export const chassisList = [
{
label: "底盘代码",
label: "底盘号",
prop: 'chassisNumber',
fixed: "left",
type: "name"
@ -3718,7 +3718,7 @@ export const chassisList = [
// 底盘执行位置序列
export const chassisOperationSequence = [
{
label: "底盘代码",
label: "底盘号",
prop: 'chassisNumber',
fixed: "left",
type: "name"
@ -3752,7 +3752,7 @@ export const KittingPackagingDepDetails = [
{ label: _Names.itemName, prop: "itemName" },
{ label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "底盘代码", prop: "chassisNumber" },
{ label: "底盘号", prop: "chassisNumber" },
{ label: "底盘号排序序列", prop: "chassisSortNumber" },
{ label: "kitting代码", prop: 'kittingCode' },
{ label: "备注", prop: "remark" },
@ -3776,7 +3776,7 @@ export const isPadForTransferLibJob = [
{ label: "备注", prop: "remark" },
{ label: "操作员", prop: "worker" },
{ label: "承接用户", prop: "acceptUserName" },
{ label: "承接时间", prop: 'acceptTime', type: "dateTime" },
// { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
{ label: "完成者用户名", prop: 'completeUserName' },
{ label: "完成时间", prop: "completeTime", type: "dateTime" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },

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

@ -730,7 +730,7 @@ export const PurchaseReceiptJob = [
{ label: "完成时间", prop: "completeTime",type: "dateTime" },
{ label: _Public.worker, prop: 'worker' },
{ label: "承接者用户名", prop: 'acceptUserName' },
{ label: "承接时间", prop: 'acceptTime', type: "dateTime" },
// { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
{ label: "完成者用户名", prop: 'completeUserName' },
{ label: "时间窗口", prop: 'timeWindow' },
{ label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
@ -838,7 +838,7 @@ export const IssueJob = [
{ label: "操作员", prop: 'worker' },
{ label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" },
{ label: "承接用户", prop: 'acceptUserName' },
{ label: "承接时间", prop: 'acceptTime', type: "dateTime" },
// { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
{ label: "完成用户", prop: 'completeUserName' },
{ label: "完成时间", prop: "completeTime", type: "dateTime" },
{ label: "叫料请求类型", prop: 'requestType' },
@ -901,7 +901,7 @@ export const automaticCallJob = [
{ label: "操作员", prop: 'worker' },
{ label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" },
{ label: "承接用户", prop: 'acceptUserName' },
{ label: "承接时间", prop: 'acceptTime', type: "dateTime" },
// { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
{ label: "完成用户", prop: 'completeUserName' },
{ label: "完成时间", prop: "completeTime", type: "dateTime" },
{ label: "叫料请求类型", prop: 'requestType' },
@ -1136,7 +1136,7 @@ export const DeliverJob = [
{ label: "客户代码", prop: "customerCode" },
{ label: "操作员", prop: 'worker' },
{ label: "承接用户", prop: 'acceptUserName' },
{ label: "承接时间", prop: 'acceptTime', type: "dateTime" },
// { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
{ label: "完成用户", prop: 'completeUserName' },
{ label: "完成时间", prop: 'completeTime', type: "dateTime" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
@ -1248,7 +1248,7 @@ export const customerDismantleJob = [
},
{ label: "申请单号", prop: "requestNumber" },
{ label: "状态", prop: "jobStatus", type: "filter", filters: "jobStatus" },
{ label: "承接时间", prop: 'acceptTime', type: "dateTime" },
// { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
{ label: "承接者用户名", prop: 'acceptUserName' },
{ label: "完成时间", prop: 'completeTime', type: "dateTime" },
{ label: "完成者用户名", prop: 'completeUserName' },
@ -1302,7 +1302,7 @@ export const productionReturnJob = [
{ label: "退库单号", prop: "productionReturnRequestNumber" },
{ label: "操作员", prop: 'worker' },
{ label: "承接用户", prop: 'acceptUserName' },
{ label: "承接时间", prop: 'acceptTime', type: "dateTime" },
// { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
{ label: "完成用户", prop: 'completeUserName' },
{ label: "完成时间", prop: 'completeTime', type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
@ -2035,7 +2035,7 @@ export const CountJob = [
{ label: "盘点次数", prop: "inventoryStage" },
{ label: "盘点根据", prop: "countMethod",type: "filter", filters: "countMethod" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "承接时间", prop: "acceptTime", type: "dateTime" },
// { label: "承接时间", prop: "acceptTime", type: "dateTime" },
{ label: "承接用户", prop: "acceptUserName" },
{ label: "完成时间", prop: "completeTime",type: "dateTime" },
{ label: "完成用户", prop: "completeUserName" },
@ -2221,8 +2221,8 @@ export const IssueJobZS = [
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
// { label: "要货单号", prop: 'kittingRequestNumber'},
{ label: "承接者用户名", prop: 'claimsUserName' },
{ label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" },
{ label: "承接者用户名", prop: 'claimsUserName' },
{ label: "完成者用户名", prop: 'completeUserName' },
{ label: "完成时间", prop: 'completeTime',type: "dateTime" },
// { label: "任务描述", prop: 'jobDescription' },
@ -2268,8 +2268,8 @@ export const IssueJobPT = [
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
{ label: "承接者用户名", prop: 'claimsUserName' },
{ label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" },
{ label: "承接者用户名", prop: 'claimsUserName' },
{ label: "完成者用户名", prop: 'completeUserName' },
{ label: "完成时间", prop: 'completeTime',type: "dateTime" },
{ label: "生产线", prop: 'prodLine' },
@ -2310,8 +2310,8 @@ export const IssueJobZP = [
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
{ label: "承接者用户名", prop: 'claimsUserName' },
{ label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" },
{ label: "承接者用户名", prop: 'claimsUserName' },
{ label: "完成者用户名", prop: 'completeUserName' },
{ label: "完成时间", prop: 'completeTime',type: "dateTime" },
{ label: "生产线", prop: 'prodLine' },
@ -2352,8 +2352,8 @@ export const IssueJobBP = [
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
{ label: "承接者用户名", prop: 'claimsUserName' },
{ label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" },
{ label: "承接者用户名", prop: 'claimsUserName' },
{ label: "完成者用户名", prop: 'completeUserName' },
{ label: "完成时间", prop: 'completeTime',type: "dateTime" },
{ label: "生产线", prop: 'prodLine' },
@ -2394,8 +2394,9 @@ export const KittingIssueJob = [
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
{ label: "承接者用户名", prop: 'claimsUserName' },
{ label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" },
{ label: "承接者用户名", prop: 'claimsUserName' },
// { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
{ label: "完成者用户名", prop: 'completeUserName' },
{ label: "完成时间", prop: 'completeTime',type: "dateTime" },
{ label: "生产线", prop: 'prodLine' },
@ -2472,20 +2473,15 @@ export const ThirdLocationRequest = [
export const ThirdLocationJob = [
{ label: "任务单号", prop: "number", fixed: "left", type: "name" },
{ label: "申请单号", prop: 'requestNumber' },
{ label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
// { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" },
{ label: "承接者用户名", prop: 'claimsUserName' },
{ label: "承接时间", prop: 'completeTime', type: "dateTime" },
{ label: "完成者用户名", prop: 'completeUserName' },
{ label: "完成时间", prop: 'completeTime', type: "dateTime" },
// { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
// { label: "完成者用户名", prop: 'completeUserName' },
// { label: "完成时间", prop: 'completeTime', type: "dateTime" },
{ label: "操作员", prop: "worker" },
{ label: "备注", prop: 'remark' },
{ label: "任务描述", prop: 'jobDescription' },
{ label: "工作组", prop: 'workGroupCode' },
{ label: "优先级", prop: 'priority' },
{ label: "优先级增量", prop: 'priorityIncrement' },
{ label: "上游任务编号", prop: 'upStreamJobNumber' },
{ label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
{ label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
]
@ -2526,7 +2522,7 @@ export const pageLock = [
// 底盘查询
export const chassisList = [
{
label: "底盘代码",
label: "底盘号",
prop: 'chassisNumber',
fixed: "left",
type: "name"
@ -2544,7 +2540,7 @@ export const chassisList = [
// 底盘执行位置序列
export const chassisOperationSequence = [
{
label: "底盘代码",
label: "底盘号",
prop: 'chassisNumber',
fixed: "left",
type: "name"
@ -2588,7 +2584,7 @@ export const isPadForTransferLibJob = [
{ label: "备注", prop: "remark" },
{ label: "操作员", prop: "worker" },
{ label: "承接用户", prop: "acceptUserName" },
{ label: "承接时间", prop: 'acceptTime', type: "dateTime" },
// { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
{ label: "完成者用户名", prop: 'completeUserName' },
{ label: "完成时间", prop: "completeTime", type: "dateTime" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },

Write Preview
Loading…
Cancel
Save