From e4d06464fce371fd4c8b33669b40b39a014b9a9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Mon, 19 Feb 2024 09:05:18 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=80=80=E6=96=99?= =?UTF-8?q?=E9=9A=94=E7=A6=BB=E9=80=80=E6=96=99=E6=B7=BB=E5=8A=A0=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionreturnRequestMainNo/index.ts | 2 +- .../productionreturnRequestMain/index.vue | 26 +++++++++++++++++++ .../productionreturnRequestMainNo/index.vue | 26 +++++++++++++++++++ 3 files changed, 53 insertions(+), 1 deletion(-) diff --git a/src/api/wms/productionreturnRequestMainNo/index.ts b/src/api/wms/productionreturnRequestMainNo/index.ts index b42ba45d1..af389c559 100644 --- a/src/api/wms/productionreturnRequestMainNo/index.ts +++ b/src/api/wms/productionreturnRequestMainNo/index.ts @@ -70,7 +70,7 @@ export const exportProductionreturnRequestMain = async (params) => { // 下载用户导入模板 export const importTemplate = () => { - return request.download({ url: '/wms/productionreturn-request-main/get-import-template' }) + return request.download({ url: '/wms/productionreturn-request-main/get-import-template-hold' }) } // 关闭 diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue index b65bfa774..770b622f4 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue @@ -85,6 +85,11 @@ @searchTableSuccess="searchTableSuccess" @submitForm="submitFormLabel" /> + + + + diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue index 16c6a20fd..bd4edf553 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue @@ -84,6 +84,11 @@ @searchTableSuccess="searchTableSuccess" @submitForm="submitFormLabel" /> + + + + From c3a58d3c23b4f76488a5841a4862360b75f4195c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Mon, 19 Feb 2024 09:09:24 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=B7=A5=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workstation/workstation.data.ts | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts index 30e74faf8..98d0907b0 100644 --- a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts @@ -123,7 +123,9 @@ export const Workstation = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + } + // TODO： 陈放修改 ; 数据过滤 查询库区对应成品类型下的所有库位 + ] } } }, @@ -149,13 +151,16 @@ export const Workstation = useCrudSchemas(reactive([ action: '==', isSearch: true, isMainValue: false - },{ - key: 'type', - value: 'FG', - action: '==', - isSearch: true, - isMainValue: false - }] + } + // TODO： 陈放修改 ; 数据过滤 查询库区对应成品类型下的所有库位 + // ,{ + // key: 'type', + // value: 'FG', + // action: '==', + // isSearch: true, + // isMainValue: false + // } + ] } } }, From 8262d8dbcf1ced079df3c2205ddd743f3f844dbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Mon, 19 Feb 2024 09:25:20 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=B7=A5=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../factoryModeling/workstation/index.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue b/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue index 0be18cf35..2059b78a5 100644 --- a/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue @@ -170,13 +170,13 @@ const openForm = (type: string, row?: any) => { item.componentProps.disabled = false } if (item.field == 'workshopCode') { - item.componentProps.disabled = false - item.componentProps.isSearchList = true - } - if (item.field == 'productionLineCode') { - item.componentProps.disabled = true - item.componentProps.isSearchList = false - } + item.componentProps.disabled = false + item.componentProps.isSearchList = true + } + if (item.field == 'productionLineCode') { + item.componentProps.disabled = false + item.componentProps.isSearchList = true + } }) } basicFormRef.value.open(type, row) From 571b8d8868a53b6f89ea66f763bdacbbde6a0c57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Mon, 19 Feb 2024 11:06:56 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E4=BF=A1=E6=81=AF=20?= =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workstation/workstation.data.ts | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts index 98d0907b0..5067e369e 100644 --- a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts @@ -37,17 +37,17 @@ export const Workstation = useCrudSchemas(reactive([ }, isSearch: true }, - { - label: '类型', - field: 'type', - dictType: DICT_TYPE.WORK_STATION_TYPE, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, + // { + // label: '类型', + // field: 'type', + // dictType: DICT_TYPE.WORK_STATION_TYPE, + // dictClass: 'string', + // isTable: true, + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { label: '车间代码', field: 'workshopCode', From 2c88799d1133f5bec19c2759debfa87001632b2d Mon Sep 17 00:00:00 2001 From: chenfang Date: Mon, 19 Feb 2024 14:14:59 +0800 Subject: [PATCH 5/5] =?UTF-8?q?api=E8=A1=A5=E5=85=A8=E5=8F=8A=E9=83=A8?= =?UTF-8?q?=E5=88=86=E6=90=9C=E7=B4=A2=E6=A1=86=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/supplierUser/index.ts | 7 ++++++- .../basicDataManage/customerManage/project/index.vue | 2 +- .../documentsetting/documentsetting.data.ts | 11 +++++++++-- .../factoryModeling/process/index.vue | 4 ++-- .../wms/basicDataManage/itemManage/bom/bom.data.ts | 8 ++++---- .../labelManage/barcode/barcode.data.ts | 4 ++++ .../purchaseprice/purchaseprice.data.ts | 12 ++++++------ .../inventorymove/inventorymoveRequestMain/index.vue | 1 + 8 files changed, 33 insertions(+), 16 deletions(-) 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 => {