From c1e56016650fa70a1451fedf64bc28c6c2c8cd01 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 27 Nov 2024 15:52:14 +0800 Subject: [PATCH 01/12] =?UTF-8?q?YT-1320=E8=A1=A5=E7=BB=99=E5=93=81?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E3=80=81=E5=8F=B7=E5=8F=A3=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=8E=BB=E6=8E=89=E7=8F=AD=E6=AC=A1?= =?UTF-8?q?=E5=BF=85=E5=A1=AB=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionplan/productionMain/index.vue | 1 + .../productionMain/productionMain.data.ts | 72 +++++++++---------- .../productionMainAssemble/index.vue | 1 + .../productionMainAssemble.data.ts | 72 +++++++++---------- 4 files changed, 74 insertions(+), 72 deletions(-) diff --git a/src/views/wms/productionManage/productionplan/productionMain/index.vue b/src/views/wms/productionManage/productionplan/productionMain/index.vue index 8bf2be24c..754b5ed19 100644 --- a/src/views/wms/productionManage/productionplan/productionMain/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMain/index.vue @@ -94,6 +94,7 @@ import { usePageLoading } from '@/hooks/web/usePageLoading' const { loadStart, loadDone } = usePageLoading() // 生产计划主 // 预生产计划 +// 补给品生产计划 defineOptions({ name: 'ProductionMain' }) const message = useMessage() // 消息弹窗 diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts index 729bfb45a..dc2f86c04 100644 --- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts @@ -199,39 +199,39 @@ export const ProductionMain = useCrudSchemas(reactive([ } } }, - { - label: '班次', - field: 'shift', - sort: 'custom', - table: { - width: 150 - }, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - enterSearch: true, - isSearchList: true, - searchListPlaceholder: '请选择班次', - searchField: 'code', - searchTitle: '班次信息', - searchAllSchemas: Shift.allSchemas, - searchPage: ShiftApi.getShiftPage, - searchCondition:[{ - key: 'available', - value: 'TRUE', - isMainValue: false - }], - verificationParams: [{ - key: 'code', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true, - }], // 失去焦点校验参数 - } - } - }, + // { + // label: '班次', + // field: 'shift', + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // // labelMessage: '信息提示说明！！！', + // componentProps: { + // enterSearch: true, + // isSearchList: true, + // searchListPlaceholder: '请选择班次', + // searchField: 'code', + // searchTitle: '班次信息', + // searchAllSchemas: Shift.allSchemas, + // searchPage: ShiftApi.getShiftPage, + // searchCondition:[{ + // key: 'available', + // value: 'TRUE', + // isMainValue: false + // }], + // verificationParams: [{ + // key: 'code', + // action: '==', + // value: '', + // isMainValue: false, + // isSearch: true, + // isFormModel: true, + // }], // 失去焦点校验参数 + // } + // } + // }, // { // label: '物料代码', // field: 'detailItemCode', @@ -640,9 +640,9 @@ export const ProductionMainRules = reactive({ productionLine: [ { required: true, message: '请选择生产线', trigger: 'change' } ], - shift: [ - { required: true, message: '请选择班次', trigger: 'change' } - ], + // shift: [ + // { required: true, message: '请选择班次', trigger: 'change' } + // ], // team: [ // { required: true, message: '请选择班组', trigger: 'change' } // ], diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue index a5335ec3c..9573cc3ba 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue @@ -93,6 +93,7 @@ import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' const { loadStart, loadDone } = usePageLoading() // 装配计划 +// 号口生产计划 defineOptions({ name: 'ProductionMainAssemble' }) const message = useMessage() // 消息弹窗 diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts index 080efd908..c901d1e5f 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts @@ -198,39 +198,39 @@ export const ProductionMain = useCrudSchemas(reactive([ } } }, - { - label: '班次', - field: 'shift', - sort: 'custom', - table: { - width: 150 - }, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - enterSearch: true, - isSearchList: true, - searchListPlaceholder: '请选择班次', - searchField: 'code', - searchTitle: '班次信息', - searchAllSchemas: Shift.allSchemas, - searchPage: ShiftApi.getShiftPage, - searchCondition:[{ - key: 'available', - value: 'TRUE', - isMainValue: false - }], - verificationParams: [{ - key: 'code', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true, - }], // 失去焦点校验参数 - } - } - }, + // { + // label: '班次', + // field: 'shift', + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // // labelMessage: '信息提示说明！！！', + // componentProps: { + // enterSearch: true, + // isSearchList: true, + // searchListPlaceholder: '请选择班次', + // searchField: 'code', + // searchTitle: '班次信息', + // searchAllSchemas: Shift.allSchemas, + // searchPage: ShiftApi.getShiftPage, + // searchCondition:[{ + // key: 'available', + // value: 'TRUE', + // isMainValue: false + // }], + // verificationParams: [{ + // key: 'code', + // action: '==', + // value: '', + // isMainValue: false, + // isSearch: true, + // isFormModel: true, + // }], // 失去焦点校验参数 + // } + // } + // }, // { // label: '物料代码', // field: 'detailItemCode', @@ -639,9 +639,9 @@ export const ProductionMainRules = reactive({ productionLine: [ { required: true, message: '请选择生产线', trigger: 'change' } ], - shift: [ - { required: true, message: '请选择班次', trigger: 'change' } - ], + // shift: [ + // { required: true, message: '请选择班次', trigger: 'change' } + // ], // team: [ // { required: true, message: '请选择班组', trigger: 'change' } // ], From d0c3fec5ce7fbdba648d7453e91c6304efb8f148 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 27 Nov 2024 16:00:32 +0800 Subject: [PATCH 02/12] =?UTF-8?q?YT-1325=E5=8F=91=E6=96=99=E7=AD=96?= =?UTF-8?q?=E7=95=A5=EF=BC=9A=E4=BF=9D=E5=AD=98=E4=B8=8D=E5=A5=BD=E4=BD=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../strategySetting/strategy/downShelfStrategy/AddForm.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue index feaef082c..81056e690 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue @@ -654,7 +654,9 @@ const searchTransactionType = ()=>{ ) } // 失去焦点校验 -const blurVerify= async (type)=>{ +const typeBlur = ref('') +const blurVerify = async (type) => { + typeBlur.value = type let transactionType = formData.value.condition.find(item => item['ParamCode'] == type) console.log(transactionType) if (transactionType && transactionType.Value) { @@ -864,6 +866,8 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调 const submitForm = async () => { await blurWarehouse() + await blurVerify(typeBlur.value) + console.log('规则条件',formData.value.condition) // 校验表单 From 524483d7c37c2e0beaf5f99d2c8198e9c390e3bd Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 27 Nov 2024 16:21:17 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BD=99=E9=A2=9D?= =?UTF-8?q?=E6=89=B9=E6=AC=A1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/inventoryManage/balance/index.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue index 97f6342ca..3993bb924 100644 --- a/src/views/wms/inventoryManage/balance/index.vue +++ b/src/views/wms/inventoryManage/balance/index.vue @@ -441,7 +441,7 @@ const getLabelDetailPage = async (row, useToPackingNumber) => { item.batch = formatDate(new Date(),'YYYYMMDD') item['disabled_batch'] = false } else { - item['disabled_batch'] = true + item['disabled_batch'] = false } }) // searchTableRef.value.openData('标签信息', tableObjectPrint, { tableColumns }, true) @@ -590,13 +590,13 @@ const pointLabel = async () => { } await PackageApi.batchPrintingBalanceLableForCreate(obj).then(res => { let src =ref('') - src.value = BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()+'&asn_number='+res//制造标签模板 + // src.value = BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()+'&asn_number='+res//制造标签模板 - // if (enableBuyOrenableMake.value == 'enableBuy') { - // src.value = BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken()+'&id='+res//采购标签模板 - // } else if(enableBuyOrenableMake.value == 'enableMake') { - // src.value = BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()+'&asn_number='+res//制造标签模板 - // } + if (enableBuyOrenableMake.value == 'enableBuy') { + src.value = BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken()+'&id='+res//采购标签模板 + } else if(enableBuyOrenableMake.value == 'enableMake') { + src.value = BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()+'&asn_number='+res//制造标签模板 + } window.open(src.value) }).catch(err => { console.log(err) From 589d3d71c3daa51b0c22c0e0d89961084d3f5da7 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Wed, 27 Nov 2024 16:36:01 +0800 Subject: [PATCH 04/12] =?UTF-8?q?YT-1321=E6=96=B0=E5=A2=9E/=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E4=BE=9B=E5=BA=94=E5=95=86=E7=89=A9=E6=96=99=EF=BC=8C?= =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E7=89=A9=E6=96=99=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=BA=94=E8=AF=A5=E6=98=AF=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierManage/supplieritem/supplieritem.data.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts index a04c95f49..784cb3b88 100644 --- a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts +++ b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts @@ -416,6 +416,7 @@ export const SupplieritemRules = reactive({ { required: true, message: '请输入物料代码', trigger: 'change' } ], supplierItemCode: [ + { required: true, message: '请输入供应商物料代码', trigger: 'change' }, { max: 50, message: '不得超过50个字符', trigger: 'blur' }, // { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'} ], From 35dfe006c53073f841b509aa42b05fbfd3227e5d Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 27 Nov 2024 16:46:57 +0800 Subject: [PATCH 05/12] =?UTF-8?q?YT-1328=E8=A1=A5=E7=BB=99=E5=93=81?= =?UTF-8?q?=E5=AE=8C=E5=B7=A5=E7=94=B3=E8=AF=B7=E6=89=93=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=EF=BC=8C=E6=89=B9=E6=AC=A1=E5=AD=97=E6=AE=B5=E7=8E=B0=E5=9C=A8?= =?UTF-8?q?=E8=83=BD=E4=BF=AE=E6=94=B9=E3=80=82=E6=94=B9=E4=B8=BA=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptRequestMain.data.ts | 3 +++ .../productreceiptAssembleRequestMain.data.ts | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts index d309ea85c..156ffb314 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts @@ -1726,6 +1726,9 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive( table: { width: 150 }, + tableForm: { + disabled: true + } }, { label: '数量', diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts index bd8d86003..ca3098848 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts @@ -1731,6 +1731,9 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive( table: { width: 150 }, + tableForm: { + disabled:true + } }, { label: '数量', From aae6f315bd40bb13dd6a54f0db11d6ff79e36e4a Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Wed, 27 Nov 2024 16:58:56 +0800 Subject: [PATCH 06/12] =?UTF-8?q?YT-1319=E3=80=81YT-1320=E8=A1=A5=E7=BB=99?= =?UTF-8?q?=E5=93=81=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=E3=80=81=E5=8F=B7?= =?UTF-8?q?=E5=8F=A3=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=E3=80=81=E8=A1=A5?= =?UTF-8?q?=E7=BB=99=E5=93=81=E6=94=B6=E8=B4=A7=E3=80=81=E5=8F=B7=E5=8F=A3?= =?UTF-8?q?=E5=93=81=E6=94=B6=E8=B4=A7=EF=BC=8C=E5=8E=BB=E6=8E=89=E7=8F=AD?= =?UTF-8?q?=E6=AC=A1=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionMain/productionMain.data.ts | 66 +++++++++---------- .../productionMainAssemble.data.ts | 66 +++++++++---------- .../productreceiptRequestMain.data.ts | 6 +- .../productreceiptAssembleRequestMain.data.ts | 6 +- 4 files changed, 72 insertions(+), 72 deletions(-) diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts index dc2f86c04..76e26ea30 100644 --- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts @@ -199,39 +199,39 @@ export const ProductionMain = useCrudSchemas(reactive([ } } }, - // { - // label: '班次', - // field: 'shift', - // sort: 'custom', - // table: { - // width: 150 - // }, - // form: { - // // labelMessage: '信息提示说明！！！', - // componentProps: { - // enterSearch: true, - // isSearchList: true, - // searchListPlaceholder: '请选择班次', - // searchField: 'code', - // searchTitle: '班次信息', - // searchAllSchemas: Shift.allSchemas, - // searchPage: ShiftApi.getShiftPage, - // searchCondition:[{ - // key: 'available', - // value: 'TRUE', - // isMainValue: false - // }], - // verificationParams: [{ - // key: 'code', - // action: '==', - // value: '', - // isMainValue: false, - // isSearch: true, - // isFormModel: true, - // }], // 失去焦点校验参数 - // } - // } - // }, + { + label: '班次', + field: 'shift', + sort: 'custom', + table: { + width: 150 + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + enterSearch: true, + isSearchList: true, + searchListPlaceholder: '请选择班次', + searchField: 'code', + searchTitle: '班次信息', + searchAllSchemas: Shift.allSchemas, + searchPage: ShiftApi.getShiftPage, + searchCondition:[{ + key: 'available', + value: 'TRUE', + isMainValue: false + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 + } + } + }, // { // label: '物料代码', // field: 'detailItemCode', diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts index c901d1e5f..7b43f9b8d 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts @@ -198,39 +198,39 @@ export const ProductionMain = useCrudSchemas(reactive([ } } }, - // { - // label: '班次', - // field: 'shift', - // sort: 'custom', - // table: { - // width: 150 - // }, - // form: { - // // labelMessage: '信息提示说明！！！', - // componentProps: { - // enterSearch: true, - // isSearchList: true, - // searchListPlaceholder: '请选择班次', - // searchField: 'code', - // searchTitle: '班次信息', - // searchAllSchemas: Shift.allSchemas, - // searchPage: ShiftApi.getShiftPage, - // searchCondition:[{ - // key: 'available', - // value: 'TRUE', - // isMainValue: false - // }], - // verificationParams: [{ - // key: 'code', - // action: '==', - // value: '', - // isMainValue: false, - // isSearch: true, - // isFormModel: true, - // }], // 失去焦点校验参数 - // } - // } - // }, + { + label: '班次', + field: 'shift', + sort: 'custom', + table: { + width: 150 + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + enterSearch: true, + isSearchList: true, + searchListPlaceholder: '请选择班次', + searchField: 'code', + searchTitle: '班次信息', + searchAllSchemas: Shift.allSchemas, + searchPage: ShiftApi.getShiftPage, + searchCondition:[{ + key: 'available', + value: 'TRUE', + isMainValue: false + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 + } + } + }, // { // label: '物料代码', // field: 'detailItemCode', diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts index 156ffb314..d55e555f8 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts @@ -611,9 +611,9 @@ export const ProductreceiptRequestMainRules = reactive({ // team: [ // { required: true, message: '请选择班组代码', trigger: 'change' } // ], - shift: [ - { required: true, message: '请选择班次代码', trigger: 'change' } - ], + // shift: [ + // { required: true, message: '请选择班次代码', trigger: 'change' } + // ], // departmentCode: [ // { required: true, message: '请输入部门', trigger: 'blur' } // ], diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts index ca3098848..71beecd5b 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts @@ -617,9 +617,9 @@ export const ProductreceiptRequestMainRules = reactive({ // team: [ // { required: true, message: '请选择班组代码', trigger: 'change' } // ], - shift: [ - { required: true, message: '请选择班次代码', trigger: 'change' } - ], + // shift: [ + // { required: true, message: '请选择班次代码', trigger: 'change' } + // ], // departmentCode: [ // { required: true, message: '请输入部门', trigger: 'blur' } // ], From 18a891bfab6b3bc2090d7cc0b9ebf6d11b1060f2 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Thu, 28 Nov 2024 09:37:59 +0800 Subject: [PATCH 07/12] itemName --- .../supplierinvoice/supplierinvoiceRequestMain/index.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index 8ad46ea69..3a1a6cade 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -597,6 +597,8 @@ const searchTableSuccess = (formField, searchField, val, searchFormRef, type, ro newRow['maxInvoicableQuantity'] = item['invoicableQuantity'] newRow['invoicableQuantity'] = item['invoicableQuantity'] newRow['itemCode'] = item['itemCode'] + newRow['itemName'] = item['itemName'] + newRow['deliveryDate'] = item['prhRcpDate'] newRow['arrivalQty'] = item['prhRcvd'] newRow['id'] = item['id'] From e120d3083bce007ea22fce7f9339b448ecd5f847 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Thu, 28 Nov 2024 09:49:03 +0800 Subject: [PATCH 08/12] =?UTF-8?q?YT-778=E5=A4=87=E6=96=99=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E7=94=9F=E6=88=90=E5=8F=91=E6=96=99=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../preparetoissueMain/index.vue | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue index 761c02b4b..4bb3c8f54 100644 --- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue +++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue @@ -90,6 +90,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as ProductionlineitemApi from '@/api/wms/productionlineitem' import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' +import { getBaseUrl } from '@/utils/systemParam' + const { loadStart, loadDone } = usePageLoading() // 备料计划 defineOptions({ name: 'PreparetoissueMain' }) @@ -395,8 +397,19 @@ const buttonTableClick = async (val, row) => { if (row.available == 'FALSE') return message.warning('当前数据：【不可用】') await message.confirm('确认要生成发料申请吗？') tableObject.loading = true - await PreparetoissueMainApi.generateIssueRequest(row.number).then(() => { - message.success(t('common.createSuccess')) + + await PreparetoissueMainApi.generateIssueRequest(row.number).then((res) => { + console.log('返回数据',res) + if (res.errorCount > 0) { + message.confirm('存在物料库存不足，差u你感觉爱你失败。同时自动下载错误数据表格，一个物料显示一行').then(() => { + window.open( + getBaseUrl() + '/admin-api' + res.errorFile, + '222' + ) + }) + } else { + message.success(t('common.createSuccess')) + } tableObject.loading = false buttonBaseClick('refresh',null) }).catch(err => { From c8a687cdea16f6adc2fd330158ce1a3f7d0818f5 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 28 Nov 2024 09:57:32 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=96=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=89=B9=E6=AC=A1=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unplannedreceiptRequestMain/index.vue | 30 +++++++++++++++++++ .../unplannedreceiptRequestMain.data.ts | 10 ++++++- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue index c79258b9a..d16b26a6e 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue @@ -135,6 +135,7 @@ import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' import * as SubjectAccountApi from '@/api/wms/subjectAccount' const { loadStart, loadDone } = usePageLoading() +import * as ruleApi from '@/api/wms/rule/index' // 计划外入库申请 defineOptions({ name: 'UnplannedreceiptRequestMain' }) @@ -194,6 +195,7 @@ const isItemType = async (itemCode, labelTypeParams) => { } // 查询页面返回 +const fromManagementPrecision = ref('') const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { nextTick(async () => { console.log('searchTableSuccess',formField, searchField, val, formRef, type, row ) @@ -201,6 +203,21 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => // 明细查询页赋值 if(formField == 'toLocationCode'){ row['toLocationCode'] = val[0]['code'] + + await ruleApi.getManagementPrecision({ + itemCodes: [row['itemCode']], + locationCode:val[0]['code'] + }).then((res) => { + fromManagementPrecision.value = res[0].ManagementPrecision + if (fromManagementPrecision.value == 'BY_QUANTITY') { + // row['disabled_batch'] = false + UnplannedreceiptRequestDetailRules.batch[0].required = false + + } else { + // row['disabled_batch'] = true + UnplannedreceiptRequestDetailRules.batch[0].required = true + } + }) } else if(formField == 'itemCode'){ let itemCodes = val.filter(item=>tableData.value.find(item1=>item1['itemCode']==item['code'])) if(itemCodes.length>0){ @@ -525,7 +542,20 @@ const buttonTableClick = async (val, row) => { return } }) + ruleApi.getManagementPrecision({ + itemCodes: [item['itemCode']], + locationCode:item['toLocationCode'] + }).then((res) => { + fromManagementPrecision.value = res[0].ManagementPrecision + if (fromManagementPrecision.value == 'BY_QUANTITY') { + item.batch = formatDate(new Date(),'YYYYMMDD') + item['disabled_batch'] = false + } else { + item['disabled_batch'] = true + } + }) }) + } } diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts index fe8b22b0b..c553107f7 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts @@ -1427,6 +1427,9 @@ function validateQty(rule, value, callback) { } //表单校验 export const UnplannedreceiptRequestDetailRules = reactive({ + batch: [ + { required: true, message: '请选择批次', trigger: ['blur', 'change'] } + ], arriveDate: [ { required: true, message: '请选择到货日期', trigger: 'change' } ], @@ -1521,7 +1524,9 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive Date: Thu, 28 Nov 2024 10:03:18 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../issueManage/preparetoissueplan/preparetoissueMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue index 4bb3c8f54..8d256fec5 100644 --- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue +++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue @@ -401,7 +401,7 @@ const buttonTableClick = async (val, row) => { await PreparetoissueMainApi.generateIssueRequest(row.number).then((res) => { console.log('返回数据',res) if (res.errorCount > 0) { - message.confirm('存在物料库存不足，差u你感觉爱你失败。同时自动下载错误数据表格，一个物料显示一行').then(() => { + message.confirm('存在物料库存不足，创建失败。').then(() => { window.open( getBaseUrl() + '/admin-api' + res.errorFile, '222' From a934d3b93d11340e457ae85b6253f106b9d0b751 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Thu, 28 Nov 2024 11:46:05 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E6=A8=A1=E5=85=B7=E5=88=86=E6=91=8A?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=B8=AD=E8=8B=B1=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/locales/en-US.ts | 3 ++- src/locales/zh-CN.ts | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index 5e7924a15..d25048231 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -1316,7 +1316,8 @@ export default { 是否确认分摊金额: 'Do you want to confirm the allocation amount?', 创建开票申请: 'Create an invoice request?', 详情:'Detail', - 退回:'Return' + 退回:'Return', + 作废成功:'Invalid successfully' }, diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 2ffb5015d..839dcf9d8 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -1316,8 +1316,7 @@ export default { 退回成功: '退回成功', 是否确认分摊金额: '是否确认分摊金额？', 创建开票申请: '创建开票申请', - 详情:'详情', - 退回:'退回', + 作废成功:'作废成功', }, } From 172378b07b3aa41f153196e819ecc5fdc4ee33c5 Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Thu, 28 Nov 2024 11:59:45 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BD=99=E9=A2=9D?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/inventoryManage/balance/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue index 3993bb924..b5e377e42 100644 --- a/src/views/wms/inventoryManage/balance/index.vue +++ b/src/views/wms/inventoryManage/balance/index.vue @@ -581,7 +581,7 @@ const pointLabel = async () => { packQty:detatableData1.value[0].packQty, uom:detatableData1.value[0].uom, productionLineCodePackage:detatableData1.value[0].productionLineCodePackage, - supplierItemCode:detatableData1.value[0].supplierItemCode, + supplierCode:detatableData1.value[0].supplierItemCode, } // const isHave = detatableData1.value.find(item => parseFloat(item.printQty) <= 0) if(!parseFloat(obj.printQty) ){ @@ -593,7 +593,7 @@ const pointLabel = async () => { // src.value = BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()+'&asn_number='+res//制造标签模板 if (enableBuyOrenableMake.value == 'enableBuy') { - src.value = BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken()+'&id='+res//采购标签模板 + src.value = BASE_URL + '/jmreport/view/1021666059319578624?token=' + getAccessToken()+'&asn_number='+res//采购标签模板 } else if(enableBuyOrenableMake.value == 'enableMake') { src.value = BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()+'&asn_number='+res//制造标签模板 }