From b3839ff9f20ceed3788ac47d509903d43d19cfcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Mon, 3 Apr 2023 14:37:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/utils/tableColumns/index.js         | 24 +++++++--------
 fe/PC/src/utils/tabsDesTions/index.js         | 30 +++++++++----------
 .../CustomerManage/CustomerAddress.vue        |  8 ++---
 .../basicData/CustomerManage/CustomerItem.vue |  8 ++---
 .../basicData/DictionaryManage/Category.vue   |  4 +--
 fe/PC/src/views/basicData/ItemsManage/AQL.vue |  4 +--
 .../views/basicData/ItemsManage/ItemBasic.vue | 24 +++++++--------
 .../basicData/ItemsManage/ItemCategory.vue    |  4 +--
 .../basicData/ItemsManage/ItemQuality.vue     |  4 +--
 .../basicData/SupplierManage/SupplierTime.vue |  4 +--
 .../views/basicData/WarehouseManage/Dock.vue  |  4 +--
 .../Count/CountJob-msQuery.vue                |  2 +-
 12 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index 5f6e0b58b..7cf490cdd 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -20,9 +20,9 @@ export const ItemBasic = [
   { label: "采购件", prop: 'canBuy', type: "filter", filters: "whetherOrNot" },
   { label: "外包件", prop: 'canOutsourcing', type: "filter", filters: "whetherOrNot" },
   { label: "回收件", prop: 'isRecycled', type: "filter", filters: "whetherOrNot" },
-  { label: "是否虚拟物品", prop: "isPhantom", type: "filter", filters: "whetherOrNot" },
+  { label: "是否虚拟物件", prop: "isPhantom", type: "filter", filters: "whetherOrNot" },
   { label: "产品类", prop: 'productLine' },
-  { label: "E-LEVEL等级", prop: 'elevel' },
+  { label: "Elevel", prop: 'elevel' },
   // { label: "物品分类", prop: "itemCategoryDictionary", type: "object", showProp: "ItemCategory" },
   { label: "颜色", prop: "color" },
   // ---------------------------------------
@@ -36,8 +36,8 @@ export const ItemBasic = [
   { label: "项目", prop: "project" },
   { label: "版本", prop: "version" },
   { label: "工程变革", prop: "eco" },
-  { label: "有效期值", prop: "validity" },
-  { label: "有效期", prop: "validityUnit", type: "filter", filters: "validityUnit" },
+  { label: "有效期", prop: "validity" },
+  { label: "有效期单位", prop: "validityUnit", type: "filter", filters: "validityUnit" },
   { label: "管理类型", prop: "manageType", type: "filter", filters: "manageType" },
   { label: "备注", prop: "remark" },
 
@@ -81,7 +81,7 @@ export const ItemCategory = [
     fixed: "left",
     type: "name"
   },
-  { label: "分类编号", prop: 'categoryCode' },
+  { label: "分类代码", prop: 'categoryCode' },
   { label: "分类值", prop: 'value' },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
   { label: "备注", prop: "remark" },
@@ -267,8 +267,8 @@ export const CustomerItem = [
   },
   { label: "客户物品代码", prop: "customerItemCode" },
   { label: "物品代码", prop: "itemCode" },
-  { label: "包装数量", prop: "customerPackQty" },
-  { label: "包装单位", prop: "customerPackUom" },
+  { label: "客户包装数量", prop: "customerPackQty" },
+  { label: "客户包装数量单位", prop: "customerPackUom" },
   { label: "开始时间", prop: "beginTime", type: "dateTime" },
   { label: "结束时间", prop: "endTime", type: "dateTime" },
   { label: "备注", prop: 'remark' },
@@ -295,8 +295,8 @@ export const CustomerAddress = [
   },
   { label: "客户地址名称", prop: "name" },
   { label: "客户代码", prop: "customerCode" },
-  { label: "仓库编号", prop: "warehouseCode" },
-  { label: "库位编号", prop: "locationCode" },
+  { label: "仓库代码", prop: "warehouseCode" },
+  { label: "库位代码", prop: "locationCode" },
   { label: "城市", prop: "city" },
   { label: "地址", prop: "address" },
   { label: "联系人", prop: "contact" },
@@ -411,7 +411,7 @@ export const SupplierTimeWindow = [
     type: "name"
   },
   { label: "供应商名称", prop: "supplierName" },
-  { label: "当前时间", prop: "week", type: "filter", filters: "week" },
+  { label: "当前星期", prop: "week", type: "filter", filters: "week" },
   { label: "时间窗口", prop: "timeSlot" },
   // ------------------------------------
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
@@ -929,7 +929,7 @@ export const Dict = [
 // 分类信息 20230328
 export const Category = [
   {
-    label: "分类编号",
+    label: "分类代码",
     prop: "code",
     fixed: "left",
     type: "name"
@@ -1407,7 +1407,7 @@ export const PutawayNote =  [
   { label: "创建时间", prop: "creationTime",type: "dateTime" },
   { label: "操作员", prop: 'worker' },
   // -----------------------------------------------------------------------
-  { label: "供应商编号", prop: 'supplierCode' },
+  { label: "供应商代码", prop: 'supplierCode' },
   { label: "检验单号", prop: 'inspectNumber' },
   { label: "收货单号", prop: 'receiptNumber' },
   { label: "到货单号", prop: 'arriveNoticeNumber' },
diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js
index a2261fdd9..24d5c47b9 100644
--- a/fe/PC/src/utils/tabsDesTions/index.js
+++ b/fe/PC/src/utils/tabsDesTions/index.js
@@ -14,8 +14,8 @@ export const ItemBasic =  [
   { label: "外包件", prop: 'canOutsourcing', type: "filter", filters: "whetherOrNot" },
   { label: "回收件", prop: 'isRecycled', type: "filter", filters: "whetherOrNot" },
   // { label: "产品类", prop: 'productLine' },
-  { label: "有效值", prop: "validity" },
-  { label: "有效期", prop: "validityUnit", type: "filter", filters: "validityUnit" },
+  { label: "有效期", prop: "validity" },
+  { label: "有效期单位", prop: "validityUnit", type: "filter", filters: "validityUnit" },
   { label: "管理类型", prop: "manageType", type: "filter", filters: "manageType" },
   { label: "类型", prop: 'type' },
   { label: "种类", prop: 'category' },
@@ -24,9 +24,9 @@ export const ItemBasic =  [
   { label: "配置", prop: 'configuration' },
   { label: "项目", prop: 'project' },
   { label: "版本", prop: 'version' },
-  { label: "工程变更", prop: 'eco' },
-  { label: "E-LEVEL等级", prop: 'elevel' },
-  { label: "是否虚拟物品", prop: "isPhantom", type: "filter", filters: "whetherOrNot" },
+  { label: "工程变革", prop: 'eco' },
+  { label: "Elevel", prop: 'elevel' },
+  { label: "是否虚拟物件", prop: "isPhantom", type: "filter", filters: "whetherOrNot" },
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
   { label: "标包数", prop: "stdPackQty" },
@@ -59,7 +59,7 @@ export const ItemQuality =  [
 // 物品分类信息 20230328
 export const ItemCategory =  [
   { label: "物品代码", prop: 'itemCode' },
-  { label: "分类编号", prop: "categoryCode" },
+  { label: "分类代码", prop: "categoryCode" },
   { label: "分类值", prop: "value" },
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
@@ -178,8 +178,8 @@ export const CustomerItem =  [
   { label: "结束时间", prop: "endTime" ,type: "dateTime" },
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
-  { label: "包装数量", prop: "customerPackQty" },
-  { label: "包装单位", prop: "customerPackUom" },
+  { label: "客户包装数量", prop: "customerPackQty" },
+  { label: "客户包装数量单位", prop: "customerPackUom" },
   { label: "事务代码", prop: "tenantId" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
   { label: "创建者Id", prop: "creatorId" },
@@ -194,8 +194,8 @@ export const CustomerItem =  [
 export const CustomerAddress =  [
   { label: "客户地址编号", prop: "code" },
   { label: "客户地址名称", prop: 'name' },
-  { label: "客户编号", prop: 'customerCode' },
-  { label: "库位编号", prop: 'locationCode' },
+  { label: "客户代码", prop: 'customerCode' },
+  { label: "库位代码", prop: 'locationCode' },
   { label: "城市", prop: "city" },
   { label: "地址", prop: "address" },
   { label: "联系人", prop: "contact" },
@@ -286,7 +286,7 @@ export const SupplierTimeWindow =  [
   { label: "供应商代码", prop: 'supplierCode' },
   { label: "供应商名称", prop: 'supplierName' },
   { label: "时间窗口", prop: "timeSlot" },
-  { label: "当前时间", prop: "week" },
+  { label: "当前星期", prop: "week" },
   { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
   { label: "事务代码", prop: "tenantId" },
@@ -726,7 +726,7 @@ export const Dict = [
 ]
 // 分类信息 20230328
 export const Category =  [
-  { label: "分类编号", prop: "code" },
+  { label: "分类代码", prop: "code" },
   { label: "分类名称", prop: 'name' },
   { label: "描述", prop: "description" },
   { label: "备注", prop: 'remark' },
@@ -883,7 +883,7 @@ export const ArriveNotice =  [
   { label: "到货单号", prop: "number" },
   { label: "订单号", prop: "poNumber" },
   { label: "发货单号", prop: 'asnNumber' },
-  { label: "供应商编号", prop: "supplierCode" },
+  { label: "供应商代码", prop: "supplierCode" },
   { label: "供应商名称", prop: "supplierName" },
   { label: "供应商地址", prop: "supplierAddress" },
   { label: "要求到货日期", prop: "planArriveDate",type: "dateTime" },
@@ -1075,7 +1075,7 @@ export const PutawayNote =  [
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
   { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "事务代码", prop: "tenantId" },
-  { label: "供应商编号", prop: 'supplierCode' },
+  { label: "供应商代码", prop: 'supplierCode' },
   { label: "检验单号", prop: 'inspectNumber' },
   { label: "收货单号", prop: 'receiptNumber' },
   { label: "到货单号", prop: 'arriveNoticeNumber' },
@@ -2756,7 +2756,7 @@ export const CountJob = [
   { label: "描述", prop: "description" },
   { label: "任务描述", prop: 'jobDescription' },
   { label: "工作组代码", prop: "workGroupCode" },
-  { label: "仓库编号", prop: "warehouseCode" },
+  { label: "仓库代码", prop: "warehouseCode" },
   { label: "id", prop: 'id' },
   { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
diff --git a/fe/PC/src/views/basicData/CustomerManage/CustomerAddress.vue b/fe/PC/src/views/basicData/CustomerManage/CustomerAddress.vue
index 01a2d9ad0..a5b3b23c1 100644
--- a/fe/PC/src/views/basicData/CustomerManage/CustomerAddress.vue
+++ b/fe/PC/src/views/basicData/CustomerManage/CustomerAddress.vue
@@ -155,10 +155,10 @@ export default {
       },
       editOptions: {},
       CreateForm: [
-        { type: "filterSelect", label: "客户编号", prop: "customerCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "客户代码", prop: "customerCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/customer")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/customer', 'Customer', '客户选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "filterSelect", label: "库位编号", prop: "locationCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "库位代码", prop: "locationCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/location",[
             {logic:"And",column:"type",action:"==",value:"10"}
           ])},
@@ -174,8 +174,8 @@ export default {
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editForm: [
-      { type: "input", label: "客户编号", prop: 'customerCode', disabled:"true", colSpan: 12 },
-        { type: "filterSelect", label: "库位编号", prop: "locationCode", optionsLabel: "name", optionsValue: "code", 
+      { type: "input", label: "客户代码", prop: 'customerCode', disabled:"true", colSpan: 12 },
+        { type: "filterSelect", label: "库位代码", prop: "locationCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/location",[
             {logic:"And",column:"type",action:"==",value:"10"}
           ])},
diff --git a/fe/PC/src/views/basicData/CustomerManage/CustomerItem.vue b/fe/PC/src/views/basicData/CustomerManage/CustomerItem.vue
index c253405ae..89d857382 100644
--- a/fe/PC/src/views/basicData/CustomerManage/CustomerItem.vue
+++ b/fe/PC/src/views/basicData/CustomerManage/CustomerItem.vue
@@ -165,8 +165,8 @@ export default {
         searchButton: (val) => { this.showSerarchPage(val, 'basedata/customer', 'Customer', '物品选择', this.CreateFormData) }, colSpan: 12 },
         
         { type: "input", label: "客户物品代码", prop: "customerItemCode", validType:'numberLetter', colSpan: 12 },
-        { type: "input", label: "包装数量", prop: "customerPackQty", colSpan: 12, validType:'number' },
-        { type: "input", label: "包装数量单位", prop: "customerPackUom", colSpan: 12 },
+        { type: "input", label: "客户包装数量", prop: "customerPackQty", colSpan: 12, validType:'number' },
+        { type: "input", label: "客户包装数量单位", prop: "customerPackUom", colSpan: 12 },
         { type: "input", label: "版本", prop: "version", colSpan: 12 },
         // { type: "rangeDateTime", label: "时间窗口", prop: "timeRange", startDate: "beginTime", endDate: "endTime", colSpan: 24 },
         { type: "dateTime", label: "开始时间", prop: "beginTime", colSpan: 12 },
@@ -177,8 +177,8 @@ export default {
         { type: "input", label: "物品代码", prop: "itemCode", disabled:"true", colSpan: 12 },
         { type: "input", label: "客户代码", prop: "customerCode", disabled:"true", colSpan: 12 },
         { type: "input", label: "客户物品代码", prop: "customerItemCode", validType:'numberLetter', colSpan: 12 },
-        { type: "input", label: "包装数量", prop: "customerPackQty", colSpan: 12, validType:'number' },
-        { type: "input", label: "包装数量单位", prop: "customerPackUom", colSpan: 12 },
+        { type: "input", label: "客户包装数量", prop: "customerPackQty", colSpan: 12, validType:'number' },
+        { type: "input", label: "客户包装数量单位", prop: "customerPackUom", colSpan: 12 },
         { type: "input", label: "版本", prop: "version", colSpan: 12 },
         // { type: "rangeDateTime", label: "时间窗口", prop: "timeRange", startDate: "beginTime", endDate: "endTime", colSpan: 24 },
         { type: "dateTime", label: "开始时间", prop: "beginTime", colSpan: 12 },
diff --git a/fe/PC/src/views/basicData/DictionaryManage/Category.vue b/fe/PC/src/views/basicData/DictionaryManage/Category.vue
index 49edee035..ac22264ae 100644
--- a/fe/PC/src/views/basicData/DictionaryManage/Category.vue
+++ b/fe/PC/src/views/basicData/DictionaryManage/Category.vue
@@ -124,13 +124,13 @@ export default {
       },
       editOptions: {},
       CreateForm: [
-        { type: "input", label: "分类编号", prop: "code", colSpan: 12, validType:'numberLetter' },
+        { type: "input", label: "分类代码", prop: "code", colSpan: 12, validType:'numberLetter' },
         { type: "input", label: "分类名称", prop: 'name', colSpan: 12 },
         { type: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editForm: [
-        { type: "input", label: "分类编号", prop: "code", disabled:"true", colSpan: 12, validType:'numberLetter' },
+        { type: "input", label: "分类代码", prop: "code", disabled:"true", colSpan: 12, validType:'numberLetter' },
         { type: "input", label: "分类名称", prop: 'name', colSpan: 12 },
         { type: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
diff --git a/fe/PC/src/views/basicData/ItemsManage/AQL.vue b/fe/PC/src/views/basicData/ItemsManage/AQL.vue
index 8b16796f7..5c6bb8070 100644
--- a/fe/PC/src/views/basicData/ItemsManage/AQL.vue
+++ b/fe/PC/src/views/basicData/ItemsManage/AQL.vue
@@ -197,7 +197,7 @@ export default {
         { type: "select", label: "ABC类", prop: "abcClass", options: "abcClass", clearable: true, filterable: true, allowCreate: true, colSpan: 12 },
         { type: "input", label: "抽检数量", prop: "sampleQty", validType:'number', colSpan: 12 },
         { type: "select", label: "使用百分比", prop: "isUsePercent", options: "whetherOrNot", colSpan: 12 },
-        { type: "number", label: "抽检百分比%", prop: "samplePercent", validType:'number', colSpan: 12, precision:0, min: 0 ,max:100 },
+        { type: "number", label: "抽检百分比", prop: "samplePercent", validType:'number', colSpan: 12, precision:0, min: 0 ,max:100 },
         { type: "input", label: "备注", prop: "remark", colSpan: 12 },
       ],
       editForm: [
@@ -212,7 +212,7 @@ export default {
         { type: "select", label: "ABC类", prop: "abcClass", options: "abcClass", clearable: true, filterable: true, allowCreate: true, colSpan: 12 },
         { type: "input", label: "抽检数量", prop: "sampleQty", validType:'number', colSpan: 12 },
         { type: "select", label: "使用百分比", prop: "isUsePercent", options: "whetherOrNot", colSpan: 12 },
-        { type: "number", label: "抽检百分比%", prop: "samplePercent", validType:'number', colSpan: 12, precision:0, min: 0 ,max:100 },
+        { type: "number", label: "抽检百分比", prop: "samplePercent", validType:'number', colSpan: 12, precision:0, min: 0 ,max:100 },
         { type: "input", label: "备注", prop: "remark", colSpan: 12 },
       ],
       editRules: {
diff --git a/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue b/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue
index dc9aa89d9..a6d9086cb 100644
--- a/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue
+++ b/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue
@@ -207,7 +207,7 @@ export default {
         { type: "input", label: "物品描述1", prop: "desc1", colSpan: 12 },
         { type: "input", label: "物品描述2", prop: "desc2", colSpan: 12 },
         { type: "select", label: "状态", prop: "status", options: "itemStatus", colSpan: 12 },
-        { type: "filterSelect", label: "计量单位", prop: "basicUom", optionsLabel: "description", optionsValue: "name", 
+        { type: "filterSelect", label: "基本计量单位", prop: "basicUom", optionsLabel: "description", optionsValue: "name", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/uom")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/uom', 'Uom', '计量单位选择', this.CreateFormData) }, colSpan: 12 },
         { type: "select", label: "ABC类", prop: "abcClass", options: "abcClass", clearable: true, filterable: true, allowCreate: true, colSpan: 12 },
@@ -216,21 +216,21 @@ export default {
         { type: "select", label: "外包件", prop: "canOutsourcing", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "回收件", prop: "isRecycled", options: "whetherOrNot", colSpan: 12 },
         // { type: "input", label: "产品类", prop: "productLine", colSpan: 12 },
-        { type: "input", label: "有效值", prop: "validity", validType:'number', colSpan: 12 },
-        { type: "select", label: "有效期", prop: "validityUnit", options: "validityUnit", colSpan: 12 },
+        { type: "input", label: "有效期", prop: "validity", validType:'number', colSpan: 12 },
+        { type: "select", label: "有效期单位", prop: "validityUnit", options: "validityUnit", colSpan: 12 },
         { type: "select", label: "管理类型", prop: "manageType", options: "manageType", colSpan: 12 },
         { type: "filterSelect", label: "项目", prop: "project", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/project")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/project', 'Project', '项目选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "input", label: "E-LEVEL等级", prop: 'elevel', colSpan: 12 },
+        { type: "input", label: "Elevel", prop: 'elevel', colSpan: 12 },
         { type: "input", label: "颜色", prop: 'color', colSpan: 12 },
         { label: "类型", prop: 'type', type: "select", options: "ItemTypeBasic", colSpan: 12 },
         { type: "input", label: "种类", prop: 'category', colSpan: 12 },
         { type: "input", label: "分组", prop: 'group', colSpan: 12 },
         { type: "input", label: "配置", prop: 'configuration', colSpan: 12 },
         { type: "input", label: "版本", prop: 'version', colSpan: 12 },
-        { type: "input", label: "工程变更", prop: 'eco', colSpan: 12 },
-        { type: "select", label: "是否虚拟物品", prop: "isPhantom", options: "whetherOrNot", colSpan: 12 },
+        { type: "input", label: "工程变革", prop: 'eco', colSpan: 12 },
+        { type: "select", label: "是否虚拟物件", prop: "isPhantom", options: "whetherOrNot", colSpan: 12 },
         { type: "input", label: "标包数", prop: 'stdPackQty', validType:'number', colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
@@ -240,7 +240,7 @@ export default {
         { type: "input", label: "物品描述1", prop: "desc1", colSpan: 12 },
         { type: "input", label: "物品描述2", prop: "desc2", colSpan: 12 },
         { type: "select", label: "状态", prop: "status", options: "itemStatus", colSpan: 12 },
-        { type: "filterSelect", label: "计量单位", prop: "basicUom", optionsLabel: "description", optionsValue: "name", 
+        { type: "filterSelect", label: "基本计量单位", prop: "basicUom", optionsLabel: "description", optionsValue: "name", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/uom")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/uom', 'Uom', '计量单位选择', this.editFormData) }, colSpan: 12 },
         { type: "select", label: "ABC类", prop: "abcClass", options: "abcClass", clearable: true, filterable: true, allowCreate: true, colSpan: 12 },
@@ -249,21 +249,21 @@ export default {
         { type: "select", label: "外包件", prop: "canOutsourcing", options: "whetherOrNot", disabled: true, colSpan: 12 },
         { type: "select", label: "回收件", prop: "isRecycled", options: "whetherOrNot", disabled: true, colSpan: 12 },
         // { type: "input", label: "产品类", prop: "productLine", colSpan: 12 },
-        { type: "input", label: "有效值", prop: "validity", validType:'number', colSpan: 12 },
-        { type: "select", label: "有效期", prop: "validityUnit", options: "validityUnit", colSpan: 12 },
+        { type: "input", label: "有效期", prop: "validity", validType:'number', colSpan: 12 },
+        { type: "select", label: "有效期单位", prop: "validityUnit", options: "validityUnit", colSpan: 12 },
         { type: "select", label: "管理类型", prop: "manageType", options: "manageType", colSpan: 12 },
         { type: "filterSelect", label: "项目", prop: "project", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/project")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/project', 'Project', '项目选择', this.editFormData) }, colSpan: 12 },
-        { type: "input", label: "E-LEVEL等级", prop: 'elevel', colSpan: 12 },
+        { type: "input", label: "Elevel", prop: 'elevel', colSpan: 12 },
         { type: "input", label: "颜色", prop: 'color', colSpan: 12 },
         { label: "类型", prop: 'type', type: "select", options: "ItemTypeBasic", disabled: true, colSpan: 12 },
         { type: "input", label: "种类", prop: 'category', colSpan: 12 },
         { type: "input", label: "分组", prop: 'group', colSpan: 12 },
         { type: "input", label: "配置", prop: 'configuration', colSpan: 12 },
         { type: "input", label: "版本", prop: 'version', colSpan: 12 },
-        { type: "input", label: "工程变更", prop: 'eco', colSpan: 12 },
-        { type: "select", label: "是否虚拟物品", prop: "isPhantom", options: "whetherOrNot", colSpan: 12 },
+        { type: "input", label: "工程变革", prop: 'eco', colSpan: 12 },
+        { type: "select", label: "是否虚拟物件", prop: "isPhantom", options: "whetherOrNot", colSpan: 12 },
         { type: "input", label: "标包数", prop: 'stdPackQty', validType:'number', colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
diff --git a/fe/PC/src/views/basicData/ItemsManage/ItemCategory.vue b/fe/PC/src/views/basicData/ItemsManage/ItemCategory.vue
index 6f7363db5..984a99b5b 100644
--- a/fe/PC/src/views/basicData/ItemsManage/ItemCategory.vue
+++ b/fe/PC/src/views/basicData/ItemsManage/ItemCategory.vue
@@ -145,7 +145,7 @@ export default {
         { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "filterSelect", label: "分类编号", prop: "categoryCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "分类代码", prop: "categoryCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/category")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/category', 'Category', '物品分类选择', this.CreateFormData) }, colSpan: 12 },
         { type: "input", label: "分类值", prop: "value", colSpan: 12 },
@@ -153,7 +153,7 @@ export default {
       ],
       editForm: [
         { type: "input", label: "物品代码", prop: "itemCode",disabled:"true", colSpan: 12 },
-        { type: "input", label: "分类编号", prop: "categoryCode", disabled:"true", colSpan: 12 },
+        { type: "input", label: "分类代码", prop: "categoryCode", disabled:"true", colSpan: 12 },
         { type: "input", label: "分类值", prop: "value", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
diff --git a/fe/PC/src/views/basicData/ItemsManage/ItemQuality.vue b/fe/PC/src/views/basicData/ItemsManage/ItemQuality.vue
index 8633482a7..3f5b3743a 100644
--- a/fe/PC/src/views/basicData/ItemsManage/ItemQuality.vue
+++ b/fe/PC/src/views/basicData/ItemsManage/ItemQuality.vue
@@ -156,7 +156,7 @@ export default {
         { type: "filterSelect", label: "物品名称", prop: "name", optionsLabel: "code", optionsValue: "name", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "filterSelect", label: "供应商编号", prop: "supplierCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Supplier', 'Supplier', '供应商选择', this.CreateFormData) }, colSpan: 12 },
         { type: "select", label: "状态", prop: "status", options: "openToClose", colSpan: 12 },
@@ -168,7 +168,7 @@ export default {
       editForm: [
         { type: "input",label: "物品代码", prop: "itemCode",disabled:"true", colSpan: 12 },
         { type: "input", label: "物品名称", prop: "name", colSpan: 12,disabled:"true", },
-        { type: "filterSelect", label: "供应商编号", prop: "supplierCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Supplier', 'Supplier', '供应商选择', this.editFormData) }, colSpan: 12 },
         { type: "select", label: "状态", prop: "status", options: "openToClose", colSpan: 12 },
diff --git a/fe/PC/src/views/basicData/SupplierManage/SupplierTime.vue b/fe/PC/src/views/basicData/SupplierManage/SupplierTime.vue
index 87098b369..e0bf2dd84 100644
--- a/fe/PC/src/views/basicData/SupplierManage/SupplierTime.vue
+++ b/fe/PC/src/views/basicData/SupplierManage/SupplierTime.vue
@@ -154,7 +154,7 @@ export default {
         { type: "filterSelect", label: "供应商名称", prop: "supplierName", optionsLabel: "code", optionsValue: "name", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Supplier', 'Supplier', '供应商选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "select", label: "当前时间", prop: "week", options: "week", colSpan: 12 },
+        { type: "select", label: "当前星期", prop: "week", options: "week", colSpan: 12 },
         { type: "input", label: "时间窗口", prop: 'timeSlot', colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
@@ -165,7 +165,7 @@ export default {
         { type: "filterSelect", label: "供应商名称", prop: "supplierName", optionsLabel: "code", optionsValue: "name", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Supplier', 'Supplier', '供应商选择', this.editFormData) }, colSpan: 12 },
-        { type: "select", label: "当前时间", prop: "week", options: "week", colSpan: 12 },
+        { type: "select", label: "当前星期", prop: "week", options: "week", colSpan: 12 },
         { type: "input", label: "时间窗口", prop: 'timeSlot', colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
diff --git a/fe/PC/src/views/basicData/WarehouseManage/Dock.vue b/fe/PC/src/views/basicData/WarehouseManage/Dock.vue
index aa44c5808..099c7b2e4 100644
--- a/fe/PC/src/views/basicData/WarehouseManage/Dock.vue
+++ b/fe/PC/src/views/basicData/WarehouseManage/Dock.vue
@@ -147,7 +147,7 @@ export default {
       },
       editOptions: {},
       CreateForm: [
-        { type: "filterSelect", label: "默认库位编号", prop: "defaultLocationCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "默认库位代码", prop: "defaultLocationCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.CreateFormData) }, colSpan: 12 },
         { type: "input", label: "收货口编号", prop: "code", validType:'numberLetter', colSpan: 12 },
@@ -157,7 +157,7 @@ export default {
       ],
       editForm: [
         { type: "input", label: "收货口编号", prop: "code", disabled:"true", colSpan: 12 },
-        { type: "filterSelect", label: "默认库位编号", prop: "defaultLocationCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "默认库位代码", prop: "defaultLocationCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.editFormData) }, colSpan: 12 },
         { type: "input", label: "收货口名称", prop: 'name', colSpan: 12 },
diff --git a/fe/PC/src/views/inventoryManage/Count/CountJob-msQuery.vue b/fe/PC/src/views/inventoryManage/Count/CountJob-msQuery.vue
index baaecb443..ca7bc0db8 100644
--- a/fe/PC/src/views/inventoryManage/Count/CountJob-msQuery.vue
+++ b/fe/PC/src/views/inventoryManage/Count/CountJob-msQuery.vue
@@ -131,7 +131,7 @@ export default {
         { type: "objectInput", label: "实际单位", prop: "countQty", showProp: "uom", },
         { type: "object", label: "库存数量", prop: "inventoryQty", showProp: "qty", },
         { type: "object", label: "库存单位", prop: "inventoryQty", showProp: "uom", },
-        { type: "input", rules: detailsRules.detailsRules, label: "库位编号", prop: "locationCode", },
+        { type: "input", rules: detailsRules.detailsRules, label: "库位代码", prop: "locationCode", },
         { type: "input", rules: detailsRules.detailsRules, label: "包装数量", prop: "stdPackQty", },
         { type: "input", rules: detailsRules.detailsRules, label: "包装单位", prop: "stdPackUom", },
         { label: "物品代码", prop: "itemCode", },