From 12a384639b38c293dce1abc9d7ea54dc387089af Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 4 Sep 2024 11:28:36 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=8D=A2=E5=AD=97=E6=AE=B5=E5=90=8D?= =?UTF-8?q?=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demandforecastingMain/demandforecastingMain.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts index 406aeb737..ee80b26df 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts @@ -76,7 +76,7 @@ export const Supplier1 = useCrudSchemas(reactive([ export const Version = useCrudSchemas(reactive([ { label: '供应商代码', - field: 'supplerCodes', + field: 'supplierCodes', sort: 'custom', isSearch:true, }, From a897442fd0f8a2ad95115d567e6e3d72b54ddd28 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 4 Sep 2024 11:40:10 +0800 Subject: [PATCH 2/5] =?UTF-8?q?HL-5838=E8=B4=A8=E6=A3=80=E6=98=8E=E7=BB=86?= =?UTF-8?q?-=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE=E5=8F=AA=E6=9C=89status?= =?UTF-8?q?=3D8=E9=9A=90=E8=97=8F=EF=BC=8C=E5=85=B6=E4=BB=96=E9=83=BD?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRequestMain/index.vue | 56 ++++++++++--------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index 6e46ec13a..91205da4b 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -100,32 +100,7 @@ { tableColumns.value = val @@ -790,6 +791,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => { .get(CACHE_KEY.DEPT) .find((account) => account.id == row.departmentCode)?.name if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) + annexInspectionDetail.value.hiddenDelete = row.status==8 //HL-5838质检明细-删除按钮只有status=8隐藏，其他都展示 detailRef.value.openDetail(row, titleName, titleValue, 'requestSupplierdeliverMain') } //添加/修改操作 From cd427ea3fec6d472b567285e2bf51f12af6e8aed Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Wed, 4 Sep 2024 13:42:24 +0800 Subject: [PATCH 3/5] =?UTF-8?q?HL-5831=E5=88=B6=E5=93=81=E5=AD=90=E4=BB=B6?= =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E3=80=81=E6=8A=A5=E5=BA=9F=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E6=92=A4=E9=94=80=E7=94=9F=E6=88=90=E6=96=B0=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scrap/scrapRecordMain/scrapRecordMain.data.ts | 8 ++++++++ .../productscrapRecordMain/productscrapRecordMain.data.ts | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts index 1411a2dcf..b6c76379b 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts @@ -399,6 +399,14 @@ export const ScrapRecordMain = useCrudSchemas( // } } }, + { + label: '关联单据号', + field: 'relateRecordNumber', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '创建时间', field: 'createTime', diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts index c195119cc..fc5a31ada 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts @@ -298,6 +298,14 @@ export const ProductscrapRecordMain = useCrudSchemas( // } } }, + { + label: '关联单据号', + field: 'relateRecordNumber', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '创建者', field: 'creator', From eff73134dbe2cc1e3b9c008d8781b1bd921a1649 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 4 Sep 2024 14:05:31 +0800 Subject: [PATCH 4/5] =?UTF-8?q?HL-5827SCP=E6=AD=A3=E5=BC=8F=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=EF=BC=8C=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91=E8=B4=A7?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=EF=BC=8C=E4=B8=8A=E4=BC=A0=E7=9A=84=E8=B4=A8?= =?UTF-8?q?=E6=A3=80=E6=8A=A5=E5=91=8A=E9=99=90=E5=88=B6=E5=8F=AA=E8=83=BD?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0PDF=E6=A0=BC=E5=BC=8F=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverInspectionDetail.data.ts | 2 +- .../supplierdeliver/supplierdeliverRequestMain/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts index 3a5bb522d..de8ce0f18 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts @@ -15,7 +15,7 @@ export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive Date: Wed, 4 Sep 2024 14:23:58 +0800 Subject: [PATCH 5/5] =?UTF-8?q?HL-5838SCP=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7=EF=BC=8C=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E8=B4=A8=E6=A3=80=E6=8A=A5=E5=91=8A=E7=9B=AE=E5=89=8D=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E6=8A=A5=E5=91=8A=E4=B8=8A=E4=BC=A0=E5=B9=B6=E9=9D=9E?= =?UTF-8?q?=E8=83=BD=E5=92=8C=E9=9B=B6=E4=BB=B6=E4=B8=80=E4=B8=80=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=EF=BC=8C=E9=9C=80=E8=A6=81=E5=BC=80=E5=8F=91=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E6=A0=A1=E9=AA=8C=EF=BC=8C=E6=8C=89=E7=85=A7=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E9=9B=B6=E4=BB=B6=E5=8F=B7=E6=98=8E=E7=BB=86=E8=A1=8C?= =?UTF-8?q?=E6=95=B0=E9=87=8F=EF=BC=88=E5=90=8C=E4=B8=80=E9=9B=B6=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=90=8C=E6=89=B9=E6=AC=A1=EF=BC=8C=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E4=BE=9B=E5=BA=94=E5=95=86=E5=88=86=E5=88=AB=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E6=8A=A5=E5=91=8A=EF=BC=89=E6=A0=B8=E5=AF=B9=E6=8A=A5?= =?UTF-8?q?=E5=91=8A=E4=B8=8A=E4=BC=A0=E6=95=B0=E9=87=8F=EF=BC=8C=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E6=8A=A5=E5=91=8A=E6=95=B0=E9=87=8F=E5=B0=91=E4=BA=8E?= =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E6=95=B0=E9=87=8F=EF=BC=8C=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E4=B8=8D=E5=85=81=E8=AE=B8=E5=8F=91=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Annex/src/Annex.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/Annex/src/Annex.vue b/src/components/Annex/src/Annex.vue index a9f8b472b..e89826f8a 100644 --- a/src/components/Annex/src/Annex.vue +++ b/src/components/Annex/src/Annex.vue @@ -4,7 +4,9 @@
+ @update:modelValue="handleAnnexSuccess" v-if="showAddBtn"/> + +