1、主表添加基础信息表查询的数据与明细表添加配置参数封装

2、物品安全库存预警，物品安全库存信息主表配置描述1、描述2、配置

fe/PC/public/version.json

@@ -1,3 +1,3 @@
 {
-    "version": "1.0.52"
+    "version": "1.0.53"
 }

fe/PC/src/mixins/TableMixins.js

@@ -37,6 +37,8 @@ export const tableMixins = {
       tableDataDetails:[],
       //默认tag
       firstTabs:'xq',
+      //明细-前端手动添加的基础信息配置
+      showDetailBaseFromFE:['configuration']
     }
   },
   methods: {
@@ -171,6 +173,50 @@ export const tableMixins = {
         }
       }
     },
+    // 
+    /**
+     * 获取物品信息-逐条过滤到主表或者明细表
+     * 明细或者主表单行数据添加所需要的值
+     * @param {*} type 是更改主表（table）还是明细表(detail)
+     * 要追加的值取showTableBaseFromFE（主表）、showDetailBaseFromFE（明细），参数是基础表的参数，如code，而不是itemCode
+     * 添加到表头的格式为item+追加的参数+FromFE   (例如：item_desc2FromFE)
+     */
+    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 = {
+          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
+      })
+    },
     // 获取供应商信息过滤propsData
     getSupplierByCodesHandle_props() {
       for(let i=0;i<this.tabsDesTions.length;i++){
@@ -198,37 +244,6 @@ export const tableMixins = {
         }
       }
     },
