From 7da73a5e3d9c76c8077e506991040fe56ee9d879 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Tue, 27 Jun 2023 10:21:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=98=AFpda=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E7=9B=98=E7=82=B9=EF=BC=8C=E5=BA=93=E4=BD=8D=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E7=A6=81=E6=AD=A2=E4=BD=BF=E7=94=A8=E7=BA=BF=E8=BE=B9?=
 =?UTF-8?q?=E5=BA=93=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/StepsCountPlanForm/index.vue   |  18 ++-
 .../src/components/conditionFilters/index.vue |   1 +
 fe/PC/src/filters/status.js                   | 144 +++++++++---------
 fe/PC/src/utils/tableColumns/index.js         |  48 ------
 4 files changed, 89 insertions(+), 122 deletions(-)

diff --git a/fe/PC/src/components/StepsCountPlanForm/index.vue b/fe/PC/src/components/StepsCountPlanForm/index.vue
index db462f07a..12b854f7b 100644
--- a/fe/PC/src/components/StepsCountPlanForm/index.vue
+++ b/fe/PC/src/components/StepsCountPlanForm/index.vue
@@ -41,6 +41,7 @@
       <!-- 库位参数 -->
       <!-- 搜索按钮——窗体组件LocationForPADPlan -->
       <searchPage
+        v-if="active == 1"
         ref="searchTable"
         :tableLoading="tableLoading"
         :advancedFilter="advancedFilter(
@@ -57,7 +58,7 @@
         :selectionTable="false"
         :editHandle="editHandle"
         :searchTableData="locationData"
-        :searchTableColumns="$isTableColumns.Location"
+        :searchTableColumns="initSearchPageTableColums()"
         :searchTotalCount="totalCountLocation"
         :supplierItemPage="pageListLocation"
         @SizeChange="AddNewAlterResultCount(
