From f4dfb8732a2d5a1afe8837143c806a9a42c3d21f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Mon, 11 Mar 2024 17:28:18 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=89=8D=E7=AB=AFPC=E3=80=9103.11?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82=E6=9B=B4=E6=94=B9=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/components/currenTable/index.vue    |   1 +
 fe/PC/src/components/searchOverall/index.vue  |   2 +-
 fe/PC/src/components/umyTable/index.vue       |   1 +
 fe/PC/src/filters/status.js                   |  19 +-
 fe/PC/src/utils/detailsTableColumns/index.js  |  84 +++---
 fe/PC/src/utils/request.js                    |  15 +-
 fe/PC/src/utils/tableColumns/index.js         | 122 +++++----
 fe/PC/src/utils/tabsDesTions/index.js         |  32 ++-
 .../views/basicData/ItemsManage/ItemBasic.vue |   3 +
 .../views/basicData/ItemsManage/Utensil.vue   |  11 +
 .../InventoryQuery/splitPackingList.vue       | 257 ++++++++----------
 .../materialsAdjustmentFunc.vue               |   1 +
 .../quality/InspectRequest.vue                |  14 +-
 13 files changed, 306 insertions(+), 256 deletions(-)

diff --git a/fe/PC/src/components/currenTable/index.vue b/fe/PC/src/components/currenTable/index.vue
index 9715ef42e..2a1eb8cfb 100644
--- a/fe/PC/src/components/currenTable/index.vue
+++ b/fe/PC/src/components/currenTable/index.vue
@@ -261,6 +261,7 @@
         <el-form-item v-if="item.type == 'button'" >
           <!-- v-show="scope.row[item.prop]==undefined?true:false" -->
           <el-button
+            v-if="item.hasButton ? item.hasButton(scope,item) : true"
             v-show="item.alwaysShow ? true : ((scope.row[item.prop]==undefined || scope.row[item.prop] == '' || !scope.row[item.prop])?false:true)"
             type="primary"
             size="mini"
