From e6d642202dd46d5998618688a504f98679e50104 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Tue, 16 Apr 2024 17:23:10 +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/router/index.js                     |  75 +--
 fe/PC/src/utils/detailsTableColumns/index.js  |  78 ++-
 fe/PC/src/utils/tableColumns/index.js         | 240 +++-----
 fe/PC/src/utils/tabsDesTions/index.js         | 217 +++----
 .../dismantle/customerDismantleJob-new.vue    | 451 ++++++++++++++
 .../InventoryQuery/LibraryShiftJob.vue        | 548 ------------------
 .../InventoryQuery/LibraryShiftRequest.vue    | 228 --------
 .../transferLibJob.vue}                       |  83 +--
 .../transferLib/transferLibNote.vue           | 100 ++++
 .../transferLib/transferLibRequest.vue        | 100 ++++
 .../materialIssueManage/ZS/IssueJobZS.vue     | 538 ++---------------
 .../materialIssueManage/ZS/IssueNoteZS.vue    |  48 +-
 .../materialIssueManage/ZS/IssueRequestZS.vue | 130 +----
 fe/PC/src/views/systemManage/pageLock.vue     |  95 +++
 14 files changed, 1086 insertions(+), 1845 deletions(-)
 create mode 100644 fe/PC/src/views/finishedProductManage/dismantle/customerDismantleJob-new.vue
 delete mode 100644 fe/PC/src/views/inventoryManage/InventoryQuery/LibraryShiftJob.vue
 delete mode 100644 fe/PC/src/views/inventoryManage/InventoryQuery/LibraryShiftRequest.vue
 rename fe/PC/src/views/inventoryManage/{InventoryQuery/LibraryShiftNote.vue => transferLib/transferLibJob.vue} (56%)
 create mode 100644 fe/PC/src/views/inventoryManage/transferLib/transferLibNote.vue
 create mode 100644 fe/PC/src/views/inventoryManage/transferLib/transferLibRequest.vue
 create mode 100644 fe/PC/src/views/systemManage/pageLock.vue

diff --git a/fe/PC/src/router/index.js b/fe/PC/src/router/index.js
index 8c3d0e9fe..200c45b6c 100644
--- a/fe/PC/src/router/index.js
+++ b/fe/PC/src/router/index.js
@@ -190,39 +190,6 @@ export const constantRoutes = [
       }
     }]
   }, 
-  
-  {
-    path: '/',
-    component: Layout,
-    redirect: '/gridlayout',
-    hidden: true,
-    children: [{
-      path: 'completDumpNoteZS',
-      component: () => import('@/views/finishedProductManage/completDump/completDumpNoteZS.vue'),
-      name: 'completDumpNoteZS',
-      meta: {
-        keepAlive : true, 
-        title: '完工转储记录（注塑）',
-        icon: '完工转储申请',
-      }
-    }]
-  },
-  // {
-  //   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,
@@ -389,12 +356,12 @@ export const constantRoutes = [
     redirect: '/gridlayout',
     hidden: true,
     children: [{
-      path: 'LibraryShiftRequest',
-      component: () => import('@/views/inventoryManage/InventoryQuery/LibraryShiftRequest.vue'),
-      name: 'LibraryShiftRequest',
+      path: 'transferLibRequest',
+      component: () => import('@/views/inventoryManage/transferLib/transferLibRequest.vue'),
+      name: 'transferLibRequest',
       meta: {
         keepAlive : true, 
-        title: '库存转移申请',
+        title: '业务库移申请',
         icon: '成品发运任务',
       }
     }]
@@ -405,12 +372,12 @@ export const constantRoutes = [
     redirect: '/gridlayout',
     hidden: true,
     children: [{
-      path: 'LibraryShiftJob',
-      component: () => import('@/views/inventoryManage/InventoryQuery/LibraryShiftJob.vue'),
-      name: 'LibraryShiftJob',
+      path: 'transferLibJob',
+      component: () => import('@/views/inventoryManage/transferLib/transferLibJob.vue'),
+      name: 'transferLibJob',
       meta: {
         keepAlive : true, 
-        title: '库存转移任务',
+        title: '业务库移任务',
         icon: '成品发运任务',
       }
     }]
@@ -421,16 +388,32 @@ export const constantRoutes = [
     redirect: '/gridlayout',
     hidden: true,
     children: [{
-      path: 'LibraryShiftNote',
-      component: () => import('@/views/inventoryManage/InventoryQuery/LibraryShiftNote.vue'),
-      name: 'LibraryShiftNote',
+      path: 'transferLibNote',
+      component: () => import('@/views/inventoryManage/transferLib/transferLibNote.vue'),
+      name: 'transferLibNote',
       meta: {
         keepAlive : true, 
-        title: '库存转移记录',
+        title: '业务库移记录',
         icon: '成品发运任务',
       }
     }]
-  }, 
+  },
+  {
+    path: '/',
+    component: Layout,
+    redirect: '/gridlayout',
+    hidden: true,
+    children: [{
+      path: 'pageLock',
+      component: () => import('@/views/systemManage/pageLock.vue'),
+      name: 'pageLock',
+      meta: {
+        keepAlive : true, 
+        title: '页面锁定控制',
+        icon: '成品发运任务',
+      }
+    }]
+  },  
 ]
 
 
diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js
index 20882e81f..85d3f4df5 100644
--- a/fe/PC/src/utils/detailsTableColumns/index.js
+++ b/fe/PC/src/utils/detailsTableColumns/index.js
@@ -4193,43 +4193,65 @@ export const IssueNoteZP =  [
   // ************** 确定隐藏 ************************
 ]
 
-// 库存转移申请
-export const LibraryShiftRequest =  [
-  { label: "物品代码", prop: "itemCode" },
+// 业务库移申请
+export const transferLibRequest =  [
+  { 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: "openToClose" },
-  { label: "叫料数量", prop: "qty" },
-  { label: "单位", prop: "uom" },
-  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { 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: "toLocationCode" },
-  { label: "目标ERP库位", prop: "toLocationErpCode" },
-  { label: "生成任务数量", prop: 'issuedQty' },
-  { label: "已收数量", prop: 'receivedQty' },
-  { label: "单据号", prop: 'number' },
+  { label: "在途库位", prop: 'onTheWayLocationCode' },
   // -----------------------------------------------------------------------
-  { label: "标包数量", prop: 'stdPackQty' },
+  { 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: 'fromLocationArea' },
   { label: "工作中心", prop: 'workStation' },
   { label: "过期时间", prop: 'expiredTime' },
-  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者ID", prop: 'lastModifierId' },
-  { label: "备注", prop: "remark" },
+  { label: "工序", prop: 'operation' },
+  { label: "取整后数量", prop: 'roundedQty' },
+  { label: "计划开始时间", prop: 'planBeginTime' },
+  { label: "每次配送数量", prop: 'deliveryQty' },
   { label: "事务ID", prop: "tenantId" },
-  { label: "请求未发", prop: 'toBeIssuedQty' },
-  { label: "已发未收", prop: 'toBeReceivedQty' },
-  { label: "请求未收", prop: 'notFinishQty' },
-  // ************** 确定隐藏 ************************
-  // { label: "主表ID", prop: "masterID" },
-  // { label: "ID", prop: 'id' },
-  // ************** 确定隐藏 ************************
 ]
-// 库存转移任务
-export const LibraryShiftJob =  [
+// 业务库移任务
+export const transferLibJob =  [
   { label: "物品代码", prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
@@ -4292,8 +4314,8 @@ export const LibraryShiftJob =  [
   // { label: "主表ID", prop: "masterID" },
   // ************** 确定隐藏 ************************
 ]
-// 库存转移记录
-export const LibraryShiftNote =  [
+// 业务库移记录
+export const transferLibNote =  [
   { label: "物品代码", prop: "itemCode",fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index ee56109d9..abd450cfc 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -747,9 +747,9 @@ export const ProductionLineItem = [
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
   { label: "生产线代码", prop: "prodLineCode" },
-  { label: "完工库位列表", prop: "productLocationCodeListJson", type:"showDetail", isJson:true},
-  { label: "原材料库位列表", prop: "rawLocationCodeListJson", type:"showDetail", isJson:true },
-  { label: "线边库位列表", prop: "wipLocationCodeListJson", type:"showDetail", isJson:true },
+  { label: "完工库位列表", prop: "productLocationCodeListJson", type:"showDetail", isJson:true,showProp:true},
+  { label: "原材料库位列表", prop: "rawLocationCodeListJson", type:"showDetail", isJson:true,showProp:true },
+  { label: "线边库位列表", prop: "wipLocationCodeListJson", type:"showDetail", isJson:true,showProp:true },
   { label: "备注", prop: "remark" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
@@ -3857,26 +3857,26 @@ export const Department =  [
 // 外部数据转换
 export const dataExchangeFromOut = [
   { label: _Dashboard.number, prop: "number" },
-  { label: _Public.remark, prop: "remark", type:"showDetail" },
-  { label: _Dashboard.dataType, prop: "dataType", type:"showDetail" },
+  { label: _Public.remark, prop: "remark", type:"showDetail",showProp:true },
+  { label: _Dashboard.dataType, prop: "dataType", type:"showDetail",showProp:true },
   { label: _Dashboard.tableType, prop: "tableType" },
   { label: _Dashboard.dataAction, prop: "dataAction" },
   { label: _Dashboard.effectiveDate, prop: "effectiveDate",type:'dateTime' },
   { label: _Dashboard.status, prop: "status" },
-  { label: _Dashboard.sourceSystem, prop: "sourceSystem", type:"showDetail" },
+  { label: _Dashboard.sourceSystem, prop: "sourceSystem", type:"showDetail",showProp:true },
   { label: _Dashboard.sourceDataId, prop: "sourceDataId" },
-  { label: _Dashboard.sourceDataGroupCode, prop: "sourceDataGroupCode", type:"showDetail" },
-  { label: _Dashboard.sourceDataDetailCode, prop: "sourceDataDetailCode", type:"showDetail" },
-  { label: _Dashboard.sourceDataContent, prop: "sourceDataContent", type:"showJsonTable" },
+  { label: _Dashboard.sourceDataGroupCode, prop: "sourceDataGroupCode", type:"showDetail",showProp:true },
+  { label: _Dashboard.sourceDataDetailCode, prop: "sourceDataDetailCode", type:"showDetail",showProp:true },
+  { label: _Dashboard.sourceDataContent, prop: "sourceDataContent", type:"showJsonTable",showProp:true },
   { label: _Dashboard.writeTime, prop: "writeTime",type:'dateTime' },
   { label: _Dashboard.writer, prop: "writer" },
-  { label: _Dashboard.destinationSystem, prop: "destinationSystem", type:"showDetail" },
+  { label: _Dashboard.destinationSystem, prop: "destinationSystem", type:"showDetail",showProp:true },
   { label: _Dashboard.destinationDataId, prop: "destinationDataId" },
   { label: _Dashboard.destinationDataContent, prop: "destinationDataContent", type:"showJsonTable" },
   { label: _Dashboard.readTime, prop: "readTime",type:'dateTime' },
   { label: _Dashboard.reader, prop: "reader" },
   { label: _Dashboard.errorCode, prop: "errorCode" },
-  { label: _Dashboard.errorMessage, prop: "errorMessage", type:"showDetail" },
+  { label: _Dashboard.errorMessage, prop: "errorMessage", type:"showDetail",showProp:true },
   { label: _Dashboard.retryTimes, prop: "retryTimes" },
 // ************** 暂时隐藏 ************************
   // { label: _Public.creationTime, prop: "creationTime",type:'dateTime' },
@@ -3889,7 +3889,7 @@ export const dataExchangeFromOut = [
 // 归档外部数据转换
 export const dataExchangeFromOut_file = [
   { label: _Dashboard.number, prop: "number" },
-  { label: _Public.remark, prop: "remark", type:"showDetail" },
+  { label: _Public.remark, prop: "remark", type:"showDetail",showProp:true },
   { label: _Dashboard.dataType, prop: "dataType" },
   { label: _Dashboard.tableType, prop: "tableType" },
   { label: _Dashboard.dataAction, prop: "dataAction" },
@@ -3908,7 +3908,7 @@ export const dataExchangeFromOut_file = [
   { label: _Dashboard.readTime, prop: "readTime",type:'dateTime' },
   { label: _Dashboard.reader, prop: "reader" },
   { label: _Dashboard.errorCode, prop: "errorCode" },
-  { label: _Dashboard.errorMessage, prop: "errorMessage", type:"showDetail" },
+  { label: _Dashboard.errorMessage, prop: "errorMessage", type:"showDetail",showProp:true },
   { label: _Dashboard.retryTimes, prop: "retryTimes" },
 // ************** 暂时隐藏 ************************
   // { label: _Public.creationTime, prop: "creationTime",type:'dateTime' },
@@ -3921,7 +3921,7 @@ export const dataExchangeFromOut_file = [
 // WMS数据接收
 export const comingToWms = [
   { label: _Dashboard.number, prop: "number" },
-  { label: _Public.remark, prop: "remark", type:"showDetail" },
+  { label: _Public.remark, prop: "remark", type:"showDetail",showProp:true },
   { label: _Dashboard.dataType, prop: "dataType" },
   { label: _Dashboard.dataAction, prop: "dataAction" },
   { label: _Dashboard.effectiveDate, prop: "effectiveDate",type:'dateTime' },
@@ -3932,7 +3932,7 @@ export const comingToWms = [
   { label: _Dashboard.writeTime, prop: "writeTime",type:'dateTime' },
   { label: _Dashboard.readTime, prop: "readTime",type:'dateTime' },
   { label: _Dashboard.errorCode, prop: "errorCode" },
-  { label: _Dashboard.errorMessage, prop: "errorMessage", type:"showDetail" },
+  { label: _Dashboard.errorMessage, prop: "errorMessage", type:"showDetail",showProp:true },
   { label: _Dashboard.retryTimes, prop: "retryTimes" },
 // ************** 暂时隐藏 ************************
   // { label: _Public.creationTime, prop: "creationTime",type:'dateTime' },
@@ -3945,7 +3945,7 @@ export const comingToWms = [
 // 归档WMS数据接收
 export const comingToWms_file = [
   { label: _Dashboard.number, prop: "number" },
-  { label: _Public.remark, prop: "remark", type:"showDetail" },
+  { label: _Public.remark, prop: "remark", type:"showDetail",showProp:true },
   { label: _Dashboard.dataType, prop: "dataType" },
   { label: _Dashboard.dataAction, prop: "dataAction" },
   { label: _Dashboard.effectiveDate, prop: "effectiveDate",type:'dateTime' },
@@ -3956,7 +3956,7 @@ export const comingToWms_file = [
   { label: _Dashboard.writeTime, prop: "writeTime",type:'dateTime' },
   { label: _Dashboard.readTime, prop: "readTime",type:'dateTime' },
   { label: _Dashboard.errorCode, prop: "errorCode" },
-  { label: _Dashboard.errorMessage, prop: "errorMessage", type:"showDetail" },
+  { label: _Dashboard.errorMessage, prop: "errorMessage", type:"showDetail",showProp:true },
   { label: _Dashboard.retryTimes, prop: "retryTimes" },
 // ************** 暂时隐藏 ************************
   // { label: _Public.creationTime, prop: "creationTime",type:'dateTime' },
@@ -3969,7 +3969,7 @@ export const comingToWms_file = [
 // WMS数据转换
 export const dataExchangeFromWms = [
   { label: _Dashboard.number, prop: "number" },
-  { label: _Public.remark, prop: "remark", type:"showDetail" },
+  { label: _Public.remark, prop: "remark", type:"showDetail",showProp:true },
   { label: _Dashboard.dataType, prop: "dataType" },
   { label: _Dashboard.dataAction, prop: "dataAction" },
   { label: _Dashboard.effectiveDate, prop: "effectiveDate",type:'dateTime' },
@@ -3981,7 +3981,7 @@ export const dataExchangeFromWms = [
   { label: _Dashboard.destinationSystem, prop: "destinationSystem" },
   { label: _Dashboard.readTime, prop: "readTime",type:'dateTime' },
   { label: _Dashboard.errorCode, prop: "errorCode" },
-  { label: _Dashboard.errorMessage, prop: "errorMessage", type:"showDetail" },
+  { label: _Dashboard.errorMessage, prop: "errorMessage", type:"showDetail",showProp:true },
   { label: _Dashboard.retryTimes, prop: "retryTimes" },
 // ************** 暂时隐藏 ************************
   // { label: _Public.creationTime, prop: "creationTime",type:'dateTime' },
@@ -3994,7 +3994,7 @@ export const dataExchangeFromWms = [
 // 归档WMS数据转换
 export const dataExchangeFromWms_file = [
   { label: _Dashboard.number, prop: "number" },
-  { label: _Public.remark, prop: "remark", type:"showDetail" },
+  { label: _Public.remark, prop: "remark", type:"showDetail",showProp:true },
   { label: _Dashboard.dataType, prop: "dataType" },
   { label: _Dashboard.dataAction, prop: "dataAction" },
   { label: _Dashboard.effectiveDate, prop: "effectiveDate",type:'dateTime' },
@@ -4006,7 +4006,7 @@ export const dataExchangeFromWms_file = [
   { label: _Dashboard.destinationSystem, prop: "destinationSystem" },
   { label: _Dashboard.readTime, prop: "readTime",type:'dateTime' },
   { label: _Dashboard.errorCode, prop: "errorCode" },
-  { label: _Dashboard.errorMessage, prop: "errorMessage", type:"showDetail" },
+  { label: _Dashboard.errorMessage, prop: "errorMessage", type:"showDetail",showProp:true },
   { label: _Dashboard.retryTimes, prop: "retryTimes" },
 // ************** 暂时隐藏 ************************
   // { label: _Public.creationTime, prop: "creationTime",type:'dateTime' },
@@ -4020,7 +4020,7 @@ export const dataExchangeFromWms_file = [
 // 外部数据接收
 export const comingFromOut = [
   { label: _Dashboard.number, prop: "number" },
-  { label: _Public.remark, prop: "remark", type:"showDetail" },
+  { label: _Public.remark, prop: "remark", type:"showDetail",showProp:true },
   { label: _Dashboard.dataType, prop: "dataType" },
   { label: _Dashboard.tableType, prop: "tableType" },
   { label: _Dashboard.dataAction, prop: "dataAction" },
@@ -4039,7 +4039,7 @@ export const comingFromOut = [
   { label: _Dashboard.readTime, prop: "readTime",type:'dateTime' },
   { label: _Dashboard.reader, prop: "reader" },
   { label: _Dashboard.errorCode, prop: "errorCode" },
-  { label: _Dashboard.errorMessage, prop: "errorMessage", type:"showDetail" },
+  { label: _Dashboard.errorMessage, prop: "errorMessage", type:"showDetail",showProp:true },
   { label: _Dashboard.retryTimes, prop: "retryTimes" },
 // ************** 暂时隐藏 ************************
   // { label: _Public.creationTime, prop: "creationTime",type:'dateTime' },
@@ -4052,7 +4052,7 @@ export const comingFromOut = [
 // 归档外部数据接收 
 export const comingFromOut_file = [
   { label: _Dashboard.number, prop: "number" },
-  { label: _Public.remark, prop: "remark", type:"showDetail" },
+  { label: _Public.remark, prop: "remark", type:"showDetail",showProp:true },
   { label: _Dashboard.dataType, prop: "dataType" },
   { label: _Dashboard.tableType, prop: "tableType" },
   { label: _Dashboard.dataAction, prop: "dataAction" },
@@ -4071,7 +4071,7 @@ export const comingFromOut_file = [
   { label: _Dashboard.readTime, prop: "readTime",type:'dateTime' },
   { label: _Dashboard.reader, prop: "reader" },
   { label: _Dashboard.errorCode, prop: "errorCode" },
-  { label: _Dashboard.errorMessage, prop: "errorMessage", type:"showDetail" },
+  { label: _Dashboard.errorMessage, prop: "errorMessage", type:"showDetail",showProp:true },
   { label: _Dashboard.retryTimes, prop: "retryTimes" },
 // ************** 暂时隐藏 ************************
   // { label: _Public.creationTime, prop: "creationTime",type:'dateTime' },
@@ -4088,11 +4088,11 @@ export const exchangeDataMaintenancePage = [
   { label: _Dashboard.dataAction, prop: "dataAction"},
   { label: _Dashboard.dataContent, prop: "dataContent", type:"showJsonTable" },
   { label: _Dashboard.dataIdentityCode, prop: "dataIdentityCode" },
-  { label: _Dashboard.dataType, prop: "dataType", type:"showDetail" },
-  { label: _Dashboard.destinationSystem, prop: "destinationSystem", type:"showDetail" },
+  { label: _Dashboard.dataType, prop: "dataType", type:"showDetail",showProp:true },
+  { label: _Dashboard.destinationSystem, prop: "destinationSystem", type:"showDetail" ,showProp:true},
   { label: _Dashboard.effectiveDate, prop: "effectiveDate",type:'dateTime' },
   { label: _Dashboard.sourceSystem, prop: "sourceSystem" },
-  { label: _Public.remark, prop: "remark", type:"showDetail" },
+  { label: _Public.remark, prop: "remark", type:"showDetail" ,showProp:true},
   { label: _Public.creationTime, prop: "creationTime",type:'dateTime' },
   { label: _Public.creatorId, prop: "creatorId" },
   { label: _Public.lastModificationTime, prop: "lastModificationTime",type:'dateTime' },
@@ -4252,76 +4252,45 @@ export const IssuePlanZS = [
 // 人工注塑申请
 export const IssueRequestZS =  [
   {
-    label: "叫料申请编号",
+    label: "申请编号",
     prop: "number",
     fixed: "left",
     type: "name",
     width: orderWidth
   },
   { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
-  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true },
+  { label: "目标库位代", prop: "toLocationCode" },
+  { label: "目标ERP库位", prop: "toLocationErpCode" },
   { 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 IssueJobZS =  [
   {
-    label: "发料任务编号",
+    label: "任务编号",
     prop: "number",
     fixed: "left",
     type: "name",
     width: orderWidth
   },
+  { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
   { 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' },
-  // ************** 确认隐藏 ************************
+  { label: "操作员", prop: 'worker' },
+  { label: "备注", prop: 'remark' },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  
 ]
 // 人工注塑记录
 export const IssueNoteZS =  [
   {
-    label: "发料记录单号",
+    label: "记录单号",
     prop: "number",
     fixed: "left",
     type: "name",
@@ -4329,21 +4298,14 @@ export const IssueNoteZS =  [
   },
   { 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" },
-  // ************** 确认隐藏 ************************
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  
 ]
 
 // 人工发料申请（喷涂）
@@ -4541,87 +4503,49 @@ export const IssueNoteZP =  [
   // ************** 确认隐藏 ************************
 ]
 
-// 库存转移申请
-export const LibraryShiftRequest =  [
-  { label: "申请编号", prop: "number" },
-  { label: "状态", prop: "requestStatus",type: "filter", filters: "requestStatus" },
-  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+// 业务库移申请
+export const transferLibRequest =  [
+  { label: "申请编号", prop: "number",type:"name",fixed: "left", },
+  { label: "状态", prop: "requestStatus",type: "tagFilter", filters: "requestStatus" },
+  { label: "回调服务名称", prop: "callServerName" },
+  { label: "回调业务类型", prop: "callBusinessType" },
+  { label: "传入申请单号", prop: "callRequestNumber" },
+  { label: "传入任务单号", prop: "callJobNumber" },
+  { label: "备注", prop: 'remark' },
   { label: "操作员", prop: "worker" },
+  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
   { 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" },
+]
+// 业务库移任务
+export const transferLibJob = [
+  { label: "任务编号", prop: "number",type:"name",fixed: "left", },
+  { label: "申请单号", prop: 'requestNumber' },
+  { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
+  { label: "回调服务名称", prop: "callServerName" },
+  { label: "回调业务类型", prop: "callBusinessType" },
+  { label: "传入申请单号", prop: "callRequestNumber" },
+  { label: "传入任务单号", prop: "callJobNumber" },
   { label: "备注", prop: 'remark' },
-  { label: "创建者ID", prop: "creatorId" },
-  { label: "事务ID", prop: "tenantId" },
+  { label: "操作员", prop: "worker" },
   { 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" },
+// 业务库移记录
+export const transferLibNote =  [
+  { label: "记录编号", prop: "number",type:"name",fixed: "left", },
   { 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: "callServerName" },
+  { label: "回调业务类型", prop: "callBusinessType" },
+  { label: "传入申请单号", prop: "callRequestNumber" },
+  { label: "传入任务单号", prop: "callJobNumber" },
   { label: "备注", prop: 'remark' },
-  { label: "事务ID", prop: "tenantId" },
+  { label: "操作员", prop: "worker" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
-  { label: "车间", prop: 'workshop' },
-  { label: "确认时间", prop: 'confirmTime', type: "dateTime" },
-  // ************** 确认隐藏 ************************
-  // { label: "ID", prop: 'id' },
-  // ************** 确认隐藏 ************************
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
 ]
 
 // 三方库申请
@@ -4691,6 +4615,16 @@ export const customerReturnNote =  [
   { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
 ]
 
+// 页面锁定控制
+export const pageLock =  [
+  { label: "菜单编码", prop: "menuCode", fixed: "left", type: "name" },
+  { label: "用户信息", prop: "userAccount" },
+  { label: "登录时间", prop: "loginTime", type: "dateTime" },
+  { label: "备注", prop: 'remark' },
+  { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
+  { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
+]
+
 
 
 // 字段说明
diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js
index 169e94d81..d6889d6fd 100644
--- a/fe/PC/src/utils/tabsDesTions/index.js
+++ b/fe/PC/src/utils/tabsDesTions/index.js
@@ -3093,87 +3093,60 @@ export const completDumpNoteZP =  [
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
 ]
 
-// 人工发料申请（注塑）
+// 人工注塑申请
 export const IssueRequestZS =  [
-  { label: "申请编号", prop: "number" },
-  { label: "状态", prop: "requestStatus",type: "filter", filters: "requestStatus" },
-  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  {
+    label: "申请编号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+  },
+  { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
+  { label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true },
+  { label: "目标库位代", prop: "toLocationCode" },
+  { label: "目标ERP库位", prop: "toLocationErpCode" },
   { 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: "creationTime", type: "dateTime" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者ID", prop: "lastModifierId" },
-  { label: "备注", prop: 'remark' },
-  { label: "上游任务编号", prop: 'upStreamJobNumber',},
+]
+// 人工注塑任务
+export const IssueJobZS =  [
+  {
+    label: "任务编号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+  },
   { 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: "jobStatus",type: "tagFilter", filters: "jobStatus" },
   { label: "生产线", prop: 'prodLine' },
-  { label: "车间", prop: 'workshop' },
-  { label: "仓库代码", prop: 'warehouseCode' },
-  // ************** 确认隐藏 ************************
-  // { label: "ID", prop: 'id' },
-  // ************** 确认隐藏 ************************
+  { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+  { label: "操作员", prop: 'worker' },
+  { label: "备注", prop: 'remark' },
+  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  
 ]
-// 人工发料记录（注塑）
+// 人工注塑记录
 export const IssueNoteZS =  [
-  { label: "发料记录单号", prop: "number" },
+  {
+    label: "记录单号",
+    prop: "number",
+    fixed: "left",
+    type: "name",
+  },
   { label: "申请单号", prop: 'requestNumber' },
   { label: "任务单号", prop: 'jobNumber' },
-  { label: "创建时间", prop: "creationTime",type: "dateTime" },
   { label: "操作员", prop: 'worker' },
-  { label: "叫料请求类型", prop: 'requestType' },
+  { 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: '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' },
-  // ************** 确认隐藏 ************************
+  
 ]
 
 // 人工发料申请（喷涂）
@@ -3353,87 +3326,49 @@ export const IssueNoteZP =  [
   // ************** 确认隐藏 ************************
 ]
 
-// 库存转移申请
-export const LibraryShiftRequest =  [
-  { label: "申请编号", prop: "number" },
-  { label: "状态", prop: "requestStatus",type: "filter", filters: "requestStatus" },
-  { label: "创建时间", prop: "creationTime", type: "dateTime" },
+// 业务库移申请
+export const transferLibRequest =  [
+  { label: "申请编号", prop: "number",type:"name",fixed: "left", },
+  { label: "状态", prop: "requestStatus",type: "tagFilter", filters: "requestStatus" },
+  { label: "回调服务名称", prop: "callServerName" },
+  { label: "回调业务类型", prop: "callBusinessType" },
+  { label: "传入申请单号", prop: "callRequestNumber" },
+  { label: "传入任务单号", prop: "callJobNumber" },
+  { label: "备注", prop: 'remark' },
   { label: "操作员", prop: "worker" },
+  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
   { 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" },
+]
+// 业务库移任务
+export const transferLibJob = [
+  { label: "任务编号", prop: "number",type:"name",fixed: "left", },
+  { label: "申请单号", prop: 'requestNumber' },
+  { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
+  { label: "回调服务名称", prop: "callServerName" },
+  { label: "回调业务类型", prop: "callBusinessType" },
+  { label: "传入申请单号", prop: "callRequestNumber" },
+  { label: "传入任务单号", prop: "callJobNumber" },
   { label: "备注", prop: 'remark' },
-  { label: "创建者ID", prop: "creatorId" },
-  { label: "事务ID", prop: "tenantId" },
+  { label: "操作员", prop: "worker" },
   { 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" },
+// 业务库移记录
+export const transferLibNote =  [
+  { label: "记录编号", prop: "number",type:"name",fixed: "left", },
   { 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: "callServerName" },
+  { label: "回调业务类型", prop: "callBusinessType" },
+  { label: "传入申请单号", prop: "callRequestNumber" },
+  { label: "传入任务单号", prop: "callJobNumber" },
   { label: "备注", prop: 'remark' },
-  { label: "事务ID", prop: "tenantId" },
+  { label: "操作员", prop: "worker" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
-  { label: "车间", prop: 'workshop' },
-  { label: "确认时间", prop: 'confirmTime', type: "dateTime" },
-  // ************** 确认隐藏 ************************
-  // { label: "ID", prop: 'id' },
-  // ************** 确认隐藏 ************************
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
 ]
 
 // 三方库申请
@@ -3501,4 +3436,14 @@ export const customerReturnNote =  [
   { label: "退料时间", prop: 'returnTime', type: "dateTime" },
   { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
   { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
+]
+
+// 页面锁定控制
+export const pageLock =  [
+  { label: "菜单编码", prop: "menuCode", fixed: "left", type: "name" },
+  { label: "用户信息", prop: "userAccount" },
+  { label: "登录时间", prop: "loginTime", type: "dateTime" },
+  { label: "备注", prop: 'remark' },
+  { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
+  { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
 ]
\ No newline at end of file
diff --git a/fe/PC/src/views/finishedProductManage/dismantle/customerDismantleJob-new.vue b/fe/PC/src/views/finishedProductManage/dismantle/customerDismantleJob-new.vue
new file mode 100644
index 000000000..24505af4b
--- /dev/null
+++ b/fe/PC/src/views/finishedProductManage/dismantle/customerDismantleJob-new.vue
@@ -0,0 +1,451 @@
+<template>
+  <div class="page-box" v-loading="Loading.appMainLoading">
+    <tablePagination
+      :currenButtonData="currenButtonData"
+      :tableData="tableData"
+      :tableLoading="Loading.tableLoading"
+      :tableColumns="tableColumns"
+      @rowDrop="rowDrop"
+      :totalCount="totalCount"
+      :multipleSelection="multipleSelection"
+      :MaxResultCount="PageListParams.MaxResultCount"
+      @topbutton="topbutton"
+      @inlineDialog="inlineDialog"
+      @sortChange="sortChange"
+      @alertoldSkipCount="alertoldSkipCount"
+      @alterResultCount="alterResultCount"
+      @handleSelectionChange="handleSelectionChange"
+      :currentPageProps="oldSkipCount"
+      :quicklySearchOption="quicklySearchOption"
+      @quicklySearchClick="quicklySearchClick"
+      @quicklySearchClear="quicklySearchClear"
+      :primarySearchOption="primarySearchOption"
+      @overallSearchFormClick="overallSearchFormClick"
+      :httpOverallSearchData="httpOverallSearchData"
+    >
+    </tablePagination>
+    <curren-Drawer
+      :title="tableColumns"
+      :DrawerLoading="Loading.DrawerLoading"
+      :drawer="displayDialog.detailsDialog"
+      :propsData="propsData"
+      :Butttondata="DrawerButtonData"
+      :tabsDesTions="tabsDesTions"
+      @drawerShut="(val) => (displayDialog.detailsDialog = val)"
+      @drawerbutton="drawerbuttonHandle"
+      @handleCommand="drawerHandle"
+      @close-value="closeValue"
+      :tableColumns="detailsTableColumns"
+      :totalCount="totalCountDetails"
+      :MaxResultCount="MaxResultCountDetails"
+      @alterResultCountDetails="alterResultCountDetails"
+      @alertoldSkipCountDetails="alertoldSkipCountDetails"
+      :dropdownTabsData="[]"
+      :firstTabs="firstTabs"
+    ></curren-Drawer>
+    <!--编辑-->
+    <StepsFormTree
+      ref="StepsFormTree_Ref"
+      :propsData="propsData"
+      :formTitle="formTitle"
+      :displayDialog="displayDialog"
+      :CreateFormData="CreateFormData"
+      :CreateForm="CreateForm"
+      :Rules="editRules.cerateRule"
+      :Options="editOptions"
+      :detailsTableColumns="AddDetailsTableColumns"
+      :childTableData="childTableData"
+      @push="FormTreePush"
+      @clear="FormTreeClear"
+      @close="stepsCloseHandle(arguments)"
+      :isShowDeleteButton="false"
+      :addClickButton="false"
+      :successHandle="successHandle"
+    ></StepsFormTree>
+  </div>
+</template>
+<script>
+import {  
+  getDetailed, 
+  getPageList,
+  getBomByComponentTree,
+  productRecycleNoteExport,
+  productionRecycleJobHandle,
+  // productionRecycleJobComplete
+} from "@/api/wms-api";
+import { tableMixins } from "@/mixins/TableMixins"
+import { LoadingMixins } from "@/mixins/LoadingMixins"
+import { drawerMixins } from "@/mixins/drawerMixins"
+import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
+import { mixins } from "@/mixins/mixins"
+import { filterSelectMixins } from '@/mixins/filter-Select'
+import store  from '@/store'
+import StepsFormTree from './StepsFormTree'
+export default {
+  name: "customerDismantleJob",
+  mixins: [
+    tableMixins,
+    LoadingMixins,
+    drawerMixins,
+    TableHeaderMixins,
+    mixins,
+    filterSelectMixins,
+  ],
+  computed: {
+    hideButton: function () {
+      return function (val) {
+        let data = true
+        val.forEach(key => {
+          if (this.propsData.jobStatus == key) {
+            data = false
+          }
+        })
+        return data
+      }
+    },
+  },
+  components:{StepsFormTree},
+  data () {
+    return {
+      URL: 'wms/store/production-recycle-job',
+      //常用按钮数据
+      currenButtonData: [
+        // this.defaultAddBtn(),//新增
+        //导出
+        this.defaultExportBtn(),
+        this.defaultFieldSettingBtn(),//字段设置
+        this.defaultFreshBtn(),//刷新
+        this.defaultFilterBtn(),//筛选
+      ],
+      DrawerButtonData: [
+        {
+          type: 'warning',
+          label: '执行',
+          name: "handle",
+          // 待处理+执行中+部分完成
+          hide: () => { return this.hideButton([1,2,4]) },
+          size: 'mini'
+        },
+        // {
+        //   type: 'success',
+        //   label: '完成',
+        //   name: "complete",
+        //   // todo:什么状态可以执行，还是数量判断
+        //   hide: () => { return this.hideButton([1]) },
+        //   size: 'mini'
+        // },
+      ],
+      //新增
+      CreateFormData: {
+        qty:null,
+        details:[]
+      },
+      CreateForm: [
+        { type: "inputNumber", label: "数量", prop: "qty",colSpan: 12,min:1},
+      ],
+      editRules: {
+        cerateRule: {
+          qty: [
+            { required: true, trigger: "blur", message: "不可为空" },
+            {
+              type: "number",
+              trigger: ["blur"],
+              validator: (rule, value, callback) => {
+                //数量控制
+                let _InventoryQty = Number(this.propsData.details[0].qty) - Number(this.propsData.details[0].executedQty)
+                if(_InventoryQty < value){
+                  return callback(new Error(`数量不能大于未完成数量${_InventoryQty}`))
+                }else{
+                  callback()
+                }
+              }
+            }
+          ],
+        },
+      },
+      AddDetailsTableColumns: [
+        { label: "子物料代码", prop: "itemCode",width:"auto",align:'left' },
+        { label: "数量", prop: 'qty',width:"auto" },
+        { type: "filterSelect", label: "目标库位", prop: "locationCode", optionsLabel: "name", optionsValue: "code", 
+          focus: (type,val) => { return this.getFilterList(type, val, "basedata/Location",this.isFilter("type", "5"))},
+          // searchButton: (val) => { this.showSerarchPage(val, 'basedata/Location', 'InventoryBalance', '库位选择', this.CreateFormData) }, 
+          width:"auto",
+        },
+      ],
+      childTableData:[{
+        itemCode:undefined,
+        qty:undefined,
+        locationCode:undefined,
+        locationArea:undefined,
+        locationErpCode:undefined,
+        locationGroup:undefined,
+        warehouseCode:undefined,
+      }],
+      successHandle:[
+        {
+          label:"下载报告",
+          click:(()=>{
+            this.downloadReport()
+          })
+        }
+      ],
+      bomList:null,
+      submitRes:null,//提交后结果
+    };
+  },
+  mounted () {
+    this.paging();
+  },
+  methods: {
+    FormTreePush(item,props,val,scope){
+      console.log(props)
+      if(props.prop == "locationCode"){
+        scope.row.locationCode = val
+        scope.row.locationArea = item.areaCode
+        scope.row.locationErpCode = item.erpLocationCode
+        scope.row.locationGroup = item.locationGroupCode
+        scope.row.warehouseCode = item.warehouseCode
+      }
+    },
+    FormTreeClear(item,scope){
+      console.log(item)
+      if(item.prop == "locationCode"){
+        scope.row.locationCode = null
+      }
+    },
+    // bom递归生成树状节点
+    buildTree(list){
+      let pidStr = 'parentCode';
+      let idStr = 'itemCode';
+      let childrenStr = 'children';
+
+      let listOjb = {}; // 用来储存{key: obj}格式的对象
+      let treeList = []; // 用来储存最终树形结构数据的数组
+
+      // 将数据变换成{key: obj}格式，方便下面处理数据
+      for (let i = 0; i < list.length; i++) {
+        listOjb[list[i][idStr]] = list[i]
+      }
+
+      for (let j = 0; j < list.length; j++) {
+        // 判断父级是否存在
+        let haveParent = listOjb[list[j][pidStr]]
+        if (haveParent) {
+          // 如果有没有父级children字段，就创建一个children字段
+          !haveParent[childrenStr] && (haveParent[childrenStr] = [])
+          // 在父级里插入子项
+          haveParent[childrenStr].push(list[j])
+        } else {
+          // 如果没有父级直接插入到最外层
+          treeList.push(list[j])
+        }
+      }
+      return treeList
+    },
+    
+    drawerbuttonHandle(val){
+      // 执行
+      if (val == "handle") {
+        this.formTitle = this.$route.meta.title + "执行";
+        this.CreateFormData = JSON.parse(JSON.stringify(this.propsData));
+        // 默认值
+        let _qty = Number(this.propsData.details[0].qty) - Number(this.propsData.details[0].executedQty)
+        this.$set(this.CreateFormData, "qty", _qty)
+        this.childTableData = [{
+          itemCode:undefined,
+          qty:undefined,
+          locationCode:undefined,
+          locationArea:undefined,
+          locationErpCode:undefined,
+          locationGroup:undefined,
+          warehouseCode:undefined,
+        }]
+        this.theEvent = "edit"
+        this.displayDialog.newDialog = true
+      }
+      // 完成
+      // else if(val == "complete"){
+      //   // todo:强制完成,更改wsm-api中productionRecycleJobComplete的值
+      //   this.Loading.appMainLoading = true
+      //   productionRecycleJobComplete(this.propsData.id).then(res => {
+      //     this.Loading.appMainLoading = false
+      //     this.paging()
+      //     this.displayDialog.detailsDialog = false
+      //   }).catch(err => {
+      //     this.Loading.appMainLoading = false
+      //   })
+      // }
+      else{
+        this.drawerbutton(val)
+      }
+    },
+    //过滤查询条件
+    isFilter (val, data) {
+      let filter = [
+        {
+          logic: "And",
+          column: val,
+          action: "==",
+          value: data
+        }
+      ]
+      return filter
+    },
+    // 成功后按钮操作
+    downloadReport(){
+      // 下载
+      let _data = {
+        maxResultCount: 20,
+        skipCount: 0,
+        sorting: "",
+        route: "wms/store/product-recycle-note/export-product-recycle",
+        function: "客户退拆记录",//导出文件名称
+        condition: {
+          filters: [
+            {
+              logic: "And",
+              column: "number",
+              action: "==",
+              value: this.submitRes.remark
+            }
+          ]
+        }
+      }
+      this.Loading.appMainLoading = true
+      productRecycleNoteExport(_data)
+        .then(res=>{
+          this.Loading.appMainLoading = false
+          this.blob(res,'客户退拆记录报告')//导出文件名称
+        })
+        .catch(err=>{
+          this.Loading.appMainLoading = false
+        })
+    },
+    // 检查递归
+    checkSelectDG(list){
+      for (let i = 0; i < list.length; i++) {
+      }
+    },
+    // 提交前检查所选数据，同级选择等情况处理
+    checkSelectData(){
+      // todo:检查所选数据，同级选择等情况处理
+      let _isSelectData = this.$refs.StepsFormTree_Ref.selectData
+      let _select_ids = []
+      _isSelectData.forEach(item=>{_select_ids.push(item.id)})
+      if(!_isSelectData || _isSelectData.length <= 0){
+        this.$warningMsg("请选择数据")
+        return
+      }
+      // this.bomList.forEach(item=>{
+      //   if()
+      // })
+      // this.checkSelectDG(_isSelectData)
+      console.log(111,_isSelectData)
+      console.log(222,this.bomList)
+      console.log(333,_select_ids)
+      return
+      this.submitHttp()
+    },
+    // 提交请求
+    submitHttp(){
+      this.bomList.forEach((item,index)=>{
+        let _item = {
+          itemCode: item.component,
+          qty: _tableList[index].qty,
+          locationCode: _tableList[index].rawLocationCode,
+          locationArea: _tableList[index].rawLocationArea,
+          locationGroup: _tableList[index].rawLocationGroup,
+          locationErpCode: _tableList[index].rawLocationErpCode,
+          warehouseCode: _tableList[index].warehouseCode,
+        }
+        _data.details[0].materialDetails.push(_item)
+      })
+      this.Loading.appMainLoading = true
+      this.submitRes = null
+      productionRecycleJobHandle(_jobInfo.id,_data).then(res => {
+        this.Loading.appMainLoading = false
+        this.submitRes = res
+        resolve();
+      }).catch(err => {
+        this.Loading.appMainLoading = false
+        reject();
+      })
+    },
+    stepsSubmit (val) {
+      // 提交
+      return new Promise((resolve, reject) => {
+        let _tableList = this.CreateFormData.details
+        let _empty = 0
+        _tableList.forEach(item=>{
+          if(!item.locationCode || item.locationCode.length <= 0){
+            _empty ++
+          }
+        })
+        if(_empty > 0){
+          this.$errorMsg("目标库位不可为空")
+          return
+        }
+        let _jobInfo = this.propsData
+        let _itemInfo = this.propsData.details[0]
+        let _data = JSON.parse(JSON.stringify(_jobInfo))
+        _data.details[0].materialDetails = [],//目前规定明细中肯定只有一个子数据
+        _data.details[0].qty = Number(this.CreateFormData.qty)
+        this.checkSelectData()
+      });
+    },
+    stepsCloseHandle(data){
+      // 关闭详情弹窗
+      this.displayDialog.detailsDialog = false
+      this.stepsClose(data)
+    },
+    PalletlFunction (val) {
+      return new Promise((resolve, reject) => {
+        if(val == 0){
+          this.Loading.appMainLoading = true
+          // 获取接口生成bom列表
+          let _itemInfo = this.propsData.details[0]
+          getBomByComponentTree(_itemInfo.itemCode)
+            .then(res=>{
+              this.bomList = res
+              this.Loading.appMainLoading = false
+              if(res.length > 0){
+                this.CreateFormData.details = []
+                res.forEach(item=>{
+                  let _item={
+                    id:item.id,
+                    itemCode:item.component,
+                    parentCode:item.product,
+                    // details的qty是否要乘以主表的qty值
+                    qty:Number(item.componentQty) * Number(this.CreateFormData.qty),
+                    locationCode:_itemInfo.rawLocationCode,
+                    locationArea:_itemInfo.rawLocationArea,
+                    locationGroup:_itemInfo.rawLocationGroup,
+                    locationErpCode:_itemInfo.rawLocationErpCode,
+                    warehouseCode:_itemInfo.warehouseCode,
+                  }
+                  this.CreateFormData.details.push(_item)
+                })
+                this.CreateFormData.details = this.buildTree(JSON.parse(JSON.stringify(this.CreateFormData.details)))
+                resolve();
+              }else{
+                this.$errorMsg(`并未找到${_itemInfo.itemCode}对应的bom数据`)
+                reject()
+              }
+            })
+            .catch(err=>{
+              this.Loading.appMainLoading = false
+              reject()
+            })
+        }
+        // 提交
+        if(val == 1){
+          resolve()
+        }
+      });
+    },
+  }
+};
+</script>
+<style lang="scss" scoped>
+@import "../../../styles/basicData.scss";
+</style>
\ No newline at end of file
diff --git a/fe/PC/src/views/inventoryManage/InventoryQuery/LibraryShiftJob.vue b/fe/PC/src/views/inventoryManage/InventoryQuery/LibraryShiftJob.vue
deleted file mode 100644
index f34d6a0f8..000000000
--- a/fe/PC/src/views/inventoryManage/InventoryQuery/LibraryShiftJob.vue
+++ /dev/null
@@ -1,548 +0,0 @@
-<template>
-  <div class="page-box" v-loading="Loading.appMainLoading">
-    <tablePagination
-      :currenButtonData="currenButtonData"
-      :tableData="tableData"
-      :tableLoading="Loading.tableLoading"
-      :tableColumns="tableColumns"
-      @rowDrop="rowDrop"
-      :totalCount="totalCount"
-      :multipleSelection="multipleSelection"
-      :MaxResultCount="PageListParams.MaxResultCount"
-      @topbutton="topbutton"
-      @inlineDialog="inlineDialog"
-      @sortChange="sortChange"
-      @alertoldSkipCount="alertoldSkipCount"
-      @alterResultCount="alterResultCount"
-      @handleSelectionChange="handleSelectionChange"
-      :currentPageProps="oldSkipCount"
-      :quicklySearchOption="quicklySearchOption"
-      @quicklySearchClick="quicklySearchClick"
-      @quicklySearchClear="quicklySearchClear"
-      :primarySearchOption="primarySearchOption"
-      @overallSearchFormClick="overallSearchFormClick"
-      :httpOverallSearchData="httpOverallSearchData"
-    >
-    </tablePagination>
-    <!-- 执行 -->
-    <handelFrom
-      :formTitle="formTitle"
-      :displayDialog.sync="displayDialog.handleFromDialog"
-      :CreateFormData="handleFormData"
-      :CreateForm="handleForm"
-      :Rules="editRules.handleRule"
-      :Options="editOptions"
-      :detailsTableColumns="handleDetailsTableColumns"
-      :isShowIndex="true"
-      :selectionTable="true"
-      @handleSelectionChange="handleSelectionChange"
-      @FormSubmit="handleFormSubmit"
-    ></handelFrom>
-    <curren-Drawer
-      :title="tableColumns"
-      :DrawerLoading="Loading.DrawerLoading"
-      :drawer="displayDialog.detailsDialog"
-      :propsData="propsData"
-      :tabsDesTions="tabsDesTions"
-      :Butttondata="DrawerButtonData"
-      @drawerShut="(val) => (displayDialog.detailsDialog = val)"
-      @drawerbutton="drawerbutton"
-      @close-value="closeValue"
-      :currenButtonData="currenButtonData"
-      :tableColumns="detailsTableColumns"
-      :totalCount="totalCountDetails"
-      :MaxResultCount="MaxResultCountDetails"
-      @alterResultCountDetails="alterResultCountDetails"
-      @alertoldSkipCountDetails="alertoldSkipCountDetails"
-    ></curren-Drawer>
-  </div>
-</template>
-<script>
-import { getPageList, createAndHandle } from "@/api/wms-api"
-import { materialRequestByType, handle} from "@/api/wms-job"
-import { tableMixins } from "@/mixins/TableMixins"
-import { LoadingMixins } from "@/mixins/LoadingMixins"
-import { drawerMixins } from "@/mixins/drawerMixins"
-import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
-import { mixins } from "@/mixins/mixins"
-import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
-import store  from '@/store'
-import { initPrintAllData } from "@/mixins/printMixin"
-export default {
-  name: "LibraryShiftJob",
-  mixins: [
-    tableMixins,
-    LoadingMixins,
-    drawerMixins,
-    TableHeaderMixins,
-    mixins,
-    newAndEdiDialogMixins
-  ],
-  computed: {
-    editDialog: {
-      get: function () {
-        return this.displayDialog.newDialog || this.displayDialog.editDialog;
-      },
-    },
-    // hideButton: function () {
-    //   return function (val) {
-    //     let data = true
-    //     val.forEach(key => {
-    //       if (this.propsData.jobStatus == key) {
-    //         data = false
-    //       }
-    //     })
-    //     return data
-    //   }
-    // },
-  },
-  data () {
-    return {
-      URL: 'wms/store/issue-job',
-      tableLoading: false,
-      handleMultipleSelection: [],
-      //常用按钮数据
-      currenButtonData: [
-        // this.defaultExportBtn(),//导出
-        this.defaultFieldSettingBtn(),//字段设置
-        this.defaultFreshBtn(),//刷新
-        this.defaultFilterBtn(),//筛选
-      ],
-      DrawerButtonData: [
-        {
-          type: 'info',
-          icon: 'el-icon-printer',
-          label: '打印',
-          hide: false,
-          name: "print",
-          size: 'mini'
-        },
-      ],
-      handleDetailsTableColumns: [
-        { label: "物品代码", prop: "itemCode", },
-        { label: "物品名称",  prop: "itemName" },
-        { label: "实际库位", prop: "handledLocationCode", },
-        { label: "推荐库位", prop: "recommendLocationCode", },
-        { label: "实际箱标签", prop: "handledPackingCode", },
-        { label: "推荐箱标签", prop: "recommendPackingCode", },
-        { label: "实际批次", prop: "handledLot", },
-        { label: "推荐批次", prop: "recommendLot", },
-        { type: "object", label: "实际数量", prop: "handledQty", showProp: "qty", },
-        { type: "object", label: "实际单位", prop: "handledQty", showProp: "uom", },
-        { type: "object", label: "推荐数量", prop: "recommendQty", showProp: "qty", },
-        { type: "object", label: "推荐单位", prop: "recommendQty", showProp: "uom", },
-      ],
-      editOptions: {
-
-      },
-      handleFormData: {
-        id: null,
-        creationTime: null,
-        IssueNoteNumber: "123",
-        lastModificationTime: null,
-        remark: null,
-        concurrencyStamp: null,
-        company: null,
-        number: null,
-        upStreamJobNumber: null,
-        materialRequestNumber: null,
-        jobType: 1,
-        jobStatus: 1,
-        priority: 0,
-        priorityIncrement: 0,
-        wlgCode: "123",
-        isAutoComplete: true,
-        details: [],
-        acceptTime: null,
-        completeTime: null,
-        prodLine: null,
-        toLocationCode: null,
-      },
-      childTableData: [
-        {
-          "id": null,
-          "creationTime": null,
-          //   "creatorId": null,
-          "lastModificationTime": null,
-          //   "lastModifierId": null,
-          "remark": null,
-          "concurrencyStamp": null,
-          "masterID": null,
-          "packingCode": null,
-          "containerCode": null,
-          "item": {
-            "id": null,
-            "name": null,
-            "desc1": null,
-            "desc2": null
-          },
-          "itemCode": null,
-          "stdPack": {
-            "packUom": null,
-            "packQty": 0
-          },
-          "recommendBatch": {
-            "supplierBatch": null,
-            "produceDate": null
-          },
-          "recommendLot": "",
-          "recommendLocationCode": "",
-          "recomendQty": {
-            "uom": null,
-            "qty": 0
-          },
-          "handledBatch": {
-            "supplierBatch": null,
-            "produceDate": null
-          },
-          "handledLot": "",
-          "handledLocationCode": "",
-          "handledQty": {
-            "uom": null,
-            "qty": 0
-          },
-          "fromLocation": "",
-          "toLocation": "",
-          "workshop": null,
-          "prodLine": null,
-          "workCenter": null,
-        }
-      ],
-      handleForm: [
-        { type: "input", label: "任务编号", prop: "number", colSpan: 12, disabled: "true" },
-        { type: "input", label: "到货编号", prop: "arriveNumber", colSpan: 12, disabled: "true" },
-        { type: "select", label: "任务类型", prop: "jobType", options: "taskType", colSpan: 12, disabled: "true" },
-        { type: "select", label: "任务状态", prop: "jobStatus", options: "jobStatus", colSpan: 12, disabled: "true" },
-        { type: "input", label: "优先级", prop: "priority", colSpan: 12, disabled: "true" },
-        { type: "input", label: "工作组", prop: "wlgCode", colSpan: 12, disabled: "true" },
-        { type: "dateTime", label: "接收时间", prop: "acceptTime", colSpan: 12, },
-        { type: "input", label: "备注", prop: "remark", colSpan: 12, },
-        { type: "input", label: "生产线", prop: "prodLine", disabled: "true", colSpan: 12,  },
-        // { type: "autocomplete", label: "目标库位", prop: "toLocationCode", optionsLabel: "itemCode", optionsValue: "locationCode", focus: (val) => { return this.getSelectList(val, "wms/inventory/Inventory-Balance") }, click: (val) => { this.filterTable(val, 'wms/inventory/Inventory-Balance', 'InventoryBalance-PullForm', '库位选择') }, colSpan: 12 },
-        { type: "autocomplete", label: "目标库位", prop: "toLocationCode", optionsLabel: "name", optionsValue: "code", focus: (val) => { return this.getSelectList(val, "basedata/Location") }, click: (val) => { this.filterTable(val, 'basedata/Location', 'InventoryBalance-PullForm', '库位选择') }, colSpan: 12 },
-      ],
-      editRules: {
-        handleRule: {
-          number: [
-            { required: true, trigger: "blur", message: "不可为空" },
-          ],
-          jobType: [{ required: true, trigger: "blur", message: "不可为空" }],
-          jobStatus: [{ required: true, trigger: "blur", message: "不可为空" }],
-          priority: [{ required: true, trigger: "blur", message: "不可为空" }],
-          wlgCode: [{ required: true, trigger: "blur", message: "不可为空" }],
-        },
-        cerateRule: {
-          itemCode: [{ required: true, trigger: "blur", message: "不可为空" }],
-          toLocationCode: [{ required: false, trigger: "blur", message: "不可为空" }],
-          numberInput: [{ required: true, trigger: "blur", message: "不可为空" }],
-        }
-      },
-    };
-  },
-  mounted () {
-    this.paging();
-  },
-  methods: {
-    //渲染数据
-    paging(callback) {
-      this.Loading.tableLoading = true;
-      this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
-      // 叫料请求类型: 人工拉动:Issue_Manual;  线边拉动:Issue_WIP; 直接发料:Direct_Issue
-      let params = {
-        requestType: 'Issue_Manual'
-      }
-      materialRequestByType(this.PageListParams, this.URL + '/by-type', params)
-        .then(res => {
-          this.tableData = res.items
-          this.totalCount = res.totalCount
-          this.pagingCallback(callback)
-        }).catch(err => {
-          this.Loading.tableLoading = false
-        })
-    },
-    handleFormSubmit (val) {
-      let that = this
-      return new Promise((resolve, reject) => {
-        if (that.handleMultipleSelection.length == 0) {
-          that.$errorMsg('请先择提交的数据！')
-          reject()
-        } else {
-          if (that.handleMultipleSelection[0].requestLocationCode != that.handleFormData.toLocationCode) {
-            that.$confirm('目标库位与需求库位不一致,是否要将所有物品发到目标库位?', '提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning'
-            }).then(() => {
-              that.checkHandleSubmit(resolve, reject)
-            }).catch(() => {
-              reject()
-            })
-          } else {
-            that.$confirm('是否要将物品发到目标库位:[' + that.handleFormData.toLocationCode + ']', '提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning'
-            }).then(() => {
-              that.checkHandleSubmit(resolve, reject)
-            }).catch(() => {
-              reject()
-            })
-          }
-        }
-      })
-    },
-    checkHandleSubmit(resolve, reject) {
-      let that = this
-      
-      let items = that.handleMultipleSelection.filter(r => {
-        return (r.handledPackingCode === null || r.handledPackingCode === '')
-      })
-
-      if (items.length > 0) {
-        let packingCodes = '';
-        items.forEach(r => {
-          packingCodes += r.recommendPackingCode + ','
-        })
-        that.$confirm('以下箱码对应的实际箱码为空,是否要继续发料?:[' + packingCodes + ']', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          that.finshIssueJobHandle(resolve, reject)
-        }).catch(() => {
-          return reject()
-        })
-      } else {
-        that.finshIssueJobHandle(resolve, reject)
-      }
-    },
-    finshIssueJobHandle(resolve, reject) {
-      let that = this
-      let data = {
-        id: that.propsData.id
-      }
-      that.handleMultipleSelection.forEach(item => {
-        item.toLocationCode = that.handleFormData.toLocationCode
-        item.handledContainerCode = item.recommendContainerCode;
-				item.handledPackingCode = item.recommendPackingCode;
-				item.handledBatch = item.recommendBatch;
-				item.handledLot = item.recommendLot;
-				item.handledLocationCode = item.recommendLocationCode;
-      })
-      let params = JSON.parse(JSON.stringify(that.handleFormData))
-      delete params.details
-      params.details = that.handleMultipleSelection
-      handle(params, data, that.URL).then(res => {
-        that.displayDialog.handleFromDialog = false;
-        that.$successMsg('已生成发料记录！')
-        that.paging()
-        return resolve()
-      }).catch(err => {
-        return reject();
-      })
-    },
-    // 输入框 变更
-    changeInput(prop, val) {
-      let that = this
-      if (prop == 'numberInput' ) {
-        this.$confirm('是否要将以下所有零件的需求数量更改为[' + val + ']', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          that.CreateFormData.details.forEach(item => {
-            item.numberDetails = parseInt(val)
-          })
-        }).catch(() => {
-        })
-      }
-    },
-    //新增——删除table
-    deleteRow(index, rows) {
-      rows.splice(index, 1);
-    },
-    //新增-按钮
-    FormClick(val) {
-      let that = this
-      if (val[0] == 0) {
-      } else if (val[0] == 1) {
-        // 查询
-        this.editRules.cerateRule.toLocationCode[0].required = false
-        val[1].validate((valid) => {
-          if (valid) {
-            this.tableLoading = true
-            let params = {
-              condition: {
-                filters: [
-                  {
-                      logic: "And",
-                      column: "code",
-                      action: "==",
-                      value: that.CreateFormData.itemCode
-                  }
-                ]
-              },
-              Sorting: "",
-              SkipCount: 0,
-              MaxResultCount: 100
-            }
-            getPageList(params, 'basedata/item-basic').then(res => {
-              if (res.items.length == 0) {
-                this.$errorMsg('未查询到该物品信息!')
-              } else {
-                let findRs = that.CreateFormData.details.find(item => (
-                  item.code == that.CreateFormData.itemCode
-                ))
-                if (!findRs) {
-                  res.items.forEach(item => {
-                    item.numberDetails = 0
-                    that.CreateFormData.details.push(item)
-                  })
-                }
-              }
-              this.tableLoading = false
-            }).catch(err => {
-              console.log(err)
-              this.tableLoading = false
-            })
-          } else {
-            this.$errorMsg('请检查表单')
-          }
-        })
-      } else {
-        this.editRules.cerateRule.toLocationCode[0].required = true
-        val[1].validate((valid) => {
-          if (valid) {
-            if (this.CreateFormData.details.length > 0) {
-              let params = {
-                worker: store.getters.name.userName,
-                company: localStorage.getItem("company"),
-                details: [],
-              }
-              for (var i = 0; i < this.CreateFormData.details.length; i++) {
-                if (this.CreateFormData.details[i].numberDetails <= 0) {
-                  this.$errorMsg('物品[' + this.CreateFormData.details[i].code + ']的数量应该大于0')
-                  return
-                } else {
-                  params.details.push({
-                    itemCode: this.CreateFormData.details[i].code,
-                    item: {
-                      id: this.CreateFormData.details[i].id,
-                      name: this.CreateFormData.details[i].name,
-                      desc1: this.CreateFormData.details[i].desc1,
-                      desc2: this.CreateFormData.details[i].desc2,
-                    },
-                    qty: {
-                      uom: this.CreateFormData.details[i].basicUom,
-                      qty: this.CreateFormData.details[i].numberDetails
-                    },
-                    prodLine: '',
-                    status: this.CreateFormData.details[i].status,
-                    toLocationCode: this.CreateFormData.toLocationCode,
-                    worker: store.getters.name.userName,
-                  })
-                }
-              }
-              this.Loading.newAndEdiLoading = true
-              createAndHandle(params).then( res => {
-                this.displayDialog.newDialog = false
-                this.Loading.newAndEdiLoading = false
-                this.$successMsg("发料任务创建成功！")
-                this.paging()
-              }).catch(err => {
-                console.log(err)
-                this.Loading.newAndEdiLoading = false
-              })
-            } else {
-              this.$errorMsg('无数据可提交！')
-            }
-          } else {
-            this.$errorMsg('请检查表单')
-          }
-        })
-      }
-    },
-    drawerbutton (val) {
-      // 打印
-      if(val == 'print'){
-        let _propsData = JSON.parse(JSON.stringify(this.tableDataDetails))
-        _propsData.title = "线边仓领料单"
-        _propsData.details.forEach(item=>{
-          item.recommendLot = item.recommendLot + " "
-        })
-        let _option = {
-          details:{
-            fromLocationCode:"recommendFromLocationCode",
-            qty:"handledQty",
-            fromLot:"recommendLot",
-            fromLocationErpCode:"recommendFromLocationErpCode",
-          }
-        }
-        let data = initPrintAllData(_propsData,'xbcll.rdlx',false,_option);
-        this.Print(data)
-      } else {
-        drawerMixins.methods.drawerbutton(val, this)
-      }
-    },
-    // drawerbutton(val) {
-    //   if (val == 'handleJob') {
-    //     this.Loading.appMainLoading = true
-    //     let propsData = JSON.parse(JSON.stringify(this.propsData));
-    //     this.$listAssign(this.handleFormData, propsData)
-    //     this.handleFormData.toLocationCode = this.handleFormData.details[0].toLocationCode
-    //     this.handleMultipleSelection = []
-    //     this.Loading.appMainLoading = false
-    //     this.formTitle = "执行" + this.$route.meta.title;
-    //     this.displayDialog.handleFromDialog = true
-    //   } else {
-    //     drawerMixins.methods.drawerbutton(val, this)
-    //   }
-    // },
-    handleSelectionChange(val) {
-      this.handleMultipleSelection = val
-    }
-  }
-};
-</script>
-<style lang="scss" scoped>
-@import "../../../styles/mainbasicData.scss";
-::v-deep .newAndEdiDialog {
-  display: flex;
-  flex-direction: column;
-  width: 100%;
-  height: 100%;
-  .el-form {
-    flex: 1;
-    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;
-  }
-  .formTable-box {
-      height: 70% !important;
-
-      .el-form-item__content {
-        width: 100%;
-        height: 100%;
-        display: flex;
-        flex-direction: column;
-        overflow: hidden;
-        margin: 0 !important;
-      }
-    }
-}
-</style>
\ 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
deleted file mode 100644
index 44f512b9b..000000000
--- a/fe/PC/src/views/inventoryManage/InventoryQuery/LibraryShiftRequest.vue
+++ /dev/null
@@ -1,228 +0,0 @@
-<template>
-  <div class="page-box" v-loading="Loading.appMainLoading">
-    <tablePagination
-      :currenButtonData="currenButtonData"
-      :tableData="tableData"
-      :tableLoading="Loading.tableLoading"
-      :tableColumns="tableColumns"
-      @rowDrop="rowDrop"
-      :totalCount="totalCount"
-      :multipleSelection="multipleSelection"
-      :MaxResultCount="PageListParams.MaxResultCount"
-      @topbutton="topbutton"
-      @inlineDialog="inlineDialog"
-      @sortChange="sortChange"
-      @alertoldSkipCount="alertoldSkipCount"
-      @alterResultCount="alterResultCount"
-      @handleSelectionChange="handleSelectionChange"
-      :currentPageProps="oldSkipCount"
-      :quicklySearchOption="quicklySearchOption"
-      @quicklySearchClick="quicklySearchClick"
-      @quicklySearchClear="quicklySearchClear"
-      :primarySearchOption="primarySearchOption"
-      @overallSearchFormClick="overallSearchFormClick"
-      :httpOverallSearchData="httpOverallSearchData"
-    >
-    </tablePagination>
-    <!-- 新导入 disabledMethod 导入方式禁用 disabledIsAllowPartImport 是否局部导入禁用-->
-    <!-- methodValue 导入方式默认选项  是否局部导入 默认选项  -->
-    <importFile
-      :loading="Loading.importLoading"
-      :show="displayDialog.importDialog"
-      :URL="URL"
-      :disabledMethod="{ method1: false, method2: false, method3: false }"
-      :disabledIsAllowPartImport="{
-        isAllowPartImport1: false,
-        isAllowPartImport2: false,
-      }"
-      isAllowPartImportValue="1"
-      @importClick="postImportMergeClick(arguments)"
-      @postImportDown="importDown"
-    ></importFile>
-    <curren-Drawer
-      :title="tableColumns"
-      :DrawerLoading="Loading.DrawerLoading"
-      :drawer="displayDialog.detailsDialog"
-      :propsData="propsData"
-      :tabsDesTions="tabsDesTions"
-      :Butttondata="DrawerButtonData"
-      @drawerShut="(val) => (displayDialog.detailsDialog = val)"
-      @drawerbutton="drawerbutton"
-      @close-value="closeValue"
-      :currenButtonData="currenButtonData"
-      :tableColumns="detailsTableColumns"
-      :totalCount="totalCountDetails"
-      :MaxResultCount="MaxResultCountDetails"
-      @alterResultCountDetails="alterResultCountDetails"
-      @alertoldSkipCountDetails="alertoldSkipCountDetails"
-    ></curren-Drawer>
-  </div>
-</template>
-<script>
-import { materialRequestByType,processRequest,getDetailed } from "@/api/wms-api"
-import { tableMixins } from "@/mixins/TableMixins"
-import { LoadingMixins } from "@/mixins/LoadingMixins"
-import { drawerMixins } from "@/mixins/drawerMixins"
-import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
-import { mixins } from "@/mixins/mixins"
-import { requestData } from "@/utils/processButtonData"
-import requestDataNames from "@/utils/processButtonData"
-export default {
-  name: "LibraryShiftRequest",
-  mixins: [
-    tableMixins,
-    LoadingMixins,
-    drawerMixins,
-    TableHeaderMixins,
-    mixins,
-  ],
-  computed: {
-    editDialog: {
-      get: function () {
-        return this.displayDialog.newDialog || this.displayDialog.editDialog;
-      },
-    },
-  },
-  data () {
-    let _this = this;
-    return {
-      URL: 'wms/store/material-request',
-      tableLoading: false,
-      handleMultipleSelection: [],
-      //常用按钮数据
-      currenButtonData: [
-        this.defaultImportBtn(),//导入
-        this.defaultFieldSettingBtn(),//字段设置
-        this.defaultFreshBtn(),//刷新
-        this.defaultFilterBtn(),//筛选
-      ],
-      //执行前获取记录数据暂存
-      oldIssueJobIds: [],
-      DrawerButtonData: [
-        // ...requestData(this),
-        {
-          type: 'primary',
-          icon: 'el-icon-circle-check',
-          label: '完成',
-          hide: () => { return this.completeRequestInit([2,6])},
-          name: "completeRequest",
-          size: 'mini'
-        },
-        {
-          type: 'primary',
-          icon: 'el-icon-circle-check',
-          label: '执行',
-          name: "IssueRequest-zx",
-          hide: () => { return this.againHandleRequestInit([9])},
-          size: 'mini'
-        },
-        ...requestData(this,false,false,[requestDataNames.againHandle]),
-      ],
-    };
-  },
-  mounted () {
-    this.paging()
-  },
-  methods: {
-    //渲染数据
-    paging(callback) {
-      this.Loading.tableLoading = true;
-      this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
-      // 叫料请求类型: 人工拉动:Issue_Manual;  线边拉动:Issue_WIP; 直接发料:Direct_Issue
-      let params = {
-        type: 'Issue_Manual'
-      }
-      materialRequestByType(this.PageListParams, this.URL + '/by-type', params).then(res => {
-          this.tableData = res.items
-          this.totalCount = res.totalCount
-          this.pagingCallback(callback)
-        }).catch(err => {
-          this.Loading.tableLoading = false
-        })
-    },
-    // 重新定义【完成按钮】显示判断 除了2(待审批) 和 6（完成状态）都显示（abortRequestRequestInit）
-    completeRequestInit(val){
-      let data = false
-      val.forEach(key => {
-        if (this.propsData.requestStatus == key) {
-          data = true
-        }
-      })
-      return data
-    },
-    // 定义【执行按钮】显示判断 ==9时候显示
-    againHandleRequestInit(val){
-      let data = true
-      val.forEach(key => {
-        if (this.propsData.requestStatus == key) {
-          data = false
-        }
-      })
-      return data
-    },
-    // 执行成功后处理
-    handleResult(){
-      getDetailed(this.propsData.id, this.URL).then(res => {
-        this.propsData = res
-      })
-      this.paging()
-      this.Loading.appMainLoading = false
-    },
-    //抽屉常用按钮
-    drawerbutton (val) {
-      // 执行
-      if(val == 'IssueRequest-zx'){
-        this.Loading.appMainLoading = true
-        // 获取记录数据暂存
-        processRequest(this.propsData.number,'wms/store/issue-job/by-request-number/').then(resFirst=>{
-          this.oldIssueJobIds = []
-          resFirst.forEach(item=>{
-            this.oldIssueJobIds.push(item.id)
-          })
-          // 执行操作
-          processRequest(this.propsData.id, this.URL + '/handle/').then(resHandle => {
-            // 重新获取记录对比
-            processRequest(this.propsData.number,'wms/store/issue-job/by-request-number/').then(resNew=>{
-              // 重新获取的记录为空（未生成任务）
-              if(!resNew || resNew.length <= 0){
-                this.$errorMsg('没有可用库存，未生成新任务')
-                this.handleResult()
-                return
-              }
-              // 当前有记录
-              if(resNew && resNew.length > 0){
-                let _newIds = []
-                resNew.forEach(item=>{
-                  _newIds.push(item.id)
-                })
-                if(this.oldIssueJobIds.sort().toString() === _newIds.sort().toString()){
-                  let mes = '未生成任务原因: ' + `<br/>` + '1、该请求中的【物品】的【实际发货数量】小于【请求数量】,请确认数量后点击【完成】。' + `<br/>` + '2、该请求中的【库存余额】小于【请求数量】,请确认数量后点击【执行】'
-                  this.$alert(mes,
-                    '错误提示', {
-                    confirmButtonText: '确定',
-                    dangerouslyUseHTMLString: true
-                  })
-                }else{
-                  this.$successMsg('执行成功，已生成新任务')
-                }
-                this.handleResult()
-              }
-            })
-          }).catch(err => {
-            console.log(err)
-            this.Loading.appMainLoading = false
-          })
-        }).catch(err => {
-          console.log(err)
-          this.Loading.appMainLoading = false
-        })
-      } else {
-        drawerMixins.methods.drawerbutton(val, this)
-      }
-    },
-  }
-};
-</script>
-<style lang="scss" scoped>
-@import "../../../styles/mainbasicData.scss";
-</style>
\ No newline at end of file
diff --git a/fe/PC/src/views/inventoryManage/InventoryQuery/LibraryShiftNote.vue b/fe/PC/src/views/inventoryManage/transferLib/transferLibJob.vue
similarity index 56%
rename from fe/PC/src/views/inventoryManage/InventoryQuery/LibraryShiftNote.vue
rename to fe/PC/src/views/inventoryManage/transferLib/transferLibJob.vue
index 286c5a1b7..8530c6deb 100644
--- a/fe/PC/src/views/inventoryManage/InventoryQuery/LibraryShiftNote.vue
+++ b/fe/PC/src/views/inventoryManage/transferLib/transferLibJob.vue
@@ -24,18 +24,32 @@
       :httpOverallSearchData="httpOverallSearchData"
     >
     </tablePagination>
-    <!-- 抽屉 -->
+    <!-- 新导入 disabledMethod 导入方式禁用 disabledIsAllowPartImport 是否局部导入禁用-->
+    <!-- methodValue 导入方式默认选项  是否局部导入 默认选项  -->
+    <importFile
+      :loading="Loading.importLoading"
+      :show="displayDialog.importDialog"
+      :URL="URL"
+      :disabledMethod="{ method1: false, method2: false, method3: false }"
+      :disabledIsAllowPartImport="{
+        isAllowPartImport1: false,
+        isAllowPartImport2: false,
+      }"
+      isAllowPartImportValue="1"
+      @importClick="postImportMergeClick(arguments)"
+      @postImportDown="importDown"
+    ></importFile>
     <curren-Drawer
       :title="tableColumns"
       :DrawerLoading="Loading.DrawerLoading"
       :drawer="displayDialog.detailsDialog"
       :propsData="propsData"
-      :Butttondata="DrawerButtonData"
       :tabsDesTions="tabsDesTions"
+      :Butttondata="DrawerButtonData"
       @drawerShut="(val) => (displayDialog.detailsDialog = val)"
       @drawerbutton="drawerbutton"
-      @handleCommand="drawerHandle"
       @close-value="closeValue"
+      :currenButtonData="currenButtonData"
       :tableColumns="detailsTableColumns"
       :totalCount="totalCountDetails"
       :MaxResultCount="MaxResultCountDetails"
@@ -45,15 +59,16 @@
   </div>
 </template>
 <script>
-import { materialRequestByType } from "@/api/wms-api"
+import { materialRequestByType,processRequest,getDetailed } from "@/api/wms-api"
 import { tableMixins } from "@/mixins/TableMixins"
 import { LoadingMixins } from "@/mixins/LoadingMixins"
 import { drawerMixins } from "@/mixins/drawerMixins"
 import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
 import { mixins } from "@/mixins/mixins"
-import { initPrintAllData } from "@/mixins/printMixin"
+import { requestData } from "@/utils/processButtonData"
+import requestDataNames from "@/utils/processButtonData"
 export default {
-  name: "LibraryShiftNote",
+  name: "transferLibJob",
   mixins: [
     tableMixins,
     LoadingMixins,
@@ -63,67 +78,23 @@ export default {
   ],
   data () {
     return {
-      URL: 'wms/store/issue-note',
+      URL: 'wms/store/transfer-lib-job',
       //常用按钮数据
       currenButtonData: [
-        this.defaultExportBtn(),//导出
+        // this.defaultImportBtn(),//导入
         this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选
       ],
-      DrawerButtonData: [
-        {
-          type: 'info',
-          icon: 'el-icon-printer',
-          label: '打印',
-          hide: false,
-          name: "print",
-          size: 'mini'
-        },
-      ]
+      //执行前获取记录数据暂存
+      DrawerButtonData: [],
     };
   },
   mounted () {
-    this.paging();
-  },
-  methods: {
-    //渲染数据
-    paging(callback) {
-      this.Loading.tableLoading = true;
-      this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
-      // 叫料请求类型: 人工拉动:Issue_Manual;  线边拉动:Issue_WIP; 直接发料:Direct_Issue
-      let params = {
-        requestType: 'Issue_Manual'
-      }
-      materialRequestByType(this.PageListParams, this.URL + '/by-type', params).then(res => {
-          this.tableData = res.items
-          this.totalCount = res.totalCount
-          this.pagingCallback(callback)
-        }).catch(err => {
-          this.Loading.tableLoading = false
-        })
-    },
-    drawerbutton (val) {
-      // 打印
-      if(val == 'print'){
-        let _propsData = JSON.parse(JSON.stringify(this.tableDataDetails))
-        // _propsData.title = "送货单"
-        _propsData.title = "线边仓领料单"
-        _propsData.details.forEach(item=>{
-          item.fromLot = item.fromLot + " "
-        })
-        let _option = {
-          number:"requestNumber",
-        }
-        let data = initPrintAllData(_propsData,'xbcll.rdlx',false,_option);
-        this.Print(data)
-      } else {
-        drawerMixins.methods.drawerbutton(val, this)
-      }
-    }
+    this.paging()
   },
 };
 </script>
 <style lang="scss" scoped>
-@import "../../../styles/basicData.scss";
+@import "@/styles/mainbasicData.scss";
 </style>
\ No newline at end of file
diff --git a/fe/PC/src/views/inventoryManage/transferLib/transferLibNote.vue b/fe/PC/src/views/inventoryManage/transferLib/transferLibNote.vue
new file mode 100644
index 000000000..e682cf4fd
--- /dev/null
+++ b/fe/PC/src/views/inventoryManage/transferLib/transferLibNote.vue
@@ -0,0 +1,100 @@
+<template>
+  <div class="page-box" v-loading="Loading.appMainLoading">
+    <tablePagination
+      :currenButtonData="currenButtonData"
+      :tableData="tableData"
+      :tableLoading="Loading.tableLoading"
+      :tableColumns="tableColumns"
+      @rowDrop="rowDrop"
+      :totalCount="totalCount"
+      :multipleSelection="multipleSelection"
+      :MaxResultCount="PageListParams.MaxResultCount"
+      @topbutton="topbutton"
+      @inlineDialog="inlineDialog"
+      @sortChange="sortChange"
+      @alertoldSkipCount="alertoldSkipCount"
+      @alterResultCount="alterResultCount"
+      @handleSelectionChange="handleSelectionChange"
+      :currentPageProps="oldSkipCount"
+      :quicklySearchOption="quicklySearchOption"
+      @quicklySearchClick="quicklySearchClick"
+      @quicklySearchClear="quicklySearchClear"
+      :primarySearchOption="primarySearchOption"
+      @overallSearchFormClick="overallSearchFormClick"
+      :httpOverallSearchData="httpOverallSearchData"
+    >
+    </tablePagination>
+    <!-- 新导入 disabledMethod 导入方式禁用 disabledIsAllowPartImport 是否局部导入禁用-->
+    <!-- methodValue 导入方式默认选项  是否局部导入 默认选项  -->
+    <importFile
+      :loading="Loading.importLoading"
+      :show="displayDialog.importDialog"
+      :URL="URL"
+      :disabledMethod="{ method1: false, method2: false, method3: false }"
+      :disabledIsAllowPartImport="{
+        isAllowPartImport1: false,
+        isAllowPartImport2: false,
+      }"
+      isAllowPartImportValue="1"
+      @importClick="postImportMergeClick(arguments)"
+      @postImportDown="importDown"
+    ></importFile>
+    <curren-Drawer
+      :title="tableColumns"
+      :DrawerLoading="Loading.DrawerLoading"
+      :drawer="displayDialog.detailsDialog"
+      :propsData="propsData"
+      :tabsDesTions="tabsDesTions"
+      :Butttondata="DrawerButtonData"
+      @drawerShut="(val) => (displayDialog.detailsDialog = val)"
+      @drawerbutton="drawerbutton"
+      @close-value="closeValue"
+      :currenButtonData="currenButtonData"
+      :tableColumns="detailsTableColumns"
+      :totalCount="totalCountDetails"
+      :MaxResultCount="MaxResultCountDetails"
+      @alterResultCountDetails="alterResultCountDetails"
+      @alertoldSkipCountDetails="alertoldSkipCountDetails"
+    ></curren-Drawer>
+  </div>
+</template>
+<script>
+import { materialRequestByType,processRequest,getDetailed } from "@/api/wms-api"
+import { tableMixins } from "@/mixins/TableMixins"
+import { LoadingMixins } from "@/mixins/LoadingMixins"
+import { drawerMixins } from "@/mixins/drawerMixins"
+import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
+import { mixins } from "@/mixins/mixins"
+import { requestData } from "@/utils/processButtonData"
+import requestDataNames from "@/utils/processButtonData"
+export default {
+  name: "transferLibNote",
+  mixins: [
+    tableMixins,
+    LoadingMixins,
+    drawerMixins,
+    TableHeaderMixins,
+    mixins,
+  ],
+  data () {
+    return {
+      URL: 'wms/store/transferlib-note',
+      //常用按钮数据
+      currenButtonData: [
+        // this.defaultImportBtn(),//导入
+        this.defaultFieldSettingBtn(),//字段设置
+        this.defaultFreshBtn(),//刷新
+        this.defaultFilterBtn(),//筛选
+      ],
+      //执行前获取记录数据暂存
+      DrawerButtonData: [],
+    };
+  },
+  mounted () {
+    this.paging()
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "@/styles/mainbasicData.scss";
+</style>
\ No newline at end of file
diff --git a/fe/PC/src/views/inventoryManage/transferLib/transferLibRequest.vue b/fe/PC/src/views/inventoryManage/transferLib/transferLibRequest.vue
new file mode 100644
index 000000000..d6103a846
--- /dev/null
+++ b/fe/PC/src/views/inventoryManage/transferLib/transferLibRequest.vue
@@ -0,0 +1,100 @@
+<template>
+  <div class="page-box" v-loading="Loading.appMainLoading">
+    <tablePagination
+      :currenButtonData="currenButtonData"
+      :tableData="tableData"
+      :tableLoading="Loading.tableLoading"
+      :tableColumns="tableColumns"
+      @rowDrop="rowDrop"
+      :totalCount="totalCount"
+      :multipleSelection="multipleSelection"
+      :MaxResultCount="PageListParams.MaxResultCount"
+      @topbutton="topbutton"
+      @inlineDialog="inlineDialog"
+      @sortChange="sortChange"
+      @alertoldSkipCount="alertoldSkipCount"
+      @alterResultCount="alterResultCount"
+      @handleSelectionChange="handleSelectionChange"
+      :currentPageProps="oldSkipCount"
+      :quicklySearchOption="quicklySearchOption"
+      @quicklySearchClick="quicklySearchClick"
+      @quicklySearchClear="quicklySearchClear"
+      :primarySearchOption="primarySearchOption"
+      @overallSearchFormClick="overallSearchFormClick"
+      :httpOverallSearchData="httpOverallSearchData"
+    >
+    </tablePagination>
+    <!-- 新导入 disabledMethod 导入方式禁用 disabledIsAllowPartImport 是否局部导入禁用-->
+    <!-- methodValue 导入方式默认选项  是否局部导入 默认选项  -->
+    <importFile
+      :loading="Loading.importLoading"
+      :show="displayDialog.importDialog"
+      :URL="URL"
+      :disabledMethod="{ method1: false, method2: false, method3: false }"
+      :disabledIsAllowPartImport="{
+        isAllowPartImport1: false,
+        isAllowPartImport2: false,
+      }"
+      isAllowPartImportValue="1"
+      @importClick="postImportMergeClick(arguments)"
+      @postImportDown="importDown"
+    ></importFile>
+    <curren-Drawer
+      :title="tableColumns"
+      :DrawerLoading="Loading.DrawerLoading"
+      :drawer="displayDialog.detailsDialog"
+      :propsData="propsData"
+      :tabsDesTions="tabsDesTions"
+      :Butttondata="DrawerButtonData"
+      @drawerShut="(val) => (displayDialog.detailsDialog = val)"
+      @drawerbutton="drawerbutton"
+      @close-value="closeValue"
+      :currenButtonData="currenButtonData"
+      :tableColumns="detailsTableColumns"
+      :totalCount="totalCountDetails"
+      :MaxResultCount="MaxResultCountDetails"
+      @alterResultCountDetails="alterResultCountDetails"
+      @alertoldSkipCountDetails="alertoldSkipCountDetails"
+    ></curren-Drawer>
+  </div>
+</template>
+<script>
+import { materialRequestByType,processRequest,getDetailed } from "@/api/wms-api"
+import { tableMixins } from "@/mixins/TableMixins"
+import { LoadingMixins } from "@/mixins/LoadingMixins"
+import { drawerMixins } from "@/mixins/drawerMixins"
+import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
+import { mixins } from "@/mixins/mixins"
+import { requestData } from "@/utils/processButtonData"
+import requestDataNames from "@/utils/processButtonData"
+export default {
+  name: "transferLibRequest",
+  mixins: [
+    tableMixins,
+    LoadingMixins,
+    drawerMixins,
+    TableHeaderMixins,
+    mixins,
+  ],
+  data () {
+    return {
+      URL: 'wms/store/transferlib-request',
+      //常用按钮数据
+      currenButtonData: [
+        // this.defaultImportBtn(),//导入
+        this.defaultFieldSettingBtn(),//字段设置
+        this.defaultFreshBtn(),//刷新
+        this.defaultFilterBtn(),//筛选
+      ],
+      //执行前获取记录数据暂存
+      DrawerButtonData: [],
+    };
+  },
+  mounted () {
+    this.paging()
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "@/styles/mainbasicData.scss";
+</style>
\ 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
index 28ff10af0..57a42b311 100644
--- a/fe/PC/src/views/materialIssueManage/ZS/IssueJobZS.vue
+++ b/fe/PC/src/views/materialIssueManage/ZS/IssueJobZS.vue
@@ -24,20 +24,21 @@
       :httpOverallSearchData="httpOverallSearchData"
     >
     </tablePagination>
-    <!-- 执行 -->
-    <handelFrom
-      :formTitle="formTitle"
-      :displayDialog.sync="displayDialog.handleFromDialog"
-      :CreateFormData="handleFormData"
-      :CreateForm="handleForm"
-      :Rules="editRules.handleRule"
-      :Options="editOptions"
-      :detailsTableColumns="handleDetailsTableColumns"
-      :isShowIndex="true"
-      :selectionTable="true"
-      @handleSelectionChange="handleSelectionChange"
-      @FormSubmit="handleFormSubmit"
-    ></handelFrom>
+    <!-- 新导入 disabledMethod 导入方式禁用 disabledIsAllowPartImport 是否局部导入禁用-->
+    <!-- methodValue 导入方式默认选项  是否局部导入 默认选项  -->
+    <importFile
+      :loading="Loading.importLoading"
+      :show="displayDialog.importDialog"
+      :URL="URL"
+      :disabledMethod="{ method1: false, method2: false, method3: false }"
+      :disabledIsAllowPartImport="{
+        isAllowPartImport1: false,
+        isAllowPartImport2: false,
+      }"
+      isAllowPartImportValue="1"
+      @importClick="postImportMergeClick(arguments)"
+      @postImportDown="importDown"
+    ></importFile>
     <curren-Drawer
       :title="tableColumns"
       :DrawerLoading="Loading.DrawerLoading"
@@ -46,7 +47,7 @@
       :tabsDesTions="tabsDesTions"
       :Butttondata="DrawerButtonData"
       @drawerShut="(val) => (displayDialog.detailsDialog = val)"
-      @drawerbutton="drawerbutton"
+      @drawerbutton="drawerbuttonHandle"
       @close-value="closeValue"
       :currenButtonData="currenButtonData"
       :tableColumns="detailsTableColumns"
@@ -54,44 +55,16 @@
       :MaxResultCount="MaxResultCountDetails"
       @alterResultCountDetails="alterResultCountDetails"
       @alertoldSkipCountDetails="alertoldSkipCountDetails"
-    >
-      <template>
-        <el-table-column
-          fixed="right"
-          label="操作"
-          align="center"
-          width="120"
-        >
-          <template slot-scope="scope">
-            <el-button 
-              type="primary"
-              @click="showLibraryShift(scope)"
-              size="small"
-            >查看库移</el-button>
-          </template>
-        </el-table-column>
-      </template>		
-    </curren-Drawer>
-    <!-- 查看库移弹窗 -->
-    <libraryShiftSearch
-      :rowData="libraryShiftRow"
-      :isShow="libraryShiftShow"
-      v-on:setClose='closeLibraryShift'
-    ></libraryShiftSearch>
+    ></curren-Drawer>
   </div>
 </template>
 <script>
-import { getPageList, createAndHandle } from "@/api/wms-api"
-import { materialRequestByType, handle} from "@/api/wms-job"
+import { getDetailed } from "@/api/wms-api"
 import { tableMixins } from "@/mixins/TableMixins"
 import { LoadingMixins } from "@/mixins/LoadingMixins"
 import { drawerMixins } from "@/mixins/drawerMixins"
 import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
 import { mixins } from "@/mixins/mixins"
-import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
-import store  from '@/store'
-import { initPrintAllData } from "@/mixins/printMixin"
-import libraryShiftSearch from "@/views/materialIssueManage/libraryShiftSearch"
 export default {
   name: "IssueJobZS",
   mixins: [
@@ -100,485 +73,62 @@ export default {
     drawerMixins,
     TableHeaderMixins,
     mixins,
-    newAndEdiDialogMixins
   ],
-  components:{libraryShiftSearch},
   computed: {
-    editDialog: {
-      get: function () {
-        return this.displayDialog.newDialog || this.displayDialog.editDialog;
-      },
+    //按钮显示
+    hideButton: function () {
+      return function () {
+        return this.propsData.status
+      }
     },
-    // hideButton: function () {
-    //   return function (val) {
-    //     let data = true
-    //     val.forEach(key => {
-    //       if (this.propsData.jobStatus == key) {
-    //         data = false
-    //       }
-    //     })
-    //     return data
-    //   }
-    // },
   },
   data () {
+    let _this = this;
     return {
-      URL: 'wms/store/issue-job',
-      tableLoading: false,
-      handleMultipleSelection: [],
+      URL: 'wms/store/injection-job',
       //常用按钮数据
       currenButtonData: [
-        // this.defaultExportBtn(),//导出
+        this.defaultImportBtn(),//导入
         this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选
       ],
       DrawerButtonData: [
         {
-          type: 'info',
-          icon: 'el-icon-printer',
-          label: '打印',
-          hide: false,
-          name: "print",
+          type: 'danger',
+          label: '中止',
+          // todo:状态确定
+          hide: () => { return this.hideButton([2,6])},
+          name: "break",
           size: 'mini'
         },
       ],
-      handleDetailsTableColumns: [
-        { label: "物品代码", prop: "itemCode", },
-        { label: "物品名称",  prop: "itemName" },
-        { label: "实际库位", prop: "handledLocationCode", },
-        { label: "推荐库位", prop: "recommendLocationCode", },
-        { label: "实际箱标签", prop: "handledPackingCode", },
-        { label: "推荐箱标签", prop: "recommendPackingCode", },
-        { label: "实际批次", prop: "handledLot", },
-        { label: "推荐批次", prop: "recommendLot", },
-        { type: "object", label: "实际数量", prop: "handledQty", showProp: "qty", },
-        { type: "object", label: "实际单位", prop: "handledQty", showProp: "uom", },
-        { type: "object", label: "推荐数量", prop: "recommendQty", showProp: "qty", },
-        { type: "object", label: "推荐单位", prop: "recommendQty", showProp: "uom", },
-      ],
-      editOptions: {
-
-      },
-      handleFormData: {
-        id: null,
-        creationTime: null,
-        IssueNoteNumber: "123",
-        lastModificationTime: null,
-        remark: null,
-        concurrencyStamp: null,
-        company: null,
-        number: null,
-        upStreamJobNumber: null,
-        materialRequestNumber: null,
-        jobType: 1,
-        jobStatus: 1,
-        priority: 0,
-        priorityIncrement: 0,
-        wlgCode: "123",
-        isAutoComplete: true,
-        details: [],
-        acceptTime: null,
-        completeTime: null,
-        prodLine: null,
-        toLocationCode: null,
-      },
-      childTableData: [
-        {
-          "id": null,
-          "creationTime": null,
-          //   "creatorId": null,
-          "lastModificationTime": null,
-          //   "lastModifierId": null,
-          "remark": null,
-          "concurrencyStamp": null,
-          "masterID": null,
-          "packingCode": null,
-          "containerCode": null,
-          "item": {
-            "id": null,
-            "name": null,
-            "desc1": null,
-            "desc2": null
-          },
-          "itemCode": null,
-          "stdPack": {
-            "packUom": null,
-            "packQty": 0
-          },
-          "recommendBatch": {
-            "supplierBatch": null,
-            "produceDate": null
-          },
-          "recommendLot": "",
-          "recommendLocationCode": "",
-          "recomendQty": {
-            "uom": null,
-            "qty": 0
-          },
-          "handledBatch": {
-            "supplierBatch": null,
-            "produceDate": null
-          },
-          "handledLot": "",
-          "handledLocationCode": "",
-          "handledQty": {
-            "uom": null,
-            "qty": 0
-          },
-          "fromLocation": "",
-          "toLocation": "",
-          "workshop": null,
-          "prodLine": null,
-          "workCenter": null,
-        }
-      ],
-      handleForm: [
-        { type: "input", label: "任务编号", prop: "number", colSpan: 12, disabled: "true" },
-        { type: "input", label: "到货编号", prop: "arriveNumber", colSpan: 12, disabled: "true" },
-        { type: "select", label: "任务类型", prop: "jobType", options: "taskType", colSpan: 12, disabled: "true" },
-        { type: "select", label: "任务状态", prop: "jobStatus", options: "jobStatus", colSpan: 12, disabled: "true" },
-        { type: "input", label: "优先级", prop: "priority", colSpan: 12, disabled: "true" },
-        { type: "input", label: "工作组", prop: "wlgCode", colSpan: 12, disabled: "true" },
-        { type: "dateTime", label: "接收时间", prop: "acceptTime", colSpan: 12, },
-        { type: "input", label: "备注", prop: "remark", colSpan: 12, },
-        { type: "input", label: "生产线", prop: "prodLine", disabled: "true", colSpan: 12,  },
-        // { type: "autocomplete", label: "目标库位", prop: "toLocationCode", optionsLabel: "itemCode", optionsValue: "locationCode", focus: (val) => { return this.getSelectList(val, "wms/inventory/Inventory-Balance") }, click: (val) => { this.filterTable(val, 'wms/inventory/Inventory-Balance', 'InventoryBalance-PullForm', '库位选择') }, colSpan: 12 },
-        { type: "autocomplete", label: "目标库位", prop: "toLocationCode", optionsLabel: "name", optionsValue: "code", focus: (val) => { return this.getSelectList(val, "basedata/Location") }, click: (val) => { this.filterTable(val, 'basedata/Location', 'InventoryBalance-PullForm', '库位选择') }, colSpan: 12 },
-      ],
-      editRules: {
-        handleRule: {
-          number: [
-            { required: true, trigger: "blur", message: "不可为空" },
-          ],
-          jobType: [{ required: true, trigger: "blur", message: "不可为空" }],
-          jobStatus: [{ required: true, trigger: "blur", message: "不可为空" }],
-          priority: [{ required: true, trigger: "blur", message: "不可为空" }],
-          wlgCode: [{ required: true, trigger: "blur", message: "不可为空" }],
-        },
-        cerateRule: {
-          itemCode: [{ required: true, trigger: "blur", message: "不可为空" }],
-          toLocationCode: [{ required: false, trigger: "blur", message: "不可为空" }],
-          numberInput: [{ required: true, trigger: "blur", message: "不可为空" }],
-        }
-      },
-      libraryShiftShow:false,//查看库移弹窗显示
-      libraryShiftRow:null,//查看库移当前行数据
     };
   },
   mounted () {
-    this.paging();
+    this.paging()
   },
   methods: {
-    //渲染数据
-    paging(callback) {
-      this.Loading.tableLoading = true;
-      this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
-      // 叫料请求类型: 人工拉动:Issue_Manual;  线边拉动:Issue_WIP; 直接发料:Direct_Issue
-      let params = {
-        requestType: 'Issue_Manual'
-      }
-      materialRequestByType(this.PageListParams, this.URL + '/by-type', params)
-        .then(res => {
-          this.tableData = res.items
-          this.totalCount = res.totalCount
-          this.pagingCallback(callback)
-        }).catch(err => {
-          this.Loading.tableLoading = false
-        })
-    },
-    handleFormSubmit (val) {
-      let that = this
-      return new Promise((resolve, reject) => {
-        if (that.handleMultipleSelection.length == 0) {
-          that.$errorMsg('请先择提交的数据！')
-          reject()
-        } else {
-          if (that.handleMultipleSelection[0].requestLocationCode != that.handleFormData.toLocationCode) {
-            that.$confirm('目标库位与需求库位不一致,是否要将所有物品发到目标库位?', '提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning'
-            }).then(() => {
-              that.checkHandleSubmit(resolve, reject)
-            }).catch(() => {
-              reject()
-            })
-          } else {
-            that.$confirm('是否要将物品发到目标库位:[' + that.handleFormData.toLocationCode + ']', '提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning'
-            }).then(() => {
-              that.checkHandleSubmit(resolve, reject)
-            }).catch(() => {
-              reject()
-            })
-          }
-        }
+    // 操作成功后处理
+    handleResult(){
+      getDetailed(this.propsData.id, this.URL).then(res => {
+        this.propsData = res
       })
+      this.paging()
+      this.Loading.appMainLoading = false
     },
-    checkHandleSubmit(resolve, reject) {
-      let that = this
-      
-      let items = that.handleMultipleSelection.filter(r => {
-        return (r.handledPackingCode === null || r.handledPackingCode === '')
-      })
-
-      if (items.length > 0) {
-        let packingCodes = '';
-        items.forEach(r => {
-          packingCodes += r.recommendPackingCode + ','
-        })
-        that.$confirm('以下箱码对应的实际箱码为空,是否要继续发料?:[' + packingCodes + ']', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          that.finshIssueJobHandle(resolve, reject)
-        }).catch(() => {
-          return reject()
-        })
+    //抽屉常用按钮
+    drawerbuttonHandle (val) {
+      // 中止
+      if(val == 'break'){
+        
       } else {
-        that.finshIssueJobHandle(resolve, reject)
-      }
-    },
-    finshIssueJobHandle(resolve, reject) {
-      let that = this
-      let data = {
-        id: that.propsData.id
+        this.drawerbutton(val, this)
       }
-      that.handleMultipleSelection.forEach(item => {
-        item.toLocationCode = that.handleFormData.toLocationCode
-        item.handledContainerCode = item.recommendContainerCode;
-				item.handledPackingCode = item.recommendPackingCode;
-				item.handledBatch = item.recommendBatch;
-				item.handledLot = item.recommendLot;
-				item.handledLocationCode = item.recommendLocationCode;
-      })
-      let params = JSON.parse(JSON.stringify(that.handleFormData))
-      delete params.details
-      params.details = that.handleMultipleSelection
-      handle(params, data, that.URL).then(res => {
-        that.displayDialog.handleFromDialog = false;
-        that.$successMsg('已生成发料记录！')
-        that.paging()
-        return resolve()
-      }).catch(err => {
-        return reject();
-      })
     },
-    // 输入框 变更
-    changeInput(prop, val) {
-      let that = this
-      if (prop == 'numberInput' ) {
-        this.$confirm('是否要将以下所有零件的需求数量更改为[' + val + ']', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          that.CreateFormData.details.forEach(item => {
-            item.numberDetails = parseInt(val)
-          })
-        }).catch(() => {
-        })
-      }
-    },
-    //新增——删除table
-    deleteRow(index, rows) {
-      rows.splice(index, 1);
-    },
-    //新增-按钮
-    FormClick(val) {
-      let that = this
-      if (val[0] == 0) {
-      } else if (val[0] == 1) {
-        // 查询
-        this.editRules.cerateRule.toLocationCode[0].required = false
-        val[1].validate((valid) => {
-          if (valid) {
-            this.tableLoading = true
-            let params = {
-              condition: {
-                filters: [
-                  {
-                      logic: "And",
-                      column: "code",
-                      action: "==",
-                      value: that.CreateFormData.itemCode
-                  }
-                ]
-              },
-              Sorting: "",
-              SkipCount: 0,
-              MaxResultCount: 100
-            }
-            getPageList(params, 'basedata/item-basic').then(res => {
-              if (res.items.length == 0) {
-                this.$errorMsg('未查询到该物品信息!')
-              } else {
-                let findRs = that.CreateFormData.details.find(item => (
-                  item.code == that.CreateFormData.itemCode
-                ))
-                if (!findRs) {
-                  res.items.forEach(item => {
-                    item.numberDetails = 0
-                    that.CreateFormData.details.push(item)
-                  })
-                }
-              }
-              this.tableLoading = false
-            }).catch(err => {
-              console.log(err)
-              this.tableLoading = false
-            })
-          } else {
-            this.$errorMsg('请检查表单')
-          }
-        })
-      } else {
-        this.editRules.cerateRule.toLocationCode[0].required = true
-        val[1].validate((valid) => {
-          if (valid) {
-            if (this.CreateFormData.details.length > 0) {
-              let params = {
-                worker: store.getters.name.userName,
-                company: localStorage.getItem("company"),
-                details: [],
-              }
-              for (var i = 0; i < this.CreateFormData.details.length; i++) {
-                if (this.CreateFormData.details[i].numberDetails <= 0) {
-                  this.$errorMsg('物品[' + this.CreateFormData.details[i].code + ']的数量应该大于0')
-                  return
-                } else {
-                  params.details.push({
-                    itemCode: this.CreateFormData.details[i].code,
-                    item: {
-                      id: this.CreateFormData.details[i].id,
-                      name: this.CreateFormData.details[i].name,
-                      desc1: this.CreateFormData.details[i].desc1,
-                      desc2: this.CreateFormData.details[i].desc2,
-                    },
-                    qty: {
-                      uom: this.CreateFormData.details[i].basicUom,
-                      qty: this.CreateFormData.details[i].numberDetails
-                    },
-                    prodLine: '',
-                    status: this.CreateFormData.details[i].status,
-                    toLocationCode: this.CreateFormData.toLocationCode,
-                    worker: store.getters.name.userName,
-                  })
-                }
-              }
-              this.Loading.newAndEdiLoading = true
-              createAndHandle(params).then( res => {
-                this.displayDialog.newDialog = false
-                this.Loading.newAndEdiLoading = false
-                this.$successMsg("发料任务创建成功！")
-                this.paging()
-              }).catch(err => {
-                console.log(err)
-                this.Loading.newAndEdiLoading = false
-              })
-            } else {
-              this.$errorMsg('无数据可提交！')
-            }
-          } else {
-            this.$errorMsg('请检查表单')
-          }
-        })
-      }
-    },
-    drawerbutton (val) {
-      // 打印
-      if(val == 'print'){
-        let _propsData = JSON.parse(JSON.stringify(this.tableDataDetails))
-        _propsData.title = "线边仓领料单"
-        _propsData.details.forEach(item=>{
-          item.recommendLot = item.recommendLot + " "
-        })
-        let _option = {
-          details:{
-            fromLocationCode:"recommendFromLocationCode",
-            qty:"handledQty",
-            fromLot:"recommendLot",
-            fromLocationErpCode:"recommendFromLocationErpCode",
-          }
-        }
-        let data = initPrintAllData(_propsData,'xbcll.rdlx',false,_option);
-        this.Print(data)
-      } else {
-        drawerMixins.methods.drawerbutton(val, this)
-      }
-    },
-    // drawerbutton(val) {
-    //   if (val == 'handleJob') {
-    //     this.Loading.appMainLoading = true
-    //     let propsData = JSON.parse(JSON.stringify(this.propsData));
-    //     this.$listAssign(this.handleFormData, propsData)
-    //     this.handleFormData.toLocationCode = this.handleFormData.details[0].toLocationCode
-    //     this.handleMultipleSelection = []
-    //     this.Loading.appMainLoading = false
-    //     this.formTitle = "执行" + this.$route.meta.title;
-    //     this.displayDialog.handleFromDialog = true
-    //   } else {
-    //     drawerMixins.methods.drawerbutton(val, this)
-    //   }
-    // },
-    handleSelectionChange(val) {
-      this.handleMultipleSelection = val
-    },
-    showLibraryShift(scope){
-      if(!scope.row.tenantId){return this.$errorMsg("事务类型有误")}
-      this.libraryShiftShow = true
-      this.libraryShiftRow = scope
-    },
-    closeLibraryShift(data){
-      this.libraryShiftShow = data
-      this.libraryShiftRow = null
-    }
   }
 };
 </script>
 <style lang="scss" scoped>
 @import "../../../styles/mainbasicData.scss";
-::v-deep .newAndEdiDialog {
-  display: flex;
-  flex-direction: column;
-  width: 100%;
-  height: 100%;
-  .el-form {
-    flex: 1;
-    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;
-  }
-  .formTable-box {
-      height: 70% !important;
-
-      .el-form-item__content {
-        width: 100%;
-        height: 100%;
-        display: flex;
-        flex-direction: column;
-        overflow: hidden;
-        margin: 0 !important;
-      }
-    }
-}
 </style>
\ 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
index 870cac7b0..d95587a82 100644
--- a/fe/PC/src/views/materialIssueManage/ZS/IssueNoteZS.vue
+++ b/fe/PC/src/views/materialIssueManage/ZS/IssueNoteZS.vue
@@ -63,7 +63,7 @@ export default {
   ],
   data () {
     return {
-      URL: 'wms/store/issue-note',
+      URL: 'wms/store/injection-note',
       //常用按钮数据
       currenButtonData: [
         this.defaultExportBtn(),//导出
@@ -71,56 +71,14 @@ export default {
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选
       ],
-      DrawerButtonData: [
-        {
-          type: 'info',
-          icon: 'el-icon-printer',
-          label: '打印',
-          hide: false,
-          name: "print",
-          size: 'mini'
-        },
-      ]
+      DrawerButtonData: []
     };
   },
   mounted () {
     this.paging();
   },
   methods: {
-    //渲染数据
-    paging(callback) {
-      this.Loading.tableLoading = true;
-      this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
-      // 叫料请求类型: 人工拉动:Issue_Manual;  线边拉动:Issue_WIP; 直接发料:Direct_Issue
-      let params = {
-        requestType: 'Issue_Manual'
-      }
-      materialRequestByType(this.PageListParams, this.URL + '/by-type', params).then(res => {
-          this.tableData = res.items
-          this.totalCount = res.totalCount
-          this.pagingCallback(callback)
-        }).catch(err => {
-          this.Loading.tableLoading = false
-        })
-    },
-    drawerbutton (val) {
-      // 打印
-      if(val == 'print'){
-        let _propsData = JSON.parse(JSON.stringify(this.tableDataDetails))
-        // _propsData.title = "送货单"
-        _propsData.title = "线边仓领料单"
-        _propsData.details.forEach(item=>{
-          item.fromLot = item.fromLot + " "
-        })
-        let _option = {
-          number:"requestNumber",
-        }
-        let data = initPrintAllData(_propsData,'xbcll.rdlx',false,_option);
-        this.Print(data)
-      } else {
-        drawerMixins.methods.drawerbutton(val, this)
-      }
-    }
+    
   },
 };
 </script>
diff --git a/fe/PC/src/views/materialIssueManage/ZS/IssueRequestZS.vue b/fe/PC/src/views/materialIssueManage/ZS/IssueRequestZS.vue
index 1876c404b..80d3480fe 100644
--- a/fe/PC/src/views/materialIssueManage/ZS/IssueRequestZS.vue
+++ b/fe/PC/src/views/materialIssueManage/ZS/IssueRequestZS.vue
@@ -47,7 +47,7 @@
       :tabsDesTions="tabsDesTions"
       :Butttondata="DrawerButtonData"
       @drawerShut="(val) => (displayDialog.detailsDialog = val)"
-      @drawerbutton="drawerbutton"
+      @drawerbutton="drawerbuttonHandle"
       @close-value="closeValue"
       :currenButtonData="currenButtonData"
       :tableColumns="detailsTableColumns"
@@ -59,14 +59,12 @@
   </div>
 </template>
 <script>
-import { materialRequestByType,processRequest,getDetailed } from "@/api/wms-api"
+import { getDetailed } from "@/api/wms-api"
 import { tableMixins } from "@/mixins/TableMixins"
 import { LoadingMixins } from "@/mixins/LoadingMixins"
 import { drawerMixins } from "@/mixins/drawerMixins"
 import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
 import { mixins } from "@/mixins/mixins"
-import { requestData } from "@/utils/processButtonData"
-import requestDataNames from "@/utils/processButtonData"
 export default {
   name: "IssueRequestZS",
   mixins: [
@@ -77,18 +75,17 @@ export default {
     mixins,
   ],
   computed: {
-    editDialog: {
-      get: function () {
-        return this.displayDialog.newDialog || this.displayDialog.editDialog;
-      },
+    //按钮显示
+    hideButton: function () {
+      return function () {
+        return this.propsData.status
+      }
     },
   },
   data () {
     let _this = this;
     return {
-      URL: 'wms/store/material-request',
-      tableLoading: false,
-      handleMultipleSelection: [],
+      URL: 'wms/store/injection-request',
       //常用按钮数据
       currenButtonData: [
         this.defaultImportBtn(),//导入
@@ -96,25 +93,15 @@ export default {
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选
       ],
-      //执行前获取记录数据暂存
-      oldIssueJobIds: [],
       DrawerButtonData: [
-        // ...requestData(this),
         {
-          type: 'success',
-          label: '完成',
-          hide: () => { return this.completeRequestInit([2,6])},
-          name: "completeRequest",
+          type: 'danger',
+          label: '中止',
+          // todo:状态确定
+          hide: () => { return this.hideButton([2,6])},
+          name: "break",
           size: 'mini'
         },
-        {
-          type: 'warning',
-          label: '执行',
-          name: "IssueRequest-zx",
-          hide: () => { return this.againHandleRequestInit([9])},
-          size: 'mini'
-        },
-        ...requestData(this,false,false,[requestDataNames.againHandle]),
       ],
     };
   },
@@ -122,43 +109,7 @@ export default {
     this.paging()
   },
   methods: {
-    //渲染数据
-    paging(callback) {
-      this.Loading.tableLoading = true;
-      this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
-      // 叫料请求类型: 人工拉动:Issue_Manual;  线边拉动:Issue_WIP; 直接发料:Direct_Issue
-      let params = {
-        type: 'Issue_Manual'
-      }
-      materialRequestByType(this.PageListParams, this.URL + '/by-type', params).then(res => {
-          this.tableData = res.items
-          this.totalCount = res.totalCount
-          this.pagingCallback(callback)
-        }).catch(err => {
-          this.Loading.tableLoading = false
-        })
-    },
-    // 重新定义【完成按钮】显示判断 除了2(待审批) 和 6（完成状态）都显示（abortRequestRequestInit）
-    completeRequestInit(val){
-      let data = false
-      val.forEach(key => {
-        if (this.propsData.requestStatus == key) {
-          data = true
-        }
-      })
-      return data
-    },
-    // 定义【执行按钮】显示判断 ==9时候显示
-    againHandleRequestInit(val){
-      let data = true
-      val.forEach(key => {
-        if (this.propsData.requestStatus == key) {
-          data = false
-        }
-      })
-      return data
-    },
-    // 执行成功后处理
+    // 操作成功后处理
     handleResult(){
       getDetailed(this.propsData.id, this.URL).then(res => {
         this.propsData = res
@@ -167,55 +118,12 @@ export default {
       this.Loading.appMainLoading = false
     },
     //抽屉常用按钮
-    drawerbutton (val) {
-      // 执行
-      if(val == 'IssueRequest-zx'){
-        this.Loading.appMainLoading = true
-        // 获取记录数据暂存
-        processRequest(this.propsData.number,'wms/store/issue-job/by-request-number/').then(resFirst=>{
-          this.oldIssueJobIds = []
-          resFirst.forEach(item=>{
-            this.oldIssueJobIds.push(item.id)
-          })
-          // 执行操作
-          processRequest(this.propsData.id, this.URL + '/handle/').then(resHandle => {
-            // 重新获取记录对比
-            processRequest(this.propsData.number,'wms/store/issue-job/by-request-number/').then(resNew=>{
-              // 重新获取的记录为空（未生成任务）
-              if(!resNew || resNew.length <= 0){
-                this.$errorMsg('没有可用库存，未生成新任务')
-                this.handleResult()
-                return
-              }
-              // 当前有记录
-              if(resNew && resNew.length > 0){
-                let _newIds = []
-                resNew.forEach(item=>{
-                  _newIds.push(item.id)
-                })
-                if(this.oldIssueJobIds.sort().toString() === _newIds.sort().toString()){
-                  let mes = '未生成任务原因: ' + `<br/>` + '1、该请求中的【物品】的【实际发货数量】小于【请求数量】,请确认数量后点击【完成】。' + `<br/>` + '2、该请求中的【库存余额】小于【请求数量】,请确认数量后点击【执行】'
-                  this.$alert(mes,
-                    '错误提示', {
-                    confirmButtonText: '确定',
-                    dangerouslyUseHTMLString: true
-                  })
-                }else{
-                  this.$successMsg('执行成功，已生成新任务')
-                }
-                this.handleResult()
-              }
-            })
-          }).catch(err => {
-            console.log(err)
-            this.Loading.appMainLoading = false
-          })
-        }).catch(err => {
-          console.log(err)
-          this.Loading.appMainLoading = false
-        })
+    drawerbuttonHandle (val) {
+      // 中止
+      if(val == 'break'){
+        
       } else {
-        drawerMixins.methods.drawerbutton(val, this)
+        this.drawerbutton(val, this)
       }
     },
   }
diff --git a/fe/PC/src/views/systemManage/pageLock.vue b/fe/PC/src/views/systemManage/pageLock.vue
new file mode 100644
index 000000000..43ff0772c
--- /dev/null
+++ b/fe/PC/src/views/systemManage/pageLock.vue
@@ -0,0 +1,95 @@
+<template>
+  <div class="page-box" v-loading="Loading.appMainLoading">
+    <tablePagination
+      :currenButtonData="currenButtonData"
+      :tableData="tableData"
+      :tableLoading="Loading.tableLoading"
+      :tableColumns="tableColumns"
+      @rowDrop="rowDrop"
+      :totalCount="totalCount"
+      :multipleSelection="multipleSelection"
+      :MaxResultCount="PageListParams.MaxResultCount"
+      @topbutton="topbutton"
+      @inlineDialog="inlineDialog"
+      @sortChange="sortChange"
+      @alertoldSkipCount="alertoldSkipCount"
+      @alterResultCount="alterResultCount"
+      @handleSelectionChange="handleSelectionChange"
+      :currentPageProps="oldSkipCount"
+      :quicklySearchOption="quicklySearchOption"
+      @quicklySearchClick="quicklySearchClick"
+      @quicklySearchClear="quicklySearchClear"
+      :primarySearchOption="primarySearchOption"
+      @overallSearchFormClick="overallSearchFormClick"
+      :httpOverallSearchData="httpOverallSearchData"
+    >
+    </tablePagination>
+    <!-- 新导入 disabledMethod 导入方式禁用 disabledIsAllowPartImport 是否局部导入禁用-->
+    <!-- methodValue 导入方式默认选项  是否局部导入 默认选项  -->
+    <importFile
+      :loading="Loading.importLoading"
+      :show="displayDialog.importDialog"
+      :URL="URL"
+      :disabledMethod = {method1:false,method2:false,method3:false}
+      :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false}
+      isAllowPartImportValue="1"
+      @importClick="postImportMergeClick(arguments)"
+      @postImportDown="importDown"
+    ></importFile>
+    <!--抽屉-->
+    <curren-Drawer
+      :title="tableColumns"
+      :DrawerLoading="Loading.DrawerLoading"
+      :drawer="displayDialog.detailsDialog"
+      :propsData="propsData"
+      :tabsDesTions="tabsDesTions"
+      :Butttondata="[]"
+      :dropdownData="dropdownData"
+      @drawerShut="(val) => (displayDialog.detailsDialog = val)"
+      @handleCommand="drawerHandle"
+      @close-value="closeValue"
+      :tableColumns="detailsTableColumns"
+      :totalCount="totalCountDetails"
+      :MaxResultCount="MaxResultCountDetails"
+      @alterResultCountDetails="alterResultCountDetails"
+      @alertoldSkipCountDetails="alertoldSkipCountDetails"
+    ></curren-Drawer>
+  </div>
+</template>
+<script>
+import { pageLockList,pageLockDetailed } from "@/api/wms-api";
+import { tableMixins } from "@/mixins/TableMixins";
+import { LoadingMixins } from "@/mixins/LoadingMixins";
+import { drawerMixins } from "@/mixins/drawerMixins";
+import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
+import { mixins } from "@/mixins/mixins";
+export default {
+  name: "pageLock",
+  mixins: [
+    tableMixins,
+    LoadingMixins,
+    drawerMixins,
+    TableHeaderMixins,
+    mixins,
+  ],
+  data() {
+    return {
+      URL: "auth/page-lock",
+      //常用按钮数据
+      currenButtonData: [
+        // this.defaultImportBtn(),//导入
+        this.defaultFieldSettingBtn(),//字段设置
+        this.defaultFreshBtn(),//刷新
+        this.defaultFilterBtn(),//筛选
+      ],
+    };
+  },
+  mounted() {
+    // todo:删除未测试
+    this.paging();
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "@/styles/mainbasicData.scss";
+</style>
\ No newline at end of file