From fe20fa14448a04a8904b25fa6ddc1894c7225a9b Mon Sep 17 00:00:00 2001 From: chenfang Date: Thu, 4 Jan 2024 13:50:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreturnRequestMain.data.ts | 7 +++++-- .../deliver/deliverRequestMain/index.vue | 14 +++++++++++--- .../purchasereturnRequestMain/index.vue | 1 - 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts index a70645bb3..f7340df87 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts @@ -491,8 +491,11 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ //表单校验 export const CustomerreturnRequestMainRules = reactive({ - deliverRecordNumber: [ - { required: true, message: '请选择发货记录单号', trigger: 'change' } + // deliverRecordNumber: [ + // { required: true, message: '请选择发货记录单号', trigger: 'change' } + // ], + customerCode: [ + { required: true, message: '请选择客户代码', trigger: 'blur' } ], departmentCode: [ { required: true, message: '请输入部门', trigger: 'blur' } diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue index 4dcf049c6..426f9b7b2 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue @@ -110,7 +110,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => row[formField] = val[0][searchField] } else { const setV = {} - setV[formField] = val[0][searchField] + setV[formField] = val[0][searchField] if(formField == 'deliverPlanNumber') { setV['deliverPlanNumber'] = val[0]['number'] setV['customerCode'] = val[0]['customerCode'] @@ -290,8 +290,16 @@ const buttonTableClick = async (val, row) => { /** 添加/修改操作 */ const formRef = ref() const openForm =async (type: string, row?: number) => { - console.log(9999,row) - console.log(996669,type) + if(type == "update"){ + DeliverRequestMain.allSchemas.formSchema.forEach((item) => { + if (item.field == 'deliverPlanNumber') { + item.componentProps.isSearchList = false + } + }) + }else { + item.componentProps.isSearchList = true, + item.componentProps.disabled = true + } tableData.value = [] // 重置明细数据 formRef.value.open(type, row) } diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index 535325963..1e2c76356 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -189,7 +189,6 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => // item.fromLocationGroupCode = item.fromLocationGroupCode }) isShowButton.value = false - PurchasereturnRequestMain.allSchemas.formSchema.forEach((item) => { if (item.field == 'supplierCode') { item.componentProps.disabled = true From 6bc4fdfc2b48ee8f3d0b40ba81c8497814c4e4a2 Mon Sep 17 00:00:00 2001 From: yejiaxing <591141169@qq.com> Date: Thu, 4 Jan 2024 14:45:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceiptManage/inspect/inspectRequestMain/index.vue | 2 +- .../purchasereceiptManage/putaway/putawayRequestMain/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue index adda80c48..e1bc40d1f 100644 --- a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue @@ -137,7 +137,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - // defaultButtons.defaultAddBtn({hasPermi:'wms:inspect-request-main:create'}), // 新增——需要手动修改下权限 + defaultButtons.defaultAddBtn({hasPermi:'wms:inspect-request-main:create'}), // 新增——需要手动修改下权限 // defaultButtons.defaultImportBtn({hasPermi:'wms:inspect-request-main:import'}), // 导入 defaultButtons.defaultExportBtn({hasPermi:'wms:inspect-request-main:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue index b5e00a309..7a2bc2b64 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue @@ -142,7 +142,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - // defaultButtons.defaultAddBtn({hasPermi:'wms:putaway-request-main:create'}), // 新增——需要手动修改下权限 + defaultButtons.defaultAddBtn({hasPermi:'wms:putaway-request-main:create'}), // 新增——需要手动修改下权限 // defaultButtons.defaultImportBtn({hasPermi:'wms:putaway-request-main:import'}), // 导入 defaultButtons.defaultExportBtn({hasPermi:'wms:putaway-request-main:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 From bdc1dc9be9e0b41b55e4e86f72d2e4f0e1228535 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Thu, 4 Jan 2024 14:50:37 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=20?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E8=B6=85=E9=95=BF=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionplan/productionMain/productionMain.data.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts index d7d235a94..8a93dcb7f 100644 --- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts @@ -39,6 +39,11 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, + form: { + componentProps: { + maxlength: 50 + } + } }, { label: '车间', @@ -429,7 +434,7 @@ export const ProductionMain = useCrudSchemas(reactive([ export const ProductionMainRules = reactive({ displayOrder: [ { required: true, message: '请输入顺序', trigger: 'blur' }, - { max: 50, message: '不得超过50个字符', trigger: 'blur' } + // { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], workshop: [ { required: true, message: '请选择车间', trigger: 'change' }