diff --git a/fe/PC/src/components/searchOverall/index.vue b/fe/PC/src/components/searchOverall/index.vue
index 4a7255db1..34c3ab986 100644
--- a/fe/PC/src/components/searchOverall/index.vue
+++ b/fe/PC/src/components/searchOverall/index.vue
@@ -424,7 +424,7 @@ export default {
           if (val == this.tableColumns[i].prop) {
             if (this.tableColumns[i].filters) {
               return this.moreListOptions.action.filter(item => item.value == '==' || item.value == '!=')
-            } else if (this.tableColumns[i].type == 'dateTime') {
+            } else if (this.tableColumns[i].type == 'dateTime'  || this.tableColumns[i].isNumber) {
               return this.moreListOptions.action.filter(item => 
                 item.value == '==' || 
                 item.value == '!=' ||
diff --git a/fe/PC/src/components/umyTable/index.vue b/fe/PC/src/components/umyTable/index.vue
index bd029feca..a49d2aeae 100644
--- a/fe/PC/src/components/umyTable/index.vue
+++ b/fe/PC/src/components/umyTable/index.vue
@@ -253,6 +253,7 @@
           <!-- v-show="scope.row[item.prop]==undefined?true:false" -->
           <div v-if="item.type == 'button'">
             <el-button
+              v-if="item.hasButton ? item.hasButton(scope,item) : true"
               v-show="item.alwaysShow ? true : ((scope.row[item.prop]==undefined || scope.row[item.prop] == '' || !scope.row[item.prop])?false:true)"
               type="primary"
               size="mini"
diff --git a/fe/PC/src/filters/status.js b/fe/PC/src/filters/status.js
index 06b535560..1c74bad84 100644
--- a/fe/PC/src/filters/status.js
+++ b/fe/PC/src/filters/status.js
@@ -2288,11 +2288,11 @@ export function SupplierAsnCtypeStaBack(name){
       label: '销售标签'
     },
     4: {
-      value: 2,
+      value: 4,
       label: '托盘标签'
     },
     5: {
-      value: 2,
+      value: 5,
       label: '盘点标签'
     },
   }
@@ -2441,3 +2441,18 @@ export function positionCodeType(index, prop) {
   }
   return Enum(type, index, prop)
 }
+
+// 器具类型
+export function utensilType(index, prop) {
+  let type = {
+    1: {
+      value: 1,
+      label: "内物流"
+    },
+    2: {
+      value: 2,
+      label: "客户"
+    },
+  }
+  return Enum(type, index, prop)
+}
diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js
index 017ed2336..6c66ecf6f 100644
--- a/fe/PC/src/utils/detailsTableColumns/index.js
+++ b/fe/PC/src/utils/detailsTableColumns/index.js
@@ -3307,48 +3307,48 @@ export const safetyStockWarning =  [
 ]
 
 // 拆箱记录
-export const splitPackingList =  [
-  {
-    label: "单号",
-    prop: "number",
-    fixed: "left",
-    type: "name"
-  },
-  { label: "原箱码", prop: "fromPackingCode" },
-  { label: "新签箱码", prop: "toPackingCode" },
-  { label: "物品代码", prop: "itemCode" },
-  { label: "物品名称", prop: "itemName" },
-  { label: "物品描述1", prop: "itemDesc1" },
-  { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "item_configurationFromFE" },
-  { label: "创建时间", prop: 'creationTime', type:'dateTime' },
-  { label: "标包数量", prop: "stdPackQty" },
-  { label: "数量", prop: "qty" },
-  { label: "单位", prop: "uom" },
-  { label: "供应商批次", prop: "supplierBatch" },
-  { label: "原库区", prop: "fromLocationArea" },
-  { label: "新签库区", prop: "toLocationArea" },
-  { label: "原库位代码", prop: "fromLocationCode" },
-  { label: "新签库位代码", prop: "toLocationCode" },
-  { label: "原ERP库位", prop: "fromLocationErpCode" },
-  { label: "新签ERP库位", prop: "toLocationErpCode" },
-  { label: "原库位组", prop: "fromLocationGroup" },
-  { label: "新签库位组", prop: "toLocationGroup" },
-  { label: "原批次", prop: "fromLot" },
-  { label: "新签批次", prop: "toLot" },
-  { label: "生产日期", prop: "produceDate",type: "dateTime" },
-  { label: "过期时间", prop: "expireDate",type: "dateTime" },
-  { label: "原器具号", prop: 'fromContainerCode' },
-  { label: "新签器具号", prop: 'toContainerCode' },
-  { label: "原状态", prop: "fromStatus",type: "filter", filters: "inventoryStage" },
-  { label: "新签状态", prop: "toStatus",type: "filter", filters: "inventoryStage" },
-  // { label: "原仓库代码", prop: "fromWarehouseCode" },
-  // { label: "新签仓库代码", prop: "toWarehouseCode" },
-  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
-  { label: "备注", prop: 'remark' },
-  { label: "原因", prop: 'reason' },
-  // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-]
+// export const splitPackingList =  [
+//   {
+//     label: "单号",
+//     prop: "number",
+//     fixed: "left",
+//     type: "name"
+//   },
+//   { label: "原箱码", prop: "fromPackingCode" },
+//   { label: "新签箱码", prop: "toPackingCode" },
+//   { label: "物品代码", prop: "itemCode" },
+//   { label: "物品名称", prop: "itemName" },
+//   { label: "物品描述1", prop: "itemDesc1" },
+//   { label: "物品描述2", prop: "itemDesc2" },
+//   { label: "配置", prop: "item_configurationFromFE" },
+//   { label: "创建时间", prop: 'creationTime', type:'dateTime' },
+//   { label: "标包数量", prop: "stdPackQty" },
+//   { label: "数量", prop: "qty" },
+//   { label: "单位", prop: "uom" },
+//   { label: "供应商批次", prop: "supplierBatch" },
+//   { label: "原库区", prop: "fromLocationArea" },
+//   { label: "新签库区", prop: "toLocationArea" },
+//   { label: "原库位代码", prop: "fromLocationCode" },
+//   { label: "新签库位代码", prop: "toLocationCode" },
+//   { label: "原ERP库位", prop: "fromLocationErpCode" },
+//   { label: "新签ERP库位", prop: "toLocationErpCode" },
+//   { label: "原库位组", prop: "fromLocationGroup" },
+//   { label: "新签库位组", prop: "toLocationGroup" },
+//   { label: "原批次", prop: "fromLot" },
+//   { label: "新签批次", prop: "toLot" },
+//   { label: "生产日期", prop: "produceDate",type: "dateTime" },
+//   { label: "过期时间", prop: "expireDate",type: "dateTime" },
+//   { label: "原器具号", prop: 'fromContainerCode' },
+//   { label: "新签器具号", prop: 'toContainerCode' },
+//   { label: "原状态", prop: "fromStatus",type: "filter", filters: "inventoryStage" },
+//   { label: "新签状态", prop: "toStatus",type: "filter", filters: "inventoryStage" },
+//   // { label: "原仓库代码", prop: "fromWarehouseCode" },
+//   // { label: "新签仓库代码", prop: "toWarehouseCode" },
+//   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+//   { label: "备注", prop: 'remark' },
+//   { label: "原因", prop: 'reason' },
+//   // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+// ]
 
 // 总成量份
 export const Kitting = [
diff --git a/fe/PC/src/utils/request.js b/fe/PC/src/utils/request.js
index 1c1750bf9..906808b5a 100644
--- a/fe/PC/src/utils/request.js
+++ b/fe/PC/src/utils/request.js
@@ -92,13 +92,18 @@ service.interceptors.response.use(
   error => {
     let err = error.response.data.error // for debug
     if (err && err.validationErrors) {
+      let _err_sum = ""
+      // 合并错误
       for (let item in err.validationErrors) {
-        Message({
-          message: err.validationErrors[item].message,
-          type: 'error',
-          duration: 5 * 1000
-        })
+        _err_sum += err.validationErrors[item].message + '<br/>'
       }
+      Message({
+        message: _err_sum,
+        type: 'error',
+        duration: 5 * 1000,
+        dangerouslyUseHTMLString: true,
+        showClose:true
+      })
     } else {
       console.log(err)
       // 用户登录，用户名密码错误，报400，后端返回 invalid_grant 信息，令牌受限
diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index bbdbb3fa8..0020c6ef2 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -36,7 +36,7 @@ export const ItemBasic = [
   { label: _Names.group, prop: "group" },
   { label: _Names.configuration, prop: "configuration" },
   { label: _Names.basicUom, prop: "basicUom" },
-  { label: _Names.stdPackQty, prop: "stdPackQty" },
+  { label: _Names.stdPackQty, prop: "stdPackQty",isNumber:true },
   { label: _Names.project, prop: "project" },
   { label: _Names.version, prop: "version" },
   { label: _Names.eco, prop: "eco" },
@@ -108,7 +108,7 @@ export const ItemPack = [
   { label: _Names.packName, prop: "packName" },
   { label: _Names.packType, prop: "packType" },
   { label: _Names.packBasicUom, prop: "basicUom" },
-  { label: _Names.packQty, prop: "qty" },
+  { label: _Names.packQty, prop: "qty",isNumber:true },
   { label: _Public.remark, prop: "remark" },
   { label: _Public.creationTime, prop: "creationTime", type:'dateTime' },
   { label: _Public.lastModificationTime, prop: "lastModificationTime",  type:'dateTime' },
@@ -130,11 +130,11 @@ export const AQL = [
   },
   { label: _Names.supplierCode, prop: "supplierCode" },
   { label: _Names.abcClass, prop: 'abcClass', type: "filter", filters: "abcClass" },
-  { label: _Names.ceilingQty, prop: 'ceilingQty' },
-  { label: _Names.floorQty, prop: "floorQty" },
+  { label: _Names.ceilingQty, prop: 'ceilingQty',isNumber:true },
+  { label: _Names.floorQty, prop: "floorQty",isNumber:true},
   { label: _Names.isUsePercent, prop: 'isUsePercent', type: "filter", filters: "whetherOrNot" },
   { label: _Names.samplePercent, prop: 'samplePercent' },
-  { label: _Names.sampleQty, prop: 'sampleQty' },
+  { label: _Names.sampleQty, prop: 'sampleQty',isNumber:true },
   { label: _Public.remark, prop: "remark" },
   { label: _Public.creationTime, prop: "creationTime", type:'dateTime' },
   { label: _Public.lastModificationTime, prop: "lastModificationTime",  type:'dateTime' },
@@ -155,7 +155,7 @@ export const Bom = [
     type: "name"
   },
   { label: _Names.componentCode, prop: "component" },
-  { label: _Names.componentQty, prop: 'componentQty' },
+  { label: _Names.componentQty, prop: 'componentQty',isNumber:true },
   { label: _Names.componentUom, prop: 'componentUom' },
   { label: _Names.erpOp, prop: "erpOp" },
   { label: _Names.mfgOp, prop: "mfgOp" },
@@ -185,7 +185,7 @@ export const BomInner = [
     type: "name"
   },
   { label: _Names.componentCode, prop: "component" },
-  { label: _Names.componentQty, prop: 'componentQty' },
+  { label: _Names.componentQty, prop: 'componentQty',isNumber:true },
   { label: _Names.componentUom, prop: 'componentUom' },
   { label: _Names.erpOp, prop: "erpOp" },
   { label: _Names.mfgOp, prop: "mfgOp" },
@@ -255,7 +255,7 @@ export const CustomerItem = [
   },
   { label: _Names.customerItemCode, prop: "customerItemCode" },
   { label: _Names.itemCode, prop: "itemCode" },
-  { label: _Names.customerPackQty, prop: "customerPackQty" },
+  { label: _Names.customerPackQty, prop: "customerPackQty",isNumber:true },
   { label: _Names.customerPackUom, prop: "customerPackUom" },
   { label: _Public.beginTime, prop: "beginTime", type: "dateTime" },
   { label: _Public.endTime, prop: "endTime", type: "dateTime" },
@@ -370,7 +370,7 @@ export const SupplierItem = [
   { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
   { label: "备注", prop: "remark" },
   { label: "供应商包装计量单位", prop: "supplierPackUom" },
-  { label: "供应商包装数量", prop: "supplierPackQty" },
+  { label: "供应商包装数量", prop: "supplierPackQty",isNumber:true },
   // {
   //   label: "操作",
   //   type:"buttonOperation", 
@@ -573,9 +573,9 @@ export const ItemStoreRelation = [
   { label: "存储关系类型", prop: "storeRelationType", type: "filter", filters: "storeRelationType" },
   { label: "值", prop: "storeValue" },
   { label: "是否可用", prop: "enabled", type: "filter", filters: "whetherOrNot" },
-  { label: "主存储容量", prop: "umQty" },
+  { label: "主存储容量", prop: "umQty",isNumber:true },
   { label: "主存储单位", prop: "storeUM" },
-  { label: "次要存储容量", prop: "altUmQty" },
+  { label: "次要存储容量", prop: "altUmQty" ,isNumber:true},
   { label: "次要存储单位", prop: "altUm" },
   { label: "存储单位", prop: "pramaryUM", type: "filter", filters: "pramaryUm" },
   { label: "是否定制位置", prop: "isFixed", type: "filter", filters: "whetherOrNot" },
@@ -633,7 +633,7 @@ export const ItemSafetyStock = [
   { label: "最小库存", prop: "minStock" },
   { label: "安全库存", prop: "safetyStock" },
   { label: "补料点", prop: "feedLine" },
-  { label: "补料数量", prop: "feedQty" },
+  { label: "补料数量", prop: "feedQty",isNumber:true },
   { label: "补料单位", prop: "feedUM" },
   { label: "备注", prop: "remark" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
@@ -1186,7 +1186,7 @@ export const qualifiedInfo = [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "数量", prop: "qty" },
+  { label: "数量", prop: "qty",isNumber:true },
   { label: "物品单位", prop: "uom" },
   { label: "批次", prop: "lot" },
   { label: "箱码", prop: "packingCode" },
@@ -1201,8 +1201,8 @@ export const qualifiedInfo = [
   { label: "实际箱码", prop: "handledPackingCode" },
   { label: "推荐ERP库位", prop: "recommendToLocationErpCode" },
   { label: "实际ERP库位", prop: "handledToLocationErpCode" },
-  { label: "推荐数量", prop: "recommendQty" },
-  { label: "实际数量", prop: "handledQty" },
+  { label: "推荐数量", prop: "recommendQty",isNumber:true },
+  { label: "实际数量", prop: "handledQty",isNumber:true },
   { label: "推荐批次到货日期", prop: "recommendArriveDate",type: "dateTime" },
   { label: "实际批次到货日期", prop: "handledArriveDate",type: "dateTime" },
   { label: "生产时间", prop: "produceDate",type: "dateTime" },
@@ -1218,7 +1218,7 @@ export const qualifiedInfo = [
   { label: "实际库区", prop: "handledToLocationArea" },
   { label: "库位组", prop: "locationGroup" },
   { label: "实际库位组", prop: "handledToLocationGroup" },
-  { label: "标包数量", prop: "stdPackQty" },
+  { label: "标包数量", prop: "stdPackQty" ,isNumber:true},
   { label: "推荐批次排序", prop: "recommendLot" },
   { label: "实际批次排序", prop: "handledLot" },
   { label: "供应商批次", prop: "supplierBatch" },
@@ -1233,7 +1233,7 @@ export const qualifiedInfo = [
   { label: "不合格原因说明", prop: 'failedReason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" },
   { label: "质量缺陷", prop: "massDefect" },
   { label: "供应商包装计量单位", prop: "supplierPackUom" },
-  { label: "供应商包装数量", prop: "supplierPackQty" },
+  { label: "供应商包装数量", prop: "supplierPackQty",isNumber:true },
   // ************** 确认隐藏 ************************
   // { label: "status", prop: 'status' },
   // ************** 确认隐藏 ************************
@@ -1252,7 +1252,7 @@ export const unqualifiedInfo = [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "数量", prop: "qty" },
+  { label: "数量", prop: "qty",isNumber:true },
   { label: "物品单位", prop: "uom" },
   { label: "原箱箱码", prop: "fromPackingCode" },
   { label: "拆箱箱码", prop: "packingCode" },
@@ -1271,8 +1271,8 @@ export const unqualifiedInfo = [
   { label: "实际箱码", prop: "handledPackingCode" },
   { label: "推荐ERP库位", prop: "recommendToLocationErpCode" },
   { label: "实际ERP库位", prop: "handledToLocationErpCode" },
-  { label: "推荐数量", prop: "recommendQty" },
-  { label: "实际数量", prop: "handledQty" },
+  { label: "推荐数量", prop: "recommendQty",isNumber:true },
+  { label: "实际数量", prop: "handledQty" ,isNumber:true},
   { label: "推荐批次到货日期", prop: "recommendArriveDate",type: "dateTime" },
   { label: "实际批次到货日期", prop: "handledArriveDate",type: "dateTime" },
   { label: "生产时间", prop: "produceDate",type: "dateTime" },
@@ -1288,7 +1288,7 @@ export const unqualifiedInfo = [
   { label: "实际库区", prop: "handledToLocationArea" },
   { label: "库位组", prop: "locationGroup" },
   { label: "实际库位组", prop: "handledToLocationGroup" },
-  { label: "标包数量", prop: "stdPackQty" },
+  { label: "标包数量", prop: "stdPackQty",isNumber:true },
   { label: "批次排序", prop: "lot" },
   { label: "推荐批次排序", prop: "recommendLot" },
   { label: "实际批次排序", prop: "handledLot" },
@@ -1301,7 +1301,7 @@ export const unqualifiedInfo = [
   { label: "备注", prop: 'remark' },
   { label: "目检照片Json", prop: 'inspectPhotoJson' },
   { label: "供应商包装计量单位", prop: "supplierPackUom" },
-  { label: "供应商包装数量", prop: "supplierPackQty" },
+  { label: "供应商包装数量", prop: "supplierPackQty",isNumber:true },
   // ************** 确认隐藏 ************************
   // { label: "status", prop: 'status' },
   // ************** 确认隐藏 ************************
@@ -1326,9 +1326,9 @@ export const lackMaterialsInfo = [
   { label: "推荐ERP库位", prop: "recommendToLocationErpCode" },
   { label: "实际ERP库位", prop: "handledToLocationErpCode" },
   { label: "物品单位", prop: "uom" },
-  { label: "数量", prop: "qty" },
-  { label: "推荐数量", prop: "recommendQty" },
-  { label: "实际数量", prop: "handledQty" },
+  { label: "数量", prop: "qty",isNumber:true },
+  { label: "推荐数量", prop: "recommendQty",isNumber:true },
+  { label: "实际数量", prop: "handledQty",isNumber:true },
   { label: "到货日期", prop: "arriveDate",type: "dateTime" },
   { label: "推荐批次到货日期", prop: "recommendArriveDate",type: "dateTime" },
   { label: "实际批次到货日期", prop: "handledArriveDate",type: "dateTime" },
@@ -1346,7 +1346,7 @@ export const lackMaterialsInfo = [
   { label: "实际库区", prop: "handledToLocationArea" },
   { label: "库位组", prop: "locationGroup" },
   { label: "实际库位组", prop: "handledToLocationGroup" },
-  { label: "标包数量", prop: "stdPackQty" },
+  { label: "标包数量", prop: "stdPackQty",isNumber:true },
   { label: "推荐批次排序", prop: "recommendLot" },
   { label: "实际批次排序", prop: "handledLot" },
   { label: "供应商批次", prop: "supplierBatch" },
@@ -1361,7 +1361,7 @@ export const lackMaterialsInfo = [
   { label: "不合格原因说明", prop: 'failedReason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" },
   { label: "质量缺陷", prop: "massDefect" },
   { label: "供应商包装计量单位", prop: "supplierPackUom" },
-  { label: "供应商包装数量", prop: "supplierPackQty" },
+  { label: "供应商包装数量", prop: "supplierPackQty",isNumber:true },
   // ************** 确认隐藏 ************************
   // { label: "status", prop: 'status' },
   // ************** 确认隐藏 ************************
@@ -1443,7 +1443,7 @@ export const unqualifiedToQualified = [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "数量", prop: "qty" },
+  { label: "数量", prop: "qty",isNumber:true },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: "lot" },
   { label: "箱码", prop: "packingCode" },
@@ -1451,7 +1451,7 @@ export const unqualifiedToQualified = [
   { label: "入库时间", prop: 'putInTime',type: "dateTime" },
   { label: "备注", prop: 'remark' },
   { label: "ERP储位", prop: "locationErpCode" },
-  { label: "标包数量", prop: "stdPackQty" },
+  { label: "标包数量", prop: "stdPackQty",isNumber:true },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
   { label: "供应商批次", prop: 'supplierBatch' },
   { label: "到货日期", prop: 'arriveDate', type: "dateTime" },
@@ -2337,12 +2337,12 @@ export const customerDismantleBackFlushNote = [
   { label: "退拆物品号", prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "预定开工日", prop: "preStartTime" ,type: "dateTime", },
-  { label: "退拆数量", prop: "qty" },
+  { label: "退拆数量", prop: "qty",isNumber:true },
   { label: "扣账库位", prop: 'locationCode' },
   { label: "转移工时", prop: 'workHour' },
   { label: "缴库库位", prop: 'rawLocationCode' },
   { label: "转移料号（子零件号）", prop: 'rawItemCode' },
-  { label: "转移量（子零件）", prop: 'rawQty' },
+  { label: "转移量（子零件）", prop: 'rawQty',isNumber:true },
 ]
 // 生产退库申请 20230415
 export const productionReturnRequest =  [
@@ -2553,7 +2553,7 @@ export const labelsList =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "数量", prop: "qty" },
+  { label: "数量", prop: "qty",isNumber:true },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: "lot" },
   { label: "库位", prop: "recommendLocationCode" },
@@ -2575,7 +2575,7 @@ export const labelsList =  [
   { label: "上次修改时间", prop: "lastModificationTime",type:"dateTime" },
   { label: "完整条码文本", prop: "fullBarcodeString" },
   { label: "供应商批次", prop: 'supplierBatch' },
-  { label: "标包数量", prop: 'stdPackQty' },
+  { label: "标包数量", prop: 'stdPackQty',isNumber:true },
   { label: "器具号", prop: 'containerCode' },
   { label: "质量级别", prop: "qLevel" },
   { label: "质检文件", prop: "qualityFile" },
@@ -2615,7 +2615,7 @@ export const InventoryBalance = [
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
   { label: "配置", prop: "item_configurationFromFE" },
-  { label: "库存数量", prop: "qty" },
+  { label: "库存数量", prop: "qty",isNumber:true },
   { label: "计量单位", prop: "uom" },
   { label: "批次", prop: "lot" },
   { label: "库位代码", prop: "locationCode" },
@@ -2631,7 +2631,7 @@ export const InventoryBalance = [
   { label: "最后盘点时间", prop: "lastCountTime",type: "dateTime" },
   { label: "最后盘点计划单号", prop: "lastCountPlanNumber",width: orderWidth },	
   { label: "最后盘点标签", prop: "lastCountLabel" },
-  { label: "标包数量", prop: "stdPackQty" },
+  { label: "标包数量", prop: "stdPackQty",isNumber:true },
   { label: "库位组", prop: "locationGroup" },
   { label: "库区", prop: "locationArea" },
   { label: "管理类型", prop: "manageType", type: "filter", filters: "manageType" },
@@ -2657,7 +2657,7 @@ export const InventoryBalanceActive = [
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
   { label: "配置", prop: "item_configurationFromFE" },
-  { label: "库存数量", prop: "qty" },
+  { label: "库存数量", prop: "qty",isNumber:true },
   { label: "计量单位", prop: "uom" },
   { label: "批次", prop: "lot" },
   { label: "库位代码", prop: "locationCode" },
@@ -2673,7 +2673,7 @@ export const InventoryBalanceActive = [
   { label: "最后盘点时间", prop: "lastCountTime",type: "dateTime" },
   { label: "最后盘点计划单号", prop: "lastCountPlanNumber",width: orderWidth },	
   { label: "最后盘点标签", prop: "lastCountLabel" },
-  { label: "标包数量", prop: "stdPackQty" },
+  { label: "标包数量", prop: "stdPackQty",isNumber:true },
   { label: "库位组", prop: "locationGroup" },
   { label: "库区", prop: "locationArea" },
   { label: "管理类型", prop: "manageType", type: "filter", filters: "manageType" },
@@ -2704,7 +2704,7 @@ export const InventoryTransaction = [
   { label: "子事务类型", prop: "transSubType", type: "filter", filters: "transSubType" },
   { label: "出库/入库", prop: "transInOut",type: "filter", filters: "transInOutStatus" },
   { label: "接口对应类型", prop: "interfaceType", width: '360px', showProp: true },
-  { label: "事务数量", prop: "qty" },
+  { label: "事务数量", prop: "qty",isNumber:true },
   { label: "箱码", prop: "packingCode" },
   { label: "ERP储位", prop: "locationErpCode" },
   { label: "库位代码", prop: "locationCode" },
@@ -2720,7 +2720,7 @@ export const InventoryTransaction = [
   { label: "到货日期", prop: "arriveDate",type: "dateTime" },
   { label: "生产日期", prop: "produceDate",type: "dateTime" },
   { label: "过期时间", prop: "expireDate",type: "dateTime" },
-  { label: "标包数量", prop: "stdPackQty" },
+  { label: "标包数量", prop: "stdPackQty",isNumber:true },
   { label: "管理类型", prop: "manageType", type: "filter", filters: "manageType" },
   { label: "供应商批次", prop: "supplierBatch" },
   { label: "备注", prop: "remark" },
@@ -2755,7 +2755,7 @@ export const InventoryTransferLog =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "到货数量", prop: "qty" },
+  { label: "到货数量", prop: "qty",isNumber:true },
   { label: "到货单位", prop: "uom" },
   { label: "从库位代码", prop: "fromLocationCode" },
   { label: "到库位代码", prop: "toLocationCode" },
@@ -2768,7 +2768,7 @@ export const InventoryTransferLog =  [
   { label: "操作员", prop: "worker" },
   { label: "单据号", prop: "docNumber" },
   { label: "任务编号", prop: "jobNumber" },
-  { label: "标包数", prop: "stdPackQty" },
+  { label: "标包数", prop: "stdPackQty",isNumber:true },
   { label: "从排序批次", prop: "fromLot" },
   { label: "到排序批次", prop: 'toLot' },
   { label: "供应商批次", prop: "supplierBatch" },
@@ -2806,7 +2806,7 @@ export const expectOut = [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "占用数量", prop: "qty" },
+  { label: "占用数量", prop: "qty",isNumber:true },
   { label: "计量单位", prop: "uom" },
   { label: "库位代码", prop: "locationCode" },
   { label: "箱码", prop: "packingCode" },
@@ -2841,7 +2841,7 @@ export const expectIn = [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "占用数量", prop: "qty" },
+  { label: "占用数量", prop: "qty",isNumber:true },
   { label: "计量单位", prop: "uom" },
   { label: "库位代码", prop: "locationCode" },
   { label: "箱码", prop: "packingCode" },
@@ -2888,16 +2888,36 @@ export const safetyStockWarning =  [
 // 拆箱记录
 export const splitPackingList =  [
   {
-    label: "单号",
-    prop: "number",
+    label: "物品代码",
+    prop: "itemCode",
     fixed: "left",
     type: "name"
   },
-  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
-  { label: "创建时间", prop: 'creationTime', type:'dateTime' },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
+  { label: "原箱箱码", prop: "fromPackingCode" },
+  { label: "目标箱码", prop: "toPackingCode" },
+  { label: "原数量", prop: "fromQty",isNumber:true },
+  { label: "目标数量", prop: "toQty",isNumber:true },
+  { label: "原顶级箱码", prop: "fromTopPackingCode" },
+  { label: "目标顶级箱码", prop: "toTopPackingCode" },
+  { label: "原标包数量", prop: "fromStdPackQty",isNumber:true },
+  { label: "目标标包数量", prop: "toStdPackQty",isNumber:true },
+  { label: "原计量单位", prop: "fromUom" },
+  { label: "目标计量单位", prop: "toUom" },
+  { label: "原批次", prop: "fromLot" },
+  { label: "目标批次", prop: "toLot" },
+  { label: "类型", prop: "labelType", type: "filter", filters: "labelTypeStatus" },
+  { label: "采购订单", prop: "purchaseInfo_PoNumber" },
+  { label: "供应商发货单", prop: "purchaseInfo_AsnNumber" },
+  { label: "到货通知单", prop: "arrivalNoticNumber" },
+  { label: "任务单", prop: "taskOrderNumber" },
+  { label: "收货记录单", prop: "receiptRecNumber" },
+  { label: "上架单", prop: "putOnShelfNumber" },
   { label: "备注", prop: 'remark' },
-  { label: "操作员", prop: 'worker' },
-  // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "创建时间", prop: 'creationTime', type:'dateTime' },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
 ]
 
 // 非生产领料申请 20230417
@@ -3971,7 +3991,7 @@ export const PositionCode = [
   { label: _Names.itemDesc1, prop: "partDesc" },
   // { label: _Names.itemDesc2, prop: "desc2" },
   { label: _Names.basicUom, prop: "basicUom" },
-  { label: _Names.stdPackQty, prop: "stdPackQty" },
+  { label: _Names.stdPackQty, prop: "stdPackQty",isNumber:true },
   { label: _Names.locationCode, prop: "locationCode" },
   { label: _Names.locationName, prop: "locationName" },
   { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
@@ -3987,7 +4007,7 @@ export const Utensil = [
     fixed: "left",
     type: "name"
   },
-  { label: _Names.stdPackQty, prop: "stdQty" },
+  { label: _Names.stdPackQty, prop: "stdQty",isNumber:true },
   { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
   { label: '创建人', prop: "creator" },
   { 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 cc617c020..2c149c36b 100644
--- a/fe/PC/src/utils/tabsDesTions/index.js
+++ b/fe/PC/src/utils/tabsDesTions/index.js
@@ -2103,16 +2103,36 @@ export const safetyStockWarning =  [
 // 拆箱记录
 export const splitPackingList =  [
   {
-    label: "单号",
-    prop: "number",
+    label: "物品代码",
+    prop: "itemCode",
     fixed: "left",
     type: "name"
   },
-  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
-  { label: "创建时间", prop: 'creationTime', type:'dateTime' },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
+  { label: "原箱箱码", prop: "fromPackingCode" },
+  { label: "目标箱码", prop: "toPackingCode" },
+  { label: "原数量", prop: "fromQty" },
+  { label: "目标数量", prop: "toQty" },
+  { label: "原顶级箱码", prop: "fromTopPackingCode" },
+  { label: "目标顶级箱码", prop: "toTopPackingCode" },
+  { label: "原标包数量", prop: "fromStdPackQty" },
+  { label: "目标标包数量", prop: "toStdPackQty" },
+  { label: "原计量单位", prop: "fromUom" },
+  { label: "目标计量单位", prop: "toUom" },
+  { label: "原批次", prop: "fromLot" },
+  { label: "目标批次", prop: "toLot" },
+  { label: "类型", prop: "labelType", type: "filter", filters: "labelTypeStatus" },
+  { label: "采购订单", prop: "purchaseInfo_PoNumber" },
+  { label: "供应商发货单", prop: "purchaseInfo_AsnNumber" },
+  { label: "到货通知单", prop: "arrivalNoticNumber" },
+  { label: "任务单", prop: "taskOrderNumber" },
+  { label: "收货记录单", prop: "receiptRecNumber" },
+  { label: "上架单", prop: "putOnShelfNumber" },
   { label: "备注", prop: 'remark' },
-  { label: "操作员", prop: 'worker' },
-  // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "创建时间", prop: 'creationTime', type:'dateTime' },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
 ]
 
 // 非生产领料申请 20230417
diff --git a/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue b/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue
index 16d0ffb03..34b344a12 100644
--- a/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue
+++ b/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue
@@ -198,6 +198,7 @@ export default {
         concurrencyStamp: null,
         isPhantom: null,
         stdPackQty: null,
+        price:null,//todo:价格字段确定
       },
       editOptions: {},
       CreateForm: [
@@ -248,6 +249,8 @@ export default {
         { type: "select", label: "外包件", prop: "canOutsourcing", options: "whetherOrNot", disabled: true, colSpan: 12 },
         { type: "select", label: "回收件", prop: "isRecycled", options: "whetherOrNot", disabled: true, colSpan: 12 },
         // { type: "input", label: "产品类", prop: "productLine", colSpan: 12 },
+        // todo:字段确定
+        { type:"inputNumber", label:"价格", prop:"price", disabled:true, colSpan: 12 },
         { type: "input", label: "有效期", prop: "validity", validType:'number', colSpan: 12 },
         { type: "select", label: "有效期单位", prop: "validityUnit", options: "validityUnit", colSpan: 12 },
         { type: "select", label: "管理类型", prop: "manageType", options: "manageType", colSpan: 12 },
diff --git a/fe/PC/src/views/basicData/ItemsManage/Utensil.vue b/fe/PC/src/views/basicData/ItemsManage/Utensil.vue
index 5fcd48644..e6d853639 100644
--- a/fe/PC/src/views/basicData/ItemsManage/Utensil.vue
+++ b/fe/PC/src/views/basicData/ItemsManage/Utensil.vue
@@ -148,13 +148,24 @@ export default {
         concurrencyStamp: ""
       },
       editOptions: {},
+      // todo:1、列表与详情添加尺寸和类型字段，标包字段是否去掉
       CreateForm: [
         { type: "prefixInput", label: "器具号", prop: "codeSuffix",prefixProp:"type",prefixWidth:'50px',prefixDisabled:true, colSpan: 12 },
+        //todo:获取字典,字段确定
+        { type: "select", label: "尺寸", prop: "size", colSpan: 12 },
+        // todo:确定枚举（内物流，客户）,字段确定
+        { type: "select",options: "utensilType", label: "类型", prop: "type2", colSpan: 12 },
+        //todo：标包数量是否去掉
         { type: "inputNumber", label: "标包数量", prop: "stdQty", colSpan: 12, min:1 },
         { type: "input", label: "备注", prop: "remark", colSpan: 12 },
       ],
       editForm: [
         { disabled:true,type: "prefixInput", label: "器具号", prop: "codeSuffix",prefixProp:"type",prefixWidth:'50px',prefixDisabled:true, colSpan: 12 },
+        //todo:获取字典,字段确定
+        { type: "select", label: "尺寸", prop: "size", colSpan: 12 },
+        // todo:确定枚举（内物流，客户）,字段确定
+        { type: "select",options: "utensilType", label: "类型", prop: "type2", colSpan: 12 },
+        //todo：标包数量是否去掉
         { type: "inputNumber", label: "标包数量", prop: "stdQty", colSpan: 12, min:1 },
         { type: "input", label: "备注", prop: "remark", colSpan: 12 },
       ],
diff --git a/fe/PC/src/views/inventoryManage/InventoryQuery/splitPackingList.vue b/fe/PC/src/views/inventoryManage/InventoryQuery/splitPackingList.vue
index 4ec6fccfe..e29502620 100644
--- a/fe/PC/src/views/inventoryManage/InventoryQuery/splitPackingList.vue
+++ b/fe/PC/src/views/inventoryManage/InventoryQuery/splitPackingList.vue
@@ -1,151 +1,112 @@
 <template>
-    <div class="page-box" v-loading="Loading.appMainLoading">
-      <tablePagination
-        :currenButtonData="currenButtonData"
-        :tableData="tableData"
-        :tableLoading="Loading.tableLoading"
-        :tableColumns="tableColumns"
-        @rowDrop="rowDrop"
-        :tableSelection="false"
-        :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="[]"
-        @drawerShut="(val) => (displayDialog.detailsDialog = val)"
-        @handleCommand="drawerHandle"
-        @close-value="closeValue"
-        :currenButtonData="currenButtonData"
-        :tableColumns="detailsTableColumns"
-        @handleSelectionChange="handleSelectionChange"
-        @inlineDialog="inlineDialog"
-        :totalCount="totalCountDetails"
-        :MaxResultCount="MaxResultCountDetails"
-        @alterResultCountDetails="alterResultCountDetails"
-        @alertoldSkipCountDetails="alertoldSkipCountDetails"
-      ></curren-Drawer>
-    </div>
-  </template>
-  <script>
-  import { getPageListWip } 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: "splitPackingList",
-    mixins: [
-      tableMixins,
-      LoadingMixins,
-      drawerMixins,
-      TableHeaderMixins,
-      mixins,
-    ],
-    computed: {
-      editDialog: {
-        get: function () {
-          return this.displayDialog.newDialog || this.displayDialog.editDialog;
-        },
+  <div class="page-box" v-loading="Loading.appMainLoading">
+    <tablePagination
+      :currenButtonData="currenButtonData"
+      :tableData="tableData"
+      :tableLoading="Loading.tableLoading"
+      :tableColumns="tableColumns"
+      @rowDrop="rowDrop"
+      :tableSelection="false"
+      :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="[]"
+      @drawerShut="(val) => (displayDialog.detailsDialog = val)"
+      @handleCommand="drawerHandle"
+      @close-value="closeValue"
+      :currenButtonData="currenButtonData"
+      :tableColumns="detailsTableColumns"
+      @handleSelectionChange="handleSelectionChange"
+      @inlineDialog="inlineDialog"
+      :totalCount="totalCountDetails"
+      :MaxResultCount="MaxResultCountDetails"
+      @alterResultCountDetails="alterResultCountDetails"
+      @alertoldSkipCountDetails="alertoldSkipCountDetails"
+    ></curren-Drawer>
+  </div>
+</template>
+<script>
+import { getPageListWip } 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: "splitPackingList",
+  mixins: [
+    tableMixins,
+    LoadingMixins,
+    drawerMixins,
+    TableHeaderMixins,
+    mixins,
+  ],
+  computed: {
+    editDialog: {
+      get: function () {
+        return this.displayDialog.newDialog || this.displayDialog.editDialog;
       },
     },
-    data () {
-      return {
-        URL: 'wms/store/transfer-note/get-split-packing-list',
-        // listURL:'basedata/split-packing-rec/get-all?includeDetails=false',
-        listURL:'wms/store/transfer-note/split-packing-inspect?includeDetails=true',
-        //常用按钮数据
-        currenButtonData: [
-          // this.defaultImportBtn(),//导入
-          this.defaultExportBtn(),//导出
-          this.defaultFieldSettingBtn(),//字段设置
-          this.defaultFreshBtn(),//刷新
-          this.defaultFilterBtn(),//筛选
-        ],
-      };
-    },
-    mounted () {
-      this.paging();
-    },
-    methods:{
-      //渲染数据
-      // paging(callback) {
-      //   this.Loading.tableLoading = true;
-      //   this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount,
-      //   getPageListWip(this.PageListParams, 'wms/store/transfer-note/split-packing-inspect?includeDetails=true')
-      //     .then(res => {
-      //       this.tableData = res.items
-      //       this.totalCount = res.totalCount
-      //       this.pagingCallback(callback)
-      //     })
-      //     .catch(err => {
-      //       this.Loading.tableLoading = false
-      //     })
-      // },
-      // 重新渲染详情
-      inlineDialog(val) {
-        //打开抽屉
-        this.Loading.DrawerLoading = true
-        this.displayDialog.detailsDialog = true;
-        this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount,
-        this.PageListParams.condition = {filters:[ {
-            logic: "And",
-            column: "number",
-            action: "==",
-            value: val.number
-        }]}
-        getPageListWip(this.PageListParams, 'wms/store/transfer-note/get-split-packing-list?includeDetails=true').then(res => {
-          this.propsData = res.items[0]
-          this.totalCountDetails = 1
-          this.Loading.DrawerLoading = false
-        }).catch(err => {
-          this.Loading.DrawerLoading = false
-        })
-      },
-    }
-  };
-  </script>
-  <style lang="scss" scoped>
-  @import "../../../styles/mainbasicData.scss";
-  </style>
-  <style lang="scss">
-  // .SupplierAsnPage{
-  //   .el-dialog__body{
-  //     padding-top:10px !important
-  //   }
-  // }
-  </style>
-  
\ No newline at end of file
+  },
+  data () {
+    return {
+      URL: 'basedata/split-packing-rec',
+      //常用按钮数据
+      currenButtonData: [
+        // this.defaultImportBtn(),//导入
+        this.defaultExportBtn(),//导出
+        this.defaultFieldSettingBtn(),//字段设置
+        this.defaultFreshBtn(),//刷新
+        this.defaultFilterBtn(),//筛选
+      ],
+    };
+  },
+  mounted () {
+    this.paging();
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "../../../styles/mainbasicData.scss";
+</style>
+<style lang="scss">
+// .SupplierAsnPage{
+//   .el-dialog__body{
+//     padding-top:10px !important
+//   }
+// }
+</style>
diff --git a/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentFunc.vue b/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentFunc.vue
index a479b857f..3690cb13a 100644
--- a/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentFunc.vue
+++ b/fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentFunc.vue
@@ -199,6 +199,7 @@ export default {
         { label: "库位", prop: "locationCode", width:"auto" },
         // todo: 小于等于库存数量
         { type: "input", validType:'pointNumber', label: "数量", prop: "qty", width:"auto",
+          rules: detailsRules.numberInput
           // rules:  [{
           //   type: "number",
           //   trigger: "blur",
diff --git a/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue b/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue
index be93b1024..88bf86b08 100644
--- a/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue
+++ b/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue
@@ -545,7 +545,19 @@ export default {
         // { label: "单位", prop: "receiveUom", width:'100%' },
         { label: "收货数量", prop: "receiveQty", width:'100%' },
         { label: "状态", prop: "detailInspectStatus", type: "filter", filters: "detailInspectStatus", width:'100%' },
-        { type: "button", label: "拆箱", alwaysShow:true, width:'130px' },
+        { type: "button", 
+          label: "拆箱", 
+          alwaysShow:true, 
+          width:'130px',
+          hasButton:((scope,item)=>{
+            if(scope.row.detailInspectStatus != 1){
+              return false
+            }else{
+              return true
+            }
+            console.log(553,scope,item)
+          })
+        },
         { type: "button", label: "检验", prop: "buttonHide",alwaysShow:true, width:'130px' },
         { type: "button", label: "清除检验", alwaysShow:true,width:'150px' },
       ],