diff --git a/fe/PC/src/components/filterSelect/index.vue b/fe/PC/src/components/filterSelect/index.vue
index eb20aebf4..4df214636 100644
--- a/fe/PC/src/components/filterSelect/index.vue
+++ b/fe/PC/src/components/filterSelect/index.vue
@@ -19,7 +19,7 @@
     :loading-text="loadingText"
     @change="changeHandle(arguments)"
     :class="[selectItem.searchButton ? 'hasSearchButton' : '']"
-    :size="selectItem.size || 'normal'"
+    :size="selectItem.size || undefined"
   >
     <el-option
       v-for="item in options"
diff --git a/fe/PC/src/router/index.js b/fe/PC/src/router/index.js
index 9094d3c36..f3186cd0c 100644
--- a/fe/PC/src/router/index.js
+++ b/fe/PC/src/router/index.js
@@ -142,70 +142,38 @@ export const constantRoutes = [
       }
     }]
   }, 
-  {
-    path: '/',
-    component: Layout,
-    redirect: '/gridlayout',
-    hidden: true,
-    children: [{
-      path: 'PurchaseReturnApprove',
-      component: () => import('@/views/rawMaterialManage/purchaseReturn/returnApprove.vue'),
-      name: 'PurchaseReturnApprove',
-      meta: {
-        keepAlive : true, 
-        title: '上架后退货审批',
-        icon: '系统首页',
-      }
-    }]
-  }, 
-  {
-    path: '/',
-    component: Layout,
-    redirect: '/gridlayout',
-    hidden: true,
-    children: [{
-      path: 'PurchaseOrderHigher',
-      component: () => import('@/views/rawMaterialManage/purchaseReceipt/PurchaseOrderHigher.vue'),
-      name: 'PurchaseOrderHigher',
-      meta: {
-        keepAlive : true, 
-        title: '采购订单（关闭订单行）',
-        icon: '系统首页',
-      }
-    }]
-  }, 
-  {
-    path: '/',
-    component: Layout,
-    redirect: '/gridlayout',
-    hidden: true,
-    children: [{
-      path: 'ProductionLine',
-      component: () => import('@/views/basicData/WorkshopManage/ProductionLine.vue'),
-      name: 'ProductionLine',
-      meta: {
-        keepAlive : true, 
-        title: '生产线信息',
-        icon: '生产线信息',
-      }
-    }]
-  }, 
-  {
-    path: '/',
-    component: Layout,
-    redirect: '/gridlayout',
-    hidden: true,
-    children: [{
-      path: 'IssuePlanZS',
-      component: () => import('@/views/materialIssueManage/ZS/IssuePlanZS.vue'),
-      name: 'IssuePlanZS',
-      meta: {
-        keepAlive : true, 
-        title: '注塑计划',
-        icon: '成品发运任务',
-      }
-    }]
-  }, 
+  // {
+  //   path: '/',
+  //   component: Layout,
+  //   redirect: '/gridlayout',
+  //   hidden: true,
+  //   children: [{
+  //     path: 'PurchaseOrderHigher',
+  //     component: () => import('@/views/rawMaterialManage/purchaseReceipt/PurchaseOrderHigher.vue'),
+  //     name: 'PurchaseOrderHigher',
+  //     meta: {
+  //       keepAlive : true, 
+  //       title: '采购订单（关闭订单行）',
+  //       icon: '系统首页',
+  //     }
+  //   }]
+  // }, 
+  // {
+  //   path: '/',
+  //   component: Layout,
+  //   redirect: '/gridlayout',
+  //   hidden: true,
+  //   children: [{
+  //     path: 'IssuePlanZS',
+  //     component: () => import('@/views/materialIssueManage/ZS/IssuePlanZS.vue'),
+  //     name: 'IssuePlanZS',
+  //     meta: {
+  //       keepAlive : true, 
+  //       title: '注塑计划',
+  //       icon: '成品发运任务',
+  //     }
+  //   }]
+  // }, 
   {
     path: '/',
     component: Layout,
@@ -217,7 +185,7 @@ export const constantRoutes = [
       name: 'IssueRequestZS',
       meta: {
         keepAlive : true, 
-        title: '人工注塑申请',
+        title: '注塑申请',
         icon: '成品发运任务',
       }
     }]
@@ -233,7 +201,7 @@ export const constantRoutes = [
       name: 'IssueJobZS',
       meta: {
         keepAlive : true, 
-        title: '人工注塑任务',
+        title: '注塑任务',
         icon: '成品发运任务',
       }
     }]
