From fbdf82a1ff718ece12763b6fe6d1b23bb33e110e Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Tue, 9 Jul 2024 15:05:26 +0800 Subject: [PATCH 01/39] =?UTF-8?q?WMS=20=E2=80=94=E2=80=94>=20bug=20=20?= =?UTF-8?q?=E9=95=BF=E6=98=A5=E6=B5=B7=E6=8B=89=E6=AD=A3=E5=BC=8F=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7=E4=B8=AD=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E8=AE=A1=E5=88=92=E5=8D=95=E5=8F=B7=E5=BC=B9=E5=87=BA?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80=E4=B8=8D=E5=90=88=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliverPlanMain/deliverPlanMain.data.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts index fac92203b..40d883e9a 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts @@ -883,7 +883,7 @@ export const DeliverPlanDetailRequest = useCrudSchemas(reactive([ field: 'number', sort: 'custom', table: { - width: 180 + width: 350 }, form: { componentProps: { @@ -896,7 +896,7 @@ export const DeliverPlanDetailRequest = useCrudSchemas(reactive([ field: 'itemCode', sort: 'custom', table: { - width: 150 + width: 350 }, tableForm:{ multiple:true, @@ -923,7 +923,7 @@ export const DeliverPlanDetailRequest = useCrudSchemas(reactive([ field: 'planQty', sort: 'custom', table: { - width: 150 + width: 350 }, form: { component: 'InputNumber', @@ -946,7 +946,7 @@ export const DeliverPlanDetailRequest = useCrudSchemas(reactive([ isTable: true, sort: 'custom', table: { - width: 150 + width: 360 }, tableForm: { disabled: true, @@ -958,4 +958,4 @@ export const DeliverPlanDetailRequest = useCrudSchemas(reactive([ } } }, -])) \ No newline at end of file +])) From 2ac98e361cdb2a5127ac72e39c6790ce967abc1c Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Tue, 9 Jul 2024 15:40:18 +0800 Subject: [PATCH 02/39] =?UTF-8?q?WMS=20=E2=80=94=E2=80=94>=20bug=20=20?= =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E5=87=BA=E5=BA=93=E6=96=B0=E5=A2=9E=EF=BC=8C?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=8C=85=E8=A3=85=E5=8F=B7=EF=BC=8C=E5=BA=94?= =?UTF-8?q?=E5=8F=AA=E6=98=BE=E7=A4=BA=E6=8A=A5=E5=BA=9F=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scrap/scrapRequestMain/scrapRequestMain.data.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts index fe6c6a315..0430fe023 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts @@ -503,6 +503,12 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ action: '==', isSearch: true, isMainValue: false + },{ + key: 'inventoryStatus', + value: 'SCRAP', + action: '==', + isSearch: true, + isMainValue: false }] }, form: { From 4c8129fbfb9aba8b54c960214389ead410fa8599 Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Tue, 9 Jul 2024 18:51:14 +0800 Subject: [PATCH 03/39] =?UTF-8?q?WMS=20=E2=80=94=E2=80=94>=20bug=20=20?= =?UTF-8?q?=E5=8C=85=E8=A3=85=E4=BF=A1=E6=81=AF=E4=B8=AD=E5=8C=85=E8=A3=85?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=9F=A5=E8=AF=A2=E4=B8=8D=E5=A5=BD=E4=BD=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itemManage/itempackage/itempackage.data.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts index 04e2537e2..b07a6fe83 100644 --- a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts @@ -86,7 +86,7 @@ export const Itempackaging = useCrudSchemas(reactive([ label: '包装名称', field: 'packName', sort: 'custom', - isSearch: true, + isSearch: false, table: { width: 120 }, @@ -101,7 +101,7 @@ export const Itempackaging = useCrudSchemas(reactive([ dictType: DICT_TYPE.PACK_UNIT_TYPE, dictClass: 'string', sort: 'custom', - isSearch: true, + isSearch: false, table: { width: 150 }, @@ -110,7 +110,7 @@ export const Itempackaging = useCrudSchemas(reactive([ label: '包装数量', field: 'packQty', sort: 'custom', - isSearch: true, + isSearch: false, table: { width: 120 }, From ea82f707f3ae6c1f15391a2867c6d710ffd1b788 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 10 Jul 2024 08:44:37 +0800 Subject: [PATCH 04/39] =?UTF-8?q?UI=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/directives/permission/clientTable.ts | 2 +- src/layout/components/useRenderLayout.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/directives/permission/clientTable.ts b/src/directives/permission/clientTable.ts index 7db98c0bd..b1c8b09ba 100644 --- a/src/directives/permission/clientTable.ts +++ b/src/directives/permission/clientTable.ts @@ -13,7 +13,7 @@ export function clientTable(app: App) { if(el.children&&el.children.length>1){ paginationHeight = 70 } - const height = window.innerHeight - top - paginationHeight - qustionHeight + const height = window.innerHeight - top - paginationHeight - qustionHeight +5 el.style.height = height + 'px' el.firstChild.style.height = '100%' }) diff --git a/src/layout/components/useRenderLayout.tsx b/src/layout/components/useRenderLayout.tsx index 393d2e8c6..d0d705a23 100644 --- a/src/layout/components/useRenderLayout.tsx +++ b/src/layout/components/useRenderLayout.tsx @@ -39,7 +39,7 @@ const fixedMenu = computed(() => appStore.getFixedMenu) // 搜索图片 const search = computed(() => appStore.search) const scrollBarHeight = computed(() => { - return (window.innerHeight - appStore.getCategoryMenuHeight - 85)+'px' + return (window.innerHeight - appStore.getCategoryMenuHeight - 35)+'px' }) export const useRenderLayout = () => { From b63f49c6b38b82e12d094edb8374ad50c2d0b97f Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Wed, 10 Jul 2024 09:02:24 +0800 Subject: [PATCH 05/39] =?UTF-8?q?WMS=20=E2=80=94=E2=80=94>=20bug=20=20?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E8=AE=B0=E5=BD=95:=20=E5=8F=91=E8=B4=A7?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=8D=95=E5=8F=B7=E3=80=81=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=BA=94=E5=8E=BB=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliver/deliverRecordMain/deliverRecordMain.data.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts index 9cef4876b..2192b55f1 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts @@ -40,6 +40,9 @@ export const DeliverRecordMain = useCrudSchemas(reactive([ width: 150 }, isSearch: false, + isTable: false, + isForm: false, + isDetail:false, }, // { // label: '发货计划单号', @@ -63,8 +66,9 @@ export const DeliverRecordMain = useCrudSchemas(reactive([ dictType: DICT_TYPE.REQUEST_STATUS, dictClass: 'string', isSearch: false, - isTable: true, + isTable: false, isForm: false, + isDetail:false, sort: 'custom', table: { width: 150 From e9b53bdcb49dde0a0e0bd333e4be60d66a408450 Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Wed, 10 Jul 2024 09:59:20 +0800 Subject: [PATCH 06/39] =?UTF-8?q?WMS=20=E2=80=94=E2=80=94>=20bug=20=20?= =?UTF-8?q?=E7=89=A9=E6=96=99=E5=8C=85=E8=A3=85=E4=BF=A1=E6=81=AF=20?= =?UTF-8?q?=E5=8C=85=E8=A3=85=E7=B1=BB=E5=9E=8B=E5=BA=94=E8=AF=A5=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=B8=A6=E5=87=BA=E4=B8=94=E4=B8=8D=E5=8F=AF=E7=BC=96?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itemManage/itempackage/index.vue | 43 +++++++++++-------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue index 4f25372ad..a0c999b69 100644 --- a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue +++ b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue @@ -173,25 +173,31 @@ const basicFormRef = ref() const openForm = (type: string, row?: any) => { if(type == "update"){ Itempackaging.allSchemas.formSchema.forEach((item) => { - if (item.field == 'itemCode') { - item.componentProps.disabled = true - item.componentProps.isSearchList = false - } - if (item.field == 'packUnit') { - item.componentProps.disabled = true - item.componentProps.isSearchList = false - } - }) + if (item.field == 'itemCode') { + item.componentProps.disabled = true + item.componentProps.isSearchList = false + } + if (item.field == 'packUnit') { + item.componentProps.disabled = true + item.componentProps.isSearchList = false + } + if (item.field == 'packType') { + item.componentProps.disabled = false + } + }) }else { Itempackaging.allSchemas.formSchema.forEach((item) => { - if (item.field == 'itemCode') { - item.componentProps.disabled = false - item.componentProps.isSearchList = true - } - if (item.field == 'packUnit') { - item.componentProps.disabled = false - item.componentProps.isSearchList = true - } + if (item.field == 'itemCode') { + item.componentProps.disabled = false + item.componentProps.isSearchList = true + } + if (item.field == 'packUnit') { + item.componentProps.disabled = false + item.componentProps.isSearchList = true + } + if (item.field == 'packType') { + item.componentProps.disabled = true + } }) } basicFormRef.value.open(type, row) @@ -261,6 +267,9 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { if('itemCode'==formField){ setV['uom'] = val[0]['uom'] } + if('packUnit'==formField){ + setV['packType'] = val[0]['type'] + } formRef.setValues(setV) }) } From 71588c0c254a5e8962b65f5cdf3c452b59887183 Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Wed, 10 Jul 2024 10:29:32 +0800 Subject: [PATCH 07/39] =?UTF-8?q?WMS=20=E2=80=94=E2=80=94>=20bug=20=20?= =?UTF-8?q?=E8=87=AA=E5=88=B6=E5=A4=87=E4=BB=B6=E5=8F=91=E8=B4=A7=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E8=AE=B0=E5=BD=95=E3=80=81=E5=AE=A2=E6=88=B7=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E8=AE=B0=E5=BD=95=E3=80=81=E5=AE=A2=E6=88=B7=E9=80=80?= =?UTF-8?q?=E8=B4=A7=E8=AE=B0=E5=BD=95=E7=9A=84=E7=8A=B6=E6=80=81=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=BA=94=E5=8E=BB=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreceiptRecordMain.data.ts | 5 +++-- .../customerreturnRecordMain.data.ts | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts index 2785f8c38..6324d6ec0 100644 --- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts @@ -45,8 +45,9 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive([ field: 'status', dictType: DICT_TYPE.REQUEST_STATUS, dictClass: 'string', - isSearch: true, - isTable: true, + isSearch: false, + isTable: false, + isDetail: false, isForm: false, sort: 'custom', table: { diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts index 76f01ff74..188819bec 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts @@ -20,7 +20,9 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive([ field: 'status', dictType: DICT_TYPE.REQUEST_STATUS, dictClass: 'string', - isTable: true, + isSearch: false, + isTable: false, + isDetail: false, isForm: false, sort: 'custom', table: { From 9a3f20b14c4858b9ae8938b2467858b9b6484d10 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 10 Jul 2024 11:18:39 +0800 Subject: [PATCH 08/39] =?UTF-8?q?=E5=8F=91=E6=96=99=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Form/src/Form.vue | 2 +- .../wms/issueManage/issue/issueRequestMain/index.vue | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue index 55e4e7726..0daccf3aa 100644 --- a/src/components/Form/src/Form.vue +++ b/src/components/Form/src/Form.vue @@ -126,7 +126,7 @@ export default defineComponent({ } const clearSearchInput = (field) => { - emit('clearSearchInput') + emit('clearSearchInput',field) } expose({ setValues, diff --git a/src/views/wms/issueManage/issue/issueRequestMain/index.vue b/src/views/wms/issueManage/issue/issueRequestMain/index.vue index 1bb24f9f6..df1f3f87a 100644 --- a/src/views/wms/issueManage/issue/issueRequestMain/index.vue +++ b/src/views/wms/issueManage/issue/issueRequestMain/index.vue @@ -61,6 +61,7 @@ @submitForm="submitForm" @onEnter="onEnter" @onChange="onChange" + @clearSearchInput="onChange" /> @@ -117,8 +118,15 @@ const onChange = async (field,value) => { setV['productionLineCode'] = '' setV['workStationCode'] = '' formRef.value.formRef.setValues(setV) + }else if(field== 'productionLineCode'){ + //生产线 + const setV = {} + setV['workStationCode'] = '' + formRef.value.formRef.setValues(setV) } } + + const onEnter = async (field,value) => { if (field == 'productionLineCode') { //生产线 From aa24ae02ba67d2181e391dbd822c403cc43c3db8 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 10 Jul 2024 11:53:29 +0800 Subject: [PATCH 09/39] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=BA=93=E5=8C=BA?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/basicDataManage/itemManage/itemarea/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue index 46e9ba97b..1870b44e9 100644 --- a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue +++ b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue @@ -42,7 +42,7 @@ { } // 主子数据 提交 const submitForm = async (formType, data) => { - data.subList = tableData.value // 拼接子表数据参数 + // data.subList = tableData.value // 拼接子表数据参数 try { if (formType === 'create') { await ItemareaApi.createItemarea(data) From d647a17591a1c5dd3cb7372df1e88df633dbbf2b Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 10 Jul 2024 11:58:00 +0800 Subject: [PATCH 10/39] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=BA=93=E5=8C=BA?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/basicDataManage/itemManage/itemarea/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue index 1870b44e9..b4bd4fd9d 100644 --- a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue +++ b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue @@ -42,7 +42,7 @@ { } // 主子数据 提交 const submitForm = async (formType, data) => { - // data.subList = tableData.value // 拼接子表数据参数 + data.subList = tableData.value // 拼接子表数据参数 try { if (formType === 'create') { await ItemareaApi.createItemarea(data) From d93fd7d37db69d63fc88efdfbd9c6438497e1abb Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Wed, 10 Jul 2024 13:35:30 +0800 Subject: [PATCH 11/39] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E3=80=81=E5=BF=85=E5=A1=AB=E9=A1=B9=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scrap/scrapRequestMain/scrapRequestMain.data.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts index fe6c6a315..2c4787b5f 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts @@ -396,6 +396,9 @@ export const ScrapRequestMainRules = reactive({ remark: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], + fromWarehouseCode:[ + {required: true,message: '请选择从仓库代码',trigger: 'change' } + ] }) /** From 3cfbf462ca5ef0e4c2a32014093eb0fa4e09fafc Mon Sep 17 00:00:00 2001 From: bjang03 <259278618@qq.com> Date: Wed, 10 Jul 2024 13:40:28 +0800 Subject: [PATCH 12/39] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=20HL-3513?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../countadjustRecordMain.data.ts | 66 ++++++++++++------- 1 file changed, 41 insertions(+), 25 deletions(-) diff --git a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts index b79fd418e..843aab50e 100644 --- a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts +++ b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts @@ -164,17 +164,17 @@ export const CountadjustRecordMain = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '接口类型', - field: 'interfaceType', - dictType: DICT_TYPE.INTERFACE_TYPE, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, + // { + // label: '接口类型', + // field: 'interfaceType', + // dictType: DICT_TYPE.INTERFACE_TYPE, + // dictClass: 'string', + // isTable: true, + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { label: '备注', field: 'remark', @@ -267,9 +267,9 @@ export const CountadjustRecordMainRules =reactive({ departmentCode: [ { required: true, message: '请输入部门', trigger: 'blur' } ], - interfaceType: [ - { required: true, message: '请选择接口类型', trigger: 'change' } - ], + // interfaceType: [ + // { required: true, message: '请选择接口类型', trigger: 'change' } + // ], number: [ { required: true, message: '请输入单据号', trigger: 'blur' } ], @@ -368,6 +368,22 @@ export const CountadjustRecordDetail = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '库位组代码', + field: 'locationGroupCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '库区代码', + field: 'areaCode', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '计量单位', field: 'uom', @@ -455,17 +471,17 @@ export const CountadjustRecordDetail = useCrudSchemas(reactive([ // width: 150 // }, // }, - { - label: '接口类型', - field: 'interfaceType', - dictType: DICT_TYPE.INTERFACE_TYPE, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, + // { + // label: '接口类型', + // field: 'interfaceType', + // dictType: DICT_TYPE.INTERFACE_TYPE, + // dictClass: 'string', + // isTable: true, + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { label: '备注', field: 'remark', From ac116c49c5496515db3dde29f7f809001f790b88 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 10 Jul 2024 13:40:36 +0800 Subject: [PATCH 13/39] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scrapContainerMainRequest/index.vue | 16 ++++++--- .../scrapContainerMainRequest.data.ts | 1 + .../scrap/scrapRequestMain/index.vue | 35 ++++++++++++++----- .../scrapRequestMain/scrapRequestMain.data.ts | 1 + .../preparetoissueMain/index.vue | 10 ++++-- .../preparetoissueMain.data.ts | 1 + .../productionreturnRequestMainNo/index.vue | 10 ++++-- .../productionreturnRequestMainNo.data.ts | 1 + .../productdismantleRequestMain/index.vue | 8 ++++- .../productdismantleRequestMain.data.ts | 1 + .../productrepairRequestMain/index.vue | 12 +++++-- .../productrepairRequestMain.data.ts | 1 + .../productscrapRequestMain/index.vue | 11 +++--- 13 files changed, 83 insertions(+), 25 deletions(-) diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue index 9f35176d5..1eaca15ea 100644 --- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue @@ -42,6 +42,8 @@ nextTick(() => { if (type == 'tableForm') { if(formField == 'containerNumber') { - row['containerNumber'] = val[0]['itemCode'] - row['uom'] = val[0]['uom'] - row['fromLocationCode'] = val[0]['locationCode'] - row['fromInventoryStatus'] = val[0]['inventoryStatus'] - row['toInventoryStatus'] = 'SCRAP' + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow['containerNumber'] = item['itemCode'] + newRow['uom'] = item['uom'] + newRow['fromLocationCode'] = item['locationCode'] + newRow['fromInventoryStatus'] = item['inventoryStatus'] + newRow['toInventoryStatus'] = 'SCRAP' + tableData.value.push(newRow) + }) }else if(formField == 'toLocationCode'){ row['toLocationCode'] = val[0]['code'] }else { diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts index 804623d5e..5516b76cb 100644 --- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts +++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts @@ -357,6 +357,7 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ field: 'containerNumber', sort: 'custom', tableForm: { + multiple: true, isInpuFocusShow: true, // 开启查询弹窗 searchListPlaceholder: '请选择器具号', searchField: 'itemCode', diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue index 28d98d053..29df5e05e 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue @@ -42,6 +42,8 @@ { tableColumns.value = val @@ -114,16 +117,32 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => nextTick(() => { if (type == 'tableForm') { // 明细查询页赋值 - row[formField] = val[0][searchField] - row['packingNumber'] = val[0]['packingNumber'] - row['batch'] = val[0]['batch'] - row['fromLocationCode'] = val[0]['locationCode'] - row['itemCode'] = val[0]['itemCode'] - row['uom'] = val[0]['uom'] + // val.forEach(item=>{ + // const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + // newRow[formField] = item[searchField] + // newRow['packingNumber'] = item['packingNumber'] + // newRow['batch'] = item['batch'] + // newRow['fromLocationCode'] = item['locationCode'] + // newRow['itemCode'] = item['itemCode'] + // newRow['uom'] = item['uom'] + // tableData.value.push(newRow) + // }) // 查询标准价格 - let param = {'itemCode':val[0]['itemCode'] as string} + let param = {'itemCodes':val.map(item=>item.itemCode).join(',') as string} StdcostpriceApi.queryStdcostpriceByItemCode(param).then(res => { - row['singlePrice'] = res.price + val.forEach(item=>{ + const itemCode = res.find(item1=>item1['itemCode']==item['itemCode']) + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow[formField] = item[searchField] + newRow['packingNumber'] = item['packingNumber'] + newRow['batch'] = item['batch'] + newRow['fromLocationCode'] = item['locationCode'] + newRow['itemCode'] = item['itemCode'] + newRow['uom'] = item['uom'] + newRow['singlePrice'] = itemCode?itemCode['price']:'' + tableData.value.push(newRow) + }) + // row['singlePrice'] = res.price }) } else { const setV = {} diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts index 2c4787b5f..e329127c8 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts @@ -483,6 +483,7 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ width: 150 }, tableForm:{ + multiple:true, isInpuFocusShow: true, // 开启查询弹窗 searchListPlaceholder: '请选择包装号', searchField: 'packingNumber', diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue index b52587d8b..81cccfca0 100644 --- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue +++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue @@ -42,6 +42,8 @@ row['itemCode'] = val[0]['componentItemCode'] row['uom'] = val[0]['componentUom'] } else { - row[formField] = val[0][searchField] - row['toLocationCode'] = val[0]['rawLocationCode'] + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow[formField] = item[searchField] + newRow['toLocationCode'] = item['rawLocationCode'] + tableData.value.push(newRow) + }) } } else { const setV = {} diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts index ddf2e9d2c..d16192121 100644 --- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts +++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts @@ -503,6 +503,7 @@ export const PreparetoissueDetail = useCrudSchemas(reactive([ } }, tableForm: { + multiple: true, isInpuFocusShow: true, searchListPlaceholder: '请选择工位', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue index 81bc49646..3a703320f 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue @@ -42,6 +42,8 @@ }) } } else if(formField == 'workStationCode') { - row['workStationCode'] = val[0]['code'] - row['fromLocationCode'] = val[0]['rawLocationCode'] + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow['workStationCode'] = item['code'] + newRow['fromLocationCode'] = item['rawLocationCode'] + tableData.value.push(newRow) + }) } else if(formField == 'packUnit') { row['packUnit'] = val[0]['packUnit'] row['packQty'] = val[0]['packQty'] diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts index 1901bc019..f4a9739fa 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts @@ -105,6 +105,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive row['bomVersion'] = '' row['childList'] = [] } else { - row[formField] = val[0][searchField] + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow[formField] = item[searchField] + tableData.value.push(newRow) + }) } } else { const setV = {} diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts index c40d77a5f..cdd5e6572 100644 --- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts +++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts @@ -474,6 +474,7 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive } else if(formField == 'productionLineCode'){ row['productionLineCode'] = val[0]['code'] } else if(formField == 'workStationCode'){ - row['fromLocationCode'] = val[0]['rawLocationCode'] - row['workStationCode'] = val[0]['code'] + + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow['fromLocationCode'] = item['rawLocationCode'] + newRow['workStationCode'] =item['code'] + tableData.value.push(newRow) + }) + } else if(formField == 'formField'){ row['workStationCode'] = val[0]['code'] } else if(formField == 'bomVersion'){ diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts index bdcb195cd..2d2ddd79e 100644 --- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts +++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts @@ -553,6 +553,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive }, sortTableDefault:5, tableForm:{ + multiple: true, isInpuFocusShow: true, searchListPlaceholder: '请选择工位代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue index cae64b1f9..b1a0986b9 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue @@ -318,12 +318,13 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => row['bomVersion'] = '' row['childList'] = [] // 查询标准价格 - let param = {'itemCode':val[0]['itemCode'] as string} + let param = {'itemCodes':val[0]['itemCode'] as string} StdcostpriceApi.queryStdcostpriceByItemCode(param).then(res => { - console.log(res) - row['uom'] = res.uom - row['singlePrice'] = res.price - }) + if(res&&res.length>0){ + row['uom'] = res.uom + row['singlePrice'] = res.price + } + }) // 查看BOM版本 console.log(formRef.formModel) const param1 = { From 85ebc8de4934cfbcf4291345c40c7d11f490b570 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 10 Jul 2024 13:44:17 +0800 Subject: [PATCH 14/39] =?UTF-8?q?=E8=B0=83=E6=95=B4WMS=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E4=B8=AD=E6=89=80=E6=9C=89BOM=E7=89=88=E6=9C=AC=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionplan/productionMain/index.vue | 19 ++++++++++++++++++- .../productionMainAssemble/index.vue | 18 +++++++++++++++++- .../productionMainAssembleSparePart/index.vue | 18 +++++++++++++++++- .../productionMainPredictSparePart/index.vue | 18 +++++++++++++++++- .../productreceiptRequestMain/index.vue | 16 ++++++++++++++++ .../index.vue | 16 ++++++++++++++++ .../productreceiptscrapRequestMain/index.vue | 18 ++++++++++++++++-- 7 files changed, 117 insertions(+), 6 deletions(-) diff --git a/src/views/wms/productionManage/productionplan/productionMain/index.vue b/src/views/wms/productionManage/productionplan/productionMain/index.vue index ef854e67a..2f6dfc3bf 100644 --- a/src/views/wms/productionManage/productionplan/productionMain/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMain/index.vue @@ -87,6 +87,7 @@ import * as ProductionMainApi from '@/api/wms/productionMain' import * as ProductionDetailApi from '@/api/wms/productionDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as ItemBasicApi from '@/api/wms/itembasic' +import * as BomApi from "@/api/wms/bom"; // 生产计划主 // 预生产计划 @@ -119,10 +120,26 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => // }) if(formField=='itemCode'){ // row[formField] = val[0][searchField] - val.forEach(item=>{ + val.forEach(async item=>{ if(tableData.value.find(item1=>item1['id'] == item['id'])) return const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) newRow['id'] = item['id'] + // 查看BOM版本 + console.log(22,item) + const param1 = { + productItemCode: item['itemCode'], + available: 'TRUE', + pageSize: 20, + pageNo: 1, + sort: '', + by: 'ASC', + } + await BomApi.getBomPage(param1).then(res => { + console.log(res) + if(res?.list?.length>0){ + newRow['bomVersion'] = res.list[0].version + } + }) tableData.value.push(newRow) }) } else { diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue index 0afec4008..4d196be98 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue @@ -87,6 +87,7 @@ import * as ProductionMainApi from '@/api/wms/productionMain' import * as ProductionDetailApi from '@/api/wms/productionDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as ItemBasicApi from '@/api/wms/itembasic' +import * as BomApi from "@/api/wms/bom"; // 装配计划 defineOptions({ name: 'ProductionMainAssemble' }) @@ -116,10 +117,25 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => // }).catch(err =>{ // console.log(err); // }) - val.forEach(item=>{ + val.forEach(async item=>{ const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) newRow[formField] = item[searchField] newRow['uom'] = item['uom'] + // 查看BOM版本 + const param1 = { + productItemCode: item['itemCode'], + available: 'TRUE', + pageSize: 20, + pageNo: 1, + sort: '', + by: 'ASC', + } + await BomApi.getBomPage(param1).then(res => { + console.log(res) + if(res?.list?.length>0){ + newRow['bomVersion'] = res.list[0].version + } + }) tableData.value.push(newRow) }) } else { diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue index 41164cefb..0592934c1 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue @@ -87,6 +87,7 @@ import * as ProductionMainApi from '@/api/wms/productionMain' import * as ProductionDetailApi from '@/api/wms/productionDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as ItemBasicApi from '@/api/wms/itembasic' +import * as BomApi from "@/api/wms/bom"; // 装配备件计划 defineOptions({ name: 'ProductionMainASparePart' }) @@ -116,10 +117,25 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => // }).catch(err =>{ // console.log(err); // }) - val.forEach(item=>{ + val.forEach(async item=>{ const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) newRow[formField] = item[searchField] newRow['uom'] = item['uom'] + // 查看BOM版本 + const param1 = { + productItemCode: item['itemCode'], + available: 'TRUE', + pageSize: 20, + pageNo: 1, + sort: '', + by: 'ASC', + } + await BomApi.getBomPage(param1).then(res => { + console.log(res) + if(res?.list?.length>0){ + newRow['bomVersion'] = res.list[0].version + } + }) tableData.value.push(newRow) }) } else { diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue index 6aa22fecd..a4d22853c 100644 --- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue @@ -87,6 +87,7 @@ import * as ProductionMainApi from '@/api/wms/productionMain' import * as ProductionDetailApi from '@/api/wms/productionDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as ItemBasicApi from '@/api/wms/itembasic' +import * as BomApi from "@/api/wms/bom"; // 预生产备件计划 defineOptions({ name: 'ProductionMainPredictSparePart' }) @@ -116,10 +117,25 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => // }).catch(err =>{ // console.log(err); // }) - val.forEach(item=>{ + val.forEach(async item=>{ const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) newRow[formField] = item[searchField] newRow['uom'] = item['uom'] + // 查看BOM版本 + const param1 = { + productItemCode: item['itemCode'], + available: 'TRUE', + pageSize: 20, + pageNo: 1, + sort: '', + by: 'ASC', + } + await BomApi.getBomPage(param1).then(res => { + console.log(res) + if(res?.list?.length>0){ + newRow['bomVersion'] = res.list[0].version + } + }) tableData.value.push(newRow) }) } else { diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue index 8263f8d62..c3a97d551 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue @@ -149,6 +149,7 @@ import { formatTime } from '@/utils/index' import { getAccessToken } from '@/utils/auth' import dayjs from 'dayjs' import { getJmreportBaseUrl } from '@/utils/systemParam' +import * as BomApi from "@/api/wms/bom"; // 制品收货申请 // 预生产收货申请 defineOptions({ name: 'ProductreceiptRequestMain' }) @@ -212,6 +213,21 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => row['uom'] = val[0]['uom'] row['produceDate'] = dayjs().valueOf() row[formField] = val[0][searchField] + // 查看BOM版本 + const param1 = { + productItemCode: val[0]['itemCode'], + available: 'TRUE', + pageSize: 20, + pageNo: 1, + sort: '', + by: 'ASC', + } + BomApi.getBomPage(param1).then(res => { + console.log(res) + if(res?.list?.length>0){ + row['bomVersion'] = res.list[0].version + } + }) }else if (formField == 'workStationCode') { // 明细查询页赋值 val.forEach(item=>{ diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue index 6296dda1e..a066d3239 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue @@ -149,6 +149,7 @@ import * as PackageApi from '@/api/wms/package' import { formatTime } from '@/utils/index' import { getAccessToken } from '@/utils/auth' import { getJmreportBaseUrl } from '@/utils/systemParam' +import * as BomApi from "@/api/wms/bom"; // 装配收货申请 defineOptions({ name: 'ProductreceiptRequestMainA' }) @@ -213,6 +214,21 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => row['uom'] = val[0]['uom'] row['produceDate'] = dayjs().valueOf() row[formField] = val[0][searchField] + // 查看BOM版本 + const param1 = { + productItemCode: val[0]['itemCode'], + available: 'TRUE', + pageSize: 20, + pageNo: 1, + sort: '', + by: 'ASC', + } + BomApi.getBomPage(param1).then(res => { + console.log(res) + if(res?.list?.length>0){ + row['bomVersion'] = res.list[0].version + } + }) }else if (formField == 'workStationCode') { // 明细查询页赋值 val.forEach(item=>{ diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue index d2be36d10..e9a80a163 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue @@ -136,6 +136,7 @@ import * as ItembasicApi from '@/api/wms/itembasic' import * as PackageApi from '@/api/wms/package' import { formatTime } from '@/utils/index' import { getAccessToken } from '@/utils/auth' +import * as BomApi from "@/api/wms/bom"; import { SupplierdeliverRequestPackage } from '../../../purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts' @@ -204,8 +205,21 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro row['uom'] = res[0]['uom'] } row[formField] = val[0][searchField] - - console.log('获取计量单位',res) + // 查看BOM版本 + const param1 = { + productItemCode: val[0]['itemCode'], + available: 'TRUE', + pageSize: 20, + pageNo: 1, + sort: '', + by: 'ASC', + } + BomApi.getBomPage(param1).then(res => { + console.log(res) + if(res?.list?.length>0){ + row['bomVersion'] = res.list[0].version + } + }) }else{ //添加明细 val.forEach(item=>{ From cedf5e20bb1158f5e3cc8ed7da8f26a6aa463e33 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 10 Jul 2024 13:45:05 +0800 Subject: [PATCH 15/39] =?UTF-8?q?=E8=B0=83=E6=95=B4WMS=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E4=B8=AD=E6=89=80=E6=9C=89BOM=E7=89=88=E6=9C=AC=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productscrapRequestMain/index.vue | 44 +++++++------------ 1 file changed, 16 insertions(+), 28 deletions(-) diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue index b1a0986b9..af5f92bc1 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue @@ -42,8 +42,6 @@ if(formField == 'productionLineCode'){ row['productionLineCode'] = val[0]['code'] }else if(formField == 'workStationCode'){ - val.forEach(item=>{ - const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) - newRow['workStationCode'] = item['code'] - newRow['fromLocationCode'] = item['rawLocationCode'] - tableData.value.push(newRow) - }) - + row['workStationCode'] = val[0]['code'] + row['fromLocationCode'] = val[0]['rawLocationCode'] }else if(formField == 'processCode'){ row['processCode'] = val[0]['code'] }else if(formField == 'itemCode'){ @@ -318,30 +310,26 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => row['bomVersion'] = '' row['childList'] = [] // 查询标准价格 - let param = {'itemCodes':val[0]['itemCode'] as string} + let param = {'itemCode':val[0]['itemCode'] as string} StdcostpriceApi.queryStdcostpriceByItemCode(param).then(res => { - if(res&&res.length>0){ - row['uom'] = res.uom - row['singlePrice'] = res.price - } - }) + console.log(res) + row['uom'] = res.uom + row['singlePrice'] = res.price + }) // 查看BOM版本 - console.log(formRef.formModel) - const param1 = { - productItemCode: val[0]['itemCode'], - available: 'TRUE', - pageSize: 20, - pageNo: 1, - sort: '', - by: 'ASC', - } + const param1 = { + productItemCode: val[0]['itemCode'], + available: 'TRUE', + pageSize: 20, + pageNo: 1, + sort: '', + by: 'ASC', + } BomApi.getBomPage(param1).then(res => { console.log(res) if(res?.list?.length>0){ row['bomVersion'] = res.list[0].version } - - // row['singlePrice'] = res.price }) }else if(formField == 'bomVersion'){ row['bomVersion'] = val[0]['version'] From 32e9f3b16859e66bdb874dcc2c6785163b240aa3 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 10 Jul 2024 14:10:31 +0800 Subject: [PATCH 16/39] =?UTF-8?q?=E7=8E=8B=E9=B2=81=E9=B9=8F=E5=B8=8C?= =?UTF-8?q?=E6=9C=9B=EF=BC=9A=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E6=97=B6=E9=81=87=E5=88=B0=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturnRequestMain/index.vue | 21 +++++++++++++++++-- .../purchasereturnRequestMain.data.ts | 1 + 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index d09d0bc40..de668c94d 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -232,8 +232,9 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro nextTick(async () => { if (type == 'tableForm') { // 明细查询页赋值 - row[formField] = val[0][searchField] + if (formField == 'purchaseReceiptRecordNumber') { + row[formField] = val[0][searchField] //搜索记录单号--回显数据 row['supplierCode'] = val[0]['supplierCode'] row['poNumber'] = val[0]['poNumber'] @@ -271,6 +272,7 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro row['amount'] = val[0]['amount'] row['projectCode'] = val[0]['projectCode'] } else if (formField == 'itemCode') { + row[formField] = val[0][searchField] row['batch'] = val[0]['toBatch'] row['containerNumber'] = val[0]['toContainerNumber'] row['containerNumber'] = val[0]['containerNumber'] @@ -278,6 +280,7 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro // row['fromLocationCode'] = val[0]['fromLocationCode'] row['toLocationCode'] = val[0]['toLocationCode'] } else if (formField == 'fromLocationCode') { + row[formField] = val[0][searchField] // let params = { // itemCode: row.itemCode, // batch: row.batch, @@ -287,7 +290,21 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro // console.log('23423423',aa); // row['inventoryBalance'] = aa//库存余额 } else if (formField == 'packingNumber') { - row['inventoryBalance'] = val[0]['qty'] //库存余额 + // row[formField] = val[0][searchField] + val.forEach((item,index)=>{ + if(index==0){ + row[formField] = item[searchField] + row['inventoryBalance'] = item['qty'] //库存余额 + }else{ + let newRow = {...row} + newRow[formField] = item[searchField] + row['inventoryBalance'] = item['qty'] //库存余额 + tableData.value.push(newRow) + } + }) + // row['inventoryBalance'] = val[0]['qty'] //库存余额 + }else{ + row[formField] = val[0][searchField] } } else { const setV = {} diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts index 1358415e2..f4a706b9c 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -982,6 +982,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive } }, tableForm:{ + multiple: true, // labelMessage: '信息提示说明！！！', isInpuFocusShow: true, // 开启查询弹窗 searchListPlaceholder: '请选择物料代码、批次、从库位代码', From 1c40e893c4a20af7a073bc6fe35784f1d9e845b9 Mon Sep 17 00:00:00 2001 From: bjang03 <259278618@qq.com> Date: Wed, 10 Jul 2024 14:29:27 +0800 Subject: [PATCH 17/39] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=20=E7=9B=98?= =?UTF-8?q?=E7=82=B9=E5=AD=90=E8=A1=A8=E5=A2=9E=E5=8A=A0=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E3=80=81=E5=BA=93=E5=8C=BA=E3=80=81=E5=BA=93=E4=BD=8D=E7=BB=84?= =?UTF-8?q?=E3=80=81=E5=BA=93=E4=BD=8D=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../count/countJobMain/countJobMain.data.ts | 48 ++++++++++++------- .../countRequestMain/countRequestMain.data.ts | 24 ++++++++++ .../countadjustRecordMain.data.ts | 16 +++++-- .../countadjustRequestMain.data.ts | 24 ++++++++++ 4 files changed, 92 insertions(+), 20 deletions(-) diff --git a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts index 4774927d0..079cff73d 100644 --- a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts +++ b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts @@ -83,22 +83,38 @@ export const CountJobMain = useCrudSchemas(reactive([ width: 150 }, }, - // { - // label: '仓库代码', - // field: 'warehouseCode', - // sort: 'custom', - // table: { - // width: 150 - // }, - // }, - // { - // label: '库位代码', - // field: 'locationCode', - // sort: 'custom', - // table: { - // width: 150 - // }, - // }, + { + label: '仓库代码', + field: 'warehouseCode', + sort: 'custom', + table: { + width: 150 + }, + }, + + { + label: '库区代码', + field: 'areaCode', + sort: 'custom', + table: { + width: 150 + }, + },{ + label: '库位组代码', + field: 'locationGroupCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '库位代码', + field: 'locationCode', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '申请时间', field: 'requestTime', diff --git a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts index ccb01037a..e525d6a90 100644 --- a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts +++ b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts @@ -482,6 +482,30 @@ export const CountRequestDetail = useCrudSchemas(reactive([ type: 'Select' } }, + { + label: '仓库代码', + field: 'warehouseCode', + sort: 'custom', + table: { + width: 150 + }, + }, + + { + label: '库区代码', + field: 'areaCode', + sort: 'custom', + table: { + width: 150 + }, + },{ + label: '库位组代码', + field: 'locationGroupCode', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '库位代码', field: 'locationCode', diff --git a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts index 843aab50e..baa353828 100644 --- a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts +++ b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts @@ -361,14 +361,22 @@ export const CountadjustRecordDetail = useCrudSchemas(reactive([ }, }, { - label: '库位代码', - field: 'locationCode', + label: '仓库代码', + field: 'warehouseCode', sort: 'custom', table: { width: 150 }, }, + { + label: '库区代码', + field: 'areaCode', + sort: 'custom', + table: { + width: 150 + }, + },{ label: '库位组代码', field: 'locationGroupCode', sort: 'custom', @@ -377,8 +385,8 @@ export const CountadjustRecordDetail = useCrudSchemas(reactive([ }, }, { - label: '库区代码', - field: 'areaCode', + label: '库位代码', + field: 'locationCode', sort: 'custom', table: { width: 150 diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts index a88081343..553b94740 100644 --- a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts +++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts @@ -518,6 +518,30 @@ export const CountadjustRequestDetail = useCrudSchemas(reactive([ precision: 6 } }, + { + label: '仓库代码', + field: 'warehouseCode', + sort: 'custom', + table: { + width: 150 + }, + }, + + { + label: '库区代码', + field: 'areaCode', + sort: 'custom', + table: { + width: 150 + }, + },{ + label: '库位组代码', + field: 'locationGroupCode', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '库位代码', field: 'locationCode', From 7700718b170683a240485bca0029036ca8b96ca6 Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Wed, 10 Jul 2024 14:37:11 +0800 Subject: [PATCH 18/39] =?UTF-8?q?WMS=20=E2=80=94=E2=80=94>=20bug=20=20?= =?UTF-8?q?=E8=87=AA=E5=88=B6=E5=A4=87=E4=BB=B6=E5=8F=91=E8=B4=A7=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=EF=BC=8C=E5=8F=91=E8=B4=A7=E6=9C=88=E5=8F=B0=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=B8=A6=E5=87=BA=EF=BC=9B=E8=87=AA=E5=88=B6=E5=A4=87?= =?UTF-8?q?=E4=BB=B6=E5=8F=91=E8=B4=A7=E8=AE=B0=E5=BD=95=EF=BC=8C=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E8=AE=B0=E5=BD=95=E5=8D=95=E5=8F=B7=E3=80=81=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=BA=94=E5=8E=BB=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliverJobMain/deliverJobMain.data.ts | 23 +++++++++++-------- .../stockupMainRecord.data.ts | 4 +++- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts index 6cf16428b..3ca07c19c 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts @@ -44,10 +44,23 @@ export const DeliverJobMain = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '客户月台代码', + field: 'customerDockCode', + sort: 'custom', + table: { + width: 150 + }, + isTable: true, + }, { label: '发货月台', field: 'deliverDock', sort: 'custom', + isSearch: false, + isTable: false, + isDetail: false, + isForm: false, table: { width: 150 }, @@ -81,16 +94,6 @@ export const DeliverJobMain = useCrudSchemas(reactive([ isTable: false, }, - { - label: '客户月台代码', - field: 'customerDockCode', - sort: 'custom', - table: { - width: 150 - }, - isTable: false, - }, - { label: '承运商', field: 'carrierCode', diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts index a671a1bf7..487bc3b3a 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts @@ -314,6 +314,7 @@ export const StockupMainRecord = useCrudSchemas(reactive([ label: '操作', field: 'action', isForm: false, + isTable: false, table: { width: 150, fixed: 'right' @@ -557,7 +558,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ field: 'interfaceType', dictType: DICT_TYPE.INTERFACE_TYPE, dictClass: 'string', - isTable: true, + isTable: false, hiddenInMain: true, sort: 'custom', table: { @@ -618,6 +619,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ label: '操作', field: 'action', isForm: false, + isTable: false, hiddenInMain: true, table: { width: 150, From a27bb9ad3c394757d77681c38eceda6bc869ad35 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 10 Jul 2024 14:38:42 +0800 Subject: [PATCH 19/39] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/RouterSearch/index.vue | 5 ++++- src/layout/components/ToolHeader.vue | 8 +++++++- src/layout/components/UserInfo/src/UserInfo.vue | 12 +++++++++++- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/components/RouterSearch/index.vue b/src/components/RouterSearch/index.vue index f8b79ab99..532af4f27 100644 --- a/src/components/RouterSearch/index.vue +++ b/src/components/RouterSearch/index.vue @@ -170,7 +170,10 @@ defineExpose({ .w-220px { width: 220px !important; } -.custom-hover1{ +.custom-hover1:hover{ + opacity: 0.5; background-color: transparent; + scale: 1.1; + transition: all 50ms; } \ No newline at end of file diff --git a/src/layout/components/ToolHeader.vue b/src/layout/components/ToolHeader.vue index ca7328fb9..fc153d386 100644 --- a/src/layout/components/ToolHeader.vue +++ b/src/layout/components/ToolHeader.vue @@ -77,7 +77,7 @@ export default defineComponent({ > ) : undefined} */} {message.value ? ( - + ) : undefined} @@ -93,4 +93,10 @@ $prefix-cls: #{$namespace}-tool-header; .#{$prefix-cls} { transition: left var(--transition-time-02); } +.custom-hover1:hover{ + opacity: 0.5; + background-color: transparent; + scale: 1.2; + transition: all 50ms; +} diff --git a/src/layout/components/UserInfo/src/UserInfo.vue b/src/layout/components/UserInfo/src/UserInfo.vue index 3521bd443..9e7f89c23 100644 --- a/src/layout/components/UserInfo/src/UserInfo.vue +++ b/src/layout/components/UserInfo/src/UserInfo.vue @@ -51,7 +51,7 @@ const toDocument = () => { + + From 3e8bb02d025b1f78ea3e59b9f5c96586b1d7e09e Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 10 Jul 2024 14:41:28 +0800 Subject: [PATCH 20/39] =?UTF-8?q?=E7=9B=98=E7=82=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../count/countPlanMain/countPlanMain.data.ts | 1 + .../countManage/count/countPlanMain/index.vue | 114 ++++++++++++------ 2 files changed, 76 insertions(+), 39 deletions(-) diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts index 4247edc61..efda01683 100644 --- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts +++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts @@ -55,6 +55,7 @@ export const CountPlanMain = useCrudSchemas(reactive([ table: { width: 150 }, + isDetail:false, isTable:false, form:{ componentProps:{ diff --git a/src/views/wms/countManage/count/countPlanMain/index.vue b/src/views/wms/countManage/count/countPlanMain/index.vue index 4395f9e9d..eaf2b9d63 100644 --- a/src/views/wms/countManage/count/countPlanMain/index.vue +++ b/src/views/wms/countManage/count/countPlanMain/index.vue @@ -111,38 +111,36 @@ import { CountPlanDetail, CountPlanDetailRules, CountPlanMain, - CountPlanMainRules, + CountPlanMainRules } from './countPlanMain.data' import * as CountPlanMainApi from '@/api/wms/countPlanMain' import * as CountPlanDetailApi from '@/api/wms/countPlanDetail' -import {Owner} from '@/views/wms/basicDataManage/orderManage/owner/owner.data' +import { Owner } from '@/views/wms/basicDataManage/orderManage/owner/owner.data' import * as OwnerApi from '@/api/wms/owner' -import {Supplier} from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data' +import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data' import * as SupplierApi from '@/api/wms/supplier' -import {Customer} from '@/views/wms/basicDataManage/customerManage/customer/customer.data' +import { Customer } from '@/views/wms/basicDataManage/customerManage/customer/customer.data' import * as CustomerApi from '@/api/wms/customer' -import {Itembasic} from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data' +import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data' import * as ItembasicApi from '@/api/wms/itembasic' -import {Warehouse} from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data' +import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data' import * as WarehouseApi from '@/api/wms/warehouse' -import {Area} from '@/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data' +import { Area } from '@/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data' import * as AreaApi from '@/api/wms/areabasic' -import { - Locationgroup -} from '@/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data' +import { Locationgroup } from '@/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data' import * as LocationgroupApi from '@/api/wms/locationgroup' -import {Location} from '@/views/wms/basicDataManage/factoryModeling/location/location.data' +import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data' import * as LocationApi from '@/api/wms/location' import * as defaultButtons from '@/utils/disposition/defaultButtons' -import {DICT_TYPE, getStrDictOptions} from '@/utils/dict' +import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' import BasicFormWmsCount from '@/components/BasicForm/src/BasicFormWmsCount.vue' // 盘点计划主 @@ -412,11 +410,28 @@ const openForm = async (type: string, row?: any) => { ] // 重置明细数据 row = row ? row : {} // row.dimension = 'BY_INEVNEOTY' - CountPlanMain.allSchemas.formSchema.forEach((item) => { - if (item.field == 'crontab') { - item.componentProps.disabled = true + // CountPlanMain.allSchemas.formSchema.forEach((item) => { + // if (item.field == 'crontab') { + // item.componentProps.disabled = true + // } + // }) + if (row.type == 'CYCLE') { + CountPlanMain.allSchemas.formSchema.forEach((item) => { + if (item.field == 'crontab') { + item.componentProps.disabled = false + item.label = '执行周期' + } + }) + CountPlanMainRules.crontab[0].required = true + } else { + CountPlanMainRules.crontab[0].required = false + CountPlanMain.allSchemas.formSchema.forEach((item) => { + if (item.field == 'crontab') { + item.componentProps.disabled = true + item.label = '' + } + }) } - }) formRef.value.open(type, row) // Promise.all([getOwnerAllList(), @@ -572,7 +587,7 @@ const detailOpenForm = (type, row) => { }) break } - } else if ( row.type == 'PROJECT') { + } else if (row.type == 'PROJECT') { formTypeDetail.value = 'InputString' } } @@ -635,7 +650,7 @@ const handleAddTable = () => { // 删除明细 const handleDeleteTable = (item, index) => { let itemIndex = tableData.value.indexOf(item) - if(itemIndex>-1){ + if (itemIndex > -1) { tableData.value.splice(itemIndex, 1) } } @@ -644,6 +659,15 @@ const tableSelectionDelete = (selection) => { } // 主子数据 提交 const submitForm = async (formType, data) => { + var isHave = CountPlanMain.allSchemas.formSchema.some(function (item) { + return item.field === 'beginTime' || item.field === 'endTime' + }) + if (isHave) { + if (data.beginTime && data.endTime && data.beginTime >= data.endTime) { + message.error('开始时间大于结束时间') + return + } + } data.subList = tableData.value.map((item) => { return { type: item.type, @@ -721,22 +745,34 @@ const selectChange = (field, val) => { } }) } -  formRef.value.formRef.setValues({ -       crontab:'' -    }) - if (val == 'DYNAMIC') { - CountPlanMain.allSchemas.formSchema[3].label = '限值（%）' - CountPlanMain.allSchemas.formSchema[3].componentProps.min = 0 - CountPlanMain.allSchemas.formSchema[3].componentProps.max = 100 - CountPlanMain.allSchemas.formSchema[3].componentProps.disabled = false - } else if (val == 'LOW' || val == 'RANDOM') { - CountPlanMain.allSchemas.formSchema[3].label = '限值' - CountPlanMain.allSchemas.formSchema[3].componentProps.min = 0 - CountPlanMain.allSchemas.formSchema[3].componentProps.max = Infinity - CountPlanMain.allSchemas.formSchema[3].componentProps.disabled = false - } else { - CountPlanMain.allSchemas.formSchema[3].componentProps.disabled = true - } + formRef.value.formRef.setValues({ + crontab: '' + }) + // if (val == 'DYNAMIC') { + // CountPlanMain.allSchemas.formSchema.forEach(item=>{ + // if(item.field == 'limitedValue'){ + // item.label = '限值（%）' + // item.componentProps.min = 0 + // item.componentProps.max = 100 + // item.componentProps.disabled = false + // } + // }) + // } else if (val == 'LOW' || val == 'RANDOM') { + // CountPlanMain.allSchemas.formSchema.forEach(item=>{ + // if(item.field == 'limitedValue'){ + // item.label = '限值（%）' + // item.componentProps.min = 0 + // item.componentProps.max =Infinity + // item.componentProps.disabled = false + // } + // }) + // } else { + // CountPlanMain.allSchemas.formSchema.forEach(item=>{ + // if(item.field == 'limitedValue'){ + // item.componentProps.disabled = true + // } + // }) + // } } } const formTypeDetail = ref('InputString') //盘点详情子表新增的时候判断盘点范围值显示输入框还是下拉框 @@ -823,7 +859,7 @@ const selectChangeDetail = (field, val) => { case 'ITEMS_CODE': CountPlanDetail.allSchemas.formSchema.forEach((item) => { if (item.field == 'value') { - item.componentProps.isInpuFocusShow = true + item.componentProps.isSearchList = true item.componentProps.searchTitle = '物品信息' item.componentProps.searchAllSchemas = Itembasic.allSchemas item.componentProps.searchPage = ItembasicApi.getItembasicPage @@ -833,7 +869,7 @@ const selectChangeDetail = (field, val) => { case 'WAREHOUSE_CODE': CountPlanDetail.allSchemas.formSchema.forEach((item) => { if (item.field == 'value') { - item.componentProps.isInpuFocusShow = true + item.componentProps.isSearchList = true item.componentProps.searchTitle = '仓库信息' item.componentProps.searchAllSchemas = Warehouse.allSchemas item.componentProps.searchPage = WarehouseApi.getWarehousePage @@ -843,7 +879,7 @@ const selectChangeDetail = (field, val) => { case 'AREABASIC_CODE': CountPlanDetail.allSchemas.formSchema.forEach((item) => { if (item.field == 'value') { - item.componentProps.isInpuFocusShow = true + item.componentProps.isSearchList = true item.componentProps.searchTitle = '库区信息' item.componentProps.searchAllSchemas = Area.allSchemas item.componentProps.searchPage = AreaApi.getAreaPage @@ -853,7 +889,7 @@ const selectChangeDetail = (field, val) => { case 'LOCATIONGROUP_CODE': CountPlanDetail.allSchemas.formSchema.forEach((item) => { if (item.field == 'value') { - item.componentProps.isInpuFocusShow = true + item.componentProps.isSearchList = true item.componentProps.searchTitle = '库位组信息' item.componentProps.searchAllSchemas = Locationgroup.allSchemas item.componentProps.searchPage = LocationgroupApi.getLocationgroupPage @@ -863,7 +899,7 @@ const selectChangeDetail = (field, val) => { case 'LOCATION_CODE': CountPlanDetail.allSchemas.formSchema.forEach((item) => { if (item.field == 'value') { - item.componentProps.isInpuFocusShow = true + item.componentProps.isSearchList = true item.componentProps.searchTitle = '库位组信息' item.componentProps.searchAllSchemas = Location.allSchemas item.componentProps.searchPage = LocationApi.getLocationPage From 952a394faddbc0e6741d055805bb84a633420e98 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 10 Jul 2024 14:43:42 +0800 Subject: [PATCH 21/39] ui --- src/components/RouterSearch/index.vue | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/components/RouterSearch/index.vue b/src/components/RouterSearch/index.vue index 532af4f27..a29d5c972 100644 --- a/src/components/RouterSearch/index.vue +++ b/src/components/RouterSearch/index.vue @@ -17,7 +17,7 @@ /> --> -
+
\ No newline at end of file From 616abc00ae6b3f4f7e677e95a4f19eb69a0139bb Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 10 Jul 2024 14:52:39 +0800 Subject: [PATCH 22/39] uom --- .../productrepairRequestMain/productrepairRequestMain.data.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts index 2d2ddd79e..37114f603 100644 --- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts +++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts @@ -918,6 +918,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive }, sortTableDefault:17, tableForm: { + disabled: true, type: 'Select' } }, From 82f0c124b5c32d1f8b01cb59f0ac33150c808a4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Wed, 10 Jul 2024 14:58:47 +0800 Subject: [PATCH 23/39] =?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 --- src/utils/formatTime.ts | 20 +- .../orderManage/shift/shift.data.ts | 478 +++++++++--------- 2 files changed, 251 insertions(+), 247 deletions(-) diff --git a/src/utils/formatTime.ts b/src/utils/formatTime.ts index 64bb9c8b3..db7948081 100644 --- a/src/utils/formatTime.ts +++ b/src/utils/formatTime.ts @@ -26,11 +26,10 @@ export function formatDate(date: Date | number, format?: string): string { /** * 获取当前的日期+时间 */ -export function addDay(date: Date | number,addDay:number) { - return dayjs(date).add(addDay,'day') +export function addDay(date: Date | number, addDay: number) { + return dayjs(date).add(addDay, 'day') } - /** * 获取当前的日期+时间 */ @@ -163,6 +162,21 @@ export const dateFormatter = (row, column, cellValue) => { } return formatDate(cellValue) } +/** + * element plus 的时间 Formatter 实现，使用 YYYY-MM-DD HH:mm:ss 格式 + * + * @param row 行数据 + * @param column 字段 + * @param cellValue 字段值 + */ +// @ts-ignore +export const dateFormatter3 = (row, column, cellValue) => { + if (!cellValue) { + return + } + let str = formatDate(cellValue).split(' ')[1] + return str +} // 获取时间戳 export const formatGetTime = (row, column, cellValue) => { console.log(cellValue.getTime()) diff --git a/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts b/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts index df23c425a..045efa49a 100644 --- a/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts +++ b/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts @@ -1,283 +1,273 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter, dateFormatter3 } from '@/utils/formatTime' const { t } = useI18n() // 国际化 -import {validateYS} from '@/utils/validator' +import { validateYS } from '@/utils/validator' /** * @returns {Array} 班次 */ -export const Shift = useCrudSchemas(reactive([ - { - label: '代码', - field: 'code', - sort: 'custom', - table: { - width: 150, - fixed: 'left' +export const Shift = useCrudSchemas( + reactive([ + { + label: '代码', + field: 'code', + sort: 'custom', + table: { + width: 150, + fixed: 'left' + }, + isSearch: true }, - isSearch: true, - }, - { - label: '名称', - field: 'name', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '开始时间', - field: 'beginTime', - isTable: true, - formatter: dateFormatter, - detail: { - dateFormat: 'HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180, - }, - form: { - component: 'TimePicker', - componentProps: { - style: {width:'100%'}, - type: 'time', - dateFormat: 'HH:mm:ss', - valueFormat: 'x', + { + label: '名称', + field: 'name', + sort: 'custom', + table: { + width: 150 } }, - isSearch: false, - search: { - show: false, - component: 'TimePicker', - componentProps: { - valueFormat: 'HH:mm:ss', - type: 'timeSelect', + { + label: '开始时间', + field: 'beginTime', + isTable: true, + formatter: dateFormatter3, + detail: { + dateFormat: 'HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'TimePicker', + componentProps: { + style: { width: '100%' }, + type: 'time', + dateFormat: 'HH:mm:ss', + valueFormat: 'x' + } + }, + isSearch: false, + search: { + show: false, + component: 'TimePicker', + componentProps: { + valueFormat: 'HH:mm:ss', + type: 'timeSelect' + } } - } - }, - { - label: '结束时间', - field: 'entTime', - isTable: true, - formatter: dateFormatter, - detail: { - dateFormat: 'HH:mm:ss', - }, - sort: 'custom', - table: { - width: 180 }, - form: { - component: 'TimePicker', - componentProps: { - style: {width:'100%'}, - type: 'time', - dateFormat: 'HH:mm:ss', - valueFormat: 'x', + { + label: '结束时间', + field: 'entTime', + isTable: true, + formatter: dateFormatter3, + detail: { + dateFormat: 'HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'TimePicker', + componentProps: { + style: { width: '100%' }, + type: 'time', + dateFormat: 'HH:mm:ss', + valueFormat: 'x' + } + }, + isSearch: false, + search: { + show: false, + component: 'TimePicker', + componentProps: { + valueFormat: 'HH:mm:ss', + type: 'timeSelect' + } } }, - isSearch: false, - search: { - show: false, - component: 'TimePicker', - componentProps: { - valueFormat: 'HH:mm:ss', - type: 'timeSelect', + { + label: '是否跨天', + field: 'endAtNextDay', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } } - } - }, - { - label: '是否跨天', - field: 'endAtNextDay', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 }, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' + { + label: '是否可用', + field: 'available', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: true, + isSearch: true, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } } }, - }, - { - label: '是否可用', - field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: true, - isSearch: true, - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' + { + label: '生效时间', + field: 'activeTime', + isTable: true, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } } }, - }, - { - label: '生效时间', - field: 'activeTime', - isTable: true, - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', + { + label: '失效时间', + field: 'expireTime', + isTable: true, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } } }, - }, - { - label: '失效时间', - field: 'expireTime', - isTable: true, - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', + { + label: '备注', + field: 'remark', + sort: 'custom', + table: { + width: 150 } }, - }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '创建时间', - field: 'createTime', - isForm: false, - table: { - width: 180 + { + label: '创建时间', + field: 'createTime', + isForm: false, + table: { + width: 180 + }, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + } }, - formatter: dateFormatter, - detail: { - dateFormat : 'YYYY-MM-DD HH:mm:ss' + { + label: '创建者', + field: 'creator', + table: { + width: 130 + }, + isForm: false, + isTable: true }, - form: { - component: 'DatePicker', - componentProps: { - style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', + { + label: '最后更新时间', + field: 'updateTime', + sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } } - } - }, - { - label: '创建者', - field: 'creator', - table: { - width: 130 - }, - isForm: false, - isTable: true - }, - { - label: '最后更新时间', - field: 'updateTime', - sort: 'custom', - isDetail: true, - isForm: false, - isTable: false, - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' }, - table: { - width: 180 + { + label: '最后更新者', + field: 'updater', + isDetail: true, + isForm: false, + isTable: false, + table: { + width: 150 + } }, - form: { - component: 'DatePicker', - componentProps: { - style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 150, + fixed: 'right' } } - }, - { - label: '最后更新者', - field: 'updater', - isDetail: true, - isForm: false, - isTable: false, - table: { - width: 150 - } - }, - { - label: '操作', - field: 'action', - isDetail: false, - isForm: false , - table: { - width: 150, - fixed: 'right' - } - } -])) + ]) +) //表单校验 export const ShiftRules = reactive({ code: [ { required: true, message: '请输入代码', trigger: 'blur' }, { max: 50, message: '不得超过50个字符', trigger: 'blur' }, - { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'} - ], - name: [ - { max: 50, message: '不得超过50个字符', trigger: 'blur' } - ], - remark: [ - { max: 50, message: '不得超过50个字符', trigger: 'blur' } - ], - beginTime: [ - { required: true, message: '请输入开始时间', trigger: 'blur' } - ], - entTime: [ - { required: true, message: '请输入结束时间', trigger: 'blur' } - ], - endAtNextDay: [ - { required: true, message: '请选择是否跨天', trigger: 'change' } - ], - available: [ - { required: true, message: '请选择是否可用', trigger: 'change' } + { validator: validateYS, message: '请输入正确的代码', trigger: 'blur' } ], + name: [{ max: 50, message: '不得超过50个字符', trigger: 'blur' }], + remark: [{ max: 50, message: '不得超过50个字符', trigger: 'blur' }], + beginTime: [{ required: true, message: '请输入开始时间', trigger: 'blur' }], + entTime: [{ required: true, message: '请输入结束时间', trigger: 'blur' }], + endAtNextDay: [{ required: true, message: '请选择是否跨天', trigger: 'change' }], + available: [{ required: true, message: '请选择是否可用', trigger: 'change' }] }) From e6dc07c54a7678bdc7cc3562378ab4fa0f84116b Mon Sep 17 00:00:00 2001 From: bjang03 <259278618@qq.com> Date: Wed, 10 Jul 2024 15:35:48 +0800 Subject: [PATCH 24/39] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=20=E7=9B=98?= =?UTF-8?q?=E7=82=B9=E5=AD=90=E8=A1=A8=E5=A2=9E=E5=8A=A0=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E3=80=81=E5=BA=93=E5=8C=BA=E3=80=81=E5=BA=93=E4=BD=8D=E7=BB=84?= =?UTF-8?q?=E3=80=81=E5=BA=93=E4=BD=8D=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../countadjustRecordMain.data.ts | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts index baa353828..3c7f73c51 100644 --- a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts +++ b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts @@ -51,22 +51,22 @@ export const CountadjustRecordMain = useCrudSchemas(reactive([ isTable:true, isForm: true }, - { - label: '出库事务类型', - field: 'outTransactionType', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '入库事务类型', - field: 'inTransactionType', - sort: 'custom', - table: { - width: 150 - }, - }, + // { + // label: '出库事务类型', + // field: 'outTransactionType', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '入库事务类型', + // field: 'inTransactionType', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { label: '申请时间', field: 'requestTime', From 251004521efdf3c539d95d1ac90bd0660a7b5f9e Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Wed, 10 Jul 2024 15:51:23 +0800 Subject: [PATCH 25/39] =?UTF-8?q?WMS=20=E2=80=94=E2=80=94>=20bug=20=20?= =?UTF-8?q?=E5=A4=87=E8=B4=A7=E7=94=B3=E8=AF=B7=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E4=BB=8E=E5=BA=93=E4=BD=8D=EF=BC=8C=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E6=B2=A1=E6=9C=89=E4=BF=9D=E5=AD=98=E4=B8=8A=EF=BC=8C?= =?UTF-8?q?=E6=88=96=E5=8E=BB=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stockup/stockupMainRequest/stockupMainRequest.data.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts index acdc78077..e40c37748 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts @@ -741,6 +741,8 @@ export const StockupDetailRequest = useCrudSchemas(reactive([ label: '从库位', field: 'fromLocationCode', sort: 'custom', + isTableForm: false, + isTable: false, table: { width: 150 }, From 0a77c3fc1aa1bb7cf35993d09bb76d7b1394cff1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Wed, 10 Jul 2024 16:49:20 +0800 Subject: [PATCH 26/39] =?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 --- src/views/qms/inspectionJob/index.vue | 596 ++-- .../inspectionJob/inspectionJobMain.data.ts | 1135 +++--- .../inspectionRecordMain.data.ts | 756 ++-- .../inspectionRequestMain.data.ts | 784 +++-- .../purchasereceiptJobMain.data.ts | 3038 ++++++++--------- 5 files changed, 3201 insertions(+), 3108 deletions(-) diff --git a/src/views/qms/inspectionJob/index.vue b/src/views/qms/inspectionJob/index.vue index 3566e702d..34ac036b8 100644 --- a/src/views/qms/inspectionJob/index.vue +++ b/src/views/qms/inspectionJob/index.vue @@ -1,33 +1,52 @@