Merge branch 'dev_web' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2 into dev_web

fe/PC/src/api/wms-core.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 // let baseURL = localStorage.getItem('print') + '/api/'
 let baseURL = localStorage.getItem('base') + '/api/'
 
-// 批量获取箱标签信息 | 到货通知
+// 批量获取箱标签信息 | 到货请求
 export function getInventoryLabelByCodes(data) {
   return request({
     url: baseURL + 'label/inventory-label/by-codes',

fe/PC/src/components/tablePagination/index.vue

@@ -139,7 +139,7 @@ export default {
       type: Boolean,
       default: false,
     },
-    // todo:当前组件内没有使用，待确定是否可以删除
+    // 选择当前行数据
     multipleSelection: {
       type: Array,
       default: () => {

fe/PC/src/filters/options.js

@@ -132,7 +132,7 @@ export function Roles(val){
     // "Company": "公司",
     // "Customer": "客户",
     // "CustomerItem": "客户物品",
-    // "WorkStation": "工作站",
+    // "WorkStation": "工作中心",
     // "Team": "班组",
     // "Supplier": "供应商",
     // "SupplierItem": "供应商物品",
@@ -179,7 +179,7 @@ export function Roles(val){
     // "PreparationPlan": "备料计划",
     // "ProductReceiptNote": "完工收货记录",
     // "OfflineSettlementNote": "下线结算记录",
-    // "ArriveNotice": "到货通知",
+    // "PurchaseReceiptRequest": "到货请求",
     // "PurchaseReceiptNote": "采购收货记录",
     // "ReceiptAbnormalNote": "收货异常记录",
     // "PurchaseReturnNote": "采购退货记录",

fe/PC/src/filters/status.js

@@ -430,9 +430,9 @@ export function calendarStatus(index, prop) {
 }
 /**
  * @param {Boolean} 
- * @returns {object} '到货通知状态'
+ * @returns {object} '到货请求'
  */
-export function arriveNoticeStatus(index, prop) {
+export function PurchaseReceiptRequestStatus(index, prop) {
   let status = {
     1: {
       label: "关闭",

fe/PC/src/mixins/TableMixins.js

@@ -136,6 +136,8 @@ export const tableMixins = {
     },
     // 获取供应商信息过滤tableData
     getSupplierByCodesHandle_table() {
+      this.Loading.tableLoading = false
+      return
       for(let i=0;i<this.tableColumns.length;i++){
         if(this.tableColumns[i].prop == 'supplierName' || this.tableColumns[i].prop == "supplierAddress"){
           let _allSuCode = []
@@ -173,6 +175,8 @@ export const tableMixins = {
     },
     // 获取供应商信息过滤propsData
     getSupplierByCodesHandle_props() {
+      this.Loading.DrawerLoading = false
+      return
       for(let i=0;i<this.tabsDesTions.length;i++){
         if(!this.propsData.supplierCode){
           this.Loading.DrawerLoading = false

fe/PC/src/mixins/printMixin.js

@@ -93,7 +93,7 @@ export function initPrintPackingCodeData(propsData,options,name,url){
 
 // 打印【箱标签-单页4个】 (xiangbq_many.rdlx)
 // 使用位置：半成品上架标签 (PartiallyPreparedProducts.vue) | 生产退库标签 (productionReturnLabel.vue)
-//          | 创建标签 (RecycledMaterialsLabel.vue) | 到货通知详情 (ArriveNotice-ms.vue)
+//          | 创建标签 (RecycledMaterialsLabel.vue) | 到货请求详情 (PurchaseReceiptRequest.vue)
 /**
  * @param {*} propsData 必填 详情数据 示例：this.propsData
  * @param {*} options 自定义特殊配置值 示例：{'number':'poNumber'} (number值将传为poNumber)

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

@@ -91,11 +91,12 @@ export const PurchaseOrder =  [
   // { label: "标包计量单位", prop: 'stdPackUom' },
   // -----------------------------------------------------------------------
 ]
-// 到货通知 已调整
-export const ArriveNotice =  [
+// 到货请求 已调整
+export const PurchaseReceiptRequest =  [
   { label: "物品代码", prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
-  { label: "物品描述", prop: "itemDesc1" },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "发货数量", prop: "qty" },
   { label: "物品单位", prop: "uom" },
   { label: "生产批次", prop: "lot" },
@@ -105,19 +106,26 @@ export const ArriveNotice =  [
   { label: "过期时间", prop: "expireDate", type: "dateTime" },
   { label: "到货时间", prop: 'arriveDate', type: "dateTime" },
   { label: "创建时间", prop: 'creationTime', type:'dateTime' },
-  { label: "发货单号", showProp:"asnNumber", type:"outerMainFilter", width: orderWidth },
+  { label: "创建者Id", prop: "creatorId" },
+  // { label: "发货单号", showProp:"asnNumber", type:"outerMainFilter", width: orderWidth },
   { label: "订单号", prop:'poNumber', width: orderWidth },
   // -----------------------------------------------------------------------
+  { label: "单据号", prop:'number', width: orderWidth },
+  { label: "备注", prop:'remark'},
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "公司", prop: 'company' },
+  { label: "上次修改者Id", prop: "lastModifierId" },
+  // { label: "公司", prop: 'company' },
   { label: "供应商批次", prop: 'supplierBatch' },
-  { label: "仓库", prop: 'warehouseCode' },
-  { label: "标包计量单位", prop: 'stdPackUom' },
+  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "标包计量单位", prop: 'stdPackUom' },
   { label: "标包数量", prop: 'stdPackQty' },
   { label: "订单行", prop: 'poLine' },
   { label: "供应商包装计量单位", prop:'supplierPackUom' },
   { label: "供应商包装数量", prop:'supplierPackQty' },
   { label: "转换率", prop: 'convertRate' },
+  { label: "事务代码", prop: "tenantId" },
+  { label: "id", prop: 'id' },
+  { label: "masterID", prop: '主表ID' },
   // { label: "项目编号", prop: "projectCode" },
   // { label: "类型", prop: "ctype", type: "filter", filters: "SupplierAsnCtypeSta" },
   // -----------------------------------------------------------------------

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

@@ -442,6 +442,7 @@ export const Dock = [
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
   { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
   { label: "备注", prop: "remark" },
+  { label: "仓库代码", prop: 'warehouseCode' },
 
   // {
   //   label: "操作",
@@ -487,28 +488,28 @@ export const LocationGroup = [
   { label: "区域代码", prop: "areaCode" },
   { label: "库位组名称", prop: 'name' },
   { label: "仓库代码", prop: "warehouseCode" },
-  { label: "类型", prop: "groupType", type: "filter", filters: "locationType" },
-  { label: "状态", prop: "defaultInventoryStatus", type: "filter", filters: "inventoryStage" },
+  { label: "库位组类型", prop: "groupType", type: "filter", filters: "locationType" },
+  { label: "默认库存状态", prop: "defaultInventoryStatus", type: "filter", filters: "inventoryStage" },
   { label: "拣料优先级", prop: "pickPriority" },
   { label: "描述", prop: "description" },
   // ------------------------------------------
   { label: "溢流库位组", prop: "overflowLocationGroup" },
-  { label: "可以混物品", prop: "enableMixItem", type: "filter", filters: "whetherOrNot" },
-  { label: "可以混批次", prop: "enableMixLot", type: "filter", filters: "whetherOrNot" },
-  { label: "可以混状态", prop: "enableMixStatus", type: "filter", filters: "whetherOrNot" },
-  { label: "可以负库存", prop: "enableNegative", type: "filter", filters: "whetherOrNot" },
-  { label: "可以保留零库存", prop: "enableKeepZero", type: "filter", filters: "whetherOrNot" },
-  { label: "可以机会盘点", prop: "enableOpportunityCount", type: "filter", filters: "whetherOrNot" },
-  { label: "可以领料", prop: "enablePick", type: "filter", filters: "whetherOrNot" },
-  { label: "可以过量领料", prop: "enableOverPick", type: "filter", filters: "whetherOrNot" },
-  { label: "可以整包存储", prop: "enableWholeStore", type: "filter", filters: "whetherOrNot" },
-  { label: "可以散件存储", prop: "enableBreakStore", type: "filter", filters: "whetherOrNot" },
-  { label: "可以发出", prop: "enableShip", type: "filter", filters: "whetherOrNot" },
-  { label: "可以接收", prop: "enableReceive", type: "filter", filters: "whetherOrNot" },
-  { label: "可以退货给供应商", prop: "enableReturnToSupplier", type: "filter", filters: "whetherOrNot" },
-  { label: "可以接收客户退货", prop: "enableReturnFromCustomer", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以拆箱", prop: "enableSplitBox", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以拆托", prop: "enableSplitPallet", type: "filter", filters: "whetherOrNot" },
+  { label: "是否混物品", prop: "enableMixItem", type: "filter", filters: "whetherOrNot" },
+  { label: "是否混批次", prop: "enableMixLot", type: "filter", filters: "whetherOrNot" },
+  { label: "是否混状态", prop: "enableMixStatus", type: "filter", filters: "whetherOrNot" },
+  { label: "是否负库存", prop: "enableNegative", type: "filter", filters: "whetherOrNot" },
+  { label: "是否保留零库存", prop: "enableKeepZero", type: "filter", filters: "whetherOrNot" },
+  { label: "是否动态盘点", prop: "enableOpportunityCount", type: "filter", filters: "whetherOrNot" },
+  { label: "是否领料", prop: "enablePick", type: "filter", filters: "whetherOrNot" },
+  { label: "是否过量领料", prop: "enableOverPick", type: "filter", filters: "whetherOrNot" },
+  { label: "是否整包存储", prop: "enableWholeStore", type: "filter", filters: "whetherOrNot" },
+  { label: "是否散件存储", prop: "enableBreakStore", type: "filter", filters: "whetherOrNot" },
+  { label: "是否发出", prop: "enableShip", type: "filter", filters: "whetherOrNot" },
+  { label: "是否接收", prop: "enableReceive", type: "filter", filters: "whetherOrNot" },
+  { label: "是否退货给供应商", prop: "enableReturnToSupplier", type: "filter", filters: "whetherOrNot" },
+  { label: "是否接收客户退货", prop: "enableReturnFromCustomer", type: "filter", filters: "whetherOrNot" },
+  { label: "是否拆箱", prop: "enableSplitBox", type: "filter", filters: "whetherOrNot" },
+  { label: "是否拆托", prop: "enableSplitPallet", type: "filter", filters: "whetherOrNot" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
   { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
   { label: "备注", prop: "remark" },
@@ -558,8 +559,8 @@ export const Location = [
   { label: "区域代码", prop: "areaCode" },
   { label: "库位组代码", prop: "locationGroupCode" },
   { label: "工作组代码", prop: "workGroupCode" },
-  { label: "类型", prop: "type", type: "filter", filters: "locationType" },
-  { label: "ERP库位", prop: "erpLocationCode" },
+  { label: "库位类型", prop: "type", type: "filter", filters: "locationType" },
+  { label: "ERP系统库位代码", prop: "erpLocationCode" },
   { label: "默认库存状态", prop: "defaultInventoryStatus", type: "filter", filters: "inventoryStage", width:'130px' },
   // -----------------------------------------------------------------------
   { label: "货架号", prop: "shelfCode" },
@@ -567,21 +568,21 @@ export const Location = [
   { label: "列号", prop: "columnCode" },
   { label: "拣料优先级", prop: "pickPriority" },
   { label: "拣料顺序", prop: "pickOrder" },
-  { label: "是否可以混物品", prop: "enableMixItem", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以混批次", prop: "enableMixLot", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以混状态", prop: "enableMixStatus", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以负库存", prop: "enableNegative", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以保留零库存", prop: "enableKeepZero", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以机会盘点", prop: "enableOpportunityCount", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以领料", prop: "enablePick", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以过量领料", prop: "enableOverPick", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以整包存储", prop: "enableWholeStore", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以散件存储", prop: "enableBreakStore", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以发出", prop: "enableShip", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以接收", prop: "enableReceive", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以退货给供应商", prop: "enableReturnToSupplier", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以接收客户退货", prop: "enableReturnFromCustomer", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以拆箱", prop: "enableSplitBox", type: "filter", filters: "whetherOrNot" },
+  { label: "是否混物品", prop: "enableMixItem", type: "filter", filters: "whetherOrNot" },
+  { label: "是否混批次", prop: "enableMixLot", type: "filter", filters: "whetherOrNot" },
+  { label: "是否混状态", prop: "enableMixStatus", type: "filter", filters: "whetherOrNot" },
+  { label: "是否负库存", prop: "enableNegative", type: "filter", filters: "whetherOrNot" },
+  { label: "是否保留零库存", prop: "enableKeepZero", type: "filter", filters: "whetherOrNot" },
+  { label: "是否动态盘点", prop: "enableOpportunityCount", type: "filter", filters: "whetherOrNot" },
+  { label: "是否领料", prop: "enablePick", type: "filter", filters: "whetherOrNot" },
+  { label: "是否过量领料", prop: "enableOverPick", type: "filter", filters: "whetherOrNot" },
+  { label: "是否整包存储", prop: "enableWholeStore", type: "filter", filters: "whetherOrNot" },
+  { label: "是否散件存储", prop: "enableBreakStore", type: "filter", filters: "whetherOrNot" },
+  { label: "是否发出", prop: "enableShip", type: "filter", filters: "whetherOrNot" },
+  { label: "是否接收", prop: "enableReceive", type: "filter", filters: "whetherOrNot" },
+  { label: "是否退货给供应商", prop: "enableReturnToSupplier", type: "filter", filters: "whetherOrNot" },
+  { label: "是否接收客户退货", prop: "enableReturnFromCustomer", type: "filter", filters: "whetherOrNot" },
+  { label: "是否拆箱", prop: "enableSplitBox", type: "filter", filters: "whetherOrNot" },
   { label: "备注", prop: "remark" },
   { label: "描述", prop: "description" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
@@ -662,7 +663,7 @@ export const ItemSafetyStock = [
   },
   { label: "仓库代码", prop: "warehouseCode" },
   { label: "存储关系类型", prop: "storeRelationType", type: "filter", filters: "storeRelationType" },
-  { label: "值", prop: "storeValue" },
+  { label: "存储关系代码", prop: "storeValue" },
   { label: "最大库存", prop: "maxStock" },
   { label: "最小库存", prop: "minStock" },
   { label: "安全库存", prop: "safetyStock" },
@@ -769,7 +770,7 @@ export const ProductionLine = [
 // 生产线零件关系 20230328
 export const ProductionLineItem = [
   { label: "物品代码", prop: "itemCode", type: "name" },
-  { label: "生产线编号", prop: "prodLineCode" },
+  { label: "生产线代码", prop: "prodLineCode" },
   { label: "备注", prop: "remark" },
   // -----------------------------------------------------------------------
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
@@ -782,7 +783,7 @@ export const ProductionLineItem = [
   //   fixed: "right"
   // },
 ]
-// 工作站信息 20230328
+// 工作中心信息 20230328
 export const WorkCenter = [
   {
     label: "编号",
@@ -791,10 +792,10 @@ export const WorkCenter = [
     prop: "code"
   },
   { label: "生产线", prop: "productionLineCode" },
-  { label: "类型", prop: "type", type: "filter", filters: "workCenterType" },
+  { label: "工作中心类型", prop: "type", type: "filter", filters: "workCenterType" },
   // ---------------------------------------
   { label: "名称", prop: "name" },
-  { label: "描述", prop: "description" },
+  { label: "工作中心描述", prop: "description" },
   { label: "原料库位", prop: "rawLocationCode" },
   { label: "成品库位", prop: "productLocationCode" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
@@ -1129,8 +1130,8 @@ export const PurchaseOrder = [
   // { label: "仓库", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
-// 到货通知 已调整
-export const ArriveNotice = [
+// 到货请求 已调整 20230404
+export const PurchaseReceiptRequest = [
   {
     label: "到货单号",
     prop: "number",
@@ -1143,16 +1144,18 @@ export const ArriveNotice = [
   { label: "供应商代码", prop: "supplierCode" },
   { label: "供应商名称", prop: "supplierName",showProp: true },
   { label: "供应商地址", prop: "supplierAddress",showProp: true },
-  { label: "要求到货日期", prop: "planArriveDate", type: "dateTime" },
+  { label: "计划到货日期", prop: "planArriveDate", type: "dateTime" },
   { label: "订单备注", prop: 'remark' },
   { label: "创建时间", prop: 'creationTime', type:'dateTime' },
   { label: "操作员", prop: 'worker' },
   // -----------------------------------------------------------------------
-  { label: "实际到货日期", prop: "arriveDate ",type: "dateTime" },
+  { label: "请求状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
+  { label: "要货计划单号", prop: 'rpNumber',width: orderWidth },
+  // { label: "实际到货日期", prop: "arriveDate ",type: "dateTime" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
-  { label: "仓库", prop: 'warehouseCode' },
+  // { label: "仓库", prop: 'warehouseCode' },
   { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
   { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" },
   { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },

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

@@ -300,8 +300,8 @@ export const SupplierTimeWindow =  [
 ]
 // 收货口信息 20230328
 export const Dock =  [
-  { label: "默认库位编号", prop: "defaultLocationCode" },
-  { label: "收货口编号", prop: "code" },
+  { label: "默认库位代码", prop: "defaultLocationCode" },
+  { label: "收货口代码", prop: "code" },
   { label: "收货口名称", prop: 'name' },
   { label: "描述", prop: "description" },
   { label: "备注", prop: 'remark' },
@@ -311,7 +311,7 @@ export const Dock =  [
   { label: "创建者Id", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
   { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "仓库", prop: 'warehouseCode' },
+  { label: "仓库代码", prop: 'warehouseCode' },
   { label: "id", prop: 'id' },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
@@ -338,8 +338,8 @@ export const Area =  [
 // 库位组信息 20230328
 export const LocationGroup =  [
   { label: "区域代码", prop: "areaCode" },
-  { label: "类型", prop: "groupType", type: "filter", filters: "locationType" },
-  { label: "状态", prop: "defaultInventoryStatus", type: "filter", filters: "inventoryStage" },
+  { label: "库位组类型", prop: "groupType", type: "filter", filters: "locationType" },
+  { label: "默认库存状态", prop: "defaultInventoryStatus", type: "filter", filters: "inventoryStage" },
   { label: "拣料优先级", prop: "pickPriority" },
   { label: "编号", prop: "code" },
   { label: "名称", prop: 'name' },
@@ -350,7 +350,7 @@ export const LocationGroup =  [
   // { label: "是否混状态", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableMixStatus" },
   // { label: "是否负库存", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableNegative" },
   // { label: "是否保留零库存", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableKeepZero" },
-  // { label: "是否机会盘点", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableOpportunityCount" },
+  // { label: "是否动态盘点", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableOpportunityCount" },
   // { label: "是否领料", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enablePick" },
   // { label: "是否过量领料", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableOverPick" },
   // { label: "是否整包存储", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableWholeStore" },
@@ -367,24 +367,24 @@ export const LocationGroup =  [
   { label: "创建者Id", prop: "creatorId" },
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
   { label: "上次修改者Id", prop: "lastModifierId" },
-  { label: "仓库", prop: 'warehouseCode' },
+  { label: "仓库代码", prop: 'warehouseCode' },
+  { label: "是否混物品", prop: "enableMixItem", type: "filter", filters: "whetherOrNot" },
+  { label: "是否混批次", prop: "enableMixLot", type: "filter", filters: "whetherOrNot" },
+  { label: "是否混状态", prop: "enableMixStatus", type: "filter", filters: "whetherOrNot" },
+  { label: "是否负库存", prop: "enableNegative", type: "filter", filters: "whetherOrNot" },
+  { label: "是否保留零库存", prop: "enableKeepZero", type: "filter", filters: "whetherOrNot" },
+  { label: "是否动态盘点", prop: "enableOpportunityCount", type: "filter", filters: "whetherOrNot" },
+  { label: "是否领料", prop: "enablePick", type: "filter", filters: "whetherOrNot" },
+  { label: "是否过量领料", prop: "enableOverPick", type: "filter", filters: "whetherOrNot" },
+  { label: "是否整包存储", prop: "enableWholeStore", type: "filter", filters: "whetherOrNot" },
+  { label: "是否散件存储", prop: "enableBreakStore", type: "filter", filters: "whetherOrNot" },
+  { label: "是否发出", prop: "enableShip", type: "filter", filters: "whetherOrNot" },
+  { label: "是否接收", prop: "enableReceive", type: "filter", filters: "whetherOrNot" },
+  { label: "是否退货给供应商", prop: "enableReturnToSupplier", type: "filter", filters: "whetherOrNot" },
+  { label: "是否接收客户退货", prop: "enableReturnFromCustomer", type: "filter", filters: "whetherOrNot" },
+  { label: "是否拆箱", prop: "enableSplitBox", type: "filter", filters: "whetherOrNot" },
+  { label: "是否拆托", prop: "enableSplitPallet", type: "filter", filters: "whetherOrNot" },
   { label: "id", prop: 'id' },
-  { label: "可以混物品", prop: "enableMixItem", type: "filter", filters: "whetherOrNot" },
-  { label: "可以混批次", prop: "enableMixLot", type: "filter", filters: "whetherOrNot" },
-  { label: "可以混状态", prop: "enableMixStatus", type: "filter", filters: "whetherOrNot" },
-  { label: "可以负库存", prop: "enableNegative", type: "filter", filters: "whetherOrNot" },
-  { label: "可以保留零库存", prop: "enableKeepZero", type: "filter", filters: "whetherOrNot" },
-  { label: "可以机会盘点", prop: "enableOpportunityCount", type: "filter", filters: "whetherOrNot" },
-  { label: "可以领料", prop: "enablePick", type: "filter", filters: "whetherOrNot" },
-  { label: "可以过量领料", prop: "enableOverPick", type: "filter", filters: "whetherOrNot" },
-  { label: "可以整包存储", prop: "enableWholeStore", type: "filter", filters: "whetherOrNot" },
-  { label: "可以散件存储", prop: "enableBreakStore", type: "filter", filters: "whetherOrNot" },
-  { label: "可以发出", prop: "enableShip", type: "filter", filters: "whetherOrNot" },
-  { label: "可以接收", prop: "enableReceive", type: "filter", filters: "whetherOrNot" },
-  { label: "可以退货给供应商", prop: "enableReturnToSupplier", type: "filter", filters: "whetherOrNot" },
-  { label: "可以接收客户退货", prop: "enableReturnFromCustomer", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以拆箱", prop: "enableSplitBox", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以拆托", prop: "enableSplitPallet", type: "filter", filters: "whetherOrNot" },
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
@@ -412,35 +412,36 @@ export const Location =  [
   { label: "区域代码", prop: "areaCode" },
   { label: "库位组代码", prop: "locationGroupCode" },
   { label: "工作组代码", prop: "workGroupCode" },
-  { label: "类型", prop: "type", type: "filter", filters: "locationType" },
+  { label: "库位类型", prop: "type", type: "filter", filters: "locationType" },
   { label: "行号", prop: "rowCode" },
   { label: "列号", prop: "columnCode" },
   { label: "默认库存状态", prop: "defaultInventoryStatus", type: "filter", filters: "inventoryStage" },
   { label: "拣料优先级", prop: "pickPriority" },
   { label: "拣料顺序", prop: "pickOrder" },
   { label: "货架号", prop: "shelfCode" },
-  { label: "ERP库位", prop: "erpLocationCode" },
-  { label: "是否可以混物品", prop: "enableMixItem", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以混批次", prop: "enableMixLot", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以混状态", prop: "enableMixStatus", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以负库存", prop: "enableNegative", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以保留零库存", prop: "enableKeepZero", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以机会盘点", prop: "enableOpportunityCount", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以领料", prop: "enablePick", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以过量领料", prop: "enableOverPick", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以整包存储", prop: "enableWholeStore", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以散件存储", prop: "enableBreakStore", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以发出", prop: "enableShip", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以接收", prop: "enableReceive", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以退货给供应商", prop: "enableReturnToSupplier", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以接收客户退货", prop: "enableReturnFromCustomer", type: "filter", filters: "whetherOrNot" },
-  { label: "是否可以拆箱", prop: "enableSplitBox", type: "filter", filters: "whetherOrNot" },
+  { label: "ERP系统库位代码", prop: "erpLocationCode" },
+  { label: "是否混物品", prop: "enableMixItem", type: "filter", filters: "whetherOrNot" },
+  { label: "是否混批次", prop: "enableMixLot", type: "filter", filters: "whetherOrNot" },
+  { label: "是否混状态", prop: "enableMixStatus", type: "filter", filters: "whetherOrNot" },
+  { label: "是否负库存", prop: "enableNegative", type: "filter", filters: "whetherOrNot" },
+  { label: "是否保留零库存", prop: "enableKeepZero", type: "filter", filters: "whetherOrNot" },
+  { label: "是否动态盘点", prop: "enableOpportunityCount", type: "filter", filters: "whetherOrNot" },
+  { label: "是否领料", prop: "enablePick", type: "filter", filters: "whetherOrNot" },
+  { label: "是否过量领料", prop: "enableOverPick", type: "filter", filters: "whetherOrNot" },
+  { label: "是否整包存储", prop: "enableWholeStore", type: "filter", filters: "whetherOrNot" },
+  { label: "是否散件存储", prop: "enableBreakStore", type: "filter", filters: "whetherOrNot" },
+  { label: "是否发出", prop: "enableShip", type: "filter", filters: "whetherOrNot" },
+  { label: "是否接收", prop: "enableReceive", type: "filter", filters: "whetherOrNot" },
+  { label: "是否退货给供应商", prop: "enableReturnToSupplier", type: "filter", filters: "whetherOrNot" },
+  { label: "是否接收客户退货", prop: "enableReturnFromCustomer", type: "filter", filters: "whetherOrNot" },
+  { label: "是否拆箱", prop: "enableSplitBox", type: "filter", filters: "whetherOrNot" },
+  { label: "是否拆托", prop: "enableSplitPallet", type: "filter", filters: "whetherOrNot" },
   // { label: "是否混物品", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableMixItem" },
   // { label: "是否混批次", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableMixLot" },
   // { label: "是否混状态", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableMixStatus" },
   // { label: "是否负库存", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableNegative" },
   // { label: "是否保留零库存", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableKeepZero" },
-  // { label: "是否盘点", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableOpportunityCount" },
+  // { label: "是否动态盘点", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableOpportunityCount" },
   // { label: "是否领料", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enablePick" },
   // { label: "是否过量领料", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableOverPick" },
   // { label: "是否整包存储", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableWholeStore" },
@@ -512,7 +513,7 @@ export const ItemSafetyStock = [
   { label: "物品代码", prop: "itemCode" },
   { label: "仓库", prop: "warehouseCode" },
   { label: "存储关系类型", prop: "storeRelationType", type: "filter", filters: "storeRelationType" },
-  { label: "值", prop: "storeValue" },
+  { label: "存储关系代码", prop: "storeValue" },
   { label: "最大库存", prop: "maxStock" },
   { label: "最小库存", prop: "minStock" },
   { label: "安全库存", prop: "safetyStock" },
@@ -600,7 +601,7 @@ export const ProductionLine =  [
 // 生产线零件关系 20230328
 export const ProductionLineItem =  [
   { label: "物品代码", prop: "itemCode" },
-  { label: "生产线编号", prop: "prodLineCode" },
+  { label: "生产线代码", prop: "prodLineCode" },
   { label: "备注", prop: "remark" },
   // -----------------------------------------------------------------------
   { label: "事务代码", prop: "tenantId" },
@@ -612,15 +613,15 @@ export const ProductionLineItem =  [
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 工作站信息 20230328
+// 工作中心信息 20230328
 export const WorkCenter =  [
-  { label: "生产线编号", prop: "productionLineCode" },
+  { label: "生产线代码", prop: "productionLineCode" },
   { label: "原料库位", prop: "rawLocation" },
   { label: "成品库位", prop: "productLocation" },
-  { label: "工作站编号", prop: "code" },
-  { label: "工作站名称", prop: 'name' },
-  { type: "filter", label: "类型", prop: "type", filters: "workCenterType" },
-  { label: "描述", prop: "description" },
+  { label: "工作中心代码", prop: "code" },
+  { label: "工作中心名称", prop: 'name' },
+  { label: "工作中心类型", prop: "type", type: "filter", filters: "workCenterType" },
+  { label: "工作中心描述", prop: "description" },
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
   { label: "事务代码", prop: "tenantId" },
@@ -877,21 +878,21 @@ export const PurchaseOrder =  [
   // { label: "联系人邮件", prop: 'contactUserEmail' },
   // -----------------------------------------------------------------------
 ]
-// 到货通知 已调整 20221220
-export const ArriveNotice =  [
+// 到货请求 已调整 20230404
+export const PurchaseReceiptRequest =  [
   { label: "到货单号", prop: "number" },
   { label: "订单号", prop: "poNumber" },
   { label: "发货单号", prop: 'asnNumber' },
   { label: "供应商代码", prop: "supplierCode" },
   { label: "供应商名称", prop: "supplierName" },
   { label: "供应商地址", prop: "supplierAddress" },
-  { label: "要求到货日期", prop: "planArriveDate",type: "dateTime" },
+  { label: "计划到货日期", prop: "planArriveDate",type: "dateTime" },
   { label: "订单备注", prop: 'remark' },
   { label: "创建时间", prop: 'creationTime', type:'dateTime' },
   { label: "操作员", prop: 'worker' },
   // -----------------------------------------------------------------------
   { label: "要货计划单号", prop: 'rpNumber' },
-  { label: "状态", prop: "requestStatus",type: "filter", filters: "requestStatus" },
+  { label: "请求状态", prop: "requestStatus",type: "filter", filters: "requestStatus" },
   { label: "创建者Id", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
   { label: "上次修改者Id", prop: "lastModifierId" },
@@ -905,9 +906,9 @@ export const ArriveNotice =  [
   { label: "车牌号", prop: 'truckNumber' },
   { label: "收货口", prop: 'dockCode' },
   { label: "时间窗口", prop: 'timeWindow' },
-  { label: "仓库", prop: 'warehouseCode' },
+  // { label: "仓库", prop: 'warehouseCode' },
   { label: "id", prop: "id" },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
 // 采购收货任务 已调整 20221220

fe/PC/src/views/basicData/SupplierManage/Supplier.vue

@@ -222,7 +222,7 @@ export default {
           label: "发货单列表",
           name: 'fhdlb',
           url: 'wms/store/arrive-notice',
-          tableColumns: 'ArriveNotice',
+          tableColumns: 'PurchaseReceiptRequest',
           functionName: 'bySupplierCode'
         },
         {

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

@@ -132,7 +132,7 @@ export default {
         defaultLocationCode: null,
         description: null,
         name: null,
-        warehouseCode: null,
+        warehouseCode: localStorage.getItem('warehouseCode'),
         remark: null
       },
       //编辑
@@ -142,7 +142,7 @@ export default {
         defaultLocationCode: null,
         description: null,
         name: null,
-        warehouseCode: null,
+        warehouseCode: localStorage.getItem('warehouseCode'),
         remark: null
       },
       editOptions: {},
@@ -150,19 +150,21 @@ export default {
         { type: "filterSelect", label: "默认库位代码", prop: "defaultLocationCode", 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 },
-        { type: "input", label: "收货口编号", prop: "code", validType:'numberLetter', colSpan: 12 },
+        { type: "input", label: "收货口代码", prop: "code", validType:'numberLetter', colSpan: 12 },
         { 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 },
       ],
       editForm: [
-        { type: "input", label: "收货口编号", prop: "code", disabled:"true", colSpan: 12 },
+        { type: "input", label: "收货口代码", prop: "code", disabled:"true", colSpan: 12 },
         { type: "filterSelect", label: "默认库位代码", prop: "defaultLocationCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.editFormData) }, colSpan: 12 },
         { 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 },
       ],
       editRules: {
         cerateRule: {

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

@@ -154,7 +154,7 @@ export default {
       //新增
       CreateFormData: {
         itemCode: null,
-        warehouseCode: null,
+        warehouseCode: localStorage.getItem('warehouseCode'),
         storeRelationType: 1,
         storeValue: null,
         maxStock: null,
@@ -170,7 +170,7 @@ export default {
       //编辑
       editFormData: {
         itemCode: null,
-        warehouseCode: null,
+        warehouseCode: localStorage.getItem('warehouseCode'),
         storeRelationType: 1,
         storeValue: null,
         maxStock: null,
@@ -189,7 +189,7 @@ 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: "select", label: "存储关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
-        { type: "filterSelect", label: "值", prop: "storeValue", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "存储关系代码", prop: "storeValue", optionsLabel: "name", optionsValue: "code", 
           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: "最大库存", validType:'pointNumber', prop: "maxStock", colSpan: 12 },
@@ -199,11 +199,13 @@ 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 },
+        
       ],
       editForm: [
         { type: "input", label: "物品代码", prop: "itemCode", disabled:"true", colSpan: 12 },
         { type: "select", label: "存储关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
-        { type: "filterSelect", label: "值", prop: "storeValue", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "存储关系代码", prop: "storeValue", optionsLabel: "name", optionsValue: "code", 
           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: "最大库存", validType:'pointNumber', prop: "maxStock", colSpan: 12 },
@@ -213,6 +215,8 @@ 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 },
+        
       ],
       editRules: {
         cerateRule: {

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

@@ -153,7 +153,7 @@ export default {
       //新增
       CreateFormData: {
         remark: null,
-        warehouseCode: null,
+        warehouseCode: localStorage.getItem('warehouseCode'),
         storeRelationType: 1,
         storeValue: null,
         enabled: true,
@@ -171,7 +171,7 @@ export default {
       editFormData: {
         itemCode: null,
         remark: null,
-        warehouseCode: null,
+        warehouseCode: localStorage.getItem('warehouseCode'),
         storeRelationType: 1,
         storeValue: null,
         enabled: true,
@@ -201,6 +201,8 @@ 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: 'multiLoc',  disabled:"true", colSpan: 12 },
       ],
       editForm: [
         { type: "input", label: "物品代码", prop: "itemCode", disabled:"true", colSpan: 12 },
@@ -216,6 +218,8 @@ 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: 'multiLoc',  disabled:"true", colSpan: 12 },
       ],
       editRules: {
         cerateRule: {

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

@@ -133,7 +133,7 @@ export default {
       //新增
       CreateFormData: {
         remark: null,
-        warehouseCode: null,
+        warehouseCode: localStorage.getItem('warehouseCode'),
         name: null,
         description: null,
         type: 1,
@@ -187,7 +187,7 @@ export default {
       //编辑
       editFormData: {
         remark: null,
-        warehouseCode: null,
+        warehouseCode: localStorage.getItem('warehouseCode'),
         name: null,
         description: null,
         type: 1,
@@ -237,20 +237,20 @@ export default {
         { type: "input", label: "名称", prop: "name", colSpan: 12 },
         // { type: "input", label: "库位数量", valueType: Number, prop: "qty", colSpan: 12 },
         // { type: "select", label: "库位数量单位", prop: "uom", options: "qtyUomType", colSpan: 12 },
-        { type: "select", label: "类型", prop: "type", options: "locationType", colSpan: 12 },
+        { type: "select", label: "库位类型", prop: "type", options: "locationType", colSpan: 12 },
         { type: "input", label: "行号", prop: "rowCode", colSpan: 12, validType:'number' },
         { type: "input", label: "列号", prop: "columnCode", colSpan: 12, validType:'number' },
         { type: "select", label: "默认库存状态", prop: "defaultInventoryStatus", options: "inventoryStage", colSpan: 12 },
         { type: "input", label: "拣料优先级", prop: "pickPriority", colSpan: 12, validType:'number' },
         { type: "input", label: "拣料顺序", prop: "pickOrder", colSpan: 12, validType:'number' },
         { type: "input", label: "货架号", prop: "shelfCode", colSpan: 12 },
-        { type: "input", label: "ERP库位", prop: "erpLocationCode", colSpan: 12 },
+        { type: "input", label: "ERP系统库位代码", prop: "erpLocationCode", colSpan: 12 },
         { type: "select", label: "是否混物品", prop: "enableMixItem", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否混批次", prop: "enableMixLot", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否混状态", prop: "enableMixStatus", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否负库存", prop: "enableNegative", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否保留零库存", prop: "enableKeepZero", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否盘点", prop: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否动态盘点", prop: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否领料", prop: "enablePick", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否过量领料", prop: "enableOverPick", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否整包存储", prop: "enableWholeStore", options: "whetherOrNot", colSpan: 12 },
@@ -260,12 +260,13 @@ export default {
         { type: "select", label: "是否退货给供应商", prop: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 },
         { 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: "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 },
         // { type: "objectSelect", label: "是否负库存", prop: "locSwitch", showProp: "enableNegative", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否保留零库存", prop: "locSwitch", showProp: "enableKeepZero", options: "whetherOrNot", colSpan: 12 },
-        // { type: "objectSelect", label: "是否盘点", prop: "locSwitch", showProp: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
+        // { type: "objectSelect", label: "是否动态盘点", prop: "locSwitch", showProp: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否领料", prop: "locSwitch", showProp: "enablePick", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否过量领料", prop: "locSwitch", showProp: "enableOverPick", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否整包存储", prop: "locSwitch", showProp: "enableWholeStore", options: "whetherOrNot", colSpan: 12 },
@@ -277,6 +278,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 },
       ],
       editForm: [
         { type: "input", label: "库位代码", prop: "code", disabled:"true", colSpan: 12 },
@@ -292,20 +294,20 @@ export default {
         { type: "input", label: "名称", prop: "name", colSpan: 12 },
         // { type: "input", label: "库位数量", valueType: Number, prop: "qty", colSpan: 12 },
         // { type: "select", label: "库位数量单位", prop: "uom", options: "qtyUomType", colSpan: 12 },
-        { type: "select", label: "类型", prop: "type", options: "locationType", clearable: true, colSpan: 12 },
+        { type: "select", label: "库位类型", prop: "type", options: "locationType", clearable: true, colSpan: 12 },
         { type: "input", label: "行号", prop: "rowCode", colSpan: 12, validType:'number' },
         { type: "input", label: "列号", prop: "columnCode", colSpan: 12, validType:'number' },
         { type: "select", label: "默认库存状态", prop: "defaultInventoryStatus", options: "inventoryStage", colSpan: 12 },
         { type: "input", label: "拣料优先级", prop: "pickPriority", colSpan: 12, validType:'number' },
         { type: "input", label: "拣料顺序", prop: "pickOrder", colSpan: 12, validType:'number' },
         { type: "input", label: "货架号", prop: "shelfCode", colSpan: 12 },
-        { type: "input", label: "ERP库位", prop: "erpLocationCode", colSpan: 12 },
+        { type: "input", label: "ERP系统库位代码", prop: "erpLocationCode", colSpan: 12 },
         { type: "select", label: "是否混物品", prop: "enableMixItem", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否混批次", prop: "enableMixLot", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否混状态", prop: "enableMixStatus", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否负库存", prop: "enableNegative", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否保留零库存", prop: "enableKeepZero", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否盘点", prop: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否动态盘点", prop: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否领料", prop: "enablePick", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否过量领料", prop: "enableOverPick", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否整包存储", prop: "enableWholeStore", options: "whetherOrNot", colSpan: 12 },
@@ -313,10 +315,12 @@ export default {
         { type: "select", label: "是否发出", prop: "enableShip", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否接收", prop: "enableReceive", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否退货给供应商", prop: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否拆箱", prop: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 },
+        { 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: "description", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
+        { type: "input", label: "仓库代码", prop: 'warehouseCode',  disabled:"true", colSpan: 12 },
       ],
       editRules: {
         cerateRule: {
@@ -328,6 +332,7 @@ export default {
           erpLocationCode: [{ required: true, trigger: "change", message: "不可为空" }],
           rowCode:[{required: true, trigger: "change", message: "不可为空"}],
           columnCode:[{required: true, trigger: "change", message: "不可为空"}],
+          defaultInventoryStatus:[{required: true, trigger: "change", message: "不可为空"}],
         },
         editRule: {
           pickPriority: [{ required: true, trigger: "change", message: "不可为空" },],
@@ -337,6 +342,7 @@ export default {
           erpLocationCode: [{ required: true, trigger: "change", message: "不可为空" }],
           rowCode:[{required: true, trigger: "change", message: "不可为空"}],
           columnCode:[{required: true, trigger: "change", message: "不可为空"}],
+          defaultInventoryStatus:[{required: true, trigger: "change", message: "不可为空"}],
         }
       },
       // 自定义详情明细汇总等table页

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

@@ -208,34 +208,34 @@ export default {
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/area', 'Area', '区域选择', this.CreateFormData) }, colSpan: 12 },
         { type: "input", label: "库位组代码", prop: "code", validType:'numberLetter', colSpan: 12 },
         { type: "input", label: "库位组名称", prop: 'name', colSpan: 12 },
-        { type: "select", label: "类型", prop: "groupType", options: "locationType", colSpan: 12 },
-        { type: "select", label: "状态", prop: "defaultInventoryStatus", options: "inventoryStage", colSpan: 12 },
+        { type: "select", label: "库位组类型", prop: "groupType", options: "locationType", colSpan: 12 },
+        { type: "select", label: "默认库存状态", prop: "defaultInventoryStatus", options: "inventoryStage", colSpan: 12 },
         { type: "input", label: "拣料优先级", prop: "pickPriority", colSpan: 12 },
         { type: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "溢流库位组", prop: "overflowLocationGroup", colSpan: 12 },
-        { type: "select", label: "可以混物品", prop: "enableMixItem", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以混批次", prop: "enableMixLot", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以混状态", prop: "enableMixStatus", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以负库存", prop: "enableNegative", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以保留零库存", prop: "enableKeepZero", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以盘点", prop: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以领料", prop: "enablePick", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以过量领料", prop: "enableOverPick", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以整包存储", prop: "enableWholeStore", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以散件存储", prop: "enableBreakStore", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以发出", prop: "enableShip", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以接收", prop: "enableReceive", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以退货给供应商", prop: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 },
-        { 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: "select", label: "是否混物品", prop: "enableMixItem", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否混批次", prop: "enableMixLot", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否混状态", prop: "enableMixStatus", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否负库存", prop: "enableNegative", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否保留零库存", prop: "enableKeepZero", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否动态盘点", prop: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否领料", prop: "enablePick", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否过量领料", prop: "enableOverPick", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否整包存储", prop: "enableWholeStore", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否散件存储", prop: "enableBreakStore", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否发出", prop: "enableShip", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否接收", prop: "enableReceive", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否退货给供应商", prop: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 },
+        { 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: "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 },
         // { type: "objectSelect", label: "是否负库存", prop: "locSwitch", showProp: "enableNegative", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否保留零库存", prop: "locSwitch", showProp: "enableKeepZero", options: "whetherOrNot", colSpan: 12 },
-        // { type: "objectSelect", label: "是否机会盘点", prop: "locSwitch", showProp: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
+        // { type: "objectSelect", label: "是否动态盘点", prop: "locSwitch", showProp: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否领料", prop: "locSwitch", showProp: "enablePick", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否过量领料", prop: "locSwitch", showProp: "enableOverPick", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否整包存储", prop: "locSwitch", showProp: "enableWholeStore", options: "whetherOrNot", colSpan: 12 },
@@ -245,6 +245,7 @@ export default {
         // { type: "objectSelect", label: "是否退货给供应商", prop: "locSwitch", showProp: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否接收客户退货", prop: "locSwitch", showProp: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
+        { type: "input", label: "描述", prop: 'description', colSpan: 12 },
       ],
       editForm: [
         { type: "filterSelect", label: "区域代码", prop: "areaCode", optionsLabel: "name", optionsValue: "code", 
@@ -252,29 +253,30 @@ export default {
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/area', 'Area', '区域选择', this.editFormData) }, colSpan: 12 },
         { type: "input", label: "库位组代码", prop: "code", disabled:"true", colSpan: 12 },
         { type: "input", label: "库位组名称", prop: 'name', colSpan: 12 },
-        { type: "select", label: "类型", prop: "groupType", options: "locationType", colSpan: 12 },
-        { type: "select", label: "状态", prop: "defaultInventoryStatus", options: "inventoryStage", colSpan: 12 },
+        { type: "select", label: "库位组类型", prop: "groupType", options: "locationType", colSpan: 12 },
+        { type: "select", label: "默认库存状态", prop: "defaultInventoryStatus", options: "inventoryStage", colSpan: 12 },
         { type: "input", label: "拣料优先级", prop: "pickPriority", colSpan: 12 },
         { type: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "溢流库位组", prop: "overflowLocationGroup", colSpan: 12 },
-        { type: "select", label: "可以混物品", prop: "enableMixItem", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以混批次", prop: "enableMixLot", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以混状态", prop: "enableMixStatus", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以负库存", prop: "enableNegative", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以保留零库存", prop: "enableKeepZero", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以盘点", prop: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以领料", prop: "enablePick", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以过量领料", prop: "enableOverPick", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以整包存储", prop: "enableWholeStore", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以散件存储", prop: "enableBreakStore", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以发出", prop: "enableShip", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以接收", prop: "enableReceive", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以退货给供应商", prop: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 },
-        { 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: "select", label: "是否混物品", prop: "enableMixItem", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否混批次", prop: "enableMixLot", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否混状态", prop: "enableMixStatus", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否负库存", prop: "enableNegative", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否保留零库存", prop: "enableKeepZero", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否动态盘点", prop: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否领料", prop: "enablePick", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否过量领料", prop: "enableOverPick", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否整包存储", prop: "enableWholeStore", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否散件存储", prop: "enableBreakStore", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否发出", prop: "enableShip", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否接收", prop: "enableReceive", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否退货给供应商", prop: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 },
+        { 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: 'remark', colSpan: 12 },
+        { type: "input", label: "描述", prop: 'description', colSpan: 12 },
       ],
       editRules: {
         cerateRule: {
@@ -284,11 +286,13 @@ export default {
           areaCode: [{ required: true, trigger: "change", message: "不可为空" }],
           pickPriority: [{ required: true, trigger: "blur", message: "不可为空" }],
           name: [{ required: true, trigger: "blur", message: "不可为空" }],//编辑必选
+          defaultInventoryStatus: [{ required: true, trigger: "blur", message: "不可为空" }],//编辑必选
         },
         editRule: {
           name: [{ required: true, trigger: "blur", message: "不可为空" }],//编辑必选
           areaCode: [{ required: true, trigger: "change", message: "不可为空" }],
           pickPriority: [{ required: true, trigger: "blur", message: "不可为空" }],
+          defaultInventoryStatus: [{ required: true, trigger: "blur", message: "不可为空" }],//编辑必选
         }
       },
     };

fe/PC/src/views/basicData/WorkshopManage/ProdLineItem.vue

@@ -152,7 +152,7 @@ export default {
         { 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) }, colSpan: 12 },
-        { type: "filterSelect", label: "生产线编号", prop: "prodLineCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "生产线代码", prop: "prodLineCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/productionLine")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/productionLine', 'ProductionLine', '生产线选择', this.CreateFormData) }, colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
@@ -161,7 +161,7 @@ export default {
         { type: "filterSelect", label: "物品代码",disabled:true, 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.editFormData) }, colSpan: 12 },
-        { type: "filterSelect", label: "生产线编号", prop: "prodLineCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "生产线代码", prop: "prodLineCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/productionLine")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/productionLine', 'ProductionLine', '生产线选择', this.editFormData) }, colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },

fe/PC/src/views/basicData/WorkshopManage/WorkCenter.vue

@@ -151,7 +151,7 @@ export default {
       },
       editOptions: {},
       CreateForm: [
-        { type: "filterSelect", label: "生产线编号", prop: "productionLineCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "生产线代码", prop: "productionLineCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/productionLine")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/productionLine', 'ProductionLine', '生产线选择', this.CreateFormData) }, colSpan: 12 },
         { type: "filterSelect", label: "原料库位", prop: "rawLocationCode", optionsLabel: "name", optionsValue: "code", 
@@ -160,14 +160,14 @@ export default {
         { type: "filterSelect", label: "成品库位", prop: "productLocation", 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 },
-        { type: "input", label: "工作站编号", prop: "code", validType:'numberLetter', colSpan: 12 },
-        { type: "input", label: "工作站名称", prop: 'name', colSpan: 12 },
-        { type: "select", label: "类型", prop: "type", options: "workCenterType", colSpan: 12 },
-        { type: "input", label: "描述", prop: "description", colSpan: 12 },
+        { type: "input", label: "工作中心代码", prop: "code", validType:'numberLetter', colSpan: 12 },
+        { type: "input", label: "工作中心名称", prop: 'name', colSpan: 12 },
+        { type: "select", label: "工作中心类型", prop: "type", options: "workCenterType", colSpan: 12 },
+        { type: "input", label: "工作中心描述", prop: "description", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editForm: [
-        { type: "filterSelect", label: "生产线编号", prop: "productionLineCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "生产线代码", prop: "productionLineCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/productionLine")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/productionLine', 'ProductionLine', '生产线选择', this.editFormData) }, colSpan: 12 },
         { type: "filterSelect", label: "原料库位", prop: "rawLocationCode", optionsLabel: "name", optionsValue: "code", 
@@ -176,10 +176,10 @@ export default {
         { type: "filterSelect", label: "成品库位", prop: "productLocation", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.editFormData) }, colSpan: 12 },
-        { type: "input", label: "工作站编号", prop: "code", validType:'numberLetter', colSpan: 12 },
-        { type: "input", label: "工作站名称", prop: 'name', colSpan: 12 },
-        { type: "select", label: "类型", prop: "type", options: "workCenterType", colSpan: 12 },
-        { type: "input", label: "描述", prop: "description", colSpan: 12 },
+        { type: "input", label: "工作中心代码", prop: "code", validType:'numberLetter', colSpan: 12 },
+        { type: "input", label: "工作中心名称", prop: 'name', colSpan: 12 },
+        { type: "select", label: "工作中心类型", prop: "type", options: "workCenterType", colSpan: 12 },
+        { type: "input", label: "工作中心描述", prop: "description", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editRules: {

fe/PC/src/views/rawMaterialManage/purchaseReceipt/ArriveNotice-ms.vue → fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptRequest.vue

@@ -66,7 +66,7 @@ import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
 import { mixins } from "@/mixins/mixins";
 import {initPrintPackingCodeManyData } from "@/mixins/printMixin"
 export default {
-  name: "ArriveNotice",
+  name: "PurchaseReceiptRequest",
   mixins: [
     tableMixins,
     LoadingMixins,
@@ -83,7 +83,7 @@ export default {
   },
   data() {
     return {
-      URL: "wms/store/arrive-notice",
+      URL: "wms/store/purchase-receipt-request",
       DrawerButtonData: [
         {
           type: 'info',
@@ -96,6 +96,7 @@ export default {
       ],
       //常用按钮数据
       currenButtonData: [
+        this.defaultExportBtn(),//导出
         this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选