From 445aed7b222143428b3e35c2fa9fdd838a268063 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 1 Aug 2024 13:57:06 +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=EF=BC=8C=E5=88=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Descriptions/src/Descriptions.vue         |   5 +
 src/types/descriptions.d.ts                   |   1 +
 .../wms/buttMesManage/mesBarCode/index.vue    |   7 +
 .../mesBarCode/mesBarCode.data.ts             | 296 ++++++++++--------
 4 files changed, 176 insertions(+), 133 deletions(-)

diff --git a/src/components/Descriptions/src/Descriptions.vue b/src/components/Descriptions/src/Descriptions.vue
index 23ed47eb2..118cbcc9f 100644
--- a/src/components/Descriptions/src/Descriptions.vue
+++ b/src/components/Descriptions/src/Descriptions.vue
@@ -145,6 +145,11 @@ const showAll = () =>{
                   data[item.field] !== null ? dayjs(data[item.field]).format(item.dateFormat) : ''
                 }}
               </slot>
+              <slot v-if="item.valueFilter">
+                {{
+                  item.valueFilter(data[item.field])
+                }}
+              </slot>
               <slot v-else-if="item.dictType">
                 <div v-if="data[item.field]&&Array.isArray(data[item.field])" >
                   <DictTag :type="item.dictType" :value="cur" v-for="(cur,key) in data[item.field]" :key="key" style="margin-right: 6px;margin-bottom: 6px;"/>
diff --git a/src/types/descriptions.d.ts b/src/types/descriptions.d.ts
index 35c0b81be..70be082d8 100644
--- a/src/types/descriptions.d.ts
+++ b/src/types/descriptions.d.ts
@@ -9,5 +9,6 @@ export interface DescriptionsSchema {
   className?: string
   labelClassName?: string
   dateFormat?: string // add by 星语：支持时间的格式化
+  valueFilter?: function // 展示的过滤函数
   dictType?: string // add by 星语：支持 dict 字典数据
 }
diff --git a/src/views/wms/buttMesManage/mesBarCode/index.vue b/src/views/wms/buttMesManage/mesBarCode/index.vue
index 0a1eebafe..8fcfd22b5 100644
--- a/src/views/wms/buttMesManage/mesBarCode/index.vue
+++ b/src/views/wms/buttMesManage/mesBarCode/index.vue
@@ -27,6 +27,13 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
+    
+    <template #type="{row}">
+        <span v-if="row.type == 'P'||row.type == 'Q'">
+          {{ row.type == 'P'?'未加密标签':'加密标签'}}
+        </span>
+        <span v-else>{{ row.type }}</span>
+      </template>
       <template #plnt="{row}">
         <el-button type="primary" link @click="openDetail(row, '代码', row.plnt)">
           <span>{{ row.plnt }}</span>