-    // 明细-获取物品信息【配置（configuration）】参数 
-    // 此方法暂时仅仅支持1000条以内的数据，如果有需要1000以外，需要优化
-    getConfigByItemHandle_props() {
-      let _data = {
-        condition: {filters: []},
-        Sorting: "",
-        SkipCount: 0,
-        MaxResultCount: 1000
-      }
-      this.propsData.details.forEach((item)=>{
-        let _filt = {
-          logic: 'Or',
-          column: "code",
-          action: "==",
-          value: item.itemCode
-        }
-        _data.condition.filters.push(_filt)
-      })
-      getPageList(_data, 'basedata/item-basic').then(res => {
-        this.propsData.details.forEach(item=>{
-          let _config = res.items.filter(base=>{
-            return base.code == item.itemCode
-          })
-          if(_config && _config.length > 0)this.$set(item,"configurationFromFE", _config[0].configuration)
-        })
-        this.$forceUpdate()
-        this.Loading.DrawerLoading = false
-      }).catch(err => {
-        this.Loading.DrawerLoading = false
-      })
-    },
     // 主列表操作列按钮执行方法
     /**
      * 
@@ -278,19 +293,21 @@ export const tableMixins = {
     // 主列表更新后全局通用操作
     pagingCallback(callback){
       this.Loading.tableLoading = false
+      // 如果业务页面设置showTableBaseFromFE为空，tableColumns.js别忘了删除配置项
+      if(this.showTableBaseFromFE && this.showTableBaseFromFE.length > 0){
+        this.getItemInfoByItemCodeHandle('table')
+      }
       if(callback)callback()
       // this.getSupplierByCodesHandle_table()
     },
     // 点击抽屉，获取明细后全局通用操作
     inlineDialogCallback(){
-      // notShowConfiguration：明细中-不用前端获取物品信息的Configuration参数，
+      // 如果业务页面设置showDetailBaseFromFE为空，detailsTableColumns.js别忘了删除配置项
-      // 如果设置notShowConfiguration，detailsTableColumns.js别忘了删除配置项
+      if(this.showDetailBaseFromFE && this.showDetailBaseFromFE.length > 0){
-      if(this.notShowConfiguration){
+        this.getItemInfoByItemCodeHandle('detail')
-        this.Loading.DrawerLoading = false
       }
-      // 插入配置数据
       else{
-        this.getConfigByItemHandle_props()
+        this.Loading.DrawerLoading = false
       }
       // this.getSupplierByCodesHandle_props()
     }

fe/PC/src/utils/detailsTableColumns/index.js

@@ -29,7 +29,7 @@ export const SupplierAsn =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "发货数量", prop: "qty" },
   { label: "物品单位", prop: "uom" },
   { label: "生产批次", prop: "lot" },
@@ -68,7 +68,7 @@ export const PurchaseOrder =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "发货数量", prop: "qty" },
   { label: "物品单位", prop: "uom" },
   { label: "生产批次", prop: "lot" },
@@ -111,7 +111,7 @@ export const PurchaseReceiptRequest =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "发货数量", prop: "qty" },
   { label: "物品单位", prop: "uom" },
   { label: "生产批次", prop: "lot" },
@@ -148,7 +148,7 @@ export const PurchaseReceiptJob =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "状态", prop: "purchaseReceiptInspectStatus", type: "filter", filters: "enumPurchaseReceiptInspectStatus" },
   { label: "数量", prop: "recommendQty" },
   { label: "质量缺陷", prop: "massDefect" },
@@ -205,7 +205,7 @@ export const InspectRequest =  [
   { label: "物品名称", prop: "itemName", width: orderWidth },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "收货数量", prop: "receiveQty" },
   { label: "生产批次", prop: "lot" },
   { label: "箱码", prop: "packingCode" },
@@ -258,7 +258,7 @@ export const InspectNote =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "收货数量", prop: "receiveQty" },
   { label: "生产批次", prop: "lot" },
   { label: "箱码", prop: "packingCode" },
@@ -311,7 +311,7 @@ export const unqualifiedToQualifiedNote = [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: "toLot" },
@@ -354,7 +354,7 @@ export const PutawayNote =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "来源库位", prop: "fromLocationCode" },
@@ -424,7 +424,7 @@ export const IssueRequest =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "状态", prop: "status", type: "filter", filters: "openToClose" },
   { label: "叫料数量", prop: "qty" },
   { label: "单位", prop: "uom" },
@@ -459,7 +459,7 @@ export const IssueJob =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "状态", prop: "status", type: "filter", filters: "inventoryStage" },
   { label: "推荐批次", prop: "recommendLot" },
   { label: "实际批次", prop: "handledLot" },
@@ -523,7 +523,7 @@ export const IssueNote =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "发料数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "创建时间", prop: 'creationTime', type: "dateTime" },
@@ -594,7 +594,7 @@ export const automaticCallApply =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "状态", prop: "status", type: "filter", filters: "openToClose" },
   { label: "叫料数量", prop: "qty" },
   { label: "单位", prop: "uom" },
@@ -629,7 +629,7 @@ export const automaticCallJob =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "状态", prop: "status", type: "filter", filters: "inventoryStage" },
   { label: "推荐批次", prop: "recommendLot" },
   { label: "实际批次", prop: "handledLot" },
@@ -693,7 +693,7 @@ export const automaticCallNote =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "发料数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "创建时间", prop: 'creationTime', type: "dateTime" },
@@ -765,7 +765,7 @@ export const beforeGroundingReturnNote =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: "lot" },
@@ -828,7 +828,7 @@ export const PurchaseReturnRequest =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: 'lot' },
@@ -865,7 +865,7 @@ export const PurchaseReturnJob =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "退货原因代码", prop: 'reason' },
   { label: "退货原因说明", prop: 'reason', type: "filter", filters: "getDict" , dictType:"PurReturnReason" },
   { label: "订单号", prop: 'poNumber', width:orderWidth },
@@ -916,7 +916,7 @@ export const PurchaseReturnNote =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: "lot" },
@@ -979,7 +979,7 @@ export const ScrapNote =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "报废数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "报废原因代码", prop: 'reasonCode' },
@@ -1024,7 +1024,7 @@ export const materialDirectSendNote =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "发料数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "创建时间", prop: 'creationTime', type: "dateTime" },
@@ -1091,7 +1091,7 @@ export const directIssueNote =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "发料数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "创建时间", prop: 'creationTime', type: "dateTime" },
@@ -1165,7 +1165,7 @@ export const ProductReceiptRequest =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "返线数量", prop: "returnQty" },
@@ -1201,7 +1201,7 @@ export const ProductReceiptNote =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "库区", prop:"locationArea" },
@@ -1265,7 +1265,7 @@ export const ProductReceiptScrapRequest =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "库区", prop:"locationArea" },
@@ -1295,7 +1295,7 @@ export const ProductReceiptScrapNote =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "报废数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "报废原因代码", prop: 'reasonCode' },
@@ -1340,7 +1340,7 @@ export const partiallyPreparedProductsNote =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "来源库位", prop: "fromLocationCode" },
@@ -1410,7 +1410,7 @@ export const DeliverRequest =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "出货数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "发货库区", prop: "areaCode" },
@@ -1434,7 +1434,7 @@ export const DeliverJob =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "单位", prop: "uom" },
   { label: "推荐批次", prop: 'recommendLot' },
   { label: "实际批次", prop: 'handledLot' },
@@ -1487,7 +1487,7 @@ export const DeliverNote =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "出货数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "创建时间", prop: 'creationTime', type: "dateTime" },
@@ -1554,7 +1554,7 @@ export const FISDeliverRequest =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "出货数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "出货库区", prop: "areaCode" },
@@ -1581,7 +1581,7 @@ export const FISDeliverNote =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "出货数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "创建时间", prop: 'creationTime', type: "dateTime" },
@@ -1650,7 +1650,7 @@ export const customerDismantle = [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "退拆数量", prop: "qty" },
   { label: "单位", prop: 'uom' },
   { label: "扣账库位", prop: "locationCode" },
@@ -1683,7 +1683,7 @@ export const productionReturnRequest =  [
   { label: "物品名称", prop: 'itemName' },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "单位", prop: 'uom' },
   { label: "批次", prop: 'lot' },
   { label: "目标ERP库位", prop: 'toLocationErpCode' },
@@ -1727,7 +1727,7 @@ export const productionReturnJob =  [
   { label: "物品名称", prop: 'itemName' },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "数量", prop: 'recommendQty' },
   { label: "批次", prop: 'recommendLot' },
   // -----------------------------------------------------------------------
@@ -1780,7 +1780,7 @@ export const productionReturnNote =  [
   { label: "物品名称", prop: 'itemName' },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "数量", prop: 'qty' },
   { label: "单位", prop: 'uom' },
   { label: "来源ERP库位", prop: 'fromLocationErpCode' },
@@ -1851,7 +1851,7 @@ export const pickingRequest =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "领料数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: 'lot' },
@@ -1889,7 +1889,7 @@ export const pickingApproval =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "领料数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: 'lot' },
@@ -1927,7 +1927,7 @@ export const pickingNote =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "领料数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: 'lot' },
@@ -1990,7 +1990,7 @@ export const pickingNote =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "退料数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: 'lot' },
@@ -2027,7 +2027,7 @@ export const materialReturnApproval =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "退料数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: 'lot' },
@@ -2064,7 +2064,7 @@ export const materialReturnNote =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "退料数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: 'lot' },
@@ -2127,7 +2127,7 @@ export const recycledMaterialsReceipt = [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: 'lot' },
@@ -2167,7 +2167,7 @@ export const recycledMaterialsAdjustmentApply = [
   { label: "目标物品描述1", prop: "toItemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
   { label: "目标物品描述2", prop: "toItemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "来源箱标签", prop: "fromPackingCode" },
   { label: "目标箱标签", prop: "toPackingCode" },
   { label: "单位", prop: "uom" },
@@ -2221,7 +2221,7 @@ export const materialsAdjustment = [
   { label: "目标物品描述1", prop: "toItemDesc1" },
   { label: "来源物品描述2", prop: "itemDesc2" },
   { label: "目标物品描述2", prop: "toItemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "来源箱标签", prop: "fromPackingCode" },
   { label: "目标箱标签", prop: "toPackingCode" },
   { label: "来源数量", prop: "fromQty" },
@@ -2272,7 +2272,7 @@ export const lineSideWarehouseAllocationRequest =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "调拨数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: "fromLot" },
@@ -2316,7 +2316,7 @@ export const lineSideWarehouseAllocationConfirm =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "调拨数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "调出库位", prop: "fromLocationCode" },
@@ -2361,7 +2361,7 @@ export const lineSideWarehouseAllocationNote =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "调拨数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "调出库位", prop: "fromLocationCode" },
@@ -2406,7 +2406,7 @@ export const interStorageAllocationNote =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "调拨数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "调出库位", prop: "fromLocationCode" },
@@ -2451,7 +2451,7 @@ export const customerStorageAllocationRequest =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "调拨数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: "fromLot" },
@@ -2495,7 +2495,7 @@ export const customerStorageAllocationConfirm =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "调拨数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "调出库位", prop: "fromLocationCode" },
@@ -2540,7 +2540,7 @@ export const customerStorageAllocationNote =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "调拨数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "调出库位", prop: "fromLocationCode" },
@@ -2585,7 +2585,7 @@ export const intraStorageTransferNote =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "调拨数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "调出库位", prop: "fromLocationCode" },
@@ -2630,7 +2630,7 @@ export const lineSideWarehousePaymentRequest =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "返线数量", prop: "returnQty" },
@@ -2666,7 +2666,7 @@ export const lineSideWarehousePaymentNote =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "库区", prop:"locationArea" },
@@ -2730,7 +2730,7 @@ export const lineSideWarehouseScrappingRequest =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "库区", prop:"locationArea" },
@@ -2760,7 +2760,7 @@ export const lineSideWarehouseScrappingNote =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "报废数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "报废原因代码", prop: 'reasonCode' },
@@ -2805,7 +2805,7 @@ export const lineSideWarehouseAdjustmentSheetRequest =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "调整原因代码", prop:"reasonCode" },
@@ -2850,7 +2850,7 @@ export const lineSideWarehouseAdjustmentSheetNote =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "调整原因代码", prop:"reasonCode" },
   { label: "调整原因说明", prop:"reasonCode", type: "filter", filters: "getDict" , dictType:"AdjustmentReason" },
   // -----------------------------------------------------------------------
@@ -2900,7 +2900,7 @@ export const InventoryInitialNote = [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "批次", prop: "lot" },
   { label: "箱码", prop: "packingCode" },
   { label: "供应商批次", prop: "supplierBatch" },
@@ -2937,7 +2937,7 @@ export const CountPlan =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "单位", prop: "uom" },
   { label: "库存数量", prop: "inventoryQty" },
   { label: "初盘数量", prop: "firstCountQty" },
@@ -2990,7 +2990,7 @@ export const CountJob =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "库存数量", prop: "inventoryQty" },
   { label: "盘点数量", prop: "countQty" },
   { label: "库存库位", prop: "inventoryLocationCode" },
@@ -3031,7 +3031,7 @@ export const CountNote =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "库存数量", prop: "inventoryQty" },
   { label: "最终盘点数量", prop: "finalCountQty" },
   { label: "盘点差异数量", prop: "diffQty" },
@@ -3085,7 +3085,7 @@ export const CountPlanAdjust =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "盘点数量", prop: "countQty" },
   { label: "调整数量", prop: "qty" },
   { label: "库存数量", prop: "inventoryQty" },
@@ -3124,7 +3124,7 @@ export const CountPlanAdjust =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   // { label: "库存数量", prop: "inventoryQty" },
   { label: "库存数量", prop: "diffQty" },//20230705
   { label: "盘点数量", prop: "countQty" },
@@ -3171,7 +3171,7 @@ export const safetyStockWarning =  [
   { label: "物品名称", prop: 'itemName' },
   { label: "物品描述1", prop: 'itemDesc1' },
   { label: "物品描述2", prop: 'itemDesc2' },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "供应商批次", prop: 'supplierBatch' },
   { label: "到货时间", prop: 'arriveDate' ,type:"dateTime" },
   { label: "生产时间", prop: 'produceDate' ,type:"dateTime" },
@@ -3214,7 +3214,7 @@ export const splitPackingList =  [
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
-  { label: "配置", prop: "configurationFromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "创建时间", prop: 'creationTime', type:'dateTime' },
   { label: "标包数量", prop: "stdPackQty" },
   { label: "数量", prop: "qty" },

fe/PC/src/utils/tableColumns/index.js

@@ -623,6 +623,9 @@ export const ItemSafetyStock = [
     fixed: "left",
     type: "name"
   },
+  { label: "物品描述1", prop: "item_desc1FromFE" },
+  { label: "物品描述2", prop: "item_desc2FromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "仓库代码", prop: "warehouseCode" },
   { label: "存储关系类型", prop: "storeRelationType", type: "filter", filters: "storeRelationType" },
   { label: "存储关系代码", prop: "storeValue" },
@@ -2768,6 +2771,9 @@ export const safetyStockWarning =  [
     fixed: "left",
     type: "name"
   },
+  { label: "物品描述1", prop: "item_desc1FromFE" },
+  { label: "物品描述2", prop: "item_desc2FromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "最小库存", prop: 'minStock' },
   { label: "最大库存", prop: 'maxStock' },
   { label: "安全库存", prop: 'safetyStock' },

fe/PC/src/views/basicData/WarehouseManage/ItemSafetyStock.vue

@@ -132,6 +132,7 @@ export default {
   },
   data () {
     return {
+      showTableBaseFromFE:['desc1','desc2','configuration'],
       URL: 'basedata/item-safety-stock',
       storeValue: {
         url: '',

fe/PC/src/views/inventoryManage/InventoryQuery/safetyStockWarning.vue

@@ -64,6 +64,7 @@ export default {
   ],
   data () {
     return {
+      showTableBaseFromFE:['desc1','desc2','configuration'],
       URL: 'wms/inventory/safety-stock-inventory-balance',
       //常用按钮数据
       currenButtonData: [