From 7e481a2c44d3d1310fea871a555344e159eb2eee Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Fri, 28 Jun 2024 15:20:08 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D=201=E3=80=81=E7=9B=98?=
 =?UTF-8?q?=E7=82=B9=E8=AE=A1=E5=88=92=EF=BC=8C=E6=96=B0=E5=A2=9E=E7=9A=84?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E5=BF=BD=E7=95=A5=E5=90=8D=E5=8D=95=E3=80=81?=
 =?UTF-8?q?=E5=BA=93=E4=BD=8D=E5=BF=BD=E7=95=A5=E5=90=8D=E5=8D=95=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=9C=A8=E8=A1=A8=E5=A4=B4=E6=98=BE=E7=A4=BA=EF=BC=8C?=
 =?UTF-8?q?=E5=B9=B6=E6=B7=BB=E5=8A=A0=E5=BF=BD=E7=95=A5=E7=9A=84=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E3=80=81=E5=BA=93=E4=BD=8D=E6=B2=A1=E6=9C=89=E5=BF=BD?=
 =?UTF-8?q?=E7=95=A5=E7=9B=98=E7=82=B9=EF=BC=8C=E5=BA=94=E5=BF=BD=E7=95=A5?=
 =?UTF-8?q?=E7=9B=98=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../count/countPlanMain/countPlanMain.data.ts | 78 +++++++++----------
 .../countManage/count/countPlanMain/index.vue |  3 +-
 2 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
index 3e0b98967..e7fe06072 100644
--- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
+++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
@@ -83,45 +83,45 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  // {
-  //   label: '物料忽略名单',
-  //   field: 'ignoreListOfItem',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     componentProps: {
-  //       isSearchList: true, // 开启查询弹窗
-  //       multiple:true,//是否可以多选
-  //       searchListPlaceholder: '请选择物料忽略名单', // 输入框占位文本
-  //       searchField: 'code', // 查询弹窗赋值字段
-  //       searchTitle: '物料信息', // 查询弹窗标题
-  //       searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
-  //       searchPage: ItembasicApi.getItembasicPage // 查询弹窗所需分页方法
-  //     }
-  //   }
-  // },
-  // {
-  //   label: '库位忽略名单',
-  //   field: 'ignoreListOfLocation',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     componentProps: {
-  //       isSearchList: true, // 开启查询弹窗
-  //       multiple:true,//是否可以多选
-  //       searchListPlaceholder: '请选择库位忽略名单', // 输入框占位文本
-  //       searchField: 'code', // 查询弹窗赋值字段
-  //       searchTitle: '库位信息', // 查询弹窗标题
-  //       searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
-  //       searchPage: LocationApi.getLocationPage // 查询弹窗所需分页方法
-  //
-  //     }
-  //   }
-  // },
+  {
+    label: '物料忽略名单',
+    field: 'ignoreListOfItem',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        multiple:true,//是否可以多选
+        searchListPlaceholder: '请选择物料忽略名单', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '物料信息', // 查询弹窗标题
+        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+        searchPage: ItembasicApi.getItembasicPage // 查询弹窗所需分页方法
+      }
+    }
+  },
+  {
+    label: '库位忽略名单',
+    field: 'ignoreListOfLocation',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        multiple:true,//是否可以多选
+        searchListPlaceholder: '请选择库位忽略名单', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '库位信息', // 查询弹窗标题
+        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+        searchPage: LocationApi.getLocationPage // 查询弹窗所需分页方法
+
+      }
+    }
+  },
   // {
   //   label: '盘点范围列表',
   //   field: 'scopeList',
diff --git a/src/views/wms/countManage/count/countPlanMain/index.vue b/src/views/wms/countManage/count/countPlanMain/index.vue
index 06aed60fa..5d7c2ecb9 100644
--- a/src/views/wms/countManage/count/countPlanMain/index.vue
+++ b/src/views/wms/countManage/count/countPlanMain/index.vue
@@ -54,7 +54,6 @@
     :formAllSchemas="CountPlanMain.allSchemas"
     :tableAllSchemas="CountPlanDetail.allSchemas"
     :tableFormRules="CountPlanDetailRules"
-    :CountPlanMain1FormAllSchemas="CountPlanMain1.allSchemas"
     :tableData="tableData"
     :apiUpdate="CountPlanMainApi.updateCountPlanMain"
     :apiCreate="CountPlanMainApi.createCountPlanMain"
@@ -113,7 +112,7 @@ import {
   CountPlanMainRules,
   CountPlanDetail,
   CountPlanDetailRules,
-  CountPlanMain1
+  // CountPlanMain1
 } from './countPlanMain.data'
 import * as CountPlanMainApi from '@/api/wms/countPlanMain'
 import * as CountPlanDetailApi from '@/api/wms/countPlanDetail'