From 80bcb77bff4ef58905aaed0a74a0ec398a93732e Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Fri, 17 May 2024 13:53:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Annex/src/Annex.vue | 2 +- src/components/BasicForm/src/BasicForm.vue | 11 +++++ src/components/TableForm/src/TableForm.vue | 43 +++++++++++++++++-- src/locales/en-US.ts | 3 +- src/locales/zh-CN.ts | 3 +- .../itemManage/itemarea/index.vue | 6 ++- .../countManage/count/countPlanMain/index.vue | 6 ++- .../count/countRequestMain/index.vue | 6 ++- .../countadjustRequestMain/index.vue | 6 ++- .../customerreceiptRequestMain/index.vue | 6 ++- .../customerreturnRequestMain/index.vue | 5 +++ .../customersettleRequestMain/index.vue | 6 ++- .../deliver/deliverRequestMain/index.vue | 6 ++- .../deliverplan/deliverPlanMain/index.vue | 6 ++- .../deliverplan/saleMain/index.vue | 6 ++- .../saleShipmentMainRequest/index.vue | 6 ++- .../stockup/stockupMainRequest/index.vue | 6 ++- .../containerBindRecord/index.vue | 6 ++- .../containerinit/containerRepair/index.vue | 6 ++- .../containerUnbindRecord/index.vue | 6 ++- .../containerMainRequest/index.vue | 6 ++- .../initialContainerMainRequest/index.vue | 6 ++- .../scrapContainerMainRequest/index.vue | 6 ++- .../inventoryinitRequestMain/index.vue | 6 ++- .../scrap/scrapRequestMain/index.vue | 6 ++- .../index.vue | 6 ++- .../transferissueRequestMain/index.vue | 6 ++- .../transferreceiptRequestMain/index.vue | 6 ++- .../unplannedissueRequestMain/index.vue | 6 ++- .../unplannedreceiptRequestMain/index.vue | 6 ++- .../issue/issueRequestMain/index.vue | 6 ++- .../onlinesettlementRequestMain/index.vue | 6 ++- .../pick/pickRequestMain/index.vue | 6 ++- .../preparetoissueMain/index.vue | 6 ++- .../productionreturnRequestMain/index.vue | 5 +++ .../repleinsh/repleinshRequestMain/index.vue | 6 ++- .../inventorychangeRequestMain/index.vue | 5 +++ .../inventorymoveRequestMain/index.vue | 6 ++- .../offlinesettlementRequestMain/index.vue | 5 +++ .../productdismantleRequestMain/index.vue | 6 ++- .../productionplan/productionMain/index.vue | 5 +++ .../productionMainAssemble/index.vue | 5 +++ .../productionMainAssembleSparePart/index.vue | 6 ++- .../productionMainPredictSparePart/index.vue | 5 +++ .../productionplan/workMain/index.vue | 5 +++ .../productputawayRequestMain/index.vue | 5 +++ .../index.vue | 6 ++- .../productreceiptRequestMain/index.vue | 6 ++- .../index.vue | 5 +++ .../productreceiptscrapRequestMain/index.vue | 5 +++ .../productredressRequestMain/index.vue | 5 +++ .../productscrapRequestMain/index.vue | 5 +++ .../inspect/inspectRequestMain/index.vue | 6 ++- .../purchasereturnRequestMain/index.vue | 19 ++++++++ .../putaway/putawayRequestMain/index.vue | 5 +++ .../sparereceiptRequestMain/index.vue | 5 +++ .../demandforecastingMain/index.vue | 5 +++ .../supplierdeliver/purchaseMain/index.vue | 10 ++++- .../purchasePlanMain/index.vue | 5 +++ .../supplierdeliverBasicForm.vue | 23 ++++++---- .../purchaseclaimRequestMain/index.vue | 7 ++- .../supplierinvoiceRequestMain/index.vue | 7 ++- 62 files changed, 369 insertions(+), 54 deletions(-) diff --git a/src/components/Annex/src/Annex.vue b/src/components/Annex/src/Annex.vue index 5f5f144d6..812be654f 100644 --- a/src/components/Annex/src/Annex.vue +++ b/src/components/Annex/src/Annex.vue @@ -8,7 +8,7 @@
- +
{{ item.name }}
diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 28f77a0cc..4157195f5 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -79,9 +79,11 @@ :tableFormRules="tableFormRules" :isShowButton="isShowButton" :isShowReduceButton="isShowReduceButton" + :isShowReduceButtonSelection="isShowReduceButtonSelection" @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable" @tableSelectionChange="tableSelectionChange" + @tableSelectionDelete="tableSelectionDelete" @extendedButtonsClick="extendedButtonsClick" @formSelectChange="formSelectChange" @formSelectvVisibleChange="formSelectvVisibleChange" @@ -139,6 +141,11 @@ const props = defineProps({ type: Boolean, default: true }, + // 是否显示删除按钮--多选 + isShowReduceButtonSelection:{ + type: Boolean, + default: false, + }, // 是否显示tableForm 删除按钮 isShowReduceButton: { type: Boolean, @@ -612,6 +619,7 @@ const resetForm = () => { const emit = defineEmits([ 'success', 'tableSelectionChange', + 'tableSelectionDelete', 'tableFormSelectOnBlur', 'extendedButtonsClick', 'formSelectChange', @@ -653,6 +661,9 @@ const formSelectvVisibleChange = (field, val, row) => { const tableSelectionChange = (val) => { emit('tableSelectionChange', val) } +const tableSelectionDelete = (val) => { + emit('tableSelectionDelete', val) +} // tableform select bulr const tableFormSelectOnBlur = (field, val, row, index) => { emit('tableFormSelectOnBlur', field, val, row, index) diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue index 1cfc8ba01..2ac2fb922 100644 --- a/src/components/TableForm/src/TableForm.vue +++ b/src/components/TableForm/src/TableForm.vue @@ -12,11 +12,13 @@ @sort-change="tableSortChange" @row-click="handleTableSelect" > + + @@ -299,18 +301,34 @@ + + + + -
-
+
+
{{t('ts.添加明细')}}
+
+ +
{{t('ts.批量删除')}}
+