diff --git a/fe/PC/src/components/currenDescriptions/index.vue b/fe/PC/src/components/currenDescriptions/index.vue
index 76ce90ff0..e682f9b5d 100644
--- a/fe/PC/src/components/currenDescriptions/index.vue
+++ b/fe/PC/src/components/currenDescriptions/index.vue
@@ -27,7 +27,7 @@
         {{ propsData[item.prop] ? JSON.parse(propsData[item.prop]).join(",") : '' }}
       </span>
       <span v-else-if="item.type == 'price'">
-        {{ (propsData[item.prop]).toFixed(item.pointe || 2) }}
+        {{ Number(propsData[item.prop]).toFixed(item.pointe || 2) }}
       </span>  
       <span v-else-if="item.type && item.type == 'object'">
         {{ propsData[item.prop]?propsData[item.prop][item.showProp]:"" }}
diff --git a/fe/PC/src/components/currenTable/index.vue b/fe/PC/src/components/currenTable/index.vue
index db717e828..29c0c6578 100644
--- a/fe/PC/src/components/currenTable/index.vue
+++ b/fe/PC/src/components/currenTable/index.vue
@@ -273,7 +273,7 @@
           >{{item.label}}</el-button>
         </el-form-item>
         <span v-if="item.type == 'price'">
-          {{ (scope.row[item.prop]).toFixed(item.pointe || 2) }}
+          {{ Number(scope.row[item.prop]).toFixed(item.pointe || 2) }}
         </span>  
         <span v-if="item.type == 'object'">
           {{ scope.row[item.prop] ? scope.row[item.prop][item.showProp] : "" }}
diff --git a/fe/PC/src/components/filterSelect/index.vue b/fe/PC/src/components/filterSelect/index.vue
index 4df214636..734070ba3 100644
--- a/fe/PC/src/components/filterSelect/index.vue
+++ b/fe/PC/src/components/filterSelect/index.vue
@@ -141,9 +141,12 @@ export default {
               _params.condition.filters.push({logic:"And",column:_column,action:"Like",value:_value})
             }
             // 多选
-            // else{
-            //   _params.condition.filters.push({logic:"And",column:_column,action:"In",value:JSON.stringify(_value)})
-            // }
+            else{
+              // _params.condition.filters.push({logic:"And",column:_column,action:"In",value:JSON.stringify(_value)})
+              if(query && query != ""){
+                _params.condition.filters.push({logic:"And",column:_column,action:"Like",value:query})
+              }
+            }
           }
         }
         // api中《getPage》方式：在业务页面调用getFilterList时候  自行传第二个val值
diff --git a/fe/PC/src/components/umyTable/index.vue b/fe/PC/src/components/umyTable/index.vue
index 131987d53..538d3f2bd 100644
--- a/fe/PC/src/components/umyTable/index.vue
+++ b/fe/PC/src/components/umyTable/index.vue
@@ -274,7 +274,7 @@
             >{{itemButton}}</el-button>
           </div>
           <span v-if="item.type == 'price'">
-            {{ (scope.row[item.prop]).toFixed(item.pointe || 2) }}
+            {{ Number(scope.row[item.prop]).toFixed(item.pointe || 2) }}
           </span> 
           <span v-if="item.type == 'object'">
             {{ scope.row[item.prop] ? scope.row[item.prop][item.showProp] : "" }}
