diff --git a/src/api/wms/supplierUser/index.ts b/src/api/wms/supplierUser/index.ts index bdb7c5b75..a7d284e80 100644 --- a/src/api/wms/supplierUser/index.ts +++ b/src/api/wms/supplierUser/index.ts @@ -45,7 +45,12 @@ export const deleteSupplierUser = async (id: number) => { // 导出供应商用户关联信息 Excel export const exportSupplierUser = async (params) => { - return await request.download({ url: `/wms/supplier-user/export-excel`, params }) + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/supplier-user/export-excel-senior`, data }) + } else { + return await request.download({ url: `/wms/supplier-user/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/views/wms/basicDataManage/customerManage/project/index.vue b/src/views/wms/basicDataManage/customerManage/project/index.vue index 196fe3fb9..e5a4303fc 100644 --- a/src/views/wms/basicDataManage/customerManage/project/index.vue +++ b/src/views/wms/basicDataManage/customerManage/project/index.vue @@ -155,7 +155,7 @@ const openForm = (type: string, row?: any) => { item.componentProps.isSearchList = false } if (item.field == 'code') { - item.componentProps.disabled = TransferissueJobMain + item.componentProps.disabled = true } }) }else { diff --git a/src/views/wms/basicDataManage/documentSetting/documentsetting/documentsetting.data.ts b/src/views/wms/basicDataManage/documentSetting/documentsetting/documentsetting.data.ts index ff8f871f3..403fd4ce6 100644 --- a/src/views/wms/basicDataManage/documentSetting/documentsetting/documentsetting.data.ts +++ b/src/views/wms/basicDataManage/documentSetting/documentsetting/documentsetting.data.ts @@ -85,6 +85,14 @@ export const Documentsetting = useCrudSchemas(reactive([ table: { width: 150 }, + form: { + component: 'InputNumber', + componentProps: { + min: 0, + max: 50, + precision: 0 + } + }, }, { label: '号码分隔符', @@ -252,8 +260,7 @@ export const DocumentsettingRules = reactive({ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], serialLength: [ - { required: true, message: '请输入号码流水长度', trigger: 'blur' }, - { max: 50, message: '不得超过50个字符', trigger: 'blur' } + { required: true, message: '请输入号码流水长度', trigger: 'blur' } ], resetPeriod: [ { required: true, message: '请选择流水重置周期', trigger: 'change' } diff --git a/src/views/wms/basicDataManage/factoryModeling/process/index.vue b/src/views/wms/basicDataManage/factoryModeling/process/index.vue index f98b88837..b3f70053f 100644 --- a/src/views/wms/basicDataManage/factoryModeling/process/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/process/index.vue @@ -173,8 +173,8 @@ const openForm = (type: string, row?: any) => { item.componentProps.isSearchList = true } if (item.field == 'productionLineCode') { - item.componentProps.disabled = true - item.componentProps.isSearchList = false + item.componentProps.disabled = false + item.componentProps.isSearchList = true } }) } diff --git a/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts b/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts index 6dc20de14..ed90ce54a 100644 --- a/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts +++ b/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts @@ -245,18 +245,18 @@ export const BomRules = reactive({ ], processCode: [ { required: true, message: '请输入工序代码', trigger: 'blur' }, - { max: 50, message: '不得超过50个字符', trigger: 'blur' }, + { max: 50, message: '不得超过50个字符', trigger: 'change' }, ], version: [ { required: true, message: '请输入版本', trigger: 'blur' }, - { max: 50, message: '不得超过50个字符', trigger: 'blur' } + { max: 50, message: '不得超过50个字符', trigger: 'change' } ], layer: [ { required: true, message: '请输入层级', trigger: 'blur' }, - { max: 50, message: '不得超过50个字符', trigger: 'blur' } + { max: 50, message: '不得超过50个字符', trigger: 'change' } ], remark: [ - { max: 50, message: '不得超过50个字符', trigger: 'blur' } + { max: 50, message: '不得超过50个字符', trigger: 'change' } ], available: [ { required: true, message: '请选择是否可用', trigger: 'change' } diff --git a/src/views/wms/basicDataManage/labelManage/barcode/barcode.data.ts b/src/views/wms/basicDataManage/labelManage/barcode/barcode.data.ts index 33eec5260..f8b2e383e 100644 --- a/src/views/wms/basicDataManage/labelManage/barcode/barcode.data.ts +++ b/src/views/wms/basicDataManage/labelManage/barcode/barcode.data.ts @@ -16,6 +16,7 @@ export const BarcodeRules = reactive({ length: [required], prefixLenght: [required], prefixChar: [ + { required: true, message: '请输入前缀字符', trigger: 'blur' }, { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], entityProperties: [ @@ -29,6 +30,9 @@ export const BarcodeRules = reactive({ { required: true, message: '请输入截断尾部空格', trigger: 'blur' }, { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], + labelType:[ + { required: true, message: '请选择标签类型', trigger: 'blur' } + ], isEncypt: [required], }) diff --git a/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts b/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts index 84c9f5d0d..8c4897667 100644 --- a/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts +++ b/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts @@ -121,8 +121,8 @@ export const Purchaseprice = useCrudSchemas(reactive([ field: 'activeTime', isTable: true, formatter: dateFormatter, - details: { - dateFormatter: 'YYYY-MM-DD HH:mm:ss' + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' }, sort: 'custom', table: { @@ -143,8 +143,8 @@ export const Purchaseprice = useCrudSchemas(reactive([ field: 'expireTime', isTable: true, formatter: dateFormatter, - details: { - dateFormatter: 'YYYY-MM-DD HH:mm:ss' + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' }, sort: 'custom', table: { @@ -166,8 +166,8 @@ export const Purchaseprice = useCrudSchemas(reactive([ isTable: false, isForm:false, formatter: dateFormatter, - details: { - dateFormatter: 'YYYY-MM-DD HH:mm:ss' + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' }, sort: 'custom', table: { diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue index 7edd66126..d02106a9e 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue @@ -601,6 +601,7 @@ const submitForm = async (formType, data) => { }) if (isExist) { formRef.value.formLoading = false + isExist = false return message.warning('包装号重复') } data.subList.forEach(item => {