@@ -249,7 +217,7 @@ export const constantRoutes = [
       name: 'IssueNoteZS',
       meta: {
         keepAlive : true, 
-        title: '人工注塑记录',
+        title: '注塑记录',
         icon: '成品发运任务',
       }
     }]
@@ -350,70 +318,6 @@ export const constantRoutes = [
       }
     }]
   }, 
-  {
-    path: '/',
-    component: Layout,
-    redirect: '/gridlayout',
-    hidden: true,
-    children: [{
-      path: 'transferLibRequest',
-      component: () => import('@/views/inventoryManage/transferLib/transferLibRequest.vue'),
-      name: 'transferLibRequest',
-      meta: {
-        keepAlive : true, 
-        title: '业务库移申请',
-        icon: '成品发运任务',
-      }
-    }]
-  }, 
-  {
-    path: '/',
-    component: Layout,
-    redirect: '/gridlayout',
-    hidden: true,
-    children: [{
-      path: 'transferLibJob',
-      component: () => import('@/views/inventoryManage/transferLib/transferLibJob.vue'),
-      name: 'transferLibJob',
-      meta: {
-        keepAlive : true, 
-        title: '业务库移任务',
-        icon: '成品发运任务',
-      }
-    }]
-  }, 
-  {
-    path: '/',
-    component: Layout,
-    redirect: '/gridlayout',
-    hidden: true,
-    children: [{
-      path: 'transferLibNote',
-      component: () => import('@/views/inventoryManage/transferLib/transferLibNote.vue'),
-      name: 'transferLibNote',
-      meta: {
-        keepAlive : true, 
-        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: '成品发运任务',
-      }
-    }]
-  },  
   {
     path: '/',
     component: Layout,
@@ -558,38 +462,6 @@ export const constantRoutes = [
       }
     }]
   },
-  {
-    path: '/',
-    component: Layout,
-    redirect: '/gridlayout',
-    hidden: true,
-    children: [{
-      path: 'chassisList',
-      component: () => import('@/views/basicData/chassisManage/chassisList.vue'),
-      name: 'chassisList',
-      meta: {
-        keepAlive : true, 
-        title: '底盘查询',
-        icon: '成品发运任务',
-      }
-    }]
-  }, 
-  {
-    path: '/',
-    component: Layout,
-    redirect: '/gridlayout',
-    hidden: true,
-    children: [{
-      path: 'chassisOperationSequence',
-      component: () => import('@/views/basicData/chassisManage/chassisOperationSequence.vue'),
-      name: 'chassisOperationSequence',
-      meta: {
-        keepAlive : true, 
-        title: '底盘执行位置序列',
-        icon: '成品发运任务',
-      }
-    }]
-  }, 
 ]
 
 
diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js
index 8ccf279c9..041252fca 100644
--- a/fe/PC/src/utils/detailsTableColumns/index.js
+++ b/fe/PC/src/utils/detailsTableColumns/index.js
@@ -3513,10 +3513,10 @@ export const safetyStockWarning =  [
 
 // 总成量份
 export const Kitting = [
-  { label: _Names.itemCode, prop: 'partCode' },
-  { label: _Names.itemName, prop: 'partName' },
-  { label: _Names.itemDesc1, prop: "desc1" },
-  { label: _Names.itemDesc2, prop: "desc2" },
+  { label: _Names.itemCode, prop: 'itemCode' },
+  { label: _Names.itemName, prop: 'itemName' },
+  { label: _Names.itemDesc1, prop: "itemDesc1" },
+  { label: _Names.itemDesc2, prop: "itemDesc2" },
   { label: '配置', prop: "conf" },
   { label: '包装数量', prop: "qty" },
   { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
@@ -4954,4 +4954,17 @@ export const customerReturnNote =  [
   { label: "过期时间", prop: 'expiredTime' },
   { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
   { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
+]
+
+// kitting打包记录
+export const KittingPackagingNote =  [
+  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
+  { label: "数量", prop: "qty" },
+  { label: "kitting代码", prop: 'kittingCode' },
+  { label: "备注", prop: "remark" },
+  { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+  { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
 ]
\ No newline at end of file
diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index 28d7f8ecf..587b7c8e9 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -735,6 +735,7 @@ export const Workshop = [
 export const ProductionLine = [
   { label: "生产线代码", prop: "code", fixed: "left", type: "name" },
   { label: "生产线名称", prop: 'name' },
+  { label: "生产线类型", prop: "productionLineType", type: "filter", filters: "productionLineType" },
   { label: "库位代码", prop: "locationCode" },
   { label: "描述", prop: "description" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
@@ -4847,6 +4848,7 @@ export const chassisList =  [
     fixed: "left",
     type: "name"
   },
+  { label: "Wms编号", prop: 'number' },
   { label: "底盘生产时间", prop: 'produceDateTime', type: "dateTime" },
   { label: "接收接口时间", prop: 'receiveInterfaceDateTime', type: "dateTime" },
   { label: "执行位置排序列", prop: 'sortNumber' },
@@ -4865,12 +4867,44 @@ export const chassisOperationSequence =  [
     type: "name"
   },
   { label: "kitting代码", prop: 'kittingCode' },
-  { label: "kitting执行序列号", prop: 'kittingNumber',width:"180px" },
+  { label: "Kitting执行底盘序列位置", prop: 'chassisSortNumber',width:"220px" },
   { label: "备注", prop: "remark" },
   { label: "创建时间", prop: 'creationTime', type: "dateTime" },
   { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
 ]
 
+// kitting打包记录
+export const KittingPackagingNote =  [
+  {
+    label: "单号",
+    prop: 'number',
+    fixed: "left",
+    type: "name"
+  },
+  { label: "kitting代码", prop: 'kittingCode' },
+  { label: "备注", prop: "remark" },
+  { label: "操作员", prop: "worker" },
+  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+  { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+  { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
+]
+
+// kitting打包记录 - 扫描明细
+export const KittingPackagingDepDetails =  [
+  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
+  { label: "底盘代码", prop: "chassisNumber" },
+  { label: "底盘号排序序列", prop: "chassisSortNumber" },
+  { label: "kitting代码", prop: 'kittingCode' },
+  { label: "备注", prop: "remark" },
+  { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+  { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
+]
+
+
+
 
 
 // 字段说明
diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js
index 289c46a11..44930e6dc 100644
--- a/fe/PC/src/utils/tabsDesTions/index.js
+++ b/fe/PC/src/utils/tabsDesTions/index.js
@@ -547,6 +547,7 @@ export const Workshop =  [
 export const ProductionLine = [
   { label: "生产线代码", prop: "code", fixed: "left", type: "name" },
   { label: "生产线名称", prop: 'name' },
+  { label: "生产线类型", prop: "productionLineType", type: "filter", filters: "productionLineType" },
   { label: "库位代码", prop: "locationCode" },
   { label: "描述", prop: "description" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
@@ -3630,6 +3631,7 @@ export const chassisList =  [
     fixed: "left",
     type: "name"
   },
+  { label: "Wms编号", prop: 'number' },
   { label: "底盘生产时间", prop: 'produceDateTime', type: "dateTime" },
   { label: "接收接口时间", prop: 'receiveInterfaceDateTime', type: "dateTime" },
   { label: "执行位置排序列", prop: 'sortNumber' },
@@ -3648,8 +3650,24 @@ export const chassisOperationSequence =  [
     type: "name"
   },
   { label: "kitting代码", prop: 'kittingCode' },
-  { label: "kitting执行序列号", prop: 'kittingNumber' },
+  { label: "Kitting执行底盘序列位置", prop: 'chassisSortNumber'},
   { label: "备注", prop: "remark" },
   { label: "创建时间", prop: 'creationTime', type: "dateTime" },
   { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
+]
+
+// kitting打包记录
+export const KittingPackagingNote =  [
+  {
+    label: "单号",
+    prop: 'number',
+    fixed: "left",
+    type: "name"
+  },
+  { label: "kitting代码", prop: 'kittingCode' },
+  { label: "备注", prop: "remark" },
+  { label: "操作员", prop: "worker" },
+  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+  { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+  { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
 ]
\ No newline at end of file
diff --git a/fe/PC/src/views/basicData/WorkshopManage/ProductionLine.vue b/fe/PC/src/views/basicData/WorkshopManage/ProductionLine.vue
index 14690768c..1d7d2d623 100644
--- a/fe/PC/src/views/basicData/WorkshopManage/ProductionLine.vue
+++ b/fe/PC/src/views/basicData/WorkshopManage/ProductionLine.vue
@@ -131,6 +131,7 @@ export default {
         name: null,
         description: null,
         locationCode: null,
+        productionLineType:null,
       },
       //编辑
       editFormData: {
@@ -138,6 +139,7 @@ export default {
         name: null,
         description: null,
         locationCode: null,
+        productionLineType:null,
         concurrencyStamp: null,
       },
       editOptions: {
@@ -146,6 +148,7 @@ export default {
       CreateForm: [
         { type: "input", label: "生产线代码", prop: "code", validType:'numberLetter', colSpan: 12 },
         { type: "input", label: "生产线名称", prop: 'name', colSpan: 12 },
+        { type: "select", label: "生产线类型", prop: "productionLineType", options: "productionLineType", colSpan: 12 },
         { type: "filterSelect", label: "库位代码", prop: "locationCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.CreateFormData) }, 
@@ -156,6 +159,7 @@ export default {
       editForm: [
         { type: "input", label: "生产线代码",disabled:true, prop: "code", validType:'numberLetter', colSpan: 12 },
         { type: "input", label: "生产线名称", prop: 'name', colSpan: 12 },
+        { type: "select", label: "生产线类型", disabled:true, prop: "productionLineType", options: "productionLineType", colSpan: 12 },
         { type: "filterSelect", label: "库位代码",disabled:true, prop: "locationCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.CreateFormData) }, 
@@ -167,6 +171,7 @@ export default {
         cerateRule: {
           code: [{ required: true, trigger: "blur", message: "不可为空" }],
           name: [{ required: true, trigger: "blur", message: "不可为空" }],
+          productionLineType: [{ required: true, trigger: "blur", message: "不可为空" }],
           locationCode: [{ required: true, trigger: "change", message: "不可为空" }],
         },
         editRule: {
diff --git a/fe/PC/src/views/finishedProductManage/dismantle/StepsFormTree/index.vue b/fe/PC/src/views/finishedProductManage/dismantle/StepsFormTree/index.vue
index 381ceee59..6860c86f1 100644
--- a/fe/PC/src/views/finishedProductManage/dismantle/StepsFormTree/index.vue
+++ b/fe/PC/src/views/finishedProductManage/dismantle/StepsFormTree/index.vue
@@ -388,24 +388,23 @@ export default {
     // 3、全选 ==> 最底层选中
     // 4、全不选 ==> 全不不选择
     handleNodeCheck(row,node){
+      // 全选/全不选
       if(row.id == this.CreateFormData.details[0].id){
-        // todo:根据当前项更新是否为全选
-        // let _selectData = this.getBomAllSelect()
-        // // 如果没有选中：则为不是全选
-        // if(_selectData.length <= 0){ this.isAllCheck = false }
-        // // 如果当前选项等于所有的最底层：则为是全选
-        // let _selectsIds = []
-        // _selectData.forEach(item=>{_selectsIds.push(item.id)})
-        // let _lastData = this.getLastFloors(this.CreateFormData.details)
-        // let _lastIds = []
-        // _lastData.forEach(item=>{_lastIds.push(item.id)})
-        // if (_selectsIds.length !== _lastIds.length) { this.isAllCheck = false }
-        // console.log(403,_selectsIds.every((item) => _lastIds.includes(item)))
-        // if(_selectsIds.every((item) => _lastIds.includes(item))){
-        //   this.isAllCheck = false 
-        // }else{
-        //   this.isAllCheck = true
-        // }
+        // 根据当前项更新是否为全选
+        let _selectData = this.getBomAllSelect()
+        // 如果没有选中：则为不是全选
+        if(_selectData.length <= 0){ this.isAllCheck = false }
+        // 如果当前选项等于所有的最底层：则为是全选
+        let _selectsIds = []
+        _selectData.forEach(item=>{_selectsIds.push(item.id)})
+        let _lastData = this.getLastFloors(this.CreateFormData.details)
+        let _lastIds = []
+        _lastData.forEach(item=>{_lastIds.push(item.id)})
+        if(_selectsIds.sort().toString() == _lastIds.sort().toString()){
+          this.isAllCheck = true
+        }else{
+          this.isAllCheck = false
+        }
 
         // 全不选
         if(this.isAllCheck){
@@ -428,7 +427,9 @@ export default {
           this.setAllDataNotCheck()
           this.toggleCheckSelect(this.selectData,true)
         }
-      }else{
+      }
+      // 单独勾选/取消勾选
+      else{
         // 勾选
         if(node.checkedKeys.indexOf(row.id) >= 0){
           row.isCheck = true
@@ -579,7 +580,6 @@ export default {
           if(_parentIsCheck != 1){ _isError++ } 
         }
       })
-      console.log(547,_isError)
       this.canCommit = (_isError == 0)
     },
     //结束退出
diff --git a/fe/PC/src/views/inventoryManage/Count/CountJob-msQuery.vue b/fe/PC/src/views/inventoryManage/Count/CountJob-msQuery.vue
index fa9d670fa..951550c2e 100644
--- a/fe/PC/src/views/inventoryManage/Count/CountJob-msQuery.vue
+++ b/fe/PC/src/views/inventoryManage/Count/CountJob-msQuery.vue
@@ -36,6 +36,18 @@
       :detailsTableColumns="handleDetailsTableColumns"
       @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"
@@ -96,6 +108,7 @@ export default {
       URL: 'wms/store/count-job',
       //常用按钮数据
       currenButtonData: [
+        this.defaultImportBtn(),//导入
         this.defaultExportBtn(),//导出
         {
           type: "success",
diff --git a/fe/PC/src/views/inventoryManage/Count/CountNote-msQuery.vue b/fe/PC/src/views/inventoryManage/Count/CountNote-msQuery.vue
index 6f4b5c57b..fb6d08a92 100644
--- a/fe/PC/src/views/inventoryManage/Count/CountNote-msQuery.vue
+++ b/fe/PC/src/views/inventoryManage/Count/CountNote-msQuery.vue
@@ -89,7 +89,7 @@ export default {
       URL: 'wms/store/count-note',
       //常用按钮数据
       currenButtonData: [
-        this.defaultImportBtn(),//导入
+        // this.defaultImportBtn(),//导入
         this.defaultExportBtn(),//导出
         this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
diff --git a/fe/PC/src/views/basicData/ItemsManage/Kitting.vue b/fe/PC/src/views/kittingManage/Kitting.vue
similarity index 88%
rename from fe/PC/src/views/basicData/ItemsManage/Kitting.vue
rename to fe/PC/src/views/kittingManage/Kitting.vue
index 31ab655ff..df72aeb3e 100644
--- a/fe/PC/src/views/basicData/ItemsManage/Kitting.vue
+++ b/fe/PC/src/views/kittingManage/Kitting.vue
@@ -155,24 +155,24 @@ export default {
       },
       AddDetailsTableColumns: [
         { type:"inputNumber", label: "包装数量", prop: 'qty',width:"auto",min:1 },
-        { type: "filterSelect", label: "物品代码", prop: "partCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, 
           width: "auto",searchButton:false
         },
-        { label: "物料名称", prop: "partName",width:"auto" },
-        { label: "物料描述1", prop: "desc1",width:"auto" },
-        { label: "物料描述2", prop: "desc2",width:"auto" },
+        { label: "物料名称", prop: "itemName",width:"auto" },
+        { label: "物料描述1", prop: "itemDesc1",width:"auto" },
+        { label: "物料描述2", prop: "itemDesc2",width:"auto" },
         { label: "配置", prop: 'conf',width:"auto" },
         { type:"input", label: "备注", prop: 'remark',width:"auto" },
       ],
       childTableData:[{
         id:undefined,
         masterId:undefined,
-        partCode:null,
-        partName:null,
-        desc1:null,
-        desc2:null,
+        itemCode:null,
+        itemName:null,
+        itemDesc1:null,
+        itemDesc2:null,
         qty:null,
         conf:null,
         remark:null,
@@ -194,10 +194,10 @@ export default {
         this.childTableData = [{
           id:undefined,
           masterId:this.propsData.id,
-          partCode:null,
-          partName:null,
-          desc1:null,
-          desc2:null,
+          itemCode:null,
+          itemName:null,
+          itemDesc1:null,
+          itemDesc2:null,
           qty:null,
           conf:null,
           remark:null,
@@ -222,8 +222,8 @@ export default {
           let array = []
           let _isEmpty = 0
           this.CreateFormData.details.forEach(item => {
-            array.push(item.partCode)
-            if(!item.partCode || item.partCode.length <= 0 || !item.qty || item.qty.length <= 0 || Number(item.qty) == 0){
+            array.push(item.itemCode)
+            if(!item.itemCode || item.itemCode.length <= 0 || !item.qty || item.qty.length <= 0 || Number(item.qty) == 0){
               _isEmpty ++
             }
           })
@@ -269,18 +269,18 @@ export default {
       });
     },
     detailsDataPush(data){
-      if(data[1].prop == "partCode"){
-        this.CreateFormData.details[data[3].$index].partName = data[0].name
-        this.CreateFormData.details[data[3].$index].desc1 = data[0].desc1
-        this.CreateFormData.details[data[3].$index].desc2 = data[0].desc2
+      if(data[1].prop == "itemCode"){
+        this.CreateFormData.details[data[3].$index].itemName = data[0].name
+        this.CreateFormData.details[data[3].$index].itemDesc1 = data[0].desc1
+        this.CreateFormData.details[data[3].$index].itemDesc2 = data[0].desc2
         this.CreateFormData.details[data[3].$index].conf = data[0].configuration
       }
     },
     detailsClear(data){
-      if(data[0].prop == "partCode"){
-        this.CreateFormData.details[data[1].$index].partName = ""
-        this.CreateFormData.details[data[1].$index].desc1 = ""
-        this.CreateFormData.details[data[1].$index].desc2 = ""
+      if(data[0].prop == "itemCode"){
+        this.CreateFormData.details[data[1].$index].itemCode = ""
+        this.CreateFormData.details[data[1].$index].itemDesc1 = ""
+        this.CreateFormData.details[data[1].$index].itemDesc2 = ""
         this.CreateFormData.details[data[1].$index].conf = ""
       }
     }
@@ -288,5 +288,5 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-@import "../../../styles/basicData.scss";
+@import "@/styles/basicData.scss";
 </style>
\ No newline at end of file
diff --git a/fe/PC/src/views/kittingManage/KittingPackagingNote.vue b/fe/PC/src/views/kittingManage/KittingPackagingNote.vue
new file mode 100644
index 000000000..3e7c73646
--- /dev/null
+++ b/fe/PC/src/views/kittingManage/KittingPackagingNote.vue
@@ -0,0 +1,106 @@
+<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"
+        :tabsDesTions="tabsDesTions"
+        :Butttondata="DrawerButtonData"
+        :dropdownTabsData="dropdownTabsData"
+        @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 { getDetailed } from "@/api/wms-api"
+  import { close } 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"
+  export default {
+    name: "KittingPackagingNote",
+    mixins: [
+      tableMixins,
+      LoadingMixins,
+      drawerMixins,
+      TableHeaderMixins,
+      mixins,
+    ],
+    data () {
+      let _this = this;
+      return {
+        URL: 'wms/store/KittingPackagingNote',
+        //常用按钮数据
+        currenButtonData: [
+          // this.defaultImportBtn(),//导入
+          this.defaultExportBtn(),//导出
+          this.defaultFieldSettingBtn(),//字段设置
+          this.defaultFreshBtn(),//刷新
+          this.defaultFilterBtn(),//筛选
+        ],
+        // 自定义详情明细汇总等table页
+        dropdownTabsData: [
+            {
+            label: "详情",
+            name: 'xq'
+            },
+            {
+            label: "明细",
+            name: 'mx'
+            },
+            {
+            label: "扫描明细",
+            name: 'depDetails',
+            tableColumns: 'KittingPackagingDepDetails',
+            functionName: 'otherDetailTab'
+            },
+        ],
+        DrawerButtonData: [],
+      };
+    },
+    mounted () {
+      this.paging()
+    },
+    methods: {
+      
+    }
+  };
+  </script>
+  <style lang="scss" scoped>
+  @import "@/styles/mainbasicData.scss";
+  </style>
\ No newline at end of file
diff --git a/fe/PC/src/views/basicData/chassisManage/chassisList.vue b/fe/PC/src/views/kittingManage/chassisManage/chassisList.vue
similarity index 100%
rename from fe/PC/src/views/basicData/chassisManage/chassisList.vue
rename to fe/PC/src/views/kittingManage/chassisManage/chassisList.vue
diff --git a/fe/PC/src/views/basicData/chassisManage/chassisOperationSequence.vue b/fe/PC/src/views/kittingManage/chassisManage/chassisOperationSequence.vue
similarity index 100%
rename from fe/PC/src/views/basicData/chassisManage/chassisOperationSequence.vue
rename to fe/PC/src/views/kittingManage/chassisManage/chassisOperationSequence.vue
diff --git a/fe/PC/src/views/systemManage/pageLock.vue b/fe/PC/src/views/systemManage/pageLock.vue
index 43ff0772c..1ac530ee9 100644
--- a/fe/PC/src/views/systemManage/pageLock.vue
+++ b/fe/PC/src/views/systemManage/pageLock.vue
@@ -74,7 +74,7 @@ export default {
   ],
   data() {
     return {
-      URL: "auth/page-lock",
+      URL: "auth/auth/page-lock",
       //常用按钮数据
       currenButtonData: [
         // this.defaultImportBtn(),//导入