From 39ae50a2e21cee2da46f3765caffdfd23b3fd42c Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Thu, 19 Sep 2024 08:24:30 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=9B=BD=E5=BC=BA=E8=AE=A9=E6=8A=8A?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=85=88=E6=8B=BF=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasePlanMain/index.vue | 39 ++++++++++--------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index b36c4f3c3..6d0455381 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -865,25 +865,26 @@ const handleSelectionPublish = async ()=>{ // 子表新增/编辑校验 const detailValidate = async (data) => { - let tag = false - await PurchaseDetailApi.getPurchaseDetailPageCheckData({ - number: data.poNumber, - lineNumber: data.poLine - }).then(res => { - if(res.list[0].type == 'DISCRETE'){//只有离散单需要这个校验 - if (data.planQty > res.list[0].orderQty - res.list[0].plannedQty) { - message.error(t('ts.要货计划数量不得大于订单数量-已计划数量')) - tag = false - } else { - tag = true - } - }else{ - tag = true - } - }).catch(err =>{ - console.log(err); - }) - return tag + return true + // let tag = false + // await PurchaseDetailApi.getPurchaseDetailPageCheckData({ + // number: data.poNumber, + // lineNumber: data.poLine + // }).then(res => { + // if(res.list[0].type == 'DISCRETE'){//只有离散单需要这个校验 + // if (data.planQty > res.list[0].orderQty - res.list[0].plannedQty) { + // message.error(t('ts.要货计划数量不得大于订单数量-已计划数量')) + // tag = false + // } else { + // tag = true + // } + // }else{ + // tag = true + // } + // }).catch(err =>{ + // console.log(err); + // }) + // return tag } /** 导入 */ From 5ed4204076dc792693a20948a74620853058ff4a Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Thu, 19 Sep 2024 08:33:30 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7=E9=83=BD=E6=98=AFflag=3D1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRequestMain.data.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index 3e0ceb2fc..6f9d5991a 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -138,6 +138,11 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive( value: 4, isMainValue: false }, + { + key: 'flag', + value: 1, + isMainValue: false + }, { key: 'available', value: "TRUE", From 05556e479a66293d56e7b3cf66370c6fe8731701 Mon Sep 17 00:00:00 2001 From: bjang03 <259278618@qq.com> Date: Thu, 19 Sep 2024 09:46:34 +0800 Subject: [PATCH 3/9] =?UTF-8?q?1=E3=80=81=E5=AF=86=E7=A0=81=E7=AD=96?= =?UTF-8?q?=E7=95=A5=E9=87=8D=E7=BD=AE=E4=BF=AE=E6=94=B9=E4=B8=BA=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/passwordRule/index.vue | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/views/system/passwordRule/index.vue b/src/views/system/passwordRule/index.vue index d91a69279..2a204081a 100644 --- a/src/views/system/passwordRule/index.vue +++ b/src/views/system/passwordRule/index.vue @@ -104,21 +104,24 @@ const rules = { password: [required], againPassword: [required] } -const reset = () => { - getConfig() -} -const passwordConfig = ref({ - status: true, +const defaultConfig = ref({ + status: false, ruleLevel: "简单", ruleDesc: "", - tryCount: 3, + tryCount: 5, lockHours: 1, - updatePeriod: 30, - dayTryCount: 3, + dayTryCount: 5, + updatePeriod: 100, updateRemind: 7, }) +const passwordConfig = ref({}) +const reset = () => { + passwordConfig.value = defaultConfig.value + changeRule("简单") +} /** 查询配置 */ const getConfig = async () => { + passwordConfig.value = defaultConfig.value loading.value = true try { passwordConfig.value = await api.getConfig() From 8d0496cd2d0d7afd00ba740296cf433642131449 Mon Sep 17 00:00:00 2001 From: bjang03 <259278618@qq.com> Date: Thu, 19 Sep 2024 10:07:22 +0800 Subject: [PATCH 4/9] =?UTF-8?q?1=E3=80=81=E5=AF=86=E7=A0=81=E7=AD=96?= =?UTF-8?q?=E7=95=A5=E9=87=8D=E7=BD=AE=E4=BF=AE=E6=94=B9=E4=B8=BA=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E5=88=9D=E5=A7=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/passwordRule/index.vue | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/views/system/passwordRule/index.vue b/src/views/system/passwordRule/index.vue index 2a204081a..353879cba 100644 --- a/src/views/system/passwordRule/index.vue +++ b/src/views/system/passwordRule/index.vue @@ -104,24 +104,21 @@ const rules = { password: [required], againPassword: [required] } -const defaultConfig = ref({ - status: false, +const reset = () => { + getConfig() +} +const passwordConfig = ref({ + status: true, ruleLevel: "简单", ruleDesc: "", - tryCount: 5, + tryCount: 3, lockHours: 1, + updatePeriod: 180, dayTryCount: 5, - updatePeriod: 100, updateRemind: 7, }) -const passwordConfig = ref({}) -const reset = () => { - passwordConfig.value = defaultConfig.value - changeRule("简单") -} /** 查询配置 */ const getConfig = async () => { - passwordConfig.value = defaultConfig.value loading.value = true try { passwordConfig.value = await api.getConfig() From 8e3e724a917dda8ae3fba5f16de8953116d68953 Mon Sep 17 00:00:00 2001 From: lidm0086 Date: Thu, 19 Sep 2024 10:43:35 +0800 Subject: [PATCH 5/9] HL-6032 --- .../deliversettlementManage/saleShipmentMainRecord/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue index b38c26706..41632cb0e 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue @@ -153,7 +153,7 @@ const butttondata = (row, $index) => { return [ // defaultButtons.mainListEditBtn({hasPermi:'wms:sale-shipment-main-record:update'}), // 编辑 // defaultButtons.mainListDeleteBtn({hasPermi:'wms:sale-shipment-main-record:delete'}), // 删除 - defaultButtons.mainListAbortBtn({hasPermi:'wms:sale-shipment-main-request:abort',hide:row.revokeFlag=='TRUE'}), // 撤销 + defaultButtons.mainListAbortBtn({hasPermi:'wms:sale-shipment-main-request:abort',hide:(row.revokeFlag=='TRUE'||row.relateRecordNumber != null ) }), // 撤销 ] } From f35a7b9eec42e81a93f40f7eca37001df20c748e Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Thu, 19 Sep 2024 11:13:55 +0800 Subject: [PATCH 6/9] =?UTF-8?q?HL-6064=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=B8=BA=E8=A1=A5=E6=96=99Repleinment=EF=BC=8C=E7=89=A9?= =?UTF-8?q?=E6=96=99=E4=BB=A3=E7=A0=81=E5=92=8C=E5=BA=93=E4=BD=8D=E5=BF=85?= =?UTF-8?q?=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../strategy/upShelfStrategy/AddForm.vue | 34 ++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue index 000036fea..0b06729cc 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue @@ -1230,7 +1230,39 @@ const submitForm = async () => { message.error('请选择库位') return } - + + let TransactionType = formData.value.condition[5]['Value'] + if(Array.isArray(TransactionType)){ + TransactionType = TransactionType.join(',') + } + if(TransactionType=='Repleinment'){ + //补料--物料和库位必填 + let msg = '' + + // 判断物料必填 + let itemCodes = formData.value.condition[1]['Value'] + if(Array.isArray(itemCodes)){ + itemCodes = itemCodes.join(',') + } + if(itemCodes.trim().length<=0){ + msg = '请您选择物料' + }else if(warehouseType.value!='LocationCode'){ + // 判断库位必填 + msg = '请选择库位类型' + }else{ + let locationCodes = formData.value.configuration.LocationCode + if(Array.isArray(locationCodes)){ + locationCodes = locationCodes.join(',') + } + if(locationCodes.trim().length<=0){ + msg = '请您选择库位' + } + } + if(msg){ + message.error(msg) + return + } + } // 校验表单 if (!formRef) return const valid = await formRef.value.validate() From 5d9eee0f3c7ac5f03fd18d66b1b5109f007e3f02 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Thu, 19 Sep 2024 11:54:29 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E4=BC=98=E5=85=88=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E8=A1=A5=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../strategy/upShelfStrategy/AddForm.vue | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue index 0b06729cc..a648a54d9 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue @@ -1210,6 +1210,37 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗 /** 提交表单 */ const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调 const submitForm = async () => { + let TransactionType = formData.value.condition[5]['Value'] + if(Array.isArray(TransactionType)){ + TransactionType = TransactionType.join(',') + } + if(TransactionType=='Repleinment'){ + //补料--物料和库位必填 + let msg = '' + let itemCodeType = formData.value.condition[1]['ParamCode'] + let itemCodes = formData.value.condition[1]['Value'] + if(Array.isArray(itemCodes)){ + itemCodes = itemCodes.join(',') + } + let locationCodes = formData.value.configuration.LocationCode + if(Array.isArray(locationCodes)){ + locationCodes = locationCodes.join(',') + } + if(itemCodeType!='ItemCode'){ + msg = '请选择物料' + }else if(itemCodes.trim().length<=0){ + msg = '请您选择物料' + }else if(warehouseType.value!='LocationCode'){ + // 判断库位必填 + msg = '请选择库位' + }else if(locationCodes.trim().length<=0){ + msg = '请您选择库位' + } + if(msg){ + message.error(msg) + return + } + } await blurWarehouse() // await blurTransactionType() if(warehouseType.value == 'WarehouseCode' && !formData.value.configuration.WarehouseCode){ @@ -1231,38 +1262,7 @@ const submitForm = async () => { return } - let TransactionType = formData.value.condition[5]['Value'] - if(Array.isArray(TransactionType)){ - TransactionType = TransactionType.join(',') - } - if(TransactionType=='Repleinment'){ - //补料--物料和库位必填 - let msg = '' - - // 判断物料必填 - let itemCodes = formData.value.condition[1]['Value'] - if(Array.isArray(itemCodes)){ - itemCodes = itemCodes.join(',') - } - if(itemCodes.trim().length<=0){ - msg = '请您选择物料' - }else if(warehouseType.value!='LocationCode'){ - // 判断库位必填 - msg = '请选择库位类型' - }else{ - let locationCodes = formData.value.configuration.LocationCode - if(Array.isArray(locationCodes)){ - locationCodes = locationCodes.join(',') - } - if(locationCodes.trim().length<=0){ - msg = '请您选择库位' - } - } - if(msg){ - message.error(msg) - return - } - } + // 校验表单 if (!formRef) return const valid = await formRef.value.validate() From 7accf6baf5f1f614103d060888ed7769253203f4 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Thu, 19 Sep 2024 12:37:45 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=AD=90=E8=A1=A8=E7=BC=96=E8=BE=91=EF=BC=8C=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=95=B0=E9=87=8F=EF=BC=9A=E6=98=AF=E5=90=A6=E5=8F=AF=E7=94=A8?= =?UTF-8?q?true=E5=8F=AF=E7=BC=96=E8=BE=91=EF=BC=8Cfalse=E4=B8=8D=E5=8F=AF?= =?UTF-8?q?=E7=BC=96=E8=BE=91=EF=BC=8C=E5=A4=A7=E4=BA=8E0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/locales/en-US.ts | 1 + src/locales/zh-CN.ts | 1 + .../purchasePlanMain/index.vue | 24 +++++++++++++++++-- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index 9c6aad57a..e571f3bf9 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -691,6 +691,7 @@ export default { 预测日期:'Forecast Date', 订单行:'Order Line', 计划数量:'Planned Quantity', + 计划数量必须大于0:'The number of plans must be greater than 0', 最后更新时间:'Last update time', 最后更新者:'Last Updater', 要货计划:'Demand plan', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index b7920e2d5..c5655b206 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -693,6 +693,7 @@ export default { 预测日期:'预测日期', 订单行:'订单行', 计划数量:'计划数量', + 计划数量必须大于0:'计划数量必须大于0', 最后更新时间:'最后更新时间', 最后更新者:'最后更新者', 要货计划:'要货计划', diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index 6d0455381..ee6307109 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -83,7 +83,6 @@ :detailAllSchemas="PurchasePlanDetail.allSchemas" :detailAllSchemasRules="PurchasePlanDetailRules" :apiCreate="PurchasePlanDetailApi.createPurchasePlanDetail" - :apiUpdate="PurchasePlanDetailApi.updatePurchasePlanDetail" :apiPage="PurchasePlanDetailApi.getPurchasePlanDetailPage" :apiDelete="PurchasePlanDetailApi.deletePurchasePlanDetail" @searchTableSuccessDetail="searchTableSuccessDetail" @@ -98,6 +97,8 @@ :isOpenSearchTable="true" :mainSubmitCreateApi="true" fieldTableColumn="poLine" + @detailOpenForm="detailOpenForm" + @handleSubmitForm="handleSubmitForm" /> @@ -517,7 +518,26 @@ const getSearchTableData = async (number,formField,searchField)=>{ const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) } - + const detailOpenForm = (type, row) => { + + PurchasePlanDetail.allSchemas.formSchema.forEach(item=>{ + if(item.field == 'planQty'){ + //计划数量 + item.componentProps.disabled = row.available=="FALSE" + } + }) + } + const handleSubmitForm = async (formType, data)=>{ + if(formType == 'update'){ + if(Number(data.planQty)<=0){ + message.error(t('ts.计划数量必须大于0')) + return + } + await PurchasePlanDetailApi.updatePurchasePlanDetail(data) + message.success(t('common.updateSuccess')) + } + + } /** 删除按钮操作 */ const handleDelete = async (id : number) => { try { From 8b73e40cca6d7da99801c7a2887c53752ddd6e3d Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Thu, 19 Sep 2024 14:01:13 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=AD=90=E8=A1=A8=E6=98=8E=E7=BB=86=E7=BC=96=E8=BE=91=E5=AE=8C?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E6=9C=AA=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/purchasePlanMain/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index ee6307109..bf4d22be7 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -98,7 +98,7 @@ :mainSubmitCreateApi="true" fieldTableColumn="poLine" @detailOpenForm="detailOpenForm" - @handleSubmitForm="handleSubmitForm" + @handleSubmitForm="handleDetailSubmitForm" /> @@ -527,7 +527,7 @@ const getSearchTableData = async (number,formField,searchField)=>{ } }) } - const handleSubmitForm = async (formType, data)=>{ + const handleDetailSubmitForm = async (formType, data)=>{ if(formType == 'update'){ if(Number(data.planQty)<=0){ message.error(t('ts.计划数量必须大于0')) @@ -536,7 +536,7 @@ const getSearchTableData = async (number,formField,searchField)=>{ await PurchasePlanDetailApi.updatePurchasePlanDetail(data) message.success(t('common.updateSuccess')) } - + detailRef.value.submitUpdateList() } /** 删除按钮操作 */ const handleDelete = async (id : number) => {