From e5d44f1c654f713de54e360a24777d32e219c68d Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 26 Dec 2024 13:21:54 +0800 Subject: [PATCH] =?UTF-8?q?YT-1823=E5=90=84=E4=B8=AA=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E4=B8=AD=E2=80=9C=E7=89=A9=E6=96=99=E7=8A=B6=E6=80=81=E2=80=9D?= =?UTF-8?q?=E2=80=9C=E7=89=A9=E6=96=99=E7=B1=BB=E5=9E=8B=E2=80=9D=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E6=9B=BF=E6=8D=A2=E6=88=90=E5=93=81=E7=95=AA=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=92=8C=E5=93=81=E7=95=AA=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/balance/index.ts | 2 +- src/api/wms/itembasic/index.ts | 6 ++-- src/api/wms/productionlineitem/index.ts | 2 +- src/locales/zh-CN.ts | 1 - src/utils/dict.ts | 6 ++-- src/utils/disposition/formFields.ts | 2 +- src/views/infra/config/ConfigForm.vue | 6 ++-- src/views/infra/config/index.vue | 2 +- .../dismantlingMain/dismantlingMain.data.ts | 2 +- .../businesstype/businesstype.data.ts | 8 ++--- .../documentSetting/businesstype/index.vue | 8 ++--- .../itemManage/itembasic/itembasic.data.ts | 4 +-- .../relegate/relegateRequest/index.vue | 2 +- .../purchasePackage/purchasePackage.data.ts | 4 +-- .../strategy/batchStrategy/AddForm.vue | 28 +++++++-------- .../strategy/deliverStrategy/AddForm.vue | 36 +++++++++---------- .../strategy/downShelfStrategy/AddForm.vue | 36 +++++++++---------- .../manageAccuracyStrategy/AddForm.vue | 14 ++++---- .../repairMaterialStrategy/AddForm.vue | 18 +++++----- .../storageCapacityStrategy/AddForm.vue | 26 +++++++------- .../strategy/upShelfStrategy/AddForm.vue | 28 +++++++-------- .../utensilCapacityStrategy/AddForm.vue | 26 +++++++------- .../deliverRecordMain.data.ts | 2 +- .../inventoryManage/balance/balance.data.ts | 4 +-- .../unplannedreceiptRequestMain/index.vue | 2 +- .../unplannedreceiptRequestMain.data.ts | 2 +- .../productionreturnRequestMain/index.vue | 4 +-- .../productionreturnRequestMain.data.ts | 2 +- .../productionreturnRequestMainNo/index.vue | 4 +-- .../productionscrapRequestMain/index.vue | 4 +-- .../inventorymoveRequestMain.data.ts | 2 +- .../productreceiptRequestMain/index.vue | 2 +- .../index.vue | 2 +- .../productreceiptscrapRequestMain/index.vue | 2 +- .../purchasereceiptJobMain.data.ts | 2 +- .../purchasereceiptRequestMain.data.ts | 2 +- .../purchasereceiptRequestMain.data.ts | 2 +- .../purchasereceiptJobMain.data.ts | 2 +- .../purchasereceiptRecordMain.data.ts | 2 +- .../purchasereceiptRequestMain.data.ts | 4 +-- .../purchasePlanMain/purchasePlanMain.data.ts | 2 +- .../supplierdeliverRecordMain/index.vue | 4 +-- .../supplierdeliverRequestMain/index.vue | 4 +-- .../purchasereceiptJobMain.data.ts | 2 +- .../purchasereceiptRequestMain.data.ts | 2 +- 45 files changed, 163 insertions(+), 164 deletions(-) diff --git a/src/api/wms/balance/index.ts b/src/api/wms/balance/index.ts index af60eb822..90d253399 100644 --- a/src/api/wms/balance/index.ts +++ b/src/api/wms/balance/index.ts @@ -109,7 +109,7 @@ export const getBalancePageByBusinessType = async (params) => { } -// 查询库存余额列表根据业务类型的物料类型 +// 查询库存余额列表根据业务类型的品番类型 export const getBalancePageByBusinessTypeByItemType = async (params) => { if (params.isSearch) { delete params.isSearch diff --git a/src/api/wms/itembasic/index.ts b/src/api/wms/itembasic/index.ts index 6af9d1007..8291744c2 100644 --- a/src/api/wms/itembasic/index.ts +++ b/src/api/wms/itembasic/index.ts @@ -92,7 +92,7 @@ export const importTemplate = () => { // 导入地址 export const importUrl = '/wms/itembasic/import' -// 查询物料类型为成品/半成品的信息列表 +// 查询品番类型为成品/半成品的信息列表 export const selectItembasicPageToFgAndSemibasicPage = async (params) => { if (params.isSearch) { const data = {...params} @@ -102,7 +102,7 @@ export const selectItembasicPageToFgAndSemibasicPage = async (params) => { } } -// 查询物料类型为原料/半成品的信息列表 +// 查询品番类型为原料/半成品的信息列表 export const selectTypeToItembasic = async (params) => { if (params.isSearch) { const data = {...params} @@ -112,7 +112,7 @@ export const selectTypeToItembasic = async (params) => { } } -// 查询物料类型为器具的信息列表 +// 查询品番类型为器具的信息列表 export const selectConfigToItembasic = async (params) => { if (params.isSearch) { const data = {...params} diff --git a/src/api/wms/productionlineitem/index.ts b/src/api/wms/productionlineitem/index.ts index e3975c07a..b313c00fc 100644 --- a/src/api/wms/productionlineitem/index.ts +++ b/src/api/wms/productionlineitem/index.ts @@ -33,7 +33,7 @@ export const getProductionlineitemPageBom = async (params) => { } -// 查询生产线物料关系列表——根据 生产线 物料类型为原料和半成品 +// 查询生产线物料关系列表——根据 生产线 品番类型为原料和半成品 export const getProductionlineitemPageByItemtype = async (params) => { if (params.isSearch) { delete params.isSearch diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 9a2207db5..91e2c90d3 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -1126,7 +1126,6 @@ export default { 供应商审批时间:'供应商审批时间', 快递单号:'快递单号', 开票日历管理:'开票日历管理', - 描述:'描述', 批量删除:'批量删除', 查看质检报告:'查看质检报告', 长春:'长春', diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 7befdde9a..280a64d04 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -184,8 +184,8 @@ export enum DICT_TYPE { PROMOTION_CONDITION_TYPE = 'promotion_condition_type', // 营销的条件类型枚举 // ========== 业务 - WMS ========== - ITEM_STATUS = 'item_status', // 物料状态 - ITEM_TYPE = 'item_type', // 物料类型 + ITEM_STATUS = 'item_status', // 品番状态 + ITEM_TYPE = 'item_type', // 品番类型 UOM = 'uom', // 计量单位 ABC_CLASS = 'abc_class', // ABC类 TRUE_FALSE = 'true_false', // 是否 @@ -345,7 +345,7 @@ export enum DICT_TYPE { REWORK_STATUS = 'rework_status', //返工返修状态:待返修，返修中，返修完成 REWORK_REPLACE_FLAG = 'rework_replace_flag', //是否有替换件 DISMANTLING_BILL_TYPE = 'dismantling_bill_type', //工单类型 - DISMANTLING_MATERIAL_STATUS = 'dismantling_material_status', //报废拆解物料状态 + DISMANTLING_MATERIAL_STATUS = 'dismantling_material_status', //报废拆解品番状态 DISMANTLING_MATERIAL_HANDLE_STATUS = 'dismantling_material_handle_status', //报废拆解处理状态 MES_REQUEST_TYPE = 'mes_request_type', //生产物料申请类型 diff --git a/src/utils/disposition/formFields.ts b/src/utils/disposition/formFields.ts index b833e8918..b6228190a 100644 --- a/src/utils/disposition/formFields.ts +++ b/src/utils/disposition/formFields.ts @@ -1729,7 +1729,7 @@ export const OuterPillarDeliverNote = [ { label: "物流名称", prop: 'name' }, { label: "背番", prop: 'desc1' }, { label: "描述", prop: 'desc2' }, - { label: "物料状态", prop: 'status' }, + { label: "品番状态", prop: 'status' }, { label: "允许制造", prop: 'canMake' }, { label: "允许采购", prop: 'canBuy' }, { label: "计量单位", prop: 'um' }, diff --git a/src/views/infra/config/ConfigForm.vue b/src/views/infra/config/ConfigForm.vue index 1326a1c6c..23edd78a8 100644 --- a/src/views/infra/config/ConfigForm.vue +++ b/src/views/infra/config/ConfigForm.vue @@ -19,8 +19,8 @@ - - + + @@ -92,7 +92,7 @@ const formRules = reactive({ visible: [{ required: true, message: '是否可见不能为空', trigger: 'blur' }] }) const formRef = ref() // 表单 Ref -// const itemTypeList = ref([]) // 物料类型列表 +// const itemTypeList = ref([]) // 品番类型列表 diff --git a/src/views/infra/config/index.vue b/src/views/infra/config/index.vue index 46893f423..48f1a75ee 100644 --- a/src/views/infra/config/index.vue +++ b/src/views/infra/config/index.vue @@ -45,7 +45,7 @@ - + diff --git a/src/views/mes/dismantlingMain/dismantlingMain.data.ts b/src/views/mes/dismantlingMain/dismantlingMain.data.ts index 9d43d8a76..dacfe610d 100644 --- a/src/views/mes/dismantlingMain/dismantlingMain.data.ts +++ b/src/views/mes/dismantlingMain/dismantlingMain.data.ts @@ -324,7 +324,7 @@ export const DismantlingDetail = useCrudSchemas(reactive([ } }, { - label: '物料状态', + label: '品番状态', field: 'materialStauts', sort: 'custom', dictType: DICT_TYPE.DISMANTLING_MATERIAL_STATUS, diff --git a/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts b/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts index c01539f50..8f716ae6b 100644 --- a/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts +++ b/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts @@ -43,7 +43,7 @@ export const Businesstype = useCrudSchemas(reactive([ }, { - label: '可用物料类型范围', + label: '可用品番类型范围', field: 'itemTypes', dictType: DICT_TYPE.ITEM_TYPE, dictClass: 'string', @@ -63,7 +63,7 @@ export const Businesstype = useCrudSchemas(reactive([ }, { - label: '可用物料状态范围', + label: '可用品番状态范围', field: 'itemStatuses', dictType: DICT_TYPE.ITEM_STATUS, dictClass: 'string', @@ -473,10 +473,10 @@ export const BusinesstypeRules = reactive({ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], itemTypes: [ - { required: true, message: '请选择可用物料类型范围', trigger: 'change' } + { required: true, message: '请选择可用品番类型范围', trigger: 'change' } ], itemStatuses: [ - { required: true, message: '请选择可用物料状态范围', trigger: 'change' } + { required: true, message: '请选择可用品番状态范围', trigger: 'change' } ], // outTransactionType: [ // { required: true, message: '请输入出库事务类型', trigger: 'blur' } diff --git a/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue b/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue index ed6634899..7071e85bd 100644 --- a/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue @@ -162,7 +162,7 @@ const buttonTableClick = async (val, row) => { // 编辑 const rowSplit = JSON.parse(JSON.stringify(row)) // rowSplit.itemTypes = rowSplit.itemTypes.split(',') - // 可用物料类型范围 + // 可用品番类型范围 const allItemTypesValue = getStrDictOptions(DICT_TYPE.ITEM_TYPE).map(item=>(item.value)) if(rowSplit.itemTypes == allItemTypesValue){ rowSplit.itemTypes = ['全选'] @@ -170,7 +170,7 @@ const buttonTableClick = async (val, row) => { rowSplit.itemTypes = rowSplit.itemTypes.split(',') } - // 可用物料状态范围 + // 可用品番状态范围 const allItemStatusesValue = getStrDictOptions(DICT_TYPE.ITEM_STATUS).map(item=>(item.value)) if(rowSplit.itemStatuses == allItemStatusesValue){ rowSplit.itemStatuses = ['全选'] @@ -242,7 +242,7 @@ const formsSuccess = async (formType, submitData) => { data.itemTypes = data.itemTypes.join(',') } - //可用物料状态范围 + //可用品番状态范围 const allItemStatusesValue = getStrDictOptions(DICT_TYPE.ITEM_STATUS).map(item=>(item.value)) if(data.itemStatuses[data.itemStatuses.length-1]=='全选'){ data.itemStatuses = allItemStatusesValue.join(',') @@ -323,7 +323,7 @@ const formsSuccess = async (formType, submitData) => { const onChange = (field, value)=>{ console.log('onChange',field,value) if(field=='outAreaTypes'||field=='inAreaTypes'||field=='itemTypes'||field=='itemStatuses'||field=='outInventoryStatuses'||field=='inInventoryStatuses'){ - //出库区类型范围 入库区类型范围 可用物料类型范围 出库库存状态范围 入库库存状态范围 + //出库区类型范围 入库区类型范围 可用品番类型范围 出库库存状态范围 入库库存状态范围 if(value.length>0){ if(value[value.length-1]=='全选'){ //全选 diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts index 4a99f9e11..e1229f9ba 100644 --- a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts @@ -72,7 +72,7 @@ export const Itembasic = useCrudSchemas(reactive([ } , }, { - label: '物料类型', + label: '品番类型', field: 'type', sort: 'custom', dictType: DICT_TYPE.ITEM_TYPE, @@ -83,7 +83,7 @@ export const Itembasic = useCrudSchemas(reactive([ } , }, { - label: '物料状态', + label: '品番状态', field: 'status', sort: 'custom', dictType: DICT_TYPE.ITEM_STATUS, diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue index b9d696daa..7869e1756 100644 --- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue +++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue @@ -531,7 +531,7 @@ const buttonTableClick = async (val, row) => { console.log(item); // item.batch = '000000' - // 查询物料类型 原料 只能选择 供应商代码 半成品成品其他 只能选择 生产线 + // 查询品番类型 原料 只能选择 供应商代码 半成品成品其他 只能选择 生产线 ItembasicApi.getItembasicPage({ pageSize: 10, pageNo: 1, diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts index d23d163ce..2d13d5b0d 100644 --- a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts +++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts @@ -350,7 +350,7 @@ export const PackageInventory = useCrudSchemas(reactive([ }, }, { - label: '物料类型', + label: '品番类型', field: 'itemType', sort: 'custom', dictType: DICT_TYPE.ITEM_TYPE, @@ -365,7 +365,7 @@ export const PackageInventory = useCrudSchemas(reactive([ }, }, { - label: '物料状态', + label: '品番状态', field: 'status', sort: 'custom', dictType: DICT_TYPE.ITEM_STATUS, diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue index 48cfd7904..fff1670c3 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue @@ -95,9 +95,9 @@ - - - + + - - @@ -307,7 +307,7 @@ const formData = ref({ condition: [ // 供应商 { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' }, - // 物料类型/物料分组/物料/abc类/项目/ + // 品番类型/物料分组/物料/abc类/项目/ { ParamCode: 'ItemType', Operator: 'IN', Value: '' } ], configuration: { @@ -362,9 +362,9 @@ const options = reactive({ ], //供应商列表 supplierList: [], - // 物料类型列表 + // 品番类型列表 itemTypeOptions: [ - { value: 'ItemType', label: '物料类型' }, + { value: 'ItemType', label: '品番类型' }, { value: 'ItemGroup', label: '物料分组' }, { value: 'ItemCode', label: '物料' }, { value: 'Project', label: '项目' }, @@ -405,7 +405,7 @@ const changeSupplierCustomer = (e) => { } } getFormSupplierList() -// 选择物料类型/物料分组/abc类/物料/项目 +// 选择品番类型/物料分组/abc类/物料/项目 const changeItemsType = () => { formData.value.condition[1].Value = '' } @@ -551,7 +551,7 @@ const resetForm = () => { condition: [ // 供应商 { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' }, - // 物料类型/物料分组/物料/abc类/项目/ + // 品番类型/物料分组/物料/abc类/项目/ { ParamCode: 'ItemType', Operator: 'IN', Value: '' } ], configuration: { diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue index d46dd2be8..694554122 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue @@ -53,9 +53,9 @@
规则条件
- - - + + - - @@ -117,9 +117,9 @@ /> - @@ -513,7 +513,7 @@ const formData = ref({ status: true, //状态 //规则条件集合 condition: [ - // 物料类型/物料分组/物料/abc类/项目/ + // 品番类型/物料分组/物料/abc类/项目/ { ParamCode: 'ItemType', Operator: 'IN', Value: '' }, // 供应商 { ParamCode: 'CustomerCode', Operator: 'IN', Value: '' }, @@ -602,14 +602,14 @@ const options = reactive({ //供应商列表 supplierList: [], originSupplierList: [], - // 物料类型列表 + // 品番类型列表 itemTypeOptions: [ - { value: 'ItemType', label: '物料类型' }, + { value: 'ItemType', label: '品番类型' }, { value: 'ItemGroup', label: '物料分组' }, { value: 'ItemCode', label: '物料' }, // { value: 'Project', label: '项目' }, { value: 'AbcClass', label: 'ABC类' }, - { value: 'ItemStatus', label: '物料状态' } + { value: 'ItemStatus', label: '品番状态' } ], // 重量体积面积类型列表 calculationTypeOptions: [ @@ -682,7 +682,7 @@ const changeSupplierCustomer = (e) => { } } getFormSupplierList() -// 选择物料类型/物料分组/abc类/物料/项目 +// 选择品番类型/物料分组/abc类/物料/项目 const changeItemsType = () => { formData.value.condition[0].Value = '' } @@ -1194,7 +1194,7 @@ const resetForm = () => { status: true, //状态 //规则条件集合 condition: [ - // 物料类型/物料分组/物料/abc类/项目/ + // 品番类型/物料分组/物料/abc类/项目/ { ParamCode: 'ItemType', Operator: 'IN', Value: '' }, // 供应商 { ParamCode: 'CustomerCode', Operator: 'IN', Value: '' }, diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue index aecd1cbbb..737c1d7bb 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue @@ -54,9 +54,9 @@ - - - + + - - @@ -118,9 +118,9 @@ /> - @@ -422,7 +422,7 @@ const formData = ref({ status: true, //状态 //规则条件集合 condition: [ - // 物料类型/物料分组/物料/abc类/项目/ + // 品番类型/物料分组/物料/abc类/项目/ { ParamCode: 'ItemType', Operator: 'IN', Value: '' }, // 生产线 { ParamCode: 'Productionline', Operator: 'IN', Value: '' } @@ -486,14 +486,14 @@ const options = reactive({ //范围下拉框列表 rangeOptions1: formatRangeOptions('IN', 'NOT IN'), rangeOptions2: formatRangeOptions('>', '<', '>=', '<='), - // 物料类型列表 + // 品番类型列表 itemTypeOptions: [ - { value: 'ItemType', label: '物料类型' }, + { value: 'ItemType', label: '品番类型' }, { value: 'ItemGroup', label: '物料分组' }, { value: 'ItemCode', label: '物料' }, // { value: 'Project', label: '项目' }, { value: 'AbcClass', label: 'ABC类' }, - { value: 'ItemStatus', label: '物料状态' } + { value: 'ItemStatus', label: '品番状态' } ], //仓库列表 warehouseTypeOptions: [ @@ -525,7 +525,7 @@ const buttonBaseClick = (val, item) => { } } -// 选择物料类型/物料分组/abc类/物料/项目 +// 选择品番类型/物料分组/abc类/物料/项目 const changeItemsType = () => { formData.value.condition[1].Value = '' } @@ -932,7 +932,7 @@ const resetForm = () => { condition: [ // 供应商 { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' }, - // 物料类型/物料分组/物料/abc类/项目/ + // 品番类型/物料分组/物料/abc类/项目/ { ParamCode: 'ItemType', Operator: 'IN', Value: '' }, // /重量/体积/面积 { ParamCode: 'Weight', Operator: '>', Value: [] }, diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue index b033f9dc4..1ed28cf71 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue @@ -97,7 +97,7 @@ /> - + { } } getFormSupplierList() -// 选择物料类型/物料分组/abc类/物料/项目 +// 选择品番类型/物料分组/abc类/物料/项目 const changeItemsType = () => { formData.value.condition[1].Value = '' } @@ -605,7 +605,7 @@ const resetForm = () => { condition: [ // 供应商 { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' }, - // 物料类型/物料分组/物料/abc类/项目/ + // 品番类型/物料分组/物料/abc类/项目/ { ParamCode: 'ItemType', Operator: 'IN', Value: '' }, // 仓库 { ParamCode: 'LocationCode', Operator: 'IN', Value: '' }, diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue index b542c19c3..e69b31373 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue @@ -51,7 +51,7 @@
规则条件
- + { dialogVisible.value = false } } -// 选择物料类型/物料分组/abc类/物料/项目 +// 选择品番类型/物料分组/abc类/物料/项目 const changeItemsType = () => { formData.value.condition[0].Value = '' } @@ -567,7 +567,7 @@ const resetForm = () => { status: true, //状态 //规则条件集合 condition: [ - // 物料类型/物料分组/物料/abc类/项目/ + // 品番类型/物料分组/物料/abc类/项目/ { ParamCode: 'ItemType', Operator: 'IN', Value: '' }, // 仓库 { ParamCode: 'LocationCode', Operator: 'IN', Value: '' } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue index bf8534f94..2c9f67875 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue @@ -51,9 +51,9 @@
规则条件
- - - + + - - @@ -344,7 +344,7 @@ const formData = ref({ status: true, //状态 //规则条件集合 condition: [ - // 物料类型/物料分组/物料/abc类/项目/ + // 品番类型/物料分组/物料/abc类/项目/ { ParamCode: 'ItemGroup', Operator: 'IN', Value: '' }, // 仓库 { ParamCode: 'LocationCode', Operator: 'IN', Value: '' } @@ -396,7 +396,7 @@ const options = reactive({ //范围下拉框列表 rangeOptions1: formatRangeOptions('IN', 'NOT IN'), - // 物料类型列表 + // 品番类型列表 itemTypeOptions: [ { value: 'ItemGroup', label: '物料分组' }, { value: 'ItemCode', label: '物料' }, @@ -430,7 +430,7 @@ const buttonBaseClick = (val, item) => { dialogVisible.value = false } } -// 选择物料类型/物料分组/abc类/物料/项目 +// 选择品番类型/物料分组/abc类/物料/项目 const changeItemsType = () => { formData.value.condition[0].Value = '' } @@ -553,7 +553,7 @@ const resetForm = () => { status: true, //状态 //规则条件集合 condition: [ - // 物料类型/物料分组/物料/abc类/项目/ + // 品番类型/物料分组/物料/abc类/项目/ { ParamCode: 'ItemGroup', Operator: 'IN', Value: '' }, // 仓库 { ParamCode: 'LocationCode', Operator: 'IN', Value: '' } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue index 74261b5d3..2db6a90c9 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue @@ -163,9 +163,9 @@ /> --> - - - + + - - @@ -742,7 +742,7 @@ const formData = ref({ { ParamCode: 'WarehouseCode', Operator: 'IN', Value: '' }, // // 供应商 // { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' }, - // 物料类型/物料分组/物料/abc类/项目/ + // 品番类型/物料分组/物料/abc类/项目/ { ParamCode: 'ItemType', Operator: 'IN', Value: '' }, // // 重量/体积/面积 // { ParamCode: 'Weight', Operator: '>', Value: [] }, @@ -827,9 +827,9 @@ const options = reactive({ //供应商列表 supplierList: [], originSupplierList: [], - // 物料类型列表 + // 品番类型列表 itemTypeOptions: [ - { value: 'ItemType', label: '物料类型' }, + { value: 'ItemType', label: '品番类型' }, { value: 'ItemGroup', label: '物料分组' }, { value: 'ItemCode', label: '物料' }, { value: 'Project', label: '项目' }, @@ -916,7 +916,7 @@ const changeSupplierCustomer = (e) => { } } getFormSupplierList() -// 选择物料类型/物料分组/abc类/物料/项目 +// 选择品番类型/物料分组/abc类/物料/项目 const changeItemsType = () => { formData.value.condition[1].Value = '' } @@ -1441,7 +1441,7 @@ const resetForm = () => { { ParamCode: 'WarehouseCode', Operator: 'IN', Value: '' }, // // 供应商 // { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' }, - // 物料类型/物料分组/物料/abc类/项目/ + // 品番类型/物料分组/物料/abc类/项目/ { ParamCode: 'ItemType', Operator: 'IN', Value: '' }, // // /重量/体积/面积 // { ParamCode: 'Weight', Operator: '>', Value: [] }, diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue index 265c80d97..e6096bb06 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue @@ -94,9 +94,9 @@ /> - - - + + - - @@ -244,7 +244,7 @@ const formData = ref({ condition: [ // 器具类型 { ParamCode: 'ContainerType', Operator: 'IN', Value: '' }, - // 物料类型/物料分组/物料/abc类/项目/ + // 品番类型/物料分组/物料/abc类/项目/ { ParamCode: 'ItemGroup', Operator: 'IN', Value: '' } ], configuration: { @@ -284,7 +284,7 @@ const options = reactive({ //范围下拉框列表 rangeOptions1: formatRangeOptions('IN', 'NOT IN'), - // 物料类型列表 + // 品番类型列表 itemTypeOptions: [ { value: 'ItemGroup', label: '物料分组' }, { value: 'ItemCode', label: '物料' }, @@ -308,7 +308,7 @@ const buttonBaseClick = (val, item) => { } } -// 选择物料类型/物料分组/abc类/物料/项目 +// 选择品番类型/物料分组/abc类/物料/项目 const changeItemsType = () => { formData.value.condition[1].Value = '' } @@ -434,7 +434,7 @@ const resetForm = () => { condition: [ // 器具类型 { ParamCode: 'ContainerType', Operator: 'IN', Value: '' }, - // 物料类型/物料分组/物料/abc类/项目/ + // 品番类型/物料分组/物料/abc类/项目/ { ParamCode: 'ItemGroup', Operator: 'IN', Value: '' } ], configuration: { diff --git a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts index c3382d695..5cf345dac 100644 --- a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts @@ -1163,7 +1163,7 @@ export const DeliverRecordImportRules = reactive({ { type: 'number', message: '结束序号必须为数字', trigger: 'blur' } ], type: [ - { required: true, message: '请选择顺引物料类型', trigger: 'blur' } + { required: true, message: '请选择顺引品番类型', trigger: 'blur' } ], customerCode: [ { required: true, message: '请选择客户代码', trigger: 'blur' } diff --git a/src/views/wms/inventoryManage/balance/balance.data.ts b/src/views/wms/inventoryManage/balance/balance.data.ts index 28fa956dd..36e1883ef 100644 --- a/src/views/wms/inventoryManage/balance/balance.data.ts +++ b/src/views/wms/inventoryManage/balance/balance.data.ts @@ -64,7 +64,7 @@ export const Balance = useCrudSchemas( isSearch: true }, { - label: '物料类型', + label: '品番类型', field: 'itemType', sort: 'custom', dictType: DICT_TYPE.ITEM_TYPE, @@ -577,7 +577,7 @@ export const BalancePopWindow = useCrudSchemas( isSearch: true }, { - label: '物料类型', + label: '品番类型', field: 'itemType', sort: 'custom', dictType: DICT_TYPE.ITEM_TYPE, diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue index 68b6e62ab..37277479e 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue @@ -192,7 +192,7 @@ const updataTableColumns = (val) => { tableColumns.value = val } -// 判断 物料类型是否与其他物料类型一致 +// 判断 品番类型是否与其他品番类型一致 const isItemType = async (itemCode, labelTypeParams) => { let isType = false const labelTypeOld = JSON.parse(JSON.stringify(labelType.value)) diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts index 5730fcdbc..ff847355b 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts @@ -722,7 +722,7 @@ export const ItembasicShow = useCrudSchemas( } , }, { - label: '物料状态', + label: '品番状态', field: 'status', sort: 'custom', dictType: DICT_TYPE.ITEM_STATUS, diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue index b35b80b85..0dee7cb51 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue @@ -162,7 +162,7 @@ const detailValidate = (data) => { } } -// 判断 物料类型是否与其他物料类型一致 +// 判断 品番类型是否与其他品番类型一致 const isItemType = async (itemCode, labelTypeParams) => { let isType = false const labelTypeOld = JSON.parse(JSON.stringify(labelType.value)) @@ -563,7 +563,7 @@ const buttonTableClick = async (val, row) => { // dialogVisible.value = true detatableData.tableList.map((item) => { // item.batch = '000000' - // 查询物料类型 原料 只能选择 供应商代码 半成品成品其他 只能选择 生产线 + // 查询品番类型 原料 只能选择 供应商代码 半成品成品其他 只能选择 生产线 ItembasicApi.getItembasicPage({ pageSize: 10, pageNo: 1, diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts index 68bd98e1b..4238e2cf2 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts @@ -1760,7 +1760,7 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive { tableColumns.value = val } -// 判断 物料类型是否与其他物料类型一致 +// 判断 品番类型是否与其他品番类型一致 const isItemType = async (itemCode, labelTypeParams) => { let isType = false const labelTypeOld = JSON.parse(JSON.stringify(labelType.value)) @@ -504,7 +504,7 @@ const buttonTableClick = async (val, row) => { formLabelRef.value.open('create', row) detatableData.tableList.map((item) => { // item.batch = '000000' 不合格批次 用原有数据的 - // 查询物料类型 原料 只能选择 供应商代码 半成品成品其他 只能选择 生产线 + // 查询品番类型 原料 只能选择 供应商代码 半成品成品其他 只能选择 生产线 ItembasicApi.getItembasicPage({ pageSize: 10, pageNo: 1, diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue index 5c98a6410..eddc39502 100644 --- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue +++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue @@ -190,7 +190,7 @@ const detailValidate = (data) => { } } -// 判断 物料类型是否与其他物料类型一致 +// 判断 品番类型是否与其他品番类型一致 const isItemType = async (itemCode, labelTypeParams) => { let isType = false const labelTypeOld = JSON.parse(JSON.stringify(labelType.value)) @@ -521,7 +521,7 @@ const buttonTableClick = async (val, row) => { formLabelRef.value.open('create', row) detatableData.tableList.map((item) => { // item.batch = '000000' - // 查询物料类型 原料 只能选择 供应商代码 半成品成品其他 只能选择 生产线 + // 查询品番类型 原料 只能选择 供应商代码 半成品成品其他 只能选择 生产线 ItembasicApi.getItembasicPage({ pageSize: 10, pageNo: 1, diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts index 0110037d2..5bd2afe24 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts @@ -643,7 +643,7 @@ export const BalanceShow = useCrudSchemas( isSearch: true }, { - label: '物料类型', + label: '品番类型', field: 'itemType', sort: 'custom', dictType: DICT_TYPE.ITEM_TYPE, diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue index 257b5b282..a029efe9a 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue @@ -585,7 +585,7 @@ const buttonTableClick = async (val, row) => { // dialogVisible.value = true formLabelRef.value.open('create', row) detatableData.tableList.map((item) => { - // 查询物料类型 原料 只能选择 供应商代码 半成品成品其他 只能选择 生产线 + // 查询品番类型 原料 只能选择 供应商代码 半成品成品其他 只能选择 生产线 ItembasicApi.getItembasicPage({ pageSize: 10, pageNo: 1, diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue index 07eb65030..37b648e17 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue @@ -467,7 +467,7 @@ const buttonTableClick = async (val, row) => { // dialogVisible.value = true formLabelRef.value.open('create', row) detatableData.tableList.map((item) => { - // 查询物料类型 原料 只能选择 供应商代码 半成品成品其他 只能选择 生产线 + // 查询品番类型 原料 只能选择 供应商代码 半成品成品其他 只能选择 生产线 ItembasicApi.getItembasicPage({ pageSize: 10, pageNo: 1, diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue index c124b1fa1..7266acb20 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue @@ -449,7 +449,7 @@ const buttonTableClick = async (val, row) => { // dialogVisible.value = true formLabelRef.value.open('create', row) detatableData.tableList.map((item) => { - // 查询物料类型 原料 只能选择 供应商代码 半成品成品其他 只能选择 生产线 + // 查询品番类型 原料 只能选择 供应商代码 半成品成品其他 只能选择 生产线 ItembasicApi.getItembasicPage({ pageSize: 10, pageNo: 1, diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts index 25cb32f64..61eac6aa5 100644 --- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts @@ -1003,7 +1003,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas( isForm: false }, { - label: '物料类型', + label: '品番类型', field: 'itemType', sort: 'custom', table: { diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index be7655c46..c301fccdf 100644 --- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -789,7 +789,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive isSearch: false, }, { - label: '物料类型', + label: '品番类型', field: 'itemType', sort: 'custom', dictType: DICT_TYPE.ITEM_TYPE, diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index 87a2584a3..065d08724 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -790,7 +790,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive { // 单据打印 const BASE_URL = getJmreportBaseUrl() -// 物料状态是“补给品”和其余状态 的发货单模版 +// 品番状态是“补给品”和其余状态 的发货单模版 const documentSrc = ref(BASE_URL + '/jmreport/view/1019060741381099520?token=' + getAccessToken()) -// 物料状态是号试显示生准订单的发货单模版 +// 品番状态是号试显示生准订单的发货单模版 const documentSrc2 = ref(BASE_URL + '/jmreport/view/1019406772438372352?token=' + getAccessToken()) const handleDocumentPrint = async (id) => { diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index 6c0084ce3..b315adf95 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -1268,9 +1268,9 @@ const print = async () => { } // 单据打印 -// 物料状态是“补给品”和其余状态 的发货单模版 +// 品番状态是“补给品”和其余状态 的发货单模版 const documentSrc = ref(BASE_URL + '/jmreport/view/1019060741381099520?token=' + getAccessToken()) -// 物料状态是号试显示生准订单的发货单模版 +// 品番状态是号试显示生准订单的发货单模版 const documentSrc2 = ref(BASE_URL + '/jmreport/view/1019406772438372352?token=' + getAccessToken()) const handleDocumentPrint = async (id, stausId) => { await SupplierdeliverRequestMainApi.getItemStatus(stausId).then(async (res) => { diff --git a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/purchasereceiptJobMain.data.ts index 25cb32f64..61eac6aa5 100644 --- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/purchasereceiptJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/purchasereceiptJobMain.data.ts @@ -1003,7 +1003,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas( isForm: false }, { - label: '物料类型', + label: '品番类型', field: 'itemType', sort: 'custom', table: { diff --git a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index be7655c46..c301fccdf 100644 --- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -789,7 +789,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive