YT-1768WMS所有业务的列表及明细中将以下属性进行替换：物料代码->品番、物料名称—>品名、描述1—>背番、描述2—>描述

2 months ago · 869861a367
23 changed files with 55 additions and 55 deletions
--- a/src/utils/disposition/formFields.ts
+++ b/src/utils/disposition/formFields.ts
@ -4,8 +4,8 @@
 export const ItemBasic =  [
    { label: "品番", prop: 'code' },
    { label: "品名", prop: "name" },
-    { label: "描述1", prop: "desc1" },
-    { label: "描述2", prop: "desc2" },
+    { label: "背番", prop: "desc1" },
+    { label: "描述", prop: "desc2" },
    { type: "filter", label: "状态", prop: "status", filters: "itemStatus" },
    { label: "计量单位", prop: 'basicUom' },
    { type: "filter", label: "ABC类", prop: 'abcClass', filters: "abcClass" },
@ -1727,8 +1727,8 @@ export const OuterPillarDeliverNote = [
  { label: "工厂", prop: 'site' },
  { label: "物料号", prop: 'code' },
  { label: "物流名称", prop: 'name' },
-  { label: "描述1", prop: 'desc1' },
-  { label: "描述2", prop: 'desc2' },
+  { label: "背番", prop: 'desc1' },
+  { label: "描述", prop: 'desc2' },
  { label: "物料状态", prop: 'status' },
  { label: "允许制造", prop: 'canMake' },
  { label: "允许采购", prop: 'canBuy' },
--- a/src/utils/disposition/tableDetailsColumns.ts
+++ b/src/utils/disposition/tableDetailsColumns.ts
@ -649,8 +649,8 @@
    { label: "工单号", prop: "number", fixed: "left" },
    { label: "品番", prop: 'itemCode' },
    { label: "品名", prop: 'item', showProp: 'name', type: "object" },
-    { label: "描述1", prop: 'item', showProp: 'desc1', type: "object" },
-    { label: "描述1", prop: 'item', showProp: 'desc1', type: "object" },
+    { label: "背番", prop: 'item', showProp: 'desc1', type: "object" },
+    { label: "背番", prop: 'item', showProp: 'desc1', type: "object" },
    { label: "批次", prop: 'lot' },
    { label: "箱标签", prop: 'packingCode' },
    { label: "单位", prop: 'qty', showProp: 'uom', type: "object" },
--- a/src/views/eam/applicationRecord/applicationRecordMain.data.ts
+++ b/src/views/eam/applicationRecord/applicationRecordMain.data.ts
@ -321,7 +321,7 @@ export const ApplicationRecordDetailRules = reactive({
    { required: true, message: '请输入单据号', trigger: 'blur' }
  ],
  itemCode: [
-    { required: true, message: '请选择物品代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
  ],
  remark: [
    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
--- a/src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts
+++ b/src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts
@ -19,13 +19,13 @@ export const BackflushDetailbQad = useCrudSchemas(reactive<CrudSchema[]>([
    isSearch: true,
  },
  {
-    label: '父物品代码',
+    label: '父品番',
    field: 'parentItemCode',
    sort: 'custom',
    isSearch: true,
  },
  {
-    label: '物品代码',
+    label: '品番',
    field: 'itemCode',
    sort: 'custom',
    isSearch: true,
--- a/src/views/wms/basicDataManage/itemManage/itemSyntheticRelation/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itemSyntheticRelation/index.vue
@ -95,7 +95,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
    } else {
      setV[formField] = val[0][searchField]
    }
-    setV['itemDesc1'] = val[0]['backNumber']//描述1赋值到背番
+    setV['itemDesc1'] = val[0]['backNumber']//背番赋值到背番
    formRef.setValues(setV)
  })
 }
--- a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
@ -178,7 +178,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
      }else{
        setV[formField] = setV[0][searchField]
      }
-      setV['itemDesc1'] = val[0]['backNumber']//描述1赋值到背番
+      setV['itemDesc1'] = val[0]['backNumber']//背番赋值到背番
      formRef.setValues(setV)
    }
  })
