diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index 40db098ed..e1e087ab3 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -3398,8 +3398,8 @@ export const IssueJobZS = [ { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" }, { label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" }, // { label: "要货单号", prop: 'kittingRequestNumber'}, - { label: "承接者用户名", prop: 'acceptUserName' }, - { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, + { label: "承接者用户名", prop: 'claimsUserName' }, + { label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" }, { label: "完成者用户名", prop: 'completeUserName' }, { label: "完成时间", prop: 'completeTime',type: "dateTime" }, // { label: "任务描述", prop: 'jobDescription' }, @@ -3442,8 +3442,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: 'acceptUserName' }, - { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, + { label: "承接者用户名", prop: 'claimsUserName' }, + { label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" }, { label: "完成者用户名", prop: 'completeUserName' }, { label: "完成时间", prop: 'completeTime',type: "dateTime" }, { label: "生产线", prop: 'prodLine' }, @@ -3484,8 +3484,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: 'acceptUserName' }, - { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, + { label: "承接者用户名", prop: 'claimsUserName' }, + { label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" }, { label: "完成者用户名", prop: 'completeUserName' }, { label: "完成时间", prop: 'completeTime',type: "dateTime" }, { label: "生产线", prop: 'prodLine' }, @@ -3526,8 +3526,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: 'acceptUserName' }, - { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, + { label: "承接者用户名", prop: 'claimsUserName' }, + { label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" }, { label: "完成者用户名", prop: 'completeUserName' }, { label: "完成时间", prop: 'completeTime',type: "dateTime" }, { label: "生产线", prop: 'prodLine' }, @@ -3568,8 +3568,9 @@ 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: 'acceptUserName' }, - { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, + { label: "承接者用户名", prop: 'claimsUserName' }, + { label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" }, + // { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, { label: "完成者用户名", prop: 'completeUserName' }, { label: "完成时间", prop: 'completeTime',type: "dateTime" }, { label: "生产线", prop: 'prodLine' }, diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js index 19f4e6922..c32b4a975 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -2219,8 +2219,8 @@ export const IssueJobZS = [ { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" }, { label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" }, // { label: "要货单号", prop: 'kittingRequestNumber'}, - { label: "承接者用户名", prop: 'acceptUserName' }, - { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, + { label: "承接者用户名", prop: 'claimsUserName' }, + { label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" }, { label: "完成者用户名", prop: 'completeUserName' }, { label: "完成时间", prop: 'completeTime',type: "dateTime" }, // { label: "任务描述", prop: 'jobDescription' }, @@ -2266,8 +2266,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: 'acceptUserName' }, - { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, + { label: "承接者用户名", prop: 'claimsUserName' }, + { label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" }, { label: "完成者用户名", prop: 'completeUserName' }, { label: "完成时间", prop: 'completeTime',type: "dateTime" }, { label: "生产线", prop: 'prodLine' }, @@ -2308,8 +2308,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: 'acceptUserName' }, - { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, + { label: "承接者用户名", prop: 'claimsUserName' }, + { label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" }, { label: "完成者用户名", prop: 'completeUserName' }, { label: "完成时间", prop: 'completeTime',type: "dateTime" }, { label: "生产线", prop: 'prodLine' }, @@ -2350,8 +2350,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: 'acceptUserName' }, - { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, + { label: "承接者用户名", prop: 'claimsUserName' }, + { label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" }, { label: "完成者用户名", prop: 'completeUserName' }, { label: "完成时间", prop: 'completeTime',type: "dateTime" }, { label: "生产线", prop: 'prodLine' }, @@ -2392,8 +2392,8 @@ 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: 'acceptUserName' }, - { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, + { label: "承接者用户名", prop: 'claimsUserName' }, + { label: "是否已承接", prop: "isClaims", type: "filter", filters: "whetherOrNot" }, { label: "完成者用户名", prop: 'completeUserName' }, { label: "完成时间", prop: 'completeTime',type: "dateTime" }, { label: "生产线", prop: 'prodLine' }, diff --git a/fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue b/fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue index 9c3e39bbd..b913067ff 100644 --- a/fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue +++ b/fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue @@ -44,7 +44,7 @@