@@ -383,6 +384,17 @@ export default {
     this.session = JSON.parse(JSON.stringify(this.CreateFormData));
   },
   methods: {
+    // 初始化库位筛选列表数据，目的：pda的库位类型不可以选择线边库位
+    initSearchPageTableColums(){
+      let _list = JSON.parse(JSON.stringify(this.$isTableColumns.Location));
+      _list.forEach(item => {
+        // 如果是pda类型盘点，库位类型 则使用 locationTypeForPADPlan 枚举（区别为线边库位为不可选）
+        if(item.prop == 'type'){
+          item.filters = this.CreateFormData.requestType == 2 ? 'locationTypeForPADPlan' : 'locationType'
+        }
+      });
+      return _list
+    },
     //结束退出
     close(val) {
       this.active = 0;
@@ -529,7 +541,6 @@ export default {
     // 下一步
     editFormClick(val) {
       //   Moment(this.CreateFormData.arriveTime).format()
-        console.log(543,val)
       if (val[0] == 0) {
         if (this.active == 0) {
           this.close(0);
@@ -549,7 +560,8 @@ export default {
                   action: "!=",
                   column: "type",
                   logic: "And",
-                  value: "5"
+                  value: "5",
+                  hide:true
                 })
               }
               const Function = this.advancedFilter(
diff --git a/fe/PC/src/components/conditionFilters/index.vue b/fe/PC/src/components/conditionFilters/index.vue
index 0c1e4388e..637995f89 100644
--- a/fe/PC/src/components/conditionFilters/index.vue
+++ b/fe/PC/src/components/conditionFilters/index.vue
@@ -99,6 +99,7 @@
                     ]()"
                     :key="item.value"
                     :label="item.label"
+                    :disabled="item.disabled"
                     :value="
                       typeof item.value == 'string'
                         ? item.value
diff --git a/fe/PC/src/filters/status.js b/fe/PC/src/filters/status.js
index 70603151e..fca8b328c 100644
--- a/fe/PC/src/filters/status.js
+++ b/fe/PC/src/filters/status.js
@@ -947,82 +947,84 @@ export function locationType(index, prop) {
   }
   return Enum(type, index, prop)
 }
-//库位类型（盘点新增选择计划库位参数页面使用 线边库位)
+//库位类型-pad类型盘点（盘点新增选择计划第二步骤的库位列表高级筛选的使用)
+// 区别于【locationType】：线边库位为不可选择
 /**
  * 
  * @param {Boolean}  
  * @returns {object}
  */
-//  export function locationTypeForPADPlan(index, prop) {
-//   let type = {
-//     1: {
-//       label: "待检库位",
-//       value: 1,
-//       UK: 'INSP'
-//     },
-//     2: {
-//       label: "原材料库位",
-//       value: 2,
-//       UK: 'RAW'
-//     },
-//     3: {
-//       label: "半成品库位",
-//       value: 3,
-//       UK: 'SEMI'
-//     },
-//     4: {
-//       label: "成品库位",
-//       value: 4,
-//       UK: 'FG'
-//     },
-//     // 5: {
-//     //   label: "线边库位",
-//     //   value: 5,
-//     //   UK: 'WIP'
-//     // },
-//     6: {
-//       label: "隔离库位",
-//       value: 6,
-//       UK: 'HOLD'
-//     },
-//     7: {
-//       label: "报废库位",
-//       value: 7,
-//       UK: 'SCRAP'
-//     },
-//     8: {
-//       label: "不合格品库位",
-//       value: 8,
-//       UK: 'NOC'
-//     },
-//     9: {
-//       label: "溢出库位",
-//       value: 9,
-//       UK: 'OVERFLOW'
-//     },
-//     10: {
-//       label: "客户库位",
-//       value: 10,
-//       UK: 'CUST'
-//     },
-//     11: {
-//       label: "外库位",
-//       value: 11,
-//       UK: 'OUTSIDE'
-//     },
-//     12: {
-//       label: "盘点差异库位",
-//       value: 12,
-//       UK: 'DIFF'
-//     },
-//     13: {
-//       label: "在途库位",
-//       value: 13,
-//       UK: 'TRANSPORT'
-//     }
-//   }
-//   return Enum(type, index, prop)
-// }
+ export function locationTypeForPADPlan(index, prop) {
+  let type = {
+    1: {
+      label: "待检库位",
+      value: 1,
+      UK: 'INSP'
+    },
+    2: {
+      label: "原材料库位",
+      value: 2,
+      UK: 'RAW'
+    },
+    3: {
+      label: "半成品库位",
+      value: 3,
+      UK: 'SEMI'
+    },
+    4: {
+      label: "成品库位",
+      value: 4,
+      UK: 'FG'
+    },
+    5: {
+      label: "线边库位",
+      value: 5,
+      UK: 'WIP',
+      disabled:true
+    },
+    6: {
+      label: "隔离库位",
+      value: 6,
+      UK: 'HOLD'
+    },
+    7: {
+      label: "报废库位",
+      value: 7,
+      UK: 'SCRAP'
+    },
+    8: {
+      label: "不合格品库位",
+      value: 8,
+      UK: 'NOC'
+    },
+    9: {
+      label: "溢出库位",
+      value: 9,
+      UK: 'OVERFLOW'
+    },
+    10: {
+      label: "客户库位",
+      value: 10,
+      UK: 'CUST'
+    },
+    11: {
+      label: "外库位",
+      value: 11,
+      UK: 'OUTSIDE'
+    },
+    12: {
+      label: "盘点差异库位",
+      value: 12,
+      UK: 'DIFF'
+    },
+    13: {
+      label: "在途库位",
+      value: 13,
+      UK: 'TRANSPORT'
+    }
+  }
+  return Enum(type, index, prop)
+}
 
 //库位类型
 /**
diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index 943ebc1e9..c7c98fa67 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -3316,54 +3316,6 @@ export const CountPlan = [
   // { label: "jsonInventoryStatus", prop: 'jsonInventoryStatus' },
   // ************** 确认隐藏 ************************
 ]
-// 盘点计划库位(盘点新增选择计划库位参数页面使用) 20230626
-// export const LocationForPADPlan = [
-//   {
-//     label: "库位代码",
-//     fixed: "left",
-//     type: "name",
-//     prop: "code"
-//   },
-//   { label: "库位名称", prop: "name" },
-//   { label: "仓库代码", prop: "warehouseCode" },
-//   { label: "区域代码", prop: "areaCode" },
-//   { label: "库位组代码", prop: "locationGroupCode" },
-//   { label: "工作组代码", prop: "workGroupCode" },
-//   { label: "库位类型", prop: "type", type: "filter", filters: "locationTypeForPADPlan" },
-//   { label: "ERP系统库位代码", prop: "erpLocationCode" },
-//   { label: "默认库存状态", prop: "defaultInventoryStatus", type: "filter", filters: "inventoryStage", width:'130px' },
-//   { label: "货架号", prop: "shelfCode" },
-//   { label: "行号", prop: "rowCode" },
-//   { 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: "remark" },
-//   { label: "描述", prop: "description" },
-//   { label: "创建时间", prop: "creationTime", type: "dateTime" },
-//   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-//   // {
-//   //   label: "操作",
-//   //   type:"buttonOperation", 
-//   //   buttonText:'编辑|删除', 
-//   //   buttonName:'edit|delete',
-//   //   fixed: "right"
-//   // },
-// ]
 // 盘点任务 20230415
 export const CountJob =  [
   {