Browse Source

api补全及部分搜索框修正

master_hella_20240701
chenfang 9 months ago
parent
commit
2c88799d11
  1. 7
      src/api/wms/supplierUser/index.ts
  2. 2
      src/views/wms/basicDataManage/customerManage/project/index.vue
  3. 11
      src/views/wms/basicDataManage/documentSetting/documentsetting/documentsetting.data.ts
  4. 4
      src/views/wms/basicDataManage/factoryModeling/process/index.vue
  5. 8
      src/views/wms/basicDataManage/itemManage/bom/bom.data.ts
  6. 4
      src/views/wms/basicDataManage/labelManage/barcode/barcode.data.ts
  7. 12
      src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts
  8. 1
      src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue

7
src/api/wms/supplierUser/index.ts

@ -45,7 +45,12 @@ export const deleteSupplierUser = async (id: number) => {
// 导出供应商用户关联信息 Excel // 导出供应商用户关联信息 Excel
export const exportSupplierUser = async (params) => { 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 })
}
} }
// 下载用户导入模板 // 下载用户导入模板

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

@ -155,7 +155,7 @@ const openForm = (type: string, row?: any) => {
item.componentProps.isSearchList = false item.componentProps.isSearchList = false
} }
if (item.field == 'code') { if (item.field == 'code') {
item.componentProps.disabled = TransferissueJobMain item.componentProps.disabled = true
} }
}) })
}else { }else {

11
src/views/wms/basicDataManage/documentSetting/documentsetting/documentsetting.data.ts

@ -85,6 +85,14 @@ export const Documentsetting = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
form: {
component: 'InputNumber',
componentProps: {
min: 0,
max: 50,
precision: 0
}
},
}, },
{ {
label: '号码分隔符', label: '号码分隔符',
@ -252,8 +260,7 @@ export const DocumentsettingRules = reactive({
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } { max: 50, message: '不得超过50个字符', trigger: 'blur' }
], ],
serialLength: [ serialLength: [
{ required: true, message: '请输入号码流水长度', trigger: 'blur' }, { required: true, message: '请输入号码流水长度', trigger: 'blur' }
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }
], ],
resetPeriod: [ resetPeriod: [
{ required: true, message: '请选择流水重置周期', trigger: 'change' } { required: true, message: '请选择流水重置周期', trigger: 'change' }

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

@ -173,8 +173,8 @@ const openForm = (type: string, row?: any) => {
item.componentProps.isSearchList = true item.componentProps.isSearchList = true
} }
if (item.field == 'productionLineCode') { if (item.field == 'productionLineCode') {
item.componentProps.disabled = true item.componentProps.disabled = false
item.componentProps.isSearchList = false item.componentProps.isSearchList = true
} }
}) })
} }

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

@ -245,18 +245,18 @@ export const BomRules = reactive({
], ],
processCode: [ processCode: [
{ required: true, message: '请输入工序代码', trigger: 'blur' }, { required: true, message: '请输入工序代码', trigger: 'blur' },
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }, { max: 50, message: '不得超过50个字符', trigger: 'change' },
], ],
version: [ version: [
{ required: true, message: '请输入版本', trigger: 'blur' }, { required: true, message: '请输入版本', trigger: 'blur' },
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } { max: 50, message: '不得超过50个字符', trigger: 'change' }
], ],
layer: [ layer: [
{ required: true, message: '请输入层级', trigger: 'blur' }, { required: true, message: '请输入层级', trigger: 'blur' },
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } { max: 50, message: '不得超过50个字符', trigger: 'change' }
], ],
remark: [ remark: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } { max: 50, message: '不得超过50个字符', trigger: 'change' }
], ],
available: [ available: [
{ required: true, message: '请选择是否可用', trigger: 'change' } { required: true, message: '请选择是否可用', trigger: 'change' }

4
src/views/wms/basicDataManage/labelManage/barcode/barcode.data.ts

@ -16,6 +16,7 @@ export const BarcodeRules = reactive({
length: [required], length: [required],
prefixLenght: [required], prefixLenght: [required],
prefixChar: [ prefixChar: [
{ required: true, message: '请输入前缀字符', trigger: 'blur' },
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } { max: 50, message: '不得超过50个字符', trigger: 'blur' }
], ],
entityProperties: [ entityProperties: [
@ -29,6 +30,9 @@ export const BarcodeRules = reactive({
{ required: true, message: '请输入截断尾部空格', trigger: 'blur' }, { required: true, message: '请输入截断尾部空格', trigger: 'blur' },
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } { max: 50, message: '不得超过50个字符', trigger: 'blur' }
], ],
labelType:[
{ required: true, message: '请选择标签类型', trigger: 'blur' }
],
isEncypt: [required], isEncypt: [required],
}) })

12
src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts

@ -121,8 +121,8 @@ export const Purchaseprice = useCrudSchemas(reactive<CrudSchema[]>([
field: 'activeTime', field: 'activeTime',
isTable: true, isTable: true,
formatter: dateFormatter, formatter: dateFormatter,
details: { detail: {
dateFormatter: 'YYYY-MM-DD HH:mm:ss' dateFormat: 'YYYY-MM-DD HH:mm:ss'
}, },
sort: 'custom', sort: 'custom',
table: { table: {
@ -143,8 +143,8 @@ export const Purchaseprice = useCrudSchemas(reactive<CrudSchema[]>([
field: 'expireTime', field: 'expireTime',
isTable: true, isTable: true,
formatter: dateFormatter, formatter: dateFormatter,
details: { detail: {
dateFormatter: 'YYYY-MM-DD HH:mm:ss' dateFormat: 'YYYY-MM-DD HH:mm:ss'
}, },
sort: 'custom', sort: 'custom',
table: { table: {
@ -166,8 +166,8 @@ export const Purchaseprice = useCrudSchemas(reactive<CrudSchema[]>([
isTable: false, isTable: false,
isForm:false, isForm:false,
formatter: dateFormatter, formatter: dateFormatter,
details: { detail: {
dateFormatter: 'YYYY-MM-DD HH:mm:ss' dateFormat: 'YYYY-MM-DD HH:mm:ss'
}, },
sort: 'custom', sort: 'custom',
table: { table: {

1
src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue

@ -601,6 +601,7 @@ const submitForm = async (formType, data) => {
}) })
if (isExist) { if (isExist) {
formRef.value.formLoading = false formRef.value.formLoading = false
isExist = false
return message.warning('包装号重复') return message.warning('包装号重复')
} }
data.subList.forEach(item => { data.subList.forEach(item => {

Loading…
Cancel
Save