【nev-pc】截止到“客户信息维护”字段整理+erp库位统一修改截止+仓库有关全部去掉截止

fe/PC/src/filters/status.js

@@ -1350,6 +1350,14 @@ export function productionLineType(index, prop) {
       label: "装配",
       value: 3
     },
+    4: {
+      label: "Kitting",
+      value: 4
+    },
+    5: {
+      label: "备品",
+      value: 5
+    },
   }
   return Enum(type, index, prop)
 }

fe/PC/src/lang/zh.js

@@ -1,3 +1,5 @@
+const _initLocationErpCode='ERP储位'
+
 export default {
   // 字段通用
   ColumsPublic:{
@@ -92,6 +94,18 @@ export default {
     locationName:'库位名称',
     projectCode:'项目代码',
     projectName:'项目名称',
+    locationErpCode:_initLocationErpCode,
+    recommendErpCode:'推荐'+ _initLocationErpCode,
+    handledErpCode:'实际'+_initLocationErpCode,
+    fromErpCode:'来源'+_initLocationErpCode,
+    toErpCode:'目标'+_initLocationErpCode,
+    recommendFromErpCode:'推荐来源'+_initLocationErpCode,
+    recommendToErpCode:'推荐目标'+_initLocationErpCode,
+    handledFromErpCode:'实际来源'+_initLocationErpCode,
+    handledToErpCode:'实际目标'+_initLocationErpCode,
+    transferFromErpCode:'库移来源'+_initLocationErpCode,
+    transferToErpCode:'库移目标'+_initLocationErpCode,
+    requestLocationErpCode:'请求'+_initLocationErpCode,
   },
 
   // 接口监控看板

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

@@ -3,9 +3,10 @@
 const orderWidth = 180
 import zh from '@/lang/zh'
 let _Names = zh.ColumsNames // 业务字段
+
 // 原料管理
 /**/
-// 报检单 20230410
+// 报检单 
 export const InspectRequest =  [
   { label: _Names.itemCode, prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
@@ -16,7 +17,6 @@ export const InspectRequest =  [
   { label: "检验数量", prop: 'inspectQty' },
   { label: "合格数量", prop: 'goodQty' },
   { label: "不合格数量", prop: 'failedQty' },
-  // -----------------------------------------------------------------------
   { label: "检验人", prop: 'inspectUser' },
   { label: "任务单号", prop: "number" },
   { label: "创建时间", prop: "creationTime",type: "dateTime" },
@@ -42,12 +42,9 @@ export const InspectRequest =  [
   { label: "检验类型", prop: "inspectType", type: "filter", filters: "inspectType" },
   { label: "不合格原因代码", prop: 'failedReason' },
   { label: "不合格原因", prop: 'failedReason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" },
-  // ************** 确定隐藏 ************************
-  // { label: "ID", prop: 'id' },
-  // { label: "主表ID", prop: "masterID" },
-  // ************** 确定隐藏 ************************
 ]
-// 检验记录  字段需要确定
+
+// 检验记录  
 export const InspectNote =  [
   { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
@@ -62,7 +59,6 @@ export const InspectNote =  [
   { label: "检验人", prop: 'inspectUser' },
   { label: "不合格原因代码", prop: 'failedReason' },
   { label: "不合格原因", prop: 'failedReason', type: "filter", filters: "getDict", dictType: "UnqualifiedReason" },
-  // -----------------------------------------------------------------------
   { label: "单据号", prop: "number" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
   { label: "创建者ID", prop: 'creatorId' },
@@ -81,8 +77,4 @@ export const InspectNote =  [
   { label: "最终不合格数量", prop: 'notPassedQty' },
   { label: "事务ID", prop: "tenantId" },
   { label: "检验类型", prop: "inspectType", type: "filter", filters: "inspectType" },
-  // ************** 确定隐藏 ************************
-  // { label: "masterID", prop: "masterID" },
-  // { label: "ID", prop: "id" },
-  // ************** 确定隐藏 ************************
 ]

fe/PC/src/views/activeReportManage/reportForm/InventoryBookSummaryERP_pay.vue

@@ -1,5 +1,5 @@
 <template>
-  <!-- 库存流水帐汇总（ERP储位）-账期 -->
+  <!-- 库存流水帐汇总（ERP）-账期 -->
   <popUpPage :openHandle="openHandle"></popUpPage>
 </template>
 <script>

fe/PC/src/views/activeReportManage/reportForm/inventoryBalanceReportLocationErpCode.vue

@@ -1,5 +1,5 @@
 <template>
-  <!-- 库存余额报表按ERP库位 -->
+  <!-- 库存余额报表按ERP -->
   <popUpPage :openHandle="openHandle"></popUpPage>
 </template>
 <script>

fe/PC/src/views/basicData/BomManage/Bom.vue

@@ -156,36 +156,36 @@ export default {
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
         { type: "inputNumber", label: "子物品用量", prop: 'componentQty', colSpan: 12, min:1, pointNumberFixed: 2  },
-        { type: "input", label: "子物品用量单位", prop: 'componentUom', disabled:"true", colSpan: 12 },
+        // { type: "input", label: "子物品用量单位", prop: 'componentUom', disabled:"true", colSpan: 12 },
         { type: "dateTime", label: "开始时间", prop: "beginTime", colSpan: 12 },
         { type: "dateTime", label: "结束时间", prop: "endTime", colSpan: 12 },
-        { type: "input", label: "ERP工序", prop: "erpOp", colSpan: 12 },
+        // { type: "input", label: "ERP工序", prop: "erpOp", colSpan: 12 },
-        { type: "input", label: "制造工序", prop: "mfgOp", colSpan: 12 },
+        // { type: "input", label: "制造工序", prop: "mfgOp", colSpan: 12 },
         { type: "input", label: "层级", disabled:"true", prop: "layer", colSpan: 12, validType:'number' },
-        { type: "select", label: "配送方式", prop: "distributionType", options: "distributionType", colSpan: 12 },
+        // { type: "select", label: "配送方式", prop: "distributionType", options: "distributionType", colSpan: 12 },
-        { type: "select", label: "取整方式", prop: "truncType", options: "truncType", colSpan: 12 },
+        // { type: "select", label: "取整方式", prop: "truncType", options: "truncType", colSpan: 12 },
-        { type: "select", label: "计划拆分规则", prop: "plannedSplitRule", options: "plannedSplitRule", colSpan: 12 },
+        // { type: "select", label: "计划拆分规则", prop: "plannedSplitRule", options: "plannedSplitRule", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editForm: [
         { type: "input", label: "父物品号", prop: "product",disabled:"true",  colSpan: 12 },
         { type: "input", label: "子物品号", prop: 'component', disabled:"true", colSpan: 12 },
         { type: "inputNumber", label: "子物品用量", prop: 'componentQty', colSpan: 12, min:1, pointNumberFixed: 2  },
-        { type: "input", label: "子物品用量单位", prop: 'componentUom', colSpan: 12 },
+        // { type: "input", label: "子物品用量单位", prop: 'componentUom', colSpan: 12 },
         { type: "dateTime", label: "开始时间", prop: "beginTime", colSpan: 12 },
         { type: "dateTime", label: "结束时间", prop: "endTime", colSpan: 12 },
-        { type: "input", label: "ERP工序", prop: "erpOp", colSpan: 12 },
+        // { type: "input", label: "ERP工序", prop: "erpOp", colSpan: 12 },
-        { type: "input", label: "制造工序", prop: "mfgOp", colSpan: 12 },
+        // { type: "input", label: "制造工序", prop: "mfgOp", colSpan: 12 },
         { type: "input", label: "层级", disabled:"true", prop: "layer", colSpan: 12, validType:'number' },
-        { type: "select", label: "配送方式", prop: "distributionType", options: "distributionType", colSpan: 12 },
+        // { type: "select", label: "配送方式", prop: "distributionType", options: "distributionType", colSpan: 12 },
-        { type: "select", label: "取整方式", prop: "truncType", options: "truncType", colSpan: 12 },
+        // { type: "select", label: "取整方式", prop: "truncType", options: "truncType", colSpan: 12 },
-        { type: "select", label: "计划拆分规则", prop: "plannedSplitRule", options: "plannedSplitRule", colSpan: 12 },
+        // { type: "select", label: "计划拆分规则", prop: "plannedSplitRule", options: "plannedSplitRule", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editRules: {
         cerateRule: {
           componentQty: [{ required: true, message: '不可为空', trigger: 'blur' },],
-          componentUom: [{ required: true, message: '不可为空', trigger: 'blur' },],
+          // componentUom: [{ required: true, message: '不可为空', trigger: 'blur' },],
           beginTime: [{ required: true, message: '不可为空', trigger: 'blur' },],
           endTime: [{ required: true, message: '不可为空', trigger: 'blur' },],
           product: [{ required: true, trigger: "blur", message: "不可为空" }],
@@ -193,7 +193,7 @@ export default {
         },
         editRule: {
           componentQty: [{ required: true, message: '不可为空', trigger: 'blur' },],
-          componentUom: [{ required: true, message: '不可为空', trigger: 'blur' },],
+          // componentUom: [{ required: true, message: '不可为空', trigger: 'blur' },],
           beginTime: [{ required: true, message: '不可为空', trigger: 'blur' },],
           endTime: [{ required: true, message: '不可为空', trigger: 'blur' },],
         }

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

@@ -133,7 +133,7 @@ export default {
         { type: "input", label: "区域名称", prop: 'name', colSpan: 12 },
         { type: "select", label: "是否功能区", prop: "isFunctional", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "类型", prop: "areaType", options: "areaType", colSpan: 12 },
-        { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12 },
+        // { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12 },
         { type: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
@@ -142,7 +142,7 @@ export default {
         { type: "input", label: "区域名称", prop: 'name', colSpan: 12 },
         { type: "select", label: "是否功能区", prop: "isFunctional", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "类型", prop: "areaType", options: "areaType", colSpan: 12 },
-        { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12 },
+        // { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12 },
         { type: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],

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

@@ -153,7 +153,7 @@ export default {
         { type: "input", label: "收货口名称", prop: 'name', colSpan: 12 },
         { type: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
-        { type: "input", label: "仓库代码", prop: 'warehouseCode',  disabled:"true", colSpan: 12 },
+        // { type: "input", label: "仓库代码", prop: 'warehouseCode',  disabled:"true", colSpan: 12 },
       ],
       editForm: [
         { type: "input", label: "收货口代码", prop: "code", disabled:"true", colSpan: 12 },
@@ -163,7 +163,7 @@ export default {
         { type: "input", label: "收货口名称", prop: 'name', colSpan: 12 },
         { type: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
-        { type: "input", label: "仓库代码", prop: 'warehouseCode',  disabled:"true", colSpan: 12 },
+        // { type: "input", label: "仓库代码", prop: 'warehouseCode',  disabled:"true", colSpan: 12 },
       ],
       editRules: {
         cerateRule: {

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

@@ -201,7 +201,7 @@ export default {
         { type: "input", label: "补料数量", validType:'pointNumber', prop: "feedQty", colSpan: 12 },
         { type: "input", label: "补料单位", prop: "feedUM", colSpan: 12 },
         { type: "input", label: "备注", prop: "remark", colSpan: 12 },
-        { type: "input", label: "仓库代码", prop: 'warehouseCode',  disabled:"true", colSpan: 12 },
+        // { type: "input", label: "仓库代码", prop: 'warehouseCode',  disabled:"true", colSpan: 12 },
         
       ],
       editForm: [
@@ -217,7 +217,7 @@ export default {
         { type: "input", label: "补料数量", validType:'pointNumber', prop: "feedQty", colSpan: 12 },
         { type: "input", label: "补料单位", prop: "feedUM", colSpan: 12 },
         { type: "input", label: "备注", prop: "remark", colSpan: 12 },
-        { type: "input", label: "仓库代码", prop: 'warehouseCode',  disabled:"true", colSpan: 12 },
+        // { type: "input", label: "仓库代码", prop: 'warehouseCode',  disabled:"true", colSpan: 12 },
         
       ],
       editRules: {

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

@@ -203,7 +203,7 @@ export default {
           focus: (type,val) => { return this.getFilterList(type, val, this.storeValue.url)},
           searchButton: (val) => { this.showSerarchPage(val, this.storeValue.url , this.storeValue.tabColumns, '值选择', this.CreateFormData) }, colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
-        { type: "input", label: "仓库代码", prop: 'warehouseCode',  disabled:"true", colSpan: 12 },
+        // { type: "input", label: "仓库代码", prop: 'warehouseCode',  disabled:"true", colSpan: 12 },
         { type: "input", label: "占用多库位", prop: 'multiLoc',  disabled:"true", colSpan: 12 },
       ],
       editForm: [
@@ -220,7 +220,7 @@ export default {
           focus: (type,val) => { return this.getFilterList(type, val, this.ediStoreValue.url)},
           searchButton: (val) => { this.showSerarchPage(val, this.ediStoreValue.url , this.ediStoreValue.tabColumns, '值选择', this.editFormData) }, colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
-        { type: "input", label: "仓库代码", prop: 'warehouseCode',  disabled:"true", colSpan: 12 },
+        // { type: "input", label: "仓库代码", prop: 'warehouseCode',  disabled:"true", colSpan: 12 },
         { type: "input", label: "占用多库位", prop: 'multiLoc',  disabled:"true", colSpan: 12 },
       ],
       editRules: {

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

@@ -277,7 +277,7 @@ export default {
         // { type: "objectSelect", label: "是否拆箱", prop: "locSwitch", showProp: "enableSplitBox", options: "whetherOrNot", colSpan: 12 },
         { type: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
-        { type: "input", label: "仓库代码", prop: 'warehouseCode',  disabled:"true", colSpan: 12 },
+        // { type: "input", label: "仓库代码", prop: 'warehouseCode',  disabled:"true", colSpan: 12 },
       ],
       editForm: [
         { type: "input", label: "库位代码", prop: "code", disabled:"true", colSpan: 12 },
@@ -319,7 +319,7 @@ export default {
         { type: "select", label: "是否拆托", prop: "enableSplitPallet", options: "whetherOrNot", colSpan: 12 },
         { type: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
-        { type: "input", label: "仓库代码", prop: 'warehouseCode',  disabled:"true", colSpan: 12 },
+        // { type: "input", label: "仓库代码", prop: 'warehouseCode',  disabled:"true", colSpan: 12 },
       ],
       editRules: {
         cerateRule: {

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

@@ -228,7 +228,7 @@ export default {
         { type: "select", label: "是否接收客户退货", prop: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否拆箱", prop: "enableSplitBox", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否拆托", prop: "enableSplitPallet", options: "whetherOrNot", colSpan: 12 },
-        { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12  },
+        // { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12  },
         // { type: "objectSelect", label: "是否混物品", prop: "locSwitch", showProp: "enableMixItem", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否混批次", prop: "locSwitch", showProp: "enableMixLot", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否混状态", prop: "locSwitch", showProp: "enableMixStatus", options: "whetherOrNot", colSpan: 12 },
@@ -273,7 +273,7 @@ export default {
         { type: "select", label: "是否接收客户退货", prop: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否拆箱", prop: "enableSplitBox", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否拆托", prop: "enableSplitPallet", options: "whetherOrNot", colSpan: 12 },
-        { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12  },
+        // { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12  },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
         { type: "input", label: "描述", prop: 'description', colSpan: 12 },
       ],

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

@@ -127,14 +127,14 @@ export default {
       CreateForm: [
         { type: "input", label: "工作组代码", prop: "code", validType:'numberLetter', colSpan: 12 },
         { type: "input", label: "工作组名称", prop: 'name', colSpan: 12 },
-        { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12 },
+        // { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12 },
         { type: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editForm: [
         { type: "input", label: "工作组代码", prop: "code", disabled:"true", colSpan: 12 },
         { type: "input", label: "工作组名称", prop: 'name', colSpan: 12 },
-        { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12 },
+        // { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12 },
         { type: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
@@ -142,11 +142,11 @@ export default {
         cerateRule: {
           code: [{ required: true, trigger: "blur", message: "不可为空" },],
           name: [{ required: true, trigger: "blur", message: "不可为空" }],//编辑必选
-          warehouseCode: [{ required: true, trigger: "blur", message: "不可为空" }],
+          // warehouseCode: [{ required: true, trigger: "blur", message: "不可为空" }],
         },
         editRule: {
           name: [{ required: true, trigger: "blur", message: "不可为空" }],//编辑必选
-          warehouseCode: [{ required: true, trigger: "blur", message: "不可为空" }],
+          // warehouseCode: [{ required: true, trigger: "blur", message: "不可为空" }],
         }
       },
     };

fe/PC/src/views/materialIssueManage/libraryShiftSearch.vue

@@ -78,7 +78,7 @@ export default {
                 { label: "接口对应类型", prop: "interfaceType", width: '360px', showProp: true },
                 { label: "事务数量", prop: "qty",isNumber:true },
                 { label: "箱码", prop: "packingCode" },
-                { label: "ERP储位", prop: "locationErpCode" },
+                { label: _Names.locationErpCode, prop: "locationErpCode" },
                 { label: "库位代码", prop: "locationCode" },
                 { label: "批次", prop: "lot" },
                 { label: "到货单位", prop: "uom" },
@@ -99,7 +99,7 @@ export default {
                 { label: "生效日期", prop: 'activeDate', type: "dateTime" },
                 { label: "创建时间", prop: "creationTime",type: "dateTime" },
                 { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
-                { label: "仓库代码", prop: 'warehouseCode' },
+                // { label: "仓库代码", prop: 'warehouseCode' },
             ]
         }
     },

fe/PC/src/views/padManage/isPadForTransferLibJob.vue

@@ -183,15 +183,15 @@ export default {
         { label: "物品描述1", prop: "itemDesc1" },
         { label: "物品描述2", prop: "itemDesc2" },
         { label: "请求数量", prop: 'requestQty' },
-        { label: "请求ERP库位", prop: 'requestLocationErpCode' },
+        { label: _Names.requestLocationErpCode, prop: 'requestLocationErpCode' },
         { label: "推荐来源数量", prop: 'recommendFromQty' },
         { label: "推荐目标数量", prop: 'recommendToQty' },
         { label: "推荐来源箱标签", prop: 'recommendFromPackingCode' },
         { label: "推荐目标箱标签", prop: 'recommendToPackingCode' },
         { label: "推荐来源库位", prop: 'recommendFromLocationCode' },
         { label: "推荐目标库位", prop: 'recommendToLocationCode' },
-        { label: "推荐来源ERP库位", prop: 'recommendFromLocationErpCode' },
+        { label: _Names.recommendFromErpCode, prop: 'recommendFromLocationErpCode' },
-        { label: "推荐目标ERP库位", prop: 'recommendToLocationErpCode' },
+        { label: _Names.recommendToErpCode, prop: 'recommendToLocationErpCode' },
         { label: "推荐来源批次", prop: 'recommendFromLot' },
         { label: "推荐目标批次", prop: 'recommendToLot' },
         { label: "推荐来源过期时间", prop: 'recommendFromExpireDate', type: "dateTime" },
@@ -202,8 +202,8 @@ export default {
         { label: "实际目标箱标签", prop: 'handledToPackingCode' },
         { label: "实际来源库位", prop: 'handledFromLocationCode' },
         { label: "实际目标库位", prop: 'handledToLocationCode' },
-        { label: "实际来源ERP库位", prop: 'handledFromLocationErpCode' },
+        { label: _Names.handledFromErpCode, prop: 'handledFromLocationErpCode' },
-        { label: "实际目标ERP库位", prop: 'handledToLocationErpCode' },
+        { label: _Names.handledToErpCode, prop: 'handledToLocationErpCode' },
         { label: "实际来源批次", prop: 'handledFromLot' },
         { label: "实际目标批次", prop: 'handledToLot' },
         { label: "实际来源过期时间", prop: 'handledFromExpireDate', type: "dateTime" },
@@ -266,7 +266,7 @@ export default {
         { label: "供应商批次", prop: "supplierBatch" },
         { label: "标包数量", prop: "stdPackQty" },
         { label: "库位", prop: 'locationCode' },
-        { label: "ERP储位", prop: "locationErpCode" },
+        { label: _Names.locationErpCode, prop: "locationErpCode" },
         { label: "库位组", prop: 'locationGroup' },
         { label: "标准成本单价", prop: "stdCostPrice" },
         { label: "标准成本金额", prop: "stdCost" },