From c98ce8d88163d26664ec10837e48fdc65c5228b2 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Fri, 29 Mar 2024 11:55:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=9D=A1=E7=A0=81=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E7=AE=A1=E7=90=86=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/buttMesManage/mesBarCode/index.vue      | 17 +++--------------
 .../buttMesManage/mesBarCode/mesBarCode.data.ts |  6 ++----
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/src/views/wms/buttMesManage/mesBarCode/index.vue b/src/views/wms/buttMesManage/mesBarCode/index.vue
index ec7404601..4718c9c79 100644
--- a/src/views/wms/buttMesManage/mesBarCode/index.vue
+++ b/src/views/wms/buttMesManage/mesBarCode/index.vue
@@ -27,9 +27,9 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
-          <span>{{ row.code }}</span>
+      <template #plnt="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.plnt)">
+          <span>{{ row.plnt }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
@@ -154,17 +154,6 @@ const openForm = (type: string, row?: any) => {
 
 // form表单提交
 const formsSuccess = async (formType,data) => {
-  var isHave =MesBarCode.allSchemas.formSchema.some(function (item) {
-    return item.field === 'activeTime' || item.field === 'expireTime';
-  });
-  if(isHave){
-    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
-      message.error('失效时间要大于生效时间')
-      return;
-    }
-  }
-  if(data.activeTime==0)data.activeTime = null;
-  if(data.expireTime==0)data.expireTime = null;
   if (formType === 'create') {
     await MesBarCodeApi.createMesBarCode(data)
     message.success(t('common.createSuccess'))
diff --git a/src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts b/src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts
index 78c22dab4..00ec5cec7 100644
--- a/src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts
+++ b/src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts
@@ -9,7 +9,7 @@ export const MesBarCodeRules = reactive({
 export const MesBarCode = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: 'Plnt',
-    field: 'plat',
+    field: 'plnt',
     sort: 'custom',
     table: {
       width: 120
@@ -26,6 +26,7 @@ export const MesBarCode = useCrudSchemas(reactive<CrudSchema[]>([
   table: {
       width: 150
     },
+    isSearch:true
   },
   {
     label: 'SIGN',
@@ -74,9 +75,6 @@ export const MesBarCode = useCrudSchemas(reactive<CrudSchema[]>([
   table: {
       width: 120
     },
-                form: {
-                  component: 'SelectV2'
-                },
   },
   {
     label: 'Length BC',