From debf7831f32ced80c5c619c8f8248a2443282a62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Thu, 28 Mar 2024 17:24:35 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90NEV-PC=E3=80=91=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
fe/PC/src/api/wms-api.js | 25 +
fe/PC/src/components/currenForm/index.vue | 4 +-
fe/PC/src/router/index.js | 176 +++++-
fe/PC/src/utils/detailsTableColumns/index.js | 589 ++++++++++++++++++
fe/PC/src/utils/tableColumns/index.js | 331 +++++++++-
fe/PC/src/utils/tabsDesTions/index.js | 311 ++++++++-
.../WorkshopManage/ProductionLine.vue | 155 +++--
.../deliver/FISDeliverJob.vue | 111 ++++
.../dismantle/customerDismantleJob.vue | 231 +++++--
.../InventoryQuery/LibraryShiftJob.vue | 548 ++++++++++++++++
.../InventoryQuery/LibraryShiftNote.vue | 129 ++++
.../InventoryQuery/LibraryShiftRequest.vue | 228 +++++++
.../materialIssueManage/PT/IssueJobPT.vue | 548 ++++++++++++++++
.../materialIssueManage/PT/IssueNotePT.vue | 129 ++++
.../materialIssueManage/PT/IssueRequestPT.vue | 228 +++++++
.../materialIssueManage/ZS/IssueJobZS.vue | 548 ++++++++++++++++
.../materialIssueManage/ZS/IssueNoteZS.vue | 129 ++++
.../materialIssueManage/ZS/IssueRequestZS.vue | 228 +++++++
.../quality/InspectRequest.vue | 29 +-
19 files changed, 4516 insertions(+), 161 deletions(-)
create mode 100644 fe/PC/src/views/finishedProductManage/deliver/FISDeliverJob.vue
create mode 100644 fe/PC/src/views/inventoryManage/InventoryQuery/LibraryShiftJob.vue
create mode 100644 fe/PC/src/views/inventoryManage/InventoryQuery/LibraryShiftNote.vue
create mode 100644 fe/PC/src/views/inventoryManage/InventoryQuery/LibraryShiftRequest.vue
create mode 100644 fe/PC/src/views/materialIssueManage/PT/IssueJobPT.vue
create mode 100644 fe/PC/src/views/materialIssueManage/PT/IssueNotePT.vue
create mode 100644 fe/PC/src/views/materialIssueManage/PT/IssueRequestPT.vue
create mode 100644 fe/PC/src/views/materialIssueManage/ZS/IssueJobZS.vue
create mode 100644 fe/PC/src/views/materialIssueManage/ZS/IssueNoteZS.vue
create mode 100644 fe/PC/src/views/materialIssueManage/ZS/IssueRequestZS.vue
diff --git a/fe/PC/src/api/wms-api.js b/fe/PC/src/api/wms-api.js
index c89b8568d..bb73b544e 100644
--- a/fe/PC/src/api/wms-api.js
+++ b/fe/PC/src/api/wms-api.js
@@ -639,6 +639,31 @@ export async function itemTransformNewCreate(data) {
})
}
+// 获取bom
+export function getBomByComponentTree(code) {
+ return request({
+ url: baseURL + 'basedata/bom/get-list-by-component-with-tree/?component=' + code,
+ method: 'get'
+ })
+}
+
+// 客户退拆任务-执行提交
+export async function productionRecycleJobHandle(id,data) {
+ return request({
+ url: baseURL + 'wms/store/production-recycle-job/handle/'+id,
+ method: 'post',
+ data:data
+ })
+}
+
+// 客户退拆任务-执行后打印
+export async function productRecycleNoteExport(data) {
+ return request({
+ url: baseURL + 'wms/store/product-recycle-note/export-product-recycle',
+ method: 'post',
+ data:data
+ })
+}
// 根据编号获取字典信息
// export function getDictByCode(code) {
diff --git a/fe/PC/src/components/currenForm/index.vue b/fe/PC/src/components/currenForm/index.vue
index 0f4d5fb5f..a213c38b8 100644
--- a/fe/PC/src/components/currenForm/index.vue
+++ b/fe/PC/src/components/currenForm/index.vue
@@ -851,7 +851,9 @@ export default {
changeSelect(prop, val) {
this.$emit("changeSelect", prop, val)
},
-
+ resetCurrenForm() {
+ this.$refs.form.resetFields();
+ },
restrictionRule(item, prop) {
if(prop) {
diff --git a/fe/PC/src/router/index.js b/fe/PC/src/router/index.js
index 7a79880fe..2bded652b 100644
--- a/fe/PC/src/router/index.js
+++ b/fe/PC/src/router/index.js
@@ -158,22 +158,6 @@ export const constantRoutes = [
}
}]
},
- {
- path: '/',
- component: Layout,
- redirect: '/gridlayout',
- hidden: true,
- children: [{
- path: 'customerDismantleJob',
- component: () => import('@/views/finishedProductManage/dismantle/customerDismantleJob.vue'),
- name: 'customerDismantleJob',
- meta: {
- keepAlive : true,
- title: '客户退拆任务',
- icon: '系统首页',
- }
- }]
- },
{
path: '/',
component: Layout,
@@ -222,6 +206,166 @@ export const constantRoutes = [
}
}]
},
+ {
+ path: '/',
+ component: Layout,
+ redirect: '/gridlayout',
+ hidden: true,
+ children: [{
+ path: 'FISDeliverJob',
+ component: () => import('@/views/finishedProductManage/deliver/FISDeliverJob.vue'),
+ name: 'FISDeliverJob',
+ meta: {
+ keepAlive : true,
+ title: '成品发运任务',
+ icon: '成品发运任务',
+ }
+ }]
+ },
+ {
+ path: '/',
+ component: Layout,
+ redirect: '/gridlayout',
+ hidden: true,
+ children: [{
+ path: 'IssueRequestZS',
+ component: () => import('@/views/materialIssueManage/ZS/IssueRequestZS.vue'),
+ name: 'IssueRequestZS',
+ meta: {
+ keepAlive : true,
+ title: '人工发料申请（注塑）',
+ icon: '成品发运任务',
+ }
+ }]
+ },
+ {
+ path: '/',
+ component: Layout,
+ redirect: '/gridlayout',
+ hidden: true,
+ children: [{
+ path: 'IssueJobZS',
+ component: () => import('@/views/materialIssueManage/ZS/IssueJobZS.vue'),
+ name: 'IssueJobZS',
+ meta: {
+ keepAlive : true,
+ title: '人工发料任务（注塑）',
+ icon: '成品发运任务',
+ }
+ }]
+ },
+ {
+ path: '/',
+ component: Layout,
+ redirect: '/gridlayout',
+ hidden: true,
+ children: [{
+ path: 'IssueNoteZS',
+ component: () => import('@/views/materialIssueManage/ZS/IssueNoteZS.vue'),
+ name: 'IssueNoteZS',
+ meta: {
+ keepAlive : true,
+ title: '人工发料记录（注塑）',
+ icon: '成品发运任务',
+ }
+ }]
+ },
+ {
+ path: '/',
+ component: Layout,
+ redirect: '/gridlayout',
+ hidden: true,
+ children: [{
+ path: 'IssueRequestPT',
+ component: () => import('@/views/materialIssueManage/PT/IssueRequestPT.vue'),
+ name: 'IssueRequestPT',
+ meta: {
+ keepAlive : true,
+ title: '人工发料申请（喷涂）',
+ icon: '成品发运任务',
+ }
+ }]
+ },
+ {
+ path: '/',
+ component: Layout,
+ redirect: '/gridlayout',
+ hidden: true,
+ children: [{
+ path: 'IssueJobPT',
+ component: () => import('@/views/materialIssueManage/PT/IssueJobPT.vue'),
+ name: 'IssueJobPT',
+ meta: {
+ keepAlive : true,
+ title: '人工发料任务（喷涂）',
+ icon: '成品发运任务',
+ }
+ }]
+ },
+ {
+ path: '/',
+ component: Layout,
+ redirect: '/gridlayout',
+ hidden: true,
+ children: [{
+ path: 'IssueNotePT',
+ component: () => import('@/views/materialIssueManage/PT/IssueNotePT.vue'),
+ name: 'IssueNotePT',
+ meta: {
+ keepAlive : true,
+ title: '人工发料记录（喷涂）',
+ icon: '成品发运任务',
+ }
+ }]
+ },
+ {
+ path: '/',
+ component: Layout,
+ redirect: '/gridlayout',
+ hidden: true,
+ children: [{
+ path: 'LibraryShiftRequest',
+ component: () => import('@/views/inventoryManage/InventoryQuery/LibraryShiftRequest.vue'),
+ name: 'LibraryShiftRequest',
+ meta: {
+ keepAlive : true,
+ title: '库存转移申请',
+ icon: '成品发运任务',
+ }
+ }]
+ },
+ {
+ path: '/',
+ component: Layout,
+ redirect: '/gridlayout',
+ hidden: true,
+ children: [{
+ path: 'LibraryShiftJob',
+ component: () => import('@/views/inventoryManage/InventoryQuery/LibraryShiftJob.vue'),
+ name: 'LibraryShiftJob',
+ meta: {
+ keepAlive : true,
+ title: '库存转移任务',
+ icon: '成品发运任务',
+ }
+ }]
+ },
+ {
+ path: '/',
+ component: Layout,
+ redirect: '/gridlayout',
+ hidden: true,
+ children: [{
+ path: 'LibraryShiftNote',
+ component: () => import('@/views/inventoryManage/InventoryQuery/LibraryShiftNote.vue'),
+ name: 'LibraryShiftNote',
+ meta: {
+ keepAlive : true,
+ title: '库存转移记录',
+ icon: '成品发运任务',
+ }
+ }]
+ },
]
/**
diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js
index a9c732d61..bbc785bee 100644
--- a/fe/PC/src/utils/detailsTableColumns/index.js
+++ b/fe/PC/src/utils/detailsTableColumns/index.js
@@ -1622,6 +1622,33 @@ export const FISDeliverRequest = [
// { label: "主表ID", prop: "masterID" },
// ************** 确定隐藏 ************************
]
+// 成品发运任务
+export const FISDeliverJob = [
+ { label: "物品代码", prop: "itemCode", fixed: "left" },
+ { label: "物品名称", prop: "itemName" },
+ { label: "物品描述1", prop: "itemDesc1" },
+ { label: "物品描述2", prop: "itemDesc2" },
+ { label: "配置", prop: "item_configurationFromFE" },
+ { label: "出货数量", prop: "qty" },
+ { label: "单位", prop: "uom" },
+ { label: "出货库区", prop: "areaCode" },
+ { label: "起始盘底号", prop: "extraProperties", showProp: 'FromVinCode', type: 'object' },
+ { label: "截止盘底号", prop: "extraProperties", showProp: 'ToVinCode', type: 'object' },
+ { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+ { label: "创建者ID", prop: 'creatorId' },
+ // -----------------------------------------------------------------------
+ { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+ { label: "上次修改者ID", prop: 'lastModifierId' },
+ { label: "任务编号", prop: 'number' },
+ { label: "备注", prop: 'remark' },
+ { label: "标包数量", prop: 'stdPackQty' },
+ { label: "事务ID", prop: "tenantId" },
+ // { label: "起始底盘号",prop: 'extraProperties',type:"object", showProp: 'FromVinCode' },
+ // ************** 确定隐藏 ************************
+ // { label: "ID", prop: 'id' },
+ // { label: "主表ID", prop: "masterID" },
+ // ************** 确定隐藏 ************************
+]
// FIS发货记录 20230415
export const FISDeliverNote = [
{ label: "物品代码", prop: "itemCode", fixed: "left" },
@@ -1724,6 +1751,55 @@ export const customerDismantle = [
// { label: "主表ID", prop: "masterID" },
// ************** 确定隐藏 ************************
]
+// 客户退拆任务 20230415
+export const customerDismantleJob = [
+ { label: "物品代码", prop: "itemCode" },
+ { label: "物品名称", prop: "itemName" },
+ { label: "物品描述1", prop: "itemDesc1" },
+ { label: "物品描述2", prop: "itemDesc2" },
+ { label: "标包数量", prop: 'stdPackQty' },
+ { label: "单位", prop: 'uom' },
+ { label: "数量", prop: 'qty' },
+ { label: "Bom版本", prop: 'bomVersion' },
+ { label: "库位代码", prop: 'locationCode' },
+ { label: "库区", prop:"locationArea" },
+ { label: "库位组", prop: 'locationGroup' },
+ { label: "ERP储位", prop: "locationErpCode" },
+ { label: "原料库位", prop: 'rawLocationCode' },
+ { label: "原料ERP库位", prop: 'rawLocationErpCode' },
+ { label: "原料库位组", prop: 'rawLocationGroup' },
+ { label: "原料库区", prop: 'rawLocationArea' },
+ { label: "原料仓库", prop: 'rawWarehouseCode' },
+ { label: "推荐箱码", prop: "recommendPackingCode" },
+ { label: "实际箱码", prop: "handledPackingCode" },
+ { label: "推荐数量", prop: "recommendQty" },
+ { label: "实际数量", prop: "handledQty" },
+ { label: "推荐库位", prop: "recommendToLocationCode" },
+ { label: "实际库位", prop: "handledToLocationCode" },
+ { label: "推荐ERP库位", prop: 'recommendToLocationErpCode' },
+ { label: "实际ERP库位", prop: "handledToLocationErpCode" },
+ { label: "推荐库位组", prop: "recommendToLocationGroup" },
+ { label: "实际库位组", prop: "handledToLocationGroup" },
+ { label: "推荐库区", prop: "recommendToLocationArea" },
+ { label: "实际库区", prop: "handledToLocationArea" },
+ { label: "推荐仓库", prop: 'recommendToWarehouseCode' },
+ { label: "实际仓库", prop: "handledToWarehouseCode" },
+ { label: "推荐供应商批次", prop: "recommendSupplierBatch" },
+ { label: "实际供应商批次", prop: "handledSupplierBatch" },
+ { label: "推荐到货时间", prop: "recommendArriveDate", type: "dateTime" },
+ { label: "实际到货时间", prop: "handledArriveDate", type: "dateTime" },
+ { label: "推荐生产时间", prop: "recommendProduceDate", type: "dateTime" },
+ { label: "实际生产时间", prop: "handledProduceDate", type: "dateTime" },
+ { label: "推荐过期时间", prop: "recommendExpireDate", type: "dateTime" },
+ { label: "实际过期时间", prop: "handledExpireDate", type: "dateTime" },
+ { label: "推荐批次", prop: "recommendLot" },
+ { label: "实际批次", prop: "handledLot" },
+ { label: "仓库代码", prop: 'warehouseCode' },
+ { label: "任务编号", prop: 'number',width:orderWidth },
+ { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+ { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+ { label: "备注", prop: 'remark' },
+]
// 生产退库申请 20230415
export const productionReturnRequest = [
{ label: "物品代码", prop: "itemCode",fixed:"left" },
@@ -3505,4 +3581,517 @@ export const completDumpNote = [
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "收货单号", prop: 'rpNumber' },
+]
+
+// 人工发料申请（注塑）
+export const IssueRequestZS = [
+ { label: "物品代码", prop: "itemCode" },
+ { label: "物品名称", prop: "itemName" },
+ { label: "物品描述1", prop: "itemDesc1" },
+ { label: "物品描述2", prop: "itemDesc2" },
+ { label: "配置", prop: "item_configurationFromFE" },
+ { label: "状态", prop: "status", type: "filter", filters: "openToClose" },
+ { label: "叫料数量", prop: "qty" },
+ { label: "单位", prop: "uom" },
+ { label: "创建时间", prop: "creationTime", type: "dateTime" },
+ { label: "创建者ID", prop: 'creatorId' },
+ { label: "目标库位", prop: "toLocationCode" },
+ { label: "目标ERP库位", prop: "toLocationErpCode" },
+ { label: "生成任务数量", prop: 'issuedQty' },
+ { label: "已收数量", prop: 'receivedQty' },
+ { label: "单据号", prop: 'number' },
+ // -----------------------------------------------------------------------
+ { label: "标包数量", prop: 'stdPackQty' },
+ { label: "生产线", prop: 'prodLine' },
+ { label: "来源库区", prop: 'fromLocationArea' },
+ { label: "工作中心", prop: 'workStation' },
+ { label: "过期时间", prop: 'expiredTime' },
+ { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+ { label: "上次修改者ID", prop: 'lastModifierId' },
+ { label: "备注", prop: "remark" },
+ { label: "事务ID", prop: "tenantId" },
+ { label: "请求未发", prop: 'toBeIssuedQty' },
+ { label: "已发未收", prop: 'toBeReceivedQty' },
+ { label: "请求未收", prop: 'notFinishQty' },
+ // ************** 确定隐藏 ************************
+ // { label: "主表ID", prop: "masterID" },
+ // { label: "ID", prop: 'id' },
+ // ************** 确定隐藏 ************************
+]
+// 人工发料任务（注塑）
+export const IssueJobZS = [
+ { label: "物品代码", prop: "itemCode", fixed: "left" },
+ { label: "物品名称", prop: "itemName" },
+ { label: "物品描述1", prop: "itemDesc1" },
+ { label: "物品描述2", prop: "itemDesc2" },
+ { label: "配置", prop: "item_configurationFromFE" },
+ { label: "状态", prop: "status", type: "filter", filters: "inventoryStage" },
+ { label: "推荐批次", prop: "recommendLot" },
+ { label: "实际批次", prop: "handledLot" },
+ { label: "推荐数量", prop: 'recommendQty' },
+ { label: "实际数量", prop: 'handledQty' },
+ { label: "推荐箱码", prop: "recommendPackingCode" },
+ { label: "实际箱码", prop: "handledPackingCode" },
+ { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+ { label: "创建者ID", prop: 'creatorId' },
+ { label: "在途库位", prop: 'onTheWayLocationCode' },
+ // -----------------------------------------------------------------------
+ { label: "标包数量", prop: "stdPackQty" },
+ { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+ { label: "上次修改者ID", prop: 'lastModifierId' },
+ { label: "任务编号", prop: 'number',width: orderWidth },
+ { label: "备注", prop: 'remark' },
+ { label: "推荐库位", prop: 'recommendFromLocationCode' },
+ { label: "推荐区域", prop: 'recommendFromLocationArea' },
+ { label: "推荐分组", prop: 'recommendFromLocationGroup' },
+ { label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' },
+ { label: "推荐仓库", prop: 'recommendFromWarehouseCode' },
+ { label: "计量单位", prop: 'uom' },
+ { label: "实际库位", prop: 'handledFromLocationCode' },
+ { label: "实际区域", prop: 'handledFromLocationArea' },
+ { label: "实际分组", prop: 'handledFromLocationGroup' },
+ { label: "实际ERP库位", prop: 'handledFromLocationErpCode' },
+ { label: "实际仓库", prop: 'handledFromWarehouseCode' },
+ { label: "到库区", prop: 'toLocationArea' },
+ { label: "到库位组", prop: 'toLocationGroup' },
+ { label: "到ERP库位", prop: 'toLocationErpCode' },
+ { label: "到仓库", prop: 'toWarehouseCode' },
+ { label: "推荐供应商批次", prop: 'recommendSupplierBatch' },
+ { label: "实际供应商批次", prop: 'handledSupplierBatch' },
+ { label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" },
+ { label: "实际到货时间", prop: 'handledArriveDate', type: "dateTime" },
+ { label: "推荐生产时间", prop: 'recommendProduceDate', type: "dateTime" },
+ { label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" },
+ { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" },
+ { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" },
+ { label: "请求库位", prop: 'requestLocationCode' },
+ { label: "到库位", prop: 'toLocationCode' },
+ { label: "生产线", prop: 'prodLine' },
+ { label: "工作中心", prop: 'workStation' },
+ { label: "过期时间", prop: 'expiredTime' },
+ { label: "工序", prop: 'operation' },
+ { label: "取整后数量", prop: 'roundedQty' },
+ { label: "计划开始时间", prop: 'planBeginTime' },
+ { label: "每次配送数量", prop: 'deliveryQty' },
+ { label: "事务ID", prop: "tenantId" },
+ // ************** 确定隐藏 ************************
+ // { label: "distributionType", prop: 'distributionType' },
+ // { label: "plannedSplitRule", prop: 'plannedSplitRule' },
+ // { label: "truncType", prop: 'truncType' },
+ // { label: "ID", prop: 'id' },
+ // { label: "主表ID", prop: "masterID" },
+ // ************** 确定隐藏 ************************
+]
+// 人工发料记录（注塑）
+export const IssueNoteZS = [
+ { label: "物品代码", prop: "itemCode",fixed: "left" },
+ { label: "物品名称", prop: "itemName" },
+ { label: "物品描述1", prop: "itemDesc1" },
+ { label: "物品描述2", prop: "itemDesc2" },
+ { label: "配置", prop: "item_configurationFromFE" },
+ { label: "发料数量", prop: "qty" },
+ { label: "单位", prop: "uom" },
+ { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+ { label: "创建者ID", prop: 'creatorId' },
+ { label: "来源库位", prop: "fromLocationCode" },
+ { label: "来源ERP库位", prop: 'fromLocationErpCode' },
+ { label: "目标库位", prop: "toLocationCode" },
+ { label: "目标ERP库位", prop: 'toLocationErpCode' },
+ { label: "在途库位", prop: 'onTheWayLocationCode' },
+ // -----------------------------------------------------------------------
+ { label: "生效日期", prop: "arriveDate", type: "dateTime" },
+ { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+ { label: "上次修改者ID", prop: 'lastModifierId' },
+ { label: "任务编号", prop: 'number',width: orderWidth },
+ { label: "备注", prop: 'remark' },
+ { label: "来源仓库", prop: 'fromWarehouseCode' },
+ { label: "目标仓库", prop: 'toWarehouseCode' },
+ { label: "标包数量", prop: 'stdPackQty' },
+ { label: "来源箱码", prop: 'fromPackingCode' },
+ { label: "目标箱码", prop: 'toPackingCode' },
+ { label: "来源批次", prop: 'fromLot' },
+ { label: "目标批次", prop: 'toLot' },
+ { label: "供应商批次", prop: 'supplierBatch' },
+ { label: "生产时间", prop: 'produceDate', type: "dateTime" },
+ { label: "过期日期", prop: 'expireDate', type: "dateTime" },
+ { label: "来源库位组", prop: 'fromLocationGroup' },
+ { label: "目标库位组", prop: 'toLocationGroup' },
+ { label: "来源库区", prop: 'fromLocationArea' },
+ { label: "目标库区", prop: 'toLocationArea' },
+ { label: "推荐箱码", prop: "recommendPackingCode" },
+ { label: "发料时间", prop: 'issueTime', type: "dateTime" },
+ { label: "生产线", prop: 'prodLine' },
+ { label: "工作中心", prop: 'workStation' },
+ { label: "事务ID", prop: "tenantId" },
+ { label: "推荐数量", prop: 'recommendQty' },
+ { label: "实际批次", prop: "handledLot" },
+ { label: "实际库位", prop: 'handledFromLocationCode' },
+ { label: "实际区域", prop: 'handledFromLocationArea' },
+ { label: "实际分组", prop: 'handledFromLocationGroup' },
+ { label: "实际ERP库位", prop: 'handledFromLocationErpCode' },
+ { label: "实际仓库", prop: 'handledFromWarehouseCode' },
+ { label: "推荐库位", prop: 'recommendFromLocationCode' },
+ { label: "推荐区域", prop: 'recommendFromLocationArea' },
+ { label: "推荐分组", prop: 'recommendFromLocationGroup' },
+ { label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' },
+ { label: "推荐仓库", prop: 'recommendFromWarehouseCode' },
+ { label: "实际数量", prop: 'handledQty' },
+ { label: "实际箱码", prop: "handledPackingCode" },
+ { label: "推荐批次", prop: "recommendLot" },
+ { label: "推荐供应商批次", prop: 'recommendSupplierBatch' },
+ { label: "实际供应商批次", prop: 'handledSupplierBatch' },
+ { label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" },
+ { label: "实际到货时间", prop: 'handledArriveDate', type: "dateTime" },
+ { label: "推荐生产时间", prop: 'recommendProduceDate', type: "dateTime" },
+ { label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" },
+ { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" },
+ { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" },
+ // ************** 确定隐藏 ************************
+ // { label: "fromStatus", prop: 'fromStatus' },
+ // { label: "toStatus", prop: 'toStatus' },
+ // { label: "ID", prop: 'id' },
+ // { label: "主表ID", prop: "masterID" },
+ // ************** 确定隐藏 ************************
+]
+
+// 人工发料申请（喷涂）
+export const IssueRequestPT = [
+ { label: "物品代码", prop: "itemCode" },
+ { label: "物品名称", prop: "itemName" },
+ { label: "物品描述1", prop: "itemDesc1" },
+ { label: "物品描述2", prop: "itemDesc2" },
+ { label: "配置", prop: "item_configurationFromFE" },
+ { label: "状态", prop: "status", type: "filter", filters: "openToClose" },
+ { label: "叫料数量", prop: "qty" },
+ { label: "单位", prop: "uom" },
+ { label: "创建时间", prop: "creationTime", type: "dateTime" },
+ { label: "创建者ID", prop: 'creatorId' },
+ { label: "目标库位", prop: "toLocationCode" },
+ { label: "目标ERP库位", prop: "toLocationErpCode" },
+ { label: "生成任务数量", prop: 'issuedQty' },
+ { label: "已收数量", prop: 'receivedQty' },
+ { label: "单据号", prop: 'number' },
+ // -----------------------------------------------------------------------
+ { label: "标包数量", prop: 'stdPackQty' },
+ { label: "生产线", prop: 'prodLine' },
+ { label: "来源库区", prop: 'fromLocationArea' },
+ { label: "工作中心", prop: 'workStation' },
+ { label: "过期时间", prop: 'expiredTime' },
+ { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+ { label: "上次修改者ID", prop: 'lastModifierId' },
+ { label: "备注", prop: "remark" },
+ { label: "事务ID", prop: "tenantId" },
+ { label: "请求未发", prop: 'toBeIssuedQty' },
+ { label: "已发未收", prop: 'toBeReceivedQty' },
+ { label: "请求未收", prop: 'notFinishQty' },
+ // ************** 确定隐藏 ************************
+ // { label: "主表ID", prop: "masterID" },
+ // { label: "ID", prop: 'id' },
+ // ************** 确定隐藏 ************************
+]
+// 人工发料任务（喷涂）
+export const IssueJobPT = [
+ { label: "物品代码", prop: "itemCode", fixed: "left" },
+ { label: "物品名称", prop: "itemName" },
+ { label: "物品描述1", prop: "itemDesc1" },
+ { label: "物品描述2", prop: "itemDesc2" },
+ { label: "配置", prop: "item_configurationFromFE" },
+ { label: "状态", prop: "status", type: "filter", filters: "inventoryStage" },
+ { label: "推荐批次", prop: "recommendLot" },
+ { label: "实际批次", prop: "handledLot" },
+ { label: "推荐数量", prop: 'recommendQty' },
+ { label: "实际数量", prop: 'handledQty' },
+ { label: "推荐箱码", prop: "recommendPackingCode" },
+ { label: "实际箱码", prop: "handledPackingCode" },
+ { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+ { label: "创建者ID", prop: 'creatorId' },
+ { label: "在途库位", prop: 'onTheWayLocationCode' },
+ // -----------------------------------------------------------------------
+ { label: "标包数量", prop: "stdPackQty" },
+ { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+ { label: "上次修改者ID", prop: 'lastModifierId' },
+ { label: "任务编号", prop: 'number',width: orderWidth },
+ { label: "备注", prop: 'remark' },
+ { label: "推荐库位", prop: 'recommendFromLocationCode' },
+ { label: "推荐区域", prop: 'recommendFromLocationArea' },
+ { label: "推荐分组", prop: 'recommendFromLocationGroup' },
+ { label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' },
+ { label: "推荐仓库", prop: 'recommendFromWarehouseCode' },
+ { label: "计量单位", prop: 'uom' },
+ { label: "实际库位", prop: 'handledFromLocationCode' },
+ { label: "实际区域", prop: 'handledFromLocationArea' },
+ { label: "实际分组", prop: 'handledFromLocationGroup' },
+ { label: "实际ERP库位", prop: 'handledFromLocationErpCode' },
+ { label: "实际仓库", prop: 'handledFromWarehouseCode' },
+ { label: "到库区", prop: 'toLocationArea' },
+ { label: "到库位组", prop: 'toLocationGroup' },
+ { label: "到ERP库位", prop: 'toLocationErpCode' },
+ { label: "到仓库", prop: 'toWarehouseCode' },
+ { label: "推荐供应商批次", prop: 'recommendSupplierBatch' },
+ { label: "实际供应商批次", prop: 'handledSupplierBatch' },
+ { label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" },
+ { label: "实际到货时间", prop: 'handledArriveDate', type: "dateTime" },
+ { label: "推荐生产时间", prop: 'recommendProduceDate', type: "dateTime" },
+ { label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" },
+ { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" },
+ { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" },
+ { label: "请求库位", prop: 'requestLocationCode' },
+ { label: "到库位", prop: 'toLocationCode' },
+ { label: "生产线", prop: 'prodLine' },
+ { label: "工作中心", prop: 'workStation' },
+ { label: "过期时间", prop: 'expiredTime' },
+ { label: "工序", prop: 'operation' },
+ { label: "取整后数量", prop: 'roundedQty' },
+ { label: "计划开始时间", prop: 'planBeginTime' },
+ { label: "每次配送数量", prop: 'deliveryQty' },
+ { label: "事务ID", prop: "tenantId" },
+ // ************** 确定隐藏 ************************
+ // { label: "distributionType", prop: 'distributionType' },
+ // { label: "plannedSplitRule", prop: 'plannedSplitRule' },
+ // { label: "truncType", prop: 'truncType' },
+ // { label: "ID", prop: 'id' },
+ // { label: "主表ID", prop: "masterID" },
+ // ************** 确定隐藏 ************************
+]
+// 人工发料记录（喷涂）
+export const IssueNotePT = [
+ { label: "物品代码", prop: "itemCode",fixed: "left" },
+ { label: "物品名称", prop: "itemName" },
+ { label: "物品描述1", prop: "itemDesc1" },
+ { label: "物品描述2", prop: "itemDesc2" },
+ { label: "配置", prop: "item_configurationFromFE" },
+ { label: "发料数量", prop: "qty" },
+ { label: "单位", prop: "uom" },
+ { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+ { label: "创建者ID", prop: 'creatorId' },
+ { label: "来源库位", prop: "fromLocationCode" },
+ { label: "来源ERP库位", prop: 'fromLocationErpCode' },
+ { label: "目标库位", prop: "toLocationCode" },
+ { label: "目标ERP库位", prop: 'toLocationErpCode' },
+ { label: "在途库位", prop: 'onTheWayLocationCode' },
+ // -----------------------------------------------------------------------
+ { label: "生效日期", prop: "arriveDate", type: "dateTime" },
+ { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+ { label: "上次修改者ID", prop: 'lastModifierId' },
+ { label: "任务编号", prop: 'number',width: orderWidth },
+ { label: "备注", prop: 'remark' },
+ { label: "来源仓库", prop: 'fromWarehouseCode' },
+ { label: "目标仓库", prop: 'toWarehouseCode' },
+ { label: "标包数量", prop: 'stdPackQty' },
+ { label: "来源箱码", prop: 'fromPackingCode' },
+ { label: "目标箱码", prop: 'toPackingCode' },
+ { label: "来源批次", prop: 'fromLot' },
+ { label: "目标批次", prop: 'toLot' },
+ { label: "供应商批次", prop: 'supplierBatch' },
+ { label: "生产时间", prop: 'produceDate', type: "dateTime" },
+ { label: "过期日期", prop: 'expireDate', type: "dateTime" },
+ { label: "来源库位组", prop: 'fromLocationGroup' },
+ { label: "目标库位组", prop: 'toLocationGroup' },
+ { label: "来源库区", prop: 'fromLocationArea' },
+ { label: "目标库区", prop: 'toLocationArea' },
+ { label: "推荐箱码", prop: "recommendPackingCode" },
+ { label: "发料时间", prop: 'issueTime', type: "dateTime" },
+ { label: "生产线", prop: 'prodLine' },
+ { label: "工作中心", prop: 'workStation' },
+ { label: "事务ID", prop: "tenantId" },
+ { label: "推荐数量", prop: 'recommendQty' },
+ { label: "实际批次", prop: "handledLot" },
+ { label: "实际库位", prop: 'handledFromLocationCode' },
+ { label: "实际区域", prop: 'handledFromLocationArea' },
+ { label: "实际分组", prop: 'handledFromLocationGroup' },
+ { label: "实际ERP库位", prop: 'handledFromLocationErpCode' },
+ { label: "实际仓库", prop: 'handledFromWarehouseCode' },
+ { label: "推荐库位", prop: 'recommendFromLocationCode' },
+ { label: "推荐区域", prop: 'recommendFromLocationArea' },
+ { label: "推荐分组", prop: 'recommendFromLocationGroup' },
+ { label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' },
+ { label: "推荐仓库", prop: 'recommendFromWarehouseCode' },
+ { label: "实际数量", prop: 'handledQty' },
+ { label: "实际箱码", prop: "handledPackingCode" },
+ { label: "推荐批次", prop: "recommendLot" },
+ { label: "推荐供应商批次", prop: 'recommendSupplierBatch' },
+ { label: "实际供应商批次", prop: 'handledSupplierBatch' },
+ { label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" },
+ { label: "实际到货时间", prop: 'handledArriveDate', type: "dateTime" },
+ { label: "推荐生产时间", prop: 'recommendProduceDate', type: "dateTime" },
+ { label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" },
+ { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" },
+ { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" },
+ // ************** 确定隐藏 ************************
+ // { label: "fromStatus", prop: 'fromStatus' },
+ // { label: "toStatus", prop: 'toStatus' },
+ // { label: "ID", prop: 'id' },
+ // { label: "主表ID", prop: "masterID" },
+ // ************** 确定隐藏 ************************
+]
+
+// 库存转移申请
+export const LibraryShiftRequest = [
+ { label: "物品代码", prop: "itemCode" },
+ { label: "物品名称", prop: "itemName" },
+ { label: "物品描述1", prop: "itemDesc1" },
+ { label: "物品描述2", prop: "itemDesc2" },
+ { label: "配置", prop: "item_configurationFromFE" },
+ { label: "状态", prop: "status", type: "filter", filters: "openToClose" },
+ { label: "叫料数量", prop: "qty" },
+ { label: "单位", prop: "uom" },
+ { label: "创建时间", prop: "creationTime", type: "dateTime" },
+ { label: "创建者ID", prop: 'creatorId' },
+ { label: "目标库位", prop: "toLocationCode" },
+ { label: "目标ERP库位", prop: "toLocationErpCode" },
+ { label: "生成任务数量", prop: 'issuedQty' },
+ { label: "已收数量", prop: 'receivedQty' },
+ { label: "单据号", prop: 'number' },
+ // -----------------------------------------------------------------------
+ { label: "标包数量", prop: 'stdPackQty' },
+ { label: "生产线", prop: 'prodLine' },
+ { label: "来源库区", prop: 'fromLocationArea' },
+ { label: "工作中心", prop: 'workStation' },
+ { label: "过期时间", prop: 'expiredTime' },
+ { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+ { label: "上次修改者ID", prop: 'lastModifierId' },
+ { label: "备注", prop: "remark" },
+ { label: "事务ID", prop: "tenantId" },
+ { label: "请求未发", prop: 'toBeIssuedQty' },
+ { label: "已发未收", prop: 'toBeReceivedQty' },
+ { label: "请求未收", prop: 'notFinishQty' },
+ // ************** 确定隐藏 ************************
+ // { label: "主表ID", prop: "masterID" },
+ // { label: "ID", prop: 'id' },
+ // ************** 确定隐藏 ************************
+]
+// 库存转移任务
+export const LibraryShiftJob = [
+ { label: "物品代码", prop: "itemCode", fixed: "left" },
+ { label: "物品名称", prop: "itemName" },
+ { label: "物品描述1", prop: "itemDesc1" },
+ { label: "物品描述2", prop: "itemDesc2" },
+ { label: "配置", prop: "item_configurationFromFE" },
+ { label: "状态", prop: "status", type: "filter", filters: "inventoryStage" },
+ { label: "推荐批次", prop: "recommendLot" },
+ { label: "实际批次", prop: "handledLot" },
+ { label: "推荐数量", prop: 'recommendQty' },
+ { label: "实际数量", prop: 'handledQty' },
+ { label: "推荐箱码", prop: "recommendPackingCode" },
+ { label: "实际箱码", prop: "handledPackingCode" },
+ { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+ { label: "创建者ID", prop: 'creatorId' },
+ { label: "在途库位", prop: 'onTheWayLocationCode' },
+ // -----------------------------------------------------------------------
+ { label: "标包数量", prop: "stdPackQty" },
+ { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+ { label: "上次修改者ID", prop: 'lastModifierId' },
+ { label: "任务编号", prop: 'number',width: orderWidth },
+ { label: "备注", prop: 'remark' },
+ { label: "推荐库位", prop: 'recommendFromLocationCode' },
+ { label: "推荐区域", prop: 'recommendFromLocationArea' },
+ { label: "推荐分组", prop: 'recommendFromLocationGroup' },
+ { label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' },
+ { label: "推荐仓库", prop: 'recommendFromWarehouseCode' },
+ { label: "计量单位", prop: 'uom' },
+ { label: "实际库位", prop: 'handledFromLocationCode' },
+ { label: "实际区域", prop: 'handledFromLocationArea' },
+ { label: "实际分组", prop: 'handledFromLocationGroup' },
+ { label: "实际ERP库位", prop: 'handledFromLocationErpCode' },
+ { label: "实际仓库", prop: 'handledFromWarehouseCode' },
+ { label: "到库区", prop: 'toLocationArea' },
+ { label: "到库位组", prop: 'toLocationGroup' },
+ { label: "到ERP库位", prop: 'toLocationErpCode' },
+ { label: "到仓库", prop: 'toWarehouseCode' },
+ { label: "推荐供应商批次", prop: 'recommendSupplierBatch' },
+ { label: "实际供应商批次", prop: 'handledSupplierBatch' },
+ { label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" },
+ { label: "实际到货时间", prop: 'handledArriveDate', type: "dateTime" },
+ { label: "推荐生产时间", prop: 'recommendProduceDate', type: "dateTime" },
+ { label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" },
+ { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" },
+ { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" },
+ { label: "请求库位", prop: 'requestLocationCode' },
+ { label: "到库位", prop: 'toLocationCode' },
+ { label: "生产线", prop: 'prodLine' },
+ { label: "工作中心", prop: 'workStation' },
+ { label: "过期时间", prop: 'expiredTime' },
+ { label: "工序", prop: 'operation' },
+ { label: "取整后数量", prop: 'roundedQty' },
+ { label: "计划开始时间", prop: 'planBeginTime' },
+ { label: "每次配送数量", prop: 'deliveryQty' },
+ { label: "事务ID", prop: "tenantId" },
+ // ************** 确定隐藏 ************************
+ // { label: "distributionType", prop: 'distributionType' },
+ // { label: "plannedSplitRule", prop: 'plannedSplitRule' },
+ // { label: "truncType", prop: 'truncType' },
+ // { label: "ID", prop: 'id' },
+ // { label: "主表ID", prop: "masterID" },
+ // ************** 确定隐藏 ************************
+]
+// 库存转移记录
+export const LibraryShiftNote = [
+ { label: "物品代码", prop: "itemCode",fixed: "left" },
+ { label: "物品名称", prop: "itemName" },
+ { label: "物品描述1", prop: "itemDesc1" },
+ { label: "物品描述2", prop: "itemDesc2" },
+ { label: "配置", prop: "item_configurationFromFE" },
+ { label: "发料数量", prop: "qty" },
+ { label: "单位", prop: "uom" },
+ { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+ { label: "创建者ID", prop: 'creatorId' },
+ { label: "来源库位", prop: "fromLocationCode" },
+ { label: "来源ERP库位", prop: 'fromLocationErpCode' },
+ { label: "目标库位", prop: "toLocationCode" },
+ { label: "目标ERP库位", prop: 'toLocationErpCode' },
+ { label: "在途库位", prop: 'onTheWayLocationCode' },
+ // -----------------------------------------------------------------------
+ { label: "生效日期", prop: "arriveDate", type: "dateTime" },
+ { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+ { label: "上次修改者ID", prop: 'lastModifierId' },
+ { label: "任务编号", prop: 'number',width: orderWidth },
+ { label: "备注", prop: 'remark' },
+ { label: "来源仓库", prop: 'fromWarehouseCode' },
+ { label: "目标仓库", prop: 'toWarehouseCode' },
+ { label: "标包数量", prop: 'stdPackQty' },
+ { label: "来源箱码", prop: 'fromPackingCode' },
+ { label: "目标箱码", prop: 'toPackingCode' },
+ { label: "来源批次", prop: 'fromLot' },
+ { label: "目标批次", prop: 'toLot' },
+ { label: "供应商批次", prop: 'supplierBatch' },
+ { label: "生产时间", prop: 'produceDate', type: "dateTime" },
+ { label: "过期日期", prop: 'expireDate', type: "dateTime" },
+ { label: "来源库位组", prop: 'fromLocationGroup' },
+ { label: "目标库位组", prop: 'toLocationGroup' },
+ { label: "来源库区", prop: 'fromLocationArea' },
+ { label: "目标库区", prop: 'toLocationArea' },
+ { label: "推荐箱码", prop: "recommendPackingCode" },
+ { label: "发料时间", prop: 'issueTime', type: "dateTime" },
+ { label: "生产线", prop: 'prodLine' },
+ { label: "工作中心", prop: 'workStation' },
+ { label: "事务ID", prop: "tenantId" },
+ { label: "推荐数量", prop: 'recommendQty' },
+ { label: "实际批次", prop: "handledLot" },
+ { label: "实际库位", prop: 'handledFromLocationCode' },
+ { label: "实际区域", prop: 'handledFromLocationArea' },
+ { label: "实际分组", prop: 'handledFromLocationGroup' },
+ { label: "实际ERP库位", prop: 'handledFromLocationErpCode' },
+ { label: "实际仓库", prop: 'handledFromWarehouseCode' },
+ { label: "推荐库位", prop: 'recommendFromLocationCode' },
+ { label: "推荐区域", prop: 'recommendFromLocationArea' },
+ { label: "推荐分组", prop: 'recommendFromLocationGroup' },
+ { label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' },
+ { label: "推荐仓库", prop: 'recommendFromWarehouseCode' },
+ { label: "实际数量", prop: 'handledQty' },
+ { label: "实际箱码", prop: "handledPackingCode" },
+ { label: "推荐批次", prop: "recommendLot" },
+ { label: "推荐供应商批次", prop: 'recommendSupplierBatch' },
+ { label: "实际供应商批次", prop: 'handledSupplierBatch' },
+ { label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" },
+ { label: "实际到货时间", prop: 'handledArriveDate', type: "dateTime" },
+ { label: "推荐生产时间", prop: 'recommendProduceDate', type: "dateTime" },
+ { label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" },
+ { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" },
+ { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" },
+ // ************** 确定隐藏 ************************
+ // { label: "fromStatus", prop: 'fromStatus' },
+ // { label: "toStatus", prop: 'toStatus' },
+ // { label: "ID", prop: 'id' },
+ // { label: "主表ID", prop: "masterID" },
+ // ************** 确定隐藏 ************************
]
\ No newline at end of file
diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index 47182c642..06e76fe9d 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -2260,6 +2260,34 @@ export const FISDeliverRequest = [
// { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
// ************** 确认隐藏 ************************
]
+
+// 成品发运任务
+export const FISDeliverJob = [
+ { label: "物品代码", prop: "itemCode", fixed: "left" },
+ { label: "物品名称", prop: "itemName" },
+ { label: "物品描述1", prop: "itemDesc1" },
+ { label: "物品描述2", prop: "itemDesc2" },
+ { label: "配置", prop: "item_configurationFromFE" },
+ { label: "出货数量", prop: "qty" },
+ { label: "单位", prop: "uom" },
+ { label: "出货库区", prop: "areaCode" },
+ { label: "起始盘底号", prop: "extraProperties", showProp: 'FromVinCode', type: 'object' },
+ { label: "截止盘底号", prop: "extraProperties", showProp: 'ToVinCode', type: 'object' },
+ { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+ { label: "创建者ID", prop: 'creatorId' },
+ // -----------------------------------------------------------------------
+ { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+ { label: "上次修改者ID", prop: 'lastModifierId' },
+ { label: "任务编号", prop: 'number' },
+ { label: "备注", prop: 'remark' },
+ { label: "标包数量", prop: 'stdPackQty' },
+ { label: "事务ID", prop: "tenantId" },
+ // { label: "起始底盘号",prop: 'extraProperties',type:"object", showProp: 'FromVinCode' },
+ // ************** 确定隐藏 ************************
+ // { label: "ID", prop: 'id' },
+ // { label: "主表ID", prop: "masterID" },
+ // ************** 确定隐藏 ************************
+]
// FIS发货记录 20230415
export const FISDeliverNote = [
{
@@ -2320,26 +2348,28 @@ export const customerDismantle = [
// 客户退拆任务 20230415
export const customerDismantleJob = [
{
- label: "退拆记录单号",
+ label: "退拆任务单号",
prop: "number",
fixed: "left",
type: "name",
width: orderWidth
},
- { label: "班次", prop: 'shift' },
- { label: "车间", prop: 'workshop' },
- { label: "回收时间", prop: "recycleTime",type: "dateTime" },
- { label: "生效时间", prop: "activeDate",type: "dateTime" },
- { label: "操作员", prop: "worker" },
+ { label: "状态", prop: "jobStatus", type: "tagFilter", filters: "jobStatus" },
+ { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
+ { label: "承接者用户名", prop: 'acceptUserName' },
+ { label: "完成时间", prop: 'completeTime', type: "dateTime" },
+ { label: "完成者用户名", prop: 'completeUserName' },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "备注", prop: 'remark' },
- { label: "申请编号", prop: 'requestNumber', width:orderWidth },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "事务ID", prop: "tenantId" },
- // ************** 确认隐藏 ************************
+ { label: "操作员", prop: "worker" },
+ { label: "上游任务编号", prop: 'upStreamJobNumber' },
+ { label: "仓库代码", prop: 'warehouseCode' },
+ { label: "优先级", prop: 'priority' },
+ { label: "优先级增量", prop: 'priorityIncrement' },
+ { label: "工作组", prop: 'workGroupCode' },
+ { label: "车间", prop: 'workshop' },
+ { label: "班次", prop: 'shift' },
]
// 客户退拆记录 20230415
export const customerDismantleNote = [
@@ -4156,6 +4186,283 @@ export const completDumpNote = [
{ label: "收货单号", prop: 'rpNumber' },
]
+// 人工发料申请（注塑）
+export const IssueRequestZS = [
+ {
+ label: "叫料申请编号",
+ prop: "number",
+ fixed: "left",
+ type: "name",
+ width: orderWidth
+ },
+ { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
+ { label: "创建时间", prop: "creationTime", type: "dateTime" },
+ { 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" },
+ // ************** 确认隐藏 ************************
+]
+// 人工发料任务（注塑）
+export const IssueJobZS = [
+ {
+ 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: 'acceptUserName' },
+ { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
+ { label: "完成者用户名", prop: 'completeUserName' },
+ { 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 IssueNoteZS = [
+ {
+ 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 IssueRequestPT = [
+ {
+ label: "叫料申请编号",
+ prop: "number",
+ fixed: "left",
+ type: "name",
+ width: orderWidth
+ },
+ { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
+ { label: "创建时间", prop: "creationTime", type: "dateTime" },
+ { 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" },
+ // ************** 确认隐藏 ************************
+]
+// 人工发料任务（喷涂）
+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: 'acceptUserName' },
+ { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
+ { label: "完成者用户名", prop: 'completeUserName' },
+ { 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 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: '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 LibraryShiftRequest = [
+ { label: "申请编号", prop: "number" },
+ { label: "状态", prop: "requestStatus",type: "filter", filters: "requestStatus" },
+ { label: "创建时间", prop: "creationTime", type: "dateTime" },
+ { 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 LibraryShiftJob = [
+ { 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 LibraryShiftNote = [
+ { 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: 'activeDate', type: "dateTime" },
+ { label: "车间", prop: 'workshop' },
+ { label: "确认时间", prop: 'confirmTime', type: "dateTime" },
+ // ************** 确认隐藏 ************************
+ // { label: "ID", prop: 'id' },
+ // ************** 确认隐藏 ************************
+]
+
// 字段说明
// showProp: true //隐藏该字段的高级筛选+列表排序
// sortable: false //隐藏该字段的列表排序
diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js
index d45646cb8..3d0614d99 100644
--- a/fe/PC/src/utils/tabsDesTions/index.js
+++ b/fe/PC/src/utils/tabsDesTions/index.js
@@ -1620,6 +1620,31 @@ export const FISDeliverRequest = [
// { label: "ID", prop: 'id' },
// ************** 确认隐藏 ************************
]
+// 成品发运任务
+export const FISDeliverJob = [
+ { label: "发货申请单号", prop: "number" },
+ { label: "状态", prop: "requestStatus", type: "filter", filters: "requestStatus" },
+ { label: "发货时间", prop: "deliverTime", type: "dateTime" },
+ { label: "客户代码", prop: "customerCode" },
+ { label: "客户地址", prop: 'customerAddressCode' },
+ { label: "操作员", prop: 'worker' },
+ { 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: "creationTime", type: "dateTime" },
+ { label: "创建者ID", prop: "creatorId" },
+ { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+ { label: "上次修改者ID", prop: "lastModifierId" },
+ { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+ { label: "备注", prop: 'remark' },
+ { label: "事务ID", prop: "tenantId" },
+ { label: "发货计划单号", prop: 'deliverPlanNumber' },
+ // ************** 确认隐藏 ************************
+ // { label: "ID", prop: 'id' },
+ // ************** 确认隐藏 ************************
+]
// FIS发货记录 20230415
export const FISDeliverNote = [
{ label: "记录单号", prop: 'number' },
@@ -1669,25 +1694,27 @@ export const customerDismantle = [
// 客户退拆任务 20230415
export const customerDismantleJob = [
{
- label: "退拆记录单号",
+ label: "退拆任务单号",
prop: "number",
fixed: "left",
type: "name",
},
- { label: "班次", prop: 'shift' },
- { label: "车间", prop: 'workshop' },
- { label: "回收时间", prop: "recycleTime",type: "dateTime" },
- { label: "生效时间", prop: "activeDate",type: "dateTime" },
- { label: "操作员", prop: "worker" },
+ { label: "状态", prop: "jobStatus", type: "tagFilter", filters: "jobStatus" },
+ { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
+ { label: "承接者用户名", prop: 'acceptUserName' },
+ { label: "完成时间", prop: 'completeTime', type: "dateTime" },
+ { label: "完成者用户名", prop: 'completeUserName' },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "备注", prop: 'remark' },
- { label: "申请编号", prop: 'requestNumber', },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "事务ID", prop: "tenantId" },
- // ************** 确认隐藏 ************************
+ { label: "操作员", prop: "worker" },
+ { label: "上游任务编号", prop: 'upStreamJobNumber' },
+ { label: "仓库代码", prop: 'warehouseCode' },
+ { label: "优先级", prop: 'priority' },
+ { label: "优先级增量", prop: 'priorityIncrement' },
+ { label: "工作组", prop: 'workGroupCode' },
+ { label: "车间", prop: 'workshop' },
+ { label: "班次", prop: 'shift' },
]
// 客户退拆记录 20230415
export const customerDismantleNote = [
@@ -3017,3 +3044,263 @@ export const completDumpNote = [
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "收货单号", prop: 'rpNumber' },
]
+
+// 人工发料申请（注塑）
+export const IssueRequestZS = [
+ { label: "申请编号", prop: "number" },
+ { label: "状态", prop: "requestStatus",type: "filter", filters: "requestStatus" },
+ { label: "创建时间", prop: "creationTime", type: "dateTime" },
+ { 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 IssueJobZS = [
+ { 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 IssueNoteZS = [
+ { 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: 'activeDate', type: "dateTime" },
+ { label: "车间", prop: 'workshop' },
+ { label: "确认时间", prop: 'confirmTime', type: "dateTime" },
+ // ************** 确认隐藏 ************************
+ // { label: "ID", prop: 'id' },
+ // ************** 确认隐藏 ************************
+]
+
+// 人工发料申请（喷涂）
+export const IssueRequestPT = [
+ {
+ label: "叫料申请编号",
+ prop: "number",
+ fixed: "left",
+ type: "name",
+ },
+ { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
+ { label: "创建时间", prop: "creationTime", type: "dateTime" },
+ { 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" },
+ // ************** 确认隐藏 ************************
+]
+// 人工发料任务（喷涂）
+export const IssueJobPT = [
+ {
+ label: "发料任务编号",
+ prop: "number",
+ fixed: "left",
+ type: "name",
+ },
+ { label: "状态", prop: "jobStatus",type: "tagFilter", 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: 'acceptUserName' },
+ { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
+ { label: "完成者用户名", prop: 'completeUserName' },
+ { 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 IssueNotePT = [
+ {
+ 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: '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 LibraryShiftRequest = [
+ { label: "申请编号", prop: "number" },
+ { label: "状态", prop: "requestStatus",type: "filter", filters: "requestStatus" },
+ { label: "创建时间", prop: "creationTime", type: "dateTime" },
+ { 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 LibraryShiftJob = [
+ { 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 LibraryShiftNote = [
+ { 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: 'activeDate', type: "dateTime" },
+ { label: "车间", prop: 'workshop' },
+ { label: "确认时间", prop: 'confirmTime', type: "dateTime" },
+ // ************** 确认隐藏 ************************
+ // { label: "ID", prop: 'id' },
+ // ************** 确认隐藏 ************************
+]
diff --git a/fe/PC/src/views/basicData/WorkshopManage/ProductionLine.vue b/fe/PC/src/views/basicData/WorkshopManage/ProductionLine.vue
index c4eaff370..7a36b907b 100644
--- a/fe/PC/src/views/basicData/WorkshopManage/ProductionLine.vue
+++ b/fe/PC/src/views/basicData/WorkshopManage/ProductionLine.vue
@@ -38,7 +38,7 @@
:Options="editOptions"
:Handle="editHandle"
:Rules="formReveal ? editRules.cerateRule : editRules.editRule"
- @FormSubmit="FormSubmit"
+ @FormSubmit="FormSubmitHandle"
@close="FormClose"
@goBack="goBack"
>
@@ -131,10 +131,13 @@ export default {
name: null,
description: null,
type: null,
- workshopCode: null,
+ // workshopCode: null,
rawLocationCode: [],
- productLocationCode: null,
- rawLocationGroupCode: null,
+ productLocationCode: [],
+ rawLocationGroupCode: [],
+ rawLocationCode_show: [],
+ rawLocationGroupCode_show: [],
+ productLocationCode_show: [],
code: null,
// company: null,
},
@@ -145,10 +148,13 @@ export default {
name: null,
description: null,
type: null,
- workshopCode: null,
+ // workshopCode: null,
rawLocationCode: [],
- rawLocationGroupCode: null,
- productLocationCode: null,
+ productLocationCode: [],
+ rawLocationGroupCode: [],
+ rawLocationCode_show: [],
+ rawLocationGroupCode_show: [],
+ productLocationCode_show: [],
concurrencyStamp: null,
},
editOptions: {
@@ -158,33 +164,28 @@ export default {
{ type: "input", label: "生产线代码", prop: "code", validType:'numberLetter', colSpan: 12 },
{ type: "input", label: "生产线名称", prop: 'name', colSpan: 12 },
{ type: "select", label: "类型", prop: "type", options: "productionLineType", colSpan: 12 },
- { type: "filterSelect", label: "车间代码", prop: "workshopCode", optionsLabel: "name", optionsValue: "code",
- focus: (type,val) => { return this.getFilterList(type, val, "basedata/workshop")},
- searchButton: (val) => { this.showSerarchPage(val, 'basedata/workshop', 'Workshop', '车间选择', this.CreateFormData) },
- colSpan: 12
- },
- { type: "filterSelect", label: "原料库位", prop: "rawLocationCode", optionsLabel: "name", optionsValue: "code",
- focus: (type,val) => { return this.getFilterList(type, val, "basedata/location",[{logic:"And",column:"type",action:"==",value:"2"}])},
- searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.CreateFormData,[{logic:"And",column:"type",action:"==",value:"2"}])},
+ // { type: "filterSelect", label: "车间代码", prop: "workshopCode", optionsLabel: "name", optionsValue: "code",
+ // focus: (type,val) => { return this.getFilterList(type, val, "basedata/workshop")},
+ // searchButton: (val) => { this.showSerarchPage(val, 'basedata/workshop', 'Workshop', '车间选择', this.CreateFormData) },
+ // colSpan: 12
+ // },
+ { type: "filterSelect", label: "原料库位", prop: "rawLocationCode_show", optionsLabel: "name", optionsValue: "code",
+ focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},//,[{logic:"And",column:"type",action:"==",value:"2"}]
+ searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.CreateFormData)}, //,[{logic:"And",column:"type",action:"==",value:"2"}]
colSpan: 12,multiple:true
},
- { type: "filterSelect", label: "原料库位组", prop: "rawLocationGroupCode", optionsLabel: "name", optionsValue: "code",
- focus: (type,val) => { return this.getFilterList(type, val, "basedata/location-group",[
- {logic:"And",column:"groupType",action:"==",value:"2"},
- ])},
- searchButton: (val) => { this.showSerarchPage(val, 'basedata/location-group', 'LocationGroup', '库位组选择', this.CreateFormData,[
- {logic:"And",column:"groupType",action:"==",value:"2"},
- ]) }, colSpan: 12 },
-
- { type: "filterSelect", label: "成品库位", prop: "productLocationCode", optionsLabel: "name", optionsValue: "code",
- focus: (type,val) => { return this.getFilterList(type, val, "basedata/location",[
- {logic:"And",column:"type",action:"==",value:"4"},
- ])},
- searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.CreateFormData,[
- {logic:"And",column:"type",action:"==",value:"4"},
- ]) }, colSpan: 12 },
+ { type: "filterSelect", label: "原料库位组", prop: "rawLocationGroupCode_show", optionsLabel: "name", optionsValue: "code",
+ focus: (type,val) => { return this.getFilterList(type, val, "basedata/location-group")},//,[ {logic:"And",column:"groupType",action:"==",value:"2"}]
+ searchButton: (val) => { this.showSerarchPage(val, 'basedata/location-group', 'LocationGroup', '库位组选择', this.CreateFormData) }, ////,[[{logic:"And",column:"groupType",action:"==",value:"2"}]{logic:"And",column:"groupType",action:"==",value:"2"}]
+ colSpan: 12,multiple:true
+ },
+ { type: "filterSelect", label: "成品库位", prop: "productLocationCode_show", optionsLabel: "name", optionsValue: "code",
+ focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},//,[{logic:"And",column:"type",action:"==",value:"4"}]
+ searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.CreateFormData) }, //,[{logic:"And",column:"type",action:"==",value:"4"}]
+ colSpan: 12,multiple:true
+ },
{ type: "input", label: "描述", prop: "description", colSpan: 12 },
{ type: "input", label: "备注", prop: 'remark', colSpan: 12 },
],
@@ -192,35 +193,24 @@ export default {
{ type: "input", label: "生产线代码", disabled:"true", prop: "code", validType:'numberLetter', colSpan: 12 },
{ type: "input", label: "生产线名称", prop: 'name', colSpan: 12 },
{ type: "select", label: "类型", prop: "type", options: "productionLineType", colSpan: 12 },
-
- { type: "filterSelect", label: "车间代码", prop: "workshopCode", optionsLabel: "name", optionsValue: "code",
- focus: (type,val) => { return this.getFilterList(type, val, "basedata/workshop")},
- searchButton: (val) => { this.showSerarchPage(val, 'basedata/workshop', 'Workshop', '车间选择', this.editFormData) }, colSpan: 12 },
-
- { type: "filterSelect", label: "原料库位", prop: "rawLocationCode", optionsLabel: "name", optionsValue: "code",
- focus: (type,val) => { return this.getFilterList(type, val, "basedata/location",[
- {logic:"And",column:"type",action:"==",value:"2"},
- ])},
- searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.editFormData,[
- {logic:"And",column:"type",action:"==",value:"2"},
- ]) }, colSpan: 12 },
-
- { type: "filterSelect", label: "原料库位组", prop: "rawLocationGroupCode", optionsLabel: "name", optionsValue: "code",
- focus: (type,val) => { return this.getFilterList(type, val, "basedata/location-group",[
- {logic:"And",column:"groupType",action:"==",value:"2"},
- ])},
- searchButton: (val) => { this.showSerarchPage(val, 'basedata/location-group', 'LocationGroup', '库位组选择', this.editFormData,[
- {logic:"And",column:"groupType",action:"==",value:"2"},
- ]) }, colSpan: 12 },
-
- { type: "filterSelect", label: "成品库位", prop: "productLocationCode", optionsLabel: "name", optionsValue: "code",
- focus: (type,val) => { return this.getFilterList(type, val, "basedata/location",[
- {logic:"And",column:"type",action:"==",value:"4"},
- ])},
- searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.editFormData,[
- {logic:"And",column:"type",action:"==",value:"4"},
- ]) }, colSpan: 12 },
-
+ // { type: "filterSelect", label: "车间代码", prop: "workshopCode", optionsLabel: "name", optionsValue: "code",
+ // focus: (type,val) => { return this.getFilterList(type, val, "basedata/workshop")},
+ // searchButton: (val) => { this.showSerarchPage(val, 'basedata/workshop', 'Workshop', '车间选择', this.editFormData) }, colSpan: 12 },
+ { type: "filterSelect", label: "原料库位", prop: "rawLocationCode_show", optionsLabel: "name", optionsValue: "code",
+ focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},//,[{logic:"And",column:"type",action:"==",value:"2"}]
+ searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.editFormData) }, //,[{logic:"And",column:"type",action:"==",value:"2"}]
+ colSpan: 12,multiple:true
+ },
+ { type: "filterSelect", label: "原料库位组", prop: "rawLocationGroupCode_show", optionsLabel: "name", optionsValue: "code",
+ focus: (type,val) => { return this.getFilterList(type, val, "basedata/location-group")},//,[{logic:"And",column:"groupType",action:"==",value:"2"}]
+ searchButton: (val) => { this.showSerarchPage(val, 'basedata/location-group', 'LocationGroup', '库位组选择', this.editFormData) }, //,[{logic:"And",column:"groupType",action:"==",value:"2"}]
+ colSpan: 12,multiple:true
+ },
+ { type: "filterSelect", label: "成品库位", prop: "productLocationCode_show", optionsLabel: "name", optionsValue: "code",
+ focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},//,[{logic:"And",column:"type",action:"==",value:"4"}]
+ searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.editFormData) }, //,[{logic:"And",column:"type",action:"==",value:"4"}]
+ colSpan: 12,multiple:true
+ },
{ type: "input", label: "描述", prop: "description", colSpan: 12 },
{ type: "input", label: "备注", prop: 'remark', colSpan: 12 },
],
@@ -228,14 +218,16 @@ export default {
cerateRule: {
code: [{ required: true, trigger: "blur", message: "不可为空" }],
type: [{ required: true, trigger: "blur", message: "不可为空" }],
- workshopCode: [{ required: true, trigger: "change", message: "不可为空" }],
+ // workshopCode: [{ required: true, trigger: "change", message: "不可为空" }],
rawLocationCode: [{ required: true, trigger: "change", message: "不可为空" }],
+ rawLocationGroupCode: [{ required: true, trigger: "change", message: "不可为空" }],
productLocationCode: [{ required: true, trigger: "change", message: "不可为空" }],
},
editRule: {
type: [{ required: true, trigger: "blur", message: "不可为空" }],
- workshopCode: [{ required: true, trigger: "change", message: "不可为空" }],
+ // workshopCode: [{ required: true, trigger: "change", message: "不可为空" }],
rawLocationCode: [{ required: true, trigger: "change", message: "不可为空" }],
+ rawLocationGroupCode: [{ required: true, trigger: "change", message: "不可为空" }],
productLocationCode: [{ required: true, trigger: "change", message: "不可为空" }],
}
},
@@ -244,6 +236,47 @@ export default {
mounted () {
this.paging();
},
+ methods:{
+ // 获取库位转义
+ initMutipleLocationGet(data){
+ if(!data || data.length <= 0)return data
+ let _arr = []
+ if(typeof data == "string"){
+ _arr=data.split(",")
+ }else{
+ data.forEach(item=>{ _arr.push(item) })
+ }
+ return _arr
+ },
+ // 获取数据库位处理
+ inlineDialogCallbackUser(){
+ this.propsData.productLocationCode_show = this.initMutipleLocationGet(this.propsData.productLocationCode)
+ this.propsData.rawLocationCode_show = this.initMutipleLocationGet(this.propsData.rawLocationCode)
+ this.propsData.rawLocationGroupCode_show = this.initMutipleLocationGet(this.propsData.rawLocationGroupCode)
+ },
+ // 提交库位转义
+ initMutipleLocationSubmit(data){
+ let _arr = []
+ if(typeof data == "string"){data=data.split(",")}
+ data.forEach(item=>{
+ _arr.push({locationCode:item})
+ })
+ return JSON.stringify(_arr)
+ },
+ // 提交库位处理
+ FormSubmitHandle(val){
+ if(this.formReveal){
+ this.CreateFormData.productLocationCode = this.initMutipleLocationSubmit(this.CreateFormData.productLocationCode_show)
+ this.CreateFormData.rawLocationCode = this.initMutipleLocationSubmit(this.CreateFormData.rawLocationCode_show)
+ this.CreateFormData.rawLocationGroupCode = this.initMutipleLocationSubmit(this.CreateFormData.rawLocationGroupCode_show)
+ }else{
+ this.editFormData.productLocationCode = this.initMutipleLocationSubmit(this.editFormData.productLocationCode_show)
+ this.editFormData.rawLocationCode = this.initMutipleLocationSubmit(this.editFormData.rawLocationCode_show)
+ this.editFormData.rawLocationGroupCode = this.initMutipleLocationSubmit(this.editFormData.rawLocationGroupCode_show)
+ }
+ this.FormSubmit(val)
+ }
+ }
};
\ No newline at end of file
diff --git a/fe/PC/src/views/finishedProductManage/dismantle/customerDismantleJob.vue b/fe/PC/src/views/finishedProductManage/dismantle/customerDismantleJob.vue
index 7a33a3f01..ac6bf433c 100644
--- a/fe/PC/src/views/finishedProductManage/dismantle/customerDismantleJob.vue
+++ b/fe/PC/src/views/finishedProductManage/dismantle/customerDismantleJob.vue
@@ -29,10 +29,10 @@
:DrawerLoading="Loading.DrawerLoading"
:drawer="displayDialog.detailsDialog"
:propsData="propsData"
- :Butttondata="[]"
+ :Butttondata="DrawerButtonData"
:tabsDesTions="tabsDesTions"
@drawerShut="(val) => (displayDialog.detailsDialog = val)"
- @drawerbutton="drawerbutton"
+ @drawerbutton="drawerbuttonHandle"
@handleCommand="drawerHandle"
@close-value="closeValue"
:tableColumns="detailsTableColumns"
@@ -40,7 +40,7 @@
:MaxResultCount="MaxResultCountDetails"
@alterResultCountDetails="alterResultCountDetails"
@alertoldSkipCountDetails="alertoldSkipCountDetails"
- :dropdownTabsData="dropdownTabsData"
+ :dropdownTabsData="[]"
:firstTabs="firstTabs"
>
@@ -63,13 +63,20 @@
+
\ No newline at end of file
diff --git a/fe/PC/src/views/inventoryManage/InventoryQuery/LibraryShiftNote.vue b/fe/PC/src/views/inventoryManage/InventoryQuery/LibraryShiftNote.vue
new file mode 100644
index 000000000..286c5a1b7
--- /dev/null
+++ b/fe/PC/src/views/inventoryManage/InventoryQuery/LibraryShiftNote.vue
@@ -0,0 +1,129 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/fe/PC/src/views/inventoryManage/InventoryQuery/LibraryShiftRequest.vue b/fe/PC/src/views/inventoryManage/InventoryQuery/LibraryShiftRequest.vue
new file mode 100644
index 000000000..44f512b9b
--- /dev/null
+++ b/fe/PC/src/views/inventoryManage/InventoryQuery/LibraryShiftRequest.vue
@@ -0,0 +1,228 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/fe/PC/src/views/materialIssueManage/PT/IssueJobPT.vue b/fe/PC/src/views/materialIssueManage/PT/IssueJobPT.vue
new file mode 100644
index 000000000..fef159d7c
--- /dev/null
+++ b/fe/PC/src/views/materialIssueManage/PT/IssueJobPT.vue
@@ -0,0 +1,548 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/fe/PC/src/views/materialIssueManage/PT/IssueNotePT.vue b/fe/PC/src/views/materialIssueManage/PT/IssueNotePT.vue
new file mode 100644
index 000000000..0244c2d20
--- /dev/null
+++ b/fe/PC/src/views/materialIssueManage/PT/IssueNotePT.vue
@@ -0,0 +1,129 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/fe/PC/src/views/materialIssueManage/PT/IssueRequestPT.vue b/fe/PC/src/views/materialIssueManage/PT/IssueRequestPT.vue
new file mode 100644
index 000000000..b81724b8a
--- /dev/null
+++ b/fe/PC/src/views/materialIssueManage/PT/IssueRequestPT.vue
@@ -0,0 +1,228 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/fe/PC/src/views/materialIssueManage/ZS/IssueJobZS.vue b/fe/PC/src/views/materialIssueManage/ZS/IssueJobZS.vue
new file mode 100644
index 000000000..50e1a7056
--- /dev/null
+++ b/fe/PC/src/views/materialIssueManage/ZS/IssueJobZS.vue
@@ -0,0 +1,548 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/fe/PC/src/views/materialIssueManage/ZS/IssueNoteZS.vue b/fe/PC/src/views/materialIssueManage/ZS/IssueNoteZS.vue
new file mode 100644
index 000000000..870cac7b0
--- /dev/null
+++ b/fe/PC/src/views/materialIssueManage/ZS/IssueNoteZS.vue
@@ -0,0 +1,129 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/fe/PC/src/views/materialIssueManage/ZS/IssueRequestZS.vue b/fe/PC/src/views/materialIssueManage/ZS/IssueRequestZS.vue
new file mode 100644
index 000000000..155e41d7c
--- /dev/null
+++ b/fe/PC/src/views/materialIssueManage/ZS/IssueRequestZS.vue
@@ -0,0 +1,228 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue b/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue
index 43df1b61f..9602654b0 100644
--- a/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue
+++ b/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue
@@ -82,6 +82,7 @@
{ this.inspectAddTable(val) }, colSpan: 24 },
],
inspectHandle: [
@@ -423,7 +425,20 @@ export default {
appearance: { required: true, trigger: "blur", message: "不可为空" },
// volume: { required: true, trigger: "blur", message: "不可为空" },
// weight: { required: true, trigger: "blur", message: "不可为空" },
- inspectQty: { required: true, trigger: "blur", message: "不可为空" },
+ inspectQty: [
+ { required: true, trigger: "blur", message: "不可为空" },
+ {
+ type: "number",
+ trigger: ["blur"],
+ validator: (rule, value, callback) => {
+ if(Number(value) > Number(this.rowReceiveQty)){
+ return callback(new Error(`数量不能大于收货数量${this.rowReceiveQty}`))
+ }else{
+ callback()
+ }
+ }
+ }
+ ],
},
inspectOptions:{},
inspectDetailsTableColumns:[
@@ -795,6 +810,10 @@ export default {
inspectButtonClick(row, index, label) {
this.inspectFormData.details.splice(row.$index, 1)
},
+ resetInspectForm() {
+ this.inspectFormData.inspectQty = null
+ this.$refs.inspectForm_Ref.resetCurrenForm()
+ },
// 质检详情-检验按钮 table中按钮
inspectDetailsButtonClick(row, index, label) {
// console.log('质检详情-检验按钮 table中按钮', row)
@@ -835,6 +854,7 @@ export default {
})
}
else if (label == '检验') {
+ this.rowReceiveQty = row.receiveQty
getListByItemcode({itemCode: row.itemCode}, 'basedata/item-guide-book').then(res => {
if (res.length > 0) {
this.guideBookData = res[0]
@@ -842,12 +862,15 @@ export default {
} else {
this.guideBookData = []
this.blobName = ''
- document.getElementById("uploadPictureCardGuideBook").innerHTML = ''
+ if(document.getElementById("uploadPictureCardGuideBook"))document.getElementById("uploadPictureCardGuideBook").innerHTML = ''
}
this.inspectShow = true
+ console.log(6666,this.$refs.inspectForm_Ref)
+ this.resetInspectForm()
}).catch(err => {
console.log(err)
this.inspectShow = true
+ this.resetInspectForm()
})
this.rowId = row.id
} else if (label == '清除检验') {