From 72c5db5148fdb0ea0cf005fbbd57f783a88d9cfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Mon, 3 Jul 2023 15:53:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E4=BD=BF=E7=94=A8excel?=
 =?UTF-8?q?=E7=9B=98=E7=82=B9=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6=E4=B8=8D?=
 =?UTF-8?q?=E7=AD=89=E4=BA=8E=E5=8E=9F=E6=9D=90=E6=96=99=E5=BA=93=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/StepsCountPlanForm/index.vue   | 21 ++++-
 fe/PC/src/filters/status.js                   | 80 ++++++++++++++++++-
 2 files changed, 99 insertions(+), 2 deletions(-)

diff --git a/fe/PC/src/components/StepsCountPlanForm/index.vue b/fe/PC/src/components/StepsCountPlanForm/index.vue
index cd7c2a23b..08873a921 100644
--- a/fe/PC/src/components/StepsCountPlanForm/index.vue
+++ b/fe/PC/src/components/StepsCountPlanForm/index.vue
@@ -391,8 +391,9 @@ export default {
       let _list = JSON.parse(JSON.stringify(this.$isTableColumns.Location));
       _list.forEach(item => {
         // 如果是pda类型盘点，库位类型 则使用 locationTypeForPADPlan 枚举（区别为线边库位为不可选）
+        // 如果是Excel类型盘点，库位类型 则使用 locationTypeForExcelPlan 枚举（区别为原材料库位为不可选）
         if(item.prop == 'type'){
-          item.filters = this.CreateFormData.requestType == 2 ? 'locationTypeForPADPlan' : 'locationType'
+          item.filters = this.CreateFormData.requestType == 2 ? 'locationTypeForPADPlan' : 'locationTypeForExcelPlan'
         }
       });
       return _list
@@ -447,6 +448,24 @@ export default {
             }
           })
         }
+        // 如果是Excel盘点类型(this.CreateFormData.requestType == 1)，过滤原材料
+        else{
+          let _filter = {
+            action: "!=",
+            column: "type",
+            logic: "And",
+            value: "2",
+            hide:true
+          }
+          if(this.pageListLocation.condition.filters.length <= 0){
+            this.pageListLocation.condition.filters.push(_filter)
+          }
+          list.condition.filters.forEach((item,key)=>{
+            if(item.action == '!=' && item.column == 'type' && item.value == '2'){
+              item.hide = true
+            }
+          })
+        }
         getPageList(list, url)
           .then((res) => {
             this[data] = res.items;
diff --git a/fe/PC/src/filters/status.js b/fe/PC/src/filters/status.js
index 8110f996b..59dc1a1a9 100644
--- a/fe/PC/src/filters/status.js
+++ b/fe/PC/src/filters/status.js
@@ -871,7 +871,7 @@ export function TransSubType(index, prop) {
   }
   return Enum(type, index, prop)
 }
-//库位类型
+//库位类型 注意！！！更改时候将 locationTypeForPADPlan 和 locationTypeForExcelPlan同步更改
 /**
  * 
  * @param {Boolean}  
@@ -1025,6 +1025,84 @@ export function locationType(index, prop) {
   }
   return Enum(type, index, prop)
 }
+//库位类型-Excel类型盘点（盘点新增选择计划第二步骤的库位列表高级筛选的使用)
+// 区别于【locationType】：原材料库位为不可选择
+/**
+ * 
+ * @param {Boolean}  
+ * @returns {object}
+ */
+ export function locationTypeForExcelPlan(index, prop) {
+  let type = {
+    1: {
+      label: "待检库位",
+      value: 1,
+      UK: 'INSP'
+    },
+    2: {
+      label: "原材料库位",
+      value: 2,
+      UK: 'RAW',
+      disabled:true
+    },
+    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)
+}
 
 //库位类型
 /**