diff --git a/jshERP-web/src/components/jeecg/JEditableTable.vue b/jshERP-web/src/components/jeecg/JEditableTable.vue
index caa18887..5d8441c0 100644
--- a/jshERP-web/src/components/jeecg/JEditableTable.vue
+++ b/jshERP-web/src/components/jeecg/JEditableTable.vue
@@ -42,6 +42,12 @@
+
+ #
+
+
+ #
+
-
- #
-
+
+
+
+ {{ rowIndex+1 }}
+
+
+
+ 向上移
+ 向下移
+
+
+
+
+
+
+ {{ rowIndex+1 }}
+
+
@@ -130,9 +152,7 @@
@change="handleChangeLeftCheckbox"/>
-
- {{ rowIndex+1 }}
-
+
-
-
+
统计
+
+
@@ -856,6 +877,11 @@
type: Boolean,
default: false
},
+ // 是否可拖拽排序并显示行号
+ dragSortAndNumber: {
+ type: Boolean,
+ default: false
+ },
dragSortKey: {
type: String,
default: 'orderNum'
diff --git a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
index ff758e7e..2ff002e0 100644
--- a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
@@ -42,7 +42,7 @@
:rowNumber="false"
:rowSelection="true"
:actionButton="true"
- :dragSort="true"
+ :dragSortAndNumber="true"
@valueChange="onValueChange"
@added="onAdded"
@deleted="onDeleted">
diff --git a/jshERP-web/src/views/bill/modules/AssembleModal.vue b/jshERP-web/src/views/bill/modules/AssembleModal.vue
index 8c39908e..f71e6a52 100644
--- a/jshERP-web/src/views/bill/modules/AssembleModal.vue
+++ b/jshERP-web/src/views/bill/modules/AssembleModal.vue
@@ -39,7 +39,7 @@
:dataSource="materialTable.dataSource"
:minWidth="minWidth"
:maxHeight="300"
- :rowNumber="false"
+ :rowNumber="true"
:rowSelection="true"
:actionButton="true"
@valueChange="onValueChange"
diff --git a/jshERP-web/src/views/bill/modules/DisassembleModal.vue b/jshERP-web/src/views/bill/modules/DisassembleModal.vue
index 41354630..8acafbeb 100644
--- a/jshERP-web/src/views/bill/modules/DisassembleModal.vue
+++ b/jshERP-web/src/views/bill/modules/DisassembleModal.vue
@@ -39,7 +39,7 @@
:dataSource="materialTable.dataSource"
:minWidth="minWidth"
:maxHeight="300"
- :rowNumber="false"
+ :rowNumber="true"
:rowSelection="true"
:actionButton="true"
@valueChange="onValueChange"
diff --git a/jshERP-web/src/views/bill/modules/OtherInModal.vue b/jshERP-web/src/views/bill/modules/OtherInModal.vue
index d97c555e..b5212015 100644
--- a/jshERP-web/src/views/bill/modules/OtherInModal.vue
+++ b/jshERP-web/src/views/bill/modules/OtherInModal.vue
@@ -61,7 +61,7 @@
:rowNumber="false"
:rowSelection="rowCanEdit"
:actionButton="rowCanEdit"
- :dragSort="rowCanEdit"
+ :dragSortAndNumber="rowCanEdit"
@valueChange="onValueChange"
@added="onAdded"
@deleted="onDeleted">
diff --git a/jshERP-web/src/views/bill/modules/OtherOutModal.vue b/jshERP-web/src/views/bill/modules/OtherOutModal.vue
index 35fa15da..72511d6f 100644
--- a/jshERP-web/src/views/bill/modules/OtherOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/OtherOutModal.vue
@@ -61,7 +61,7 @@
:rowNumber="false"
:rowSelection="rowCanEdit"
:actionButton="rowCanEdit"
- :dragSort="rowCanEdit"
+ :dragSortAndNumber="rowCanEdit"
@valueChange="onValueChange"
@added="onAdded"
@deleted="onDeleted">
diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
index b4ad0fe1..cbdeed32 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
@@ -61,7 +61,7 @@
:rowNumber="false"
:rowSelection="rowCanEdit"
:actionButton="rowCanEdit"
- :dragSort="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 59af8ebc..81bff2bd 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
@@ -68,7 +68,7 @@
:rowNumber="false"
:rowSelection="rowCanEdit"
:actionButton="rowCanEdit"
- :dragSort="rowCanEdit"
+ :dragSortAndNumber="rowCanEdit"
@valueChange="onValueChange"
@added="onAdded"
@deleted="onDeleted">
diff --git a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
index a0af9d7c..bf00b91b 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
@@ -68,7 +68,7 @@
:rowNumber="false"
:rowSelection="rowCanEdit"
:actionButton="rowCanEdit"
- :dragSort="rowCanEdit"
+ :dragSortAndNumber="rowCanEdit"
@valueChange="onValueChange"
@added="onAdded"
@deleted="onDeleted">
diff --git a/jshERP-web/src/views/bill/modules/RetailBackModal.vue b/jshERP-web/src/views/bill/modules/RetailBackModal.vue
index 10341ea8..4b6f630f 100644
--- a/jshERP-web/src/views/bill/modules/RetailBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/RetailBackModal.vue
@@ -63,7 +63,7 @@
:rowNumber="false"
:rowSelection="rowCanEdit"
:actionButton="rowCanEdit"
- :dragSort="rowCanEdit"
+ :dragSortAndNumber="rowCanEdit"
@valueChange="onValueChange"
@added="onAdded"
@deleted="onDeleted">
diff --git a/jshERP-web/src/views/bill/modules/RetailOutModal.vue b/jshERP-web/src/views/bill/modules/RetailOutModal.vue
index 128f8d4b..23158f4c 100644
--- a/jshERP-web/src/views/bill/modules/RetailOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/RetailOutModal.vue
@@ -73,7 +73,7 @@
:rowNumber="false"
:rowSelection="true"
:actionButton="true"
- :dragSort="true"
+ :dragSortAndNumber="true"
@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 3bcc5688..e76e077c 100644
--- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
@@ -61,7 +61,7 @@
:rowNumber="false"
:rowSelection="rowCanEdit"
:actionButton="rowCanEdit"
- :dragSort="rowCanEdit"
+ :dragSortAndNumber="rowCanEdit"
@valueChange="onValueChange"
@added="onAdded"
@deleted="onDeleted">
diff --git a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
index c200bd06..8ff64bfe 100644
--- a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
@@ -68,7 +68,7 @@
:rowNumber="false"
:rowSelection="true"
:actionButton="true"
- :dragSort="true"
+ :dragSortAndNumber="true"
@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 3d2f6c4d..9424eeb2 100644
--- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
@@ -69,7 +69,7 @@
:rowNumber="false"
:rowSelection="rowCanEdit"
:actionButton="rowCanEdit"
- :dragSort="rowCanEdit"
+ :dragSortAndNumber="rowCanEdit"
@valueChange="onValueChange"
@added="onAdded"
@deleted="onDeleted">
diff --git a/jshERP-web/src/views/financial/modules/AdvanceInModal.vue b/jshERP-web/src/views/financial/modules/AdvanceInModal.vue
index 6883a512..783fc183 100644
--- a/jshERP-web/src/views/financial/modules/AdvanceInModal.vue
+++ b/jshERP-web/src/views/financial/modules/AdvanceInModal.vue
@@ -63,7 +63,7 @@
:dataSource="accountTable.dataSource"
:minWidth="minWidth"
:maxHeight="300"
- :rowNumber="false"
+ :rowNumber="true"
:rowSelection="true"
:actionButton="true"
@valueChange="onValueChange" />
diff --git a/jshERP-web/src/views/financial/modules/GiroModal.vue b/jshERP-web/src/views/financial/modules/GiroModal.vue
index 70a90175..e4ca57da 100644
--- a/jshERP-web/src/views/financial/modules/GiroModal.vue
+++ b/jshERP-web/src/views/financial/modules/GiroModal.vue
@@ -55,7 +55,7 @@
:dataSource="accountTable.dataSource"
:minWidth="minWidth"
:maxHeight="300"
- :rowNumber="false"
+ :rowNumber="true"
:rowSelection="true"
:actionButton="true"
@valueChange="onValueChange" />
diff --git a/jshERP-web/src/views/financial/modules/ItemInModal.vue b/jshERP-web/src/views/financial/modules/ItemInModal.vue
index 02982449..48e1889d 100644
--- a/jshERP-web/src/views/financial/modules/ItemInModal.vue
+++ b/jshERP-web/src/views/financial/modules/ItemInModal.vue
@@ -63,7 +63,7 @@
:dataSource="accountTable.dataSource"
:minWidth="minWidth"
:maxHeight="300"
- :rowNumber="false"
+ :rowNumber="true"
:rowSelection="true"
:actionButton="true"
@valueChange="onValueChange" />
diff --git a/jshERP-web/src/views/financial/modules/ItemOutModal.vue b/jshERP-web/src/views/financial/modules/ItemOutModal.vue
index 4e826729..ffee3a07 100644
--- a/jshERP-web/src/views/financial/modules/ItemOutModal.vue
+++ b/jshERP-web/src/views/financial/modules/ItemOutModal.vue
@@ -63,7 +63,7 @@
:dataSource="accountTable.dataSource"
:minWidth="minWidth"
:maxHeight="300"
- :rowNumber="false"
+ :rowNumber="true"
:rowSelection="true"
:actionButton="true"
@valueChange="onValueChange" />
diff --git a/jshERP-web/src/views/financial/modules/MoneyInModal.vue b/jshERP-web/src/views/financial/modules/MoneyInModal.vue
index 9ff4fd26..375929a1 100644
--- a/jshERP-web/src/views/financial/modules/MoneyInModal.vue
+++ b/jshERP-web/src/views/financial/modules/MoneyInModal.vue
@@ -83,7 +83,7 @@
:dataSource="accountTable.dataSource"
:minWidth="minWidth"
:maxHeight="300"
- :rowNumber="false"
+ :rowNumber="true"
:rowSelection="false"
:actionButton="false"
@valueChange="onValueChange" />
diff --git a/jshERP-web/src/views/financial/modules/MoneyOutModal.vue b/jshERP-web/src/views/financial/modules/MoneyOutModal.vue
index adae746c..462a5011 100644
--- a/jshERP-web/src/views/financial/modules/MoneyOutModal.vue
+++ b/jshERP-web/src/views/financial/modules/MoneyOutModal.vue
@@ -83,7 +83,7 @@
:dataSource="accountTable.dataSource"
:minWidth="minWidth"
:maxHeight="300"
- :rowNumber="false"
+ :rowNumber="true"
:rowSelection="false"
:actionButton="false"
@valueChange="onValueChange" />