--- a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
@ -55,7 +55,7 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
    },
  },
  {
-    label: '描述1',
+    label: '背番',
    field: 'desc1',
    sort: 'custom',
    table: {
@ -64,7 +64,7 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
    // isTableForm:false
  },
  {
-    label: '描述2',
+    label: '描述',
    field: 'desc2',
    sort: 'custom',
    table: {
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts
@ -293,7 +293,7 @@ export const SaleShipmentDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
    }
  },
  {
-    label: '物品名称',
+    label: '品名',
    field: 'itemName',
    sort: 'custom',
    table: {
@ -301,13 +301,13 @@ export const SaleShipmentDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
    }
  },
  {
-    label: '物品描述1',
+    label: '背番',
    field: 'itemDesc1',
    sort: 'custom',
    isTable:false
  },
  {
-    label: '物品描述2',
+    label: '描述',
    field: 'itemDesc2',
    sort: 'custom',
    isTable:false
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts
@ -488,7 +488,7 @@ export const SaleShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
    isForm: false,
  },
  {
-    label: '物品名称',
+    label: '品名',
    field: 'itemName',
    sort: 'custom',
    table: {
@ -498,7 +498,7 @@ export const SaleShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
    isTableForm: false
  },
  {
-    label: '物品描述1',
+    label: '背番',
    field: 'itemName',
    sort: 'custom',
    table: {
@ -509,7 +509,7 @@ export const SaleShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
    isTable: false,
  },
  {
-    label: '物品描述2',
+    label: '描述',
    field: 'itemName',
    sort: 'custom',
    table: {
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts
@ -551,7 +551,7 @@ export const StockupDetailJob = useCrudSchemas(reactive<CrudSchema[]>([
    },
  },
  {
-    label: '物品名称',
+    label: '品名',
    field: 'itemName',
    sort: 'custom',
    table: {
@ -559,7 +559,7 @@ export const StockupDetailJob = useCrudSchemas(reactive<CrudSchema[]>([
    },
  },
  {
-    label: '物品描述1',
+    label: '背番',
    field: 'itemDesc1',
    sort: 'custom',
    table: {
@ -568,7 +568,7 @@ export const StockupDetailJob = useCrudSchemas(reactive<CrudSchema[]>([
    hiddenInMain:true,
  },
  {
-    label: '物品描述2',
+    label: '描述',
    field: 'itemDesc2',
    sort: 'custom',
    table: {
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts
@ -415,7 +415,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
    },
  },
  {
-    label: '物品名称',
+    label: '品名',
    field: 'itemName',
    sort: 'custom',
    table: {
@ -423,7 +423,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
    },
  },
  {
-    label: '物品描述1',
+    label: '背番',
    field: 'itemDesc1',
    sort: 'custom',
    // isSearch: true,
@ -434,7 +434,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([

  },
  {
-    label: '物品描述2',
+    label: '描述',
    field: 'itemDesc2',
    sort: 'custom',
    // isSearch: true,
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts
@ -696,7 +696,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
    }
  },
  {
-    label: '物品名称',
+    label: '品名',
    field: 'itemName',
    sort: 'custom',
    isTableForm: false,
@ -705,7 +705,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
    },
  },
  {
-    label: '物品描述1',
+    label: '背番',
    field: 'itemDesc1',
    sort: 'custom',
    isTableForm: false,
@ -715,7 +715,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
    hiddenInMain: true
  },
  {
-    label: '物品描述2',
+    label: '描述',
    field: 'itemDesc2',
    sort: 'custom',
    isTableForm: false,
--- a/src/views/wms/inventoryManage/balance/balance.data.ts
+++ b/src/views/wms/inventoryManage/balance/balance.data.ts
@ -840,7 +840,7 @@ export const BalanceRules = reactive({
  //   { required: true, message: '请选择器具号', trigger: 'change' }
  // ],
  itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
  ],
  batch: [
    { required: true, message: '请输入批次', trigger: 'blur' }
@ -950,7 +950,7 @@ export const BalancePackage = useCrudSchemas(reactive<CrudSchema[]>([
              {
                key: 'itemCode',
                value: 'itemCode',
-                message: '请先选择物料代码！',
+                message: '请先选择品番！',
                isMainValue: true
              }
            ],
@ -983,7 +983,7 @@ export const BalancePackage = useCrudSchemas(reactive<CrudSchema[]>([
                {
                  key: 'itemCode',
                  value: 'itemCode',
-                  message: '请先选择物料代码！', // 当前置条件为空时 弹出信息提示
+                  message: '请先选择品番！', // 当前置条件为空时 弹出信息提示
                  isMainValue: true
                }
              ],
@ -1064,7 +1064,7 @@ export const BalancePackage = useCrudSchemas(reactive<CrudSchema[]>([
      searchCondition: [{
        key: 'itemCode',
        value: 'itemCode',
-        message: '请填写物料代码！',
+        message: '请填写品番！',
        isMainValue: true
      }]
    }
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts
@ -575,7 +575,7 @@ export const PackageoverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
    },
  },
  {
-    label: '物品名称',
+    label: '品名',
    field: 'itemName',
    sort: 'custom',
    table: {
@ -583,7 +583,7 @@ export const PackageoverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
    },
  },
  {
-    label: '物品描述1',
+    label: '背番',
    field: 'itemDesc1',
    sort: 'custom',
    table: {
@ -591,7 +591,7 @@ export const PackageoverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
    },
  },
  {
-    label: '物品描述2',
+    label: '描述',
    field: 'itemDesc2',
    sort: 'custom',
    table: {
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts
@ -506,7 +506,7 @@ export const PackageoverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
    },
  },
  {
-    label: '物品名称',
+    label: '品名',
    field: 'itemName',
    sort: 'custom',
    table: {
@ -516,7 +516,7 @@ export const PackageoverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
    isForm: false
  },
  {
-    label: '物品描述1',
+    label: '背番',
    field: 'itemDesc1',
    sort: 'custom',
    table: {
@ -526,7 +526,7 @@ export const PackageoverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
    isForm: false
  },
  {
-    label: '物品描述2',
+    label: '描述',
    field: 'itemDesc2',
    sort: 'custom',
    table: {
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts
@ -73,7 +73,7 @@ export const PackageoverRetrospect = useCrudSchemas(reactive<CrudSchema[]>([
    },
  },
  {
-    label: '物品名称',
+    label: '品名',
    field: 'itemName',
    sort: 'custom',
    table: {
@ -81,7 +81,7 @@ export const PackageoverRetrospect = useCrudSchemas(reactive<CrudSchema[]>([
    },
  },
  {
-    label: '物品描述1',
+    label: '背番',
    field: 'itemDesc1',
    sort: 'custom',
    table: {
@ -89,7 +89,7 @@ export const PackageoverRetrospect = useCrudSchemas(reactive<CrudSchema[]>([
    },
  },
  {
-    label: '物品描述2',
+    label: '描述',
    field: 'itemDesc2',
    sort: 'custom',
    table: {
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts
@ -707,7 +707,7 @@ export const ItembasicShow = useCrudSchemas(
      },
    },
    {
-      label: '描述1',
+      label: '背番',
      field: 'desc1',
      sort: 'custom',
      table: {
@ -715,7 +715,7 @@ export const ItembasicShow = useCrudSchemas(
      // isTableForm:false
    },
    {
-      label: '描述2',
+      label: '描述',
      field: 'desc2',
      sort: 'custom',
      table: {
--- a/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/mesRawMaterialConsumptionInfo.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/mesRawMaterialConsumptionInfo/mesRawMaterialConsumptionInfo.data.ts
@ -129,7 +129,7 @@ export const MesRawMaterialConsumptionInfo = useCrudSchemas(reactive<CrudSchema[
    },
  },
  {
-    label: '原料物品代码',
+    label: '原料品番',
    field: 'itemCode',
    sort: 'custom',
    table: {
@ -137,7 +137,7 @@ export const MesRawMaterialConsumptionInfo = useCrudSchemas(reactive<CrudSchema[
    },
  },
  {
-    label: '原料物品名称',
+    label: '原料品名',
    field: 'itemName',
    sort: 'custom',
    table: {
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts
@ -1156,7 +1156,7 @@ export const ProductreceiptDetailb = useCrudSchemas(reactive<CrudSchema[]>([
    isSearch: true,
  },
  {
-    label: '物品名称',
+    label: '品名',
    field: 'itemName',
    sort: 'custom',
    isSearch: true,
--- a/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
+++ b/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts
@ -645,7 +645,7 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
  // },

  {
-    label: '物品描述1',
+    label: '背番',
    field: 'itemDesc1',
    sort: 'custom',
    table: {
@ -655,7 +655,7 @@ export const ProductredressJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
    hiddenInMain:true,
  },
  {
-    label: '物品描述2',
+    label: '描述',
    field: 'itemDesc2',
    sort: 'custom',
    table: {
--- a/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts
+++ b/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts
@ -508,7 +508,7 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(


  {
-    label: '物品描述1',
+    label: '背番',
    field: 'itemDesc1',
    sort: 'custom',
    table: {
@ -518,7 +518,7 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
    hiddenInMain: true
  },
  {
-    label: '物品描述2',
+    label: '描述',
    field: 'itemDesc2',
    sort: 'custom',
    table: {
--- a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
+++ b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts
@ -627,7 +627,7 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
    }
  },
  // {
-  //   label: '物品描述1',
+  //   label: '背番',
  //   field: 'itemDesc1',
  //   sort: 'custom',
  //   table: {
@ -638,7 +638,7 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
  //   hiddenInMain:true,
  // },
  {
-    label: '物品描述2',
+    label: '描述',
    field: 'itemDesc2',
    sort: 'custom',
    table: {
--- a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/purchaseBarterRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/purchaseBarterRequestMain.data.ts
@ -184,7 +184,7 @@ export const PurchaseBarterRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
    tableForm:{
      multiple:true,//多选
      isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择物料代码',// 输入框占位文本
+      searchListPlaceholder: '请选择品番',// 输入框占位文本
      searchField: 'itemCode', // 查询弹窗赋值字段
      searchTitle: '库存余额信息', // 查询弹窗标题
      searchAllSchemas: BalancePopWindow.allSchemas,
@ -216,7 +216,7 @@ export const PurchaseBarterRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
        disabled:true,
        enterSearch: true,
        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
        searchField: 'itemCode', // 查询弹窗赋值字段
        searchTitle: '库存余额信息', // 查询弹窗标题
        searchAllSchemas: BalancePopWindow.allSchemas,
@ -411,6 +411,6 @@ export const PurchaseBarterRequestDetailRules = reactive({
    { validator:validateQty, message: '换货数量必须是一个正数', trigger: 'change'}
  ],
  itemCode: [
-    { required: true, message: '请输入物料代码', trigger: 'blur' }
+    { required: true, message: '请输入品番', trigger: 'blur' }
  ],
 })