Browse Source

【nev-pc】注塑,喷涂,装配9个页面联调

ag_report_nev
安虹睿 12 months ago
parent
commit
192c4299f8
  1. 173
      fe/PC/src/styles/padMain.scss
  2. 1144
      fe/PC/src/utils/detailsTableColumns/index.js
  3. 512
      fe/PC/src/utils/tableColumns/index.js
  4. 450
      fe/PC/src/utils/tabsDesTions/index.js
  5. 2
      fe/PC/src/views/materialIssuePT/IssueJobPT.vue
  6. 2
      fe/PC/src/views/materialIssuePT/IssueNotePT.vue
  7. 4
      fe/PC/src/views/materialIssuePT/IssueRequestPT.vue
  8. 2
      fe/PC/src/views/materialIssueZP/IssueJobZP.vue
  9. 2
      fe/PC/src/views/materialIssueZP/IssueNoteZP.vue
  10. 4
      fe/PC/src/views/materialIssueZP/IssueRequestZP.vue
  11. 0
      fe/PC/src/views/materialIssueZS/IssueJobZS.vue
  12. 0
      fe/PC/src/views/materialIssueZS/IssueNoteZS.vue
  13. 2
      fe/PC/src/views/materialIssueZS/IssuePlanZS.vue
  14. 0
      fe/PC/src/views/materialIssueZS/IssueRequestZS.vue
  15. 4
      fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue

173
fe/PC/src/styles/padMain.scss

@ -6,114 +6,67 @@
height:calc(100% - 20px);
min-width:800px;
overflow:auto;
// ::v-deep .el-dialog {
// .el-dialog__body {
// padding-bottom: 20px;
// }
// .form1,
// .form2 {
// display: flex;
// flex-direction: column;
// width: 100%;
// height: 100%;
// }
// .form1 .el-form {
// flex: 1;
// padding-left: 70px;
// padding-right: 70px;
// display: flex;
// flex-direction: column;
// overflow: hidden;
// .el-row {
// flex: 2;
// padding-left: 30px;
// padding-right: 30px;
// flex-wrap: wrap;
// overflow: hidden;
// overflow-y: auto;
// }
// .formTable-box {
// flex: 2;
// overflow: hidden;
// .el-form-item__content {
// width: 100%;
// height: 100%;
// display: flex;
// flex-direction: column;
// overflow: hidden;
// margin: 0 !important;
// }
// .heder {
// padding: 5px 0;
// text-align: end;
// span {
// color: rgb(64, 158, 255);
// cursor: pointer;
// &:hover {
// color: blue;
// }
// }
// }
// .el-table {
// flex: 1;
// // white-space: nowrap;
// // display: flex;
// .childTable {
// display: flex;
// justify-content: space-around;
// span {
// cursor: pointer;
// &:nth-child(1) {
// color: red;
// }
// &:nth-child(2) {
// color: green;
// }
// }
// }
// }
// }
// }
// }
// .form2 .el-form {
// flex: 1;
// padding-left: 100px;
// padding-right: 100px;
// display: flex;
// justify-content: flex-start;
// align-content: flex-start;
// flex-wrap: wrap;
// overflow: hidden;
// overflow-y: auto;
// }
// .screen-push {
// color: rgb(64, 158, 255);
// span {
// cursor: pointer;
// &:hover {
// color: blue;
// }
// }
// }
// .formButton {
// padding: 20px 20px 20px 0;
// }
}
.padListPage{
background:#fff;
margin:15px;
height:calc(100% - 30px);
min-width:800px;
overflow:auto;
display: flex;
flex-direction: column;
.padListHeader{
padding: 10px 10px 0 10px;
box-shadow: 1px 1px 5px #ddd;
flex-shrink: 0;
::v-deep .el-form-item{
margin-bottom: 10px;
}
}
.padListCard{
height: 100%;
overflow: auto;
background: #f8f8f8;
margin-top: 4px;
.padListRow{
box-shadow: 1px 1px 5px #ddd;
padding: 10px;
background: #fff;
margin-bottom: 10px;
}
.detailDataBox{
padding: 10px 10px 5px 10px;
border: #ddd dashed 1px;
}
}
.padListPager{
height: 30px;
line-height: 30px;
flex-shrink: 0;
text-align: center;
color: #999;
overflow: hidden;
::v-deep .el-loading-spinner {
display: flex;
justify-content: center;
.circular{
height: 22px;
width: 22px;
margin: 7px 10px 0 0;
}
}
}
.listRowButtonBox{
text-align: right;
padding-top: 10px;
}
}

1144
fe/PC/src/utils/detailsTableColumns/index.js

File diff suppressed because it is too large

512
fe/PC/src/utils/tableColumns/index.js

