diff --git a/jshERP-web/src/components/jeecg/JEditableTable.vue b/jshERP-web/src/components/jeecg/JEditableTable.vue
index ffec2cfc..6a14f00a 100644
--- a/jshERP-web/src/components/jeecg/JEditableTable.vue
+++ b/jshERP-web/src/components/jeecg/JEditableTable.vue
@@ -26,6 +26,16 @@
+
@@ -837,6 +847,11 @@
type: Boolean,
default: false
},
+ // 是否显示删除按钮
+ actionDeleteButton: {
+ type: Boolean,
+ default: false
+ },
// 是否显示行号
rowNumber: {
type: Boolean,
diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
index 66d6fa10..beee8bce 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
@@ -63,14 +63,15 @@
:minWidth="minWidth"
:maxHeight="300"
:rowNumber="false"
- :rowSelection="rowCanEdit"
+ :rowSelection="true"
:actionButton="rowCanEdit"
+ :actionDeleteButton="!rowCanEdit"
:dragSortAndNumber="rowCanEdit"
@valueChange="onValueChange"
@added="onAdded"
@deleted="onDeleted">
-
+
扫码录入
diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
index 7499a952..db5b3f9c 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
@@ -68,14 +68,15 @@
:minWidth="minWidth"
:maxHeight="300"
:rowNumber="false"
- :rowSelection="rowCanEdit"
+ :rowSelection="true"
:actionButton="rowCanEdit"
+ :actionDeleteButton="!rowCanEdit"
:dragSortAndNumber="rowCanEdit"
@valueChange="onValueChange"
@added="onAdded"
@deleted="onDeleted">
-
+
扫码录入
@@ -88,7 +89,7 @@
- 历史单据
+ 历史单据
diff --git a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
index 12bf3b01..be428a37 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
@@ -75,14 +75,15 @@
:minWidth="minWidth"
:maxHeight="300"
:rowNumber="false"
- :rowSelection="rowCanEdit"
+ :rowSelection="true"
:actionButton="rowCanEdit"
+ :actionDeleteButton="!rowCanEdit"
:dragSortAndNumber="rowCanEdit"
@valueChange="onValueChange"
@added="onAdded"
@deleted="onDeleted">
-
+
扫码录入
@@ -95,7 +96,7 @@
- 历史单据
+ 历史单据
diff --git a/jshERP-web/src/views/bill/modules/RetailBackModal.vue b/jshERP-web/src/views/bill/modules/RetailBackModal.vue
index ec6dfa95..ca7c1510 100644
--- a/jshERP-web/src/views/bill/modules/RetailBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/RetailBackModal.vue
@@ -65,14 +65,15 @@
:minWidth="minWidth"
:maxHeight="300"
:rowNumber="false"
- :rowSelection="rowCanEdit"
+ :rowSelection="true"
:actionButton="rowCanEdit"
+ :actionDeleteButton="!rowCanEdit"
:dragSortAndNumber="rowCanEdit"
@valueChange="onValueChange"
@added="onAdded"
@deleted="onDeleted">
-
+
扫码录入
diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
index e2e3e754..ce59e49e 100644
--- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
@@ -63,14 +63,15 @@
:minWidth="minWidth"
:maxHeight="300"
:rowNumber="false"
- :rowSelection="rowCanEdit"
+ :rowSelection="true"
:actionButton="rowCanEdit"
+ :actionDeleteButton="!rowCanEdit"
:dragSortAndNumber="rowCanEdit"
@valueChange="onValueChange"
@added="onAdded"
@deleted="onDeleted">
-
+
扫码录入
diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
index 66b93997..b7ce8b9c 100644
--- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
@@ -69,14 +69,15 @@
:minWidth="minWidth"
:maxHeight="300"
:rowNumber="false"
- :rowSelection="rowCanEdit"
+ :rowSelection="true"
:actionButton="rowCanEdit"
+ :actionDeleteButton="!rowCanEdit"
:dragSortAndNumber="rowCanEdit"
@valueChange="onValueChange"
@added="onAdded"
@deleted="onDeleted">
-
+
扫码录入
@@ -89,7 +90,7 @@
- 历史单据
+ 历史单据