备份同步更改

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

@@ -3326,6 +3326,54 @@ export const CountPlan = [
   // { label: "jsonInventoryStatus", prop: 'jsonInventoryStatus' },
   // ************** 确认隐藏 ************************
 ]
+// 新增盘点计划-选择库位 20230328
+export const CountPlanByAddLocation = [
+  {
+    label: "库位代码",
+    fixed: "left",
+    type: "name",
+    prop: "code"
+  },
+  { label: "库位名称", prop: "name", showProp:true },
+  { label: "仓库代码", prop: "warehouseCode", showProp:true },
+  { label: "区域代码", prop: "areaCode", showProp:true },
+  { label: "库位组代码", prop: "locationGroupCode", showProp:true },
+  { label: "工作组代码", prop: "workGroupCode", showProp:true },
+  { label: "库位类型", prop: "type", type: "filter", filters: "locationType" },
+  { label: "ERP系统库位代码", prop: "erpLocationCode", showProp:true },
+  { label: "默认库存状态", prop: "defaultInventoryStatus", type: "filter", filters: "inventoryStage", width:'130px', showProp:true },
+  { label: "货架号", prop: "shelfCode", showProp:true },
+  { label: "行号", prop: "rowCode", showProp:true },
+  { label: "列号", prop: "columnCode", showProp:true },
+  { label: "拣料优先级", prop: "pickPriority", showProp:true },
+  { label: "拣料顺序", prop: "pickOrder", showProp:true },
+  { label: "是否混物品", prop: "enableMixItem", type: "filter", filters: "whetherOrNot", showProp:true },
+  { label: "是否混批次", prop: "enableMixLot", type: "filter", filters: "whetherOrNot", showProp:true },
+  { label: "是否混状态", prop: "enableMixStatus", type: "filter", filters: "whetherOrNot", showProp:true },
+  { label: "是否负库存", prop: "enableNegative", type: "filter", filters: "whetherOrNot", showProp:true },
+  { label: "是否保留零库存", prop: "enableKeepZero", type: "filter", filters: "whetherOrNot", showProp:true },
+  { label: "是否动态盘点", prop: "enableOpportunityCount", type: "filter", filters: "whetherOrNot", showProp:true },
+  { label: "是否领料", prop: "enablePick", type: "filter", filters: "whetherOrNot", showProp:true },
+  { label: "是否过量领料", prop: "enableOverPick", type: "filter", filters: "whetherOrNot", showProp:true },
+  { label: "是否整包存储", prop: "enableWholeStore", type: "filter", filters: "whetherOrNot", showProp:true },
+  { label: "是否散件存储", prop: "enableBreakStore", type: "filter", filters: "whetherOrNot", showProp:true },
+  { label: "是否发出", prop: "enableShip", type: "filter", filters: "whetherOrNot", showProp:true },
+  { label: "是否接收", prop: "enableReceive", type: "filter", filters: "whetherOrNot", showProp:true },
+  { label: "是否退货给供应商", prop: "enableReturnToSupplier", type: "filter", filters: "whetherOrNot", showProp:true },
+  { label: "是否接收客户退货", prop: "enableReturnFromCustomer", type: "filter", filters: "whetherOrNot", showProp:true },
+  { label: "是否拆箱", prop: "enableSplitBox", type: "filter", filters: "whetherOrNot", showProp:true },
+  { label: "备注", prop: "remark", showProp:true },
+  { label: "描述", prop: "description", showProp:true },
+  { label: "创建时间", prop: "creationTime", type: "dateTime", showProp:true },
+  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime", showProp:true },
+  // {
+  //   label: "操作",
+  //   type:"buttonOperation", 
+  //   buttonText:'编辑|删除', 
+  //   buttonName:'edit|delete',
+  //   fixed: "right"
+  // },
+]
 // 盘点任务 20230415
 export const CountJob =  [
   {