Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex

.env.development

@@ -4,7 +4,12 @@ NODE_ENV=development
 VITE_DEV=false
 
 # 请求路径
-VITE_BASE_URL='http://localhost:12080'
+# VITE_BASE_URL='http://localhost:12080'
+# VITE_BASE_URL='http://192.168.1.49:12080'
+# VITE_BASE_URL='http://192.168.1.254:12080'
+VITE_BASE_URL='http://dev.ccwin-in.com:28050/api'
+# VITE_BASE_URL='http://dev.ccwin-in.com:28040/api'
+# VITE_BASE_URL='http://192.168.1.254:12080'
 
 # 上传路径
 VITE_UPLOAD_URL='http://localhost:12080/admin-api/infra/file/upload'

README.md

@@ -14,7 +14,7 @@ form: {
       value:'undefined',//默认值，设置为'undefined'-->实际是undefined(解决SelectV2不显示占位符placeholder)
       enterSearch: true, //可输入回车  对应绑定事件：@onEnter="onEnter"
       isSearchList: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchListPlaceholder: '请选择品番', // 输入框占位文本
       searchField: 'itemCode', // 查询弹窗赋值字段
       searchTitle: '生产线物料关系信息', // 查询弹窗标题
       hiddenFilterButton:true,//是否隐藏筛选按钮

package.json

@@ -32,6 +32,7 @@
     "cropperjs": "^1.6.1",
     "crypto-js": "^4.1.1",
     "dayjs": "^1.11.10",
+    "decimal.js": "^10.4.3",
     "diagram-js": "^12.3.0",
     "echarts": "^5.4.3",
     "echarts-wordcloud": "^2.1.0",

src/api/home/index.ts

@@ -4,7 +4,10 @@ import request from '@/config/axios'
 export const getSupplierData = async () => {
   return await request.get({ url: `/wms/index/indexSupplier` })
 }
-
+// WMS首页
+export const getWmsData = async () => {
+  return await request.get({ url: `/wms/index/indexWMS` })
+}
 // 原料管理员首页
 export const getMaterialData = async () => {
   return await request.get({ url: `/wms/index/indexMaterial` })

src/api/wms/demandforecastingDetail/index.ts

@@ -55,7 +55,7 @@ const getPageParams = (params)=>{
   }
   params.supplierCode = ''
 
-  // 物料代码
+  // 品番
   if(params.itemCode&&params.itemCode.length>0){
     let keyValue = params.itemCode.split(' ')
     keyValue.forEach(item=>{item = item.trim()})

src/api/wms/demandforecastingMain/index.ts

@@ -104,7 +104,7 @@ const getPageParams = (params)=>{
   }
   params.supplierCode = ''
 
-  // 物料代码
+  // 品番
   if(params.itemCode&&params.itemCode.length>0){
     let keyValue = params.itemCode.split(' ')
     keyValue.forEach(item=>{item = item.trim()})
@@ -133,6 +133,18 @@ export const exportDemandforecastingMain = async (params) => {
   }
 }
 
+// 导出要货预测主 Excel
+export const exportDemandforecastingPlannnerMain = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/demandforecasting-main/export-excel-senior', data })
+  } else {
+    params = getPageParams(params)
+    return await request.download({ url: `/wms/demandforecasting-main/export-excel-planner`, params })
+  }
+}
+
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/demandforecasting-main/get-import-template' })
@@ -156,4 +168,8 @@ export const updateIsRead = async (data) => {
   return await request.post({ url: `/wms/demandforecasting-main/updateIsRead`,data })
 }
 
+export const publish = async (data) => {
+  return await request.post({ url: `/wms/demandforecasting-main/publishDemandForecast`,data })
+}
+
 

src/api/wms/inventoryinitRecordDetail/index.ts

@@ -77,4 +77,9 @@ export const importTemplate = () => {
 // 批量打印
 export const printLabelBatchByIdSelection = async (data: any) => {
   return await request.post({ url: `/wms/inventoryinit-record-main/printLabelBatchById` ,data})
+}
+
+// 批量打印
+export const printLabelBatchByIdSelectionForYT = async (data: any) => {
+  return await request.post({ url: `/wms/inventoryinit-record-main/printLabelBatchByIdForYT` ,data})
 }

src/api/wms/itembasic/index.ts

@@ -122,7 +122,7 @@ export const selectConfigToItembasic = async (params) => {
   }
 }
 
-// 根据物料代码查计量单位
+// 根据品番查计量单位
 export const getQueryItemCodeInfo = async (data) => {
   return await request.post({ url: 'wms/itembasic/queryItemCodeInfo', data })
 }

src/api/wms/package/index.ts

@@ -122,6 +122,11 @@ export const batchPrintingLables = async (data: any) => {
   return await request.post({ url: `/wms/package/batchPrintingLables`, data })
 }
 
+// 批量打印标签英泰多选
+export const batchPrintingLablesForYT = async (data: any) => {
+  return await request.post({ url: `/wms/package/batchPrintingLablesForYT`, data })
+}
+
 // 打印标签获取包装列表
 export const getLabel = async (id: number) => {
   return await request.get({ url: `/wms/package/getLabel?id=` + id })
@@ -159,3 +164,8 @@ export const getBalanceToPackageByIntex = async (itemCode: String,batch: String)
 export const getBalanceToPackageSelection = async (data: any) => {
   return await request.post({ url: `/wms/balance/batchPrintLabel` ,data})
 }
+
+// 获取包装信息
+export const getPackageByBarbasic = async (relateNumber) => {
+  return await request.get({ url: `/wms/package/getPackageByBarbasic?relateNumber=${relateNumber}`})
+}

src/api/wms/supplierdeliverRecordDetail/index.ts

@@ -95,4 +95,16 @@ export const queryChildPickingNumber = async (params) => {
   } else {
     return await request.get({ url: `/wms/supplierdeliver-record-detail/queryChildPickingNumberPage`, params })
   }
+}
+
+// 查询供应商发货记录
+// 查询供应商发货记录子列表
+export const getSupplierdeliverRecordDetailPageWMS = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/supplierdeliver-record-detail/seniorWMS', data })
+  } else {
+    return await request.get({ url: `/wms/supplierdeliver-record-detail/pageWMS`, params })
+  }
 }

src/api/wms/supplierinvoiceInvoiced/index.ts

@@ -58,7 +58,10 @@ export const deleteSupplierinvoiceInvoiced = async (id: number) => {
 export const exportSupplierinvoiceInvoiced = async (params) => {
   return await request.download({ url: `/wms/supplierinvoice-invoiced/export-excel`, params })
 }
-
+// 导出待开票 Excel
+export const exportSupplierinvoiceInvoicedWork = async (params) => {
+  return await request.download({ url: `/wms/supplierinvoice-invoiced/export-excel-work`, params })
+}
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/supplierinvoice-invoiced/get-import-template' })

src/components/Descriptions/src/Descriptions.vue

@@ -38,6 +38,7 @@ const props = defineProps({
     default: () => ({})
   }
 })
+const schema = ref(props.schema)
 
 const { getPrefixCls } = useDesign()
 
@@ -82,6 +83,20 @@ const showAll = () =>{
   isShow.value = !isShow.value
  
 }
+
+// 默认排序
+const updateSort = (val) => {
+  console.log(999,val)
+  val.forEach(item=>{
+    if(!item.sortDetailDefault){
+      item.sortDetailDefault = 999 // 默认999
+    }
+  })
+  val.sort((column1,column2)=>{
+    return column1.sortDetailDefault - column2.sortDetailDefault
+  })
+}
+updateSort(schema.value)
 </script>
 
 <template>

src/components/Detail/src/Detail.vue

@@ -49,6 +49,7 @@
             :data="detailData"
             :schema="allSchemas.detailSchema"
             :columns="2"
+            :key="updateKey"
           />
           <!-- 检验工序用到插槽 -->
           <slot v-if="isBasic && !tabsExtend" :data="detailData" name="basicBottom" :key="updateKey"></slot>
@@ -498,6 +499,17 @@ const props = defineProps({
     required: false,
     default: false
   },
+  isHaveDetailTabs:{
+    type: Boolean,
+    required: true,
+    default: false
+  },
+  // 主列表数据
+  detailDataProps: {
+    type: Object,
+    required: true,
+    default: null
+  }
 })
 const allSchemas = ref(props.allSchemas)
 const detailAllSchemasRef = ref(props.detailAllSchemas)
@@ -535,10 +547,13 @@ const tabsList = ref(JSON.parse(JSON.stringify(props.tabs ? props.tabs : '')))
 
 if (props.isBasic == true) {
   if (tabsList.value && tabsList.value.length > 0) {
-    tabsList.value.unshift({
-      label: '详情',
-      prop: 'Detail'
-    })
+    if (props.isHaveDetailTabs) {
+        tabsList.value.unshift({
+        label: '详情',
+        prop: 'Detail'
+      })
+    }
+    
   }
 } else {
   if (tabsList.value && tabsList.value.length > 0) {
@@ -680,7 +695,7 @@ const getAnnexFileList =  async (row) => {
         annexList,
         hasSubDetail:item.hasSubDetail||false,
         subDetailTableData:item.subDetailTableData,
-        fileType:item.fileType||['apk','doc', 'xls', 'ppt', 'txt', 'pdf','png', 'jpg', 'jpeg'],
+        fileType:item.fileType||['apk','doc', 'xls', 'ppt', 'txt', 'pdf','png', 'jpg', 'jpeg','ofd'],
         limit:item.limit||10,
         fileSize:item.fileSize||5,
         showPreview:item.showPreview||false, // 是否展示预览按钮
@@ -887,7 +902,7 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName:
     }
   }
 }
-const updateList = ()=>{
+const updateList =async  ()=>{
   
   // 刷新
   if (tableObjectRef.value.params.filters && tableObjectRef.value.params.filters.length > 0) {
@@ -895,7 +910,7 @@ const updateList = ()=>{
       filters: tableObjectRef.value.params.filters
     })
   } else {
-    tableMethodsRef.value.getList()
+    await tableMethodsRef.value.getList()
   }
 }
 
