purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化单据关联之后的展示界面

Browse Source
This commit is contained in:
jishenghua
2025-05-01 13:43:57 +08:00
parent 71dc44df36
commit 7583207640
7 changed files with 36 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
jshERP-web/src/components/jeecg/JEditableTable.vue
View File

@@ -26,6 +26,16 @@
</template> </template>
</template> </template>
</div> </div>
<div v-if="actionDeleteButton" class="action-button">
<template v-if="selectedRowIds.length>0">
<a-popconfirm
:title="`确定要移除这 ${selectedRowIds.length} 项吗?`"
@confirm="handleConfirmDelete">
<a-button type="primary" icon="minus" :disabled="disabled">移除行</a-button>
<span class="gap"></span>
</a-popconfirm>
</template>
</div>
</a-col> </a-col>
<a-col> <a-col>
<slot name="buttonAfter" :target="getVM()"/> <slot name="buttonAfter" :target="getVM()"/>
@@ -837,6 +847,11 @@
type: Boolean, type: Boolean,
default: false default: false
}, },
// 是否显示删除按钮
actionDeleteButton: {
type: Boolean,
default: false
},
// 是否显示行号 // 是否显示行号
rowNumber: { rowNumber: {
type: Boolean, type: Boolean,

5
jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
View File

@@ -63,14 +63,15 @@
:minWidth="minWidth" :minWidth="minWidth"
:maxHeight="300" :maxHeight="300"
:rowNumber="false" :rowNumber="false"
:rowSelection="rowCanEdit" :rowSelection="true"
:actionButton="rowCanEdit" :actionButton="rowCanEdit"
:actionDeleteButton="!rowCanEdit"
:dragSortAndNumber="rowCanEdit" :dragSortAndNumber="rowCanEdit"
@valueChange="onValueChange" @valueChange="onValueChange"
@added="onAdded" @added="onAdded"
@deleted="onDeleted"> @deleted="onDeleted">
<template #buttonAfter> <template #buttonAfter>
<a-row v-if="rowCanEdit" :gutter="24" style="float:left;padding-bottom: 5px;" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入"> <a-row v-if="rowCanEdit" :gutter="24" style="float:left;padding-bottom:5px;padding-right:8px" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入">
<a-col v-if="scanStatus" :md="6" :sm="24"> <a-col v-if="scanStatus" :md="6" :sm="24">
<a-button @click="scanEnter" style="margin-right: 8px">扫码录入</a-button> <a-button @click="scanEnter" style="margin-right: 8px">扫码录入</a-button>
</a-col> </a-col>

7
jshERP-web/src/views/bill/modules/PurchaseInModal.vue
View File

@@ -68,14 +68,15 @@
:minWidth="minWidth" :minWidth="minWidth"
:maxHeight="300" :maxHeight="300"
:rowNumber="false" :rowNumber="false"
:rowSelection="rowCanEdit" :rowSelection="true"
:actionButton="rowCanEdit" :actionButton="rowCanEdit"
:actionDeleteButton="!rowCanEdit"
:dragSortAndNumber="rowCanEdit" :dragSortAndNumber="rowCanEdit"
@valueChange="onValueChange" @valueChange="onValueChange"
@added="onAdded" @added="onAdded"
@deleted="onDeleted"> @deleted="onDeleted">
<template #buttonAfter> <template #buttonAfter>
<a-row v-if="rowCanEdit" :gutter="24" style="float:left;padding-bottom: 5px;" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入"> <a-row v-if="rowCanEdit" :gutter="24" style="float:left;padding-bottom:5px;padding-right:8px" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入">
<a-col v-if="scanStatus" :md="6" :sm="24"> <a-col v-if="scanStatus" :md="6" :sm="24">
<a-button @click="scanEnter">扫码录入</a-button> <a-button @click="scanEnter">扫码录入</a-button>
</a-col> </a-col>
@@ -88,7 +89,7 @@
</a-row> </a-row>
<a-row :gutter="24" style="float:left;padding-bottom: 5px;"> <a-row :gutter="24" style="float:left;padding-bottom: 5px;">
<a-col :md="24" :sm="24"> <a-col :md="24" :sm="24">
<a-button style="margin-left: 8px" @click="handleHistoryBillList"><a-icon type="history" />历史单据</a-button> <a-button @click="handleHistoryBillList"><a-icon type="history" />历史单据</a-button>
</a-col> </a-col>
</a-row> </a-row>
<a-row v-if="rowCanEdit" :gutter="24" style="float:left;padding-bottom: 5px;padding-left:20px;"> <a-row v-if="rowCanEdit" :gutter="24" style="float:left;padding-bottom: 5px;padding-left:20px;">

7
jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
View File

@@ -75,14 +75,15 @@
:minWidth="minWidth" :minWidth="minWidth"
:maxHeight="300" :maxHeight="300"
:rowNumber="false" :rowNumber="false"
:rowSelection="rowCanEdit" :rowSelection="true"
:actionButton="rowCanEdit" :actionButton="rowCanEdit"
:actionDeleteButton="!rowCanEdit"
:dragSortAndNumber="rowCanEdit" :dragSortAndNumber="rowCanEdit"
@valueChange="onValueChange" @valueChange="onValueChange"
@added="onAdded" @added="onAdded"
@deleted="onDeleted"> @deleted="onDeleted">
<template #buttonAfter> <template #buttonAfter>
<a-row v-if="rowCanEdit" :gutter="24" style="float:left;padding-bottom: 5px;" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入"> <a-row v-if="rowCanEdit" :gutter="24" style="float:left;padding-bottom:5px;padding-right:8px" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入">
<a-col v-if="scanStatus" :md="6" :sm="24"> <a-col v-if="scanStatus" :md="6" :sm="24">
<a-button @click="scanEnter">扫码录入</a-button> <a-button @click="scanEnter">扫码录入</a-button>
</a-col> </a-col>
@@ -95,7 +96,7 @@
</a-row> </a-row>
<a-row :gutter="24" style="float:left;padding-bottom: 5px;"> <a-row :gutter="24" style="float:left;padding-bottom: 5px;">
<a-col :md="24" :sm="24"> <a-col :md="24" :sm="24">
<a-button style="margin-left: 8px" @click="handleHistoryBillList"><a-icon type="history" />历史单据</a-button> <a-button @click="handleHistoryBillList"><a-icon type="history" />历史单据</a-button>
</a-col> </a-col>
</a-row> </a-row>
<a-row v-if="rowCanEdit" :gutter="24" style="float:left;padding-bottom: 5px;padding-left:20px;"> <a-row v-if="rowCanEdit" :gutter="24" style="float:left;padding-bottom: 5px;padding-left:20px;">

5
jshERP-web/src/views/bill/modules/RetailBackModal.vue
View File

@@ -65,14 +65,15 @@
:minWidth="minWidth" :minWidth="minWidth"
:maxHeight="300" :maxHeight="300"
:rowNumber="false" :rowNumber="false"
:rowSelection="rowCanEdit" :rowSelection="true"
:actionButton="rowCanEdit" :actionButton="rowCanEdit"
:actionDeleteButton="!rowCanEdit"
:dragSortAndNumber="rowCanEdit" :dragSortAndNumber="rowCanEdit"
@valueChange="onValueChange" @valueChange="onValueChange"
@added="onAdded" @added="onAdded"
@deleted="onDeleted"> @deleted="onDeleted">
<template #buttonAfter> <template #buttonAfter>
<a-row v-if="rowCanEdit" :gutter="24" style="float:left;padding-bottom: 5px;" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入"> <a-row v-if="rowCanEdit" :gutter="24" style="float:left;padding-bottom:5px;padding-right:8px" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入">
<a-col v-if="scanStatus" :md="6" :sm="24"> <a-col v-if="scanStatus" :md="6" :sm="24">
<a-button @click="scanEnter" style="margin-right: 8px">扫码录入</a-button> <a-button @click="scanEnter" style="margin-right: 8px">扫码录入</a-button>
</a-col> </a-col>

5
jshERP-web/src/views/bill/modules/SaleBackModal.vue
View File

@@ -63,14 +63,15 @@
:minWidth="minWidth" :minWidth="minWidth"
:maxHeight="300" :maxHeight="300"
:rowNumber="false" :rowNumber="false"
:rowSelection="rowCanEdit" :rowSelection="true"
:actionButton="rowCanEdit" :actionButton="rowCanEdit"
:actionDeleteButton="!rowCanEdit"
:dragSortAndNumber="rowCanEdit" :dragSortAndNumber="rowCanEdit"
@valueChange="onValueChange" @valueChange="onValueChange"
@added="onAdded" @added="onAdded"
@deleted="onDeleted"> @deleted="onDeleted">
<template #buttonAfter> <template #buttonAfter>
<a-row v-if="rowCanEdit" :gutter="24" style="float:left;padding-bottom: 5px;" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入"> <a-row v-if="rowCanEdit" :gutter="24" style="float:left;padding-bottom:5px;padding-right:8px" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入">
<a-col v-if="scanStatus" :md="6" :sm="24"> <a-col v-if="scanStatus" :md="6" :sm="24">
<a-button @click="scanEnter" style="margin-right: 8px">扫码录入</a-button> <a-button @click="scanEnter" style="margin-right: 8px">扫码录入</a-button>
</a-col> </a-col>

7
jshERP-web/src/views/bill/modules/SaleOutModal.vue
View File

@@ -69,14 +69,15 @@
:minWidth="minWidth" :minWidth="minWidth"
:maxHeight="300" :maxHeight="300"
:rowNumber="false" :rowNumber="false"
:rowSelection="rowCanEdit" :rowSelection="true"
:actionButton="rowCanEdit" :actionButton="rowCanEdit"
:actionDeleteButton="!rowCanEdit"
:dragSortAndNumber="rowCanEdit" :dragSortAndNumber="rowCanEdit"
@valueChange="onValueChange" @valueChange="onValueChange"
@added="onAdded" @added="onAdded"
@deleted="onDeleted"> @deleted="onDeleted">
<template #buttonAfter> <template #buttonAfter>
<a-row v-if="rowCanEdit" :gutter="24" style="float:left;padding-bottom: 5px;" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入"> <a-row v-if="rowCanEdit" :gutter="24" style="float:left;padding-bottom:5px;padding-right:8px" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入">
<a-col v-if="scanStatus" :md="6" :sm="24"> <a-col v-if="scanStatus" :md="6" :sm="24">
<a-button @click="scanEnter">扫码录入</a-button> <a-button @click="scanEnter">扫码录入</a-button>
</a-col> </a-col>
@@ -89,7 +90,7 @@
</a-row> </a-row>
<a-row :gutter="24" style="float:left;padding-bottom: 5px;"> <a-row :gutter="24" style="float:left;padding-bottom: 5px;">
<a-col :md="24" :sm="24"> <a-col :md="24" :sm="24">
<a-button style="margin-left: 8px" @click="handleHistoryBillList"><a-icon type="history" />历史单据</a-button> <a-button @click="handleHistoryBillList"><a-icon type="history" />历史单据</a-button>
</a-col> </a-col>
</a-row> </a-row>
<a-row v-if="rowCanEdit" :gutter="24" style="float:left;padding-bottom: 5px;padding-left:20px;"> <a-row v-if="rowCanEdit" :gutter="24" style="float:left;padding-bottom: 5px;padding-left:20px;">