@ -4297,443 +4297,163 @@ export const completDumpNoteZP = [
]
// 注塑计划
export const IssuePlanZS = [
{
label: "注塑计划号",
prop: "number",
fixed: "left",
width: orderWidth
},
{ label: "计划说明", prop: 'remark',width:"auto" },
{ label: "版本号", prop: 'version' },
{ label: "状态", prop: "requestStatus",type: "tagFilter", filters: "planStatus_ZS",width:"auto" },
{ label: "计划日期", prop: 'planTime', type: "dateTime",width:"auto"},
]
// 人工注塑申请
// export const IssuePlanZS = [
// {
// label: "注塑计划号",
// prop: "number",
// fixed: "left",
// width: orderWidth
// },
// { label: "计划说明", prop: 'remark',width:"auto" },
// { label: "版本号", prop: 'version' },
// { label: "状态", prop: "requestStatus",type: "tagFilter", filters: "planStatus_ZS",width:"auto" },
// { label: "计划日期", prop: 'planTime', type: "dateTime",width:"auto"},
// ]
// 注塑申请
export const IssueRequestZS = [
{
label: "申请编号",
prop: "number",
fixed: "left",
type: "name",
width: orderWidth
},
{ label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
{ label: "叫料库位代码", prop: "toLocationCode" },
{ label: "请求单号", prop: "number", fixed: "left", type: "name" },
{ label: "状态", prop: "requestStatus", type: "filter", filters: "requestStatus" },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true },
{ label: "目标库位代码", prop: "toLocationCode" },
{ label: "目标ERP库位", prop: "toLocationErpCode" },
{ label: "备注", prop: "remark" },
{ label: "操作员", prop: "worker" },
{ label: "备注", prop: 'remark' },
{ label: "使用在途库", prop: 'isUseOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
// { label: "创建时间", prop: "creationTime", type: "dateTime" },
// { label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true },
// { label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
// 人工注塑任务
// 注塑任务
export const IssueJobZS = [
{
label: "任务编号",
prop: "number",
fixed: "left",
type: "name",
width: orderWidth
},
{ label: "要货单号", prop: 'injectionIssueRequestNumber' },
{ label: "任务单号", prop: "number", fixed: "left", type: "name" },
{ label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
{ 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: 'completeUserName' },
{ label: "完成时间", prop: 'completeTime',type: "dateTime" },
{ label: "任务描述", prop: 'jobDescription' },
{ label: "生产线", prop: 'prodLine' },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "操作员", prop: 'worker' },
{ label: "备注", prop: 'remark' },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "备注", prop: "remark" },
{ label: "操作员", prop: "worker" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
// 人工注塑记录
// 注塑记录
export const IssueNoteZS = [
{
label: "记录单号",
prop: "number",
fixed: "left",
type: "name",
width: orderWidth
},
{ label: "申请单号", prop: 'requestNumber',width: orderWidth },
{ label: "任务单号", prop: 'jobNumber',width: orderWidth },
{ label: "操作员", prop: 'worker' },
{ label: "备注", prop: 'remark' },
{ label: "记录单号", prop: "number", fixed: "left", type: "name" },
{ label: "申请单号", prop: 'requestNumber' },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
{ label: "确认时间", prop: 'confirmTime' },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "确认时间", prop: 'confirmTime',type: "dateTime" },
{ label: "任务代码", prop: 'jobNumber' },
{ label: "备注", prop: "remark" },
{ label: "操作员", prop: "worker" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
// 人工发料申请(喷涂)
// 喷涂申请
export const IssueRequestPT = [
{
label: "叫料申请编号",
prop: "number",
fixed: "left",
type: "name",
width: orderWidth
},
{ label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "请求单号", prop: "number", fixed: "left", type: "name" },
{ label: "状态", prop: "requestStatus", type: "filter", filters: "requestStatus" },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true },
{ label: "目标库位代码", prop: "toLocationCode" },
{ label: "目标ERP库位", prop: "toLocationErpCode" },
{ label: "备注", prop: "remark" },
{ label: "操作员", prop: "worker" },
{ label: "备注", prop: 'remark' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "叫料类型", prop: 'type' },
{ label: "备料计划单号", prop: 'preparationPlanNumber',width: orderWidth },
{ label: "生产线", prop: 'prodLine' },
{ label: "车间", prop: 'workshop' },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
// ************** 确认隐藏 ************************
// { 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: 'creatorId' },
// { label: "事务ID", prop: "tenantId" },
// ************** 确认隐藏 ************************
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
// 人工发料任务(喷涂)
// 喷涂任务
export const IssueJobPT = [
{
label: "发料任务编号",
prop: "number",
fixed: "left",
type: "name",
width: orderWidth
},
{ label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
{ label: "申请单号", prop: "materialRequestNumber",width: orderWidth },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "完成时间", prop: "completeTime", type: "dateTime" },
{ label: "操作员", prop: 'worker' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "备注", prop: 'remark' },
{ label: "仓库代码", prop: 'warehouseCode' },
{ label: "上游任务编号", prop: 'upStreamJobNumber' },
{ label: "任务类型", prop: 'jobType' },
{ label: "优先级", prop: 'priority' },
{ label: "优先级增量", prop: 'priorityIncrement' },
{ label: "工作组", prop: 'workGroupCode' },
{ label: "任务单号", prop: "number", fixed: "left", type: "name" },
{ label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ 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: 'completeUserName' },
{ label: "完成时间", prop: 'completeTime',type: "dateTime" },
{ label: "任务描述", prop: 'jobDescription' },
{ label: "叫料请求类型", prop: 'requestType' },
{ label: "生产线", prop: 'prodLine' },
{ label: "车间", prop: 'workshop' },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
// ************** 确认隐藏 ************************
// { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" },
// { label: "创建者ID", prop: 'creatorId' },
// { label: "上次修改者ID", prop: "lastModifierId" },
// { label: "事务ID", prop: "tenantId" },
// { label: "承接者ID", prop: 'acceptUserId' },
// { label: "完成者", prop: 'completeUserId' },
// ************** 确认隐藏 ************************
{ label: "备注", prop: "remark" },
{ label: "操作员", prop: "worker" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
// 人工发料记录(喷涂)
// 喷涂记录
export const IssueNotePT = [
{
label: "发料记录单号",
prop: "number",
fixed: "left",
type: "name",
width: orderWidth
},
{ label: "申请单号", prop: 'requestNumber',width: orderWidth },
{ label: "任务单号", prop: 'jobNumber',width: orderWidth },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "操作员", prop: 'worker' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "备注", prop: 'remark' },
{ label: "生效日期", prop: 'activeDate',type: "dateTime" },
{ label: "车间", prop: 'workshop' },
{ label: "叫料请求类型", prop: 'requestType' },
{ label: "记录单号", prop: "number", fixed: "left", type: "name" },
{ label: "申请单号", prop: 'requestNumber' },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
{ label: "确认时间", prop: 'confirmTime' },
// ************** 确认隐藏 ************************
// { label: "创建者ID", prop: 'creatorId' },
// { label: "上次修改者ID", prop: "lastModifierId" },
// { label: "事务ID", prop: "tenantId" },
// ************** 确认隐藏 ************************
{ label: "确认时间", prop: 'confirmTime',type: "dateTime" },
{ label: "任务代码", prop: 'jobNumber' },
{ label: "备注", prop: "remark" },
{ label: "操作员", prop: "worker" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
// 人工发料申请(装配)
// 装配申请
export const IssueRequestZP = [
{
label: "叫料申请编号",
prop: "number",
fixed: "left",
type: "name",
width: orderWidth
},
{ label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "请求单号", prop: "number", fixed: "left", type: "name" },
{ label: "状态", prop: "requestStatus", type: "filter", filters: "requestStatus" },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true },
{ label: "目标库位代码", prop: "toLocationCode" },
{ label: "目标ERP库位", prop: "toLocationErpCode" },
{ label: "备注", prop: "remark" },
{ label: "操作员", prop: "worker" },
{ label: "备注", prop: 'remark' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "叫料类型", prop: 'type' },
{ label: "备料计划单号", prop: 'preparationPlanNumber',width: orderWidth },
{ label: "生产线", prop: 'prodLine' },
{ label: "车间", prop: 'workshop' },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
// ************** 确认隐藏 ************************
// { 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: 'creatorId' },
// { label: "事务ID", prop: "tenantId" },
// ************** 确认隐藏 ************************
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
// 人工发料任务(装配)
export const IssueJobZP = [
{
label: "发料任务编号",
prop: "number",
fixed: "left",
type: "name",
width: orderWidth
},
{ label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
{ label: "申请单号", prop: "materialRequestNumber",width: orderWidth },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "完成时间", prop: "completeTime", type: "dateTime" },
{ label: "操作员", prop: 'worker' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "备注", prop: 'remark' },
{ label: "仓库代码", prop: 'warehouseCode' },
{ label: "上游任务编号", prop: 'upStreamJobNumber' },
{ label: "任务类型", prop: 'jobType' },
{ label: "优先级", prop: 'priority' },
{ label: "优先级增量", prop: 'priorityIncrement' },
{ label: "工作组", prop: 'workGroupCode' },
// 装配任务
export const IssueJobZP = [
{ label: "任务单号", prop: "number", fixed: "left", type: "name" },
{ label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ 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: 'completeUserName' },
{ label: "完成时间", prop: 'completeTime',type: "dateTime" },
{ label: "任务描述", prop: 'jobDescription' },
{ label: "叫料请求类型", prop: 'requestType' },
{ label: "生产线", prop: 'prodLine' },
{ label: "车间", prop: 'workshop' },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
// ************** 确认隐藏 ************************
// { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" },
// { label: "创建者ID", prop: 'creatorId' },
// { label: "上次修改者ID", prop: "lastModifierId" },
// { label: "事务ID", prop: "tenantId" },
// { label: "承接者ID", prop: 'acceptUserId' },
// { label: "完成者", prop: 'completeUserId' },
// ************** 确认隐藏 ************************
]
// 人工发料记录(装配)
export const IssueNoteZP = [
{
label: "发料记录单号",
prop: "number",
fixed: "left",
type: "name",
width: orderWidth
},
{ label: "申请单号", prop: 'requestNumber',width: orderWidth },
{ label: "任务单号", prop: 'jobNumber',width: orderWidth },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "操作员", prop: 'worker' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "备注", prop: 'remark' },
{ label: "生效日期", prop: 'activeDate',type: "dateTime" },
{ label: "车间", prop: 'workshop' },
{ label: "叫料请求类型", prop: 'requestType' },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
{ label: "确认时间", prop: 'confirmTime' },
// ************** 确认隐藏 ************************
// { label: "创建者ID", prop: 'creatorId' },
// { label: "上次修改者ID", prop: "lastModifierId" },
// { label: "事务ID", prop: "tenantId" },
// ************** 确认隐藏 ************************
]
// 自动叫料(注塑)申申请
export const automaticRequestZS = [
{
label: "申请编号",
prop: "number",
fixed: "left",
type: "name",
width: orderWidth
},
{ label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
{ label: "叫料库位代码", prop: "toLocationCode" },
{ label: "目标ERP库位", prop: "toLocationErpCode" },
{ label: "操作员", prop: "worker" },
{ label: "备注", prop: 'remark' },
{ label: "使用在途库", prop: 'isUseOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
// { label: "创建时间", prop: "creationTime", type: "dateTime" },
// { label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true },
// { label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
]
// 自动叫料(注塑)申任务
export const automaticJobZS = [
{
label: "任务编号",
prop: "number",
fixed: "left",
type: "name",
width: orderWidth
},
{ label: "要货单号", prop: 'injectionIssueRequestNumber' },
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
{ label: "生产线", prop: 'prodLine' },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "操作员", prop: 'worker' },
{ label: "备注", prop: 'remark' },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
]
// 自动叫料(注塑)申记录
export const automaticNoteZS = [
{
label: "记录单号",
prop: "number",
fixed: "left",
type: "name",
width: orderWidth
},
{ label: "申请单号", prop: 'requestNumber',width: orderWidth },
{ label: "任务单号", prop: 'jobNumber',width: orderWidth },
{ label: "操作员", prop: 'worker' },
{ label: "备注", prop: 'remark' },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
{ label: "确认时间", prop: 'confirmTime' },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
]
// 自动叫料(喷涂)申请
export const automaticRequestPT = [
{
label: "申请编号",
prop: "number",
fixed: "left",
type: "name",
width: orderWidth
},
{ label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
{ label: "叫料库位代码", prop: "toLocationCode" },
{ label: "目标ERP库位", prop: "toLocationErpCode" },
{ label: "备注", prop: "remark" },
{ label: "操作员", prop: "worker" },
{ label: "备注", prop: 'remark' },
{ label: "使用在途库", prop: 'isUseOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
// { label: "创建时间", prop: "creationTime", type: "dateTime" },
// { label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true },
// { label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
]
// 自动叫料(喷涂)申任务
export const automaticJobPT = [
{
label: "任务编号",
prop: "number",
fixed: "left",
type: "name",
width: orderWidth
},
{ label: "要货单号", prop: 'injectionIssueRequestNumber' },
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
{ label: "生产线", prop: 'prodLine' },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "操作员", prop: 'worker' },
{ label: "备注", prop: 'remark' },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
// 自动叫料(喷涂)申记录
export const automaticNotePT = [
{
label: "记录单号",
prop: "number",
fixed: "left",
type: "name",
width: orderWidth
},
{ label: "申请单号", prop: 'requestNumber',width: orderWidth },
{ label: "任务单号", prop: 'jobNumber',width: orderWidth },
{ label: "操作员", prop: 'worker' },
{ label: "备注", prop: 'remark' },
// 装配记录
export const IssueNoteZP = [
{ label: "记录单号", prop: "number", fixed: "left", type: "name" },
{ label: "申请单号", prop: 'requestNumber' },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
{ label: "确认时间", prop: 'confirmTime' },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
]
// 自动叫料(装配)申请
export const automaticRequestZP = [
{
label: "申请编号",
prop: "number",
fixed: "left",
type: "name",
width: orderWidth
},
{ label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
{ label: "叫料库位代码", prop: "toLocationCode" },
{ label: "目标ERP库位", prop: "toLocationErpCode" },
{ label: "确认时间", prop: 'confirmTime',type: "dateTime" },
{ label: "任务代码", prop: 'jobNumber' },
{ label: "备注", prop: "remark" },
{ label: "操作员", prop: "worker" },
{ label: "备注", prop: 'remark' },
{ label: "使用在途库", prop: 'isUseOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
// { label: "创建时间", prop: "creationTime", type: "dateTime" },
// { label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true },
// { label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
]
// 自动叫料(装配)申任务
export const automaticJobZP = [
{
label: "任务编号",
prop: "number",
fixed: "left",
type: "name",
width: orderWidth
},
{ label: "要货单号", prop: 'injectionIssueRequestNumber' },
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
{ label: "生产线", prop: 'prodLine' },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "操作员", prop: 'worker' },
{ label: "备注", prop: 'remark' },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
]
// 自动叫料(装配)申记录
export const automaticNoteZP = [
{
label: "记录单号",
prop: "number",
fixed: "left",
type: "name",
width: orderWidth
},
{ label: "申请单号", prop: 'requestNumber',width: orderWidth },
{ label: "任务单号", prop: 'jobNumber',width: orderWidth },
{ label: "操作员", prop: 'worker' },
{ label: "备注", prop: 'remark' },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
{ label: "确认时间", prop: 'confirmTime' },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
// 业务库移申请

450
fe/PC/src/utils/tabsDesTions/index.js

@ -3120,403 +3120,151 @@ export const completDumpNoteZP = [
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
]
// 人工注塑申请
// 注塑申请
export const IssueRequestZS = [
{
label: "申请编号",
prop: "number",
fixed: "left",
type: "name",
},
{ label: "请求单号", prop: "number", fixed: "left", type: "name" },
{ label: "状态", prop: "requestStatus", type: "filter", filters: "requestStatus" },
{ label: "叫料库位代码", prop: "toLocationCode" },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true },
{ label: "目标库位代码", prop: "toLocationCode" },
{ label: "目标ERP库位", prop: "toLocationErpCode" },
{ label: "备注", prop: "remark" },
{ label: "操作员", prop: "worker" },
{ label: "备注", prop: 'remark' },
{ label: "使用在途库", prop: 'isUseOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
// { label: "创建时间", prop: "creationTime", type: "dateTime" },
// { label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true },
// { label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
// 人工注塑任务
// 注塑任务
export const IssueJobZS = [
{
label: "任务编号",
prop: "number",
fixed: "left",
type: "name",
},
{ label: "要货单号", prop: 'injectionIssueRequestNumber' },
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "任务单号", prop: "number", fixed: "left", type: "name" },
{ label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ 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: 'completeUserName' },
{ label: "完成时间", prop: 'completeTime',type: "dateTime" },
{ label: "任务描述", prop: 'jobDescription' },
{ label: "生产线", prop: 'prodLine' },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "操作员", prop: 'worker' },
{ label: "备注", prop: 'remark' },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "备注", prop: "remark" },
{ label: "操作员", prop: "worker" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
// 人工注塑记录
// 注塑记录
export const IssueNoteZS = [
{
label: "记录单号",
prop: "number",
fixed: "left",
type: "name",
},
{ label: "记录单号", prop: "number", fixed: "left", type: "name" },
{ label: "申请单号", prop: 'requestNumber' },
{ label: "任务单号", prop: 'jobNumber' },
{ label: "操作员", prop: 'worker' },
{ label: "备注", prop: 'remark' },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
{ label: "确认时间", prop: 'confirmTime' },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "确认时间", prop: 'confirmTime',type: "dateTime" },
{ label: "任务代码", prop: 'jobNumber' },
{ label: "备注", prop: "remark" },
{ label: "操作员", prop: "worker" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
// 人工发料申请(喷涂)
// 喷涂申请
export const IssueRequestPT = [
{
label: "叫料申请编号",
prop: "number",
fixed: "left",
type: "name",
},
{ label: "请求单号", prop: "number", fixed: "left", type: "name" },
{ label: "状态", prop: "requestStatus", type: "filter", filters: "requestStatus" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true },
{ label: "目标库位代码", prop: "toLocationCode" },
{ label: "目标ERP库位", prop: "toLocationErpCode" },
{ label: "备注", prop: "remark" },
{ label: "操作员", prop: "worker" },
{ label: "备注", prop: 'remark' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "叫料类型", prop: 'type' },
{ label: "备料计划单号", prop: 'preparationPlanNumber' },
{ label: "生产线", prop: 'prodLine' },
{ label: "车间", prop: 'workshop' },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
// ************** 确认隐藏 ************************
// { 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: 'creatorId' },
// { label: "事务ID", prop: "tenantId" },
// ************** 确认隐藏 ************************
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
// 人工发料任务(喷涂)
// 喷涂任务
export const IssueJobPT = [
{
label: "发料任务编号",
prop: "number",
fixed: "left",
type: "name",
},
{ label: "任务单号", prop: "number", fixed: "left", type: "name" },
{ label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
{ label: "申请单号", prop: "materialRequestNumber" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "完成时间", prop: "completeTime", type: "dateTime" },
{ label: "操作员", prop: 'worker' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "备注", prop: 'remark' },
{ label: "仓库代码", prop: 'warehouseCode' },
{ label: "上游任务编号", prop: 'upStreamJobNumber' },
{ label: "任务类型", prop: 'jobType' },
{ label: "优先级", prop: 'priority' },
{ label: "优先级增量", prop: 'priorityIncrement' },
{ label: "工作组", prop: 'workGroupCode' },
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ 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: 'completeUserName' },
{ label: "完成时间", prop: 'completeTime',type: "dateTime" },
{ label: "任务描述", prop: 'jobDescription' },
{ label: "叫料请求类型", prop: 'requestType' },
{ label: "生产线", prop: 'prodLine' },
{ label: "车间", prop: 'workshop' },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
// ************** 确认隐藏 ************************
// { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" },
// { label: "创建者ID", prop: 'creatorId' },
// { label: "上次修改者ID", prop: "lastModifierId" },
// { label: "事务ID", prop: "tenantId" },
// { label: "承接者ID", prop: 'acceptUserId' },
// { label: "完成者", prop: 'completeUserId' },
// ************** 确认隐藏 ************************
{ label: "备注", prop: "remark" },
{ label: "操作员", prop: "worker" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
// 人工发料记录(喷涂)
// 喷涂记录
export const IssueNotePT = [
{
label: "发料记录单号",
prop: "number",
fixed: "left",
type: "name",
},
{ label: "记录单号", prop: "number", fixed: "left", type: "name" },
{ label: "申请单号", prop: 'requestNumber' },
{ label: "任务单号", prop: 'jobNumber' },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "操作员", prop: 'worker' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "备注", prop: 'remark' },
{ label: "生效日期", prop: 'activeDate',type: "dateTime" },
{ label: "车间", prop: 'workshop' },
{ label: "叫料请求类型", prop: 'requestType' },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
{ label: "确认时间", prop: 'confirmTime' },
// ************** 确认隐藏 ************************
// { label: "创建者ID", prop: 'creatorId' },
// { label: "上次修改者ID", prop: "lastModifierId" },
// { label: "事务ID", prop: "tenantId" },
// ************** 确认隐藏 ************************
]
// 人工发料申请(装配)
export const IssueRequestZP = [
{ label: "申请编号", prop: "number" },
{ label: "状态", prop: "requestStatus",type: "filter", filters: "requestStatus" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "确认时间", prop: 'confirmTime',type: "dateTime" },
{ label: "任务代码", prop: 'jobNumber' },
{ label: "备注", prop: "remark" },
{ label: "操作员", prop: "worker" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: "lastModifierId" },
{ 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: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "备注", prop: 'remark' },
{ label: "创建者ID", prop: "creatorId" },
{ label: "事务ID", prop: "tenantId" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "备料计划单号", prop: 'preparationPlanNumber' },
{ label: "生产线", prop: 'prodLine' },
{ label: "车间", prop: 'workshop' },
// ************** 确认隐藏 ************************
// { label: "ID", prop: 'id' },
// { label: "叫料类型", prop: 'type' },
// ************** 确认隐藏 ************************
]
// 人工发料任务(装配)
export const IssueJobZP = [
{ label: "发料任务编号", prop: "number" },
{ label: "申请单号", prop: "materialRequestNumber" },
{ label: "状态", prop: "jobStatus", type: "filter", filters: "jobStatus" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "操作员", prop: 'worker' },
{ label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" },
{ label: "承接用户", prop: 'acceptUserName' },
{ label: "承接时间", prop: 'acceptTime', type: "dateTime" },
{ label: "完成用户", prop: 'completeUserName' },
{ label: "完成时间", prop: "completeTime", type: "dateTime" },
{ label: "叫料请求类型", prop: 'requestType' },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "备注", prop: 'remark' },
{ label: "上游任务编号", prop: 'upStreamJobNumber',},
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "优先级", prop: 'priority' },
{ label: "优先级增量", prop: 'priorityIncrement' },
{ label: "事务ID", prop: "tenantId" },
{ label: "工作组", prop: 'workGroupCode' },
{ label: "创建者ID", prop: "creatorId" },
{ label: "承接者ID", prop: 'acceptUserId' },
{ label: "完成者ID", prop: 'completeUserId' },
{ label: "任务描述", prop: 'jobDescription' },
{ label: "生产线", prop: 'prodLine' },
{ label: "车间", prop: 'workshop' },
{ label: "仓库代码", prop: 'warehouseCode' },
// ************** 确认隐藏 ************************
// { label: "ID", prop: 'id' },
// ************** 确认隐藏 ************************
]
// 人工发料记录(装配)
export const IssueNoteZP = [
{ label: "发料记录单号", prop: "number" },
{ label: "申请单号", prop: 'requestNumber' },
{ label: "任务单号", prop: 'jobNumber' },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "操作员", prop: 'worker' },
{ label: "叫料请求类型", prop: 'requestType' },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "创建者ID", prop: "creatorId" },
{ label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "车间", prop: 'workshop' },
{ label: "确认时间", prop: 'confirmTime', type: "dateTime" },
// ************** 确认隐藏 ************************
// { label: "ID", prop: 'id' },
// ************** 确认隐藏 ************************
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
// 自动叫料(注塑)申请
export const automaticRequestZS = [
{
label: "申请编号",
prop: "number",
fixed: "left",
type: "name",
},
// 装配申请
export const IssueRequestZP = [
{ label: "请求单号", prop: "number", fixed: "left", type: "name" },
{ label: "状态", prop: "requestStatus", type: "filter", filters: "requestStatus" },
{ label: "叫料库位代码", prop: "toLocationCode" },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true },
{ label: "目标库位代码", prop: "toLocationCode" },
{ label: "目标ERP库位", prop: "toLocationErpCode" },
{ label: "备注", prop: "remark" },
{ label: "操作员", prop: "worker" },
{ label: "备注", prop: 'remark' },
{ label: "使用在途库", prop: 'isUseOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
// { label: "创建时间", prop: "creationTime", type: "dateTime" },
// { label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true },
// { label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
// 自动叫料(注塑)任务
export const automaticJobZS = [
{
label: "任务编号",
prop: "number",
fixed: "left",
type: "name",
},
{ label: "要货单号", prop: 'injectionIssueRequestNumber' },
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
// 装配任务
export const IssueJobZP = [
{ label: "任务单号", prop: "number", fixed: "left", type: "name" },
{ label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
{ label: "生产线", prop: 'prodLine' },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "操作员", prop: 'worker' },
{ label: "备注", prop: 'remark' },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
]
// 自动叫料(注塑)记录
export const automaticNoteZS = [
{
label: "记录单号",
prop: "number",
fixed: "left",
type: "name",
},
{ label: "申请单号", prop: 'requestNumber' },
{ label: "任务单号", prop: 'jobNumber' },
{ label: "操作员", prop: 'worker' },
{ label: "备注", prop: 'remark' },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
{ label: "确认时间", prop: 'confirmTime' },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
]
// 自动叫料(喷涂)申请
export const automaticRequestPT = [
{
label: "申请编号",
prop: "number",
fixed: "left",
type: "name",
},
{ label: "状态", prop: "requestStatus", type: "filter", filters: "requestStatus" },
{ label: "叫料库位代码", prop: "toLocationCode" },
{ label: "目标ERP库位", prop: "toLocationErpCode" },
{ label: "操作员", prop: "worker" },
{ label: "备注", prop: 'remark' },
{ label: "使用在途库", prop: 'isUseOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
// { label: "创建时间", prop: "creationTime", type: "dateTime" },
// { label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true },
// { label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
]
// 自动叫料(喷涂)任务
export const automaticJobPT = [
{
label: "任务编号",
prop: "number",
fixed: "left",
type: "name",
},
{ label: "要货单号", prop: 'injectionIssueRequestNumber' },
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
{ 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: 'completeUserName' },
{ label: "完成时间", prop: 'completeTime',type: "dateTime" },
{ label: "任务描述", prop: 'jobDescription' },
{ label: "生产线", prop: 'prodLine' },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "操作员", prop: 'worker' },
{ label: "备注", prop: 'remark' },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
]
// 自动叫料(喷涂)记录
export const automaticNotePT = [
{
label: "记录单号",
prop: "number",
fixed: "left",
type: "name",
},
{ label: "申请单号", prop: 'requestNumber' },
{ label: "任务单号", prop: 'jobNumber' },
{ label: "操作员", prop: 'worker' },
{ label: "备注", prop: 'remark' },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
{ label: "确认时间", prop: 'confirmTime' },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
]
// 自动叫料(装配)申请
export const automaticRequestZP = [
{
label: "申请编号",
prop: "number",
fixed: "left",
type: "name",
},
{ label: "状态", prop: "requestStatus", type: "filter", filters: "requestStatus" },
{ label: "叫料库位代码", prop: "toLocationCode" },
{ label: "目标ERP库位", prop: "toLocationErpCode" },
{ label: "备注", prop: "remark" },
{ label: "操作员", prop: "worker" },
{ label: "备注", prop: 'remark' },
{ label: "使用在途库", prop: 'isUseOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
// { label: "创建时间", prop: "creationTime", type: "dateTime" },
// { label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true },
// { label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
]
// 自动叫料(装配)任务
export const automaticJobZP = [
{
label: "任务编号",
prop: "number",
fixed: "left",
type: "name",
},
{ label: "要货单号", prop: 'injectionIssueRequestNumber' },
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
{ label: "生产线", prop: 'prodLine' },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "操作员", prop: 'worker' },
{ label: "备注", prop: 'remark' },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
// 自动叫料(装配)记录
export const automaticNoteZP = [
{
label: "记录单号",
prop: "number",
fixed: "left",
type: "name",
},
// 装配记录
export const IssueNoteZP = [
{ label: "记录单号", prop: "number", fixed: "left", type: "name" },
{ label: "申请单号", prop: 'requestNumber' },
{ label: "任务单号", prop: 'jobNumber' },
{ label: "操作员", prop: 'worker' },
{ label: "备注", prop: 'remark' },
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
{ label: "确认时间", prop: 'confirmTime' },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "确认时间", prop: 'confirmTime',type: "dateTime" },
{ label: "任务代码", prop: 'jobNumber' },
{ label: "备注", prop: "remark" },
{ label: "操作员", prop: "worker" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
// 业务库移申请
@ -3767,4 +3515,4 @@ export const isPadForTransferLibJob = [
{ label: "完成时间", prop: "completeTime", type: "dateTime" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
]

2
fe/PC/src/views/materialIssueManage/PT/IssueJobPT.vue → fe/PC/src/views/materialIssuePT/IssueJobPT.vue

@ -88,7 +88,7 @@ export default {
},
data() {
return {
URL: "wms/store/issue-job",
URL: "wms/store/coating-issue-job",
//
currenButtonData: [
// this.defaultImportBtn(),//

2
fe/PC/src/views/materialIssueManage/PT/IssueNotePT.vue → fe/PC/src/views/materialIssuePT/IssueNotePT.vue

@ -72,7 +72,7 @@ export default {
],
data() {
return {
URL: "wms/store/issue-note",
URL: "wms/store/coating-issue-note",
//
currenButtonData: [
// this.defaultImportBtn(),//

4
fe/PC/src/views/materialIssueManage/PT/IssueRequestPT.vue → fe/PC/src/views/materialIssuePT/IssueRequestPT.vue

@ -86,7 +86,7 @@ export default {
},
data() {
return {
URL: "wms/store/material-request",
URL: "wms/store/coating-issue-request",
//
currenButtonData: [
// this.defaultImportBtn(),//
@ -102,7 +102,7 @@ export default {
name: "handleGetIds",
hide: () => { return this.hideButton([1,5,9]) },
size: 'mini',
handleGetJobsUrl:'wms/store/material-job',
handleGetJobsUrl:'wms/store/coating-issue-job',
// handleRequestUrl:'wms/store/kitting-issue-request',
},
{

2
fe/PC/src/views/materialIssueManage/ZP/IssueJobZP.vue → fe/PC/src/views/materialIssueZP/IssueJobZP.vue

@ -88,7 +88,7 @@ export default {
},
data() {
return {
URL: "wms/store/issue-job",
URL: "wms/store/assemble-issue-job",
//
currenButtonData: [
// this.defaultImportBtn(),//

2
fe/PC/src/views/materialIssueManage/ZP/IssueNoteZP.vue → fe/PC/src/views/materialIssueZP/IssueNoteZP.vue

@ -72,7 +72,7 @@ export default {
],
data() {
return {
URL: "wms/store/issue-note",
URL: "wms/store/assemble-issue-note",
//
currenButtonData: [
// this.defaultImportBtn(),//

4
fe/PC/src/views/materialIssueManage/ZP/IssueRequestZP.vue → fe/PC/src/views/materialIssueZP/IssueRequestZP.vue

@ -86,7 +86,7 @@ export default {
},
data() {
return {
URL: "wms/store/material-request",
URL: "wms/store/assemble-issue-request",
//
currenButtonData: [
// this.defaultImportBtn(),//
@ -102,7 +102,7 @@ export default {
name: "handleGetIds",
hide: () => { return this.hideButton([1,5,9]) },
size: 'mini',
handleGetJobsUrl:'wms/store/material-job',
handleGetJobsUrl:'wms/store/assemble-issue-job',
// handleRequestUrl:'wms/store/kitting-issue-request',
},
{

0
fe/PC/src/views/materialIssueManage/ZS/IssueJobZS.vue → fe/PC/src/views/materialIssueZS/IssueJobZS.vue

0
fe/PC/src/views/materialIssueManage/ZS/IssueNoteZS.vue → fe/PC/src/views/materialIssueZS/IssueNoteZS.vue

2
fe/PC/src/views/materialIssueManage/ZS/IssuePlanZS.vue → fe/PC/src/views/materialIssueZS/IssuePlanZS.vue

@ -286,7 +286,7 @@ export default {
};
</script>
<style lang="scss" scoped>
@import "../../../styles/basicData.scss";
@import "@/styles/basicData.scss";
.controlBarButton{
color:#409EFF;
cursor:pointer;

0
fe/PC/src/views/materialIssueManage/ZS/IssueRequestZS.vue → fe/PC/src/views/materialIssueZS/IssueRequestZS.vue

4
fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue

@ -411,7 +411,7 @@ export default {
{ type: "input", label: "物品名称", prop: "itemName", disabled: true, colSpan: 12 },
{ type: "input", label: "箱码", prop: "packingCode", disabled: true, colSpan: 12 },
{ type: "select", label: "外观", prop: "appearance", options: "inspectAppearanceStatus", colSpan: 12 },
{ type: "input", label: "尺寸", prop: "volume", colSpan: 12 },
// { type: "input", label: "", prop: "volume", colSpan: 12 },
{ type: "input", label: "重量", prop: "weight", colSpan: 12 },
{ type: "inputNumber", label: "检验数量", prop: "inspectQty", colSpan: 12 },
{ type: "button", label: "其他", buttonText: "添加", click: (val) => { this.inspectAddTable(val) }, colSpan: 24 },
@ -548,7 +548,7 @@ export default {
{ type: "input", label: "不合格数量", prop: "failedQty", disabled: true, colSpan: 8 },
{ type: "input", label: "合格数量", prop: "goodQty", disabled: true, colSpan: 8 },
{ type: "select", label: "ABC类", prop: "abcClass", options: "abcClass", clearable: true, filterable: true, disabled: true, allowCreate: true, colSpan: 8 },
{ type: "uploadList", label: "检报告", prop: "formFile", limit: 1, picExt: ".pdf", colSpan: 12 },
{ type: "uploadList", label: "供应商自检报告", prop: "formFile", limit: 1, picExt: ".pdf", colSpan: 12 },
],
inspectNoticeDetailsRules: {
// formFile: { required: true, trigger: "change", message: "" },

Loading…
Cancel
Save