@@ -1100,7 +1115,7 @@ const submitForm = async (formType, data) => {
 const submitUpdateList = async ()=>{
   formRef.value.dialogVisible = false
   // 刷新当前列表
-  updateList()
+  await updateList()
   updateKey.value += 1
 }
 
@@ -1134,7 +1149,8 @@ const emit = defineEmits([
   'formFormDateChange',
   'buttonBaseClick',
   'handleMainFefresh',
-  'handleSubmitForm'
+  'handleSubmitForm',
+  'changeDetailList'
 ])
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
@@ -1269,6 +1285,9 @@ watch(
     tableMethodsRef.value = tableMethods
     const { getList } = tableMethods
     await getList()
+    
+    emit('changeDetailList',props.apiPage)
+
   }
 )
   watch(
@@ -1279,6 +1298,34 @@ watch(
     {
       deep: true
     }
+)
+watch(
+    () => props.detailDataProps,
+    (val) => {
+      detailData.value = val
+    },
+    {
+      deep: true
+    }
+)
+watch(
+    () => props.allSchemas,
+  (val) => {
+      allSchemas.value =val
+      // if (!wsCache.get('ShowPackingNumber') && !props.isShowPackNumber) {
+      //   if (allSchemas.value) {
+      //     allSchemas.value.detailSchema = val.detailSchema.filter(item => item.field != 'packingNumber')
+      //   }
+      //   if (detailAllSchemasRules.value&&detailAllSchemasRules.value.packingNumber) {
+      //     delete detailAllSchemasRules.value.packingNumber
+      //   }
+      // }
+      updateKey.value++
+     
+    },
+    {
+      deep: true
+    }
   )
 defineExpose({ openDetail, formRef ,updateList,submitUpdateList,changeTabCurrent,openForm,tableObjectRef}) // 提供 open 方法，用于打开弹窗
 

src/components/SearchHigh/src/SearchHigh.vue

@@ -116,7 +116,8 @@ const props = defineProps({
 const message = useMessage() // 消息弹窗
 const route = useRoute() // 路由信息
 const popoverVisible = ref(false)
-const searchOption_high = ref(props.allSchemas?.tableColumns.filter(item => (item.field != "action"&&!item.hiddenSearchHigh)))
+const searchOption_high = ref(props.allSchemas?.tableColumns.filter(item => (item.field != "action" && !item.hiddenSearchHigh)))
+console.log(988,searchOption_high.value)
 const moreListData = ref({
   filters:[]
 })
@@ -390,7 +391,14 @@ const remoteMethod = (query, array) => {
     options.value = userListAll.value
   }
 }
-
+watch(
+  () =>props.allSchemas,
+  () => {
+    searchOption_high.value = props.allSchemas?.tableColumns.filter(item => (item.field != "action" && !item.hiddenSearchHigh))
+  },{
+    deep: true
+  }
+)
 defineExpose({
   popoverVisible
 })

src/components/Table/src/Table.vue

@@ -104,7 +104,6 @@ export default defineComponent({
 
     const setColumn = (columnProps: TableSetPropsType[], columnsChildren?: TableColumn[]) => {
       let { columns } = unref(getProps)
-      console.log(888,props.isShowPackNumber)
       if (!wsCache.get('ShowPackingNumber')&&!props.isShowPackNumber) {
         if (columns) {
           columns = columns.filter(item => item.field != 'packingNumber' && item.field != 'fromPackingNumber'&& item.field != 'toPackingNumber')
@@ -175,7 +174,6 @@ export default defineComponent({
     
     //清空选择
     const clearSelection  = ()=>{
-      console.log('clearSelection')
       elTableRef.value!.clearSelection()
     }
     
@@ -348,14 +346,13 @@ export default defineComponent({
         border
       } = unref(getProps)
       
-      console.log(999,props.isShowPackNumber)
       if (!wsCache.get('ShowPackingNumber') && !props.isShowPackNumber) {
         if (columns) {
          columns = columns.filter(item => item.field != 'packingNumber' && item.field != 'fromPackingNumber'&& item.field != 'toPackingNumber')
         }
       }
       //默认排序
-      // updateSort(columns)
+      updateSort(columns)
       return [...[renderTableExpand()], ...[renderTableSelection()]].concat(
         (columnsChildren || columns).map((v) => {
           const zhName = v.label || '';//中文名称

src/components/TableForm/src/TableForm.vue

@@ -97,7 +97,7 @@
               :type="headerItem?.tableForm?.inputType"
               :placeholder="
                 t(
-                  `ts.${headerItem?.tableForm?.placeholder || '请输入' + headerItem.label}`
+                  `ts.${headerItem?.tableForm?.isPlaceholder === false ? '' :( headerItem?.tableForm?.placeholder || '请输入' + headerItem.label)}`
                 ).replace('ts.', '')
               "
               :disabled="itemIsDisabled(headerItem, row)"

src/components/XButton/src/ButtonBaseMore.vue

@@ -14,11 +14,11 @@
       <span :style="{width:item.width+'px'||'auto'}" :class="[item.width?'ellipsis':'']">{{ item.label }}</span>
     </el-button>
   </div>
-  <el-dropdown placement="top-start" v-if="showList().length>3">
+  <el-dropdown placement="top-start" v-if="showList().length>2">
     <el-button link class="more" type="primary"> 更多 </el-button>
     <template #dropdown>
       <el-dropdown-menu>
-        <el-dropdown-item v-for="(item, index) in getMoreList" :key="index+3" class="btn-div">
+        <el-dropdown-item v-for="(item, index) in getMoreList" :key="index+2" class="btn-div">
           <el-button
             v-show="!item.hide"
             :type="item.type"
@@ -80,13 +80,13 @@ const showList = ()=>{
 }
 const getMoreList = computed(()=>{
   let list = showList()
-  return list.slice(3)
+  return list.slice(2)
 })
 const getButtonList = computed(()=>{
   let list = showList()
-  if(list.length>3){
+  if(list.length>2){
     console.log('list===',list)
-    return list.slice(0, 3)
+    return list.slice(0, 2)
   }
   return list
 })

src/layout/components/Message/src/Message.vue

@@ -65,6 +65,7 @@ onBeforeUnmount(() => {
           <Icon :size="18" class="cursor-pointer" color="#ffffff" icon="ep:bell" @click="getList" />
         </ElBadge>
       </template>
+      <ElScrollbar max-height="calc(100vh - 80px)">
       <ElTabs v-model="activeName">
         <ElTabPane label="我的站内信" name="notice">
           <div class="message-list">
@@ -88,7 +89,9 @@ onBeforeUnmount(() => {
       <div style="margin-top: 10px; text-align: right">
         <XButton preIcon="ep:view" title="查看全部" type="primary" @click="goMyList" />
       </div>
+      </ElScrollbar>
     </ElPopover>
+    
   </div>
 </template>
 <style lang="scss" scoped>

src/locales/en-US.ts

@@ -528,8 +528,8 @@ export default {
     money:'Money',
     material_code:'Material Code',
     material_name:'Material Name',
-    material_description1:'Material Description1',
-    material_description2:'Material Description2',
+    material_abbreviation:'Material Abbreviation',
+    material_description:'Material Description',
     amount:'Amount',
     measuring_unit:'Measuring Unit',
     item_cde:'Item Code',
@@ -635,7 +635,7 @@ export default {
     是:'Yes',
     否:'No',
     供应商代码:'Supplier Code',
-    物料代码:'Material Code',
+    品番:'Material Code',
     单据号:'Document Number',
     订单类型:'Order Type',
     状态:'State',
@@ -668,7 +668,7 @@ export default {
     '税率(%)':'Tax Rate(%)',
     生效时间:'Effective Time',
     失效时间:'Expiration Time',
-    供应商物料代码:'Supplier material code',
+    供应商品番:'Supplier material code',
     供应商计量单位:'Supplier measuring unit',
     转换率:'Conversion Rate',
     默认收货库位:'Default receiving warehouse location',
@@ -756,9 +756,9 @@ export default {
     批次:'Batch',
     到货日期:'Arrival date',
     过期日期:'Expiration date',
-    物料名称:'Material Name',
-    物料描述1:'Material Description1',
-    物料描述2:'Material Description2',
+    品名:'Material Name',
+    背番:'Material Abbreviation',
+    描述:'Description',
     项目代码:'Item Code',
     质检明细:'Quality inspection details',
     履历表明细:'Details of your resume',
@@ -933,7 +933,7 @@ export default {
     序号:'Serial Number',
     版本:'Version',
     地点:'Place',
-    '影响明细中物料代码，需在供应商物料中维护':'The material code in the details is affected ， must be maintained in the supplier\'s material',
+    '影响明细中品番，需在供应商物料中维护':'The material code in the details is affected ， must be maintained in the supplier\'s material',
     是否外部资源:'External resource or not',
     注意事项:'Announcements',
     导入模式:'Import Mode',
@@ -952,8 +952,8 @@ export default {
     用户信息:'User Information',
     请选择供应商:'Please select a supplier',
     请选择供应商代码:'Please select a vendor code',
-    请选择物料代码:'Please select material code',
-    请输入供应商物料代码:'Please input  the supplier material code',
+    请选择品番:'Please select material code',
+    请输入供应商品番:'Please input  the supplier material code',
     请选择库位代码:'Please input the location code',
     ERP库位:'ERP Location Code',
     单价:'Unit Price',
@@ -1024,7 +1024,7 @@ export default {
     审批通过:'Approve',
     要货预测主:'Demand forecast master data',
     要货预测主导入模版:'Demand forecast master data leads into the template',
-    创建供应商发货申请:'Create a supplier shipping request',
+    创建发货申请:'Create a shipping request',
     '是否重新打开所选中数据？':'Do you want to reopen the selected data?',
     '请先上传自检报告!':'Please upload the self-test report first!',
     '提交审批成功!':'Submitted for approval!',
@@ -1056,6 +1056,8 @@ export default {
     合同附件:'Appendix to the contract',
     发票附件:'Invoice Attachment',
     货运单附件:'Attachment to the waybill',
+    发货单附件:'Dispatch note',
+    对账单附件:'Statement of account',
     其他附件:'Other Attachment',
     打印明细:'Print Detail',
     打印全部发货单:'Print all invoices',

src/locales/zh-CN.ts

@@ -527,10 +527,10 @@ export default {
     cause:'原因',
     unit_price:'单价',
     money:'金额',
-    material_code:'物料代码',
-    material_name:'物料名称',
-    material_description1:'物料描述1',
-    material_description2:'物料描述2',
+    material_code:'品番',
+    material_name:'品名',
+    material_abbreviation:'背番',
+    description:'描述',
     amount:'数量',
     measuring_unit:'计量单位',
     item_code:'项目代码',
@@ -640,7 +640,7 @@ export default {
     是:'是',
     否:'否',
     供应商代码: '供应商代码',
-    物料代码:'物料代码',
+    品番:'品番',
     单据号:'单据号',
     订单类型:'订单类型',
     状态:'状态',
@@ -673,7 +673,7 @@ export default {
     '税率(%)':'税率(%)',
     生效时间:'生效时间',
     失效时间:'失效时间',
-    供应商物料代码:'供应商物料代码',
+    供应商品番:'供应商品番',
     供应商计量单位:'供应商计量单位',
     转换率:'转换率',
     默认收货库位:'默认收货库位',
@@ -761,9 +761,9 @@ export default {
     批次:'批次',
     到货日期:'到货日期',
     过期日期:'过期日期',
-    物料名称:'物料名称',
-    物料描述1:'物料描述1',
-    物料描述2:'物料描述2',
+    品名:'品名',
+    背番:'背番',
+    描述:'描述',
     项目代码:'项目代码',
     质检明细:'质检明细',
     履历表明细:'履历表明细',
@@ -938,7 +938,7 @@ export default {
     序号:'序号',
     版本:'版本',
     地点:'地点',
-    '影响明细中物料代码，需在供应商物料中维护':'影响明细中物料代码，需在供应商物料中维护',
+    '影响明细中品番，需在供应商物料中维护':'影响明细中品番，需在供应商物料中维护',
     是否外部资源:'是否外部资源',
     注意事项:'注意事项',
     导入模式:'导入模式',
@@ -957,8 +957,8 @@ export default {
     用户信息:'用户信息',
     请选择供应商:'请选择供应商',
     请选择供应商代码:'请选择供应商代码',
-    请选择物料代码:'请选择物料代码',
-    请输入供应商物料代码:'请输入供应商物料代码',
+    请选择品番:'请选择品番',
+    请输入供应商品番:'请输入供应商品番',
     请选择库位代码:'请选择库位代码',
     ERP库位:'ERP库位',
     单价:'单价',
@@ -1029,7 +1029,7 @@ export default {
     审批通过:'审批通过',
     要货预测主:'要货预测主',
     要货预测主导入模版:'要货预测主导入模版',
-    创建供应商发货申请:'创建供应商发货申请',
+    创建发货申请:'创建发货申请',
     '是否重新打开所选中数据？':'是否重新打开所选中数据？',
     '请先上传自检报告!':'请先上传自检报告!',
     '提交审批成功!':'提交审批成功!',
@@ -1062,6 +1062,8 @@ export default {
     合同附件:'合同附件',
     发票附件:'发票附件',
     货运单附件:'货运单附件',
+    发货单附件:'发货单附件',
+    对账单附件:'对账单附件',
     其他附件:'其他附件',
     打印明细:'打印明细',
     打印全部发货单:'打印全部发货单',

src/router/modules/remaining.ts

@@ -36,7 +36,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
   {
     path: '/redirect',
     component: Layout,
-    name: 'Redirect',
+    name: '',
     children: [
       {
         path: '/redirect/:path(.*)',
@@ -184,37 +184,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
       title: t('router.login'),
       noTagsView: true
     }
-  },{
-    path: '/forgetPassword',
-    component: () => import('@/views/login/forgetPassword.vue'),
-    name: 'ForgetPassword',
-    meta: {
-      hidden: true,
-      title: t('router.login'),
-      noTagsView: true
-    }
-  },
-  {
-    path: '/updatePassword',
-    component: () => import('@/views/login/updatePassword.vue'),
-    name: 'UpdatePassword',
-    meta: {
-      hidden: true,
-      title: t('router.login'),
-      noTagsView: true
-    }
   },
-  {
-    path: '/updatePasswordNewTips',
-    component: () => import('@/views/login/updatePasswordNewTips.vue'),
-    name: 'UpdatePasswordNewTips',
-    meta: {
-      hidden: true,
-      title: t('router.login'),
-      noTagsView: true
-    }
-  },
-  
   {
     path: '/sso',
     component: () => import('@/views/login/login.vue'),
@@ -255,26 +225,6 @@ const remainingRouter: AppRouteRecordRaw[] = [
       noTagsView: true
     }
   },
-  {
-    path: '/purchasereceiptReport',
-    component: () => import('@/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptReport/index.vue'),
-    name: 'purchasereceiptReport',
-    meta: {
-      hidden: true,
-      title: t('ts.查看质检报告'),
-      noTagsView: true
-    }
-  },
-  {
-    path: '/supplierResume',
-    component: () => import('@/views/wms/purchasereceiptManage/supplierdeliver/supplierResume/index.vue'),
-    name: 'supplierResume',
-    meta: {
-      hidden: true,
-      title: t('ts.查看履历表'),
-      noTagsView: true
-    }
-  },
   {
     path: '/bpm',
     component: Layout,

src/types/descriptions.d.ts

@@ -12,4 +12,5 @@ export interface DescriptionsSchema {
   valueFilter?: function // 展示的过滤函数
   slotFilter?:boolean // 插槽自定义内容
   dictType?: string // add by 星语：支持 dict 字典数据
+  sortDetailDefault?: string | number
 }

src/utils/dict.ts

@@ -262,6 +262,7 @@ export enum DICT_TYPE {
   COUNT_PLAN_STATUS = 'count_plan_status', // 盘点计划状态
   COUNT_DIMENSION = 'count_dimension', // 盘点维度
   REQUEST_STATUS = 'request_status', // 申请状态
+  DEMANDFORECASTING_STATUS = 'demandforecasting_status', // 申请状态
   UNPLANNED_RECEIPT_REASON = 'unplanned_receipt_reason', // 计划外入库原因
   UNPLANNED_ISSUE_REASON = 'unplanned_issue_reason', // 计划外出库原因
   SCRAP_REASON = 'scrap_reason', // 报废出库原因

src/utils/disposition/formFields.ts

@@ -2,10 +2,10 @@
  * @returns {Array}  基础物料信息
  */
  export const ItemBasic =  [
-    { label: "物料代码", prop: 'code' },
-    { label: "物料名称", prop: "name" },
-    { label: "描述1", prop: "desc1" },
-    { label: "描述2", prop: "desc2" },
+    { label: "品番", prop: 'code' },
+    { label: "品名", prop: "name" },
+    { label: "背番", prop: "desc1" },
+    { label: "描述", prop: "desc2" },
     { type: "filter", label: "状态", prop: "status", filters: "itemStatus" },
     { label: "计量单位", prop: 'basicUom' },
     { type: "filter", label: "ABC类", prop: 'abcClass', filters: "abcClass" },
@@ -36,7 +36,7 @@
  */
  export const ItemQuality =  [
     {  label: "itemCode", prop: "itemCode" },
-    { label: "物料名称", prop: 'name' },
+    { label: "品名", prop: 'name' },
     { label: "供应商代码", prop: 'supplierCode' },
     { type: "filter", label: "检验类型", prop: 'inspectType', filters: "inspectType" },
     { label: "检验周期-按到货频次", prop: 'inspFrequency' },
@@ -66,7 +66,7 @@
  export const ItemPack =  [
     { label: "包装代码", prop: 'packCode', },
     { label: "包装名称", prop: "packName" },
-    { label: '物料代码', prop: "itemCode", },
+    { label: '品番', prop: "itemCode", },
     { label: "是否标准包装", type: "filter", prop: 'isStdPack', filters: "whetherOrNot" },
     { label: '标包编号', prop: "stdPackCode", },
     { label: "包装数量",type: "object",  prop: "packQty", showProp: "qty" },
@@ -133,7 +133,7 @@
  export const CustomerItem =  [
     { label: "客户代码", prop: 'customerCode', },
     { label: "itemCode", prop: "itemCode", },
-    { label: "客户物料代码", prop: "customerItemCode", },
+    { label: "客户品番", prop: "customerItemCode", },
     { label: "版本", prop: "version", },
     { type: "objectDateTime", label: "开始时间", prop: "timeRange", showProp: "beginTime" },
     { type: "objectDateTime", label: "结束时间", prop: "timeRange", showProp: "endTime" },
@@ -194,8 +194,8 @@
  export const SupplierItem =  [
   { label: "供应商代码", prop: 'supplierCode' },
   { label: "itemCode", prop: "itemCode" },
-  { label: "供应商物料代码", prop: "supplierItemCode" },
-  { label: "供应商物料名称", prop: "itemName" },
+  { label: "供应商品番", prop: "supplierItemCode" },
+  { label: "供应商品名", prop: "itemName" },
   { label: "每托数量", prop: "qtyPerPallet" },
   { type: "object", label: "包装数量", prop: "supplierPackQty", showProp: "qty" },
   { type: "object", label: "包装单位", prop: "supplierPackQty", showProp: "uom" },
@@ -377,7 +377,7 @@
  * @returns {Array}   物料安全库存
  */
  export const ItemSafetyStock = [
-  { label: "物料代码", prop: "itemCode", },
+  { label: "品番", prop: "itemCode", },
   { label: "仓库代码", prop: "warehouseCode" },
   { type: "filter", label: "存储关系类型", prop: "storeRelationType", filters: "storeRelationType", },
   { label: "值", prop: "storeValue" },
@@ -394,7 +394,7 @@
  */
  export const ItemSafetyStockQuery = [
   {
-    label: "物料代码",
+    label: "品番",
     prop: "itemCode",
     fixed: "left",
     type: "name",
@@ -436,7 +436,7 @@
  * @returns {Array}  生产线零件关系
  */
  export const ProdLineItem =  [
-  { label: "物料代码", prop: "itemCode", },
+  { label: "品番", prop: "itemCode", },
   { label: "生产线编号", prop: "prodLineCode", },
   { label: "生产线名称", prop: "prodLineName", },
   { label: "车间代码", prop: "workshopCode", },
@@ -924,9 +924,9 @@ export const DeliverNote = [
  */
  export const InventoryBalance = [
   { label: "itemCode", prop: 'itemCode' },
-  { type: "object", label: "物料名称", prop: "item", showProp: "name" },
-  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1" },
-  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2" },
+  { type: "object", label: "品名", prop: "item", showProp: "name" },
+  { type: "object", label: "背番", prop: "item", showProp: "desc1" },
+  { type: "object", label: "描述", prop: "item", showProp: "desc2" },
   { label: "库位代码", prop: "locationCode" },
   { type: "filter", label: "库存状态", prop: "status", filters: "inventoryStage" },
   { label: "批次", prop: 'lot' },
@@ -975,9 +975,9 @@ export const ERPInventoryBalance = [
   { label: "箱标签", prop: "packingCode" },
   { label: "托标签", prop: "containerCode" },
   { label: "itemCode", prop: "itemCode", },
-  { label: "物料名称", type: "object", prop: "item", showProp: "name", },
-  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+  { label: "品名", type: "object", prop: "item", showProp: "name", },
+  { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+  { type: "object", label: "描述", prop: "item", showProp: "desc2", },
   { type: "object", label: "计量单位", prop: "qty", showProp: "uom" },
   { type: "filter", filters: "inventoryStage", label: "库存状态", prop: "inventoryStatus" },
   { label: "仓库代码", prop: "warehouseCode" },
@@ -1022,9 +1022,9 @@ export const ERPInventoryBalance = [
   { type: "filter", filters: "inventoryStage", label: "从状态", prop: "fromStatus", },
   { type: "filter", filters: "inventoryStage", label: "到状态", prop: "toStatus", },
   { label: "itemCode", prop: "itemCode" },
-  { label: "物料名称", type: "object", prop: "item", showProp: "name", },
-  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+  { label: "品名", type: "object", prop: "item", showProp: "name", },
+  { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+  { type: "object", label: "描述", prop: "item", showProp: "desc2", },
   { type: "object", label: "到货数量", prop: "qty", showProp: "qty", },
   { type: "object", label: "到货单位", prop: "qty", showProp: "uom", },
   { label: "批次", prop: 'lot', },
@@ -1064,9 +1064,9 @@ export const InventoryTransferLogHegeZBuHeGe = [
   { type: "filter", filters: "requestStatus", label: "从状态", prop: "fromStatus", },
   { type: "filter", filters: "requestStatus", label: "到状态", prop: "toStatus", },
   { label: "itemCode", prop: "itemCode" },
-  { label: "物料名称", type: "object", prop: "item", showProp: "name", },
-  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+  { label: "品名", type: "object", prop: "item", showProp: "name", },
+  { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+  { type: "object", label: "描述", prop: "item", showProp: "desc2", },
   { type: "object", label: "到货数量", prop: "qty", showProp: "qty", },
   { type: "object", label: "到货单位", prop: "qty", showProp: "uom", },
   { label: "批次", prop: 'lot', },
@@ -1082,9 +1082,9 @@ export const InventoryTransferLogHegeZBuHeGe = [
  */
  export const InventoryOccupied = [
   { label: "itemCode", prop: "itemCode" },
-  { label: "物料名称", type: "object", prop: "item", showProp: "name", },
-  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+  { label: "品名", type: "object", prop: "item", showProp: "name", },
+  { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+  { type: "object", label: "描述", prop: "item", showProp: "desc2", },
   { label: "任务编号", prop: "jobNumber" },
   { label: "箱标签", prop: "packingCode", },
   { label: "托标签", prop: "containerCode", },
@@ -1105,9 +1105,9 @@ export const InventoryTransferLogHegeZBuHeGe = [
  */
  export const InventoryPredictable = [
   { label: "itemCode", prop: "itemCode", },
-  { label: "物料名称", type: "object", prop: "item", showProp: "name", },
-  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+  { label: "品名", type: "object", prop: "item", showProp: "name", },
+  { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+  { type: "object", label: "描述", prop: "item", showProp: "desc2", },
   { label: "任务编号", prop: "jobNumber" },
   { label: "箱标签", prop: "packingCode", },
   { label: "托标签", prop: "containerCode", },
@@ -1168,9 +1168,9 @@ export const InventoryTransferLogHegeZBuHeGe = [
   { type: "filter", filters: "requestStatus", label: "从状态", prop: "fromStatus", },
   { type: "filter", filters: "requestStatus", label: "到状态", prop: "toStatus", },
   { label: "itemCode", prop: "itemCode" },
-  { label: "物料名称", type: "object", prop: "item", showProp: "name", },
-  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+  { label: "品名", type: "object", prop: "item", showProp: "name", },
+  { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+  { type: "object", label: "描述", prop: "item", showProp: "desc2", },
   { type: "object", label: "到货数量", prop: "qty", showProp: "qty", },
   { type: "object", label: "到货单位", prop: "qty", showProp: "uom", },
   { label: "批次", prop: 'lot', },
@@ -1210,10 +1210,10 @@ export const InventoryTransferLogHegeZBuHeGe = [
  export const TracebackNote = [
   // { label: "编号", prop: "id", },
   { label: "追溯单号", prop: "number" },
-  { label: "物料代码", prop: "itemCode" },
-  { label: "物料名称", type: "object", prop: "item", showProp: "name" },
-  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1" },
-  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2" },
+  { label: "品番", prop: "itemCode" },
+  { label: "品名", type: "object", prop: "item", showProp: "name" },
+  { type: "object", label: "背番", prop: "item", showProp: "desc1" },
+  { type: "object", label: "描述", prop: "item", showProp: "desc2" },
   { label: "箱标签", prop: "packingCode" },
   { type: "object", label: "产品数量", prop: "qty", showProp: "qty" },
   { type: "object", label: "单位", prop: "qty", showProp: "uom" },
@@ -1278,14 +1278,14 @@ export const ReworkNote =  [
     prop: "number",
     fixed: "left",
   },
-  { label: "物料代码", prop: 'itemCode' },
+  { label: "品番", prop: 'itemCode' },
   // { label: "部门", prop: 'department' },
   // { label: "工单号", prop: 'workOrder' },
   // { label: "流水号", prop: 'seqNo' },
-  { label: "目标物料代码", prop: 'toItemCode' },
-  { label: "目标物料名称", prop: 'toItemName' },
-  { label: "目标物料描述1", prop: 'toItemDesc1' },
-  { label: "目标物料描述2", prop: 'toItemDesc2' },
+  { label: "目标品番", prop: 'toItemCode' },
+  { label: "目标品名", prop: 'toItemName' },
+  { label: "目标背番", prop: 'toItemDesc1' },
+  { label: "目标描述", prop: 'toItemDesc2' },
   { label: "目标数量", prop: 'toQtyQty' },
   { label: "目标单位", prop: 'toQtyUom' },
   { label: "目标库位", prop: 'toLocationCode' },
@@ -1646,7 +1646,7 @@ export const OuterPillarDeliverNote = [
   { label: "项目号", prop: "projectCode" },
   { label: "位置", prop: 'position' },
   { label: "配置号", prop: 'l7Part' },
-  { label: "物料描述", prop: 'itemName' },
+  { label: "描述", prop: 'itemName' },
   { label: "备品生产号", prop: 'sparesNumber' },
   { label: "备品批次", prop: 'sparesLot' },
   { label: "目标生产号", prop: 'targetNumber' },
@@ -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' },
@@ -1933,10 +1933,10 @@ export const PillarDeliverNote = [
  */
 export const labelInfo =  [
   { label: "箱码", prop: "packingCode" },
-  { label: "物料代码", prop: "itemCode" },
-  { label: "物料名称", prop: "item", showProp: 'name', type:'object' },
-  { label: "物料描述1", prop: "item", showProp: 'desc1', type:'object' },
-  { label: "物料描述2", prop: "item", showProp: 'desc2', type:'object' },
+  { label: "品番", prop: "itemCode" },
+  { label: "品名", prop: "item", showProp: 'name', type:'object' },
+  { label: "背番", prop: "item", showProp: 'desc1', type:'object' },
+  { label: "描述", prop: "item", showProp: 'desc2', type:'object' },
   { label: "批次", prop: "lot" },
   { label: "数量", prop: "qty", showProp: 'qty', type:'object' },
   { label: "单位", prop: "qty", showProp: 'uom', type:'object' },

src/utils/disposition/tableDetailsColumns.ts

@@ -3,9 +3,9 @@
  */
  export const PurchaseOrder =  [
     { label: "itemCode", prop: "itemCode", fixed: "left" },
-    { type:"object", label: "物料名称", prop: "item", showProp:"name", },
-    { type:"object", label: "物料描述1", prop: "item", showProp:"desc1", },
-    { type:"object", label: "物料描述2", prop: "item", showProp:"desc2", },
+    { type:"object", label: "品名", prop: "item", showProp:"name", },
+    { type:"object", label: "背番", prop: "item", showProp:"desc1", },
+    { type:"object", label: "描述", prop: "item", showProp:"desc2", },
     { label: "订单号", prop: "number", },
     { label: "订单行", prop: "poLine", },
     { type:"object", label: "数量", prop: "qty", showProp:"qty", },
@@ -23,9 +23,9 @@
       { label: "销售订单号", prop: "number", fixed: "left",},
       { label: "订单行", prop: "soLine", },
       { label: "itemCode", prop: "itemCode", },
-      { type:"object", label: "物料名称", prop: "item", showProp:"name", },
-      { type:"object", label: "物料描述1", prop: "item", showProp:"desc1", },
-      { type:"object", label: "物料描述2", prop: "item", showProp:"desc2", },
+      { type:"object", label: "品名", prop: "item", showProp:"name", },
+      { type:"object", label: "背番", prop: "item", showProp:"desc1", },
+      { type:"object", label: "描述", prop: "item", showProp:"desc2", },
       { label: "备注", prop: 'remark', },
   ]
 /**
@@ -36,9 +36,9 @@
     { label: "订单行", prop: "poLine", width: "200px" },
     { label: "箱标签", prop: "packingCode", width: "200px" },
     { label: "itemCode", prop: "itemCode", width: "200px" },
-    { type: "object", label: "物料名称", prop: "item", showProp: "name", width: "200px" },
-    { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", width: "200px" },
-    { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", width: "200px" },
+    { type: "object", label: "品名", prop: "item", showProp: "name", width: "200px" },
+    { type: "object", label: "背番", prop: "item", showProp: "desc1", width: "200px" },
+    { type: "object", label: "描述", prop: "item", showProp: "desc2", width: "200px" },
     // { type: "object", label: "到货数量", prop: "qty", showProp: "qty", width: "200px" },
     { type: "object", label: "发货数量", prop: "qty", showProp: "qty", width: "200px" },
     { type: "object", label: "计量单位", prop: "qty", showProp: "uom", width: "200px" },
@@ -58,9 +58,9 @@
     { label: "订单行", prop: "poLine", },
     { label: "箱标签", prop: "packingCode", },
     { label: "itemCode", prop: "itemCode", },
-    { type: "object", label: "物料名称", prop: "item", showProp: "name", },
-    { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-    { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+    { type: "object", label: "品名", prop: "item", showProp: "name", },
+    { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+    { type: "object", label: "描述", prop: "item", showProp: "desc2", },
     { type: "object", label: "发货数量", prop: "qty", showProp: "qty", },
     { type: "object", label: "计量单位", prop: "qty", showProp: "uom", },
     { label: "托标签", prop: "containerCode", },
@@ -75,13 +75,13 @@
  */
  export const ArriveNotice =  [
     { label: "itemCode", prop: "itemCode",fixed:"left", },
-    { type: "object", label: "物料名称",  prop: "item", showProp: "name", },
+    { type: "object", label: "品名",  prop: "item", showProp: "name", },
     { type: "object", valueType: Number, label: "到货数量",  prop: "qty", showProp: "qty", },
     { type: "object", valueType: Number, label: "包装数量",  prop: "stdPack", showProp: "packQty", },
     { label: "每托数量",  prop: "qtyPerPallet", },
     { type: "object", label: "计量单位", prop: "qty", showProp: "uom", },
-    { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-    { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+    { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+    { type: "object", label: "描述", prop: "item", showProp: "desc2", },
     { label: "批次", prop: "lot", },
     { type: "objectDateTime", label: "生产日期",  prop: "batch", showProp: "produceDate", },
     { type: "object", label: "供应商批次",  prop: "batch", showProp: "supplierBatch", },
@@ -96,7 +96,7 @@
  */
  export const PurchaseReceiptNote =  [
       { label: "itemCode", prop: "itemCode",fixed: "left", },
-      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+      { type: "object", label: "品名", prop: "item", showProp: "name", },
       // { type: "object", label: "到货数量", prop: "qty", showProp: "qty", },
       { type: "object", label: "收货数量", prop: "qty", showProp: "qty", },
       { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
@@ -105,8 +105,8 @@
       { label: "箱标签", prop: "packingCode", },
       { label: "托标签", prop: "containerCode", },
       { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { type: "object", label: "包装单位", prop: "qty", showProp: "uom", },
       { type: "object", label: "包装规格", prop: "stdPack", showProp: "packUom", },
       { label: "E-LEVEL等级", prop: "labelEqLevel" },
@@ -117,13 +117,13 @@
  */
  export const ReceiptAbnormalNote =  [
       { label: "itemCode", prop: "itemCode", fixed: "left", },
-      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+      { type: "object", label: "品名", prop: "item", showProp: "name", },
       // { type: "object", label: "到货数量", prop: "qty", showProp: "qty", },
       { type: "object", label: "收货数量", prop: "qty", showProp: "qty", },
       { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
       { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { type: "object", label: "包装单位", prop: "qty", showProp: "uom", },
       { type: "object", label: "包装规格", prop: "stdPack", showProp: "packUom", },
       { label: "备注", prop: 'remark', },
@@ -133,9 +133,9 @@
  */
  export const PurchaseReturnNote =  [
       { label: "itemCode", prop: "itemCode", fixed: "left", },
-      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "品名", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { label: "箱标签", prop: "packingCode"},
       { label: "退货库位", prop: "locationCode"},
       { label: "发货单号", prop: "asnNumber" },
@@ -155,14 +155,14 @@
       { label: "箱标签", prop: "toPackingCode", },
       { type: "object", valueType: Number, label: "上架数量", prop: "qty", showProp: "qty", },
       { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", },
-      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+      { type: "object", label: "品名", prop: "item", showProp: "name", },
       { type: "object", label: "备料单位", prop: "qty", showProp: "uom", },
       { label: "目标库位", prop: "toLocationCode", },
       { label: "来源库位", prop: "fromLocationCode", },
       { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
       { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { label: "备注", prop: 'remark', },
   ]
 /**
@@ -177,9 +177,9 @@
     { label: "请求库位", prop: "requestLocationCode", },
     { label: "目标库位", prop: "toLocationCode",  },
     { type: "dateTime", label: "过期日期", prop: "expiredTime", },
-    { type: "object", label: "物料名称", prop: "item", showProp: "name", },
-    { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-    { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+    { type: "object", label: "品名", prop: "item", showProp: "name", },
+    { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+    { type: "object", label: "描述", prop: "item", showProp: "desc2", },
     { label: "备注", prop: 'remark', },
   ]
 /**
@@ -190,15 +190,15 @@
       // { label: "箱标签", type: "input", prop: "packingCode", },
       { type: "object", valueType: Number, label: "发料数量", prop: "qty", showProp: "qty", },
       { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", },
-      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+      { type: "object", label: "品名", prop: "item", showProp: "name", },
       { type: "object", label: "发料单位", prop: "qty", showProp: "uom", },
       { label: "请求库位", prop: "fromRequestLocationCode", },
       { label: "目标库位", prop: "toLocationCode", },
       { label: "来源库位", prop: "fromLocationCode", },
       { type: "dateTime", label: "发料时间", prop: "issueTime", },
       { type: "dateTime", label: "过期时间", prop: "expiredTime", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { label: "生产线", prop: "prodLine", },
       { label: "工作中心", prop: "workCenter", },
       { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
@@ -213,13 +213,13 @@
       // { label: "箱标签", type: "input", prop: "packingCode", },
       { type: "object", valueType: Number, label: "入库数量", prop: "qty", showProp: "qty", },
       { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", },
-      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+      { type: "object", label: "品名", prop: "item", showProp: "name", },
       { type: "object", label: "入库单位", prop: "qty", showProp: "uom", },
       { label: "库位编号", prop: "locationCode", },
       { label: "箱标签", prop: "packingCode", },
       { label: "托标签", prop: "containerCode", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
       { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", },
       { label: "供应商代码", prop: 'supplierCode', },
@@ -234,13 +234,13 @@
     // { label: "箱标签", type: "input", prop: "packingCode", },
     { type: "object", valueType: Number, label: "出库数量", prop: "qty", showProp: "qty", },
     { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", },
-    { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+    { type: "object", label: "品名", prop: "item", showProp: "name", },
     { type: "object", label: "出库单位", prop: "qty", showProp: "uom", },
     { label: "库位编号", prop: "locationCode", },
     { label: "箱标签", prop: "packingCode", },
     { label: "托标签", prop: "containerCode", },
-    { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-    { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+    { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+    { type: "object", label: "描述", prop: "item", showProp: "desc2", },
     { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
     { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", },
     { label: "供应商代码", prop: 'supplierCode', },
@@ -255,7 +255,7 @@
     // { label: "箱标签", type: "input", prop: "packingCode", },
     { type: "object", valueType: Number, label: "隔离数量", prop: "qty", showProp: "qty", },
     { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", },
-    { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+    { type: "object", label: "品名", prop: "item", showProp: "name", },
     { type: "object", label: "隔离单位", prop: "qty", showProp: "uom", },
     { label: "来源库位", prop: "fromLocationCode", },
     { label: "目标库位", prop: "toLocationCode", },
@@ -263,8 +263,8 @@
     { label: "目标箱标签", prop: "toPackingCode", },
     { label: "来源托标签", prop: "fromContainerCode", },
     { label: "来源托标签", prop: "toContainerCode", },
-    { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-    { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+    { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+    { type: "object", label: "描述", prop: "item", showProp: "desc2", },
     { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
     { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", },
     { label: "备注", prop: 'remark', },
@@ -277,7 +277,7 @@
     // { label: "箱标签", type: "input", prop: "packingCode", },
     { type: "object", valueType: Number, label: "报废数量", prop: "qty", showProp: "qty", },
     { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", },
-    { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+    { type: "object", label: "品名", prop: "item", showProp: "name", },
     { type: "object", label: "报废单位", prop: "qty", showProp: "uom", },
     { label: "来源库位", prop: "fromLocationCode", },
     { label: "目标库位", prop: "toLocationCode", },
@@ -285,8 +285,8 @@
     { label: "目标箱标签", prop: "toPackingCode", },
     { label: "来源托标签", prop: "fromContainerCode", },
     { label: "来源托标签", prop: "toContainerCode", },
-    { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-    { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+    { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+    { type: "object", label: "描述", prop: "item", showProp: "desc2", },
     { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
     { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", },
     { label: "备注", prop: 'remark', },
@@ -296,14 +296,14 @@
  */
  export const DeliverPlan =  [
       { label: "itemCode", prop: "itemCode", fixed: "left",},
-      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+      { type: "object", label: "品名", prop: "item", showProp: "name", },
       // { type: "object", label: "到货数量", prop: "qty", showProp: "qty", },
       { type: "object", label: "发货数量", prop: "qty", showProp: "qty", },
       { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
       { type: "object", label: "包装单位", prop: "qty", showProp: "uom", },
       { type: "object", label: "包装规格", prop: "stdPack", showProp: "packUom", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { label: "项目", prop: "project", },
       { label: "销售订单号", prop: "soNumber", },
       { label: "订单行", prop: "soLine", },
@@ -316,11 +316,11 @@
       { label: "itemCode", prop: "itemCode", fixed: "left",},
       { type: "object", label: "发货数量", prop: "qty", showProp: "qty", },
       { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
-      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+      { type: "object", label: "品名", prop: "item", showProp: "name", },
       { label: "目标库位", prop: "toLocationCode", },
       { type: "dateTime", label: "过期时间", prop: "expiredTime", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { label: "备注", prop: 'remark', },
   ]
 /**
@@ -331,7 +331,7 @@
       // { label: "箱标签", type: "input", prop: "packingCode", },
       { type: "object", valueType: Number, label: "发货数量", prop: "qty", showProp: "qty", },
       { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", },
-      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
+      { type: "object", label: "品名", prop: "item", showProp: "name", },
       { type: "object", label: "发货单位", prop: "qty", showProp: "uom", },
       { label: "目标库位", prop: "toLocationCode", },
       { label: "来源库位", prop: "fromLocationCode", },
@@ -343,8 +343,8 @@
       { label: "目标托标签", prop: "toContainerCode", },
       { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
       { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { label: "备注", prop: 'remark', },
   ]
 /**
@@ -373,9 +373,9 @@
     { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", },
     // { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", },
     { label: "批次", prop: "lot", },
-    { type: "object", label: "物料名称", prop: "item", showProp: "name", },
-    { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-    { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+    { type: "object", label: "品名", prop: "item", showProp: "name", },
+    { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+    { type: "object", label: "描述", prop: "item", showProp: "desc2", },
     { label: "备注", prop: 'remark', },
   ]
 
@@ -386,9 +386,9 @@
   { label: "盘点计划单号", prop: "countPlanNumber", fixed: "left", },
   // { type: "filter", filters: "stageType", label: "阶段", prop: "stage",},
   { label: "itemCode", prop: "itemCode", },
-  { type: "object", label: "物料名称", prop: "item", showProp: "name", },
-  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+  { type: "object", label: "品名", prop: "item", showProp: "name", },
+  { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+  { type: "object", label: "描述", prop: "item", showProp: "desc2", },
   { label: "盘点数量", prop: "finalCountQty" },
   { label: "盘点差异数量", prop: "diffQty" },
   { type: "filter", label: "明细状态", prop: "detailStatus", filters: "DetailStatus", },
@@ -416,9 +416,9 @@
       { label: "盘点计划单号", prop: "countPlanNumber", fixed: "left", },
       // { type: "filter", filters: "checkStage", label: "阶段", prop: "stage",},
       { label: "itemCode", prop: "itemCode", },
-      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "品名", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { label: "盘点数量", prop: "finalCountQty" },
       { label: "盘点差异数量", prop: "diffQty" },
       { type: "filter", label: "明细状态", prop: "detailStatus", filters: "DetailStatus", },
@@ -444,11 +444,11 @@
  export const CountAdjustNote =  [
       { label: "itemCode", prop: "itemCode", fixed: "left", },
       // { type: "filter", filters: "checkStage", label: "阶段", prop: "stage",},
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", width: "300px" },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", width: "300px" },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", width: "300px" },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", width: "300px" },
       { label: "库位编号", prop: "locationCode", width: "200px" },
       // { type: "object", valueType: Number, label: "发货数量", prop: "InventoryQty", showProp: "qty", width: "100px" },
-      { type: "object", label: "物料名称", prop: "item", showProp: "name", width: "150px" },
+      { type: "object", label: "品名", prop: "item", showProp: "name", width: "150px" },
       // { type: "object", label: "发货单位", prop: "InventoryQty", showProp: "uom", width: "100px" },
       { label: "盘点差异数量", prop: "diffQty" },
       // { type: "filter", label: "明细状态", prop: "detailStatus", filters: "DetailStatus", width: "100px" },
@@ -468,9 +468,9 @@
  */
  export const ProductionPlan =  [
       { label: "itemCode", prop: "itemCode", fixed: "left",},
-      { type: "object", label: "物料名称", prop: "item", showProp: "name",},
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "品名", prop: "item", showProp: "name",},
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { type: "object", valueType: Number, label: "计划数量", prop: "planQty", showProp: "qty", },
       // { label: "合格数量", prop: "goodQty", },
       // { label: "不合格数量", prop: "noGoodQty", },
@@ -486,9 +486,9 @@
  */
  export const PreparationPlan =  [
       { label: "itemCode", prop: "itemCode", fixed: "left",},
-      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "品名", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { type: "object", label: "备料数量", prop: "qty", showProp: "qty", },
       { type: "object", label: "备料单位", prop: "qty", showProp: "uom", },
       { type: "object", label: "包装数量", prop: "stdPack", showProp: "qty", },
@@ -503,9 +503,9 @@
  */
  export const ProductReceiptNote =  [
       { label: "itemCode", prop: "itemCode", fixed: "left",},
-      { type: "object", label: "物料名称", prop: "item", showProp: "name", width: "150px" },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", width: "300px" },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", width: "300px" },
+      { type: "object", label: "品名", prop: "item", showProp: "name", width: "150px" },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", width: "300px" },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", width: "300px" },
       { label: "库位编号", prop: "locationCode", },
       { label: "原料库位", prop: "rawLocation", width: "100px" },
       { type: "object", valueType: Number, label: "完工收货数量", prop: "qty", showProp: "qty", width: "100px" },
@@ -526,9 +526,9 @@
  */
  export const OfflineSettlementNote =  [
       { label: "itemCode", prop: "itemCode", fixed: "left",},
-      { type: "object", label: "物料名称", prop: "item", showProp: "name",},
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "品名", prop: "item", showProp: "name",},
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { type: "object", valueType: Number, label: "下线结算数量", prop: "qty", showProp: "qty", },
       { type: "object", label: "下线结算单位", prop: "qty", showProp: "uom", },
       { label: "库位编号", prop: "locationCode", },
@@ -544,9 +544,9 @@
  */
  export const TracebackNote =  [
       { label: "itemCode", prop: "itemCode", fixed: "left",},
-      { type: "object", label: "物料名称", prop: "item", showProp: "name",},
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "品名", prop: "item", showProp: "name",},
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { type: "object", valueType: Number, label: "消耗数量", prop: "rawQty", showProp: "qty", },
       { type: "object", label: "包装规格", prop: "rawQty", showProp: "uom", },
       { label: "来源库位代码", prop: "rawLocation", },
@@ -562,9 +562,9 @@
  */
  export const ProductRecycleNote =  [
       { label: "itemCode", prop: "itemCode", fixed: "left",},
-      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "品名", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { label: "库位编号", prop: "locationCode", },
       { label: "原料库位编号", prop: "rawLocation", },
       { type: "object", valueType: Number, label: "成品回收数量", prop: "qty", showProp: "qty", },
@@ -584,9 +584,9 @@
  */
  export const StockReturnNote =  [
       { label: "itemCode", prop: "itemCode", fixed: "left",},
-      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "品名", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { type: "object", valueType: Number, label: "退库数量", prop: "qty", showProp: "qty", },
       { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", },
       { type: "object", label: "退库单位", prop: "qty", showProp: "uom", },
@@ -607,9 +607,9 @@
  */
  export const CustomerReturnNote =  [
       { label: "itemCode", prop: "itemCode", fixed: "left",},
-      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "品名", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { type: "object", valueType: Number, label: "退货数量", prop: "qty", showProp: "qty", },
       { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", },
       { type: "object", label: "退货单位", prop: "qty", showProp: "uom", },
@@ -628,9 +628,9 @@
  */
  export const WareHouseTransferNote =  [
   { label: "物料编号", prop: "itemCode", fixed: "left",},
-  { type: "object", label: "物料名称", prop: "item", showProp: "name", },
-  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+  { type: "object", label: "品名", prop: "item", showProp: "name", },
+  { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+  { type: "object", label: "描述", prop: "item", showProp: "desc2", },
   { type: "object", label: "数量", prop: "qty", showProp: "qty", },
   { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
   { label: "目标库位", prop: "toLocationCode", },
@@ -647,10 +647,10 @@
  */
   export const ReworkNote =  [
     { 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: 'itemCode' },
+    { label: "品名", prop: 'item', showProp: 'name', 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" },
@@ -668,9 +668,9 @@
  */
  export const InspectNotice =  [
       { label: "itemCode", prop: "itemCode", fixed: "left",},
-      { label: "物料名称", type: "object", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { label: "品名", type: "object", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { label: "箱标签", prop: "packingCode",},
       { label: "托标签", prop: "containerCode",},
       { label: "批次", prop: "lot" },
@@ -692,9 +692,9 @@
  */
  export const InspectNote =  [
       { label: "itemCode", prop: "itemCode", fixed: "left",},
-      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "品名", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { label: "检验数量", prop: "inspectQty",},
       { label: "合格数量", prop: "goodQty",},
       { label: "不合格数量", prop: "failedQty",},
@@ -718,9 +718,9 @@
  */
  export const InspectAbnormalNote =  [
       { label: "itemCode", prop: "itemCode", fixed: "left",},
-      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "品名", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { type: "object", label: "质量异常数量", prop: "qty", showProp: "qty", },
       { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
       { type: "object", label: "质量异常单位", prop: "qty", showProp: "uom", },
@@ -736,9 +736,9 @@
  */
  export const PurchaseReceiptJob =  [
       { label: "itemCode", prop: "itemCode", fixed: "left",},
-      { label: "物料名称", type: "object", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { label: "品名", type: "object", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { type: "object", label: "实际收货数量", prop: "handledQty", showProp: "qty", },
       { type: "object", label: "推荐收货数量", prop: "recommendQty", showProp: "qty", },
       { type: "object", label: "收货单位", prop: "recommendQty", showProp: "uom",},
@@ -773,9 +773,9 @@
       { label: "推荐库位", prop: "recommendLocationCode",},
       { label: "实际托标签", prop: "handledContainerCode",},
       { label: "推荐托标签", prop: "recommendContainerCode",},
-      { label: "物料名称", type: "object", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { label: "品名", type: "object", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty",},
       { type: "object", label: "包装单位", prop: "stdPack", showProp: "packUom",},
       { type: "object", label: "实际供应商批次", prop: "handledBatch", showProp: "supplierBatch",},
@@ -789,9 +789,9 @@
  */
  export const PutawayJob =  [
       { label: "itemCode", prop: "itemCode",  fixed: "left",}, 
-      { label: "物料名称", type: "object", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { label: "品名", type: "object", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { label: "实际箱标签", prop: "handledPackingCode",},
       { label: "推荐箱标签", prop: "recommendPackingCode",},
       { label: "实际托标签", prop: "handledContainerCode",},
@@ -819,9 +819,9 @@
  */
  export const InspectJob =  [
       { label: "itemCode", prop: "itemCode",  fixed:"left", }, 
-      { label: "物料名称", type: "object", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { label: "品名", type: "object", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { label: "实际箱标签",prop: "handledPackingCode",},
       { label: "推荐箱标签", prop: "recommendPackingCode",},
       { label: "实际托标签", prop: "handledContainerCode",},
@@ -855,9 +855,9 @@
  */
  export const IssueJob =  [
       { label: "itemCode", prop: "itemCode", fixed: "left",},
-      { label: "物料名称", type: "object", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { label: "品名", type: "object", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { label: "实际箱标签", prop: "handledPackingCode",},
       { label: "推荐箱标签", prop: "recommendPackingCode",},
       { label: "请求库位", prop: "fromRequestLocationCode", },
@@ -895,9 +895,9 @@
       { label: "目标库位", prop: "toLocation",},
       { label: "推荐库位", prop: "recommendLocationCode",},
       { label: "托标签", prop: "containerCode",},
-      { label: "物料名称", type: "object", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { label: "品名", type: "object", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       // { type: "object", label: "到货数量", prop: "handledQty", showProp: "qty",},
       // { type: "object", label: "到货单位", prop: "handledQty", showProp: "uom",},
       { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty",},
@@ -922,9 +922,9 @@
       { type: "object", label: "收货单位", prop: "handledQty", showProp: "uom",},
       // { label: "箱标签", prop: "packingCode",},
       { label: "托标签", prop: "containerCode",},
-      { label: "物料名称", type: "object", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { label: "品名", type: "object", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       // { type: "object", label: "到货数量", prop: "handledQty", showProp: "qty",},
       // { type: "object", label: "到货单位", prop: "handledQty", showProp: "uom",},
       { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty",},
@@ -952,9 +952,9 @@
       { type: "object", label: "推荐批次", prop: "recommendBatch", showProp: "supplierBatch", },
       { type: "object", label: "推荐日期", prop: "recommendBatch", showProp: "produceDate",},
       { label: "托标签", prop: "containerCode",},
-      { label: "物料名称", type: "object", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { label: "品名", type: "object", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       // { type: "object", label: "到货数量", prop: "handledQty", showProp: "qty",},
       // { type: "object", label: "到货单位", prop: "handledQty", showProp: "uom",},
       { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty",},
@@ -971,9 +971,9 @@
       { type: "object", label: "库存单位", prop: "inventoryQty", showProp: "uom",},
       { label: "实际库位", prop: "locationCode",},
       { label: "托标签", prop: "containerCode",},
-      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "品名", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty",},
       { type: "object", label: "包装单位", prop: "stdPack", showProp: "packUom",},
       { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch",},
@@ -996,10 +996,10 @@
       { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty",},
       { type: "object", label: "包装单位", prop: "stdPack", showProp: "packUom",},
       { label: "托标签", prop: "containerCode",},
-      //{ label: "物料代码", prop: "itemCode",},
-      { label: "物料名称", type: "object", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      //{ label: "品番", prop: "itemCode",},
+      { label: "品名", type: "object", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       // { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch",},
       { label: "批次", prop: "lot", },
       { label: "备注", prop: 'remark', },
@@ -1069,9 +1069,9 @@ export const ReceivingRecords = [
  */
  export const JisProductRecycleNote = [
   { label: "itemCode", prop: "itemCode", fixed: "left",},
-  { type: "object", label: "物料名称", prop: "item", showProp: "name", },
-  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+  { type: "object", label: "品名", prop: "item", showProp: "name", },
+  { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+  { type: "object", label: "描述", prop: "item", showProp: "desc2", },
   { type: "object", label: "数量", prop: "qty", showProp: "qty", },
   { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
   { label: "箱标签", prop: "packingCode"},
@@ -1090,9 +1090,9 @@ export const ReceivingRecords = [
  */
  export const JisProductReturnNote = [
   { label: "itemCode", prop: "itemCode", fixed: "left",},
-  { type: "object", label: "物料名称", prop: "item", showProp: "name", },
-  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+  { type: "object", label: "品名", prop: "item", showProp: "name", },
+  { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+  { type: "object", label: "描述", prop: "item", showProp: "desc2", },
   { type: "object", label: "数量", prop: "qty", showProp: "qty", },
   // { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
   { label: "产品号", prop: "productNo" },
@@ -1104,9 +1104,9 @@ export const ReceivingRecords = [
  */
  export const JisProductTransferNote = [
   { label: "itemCode", prop: "itemCode", fixed: "left",},
-  { type: "object", label: "物料名称", prop: "item", showProp: "name", },
-  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+  { type: "object", label: "品名", prop: "item", showProp: "name", },
+  { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+  { type: "object", label: "描述", prop: "item", showProp: "desc2", },
   { type: "object", label: "数量", prop: "qty", showProp: "qty", },
   { label: "批次", prop: "lot" },
   { label: "产品号", prop: "productNo" },
@@ -1132,9 +1132,9 @@ export const ReceivingRecords = [
  * @returns {Array}  JIS信息查询
  */
  export const JISMessageQuery = [
-  { label: "物料代码", prop: "itemCode", },
-  { label: "物料名称",type: "object",  prop: "item", showProp: "name" },
-  { label: "物料描述",type: "object", prop: "item", showProp: "desc1" },
+  { label: "品番", prop: "itemCode", },
+  { label: "品名",type: "object",  prop: "item", showProp: "name" },
+  { label: "描述",type: "object", prop: "item", showProp: "desc1" },
   { label: "产品号", prop: "productNo" },
   { label: "项目号", prop: 'program' },
   { label: "位置", prop: 'position' },
@@ -1150,13 +1150,13 @@ export const ReceivingRecords = [
  */
  export const OuterJisDeliverNote = [
   { label: "单据号", prop: "number" },
-  { label: "物料代码", prop: "itemCode" },
+  { label: "品番", prop: "itemCode" },
   { label: "发货单号", prop: 'deliverNumber' },
   { label: "生产号", prop: 'productionNumber' },
   { label: "REV", prop: 'rev' },
   { label: "配置号", prop: 'l7Part' },
   { label: "流水号", prop: 'serialNumber' },
-  { label: "物料描述", prop: 'itemName' },
+  { label: "描述", prop: 'itemName' },
   { label: "位置", prop: 'position' },
   { label: "数量", prop: 'qty' },
   { label: "站别名", prop: 'siteNickName' },
@@ -1179,14 +1179,14 @@ export const ReceivingRecords = [
  */
 export const OuterPillarDeliverNote = [
   { label: "单据号", prop: "number" },
-  { label: "物料代码", prop: "itemCode" },
+  { label: "品番", prop: "itemCode" },
   { label: "发货单号", prop: 'deliverNumber' },
   // { label: "生产号", prop: 'productionNumber' },
   // { label: "REV", prop: 'rev' },
   // { label: "配置号", prop: 'l7Part' },
   // { label: "流水号", prop: 'serialNumber' },
-  { label: "物料描述1", prop: 'item', showProp:'desc1', type: "object" },
-  { label: "物料描述2", prop: 'item', showProp:'desc2', type: "object" },
+  { label: "背番", prop: 'item', showProp:'desc1', type: "object" },
+  { label: "描述", prop: 'item', showProp:'desc2', type: "object" },
   { label: "来源库位", prop: 'locationCode' },
   { label: "发货数量", prop: 'qty', showProp: 'qty', type: 'object' },
   // { label: "位置", prop: 'position' },
@@ -1211,8 +1211,8 @@ export const OuterPillarDeliverNote = [
  */
  export const OuterJisUnplannedReceiptNote = [
   { label: "单据号", prop: "number" },
-  { label: "物料代码", prop: "itemCode" },
-  { label: "物料描述", prop: 'itemName' },
+  { label: "品番", prop: "itemCode" },
+  { label: "描述", prop: 'itemName' },
   { label: "计划外入库单号", prop: 'outerUnplannedReceiptNumber' },
   { label: "单据类型", prop: 'documentType' },
   { label: "生产号", prop: 'productionNumber' },
@@ -1234,8 +1234,8 @@ export const OuterPillarDeliverNote = [
  */
  export const OuterJisUnplannedIssueNote = [
   { label: "单据号", prop: "number" },
-  { label: "物料代码", prop: "itemCode" },
-  { label: "物料描述", prop: 'itemName' },
+  { label: "品番", prop: "itemCode" },
+  { label: "描述", prop: 'itemName' },
   { label: "计划外出库单号", prop: 'outerUnplannedIssueNumber' },
   { label: "单据类型", prop: 'documentType' },
   { label: "生产号", prop: 'productionNumber' },
@@ -1255,9 +1255,9 @@ export const OuterPillarDeliverNote = [
  */
 export const SingleDoorPanelDeliverNote =  [
   { label: "itemCode", prop: "itemCode", fixed: "left" },
-  { type: "object", label: "物料名称", prop: "item", showProp: "name" },
-  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1" },
-  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2" },
+  { type: "object", label: "品名", prop: "item", showProp: "name" },
+  { type: "object", label: "背番", prop: "item", showProp: "desc1" },
+  { type: "object", label: "描述", prop: "item", showProp: "desc2" },
   { label: "目标批次", prop: "toLot" },
   { label: "来源批次", prop: "fromLot" },
   { label: "来源箱标签", prop: "fromPackingCode" },
@@ -1290,9 +1290,9 @@ export const SingleDoorPanelDeliverNote =  [
  */
 export const SingleDoorPanelProductReceiptNote =  [
   { label: "itemCode", prop: "itemCode", fixed: "left" },
-  { type: "object", label: "物料名称", prop: "item", showProp: "name" },
-  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1" },
-  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2" },
+  { type: "object", label: "品名", prop: "item", showProp: "name" },
+  { type: "object", label: "背番", prop: "item", showProp: "desc1" },
+  { type: "object", label: "描述", prop: "item", showProp: "desc2" },
   { label: "批次", prop: "lot" },
   { label: "箱标签", prop: "packingCode" },
   { label: "托标签", prop: "containerCode" },
@@ -1318,7 +1318,7 @@ export const SingleDoorPanelProductReceiptNote =  [
  */
 export const SingleDoorPanelProductAdjust =  [
   { label: "完工调整单号", prop: "number" },
-  { label: "物料代码", prop: 'itemCode',},
+  { label: "品番", prop: 'itemCode',},
   { label: "批次", prop: 'lot',},
   { label: "箱标签", prop: 'packingCode',},
   { label: "托标签", prop: 'containerCode',},
@@ -1335,9 +1335,9 @@ export const SingleDoorPanelProductAdjust =  [
  */
   export const SingleDoorPanelProductTransferNote =  [
     { label: "物料编号", prop: "itemCode", fixed: "left" },
-    { type: "object", label: "物料名称", prop: "item", showProp: "name" },
-    { type: "object", label: "物料描述1", prop: "item", showProp: "desc1" },
-    { type: "object", label: "物料描述2", prop: "item", showProp: "desc2" },
+    { type: "object", label: "品名", prop: "item", showProp: "name" },
+    { type: "object", label: "背番", prop: "item", showProp: "desc1" },
+    { type: "object", label: "描述", prop: "item", showProp: "desc2" },
     { label: "批次", prop: "lot" },
     { label: "箱标签", prop: "packingCode" },
     { label: "托标签", prop: "containerCode" },
@@ -1358,7 +1358,7 @@ export const SingleDoorPanelProductAdjust =  [
  */
 export const SingleDoorPanelCustomerReturnNote =  [
   { label: "客户退货单号", prop: "number" },
-  { label: "物料代码", prop: 'itemCode' },
+  { label: "品番", prop: 'itemCode' },
   { label: "批次", prop: 'lot' },
   { label: "箱标签", prop: 'packingCode' },
   { label: "托标签", prop: 'containerCode' },
@@ -1380,9 +1380,9 @@ export const SingleDoorPanelCustomerReturnNote =  [
  */
  export const PillarDeliverNote =  [
   { label: "物料编号", prop: "itemCode", fixed: "left",},
-  { type: "object", label: "物料名称", prop: "item", showProp: "name", },
-  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+  { type: "object", label: "品名", prop: "item", showProp: "name", },
+  { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+  { type: "object", label: "描述", prop: "item", showProp: "desc2", },
   { type: "object", label: "数量", prop: "qty", showProp: "qty", },
   { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },
   { label: "目标批次", prop: "toLot", },
@@ -1414,9 +1414,9 @@ export const InventoryTransferNote = [
   { type: "filter", filters: "inventoryStage", label: "从状态", prop: "fromStatus", },
   { type: "filter", filters: "inventoryStage", label: "到状态", prop: "toStatus", },
   { label: "itemCode", prop: "itemCode" },
-  { label: "物料名称", type: "object", prop: "item", showProp: "name", },
-  { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-  { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+  { label: "品名", type: "object", prop: "item", showProp: "name", },
+  { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+  { type: "object", label: "描述", prop: "item", showProp: "desc2", },
   { type: "object", label: "到货数量", prop: "qty", showProp: "qty", },
   { type: "object", label: "到货单位", prop: "qty", showProp: "uom", },
   { label: "从批次", prop: "fromLot" },

src/utils/disposition/tableSummaryColumns.ts

@@ -3,9 +3,9 @@
  */
  export const InspectJob =  [
       { label: "itemCode", prop: "itemCode",  fixed:"left", }, 
-      { label: "物料名称", type: "object", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { label: "品名", type: "object", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { type: "filter", filters: "inspectType", label: "检验类型", prop: "inspectType",},
       { label: "检验数量", prop: "inspectQty",},
       { label: "合格数量", prop: "goodQty",},
@@ -28,9 +28,9 @@
       // { label: "最终不合格数量", prop: "notPassedQty",},
       // { label: "实际库位", prop: "handledLocationCode",},
       // { label: "推荐库位", prop: "recommendLocationCode",},
-      // { label: "物料名称", type: "object", prop: "item", showProp: "name", },
-      // { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      // { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      // { label: "品名", type: "object", prop: "item", showProp: "name", },
+      // { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      // { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       // { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch",},
       // { label: "备注", prop: 'remark', },
 ]
@@ -40,9 +40,9 @@
  */
  export const InspectNotice =  [
       { label: "itemCode", prop: "itemCode", fixed: "left",},
-      { label: "物料名称", type: "object", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { label: "品名", type: "object", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { label: "批次", prop: "lot" },
       { label: "抽检百分比", prop: "samplePercent",},
       { label: "检验数量", prop: "inspectQty",},
@@ -62,9 +62,9 @@
  */
  export const InspectNote =  [
       { label: "itemCode", prop: "itemCode", fixed: "left",},
-      { type: "object", label: "物料名称", prop: "item", showProp: "name", },
-      { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-      { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+      { type: "object", label: "品名", prop: "item", showProp: "name", },
+      { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+      { type: "object", label: "描述", prop: "item", showProp: "desc2", },
       { label: "检验数量", prop: "inspectQty",},
       { label: "合格数量", prop: "goodQty",},
       { label: "不合格数量", prop: "failedQty",},
@@ -82,9 +82,9 @@
  */
   export const PurchaseReceiptNote =  [
      { label: "itemCode", prop: "itemCode",fixed: "left", },
-     { type: "object", label: "物料名称", prop: "item", showProp: "name", },
-     { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", },
-     { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", },
+     { type: "object", label: "品名", prop: "item", showProp: "name", },
+     { type: "object", label: "背番", prop: "item", showProp: "desc1", },
+     { type: "object", label: "描述", prop: "item", showProp: "desc2", },
      { label: "总数", prop: "summary" },
      { type: "object", label: "收货数量", prop: "qty", showProp: "qty", },
      { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", },

src/utils/validator.ts

@@ -376,6 +376,16 @@ export function validateMaxNumber5(rule, value, callback) {
     }
 
 }
+
+export function validateMaxInteger(rule, value, callback) {
+  if (parseInt(value) >= 0 && parseInt(value) <= 65535) {
+    callback()
+  } else {
+    callback(new Error('请输入正确整数'))
+  }
+
+}
+
 // 数字格式  小数点后三位
 export function validateThreeNum(rule, value, callback) {
     if (value) {

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' }

src/views/eam/toolMod/toolMod.data.ts

@@ -89,7 +89,7 @@ export const ToolMod = useCrudSchemas(reactive<CrudSchema[]>([
   //   form: {
   //     componentProps: {
   //       isSearchList: true,
-  //       searchListPlaceholder: '请选择物料代码',
+  //       searchListPlaceholder: '请选择品番',
   //       searchField: 'modCodeShow',
   //       searchTitle: '客户物料基础信息',
   //       multiple:true,
@@ -105,7 +105,7 @@ export const ToolMod = useCrudSchemas(reactive<CrudSchema[]>([
   //   search: {
   //     componentProps: {
   //       isSearchList: true,
-  //       searchListPlaceholder: '请选择物料代码',
+  //       searchListPlaceholder: '请选择品番',
   //       searchField: 'modCodeShow',
   //       searchTitle: '客户物料基础信息',
   //       multiple: true,

src/views/home/components/supplierIndex供应商发票空白页，暂时去掉部分模块.vue

@@ -183,7 +183,7 @@
           <el-table-column prop="amount" :label="t('home.money')" width="120" />
           <el-table-column prop="itemCode" :label="t('home.material_code')" width="160" />
           <el-table-column prop="itemName" :label="t('home.material_name')" width="120" />
-          <el-table-column prop="itemDesc1" :label="t('home.material_description1')" width="120" />
+          <el-table-column prop="itemDesc1" :label="t('home.Material Abbreviation')" width="120" />
           <el-table-column prop="itemDesc2" :label="t('home.material_description2')" width="120" />
           <el-table-column prop="qty" :label="t('home.amount')" width="120" />
           <el-table-column prop="uom" :label="t('home.measuring_unit')" width="120">

src/views/infra/outerApiHis/index.vue

@@ -128,7 +128,7 @@ const butttondata = (row) =>{
   return [
     // defaultButtons.mainListEditBtn({hasPermi:'wms:outerApiHis:update'}), // 编辑
     // defaultButtons.mainListDeleteBtn({hasPermi:'wms:outerApiHis:delete'}), // 删除
-    defaultButtons.retryBtn({hide: row.times >= 3 || row.success}), // 重试
+    defaultButtons.retryBtn({hide: row.success}), // 重试
   ]
 } 
 

src/views/mes/orderDay/components/orderDetail.vue

@@ -81,7 +81,7 @@
               style="width: 100%"
             >
             <el-table-column prop="id" label="序号" align="center" />
-            <el-table-column prop="srcMaterialCode" label="物料代码" align="center" />
+            <el-table-column prop="srcMaterialCode" label="品番" align="center" />
             <el-table-column prop="srcMaterialModel" label="计量单位" align="center" />
             <el-table-column prop="srcMaterialCounts" label="数量" align="center"/>
             <el-table-column prop="processCode" label="工序编码" align="center" />

src/views/mes/processroute/components/configDialog.vue

@@ -108,7 +108,7 @@
               </div>
             </template>
             <el-table :data="showMaterialsData" ref="tableMaterial" style="width: 100%; height: 80%;overflow-y: auto;">
-                  <!-- <el-table-column prop="name" label="物料名称"/> -->
+                  <!-- <el-table-column prop="name" label="品名"/> -->
                   <el-table-column prop="componentItemCode" label="物料编码"/>
                   <el-table-column prop="version" label="版本号"/>
                   <el-table-column prop="componentQty" label="物料数量"/>

src/views/qms/inspectionJob/inspectionJobMain.data.ts

@@ -109,7 +109,7 @@ export const InspectionJobMain = useCrudSchemas(
       }
     },
     {
-      label: '物料名称',
+      label: '品名',
       field: 'itemName',
       sort: 'custom',
       isSearch: false,

src/views/qms/inspectionQ1/inspectionQ1.data.ts

@@ -27,7 +27,7 @@ const validateNumber = (rule: any, value: any, callback: any) => {
 }  
 // 表单校验
 export const Q1Rules = reactive({
-  itemCode: [{ required: true, message: '请选择物料代码', trigger: 'change' }],
+  itemCode: [{ required: true, message: '请选择品番', trigger: 'change' }],
   customerCode: [{ required: true, message: '请选择客户代码', trigger: 'change' }],
   qty: [{ required: true, message: '请输入数量', trigger: 'change' },
     { validator:validateNumber, message: '数量必须是数值类型', trigger: 'change'}
@@ -57,7 +57,7 @@ export const Q1 = useCrudSchemas(
       }
     },
     {
-      label: '物料代码',
+      label: '品番',
       field: 'itemCode',
       sort: 'custom',
       table: {
@@ -69,7 +69,7 @@ export const Q1 = useCrudSchemas(
         componentProps: {
           enterSearch: true,
           isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+          searchListPlaceholder: '请选择品番', // 输入框占位文本
           searchField: 'itemCode', // 查询弹窗赋值字段
           searchTitle: '客户物料信息', // 查询弹窗标题
           searchAllSchemas: Customeritem.allSchemas, // 查询弹窗所需类
@@ -95,7 +95,7 @@ export const Q1 = useCrudSchemas(
       }
     },
     {
-      label: '物料名称',
+      label: '品名',
       field: 'itemName',
       sort: 'custom',
       dictClass: 'string',

src/views/qms/inspectionQ2/index.vue

@@ -69,7 +69,7 @@
   >
     <template #searchQuerypurchaseReceiptNumber>
       <el-form :inline="true">
-        <el-form-item label="供应商物料代码">
+        <el-form-item label="供应商品番">
           <el-input
             v-model="basicFormRef.formRef.formModel.itemCode"
             placeholder="请输入供应商"

src/views/qms/inspectionQ2/inspectionQ2.data.ts

@@ -20,7 +20,7 @@ const userStore = useUserStore()
 
 // 表单校验
 export const Q2Rules = reactive({
-  itemCode: [{ required: true, message: '请选择供应商物料代码', trigger: 'change' }],
+  itemCode: [{ required: true, message: '请选择供应商品番', trigger: 'change' }],
   supplierCode: [{ required: true, message: '请选择供应商代码', trigger: 'change' }],
   purchaseReceiptNumber: [
     // { required: true, message: '请选择采购收货单号', trigger: 'change' },
@@ -168,7 +168,7 @@ export const Q2 = useCrudSchemas(
       }
     },
     {
-      label: '供应商物料代码',
+      label: '供应商品番',
       field: 'itemCode',
       sort: 'custom',
       table: {
@@ -180,7 +180,7 @@ export const Q2 = useCrudSchemas(
         componentProps: {
           enterSearch: true,
           isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+          searchListPlaceholder: '请选择品番', // 输入框占位文本
           searchField: 'itemCode', // 查询弹窗赋值字段
           searchTitle: '供应商物料信息', // 查询弹窗标题
           searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
@@ -211,7 +211,7 @@ export const Q2 = useCrudSchemas(
       }
     },
     {
-      label: '供应商物料名称',
+      label: '供应商品名',
       field: 'itemName',
       sort: 'custom',
       dictClass: 'string',
@@ -329,7 +329,7 @@ export const Q2 = useCrudSchemas(
       }
     },
     {
-      label: '整灯/分总成物料代码',
+      label: '整灯/分总成品番',
       field: 'lightItemCode',
       sort: 'custom',
       table: {
@@ -341,7 +341,7 @@ export const Q2 = useCrudSchemas(
         componentProps: {
           enterSearch: true,
           isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择整灯/分总成物料代码', // 输入框占位文本
+          searchListPlaceholder: '请选择整灯/分总成品番', // 输入框占位文本
           searchField: 'code', // 查询弹窗赋值字段
           searchTitle: '物料基础信息', // 查询弹窗标题
           searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
@@ -372,7 +372,7 @@ export const Q2 = useCrudSchemas(
       }
     },
     {
-      label: '整灯/分总成物料名称',
+      label: '整灯/分总成品名',
       field: 'lightItemName',
       sort: 'custom',
       dictClass: 'string',

src/views/qms/inspectionQ3/inspectionQ3.data.ts

@@ -309,7 +309,7 @@ export const InspectionQ3Detail = useCrudSchemas(
       tableForm: {
         isInpuFocusShow: false,
         disabled: true,
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'itemCode', // 查询弹窗赋值字段
         searchTitle: '物料信息', // 查询弹窗标题
         searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
@@ -341,7 +341,7 @@ export const InspectionQ3Detail = useCrudSchemas(
         componentProps: {
           enterSearch: true,
           isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+          searchListPlaceholder: '请选择品番', // 输入框占位文本
           searchField: 'code', // 查询弹窗赋值字段
           searchTitle: '物料基础信息', // 查询弹窗标题
           searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
@@ -537,7 +537,7 @@ export const InspectionQ3Detail = useCrudSchemas(
 
 //表单校验
 export const InspectionQ3DetailRules = reactive({
-  itemCode: [{ required: true, message: '请选择物料代码', trigger: 'change' }],
+  itemCode: [{ required: true, message: '请选择品番', trigger: 'change' }],
   qty: [{ required: true, message: '请输入数量', trigger: 'change' }],
   price: [{ required: true, message: '请选择单价', trigger: 'change' }],
   amount: [{ required: true, message: '请选择金额', trigger: 'change' }],

src/views/qms/inspectionRecord/inspectionRecordMain.data.ts

@@ -111,7 +111,7 @@ export const InspectionRecordMain = useCrudSchemas(
       }
     },
     {
-      label: '物料名称',
+      label: '品名',
       field: 'itemName',
       sort: 'custom',
       isSearch: false,

src/views/qms/inspectionRecordFirst/addForm.vue

@@ -47,12 +47,12 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="物料名称" prop="itemName">
+              <el-form-item label="品名" prop="itemName">
                 <el-input v-model="data.itemName" placeholder="请填写名称" disabled />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="物料描述" prop="desc1">
+              <el-form-item label="描述" prop="desc1">
                 <el-input v-model="data.desc1" placeholder="请填写描述" disabled />
               </el-form-item>
             </el-col>

src/views/qms/inspectionRecordFirst/inspectionRecordFirstMain.data.ts

@@ -47,7 +47,7 @@ export const InspectionRecordMain = useCrudSchemas(
       }
     },
     {
-      label: '物料名称',
+      label: '品名',
       field: 'itemName',
       sort: 'custom',
       isSearch: false,

src/views/qms/inspectionRequest/inspectionRequestMain.data.ts

@@ -316,7 +316,7 @@ export const InspectionMain = useCrudSchemas(
       }
     },
     {
-      label: '物料名称',
+      label: '品名',
       field: 'itemName',
       sort: 'custom',
       isSearch: false,

src/views/qms/inspectionScheme/addForm.vue

@@ -47,7 +47,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="物料名称" prop="itemName">
+              <el-form-item label="品名" prop="itemName">
                 <div style="display: flex; width: 100%">
                   <el-input v-model="data.itemName" placeholder="请选择物料" disabled />
                 </div>

src/views/qms/inspectionScheme/inspectionScheme.data.ts

@@ -54,7 +54,7 @@ export const InspectionSchemeMain = useCrudSchemas(
       isSearch: true
     },
     {
-      label: '物料名称',
+      label: '品名',
       field: 'itemName',
       sort: 'custom',
       table: {

src/views/qms/qualityNotice/components/qualityBatch.vue

@@ -28,8 +28,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="物料代码" prop="itemCode">
-                <el-input v-model="item.itemCode" placeholder="请输入物料代码" />
+              <el-form-item label="品番" prop="itemCode">
+                <el-input v-model="item.itemCode" placeholder="请输入品番" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -43,8 +43,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="物料描述" prop="itemDesc">
-                <el-input v-model="item.itemDesc" placeholder="请输入物料描述" />
+              <el-form-item label="描述" prop="itemDesc">
+                <el-input v-model="item.itemDesc" placeholder="请输入描述" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -119,7 +119,7 @@
           <el-table-column prop="defectTypeCodeGroup" label="缺陷类型代码组"  align="center" width="150"/>
           <el-table-column prop="defectTypeCode" label="缺陷类型代码"  align="center" width="150"/>
           <el-table-column prop="defectDesc" label="缺陷描述"  align="center" width="150"/>
-          <el-table-column prop="defectSonItemCode" label="缺陷子物料代码"  align="center" width="150"/>
+          <el-table-column prop="defectSonItemCode" label="缺陷子品番"  align="center" width="150"/>
           <el-table-column prop="defectCount" label="缺陷数量"  align="center" width="150"/>
           <el-table-column prop="defectLevel" label="缺陷级别"  align="center" width="150"/>
           <el-table-column prop="sampleNumber" label="样本编号"  align="center" width="150"/>
@@ -296,8 +296,8 @@
             </el-col>
  
             <el-col :span="12">
-              <el-form-item prop="defectSonItemCode" label="缺陷子物料代码" >
-                <el-input v-model="defectForm.defectSonItemCode"  placeholder="请输入缺陷子物料代码" />
+              <el-form-item prop="defectSonItemCode" label="缺陷子品番" >
+                <el-input v-model="defectForm.defectSonItemCode"  placeholder="请输入缺陷子品番" />
               </el-form-item>
             </el-col>
             <el-col :span="12">

src/views/system/post/PostAreaPermissionForm.vue

@@ -73,7 +73,7 @@ const open = async (row: any) => {
   resetForm()
   // 加载 Menu 列表。注意，必须放在前面，不然下面 setChecked 没数据节点
   let array = await PostApi.getPostAreaTreeList()
-  array.forEach(item=>item.name =item.code + '-' + item.name )
+  array.forEach(item=>item.name =item.code + ' ' + item.name )
   areaOptions.value =  handleTree(array)
   // menuOptions.value =  await MenuApi.getSimpleMenusList())
   // 设置数据

src/views/system/post/PostForm.vue

@@ -40,6 +40,12 @@
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { CommonStatusEnum } from '@/utils/constants'
 import * as PostApi from '@/api/system/post'
+import {
+  validateInteger,
+  validateMaxInteger,
+  validateMaxNumber5,
+  validatePositiveNumber
+} from "@/utils/validator";
 
 defineOptions({ name: 'SystemPostForm' })
 
@@ -59,10 +65,20 @@ const formData = ref({
   remark: ''
 })
 const formRules = reactive({
-  name: [{ required: true, message: '岗位标题不能为空', trigger: 'blur' }],
-  code: [{ required: true, message: '岗位编码不能为空', trigger: 'change' }],
+  name: [
+    { required: true, message: '岗位标题不能为空', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  code: [
+    { required: true, message: '岗位编码不能为空', trigger: 'change' },
+    { max: 64, message: '不得超过64个字符', trigger: 'blur' }
+  ],
   status: [{ required: true, message: '岗位状态不能为空', trigger: 'change' }],
-  remark: [{ required: false, message: '岗位内容不能为空', trigger: 'blur' }]
+  remark: [
+    { required: false, message: '岗位内容不能为空', trigger: 'blur' },
+    { max: 500, message: '不得超过500个字符', trigger: 'blur' }
+  ],
+  sort:[{ validator:validateMaxInteger, message: '岗位顺序范围0~65535', trigger: 'change'}]
 })
 const formRef = ref() // 表单 Ref
 

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,

src/views/wms/basicDataManage/customerManage/customer/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/customerManage/customerdock/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts

@@ -54,7 +54,7 @@ export const Customeritem = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -65,7 +65,7 @@ export const Customeritem = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         enterSearch: true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '物料基础信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
@@ -89,7 +89,23 @@ export const Customeritem = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true
   },
   {
-    label: '客户物料代码',
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    isSearch: true,
+    isForm:false,
+hiddenSearchHigh:true,
+    table: {
+      width: 150
+    },
+form:{
+      componentProps:{
+        disabled: true,
+      }
+    }
+  },
+  {
+    label: '客户品番',
     field: 'customerItemCode',
     sort: 'custom',
     table: {
@@ -352,7 +368,7 @@ export const CustomeritemRules = reactive({
     { required: true, message: '请输入客户代码', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请输入物料代码', trigger: 'blur' }
+    { required: true, message: '请输入品番', trigger: 'blur' }
   ],
   packUnit: [
     { required: true, message: '请选择客户包装单位', trigger: 'change' }
@@ -368,7 +384,7 @@ export const CustomeritemRules = reactive({
   ],
   customerItemCode: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' },
-    { validate: validateYS, message: '请输入正确的客户物料代码', trigger: 'blur' }
+    { validate: validateYS, message: '请输入正确的客户品番', trigger: 'blur' }
   ],
   remark: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }

src/views/wms/basicDataManage/customerManage/customeritem/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/customerManage/project/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/customerManage/saleprice/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts

@@ -50,7 +50,7 @@ export const Saleprice = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -62,7 +62,7 @@ export const Saleprice = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         enterSearch:true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'itemCode', // 查询弹窗赋值字段
         searchTitle: '客户物料信息', // 查询弹窗标题
         searchAllSchemas: Customeritem.allSchemas, // 查询弹窗所需类
@@ -88,6 +88,22 @@ export const Saleprice = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    isSearch: true,
+    isForm:false,
+hiddenSearchHigh:true,
+    table: {
+      width: 150
+    },
+form:{
+      componentProps:{
+        disabled: true,
+      }
+    }
+  },
   {
     label: '货币',
     field: 'currency',
@@ -271,7 +287,7 @@ export const SalepriceRules = reactive({
     { required: true, message: '请输入客户代码', trigger: 'blur' }
   ],
   itemCode: [
-    { required: true, message: '请输入物料代码', trigger: 'blur' }
+    { required: true, message: '请输入品番', trigger: 'blur' }
   ],
   currency: [
     { required: true, message: '请选择货币', trigger: 'change' }

src/views/wms/basicDataManage/documentSetting/businesstype/index.vue

@@ -37,7 +37,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/documentSetting/plansetting/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/documentSetting/switch/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row, $index }">
-        <ButtonBase :Butttondata="butttondata(row, $index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row, $index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/factoryModeling/dock/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -237,7 +237,7 @@ const openForm = (type: string, row?: any) => {
 const onEnter = async (field,value)=>{
   console.log('onEnter',field,value)
   if('defaultLocationCode'==field){
-    //物料代码
+    //品番
     basicFormRef.value.opensearchTable('itemCode', 'code', '库位信息', Location.allSchemas, LocationApi.getLocationPage,[{
       key: 'available',
       value: 'TRUE',

src/views/wms/basicDataManage/factoryModeling/enterprise/index.vue

@@ -32,7 +32,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/factoryModeling/location/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/factoryModeling/process/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/factoryModeling/productionline/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/factoryModeling/workshop/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/factoryModeling/workstation/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/itemManage/bom/bom.data.ts

@@ -14,7 +14,7 @@ const { t } = useI18n() // 国际化
 */
 export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '父物料代码',
+    label: '父品番',
     field: 'productItemCode',
     isSearch: true,
     sort: 'custom',
@@ -27,7 +27,7 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         enterSearch: true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '物料基础信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
@@ -44,7 +44,22 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '子物料代码',
+    label: '父背番',
+    field: 'productBackNumber',
+    sort: 'custom',
+    isSearch: true,
+    hiddenSearchHigh:true,
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps:{
+        disabled: true,
+      }
+    }
+  },
+  {
+    label: '子品番',
     field: 'componentItemCode',
     isSearch: true,
     sort: 'custom',
@@ -56,7 +71,7 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         enterSearch: true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '物料基础信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
@@ -72,6 +87,21 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '子背番',
+    field: 'componentBackNumber',
+    sort: 'custom',
+    isSearch: true,
+    hiddenSearchHigh:true,
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps:{
+        disabled: true,
+      }
+    }
+  },
   {
     label: '子物料计量单位',
     field: 'componentUom',
@@ -305,10 +335,10 @@ export const Bom = useCrudSchemas(reactive<CrudSchema[]>([
 //表单校验
 export const BomRules = reactive({
   productItemCode: [
-    { required: true, message: '请输入父物料代码', trigger: 'change' }
+    { required: true, message: '请输入父品番', trigger: 'change' }
   ],
   componentItemCode: [
-    { required: true, message: '请输入子物料代码', trigger: 'change' }
+    { required: true, message: '请输入子品番', trigger: 'change' }
   ],
   componentUom: [
     { required: true, message: '请选择子物料计量单位', trigger: 'change' }

src/views/wms/basicDataManage/itemManage/bom/index.vue

@@ -28,12 +28,12 @@
       v-model:sort="tableObject.sort"
     >
       <template #productItemCode="{row}">
-        <el-button type="primary" link @click="openDetail(row, '物料代码', row.productItemCode)">
+        <el-button type="primary" link @click="openDetail(row, '品番', row.productItemCode)">
           <span>{{ row.productItemCode }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -231,7 +231,7 @@ const formsSuccess = async (formType,data) => {
       if(data.activeTime==0)data.activeTime = null;
       if(data.expireTime==0)data.expireTime = null;
       if (data.productItemCode == data.componentItemCode) {
-          message.error('父物料代码和子物料代码不能相同！')
+          message.error('父品番和子品番不能相同！')
           return
       }
       basicFormRef.value.formLoading = true

src/views/wms/basicDataManage/itemManage/itemSyntheticRelation/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -95,6 +95,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
     } else {
       setV[formField] = val[0][searchField]
     }
+    setV['itemDesc1'] = val[0]['backNumber']//背番赋值到背番
     formRef.setValues(setV)
   })
 }

src/views/wms/basicDataManage/itemManage/itemSyntheticRelation/itemSyntheticRelation.data.ts

@@ -38,7 +38,7 @@ export const ItemSyntheticRelation = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,
@@ -48,7 +48,7 @@ export const ItemSyntheticRelation = useCrudSchemas(reactive<CrudSchema[]>([
         multiple: true,
         enterSearch: true, //可输入回车
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '物料基础信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
@@ -71,12 +71,28 @@ export const ItemSyntheticRelation = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     isSearch: false,
     isForm:false,
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    isSearch: false,
+    isForm:false,
+hiddenSearchHigh:true,
+    table: {
+      width: 150
+    },
+form:{
+      componentProps:{
+        disabled: true,
+      }
+    }
+  },
   {
     label: '生效时间',
     field: 'effectiveDate',

src/views/wms/basicDataManage/itemManage/itemarea/index.vue

@@ -178,6 +178,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       }else{
         setV[formField] = setV[0][searchField]
       }
+      setV['itemDesc1'] = val[0]['backNumber']//背番赋值到背番
       formRef.setValues(setV)
     }
   })

src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts

@@ -16,7 +16,7 @@ import { t } from '@/hooks/web/useI18n'
 
 export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,
@@ -29,7 +29,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         enterSearch: true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '物料基础信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
@@ -50,6 +50,21 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    isSearch: true,
+hiddenSearchHigh:true,
+    table: {
+      width: 150
+    },
+form:{
+      componentProps:{
+        disabled: true,
+      }
+    }
+  },
   {
     label: '区域代码',
     field: 'areaCode',
@@ -158,7 +173,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
         }, {
           key: 'itemCode',
           value: 'itemCode',
-          message: "请选择物料代码",
+          message: "请选择品番",
           isMainValue: true
         }],
         verificationParams: [{
@@ -169,7 +184,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
           isSearch: true,
           isFormModel: true,
           required: true,
-          message: '请选择物料代码',
+          message: '请选择品番',
         }], // 失去焦点校验参数
       }
     }
@@ -198,7 +213,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
         }, {
           key: 'itemCode',
           value: 'itemCode',
-          message: "请选择物料代码",
+          message: "请选择品番",
           isMainValue: true
         }],
         verificationParams: [{
@@ -209,7 +224,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
           isSearch: true,
           isFormModel: true,
           required: true,
-          message: '请选择物料代码',
+          message: '请选择品番',
           isBlurParams: true,//是否是失去焦点的方法的参数
         }], // 失去焦点校验参数
       }
@@ -324,7 +339,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
           isSearch: true,
           isFormModel: true,
           required: true,
-          message: '请选择物料代码',
+          message: '请选择品番',
         }], // 失去焦点校验参数
       }
     }
@@ -727,7 +742,7 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
 // 表单校验
 export const ItemareaRules = reactive({
   itemCode: [
-    { required: true, message: '请选择物料代码', trigger: 'change' }
+    { required: true, message: '请选择品番', trigger: 'change' }
   ],
   areaCode: [
     { required: true, message: '请选择到区域代码', trigger: 'change' }

src/views/wms/basicDataManage/itemManage/itembasic/index.vue

@@ -27,7 +27,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase
+        <ButtonBaseMore
           :Butttondata="butttondata(row)"
           @button-base-click="buttonTableClick($event,row)"
         />
@@ -379,7 +379,7 @@ const changeTabs = (item) => {
   })
   }
  
-  // 当前物料代码作为条件
+  // 当前品番作为条件
   tableObjectExtend.value = [{
     key: 'itemCode',
     value: itemCodeRow.value

src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts

@@ -49,22 +49,22 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
     label: '背番',
     field: 'backNumber',
     sort: 'custom',
-    isSearch: false,
+    isSearch: true,
     table: {
       width: 150
     },
   },
+  // {
+  //   label: '背番',
+  //   field: 'desc1',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   } ,
+  //   // isTableForm:false
+  // },
   {
-    label: '描述1',
-    field: 'desc1',
-    sort: 'custom',
-    table: {
-      width: 150
-    } ,
-    // isTableForm:false
-  },
-  {
-    label: '描述2',
+    label: '描述',
     field: 'desc2',
     sort: 'custom',
     table: {
@@ -245,7 +245,7 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '项目',
+    label: '车型',
     field: 'project',
     sort: 'custom',
     table: {
@@ -352,6 +352,24 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180
     },
   },
+  {
+    label: 'ERP默认收货库位',
+    field: 'defaultErpLocationCode',
+    sort: 'custom',
+    isTable: true,
+    table: {
+      width: 100
+    } ,
+  },
+  {
+    label: '文档号',
+    field: 'itemGroup',
+    sort: 'custom',
+    isTable: true,
+    table: {
+      width: 100
+    } ,
+  },
   {
     label: '创建者',
     field: 'creator',
@@ -522,9 +540,6 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
 
-
-
-
   {
     label: '产品类',
     field: 'prodCla',

src/views/wms/basicDataManage/itemManage/itempackage/index.vue

@@ -33,12 +33,12 @@
       rowKey="id"
     >
       <template #itemCode="{ row }">
-        <el-button type="primary" link @click="openDetail(row, '物料代码', row.itemCode)">
+        <el-button type="primary" link @click="openDetail(row, '品番', row.itemCode)">
           <span>{{ row.itemCode }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event, row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event, row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -319,7 +319,7 @@ const formsSuccess = async (formType, data) => {
 const onEnter = async (field,value)=>{
   console.log('onEnter',field,value)
   if('itemCode'==field){
-    //物料代码
+    //品番
     basicFormRef.value.opensearchTable('itemCode', 'code', '物料基础信息', Itembasic.allSchemas, ItembasicApi.getItembasicPage,[{
       key: 'available',
       value: 'TRUE',
@@ -359,6 +359,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
     if('itemCode'==formField){
       setV['itemName'] = val[0]['name']
       setV['uom'] = val[0]['uom']
+      setV['backNumber'] = val[0]['backNumber']
     }
     if('packUnit'==formField){
       setV['packType'] = val[0]['type']

src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts

@@ -4,6 +4,7 @@ import * as ItembasicApi from '@/api/wms/itembasic'
 import { Itembasic } from '../itembasic/itembasic.data'
 import * as PackageunitApi from '@/api/wms/packageunit'
 import { Packageunit } from '../packageunit/packageunit.data'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 
 const { t } = useI18n() // 国际化
 
@@ -12,7 +13,7 @@ const { t } = useI18n() // 国际化
  */
 export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,
@@ -25,7 +26,7 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         enterSearch: true, //可输入回车
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '物料基础信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
@@ -47,7 +48,7 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '物料名称',
+    label: '品名',
     field: 'itemName',
     sort: 'custom',
     isSearch: false,
@@ -64,6 +65,21 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
     isForm:true,
     isDetail:true
   },
+  {
+    label: '背番',
+    field: 'backNumber',
+    sort: 'custom',
+    hiddenSearchHigh:true,
+    isSearch: true,
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+  },
   {
     label: '计量单位',
     field: 'uom',
@@ -356,7 +372,7 @@ const validateQty = (rule: any, value: any, callback: any,a,b) => {
 }  
 // 表单校验
 export const ItempackagingRules = reactive({
-  itemCode: [{ required: true, message: '物料代码不能为空', trigger: 'change' }],
+  itemCode: [{ required: true, message: '品番不能为空', trigger: 'change' }],
   uom: [{ required: true, message: '计量单位不能为空', trigger: 'change' }],
   packUnit: [{ required: true, message: '包装单位不能为空', trigger: 'change' }],
   packQty: [
@@ -365,3 +381,236 @@ export const ItempackagingRules = reactive({
   ],
   available: [{ required: true, message: '是否可用不能为空', trigger: 'change' }]
 })
+/**
+ * @returns {Array} 采购件标签需要基础包装信息
+ */
+export const PurchasePackaging = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '包装号',
+    field: 'number',
+    sort: 'custom',
+    
+  },
+  {
+    label: '看板编号',
+    field: 'lookNumber',
+    sort: 'custom',
+  },
+  {
+    label: '品番',
+    field: 'itemCode',
+    sort: 'custom',
+  },
+  {
+    label: '品名',
+    field: 'itemName',
+    sort: 'custom',
+  },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+  },
+  {
+    label: '描述',
+    field: 'itemDesc2',
+    sort: 'custom',
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    sort: 'custom',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+  },
+  {
+    label: '有效期(日)',
+    field: 'validityDays',
+    sort: 'custom',
+  },
+  {
+    label: '失效日期',
+    field: 'expireDate',
+    sort: 'custom',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+  },
+  {
+    label: '采购计量单位',
+    field: 'purchaseUom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    table: {
+      width: 120
+    },
+  },
+  {
+    label: '采购数量',
+    field: 'purchaseQty',
+    sort: 'custom',
+  },
+  {
+    label: '采购标包数量',
+    field: 'purchaseStdQty',
+    sort: 'custom',
+  },
+  {
+    label: '转换率',
+    field: 'convertRate',
+    sort: 'custom',
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        enterSearch: true, //可输入回车
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择包装规格', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '包装规格信息', // 查询弹窗标题
+        searchAllSchemas: Packageunit.allSchemas, // 查询弹窗所需类
+        searchPage: PackageunitApi.getPackageunitPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          action: '==',
+          isSearch: true,
+          isMainValue: false
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: 'true',
+          isFormModel: true
+        }], // 失去焦点校验参数
+      }
+    }
+  },
+  
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 120
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    }
+  },
+  {
+    label: '供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 120
+    },
+  },
+  {
+    label: '供应商品番',
+    field: 'supplierItemCode',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 120
+    },
+  },
+  {
+    label: '标签数量',
+    field: 'count',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 120
+    },
+  },
+  {
+    label: '生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    isSearch: false,
+    table: {
+      width: 120
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    isForm: false,
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    isForm: false,
+    isTable: true,
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '操作',
+    field: 'aaa',
+    sort: 'custom',
+  },
+ 
+]))

src/views/wms/basicDataManage/itemManage/itemwarehouse/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts

@@ -9,7 +9,7 @@ import { Itempackaging } from '../itempackage/itempackage.data'
 
 export const Itemwarehouse = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     isSearch: true,
@@ -21,7 +21,7 @@ export const Itemwarehouse = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         enterSearch:true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '物料基础信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
@@ -115,7 +115,7 @@ export const Itemwarehouse = useCrudSchemas(reactive<CrudSchema[]>([
         },{
           key: 'itemCode',
           value: 'itemCode',
-          message: "请选择物料代码",
+          message: "请选择品番",
           isMainValue: true
         }]
       }

src/views/wms/basicDataManage/itemManage/packageunit/index.vue

@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase  :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore  :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/productionitemcodeSpareitemcode.data.ts

@@ -21,7 +21,7 @@ export const ProductionitemcodeSpareitemcode = useCrudSchemas(reactive<CrudSchem
       componentProps: {
         enterSearch: true, //可输入回车
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '物料基础信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
@@ -60,7 +60,7 @@ export const ProductionitemcodeSpareitemcode = useCrudSchemas(reactive<CrudSchem
       componentProps: {
         enterSearch: true, //可输入回车
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '物料基础信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类

src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -257,6 +257,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {
     const setV = {}
     setV[formField] = val[0][searchField]
+    setV['itemDesc1'] = val[0]['backNumber']
     formRef.setValues(setV)
   })
 }

src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts

@@ -100,7 +100,7 @@ export const Productionlineitem = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     isSearch: true,
     sort: 'custom',
@@ -112,7 +112,7 @@ export const Productionlineitem = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         enterSearch: true,
         isSearchList: true,
-        searchListPlaceholder: '请选择物料代码',
+        searchListPlaceholder: '请选择品番',
         searchField: 'code',
         searchTitle: '物料信息',
         searchAllSchemas: Itembasic.allSchemas,
@@ -151,6 +151,21 @@ export const Productionlineitem = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    isSearch: true,
+    hiddenSearchHigh:true,
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps:{
+        disabled: true,
+      }
+    }
+  },
   {
     label: '是否可用',
     field: 'available',
@@ -298,7 +313,7 @@ export const ProductionlineitemRules = reactive({
     { required: true, message: '请输入产线代码', trigger: 'change' }
   ],
   itemCode: [
-    { required: true, message: '请输入物料代码', trigger: 'change' }
+    { required: true, message: '请输入品番', trigger: 'change' }
   ],
   remark: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
@@ -307,3 +322,163 @@ export const ProductionlineitemRules = reactive({
     { required: true, message: '请选择是否可用', trigger: 'change' }
   ],
 })
+
+/**
+ * @returns {Array} 生产线物料关系加上物料基本信息
+ */
+export const ProductionlineitemInfo = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '产线代码',
+    field: 'productionLineCode',
+    isSearch: true,
+    sort: 'custom',
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+    isForm: true,
+    form: {
+      show: true,
+      component: 'SelectV2',
+      // value:'undefined',
+      value: lineCodeData?.list.length > 0 ? lineCodeData.list[0].code : 'undefined',
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        // isSearchList: true,
+        filterable: true,
+        placeholder: '请选择产线代码',
+        searchField: 'code',
+        // searchTitle: '生产线信息',
+        // searchAllSchemas: Productionline.allSchemas,
+        // searchPage: ProductionLineCodeApi.getProductionlinePage
+        options: lineCodeData.list.map(item => ({
+          label: item.code,
+          value: item.code
+        }))
+      }
+    },
+  },
+  {
+    label: '品番',
+    field: 'itemCode',
+    isSearch: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        enterSearch: true,
+        isSearchList: true,
+        searchListPlaceholder: '请选择品番',
+        searchField: 'code',
+        searchTitle: '物料信息',
+        searchAllSchemas: Itembasic.allSchemas,
+        searchPage: ItembasicApi.getItembasicPage,
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: 'true',
+          isFormModel: true
+        }], // 失去焦点校验参数
+        searchCondition: [
+          {
+            key: 'enableMake',
+            value: 'TRUE',
+            action: '==',
+            isSearch: true,
+            isMainValue: false
+          },
+          {
+            key: 'type',
+            value: confgiData.itemType,
+            action: 'notin',
+            isSearch: true,
+            isMainValue: false
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            action: '==',
+            isSearch: true,
+            isMainValue: false
+          }
+        ]
+      }
+    }
+  },
+  {
+    label: '品名',
+    field: 'itemCode',
+  },
+  {
+    label: '背番',
+    field: 'backNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '车型',
+    field: 'vehicleType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isForm: false,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: { width: '100%' },
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    isForm: false,
+    isTable: true
+  },
+ 
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))

src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/relegateRecordMain.data.ts

@@ -154,7 +154,7 @@ export const RelegateRecordDetailRules = reactive({
 
 export const RelegateRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -162,7 +162,7 @@ export const RelegateRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '降级后物料代码',
+    label: '降级后品番',
     field: 'downItemCode',
     sort: 'custom',
     table: {

src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue

@@ -205,7 +205,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
             itemCodes.push(item['itemCode'])
           }
         })
-        console.log('过滤之后的物料代码',itemCodes)
+        console.log('过滤之后的品番',itemCodes)
         itemCodes.forEach(async (item)=>{
           let res = await ProductionitemcodeSpareitemcodeApi.getProductionitemcodeSpareitemcodeRelation({
             changeBeforeCode:item,
@@ -576,7 +576,7 @@ const buttonTableClick = async (val, row) => {
           })
           }
         } else {
-          message.warning('没有查询到物料代码：【' + item.itemCode + '】')
+          message.warning('没有查询到品番：【' + item.itemCode + '】')
           return
         }
       })

src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts

@@ -317,13 +317,13 @@ export const RelegateRequestDetailRules = reactive({
 
 export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     form: {
       componentProps: {
         isSearchList: true,
-        searchListPlaceholder: '请选择物料代码',
+        searchListPlaceholder: '请选择品番',
         searchField: 'itemCode',
         searchTitle: '库存余额信息',
         searchAllSchemas: BalancePopWindow.allSchemas,
@@ -335,7 +335,7 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       disabled:true,
       multiple:true,
       // isInpuFocusShow: true,
-      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchListPlaceholder: '请选择品番', // 输入框占位文本
       searchField: 'itemCode', // 查询弹窗赋值字段
       searchTitle: '库存余额信息', // 查询弹窗标题
       searchAllSchemas: BalancePopWindow.allSchemas, // 查询弹窗所需类
@@ -365,7 +365,7 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         enterSearch: true,
         isSearchList: true,
-        searchListPlaceholder: '请选择物料代码',
+        searchListPlaceholder: '请选择品番',
         searchField: 'productionItemCode',
         searchTitle: '物料基础信息',
         searchAllSchemas: Itembasic.allSchemas,
@@ -392,7 +392,7 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     tableForm:{
       isInpuFocusShow: true,
-      searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+      searchListPlaceholder: '请选择品番', // 输入框占位文本
       searchField: 'productionItemCode', // 查询弹窗赋值字段
       searchTitle: '物料基础信息', // 查询弹窗标题
       searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
@@ -704,7 +704,7 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
  */
 export const RelegateRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '物料代码',
+    label: '品番',
     field: 'downItemCode',
     sort: 'custom',
     table: {

src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue

@@ -28,12 +28,12 @@
       v-model:sort="tableObject.sort"
     >
       <template #itemCode="{row}">
-        <el-button type="primary" link @click="openDetail(row, '物料代码', row.itemCode)">
+        <el-button type="primary" link @click="openDetail(row, '品番', row.itemCode)">
           <span>{{ row.itemCode }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -245,6 +245,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {
     const setV = {}
     setV[formField] = val[0][searchField]
+    setV['itemDesc1'] = val[0]['backNumber']
     formRef.setValues(setV)
   })
 }

src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts

@@ -42,7 +42,7 @@ export const Stdcostprice = useCrudSchemas(reactive<CrudSchema[]>([
   //   }
   // },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     isSearch: true,
     sort: 'custom',
@@ -55,7 +55,7 @@ export const Stdcostprice = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         enterSearch: true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '物料信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
@@ -82,6 +82,21 @@ export const Stdcostprice = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    isSearch: true,
+    hiddenSearchHigh:true,
+    table: {
+      width: 150
+    },
+    form:{
+      componentProps:{
+        disabled: true,
+      }
+    }
+  },
   {
     label: '货币',
     field: 'currency',
@@ -253,7 +268,7 @@ export const StdcostpriceRules = reactive({
     { required: true, message: '请输入供应商代码', trigger: 'change' }
   ],
   itemCode: [
-    { required: true, message: '请输入物料代码', trigger: 'change' }
+    { required: true, message: '请输入品番', trigger: 'change' }
   ],
   currency: [
     { required: true, message: '请选择货币', trigger: 'change' }

src/views/wms/basicDataManage/labelManage/barbasic/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/labelManage/barcode/index.vue

@@ -33,7 +33,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>

src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts

@@ -43,7 +43,7 @@ export const CallmaterialsRules = reactive({
 
 export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     sort: 'custom',
     table: {
@@ -56,7 +56,7 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         enterSearch: true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择品番', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '物料信息', // 查询弹窗标题
         searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
@@ -102,7 +102,7 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
         },{
           key: 'itemCode',
           value: 'itemCode',
-          message: '请填写物料代码！',
+          message: '请填写品番！',
           isMainValue: true
           }],
         verificationParams: [{

src/views/wms/basicDataManage/labelManage/callmaterials/index.vue

@@ -34,7 +34,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBaseMore :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>