diff --git a/src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts b/src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts
index 0124386fa..e59718da6 100644
--- a/src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts
+++ b/src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts
@@ -1,6 +1,8 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
-
+import {  getTenantId } from '@/utils/auth'
+let names =[{"text":"1379","value":1},{"text":"1397","value":2},{"text":"2379","value":3}]
+let tenant = names.find(item=>item.value == getTenantId())
 // 表单校验
 export const MesBarCodeRules = reactive({
   available: [required],
@@ -11,79 +13,106 @@ export const MesBarCodeRules = reactive({
 
 export const MesBarCode = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: 'Plnt',
+    label: '租户',
     field: 'plnt',
     sort: 'custom',
     table: {
       width: 120
     },
     form: {
-      component: 'InputNumber',
-      value: 0
-    },
-  },
-  {
-    label: 'Counter',
-    field: 'counter',
-    sort: 'custom',
-  table: {
-      width: 150
-    },
-    isSearch:true
-  },
-  {
-    label: 'SIGN',
-    field: 'sign',
-    sort: 'custom',
-  table: {
-      width: 120
-    },
-  },
-  {
-    label: 'Option',
-    field: 'option',
-    sort: 'custom',
-  table: {
-      width: 120
+      componentProps: {
+        disabled:true,
+        value: tenant?.text
+      },
     },
   },
+  // {
+  //   label: 'Counter',
+  //   field: 'counter',
+  //   sort: 'custom',
+  // table: {
+  //     width: 150
+  //   },
+  //   isSearch:true
+  // },
+  // {
+  //   label: 'SIGN',
+  //   field: 'sign',
+  //   sort: 'custom',
+  // table: {
+  //     width: 120
+  //   },
+  // },
+  // {
+  //   label: 'Option',
+  //   field: 'option',
+  //   sort: 'custom',
+  // table: {
+  //     width: 120
+  //   },
+  // },
   {
-    label: 'Lower Lim.',
+    label: 'WMS物料代码',
     field: 'lowerLim',
     sort: 'custom',
-  table: {
-      width: 150
-    },
-  },
-  {
-    label: 'UpperLimit',
-    field: 'upperLimit',
-    sort: 'custom',
-  table: {
+    isSearch: true,
+    table: {
       width: 150
     },
   },
+  // {
+  //   label: 'UpperLimit',
+  //   field: 'upperLimit',
+  //   sort: 'custom',
+  // table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: 'ITAC',
+  //   field: 'itac',
+  //   sort: 'custom',
+  // table: {
+  //     width: 120
+  //   },
+  // },
   {
-    label: 'ITAC',
-    field: 'itac',
-    sort: 'custom',
-  table: {
-      width: 120
-    },
-  },
-  {
-    label: 'Type',
+    label: '灯码标签类型',
     field: 'type',
     sort: 'custom',
-  table: {
+    table: {
       width: 120
     },
+    form: {
+      component: 'Select',
+      componentProps: {
+        options: [{
+          label:'未加密标签',
+          value:'P'
+        },{
+          label:'加密标签',
+          value:'Q'
+        }],
+      }
+    },
+    detail:{
+      valueFilter:(value)=>{
+        if(value=='P'){
+          return `未加密标签`
+        }else if(value=='Q'){
+          return '加密标签'
+        }else{
+          return value
+        }
+      }
+    }
+    
   },
   {
-    label: 'Length BC',
+    label: '灯码标签字符总长度',
     field: 'lengthBc',
     sort: 'custom',
-  table: {
+    table: {
       width: 150
     },
     form: {
@@ -91,19 +120,19 @@ export const MesBarCode = useCrudSchemas(reactive<CrudSchema[]>([
       value: 0
     },
   },
+  // {
+  //   label: 'Pos. mat',
+  //   field: 'posMat',
+  //   sort: 'custom',
+  // table: {
+  //     width: 150
+  //   },
+  // },
   {
-    label: 'Pos. mat',
-    field: 'posMat',
-    sort: 'custom',
-  table: {
-      width: 150
-    },
-  },
-  {
-    label: 'Length mat',
+    label: '客户物料代码字符长度',
     field: 'lengthMat',
     sort: 'custom',
-  table: {
+    table: {
       width: 150
     },
     form: {
@@ -111,76 +140,77 @@ export const MesBarCode = useCrudSchemas(reactive<CrudSchema[]>([
       value: 0
     },
   },
+  // {
+  //   label: 'Pos. revlv',
+  //   field: 'posRevlv',
+  //   sort: 'custom',
+  // table: {
+  //     width: 150
+  //   },
+  // },
   {
-    label: 'Pos. revlv',
-    field: 'posRevlv',
-    sort: 'custom',
-  table: {
-      width: 150
-    },
-  },
-  {
-    label: 'Part number',
+    label: '客户物料代码',
     field: 'partNumber',
     sort: 'custom',
-  table: {
-      width: 150
-    },
-  },
-  {
-    label: 'Pack Label',
-    field: 'packLabel',
-    sort: 'custom',
-  table: {
-      width: 150
-    },
-  },
-  {
-    label: 'OES-Label',
-    field: 'oesLabel',
-    sort: 'custom',
-  table: {
-      width: 150
-    },
-  },
-  {
-    label: 'Check Rvl',
-    field: 'checkRvl',
-    sort: 'custom',
-  table: {
-      width: 150
-    },
-  },
-  {
-    label: 'Days',
-    field: 'days',
-    sort: 'custom',
-  table: {
-      width: 120
-    },
-    form: {
-      component: 'InputNumber',
-      value: 0
-    },
-  },
-  {
-    label: '是否可用',
-    field: 'available',
-    sort: 'custom',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
+    isSearch: true,
     table: {
-      width: 120
+      width: 150
     },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
-      }
-    }
   },
+  // {
+  //   label: 'Pack Label',
+  //   field: 'packLabel',
+  //   sort: 'custom',
+  // table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: 'OES-Label',
+  //   field: 'oesLabel',
+  //   sort: 'custom',
+  // table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: 'Check Rvl',
+  //   field: 'checkRvl',
+  //   sort: 'custom',
+  // table: {
+  //     width: 150
+  //   },
+  // },
+  // {
+  //   label: 'Days',
+  //   field: 'days',
+  //   sort: 'custom',
+  // table: {
+  //     width: 120
+  //   },
+  //   form: {
+  //     component: 'InputNumber',
+  //     value: 0
+  //   },
+  // },
+  // {
+  //   label: '是否可用',
+  //   field: 'available',
+  //   sort: 'custom',
+  //   dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictClass: 'string',
+  //   table: {
+  //     width: 120
+  //   },
+  //   form: {
+  //     component: 'Switch',
+  //     value: 'TRUE',
+  //     componentProps: {
+  //       inactiveValue: 'FALSE',
+  //       activeValue: 'TRUE'
+  //     }
+  //   }
+  // },
   {
     label: '创建时间',
     field: 'createTime',
@@ -245,14 +275,14 @@ export const MesBarCode = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     }
   },
-  {
-    label: '备注',
-    field: 'remark',
-    sort: 'custom',
-  table: {
-      width: 120
-    },
-  },
+  // {
+  //   label: '备注',
+  //   field: 'remark',
+  //   sort: 'custom',
+  // table: {
+  //     width: 120
+  //   },
+  // },
   {
     label: '操作',
     field: 'action',