diff --git a/fe/PC/src/mixins/TableMixins.js b/fe/PC/src/mixins/TableMixins.js
index 6281f437b..fc2cb70b4 100644
--- a/fe/PC/src/mixins/TableMixins.js
+++ b/fe/PC/src/mixins/TableMixins.js
@@ -171,12 +171,16 @@ export const tableMixins = {
       for(let i=0;i<this.tableColumns.length;i++){
         if(this.tableColumns[i].prop == 'supplierName' || this.tableColumns[i].prop == "supplierAddress"){
           let _allSuCode = []
+          let _allSuNames = 0
           this.tableData.forEach((item)=>{
             if(item.supplierCode && item.supplierCode.length > 0 && _allSuCode.indexOf(item.supplierCode) < 0){
               _allSuCode.push(item.supplierCode)
             }
+            if(item.supplierName && item.supplierName.length > 0){
+              _allSuNames ++
+            }
           })
-          if(_allSuCode.length <= 0){
+          if(_allSuCode.length <= 0 || _allSuNames > 0){
             this.Loading.tableLoading = false
             return
           }
@@ -208,44 +212,69 @@ export const tableMixins = {
      * 获取物品信息-逐条过滤到主表或者明细表
      * 明细或者主表单行数据添加所需要的值
      * @param {*} type 是更改主表（table）还是明细表(detail)
-     * 要追加的值取showTableBaseFromFE（主表）、showDetailBaseFromFE（明细），参数是基础表的参数，如code，而不是itemCode
+     * 要追加的值取showTableBaseFromFE（主表+详情）、showDetailBaseFromFE（明细），参数是基础表的参数，如code，而不是itemCode
      * 添加到表头的格式为item+追加的参数+FromFE   (例如：item_desc2FromFE)
      */
-    getItemInfoByItemCodeHandle(type) {
+     getItemInfoByItemCodeHandle(type) {
       let _data = {
         condition: {filters: []},
         Sorting: "",
         SkipCount: 0,
         MaxResultCount: 1000
       }
-      // 主表
-      let _mainData = type == 'table' ? this.tableData : this.propsData.details
-      let _arrFromFE = type == 'table' ? this.showTableBaseFromFE : this.showDetailBaseFromFE
-      _mainData.forEach((item)=>{
-        let _filt = {
+      let _arrFromFE = type == 'table' || type == 'props' ? this.showTableBaseFromFE : this.showDetailBaseFromFE
+      // 主表+明细表
+      if(type != 'props'){
+        let _mainData = type == 'table' ? this.tableData : this.propsData.details
+        _mainData.forEach((item)=>{
+          let _filt = {
+            logic: 'Or',
+            column: "code",
+            action: "==",
+            value: item.itemCode
+          }
+          _data.condition.filters.push(_filt)
+        })
+        getPageList(_data, 'basedata/item-basic').then(res => {
+          _mainData.forEach(item=>{
+            let _config = res.items.filter(base=>{
+              return base.code == item.itemCode
+            })
+            if(_config && _config.length > 0){
+              _arrFromFE.forEach(fe=>{
+                this.$set(item,"item_"+fe+"FromFE", _config[0][fe])
+              })
+            }
+          })
+          this.$forceUpdate()
+          this.Loading.DrawerLoading = false
+        }).catch(err => {
+          this.Loading.DrawerLoading = false
+        })
+      }
+      // 详情
+      else{
+        _data.condition.filters.push({
           logic: 'Or',
           column: "code",
           action: "==",
-          value: item.itemCode
-        }
-        _data.condition.filters.push(_filt)
-      })
-      getPageList(_data, 'basedata/item-basic').then(res => {
-        _mainData.forEach(item=>{
+          value: this.propsData.itemCode
+        })
+        getPageList(_data, 'basedata/item-basic').then(res => {
           let _config = res.items.filter(base=>{
-            return base.code == item.itemCode
+            return base.code == this.propsData.itemCode
           })
           if(_config && _config.length > 0){
             _arrFromFE.forEach(fe=>{
-              this.$set(item,"item_"+fe+"FromFE", _config[0][fe])
+              this.$set(this.propsData,"item_"+fe+"FromFE", _config[0][fe])
             })
           }
+          this.$forceUpdate()
+          this.Loading.DrawerLoading = false
+        }).catch(err => {
+          this.Loading.DrawerLoading = false
         })
-        this.$forceUpdate()
-        this.Loading.DrawerLoading = false
-      }).catch(err => {
-        this.Loading.DrawerLoading = false
-      })
+      }
     },
     // 获取供应商信息过滤propsData
     getSupplierByCodesHandle_props() {
@@ -254,6 +283,10 @@ export const tableMixins = {
           this.Loading.DrawerLoading = false
           return
         }
+        if(this.propsData.supplierName){
+          this.Loading.DrawerLoading = false
+          return
+        }
         if(this.tabsDesTions[i].prop == 'supplierName' || this.tabsDesTions[i].prop == "supplierAddress"){
           let _allSuCode = [this.propsData.supplierCode]
           this.Loading.DrawerLoading = true
@@ -328,19 +361,27 @@ export const tableMixins = {
         this.getItemInfoByItemCodeHandle('table')
       }
       if(callback)callback()
-      // this.getSupplierByCodesHandle_table()
+      this.getSupplierByCodesHandle_table()
     },
     // 点击抽屉，获取明细后全局通用操作
     inlineDialogCallback(){
       if(this.inlineDialogCallbackUser){this.inlineDialogCallbackUser()}
       // 如果业务页面设置showDetailBaseFromFE为空，detailsTableColumns.js别忘了删除配置项
-      if(this.showDetailBaseFromFE && this.showDetailBaseFromFE.length > 0){
-        this.getItemInfoByItemCodeHandle('detail')
+      if(
+        (this.showDetailBaseFromFE && this.showDetailBaseFromFE.length > 0) || 
+        (this.showTableBaseFromFE && this.showTableBaseFromFE.length > 0)
+      ){
+        if(this.showTableBaseFromFE && this.showTableBaseFromFE.length > 0){
+          this.getItemInfoByItemCodeHandle('props')
+        }
+        if(this.showDetailBaseFromFE && this.showDetailBaseFromFE.length > 0){
+          this.getItemInfoByItemCodeHandle('detail')
+        }
       }
       else{
         this.Loading.DrawerLoading = false
       }
-      // this.getSupplierByCodesHandle_props()
+      this.getSupplierByCodesHandle_props()
     }
   }
 }
diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js
index 041252fca..6d5ea01f5 100644
--- a/fe/PC/src/utils/detailsTableColumns/index.js
+++ b/fe/PC/src/utils/detailsTableColumns/index.js
@@ -3518,7 +3518,7 @@ export const Kitting = [
   { label: _Names.itemDesc1, prop: "itemDesc1" },
   { label: _Names.itemDesc2, prop: "itemDesc2" },
   { label: '配置', prop: "conf" },
-  { label: '包装数量', prop: "qty" },
+  { label: '数量', prop: "qty" },
   { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
   { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
   { label: _Public.remark, prop: "remark" },
diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index ae8eaadc6..e407f6572 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -128,8 +128,13 @@ export const ItemContainer =  [
     fixed: "left",
     type: "name" 
   },
-  { label: "物料代码", prop: "itemCode" },
-  { label: '收容数量', prop: "qty" },
+  { label: "收容代码描述", prop: "containerName" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "item_nameFromFE",showProp:true },
+  { label: "物品描述1", prop: "item_desc1FromFE",showProp:true },
+  { label: "物品描述2", prop: "item_desc2FromFE",showProp:true },
+  { label: "配置", prop: "item_configurationFromFE",showProp:true },
+  { label: '转储标包数量', prop: "qty" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
   { label: "备注", prop: 'remark', colSpan: 12 },
@@ -704,7 +709,11 @@ export const TransactionType = [
 // 库存开账
 export const InventoryBilling = [
   { label: "物品代码", prop: "itemCode", type: "name" },
-  { label: "ERP系统库位代码", prop: "erpLocationCode",width:"180px" },
+  { label: "物品名称", prop: "item_nameFromFE",showProp:true },
+  { label: "物品描述1", prop: "item_desc1FromFE",showProp:true },
+  { label: "物品描述2", prop: "item_desc2FromFE",showProp:true },
+  { label: "配置", prop: "item_configurationFromFE",showProp:true },
+  { label: "TYRP储位代码", prop: "erpLocationCode",width:"180px" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
   { label: "备注", prop: "remark" },
@@ -736,7 +745,7 @@ 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: "locationCode" },
   { label: "描述", prop: "description" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
@@ -748,9 +757,9 @@ export const ProductionLineItem = [
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
   { label: "生产线代码", prop: "prodLineCode" },
-  { 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: "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" },
@@ -1014,6 +1023,10 @@ export const StdCostPriceSheet = [
     prop: "itemCode",
     width:"200px"
   },
+  { label: "物品名称", prop: "item_nameFromFE",showProp:true },
+  { label: "物品描述1", prop: "item_desc1FromFE",showProp:true },
+  { label: "物品描述2", prop: "item_desc2FromFE",showProp:true },
+  { label: "配置", prop: "item_configurationFromFE",showProp:true },
   { label: "标准成本价格", prop: "stdCostPrice",type:"price" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
   { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
@@ -1028,6 +1041,10 @@ export const PurchasePriceSheet = [
     prop: "itemCode",
     width:"200px"
   },
+  { label: "物品名称", prop: "item_nameFromFE",showProp:true },
+  { label: "物品描述1", prop: "item_desc1FromFE",showProp:true },
+  { label: "物品描述2", prop: "item_desc2FromFE",showProp:true },
+  { label: "配置", prop: "item_configurationFromFE",showProp:true },
   { label: "供应商编号", prop: "supplierCode" },
   { label: "采购价格", prop: "purchasePrice",type:"price" },
   { label: "价格单描述", prop: "description" },
@@ -1044,6 +1061,10 @@ export const SalePriceSheet = [
     prop: "itemCode",
     width:"200px"
   },
+  { label: "物品名称", prop: "item_nameFromFE",showProp:true },
+  { label: "物品描述1", prop: "item_desc1FromFE",showProp:true },
+  { label: "物品描述2", prop: "item_desc2FromFE",showProp:true },
+  { label: "配置", prop: "item_configurationFromFE",showProp:true },
   { label: "客户代码", prop: "customerCode" },
   { label: "销售价格", prop: "salePrice",type:"price" },
   { label: "价格单描述", prop: "description" },
@@ -1170,8 +1191,8 @@ export const PurchaseReceiptRequest = [
   { label: "订单号", prop: "poNumber",width: orderWidth },
   { label: "发货单号", prop: 'asnNumber',width: orderWidth },
   { label: "供应商代码", prop: "supplierCode" },
-  { label: "供应商名称", prop: "supplierName",showProp: true },
-  { label: "供应商地址", prop: "supplierAddress",showProp: true },
+  { label: "供应商名称", prop: "supplierName" },
+  { label: "供应商地址", prop: "supplierAddress" },
   { label: "计划到货日期", prop: "planArriveDate", type: "dateTime" },
   { label: "订单备注", prop: 'remark' },
   { label: "创建时间", prop: 'creationTime', type:'dateTime' },
@@ -1205,7 +1226,7 @@ export const PurchaseReceiptJob =  [
   { label: "采购订单号", prop: "poNumber", width: orderWidth },
   { label: "供应商代码", prop: "supplierCode" },
   { label: "供应商名称", prop: "supplierName" },
-  { label: "供应商地址", prop: "supplierAddress",showProp: true  },
+  { label: "供应商地址", prop: "supplierAddress"  },
   { label: "要求到货日期", prop: "planArriveDate" ,type: "dateTime" },
   { label: "完成时间", prop: "completeTime",type: "dateTime" },
   { label: "订单备注", prop: 'remark' },
@@ -1599,6 +1620,7 @@ export const PutawayNote =  [
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
   { label: "供应商代码", prop: 'supplierCode' },
+  { label: "供应商名称", prop: 'supplierName',showProp:true },
   { label: "检验单号", prop: 'inspectNumber' },
   { label: "收货单号", prop: 'receiptNumber' },
   { label: "发货单号", prop: 'asnNumber' },
@@ -2324,7 +2346,7 @@ export const FISDeliverJob =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "item_configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE",showProp:true },
   { label: "出货数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "出货库区", prop: "areaCode" },
@@ -4153,7 +4175,7 @@ export const PositionCode = [
   { label: _Names.basicUom, prop: "basicUom" },
   { label: _Names.stdPackQty, prop: "stdPackQty",isNumber:true },
   { label: "叫料库位代码", prop: "locationCode" },
-  { label: _Names.locationName, prop: "locationName" },
+  { label: "叫料库位名称", prop: "locationName" },
   { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
   { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
   { label: _Public.remark, prop: "remark" },
@@ -4179,13 +4201,13 @@ export const Utensil = [
 // 总成量份
 export const Kitting = [
   {
-    label: '编码',
+    label: 'Kitting编码',
     prop: "code",
     fixed: "left",
     type: "name"
   },
-  { label: '名称', prop: 'name' },
-  { label: '底盘数量', prop: 'chassisQty' },
+  { label: 'Kitting编码描述', prop: 'name' },
+  { label: '底盘打包数量', prop: 'chassisQty' },
   { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
   { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
   { label: _Public.remark, prop: "remark" },
diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js
index 0f09b1216..95182bf7b 100644
--- a/fe/PC/src/utils/tabsDesTions/index.js
+++ b/fe/PC/src/utils/tabsDesTions/index.js
@@ -95,8 +95,13 @@ export const ItemPack =  [
 // 收容数标包
 export const ItemContainer =  [
   { label: "收容代码", prop: 'containerCode' },
-  { label: "物料代码", prop: "itemCode" },
-  { label: '收容数量', prop: "qty" },
+  { label: "收容代码描述", prop: "containerName" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "item_nameFromFE" },
+  { label: "物品描述1", prop: "item_desc1FromFE" },
+  { label: "物品描述2", prop: "item_desc2FromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
+  { label: '转储标包数量', prop: "qty" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
   { label: "备注", prop: 'remark', colSpan: 12 },
@@ -523,7 +528,11 @@ export const TransactionType = [
 // 库存开账
 export const InventoryBilling = [
   { label: "物品代码", prop: "itemCode", type: "name" },
-  { label: "ERP系统库位代码", prop: "erpLocationCode" },
+  { label: "物品名称", prop: "item_nameFromFE" },
+  { label: "物品描述1", prop: "item_desc1FromFE" },
+  { label: "物品描述2", prop: "item_desc2FromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
+  { label: "TYRP储位代码", prop: "erpLocationCode" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
   { label: "备注", prop: "remark" },
@@ -548,7 +557,7 @@ 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: "locationCode" },
   { label: "描述", prop: "description" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
@@ -560,9 +569,9 @@ export const ProductionLineItem =  [
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
   { label: "生产线代码", prop: "prodLineCode" },
-  { label: "完工库位列表", prop: "productLocationCodeListJson", type:"json" },
-  { label: "原材料库位列表", prop: "rawLocationCodeListJson", type:"json" },
-  { label: "线边库位列表", prop: "wipLocationCodeListJson", type:"json" },
+  // { label: "完工库位列表", prop: "productLocationCodeListJson", type:"json" },
+  { label: "原材料来源库位列表", prop: "rawLocationCodeListJson", type:"json" },
+  { label: "半成品来源库位列表", prop: "wipLocationCodeListJson", type:"json" },
   { label: "备注", prop: "remark" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
@@ -764,6 +773,10 @@ export const StdCostPriceSheet = [
     prop: "itemCode",
     width:"200px"
   },
+  { label: "物品名称", prop: "item_nameFromFE" },
+  { label: "物品描述1", prop: "item_desc1FromFE" },
+  { label: "物品描述2", prop: "item_desc2FromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "标准成本价格", prop: "stdCostPrice",type:"price" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
   { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
@@ -778,6 +791,10 @@ export const PurchasePriceSheet = [
     prop: "itemCode",
     width:"200px"
   },
+  { label: "物品名称", prop: "item_nameFromFE" },
+  { label: "物品描述1", prop: "item_desc1FromFE" },
+  { label: "物品描述2", prop: "item_desc2FromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "供应商编号", prop: "supplierCode" },
   { label: "采购价格", prop: "purchasePrice",type:"price" },
   { label: "价格单描述", prop: "description" },
@@ -794,6 +811,10 @@ export const SalePriceSheet = [
     prop: "itemCode",
     width:"200px"
   },
+  { label: "物品名称", prop: "item_nameFromFE" },
+  { label: "物品描述1", prop: "item_desc1FromFE" },
+  { label: "物品描述2", prop: "item_desc2FromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "客户代码", prop: "customerCode" },
   { label: "销售价格", prop: "salePrice",type:"price" },
   { label: "价格单描述", prop: "description" },
@@ -1074,6 +1095,7 @@ export const PutawayNote =  [
   { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "事务ID", prop: "tenantId" },
   { label: "供应商代码", prop: 'supplierCode' },
+  { label: "供应商名称", prop: 'supplierName' },
   { label: "检验单号", prop: 'inspectNumber' },
   { label: "收货单号", prop: 'receiptNumber' },
   { label: "发货单号", prop: 'asnNumber' },
@@ -2996,7 +3018,7 @@ export const PositionCode = [
   { label: _Names.basicUom, prop: "basicUom" },
   { label: _Names.stdPackQty, prop: "stdPackQty" },
   { label: "叫料库位代码", prop: "locationCode" },
-  { label: _Names.locationName, prop: "locationName" },
+  { label: "叫料库位名称", prop: "locationName" },
   { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
   { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
   { label: _Public.remark, prop: "remark" },
@@ -3016,9 +3038,9 @@ export const Utensil = [
 
 // 总成量份
 export const Kitting = [
-  { label: '编码', prop: "code" },
-  { label: '名称', prop: 'name' },
-  { label: '底盘数量', prop: 'chassisQty' },
+  { label: 'Kitting编码', prop: "code" },
+  { label: 'Kitting编码描述', prop: 'name' },
+  { label: '底盘打包数量', prop: 'chassisQty' },
   { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
   { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
   { label: _Public.remark, prop: "remark" },
diff --git a/fe/PC/src/views/basicData/ItemsManage/ItemContainer.vue b/fe/PC/src/views/basicData/ItemsManage/ItemContainer.vue
index 4fcd8e6e1..386ad87c2 100644
--- a/fe/PC/src/views/basicData/ItemsManage/ItemContainer.vue
+++ b/fe/PC/src/views/basicData/ItemsManage/ItemContainer.vue
@@ -41,6 +41,7 @@
       @FormSubmit="FormSubmit"
       @close="FormClose"
       @goBack="goBack"
+      @push="DataPush"
     ></newAndEdiDialog>
     <!-- 新导入 disabledMethod 导入方式禁用 disabledIsAllowPartImport 是否局部导入禁用-->
     <!-- methodValue 导入方式默认选项  是否局部导入 默认选项  -->
@@ -63,7 +64,7 @@
       :propsData="propsData"
       :tabsDesTions="tabsDesTions"
       @drawerShut="(val) => (displayDialog.detailsDialog = val)"
-      @drawerbutton="drawerbutton"
+      @drawerbutton="drawerbuttonHandel"
       @handleCommand="drawerHandle"
       @close-value="closeValue"
     ></curren-Drawer>
@@ -121,6 +122,7 @@ export default {
       }
     }
     return {
+      showTableBaseFromFE:['configuration','name','desc1','desc2'],
       URL: 'basedata/item-container',
       //常用按钮数据
       currenButtonData: [
@@ -149,16 +151,26 @@ export default {
       editOptions: {},
       CreateForm: [
         { type: "input", label: "收容代码", prop: 'containerCode', colSpan: 12, validType:'numberLetter' },
+        { type: "input", label: "收容代码描述", prop: 'containerName', colSpan: 12},
         { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic",this.isFilterItemCode())},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData,this.isFilterItemCode()) }, colSpan: 12 },
-        { type: "inputNumber", label: "收容数量", prop: "qty", colSpan: 12, min:1 },
+        { type: "input", label: "物品名称", prop: "item_nameFromFE", colSpan: 12, disabled:true},
+        { type: "input", label: "物品描述1", prop: "item_desc1FromFE", colSpan: 12, disabled:true},
+        { type: "input", label: "物品描述2", prop: "item_desc2FromFE", colSpan: 12, disabled:true},
+        { type: "input", label: "配置", prop: "item_configurationFromFE", colSpan: 12, disabled:true},
+        { type: "inputNumber", label: "转储标包数量", prop: "qty", colSpan: 12, min:1 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editForm: [
         { disabled:true, type: "input", label: "收容代码", prop: 'containerCode', colSpan: 12, validType:'numberLetter' },
+        { type: "input", label: "收容代码描述", prop: 'containerName', colSpan: 12},
         { type: "input", label: "物品代码", prop: "itemCode", disabled:true, colSpan: 12 },
-        { type: "inputNumber", label: "收容数量", prop: "qty", colSpan: 12, min:1 },
+        { type: "input", label: "物品名称", prop: "item_nameFromFE", colSpan: 12, disabled:true},
+        { type: "input", label: "物品描述1", prop: "item_desc1FromFE", colSpan: 12, disabled:true},
+        { type: "input", label: "物品描述2", prop: "item_desc2FromFE", colSpan: 12, disabled:true},
+        { type: "input", label: "配置", prop: "item_configurationFromFE", colSpan: 12, disabled:true},
+        { type: "inputNumber", label: "转储标包数量", prop: "qty", colSpan: 12, min:1 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editRules: {
@@ -203,6 +215,30 @@ export default {
       ]
       return filter
     },
+    DataPush(val){
+      if(val[1].prop == "itemCode"){
+        if(this.formReveal){
+          this.CreateFormData.item_nameFromFE = val[0].name
+          this.CreateFormData.item_desc1FromFE = val[0].desc1
+          this.CreateFormData.item_desc2FromFE = val[0].desc2
+          this.CreateFormData.item_configurationFromFE = val[0].configuration
+        }else{
+          this.editFormData.item_nameFromFE = val[0].name
+          this.editFormData.item_desc1FromFE = val[0].desc1
+          this.editFormData.item_desc2FromFE = val[0].desc2
+          this.editFormData.item_configurationFromFE = val[0].configuration
+        }
+      }
+    },
+    drawerbuttonHandel(val){
+      if(val == "edit"){
+        this.editFormData.item_nameFromFE = this.propsData.item_nameFromFE
+        this.editFormData.item_desc1FromFE = this.propsData.item_desc1FromFE
+        this.editFormData.item_desc2FromFE = this.propsData.item_desc2FromFE
+        this.editFormData.item_configurationFromFE = this.propsData.item_configurationFromFE
+      }
+      this.drawerbutton(val)
+    },
   }
 };
 </script>
diff --git a/fe/PC/src/views/basicData/ItemsManage/PositionCode.vue b/fe/PC/src/views/basicData/ItemsManage/PositionCode.vue
index d1ca90f22..1ad986e99 100644
--- a/fe/PC/src/views/basicData/ItemsManage/PositionCode.vue
+++ b/fe/PC/src/views/basicData/ItemsManage/PositionCode.vue
@@ -160,7 +160,7 @@ export default {
       editOptions: {},
       CreateForm: [
         { type: "select", label: "类型", prop: "type", colSpan: 12 ,options:'positionCodeType' },
-        { type: "prefixInput", label: "位置码", prop: "codeSuffix",prefixProp:"codeType",prefixWidth:'50px',prefixDisabled:true, colSpan: 12 },
+        { type: "prefixInput", label: "位置码",validType:'numberLetter', prop: "codeSuffix",prefixProp:"codeType",prefixWidth:'50px',prefixDisabled:true, colSpan: 12 },
         { type: "inputNumber", label: "标包数量", prop: "stdPackQty", colSpan: 12, min:1 },
         { type: "filterSelect", label: "物品代码", prop: "partCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
@@ -170,12 +170,12 @@ export default {
         { type: "input", disabled:true, label: "物品名称", prop: "partName",colSpan: 12 },
         { type: "input", disabled:true, label: "物品描述", prop: "partDesc",colSpan: 12 },
         { type: "input", disabled:true, label: "单位", prop: "basicUom",colSpan: 12 },
-        { type: "filterSelect", label: "库位代码", prop: "locationCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "叫料库位代码", prop: "locationCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/location",this.isFilterLocation(this.CreateFormData.codeType))},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.CreateFormData) }, 
           colSpan: 12 
         },
-        { type: "input", disabled:true, label: "库位名称", prop: "locationName",colSpan: 12 },
+        { type: "input", disabled:true, label: "叫料库位名称", prop: "locationName",colSpan: 12 },
         { type: "input", label: "备注", prop: "remark",colSpan: 12 },
       ],
       editForm: [
@@ -190,12 +190,12 @@ export default {
         { type: "input", disabled:true, label: "物品名称", prop: "partName",colSpan: 12 },
         { type: "input", disabled:true, label: "物品描述", prop: "partDesc",colSpan: 12 },
         { type: "input", disabled:true, label: "单位", prop: "basicUom",colSpan: 12 },
-        { type: "filterSelect", label: "库位代码", prop: "locationCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "叫料库位代码", prop: "locationCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/location",this.isFilterLocation(this.editFormData.codeType))},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.editFormData) }, 
           colSpan: 12 
         },
-        { type: "input", disabled:true, label: "库位名称", prop: "locationName",colSpan: 12 },
+        { type: "input", disabled:true, label: "叫料库位名称", prop: "locationName",colSpan: 12 },
         { type: "input", label: "备注", prop: "remark",colSpan: 12 },
       ],
       editRules: {
diff --git a/fe/PC/src/views/basicData/WarehouseManage/InventoryBilling.vue b/fe/PC/src/views/basicData/WarehouseManage/InventoryBilling.vue
index 306901dc0..30c14343c 100644
--- a/fe/PC/src/views/basicData/WarehouseManage/InventoryBilling.vue
+++ b/fe/PC/src/views/basicData/WarehouseManage/InventoryBilling.vue
@@ -71,6 +71,7 @@ export default {
   data () {
     let _this = this;
     return {
+      showTableBaseFromFE:['configuration','name','desc1','desc2'],
       URL: 'basedata/erpLocation-item',
       tableLoading: false,
       handleMultipleSelection: [],
diff --git a/fe/PC/src/views/basicData/WorkshopManage/ProdLineItem.vue b/fe/PC/src/views/basicData/WorkshopManage/ProdLineItem.vue
index 5b7da11b2..7f8bcac26 100644
--- a/fe/PC/src/views/basicData/WorkshopManage/ProdLineItem.vue
+++ b/fe/PC/src/views/basicData/WorkshopManage/ProdLineItem.vue
@@ -135,8 +135,8 @@ export default {
         itemName:null,
         itemDesc1:null,
         itemDesc2:null,
-        productLocationCodeListJson:null,
-        productLocationCodeListJson_show:[],
+        // productLocationCodeListJson:null,
+        // productLocationCodeListJson_show:[],
         rawLocationCodeListJson:null,
         rawLocationCodeListJson_show:[],
         wipLocationCodeListJson:null,
@@ -157,8 +157,8 @@ export default {
         itemName:null,
         itemDesc1:null,
         itemDesc2:null,
-        productLocationCodeListJson:null,
-        productLocationCodeListJson_show:[],
+        // productLocationCodeListJson:null,
+        // productLocationCodeListJson_show:[],
         rawLocationCodeListJson:null,
         rawLocationCodeListJson_show:[],
         wipLocationCodeListJson:null,
@@ -178,19 +178,19 @@ export default {
         { label: "物料名称", prop: 'itemName', type:"input", disabled:true, colSpan: 12 },
         { label: "物料描述1", prop: 'itemDesc1', type:"input", disabled:true, colSpan: 12 },
         { label: "物料描述2", prop: 'itemDesc2', type:"input", disabled:true, colSpan: 12 },
-        { type: "filterSelect", label: "完工库位列表", prop: "productLocationCodeListJson_show", optionsLabel: "name", optionsValue: "code", 
-          focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},//,[{logic:"And",column:"type",action:"==",value:"2"}]
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.CreateFormData)}, //,[{logic:"And",column:"type",action:"==",value:"2"}]
+        // { type: "filterSelect", label: "完工库位列表", prop: "productLocationCodeListJson_show", optionsLabel: "name", optionsValue: "code", 
+        //   focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},//,[{logic:"And",column:"type",action:"==",value:"2"}]
+        //   searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.CreateFormData)}, //,[{logic:"And",column:"type",action:"==",value:"2"}]
+        //   colSpan: 12,multiple:true
+        // },
+        { type: "filterSelect", label: "原材料来源库位列表", prop: "rawLocationCodeListJson_show", optionsLabel: "name", optionsValue: "code", 
+          focus: (type,val) => { return this.getFilterList(type, val, "basedata/location",[{logic:"And",column:"type",action:"==",value:"2"}])},
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.CreateFormData,[{logic:"And",column:"type",action:"==",value:"2"}])}, 
           colSpan: 12,multiple:true
         },
-        { type: "filterSelect", label: "原材料库位列表", prop: "rawLocationCodeListJson_show", optionsLabel: "name", optionsValue: "code", 
-          focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},//,[{logic:"And",column:"type",action:"==",value:"2"}]
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.CreateFormData)}, //,[{logic:"And",column:"type",action:"==",value:"2"}]
-          colSpan: 12,multiple:true
-        },
-        { type: "filterSelect", label: "线边库位列表", prop: "wipLocationCodeListJson_show", optionsLabel: "name", optionsValue: "code", 
-          focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},//,[{logic:"And",column:"type",action:"==",value:"2"}]
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.CreateFormData)}, //,[{logic:"And",column:"type",action:"==",value:"2"}]
+        { type: "filterSelect", label: "半成品来源库位列表", prop: "wipLocationCodeListJson_show", optionsLabel: "name", optionsValue: "code", 
+          focus: (type,val) => { return this.getFilterList(type, val, "basedata/location",[{logic:"And",column:"type",action:"==",value:"3"}])},
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.CreateFormData,[{logic:"And",column:"type",action:"==",value:"3"}])},
           colSpan: 12,multiple:true
         },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
@@ -205,19 +205,19 @@ export default {
         { label: "物料名称", prop: 'itemName', type:"input", disabled:true, colSpan: 12 },
         { label: "物料描述1", prop: 'itemDesc1', type:"input", disabled:true, colSpan: 12 },
         { label: "物料描述2", prop: 'itemDesc2', type:"input", disabled:true, colSpan: 12 },
-        { type: "filterSelect", label: "完工库位列表", prop: "productLocationCodeListJson_show", optionsLabel: "name", optionsValue: "code", 
-          focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},//,[{logic:"And",column:"type",action:"==",value:"2"}]
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.editFormData)}, //,[{logic:"And",column:"type",action:"==",value:"2"}]
+        // { type: "filterSelect", label: "完工库位列表", prop: "productLocationCodeListJson_show", optionsLabel: "name", optionsValue: "code", 
+        //   focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},//,[{logic:"And",column:"type",action:"==",value:"2"}]
+        //   searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.editFormData)}, //,[{logic:"And",column:"type",action:"==",value:"2"}]
+        //   colSpan: 12,multiple:true
+        // },
+        { type: "filterSelect", label: "原材料来源库位列表", prop: "rawLocationCodeListJson_show", optionsLabel: "name", optionsValue: "code", 
+          focus: (type,val) => { return this.getFilterList(type, val, "basedata/location",[{logic:"And",column:"type",action:"==",value:"2"}])},
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.editFormData,[{logic:"And",column:"type",action:"==",value:"2"}])},
           colSpan: 12,multiple:true
         },
-        { type: "filterSelect", label: "原材料库位列表", prop: "rawLocationCodeListJson_show", optionsLabel: "name", optionsValue: "code", 
-          focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},//,[{logic:"And",column:"type",action:"==",value:"2"}]
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.editFormData)}, //,[{logic:"And",column:"type",action:"==",value:"2"}]
-          colSpan: 12,multiple:true
-        },
-        { type: "filterSelect", label: "线边库位列表", prop: "wipLocationCodeListJson_show", optionsLabel: "name", optionsValue: "code", 
-          focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},//,[{logic:"And",column:"type",action:"==",value:"2"}]
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.editFormData)}, //,[{logic:"And",column:"type",action:"==",value:"2"}]
+        { type: "filterSelect", label: "半成品来源库位列表", prop: "wipLocationCodeListJson_show", optionsLabel: "name", optionsValue: "code", 
+          focus: (type,val) => { return this.getFilterList(type, val, "basedata/location",[{logic:"And",column:"type",action:"==",value:"3"}])},
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.editFormData,[{logic:"And",column:"type",action:"==",value:"3"}])}, 
           colSpan: 12,multiple:true
         },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
@@ -238,12 +238,28 @@ export default {
     this.paging();
   },
   methods:{
+    initJson(str){
+      let json = str
+      try {
+        json = JSON.parse(str)
+      } catch (d) {
+        json = null
+      }
+      return json
+    },
+    initStringify(val){
+      if(val && val.length>0 && val != 'null'){
+        return JSON.stringify(val)
+      }else{
+        return null
+      }
+    },
     // 多选数据库位转义处理
     drawerbuttonHandle(val){
       if(val == "edit"){
-        this.propsData.productLocationCodeListJson_show = JSON.parse(this.propsData.productLocationCodeListJson)
-        this.propsData.rawLocationCodeListJson_show = JSON.parse(this.propsData.rawLocationCodeListJson)
-        this.propsData.wipLocationCodeListJson_show = JSON.parse(this.propsData.wipLocationCodeListJson)
+        // this.propsData.productLocationCodeListJson_show = this.initJson(this.propsData.productLocationCodeListJson)
+        this.propsData.rawLocationCodeListJson_show = this.initJson(this.propsData.rawLocationCodeListJson)
+        this.propsData.wipLocationCodeListJson_show = this.initJson(this.propsData.wipLocationCodeListJson)
       }
       this.drawerbutton(val)
     },
@@ -264,13 +280,13 @@ export default {
     // 提交库位处理
     FormSubmitHandle(val){
       if(this.formReveal){
-        this.CreateFormData.productLocationCodeListJson = JSON.stringify(this.CreateFormData.productLocationCodeListJson_show)
-        this.CreateFormData.rawLocationCodeListJson = JSON.stringify(this.CreateFormData.rawLocationCodeListJson_show)
-        this.CreateFormData.wipLocationCodeListJson = JSON.stringify(this.CreateFormData.wipLocationCodeListJson_show)
+        // this.CreateFormData.productLocationCodeListJson = this.initStringify(this.CreateFormData.productLocationCodeListJson_show)
+        this.CreateFormData.rawLocationCodeListJson = this.initStringify(this.CreateFormData.rawLocationCodeListJson_show)
+        this.CreateFormData.wipLocationCodeListJson = this.initStringify(this.CreateFormData.wipLocationCodeListJson_show)
       }else{
-        this.editFormData.productLocationCodeListJson = JSON.stringify(this.editFormData.productLocationCodeListJson_show)
-        this.editFormData.rawLocationCodeListJson = JSON.stringify(this.editFormData.rawLocationCodeListJson_show)
-        this.editFormData.wipLocationCodeListJson = JSON.stringify(this.editFormData.wipLocationCodeListJson_show)
+        // this.editFormData.productLocationCodeListJson = this.initStringify(this.editFormData.productLocationCodeListJson_show)
+        this.editFormData.rawLocationCodeListJson = this.initStringify(this.editFormData.rawLocationCodeListJson_show)
+        this.editFormData.wipLocationCodeListJson = this.initStringify(this.editFormData.wipLocationCodeListJson_show)
       }
       this.FormSubmit(val)
     }
diff --git a/fe/PC/src/views/basicData/WorkshopManage/ProductionLine.vue b/fe/PC/src/views/basicData/WorkshopManage/ProductionLine.vue
index 1d7d2d623..7501c3ceb 100644
--- a/fe/PC/src/views/basicData/WorkshopManage/ProductionLine.vue
+++ b/fe/PC/src/views/basicData/WorkshopManage/ProductionLine.vue
@@ -149,7 +149,7 @@ export default {
         { 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", 
+        { 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) }, 
           colSpan: 12 
@@ -160,7 +160,7 @@ export default {
         { 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", 
+        { 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) }, 
           colSpan: 12 
diff --git a/fe/PC/src/views/basicData/priceManage/PurchasePriceSheet.vue b/fe/PC/src/views/basicData/priceManage/PurchasePriceSheet.vue
index df58f9d1e..87b9f4ce8 100644
--- a/fe/PC/src/views/basicData/priceManage/PurchasePriceSheet.vue
+++ b/fe/PC/src/views/basicData/priceManage/PurchasePriceSheet.vue
@@ -77,7 +77,7 @@
       :title="tableColumns"
       :DrawerLoading="Loading.DrawerLoading"
       :drawer="displayDialog.detailsDialog"
-      :dropdownData="dropdownData"
+      :Butttondata="[]"
       :propsData="propsData"
       :tabsDesTions="tabsDesTions"
       :tableLoading="tableLoading"
@@ -117,6 +117,7 @@ export default {
   },
   data () {
     return {
+      showTableBaseFromFE:['configuration','name','desc1','desc2'],
       URL: 'basedata/purchase-price-sheet',
       tableLoading:false,
       //常用按钮数据
diff --git a/fe/PC/src/views/basicData/priceManage/SalePriceSheet.vue b/fe/PC/src/views/basicData/priceManage/SalePriceSheet.vue
index b4ab89423..de7df1f4d 100644
--- a/fe/PC/src/views/basicData/priceManage/SalePriceSheet.vue
+++ b/fe/PC/src/views/basicData/priceManage/SalePriceSheet.vue
@@ -77,7 +77,7 @@
       :title="tableColumns"
       :DrawerLoading="Loading.DrawerLoading"
       :drawer="displayDialog.detailsDialog"
-      :dropdownData="dropdownData"
+      :Butttondata="[]"
       :propsData="propsData"
       :tabsDesTions="tabsDesTions"
       :tableLoading="tableLoading"
@@ -117,6 +117,7 @@ export default {
   },
   data () {
     return {
+      showTableBaseFromFE:['configuration','name','desc1','desc2'],
       URL: 'basedata/sale-price-sheet',
       tableLoading:false,
       //常用按钮数据
diff --git a/fe/PC/src/views/basicData/priceManage/StdCostPriceSheet.vue b/fe/PC/src/views/basicData/priceManage/StdCostPriceSheet.vue
index 65af6ee03..4f93ece41 100644
--- a/fe/PC/src/views/basicData/priceManage/StdCostPriceSheet.vue
+++ b/fe/PC/src/views/basicData/priceManage/StdCostPriceSheet.vue
@@ -77,8 +77,8 @@
       :title="tableColumns"
       :DrawerLoading="Loading.DrawerLoading"
       :drawer="displayDialog.detailsDialog"
-      :dropdownData="dropdownData"
       :propsData="propsData"
+      :Butttondata="[]"
       :tabsDesTions="tabsDesTions"
       :tableLoading="tableLoading"
       @drawerShut="(val) => (displayDialog.detailsDialog = val)"
@@ -117,6 +117,7 @@ export default {
   },
   data () {
     return {
+      showTableBaseFromFE:['configuration','name','desc1','desc2'],
       URL: 'basedata/stdcostpricesheet',
       tableLoading:false,
       //常用按钮数据
diff --git a/fe/PC/src/views/kittingManage/Kitting.vue b/fe/PC/src/views/kittingManage/Kitting.vue
index df72aeb3e..8f7f4e1c9 100644
--- a/fe/PC/src/views/kittingManage/Kitting.vue
+++ b/fe/PC/src/views/kittingManage/Kitting.vue
@@ -142,9 +142,9 @@ export default {
       },
       editOptions: {},
       CreateForm: [
-        { type: "input", label: "编码", prop: "code",colSpan: 12 },
-        { type: "input", label: "名称", prop: "name",colSpan: 12 },
-        { type: "inputNumber", label: "底盘数量", prop: "chassisQty", colSpan: 12, min:1 },
+        { type: "input", label: "Kitting编码",validType:'numberLetter', prop: "code",colSpan: 12 },
+        { type: "input", label: "Kitting编码描述", prop: "name",colSpan: 12 },
+        { type: "inputNumber", label: "底盘打包数量", prop: "chassisQty", colSpan: 12, min:1 },
         { type: "input", label: "备注", prop: "remark", colSpan: 12 },
       ],
       editRules: {
@@ -154,7 +154,7 @@ export default {
         },
       },
       AddDetailsTableColumns: [
-        { type:"inputNumber", label: "包装数量", prop: 'qty',width:"auto",min:1 },
+        { type:"inputNumber", label: "数量", prop: 'qty',width:"auto",min:1 },
         { 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) }, 
@@ -228,7 +228,7 @@ export default {
             }
           })
           if(_isEmpty > 0){
-            this.$errorMsg('【包装数量】与【物料代码】不能为空,且【包装数量】要大于0！')
+            this.$errorMsg('【数量】与【物料代码】不能为空,且【数量】要大于0！')
             reject()
             return
           }
diff --git a/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue b/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue
index 06d21f46b..7ab6a1db1 100644
--- a/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue
+++ b/fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue
@@ -575,7 +575,6 @@ export default {
             }else{
               return true
             }
-            console.log(553,scope,item)
           })
         },
         { type: "button", label: "检验", prop: "buttonHide",alwaysShow:true, width:'130px' },
@@ -813,13 +812,22 @@ export default {
     resetInspectForm(row) {
       // this.inspectFormData.inspectQty = null
       // this.$refs.inspectForm_Ref.resetCurrenForm()
-      console.log(816,row)
       let _detailTable = '[]'
       if(row.otherPropertyJson && row.otherPropertyJson != '' && row.otherPropertyJson != 'null'){
         _detailTable = JSON.parse(JSON.stringify(row.otherPropertyJson))
       }
       this.inspectFormData = row
       this.inspectFormData.details = JSON.parse(_detailTable)
+      // 默认合格时候检查数量默认赋值
+      if(row.detailInspectStatus == 1){
+        // todo：待测试
+        this.inspectFormData.appearance = ''
+        this.inspectFormData.volume = ''
+        this.inspectFormData.weight = ''
+        this.inspectFormData.otherPropertyJson = '[]'
+        this.inspectFormData.details = []
+        this.inspectFormData.inspectQty = row.receiveQty
+      }
     },
     // 质检详情-检验按钮 table中按钮
     inspectDetailsButtonClick(row, index, label) {
@@ -906,12 +914,6 @@ export default {
               this.propsData = res
             })
             this.paging()
-            this.inspectFormData.appearance = ''
-            this.inspectFormData.volume = ''
-            this.inspectFormData.weight = ''
-            this.inspectFormData.inspectQty = ''
-            this.inspectFormData.otherPropertyJson = '[]'
-            console.log(913,this.inspectFormData)
             this.loading = false
             this.inspectNoticeDetailsTableLoading = false
           }).catch(err => {
@@ -973,7 +975,6 @@ export default {
                 bytes: arrayBuffer.substring(arrayBuffer.lastIndexOf(',')+1,arrayBuffer.length)
               }
             )
-            console.log(830,{id: that.masterID, summaryDetailId: that.inspectNoticeDetailsFormData.id }, that.inspectNoticeDetailsFormData)
             completeSummaryDetailStatus(
               {id: that.masterID, summaryDetailId: that.inspectNoticeDetailsFormData.id }, 
               that.inspectNoticeDetailsFormData,