From c61684a6faa06c7ffe1641601b675a5cccd01b57 Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Tue, 19 Mar 2024 14:18:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=8D=95=E6=8D=AE=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E7=9A=84=E6=9C=80=E5=B7=A6=E4=BE=A7=E5=A2=9E=E5=8A=A0=E5=B8=A6?=
 =?UTF-8?q?=E6=8B=96=E5=8A=A8=E7=9A=84=E5=BA=8F=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/jeecg/JEditableTable.vue   | 42 +++++++++++++++----
 .../views/bill/modules/AllocationOutModal.vue |  2 +-
 .../src/views/bill/modules/AssembleModal.vue  |  2 +-
 .../views/bill/modules/DisassembleModal.vue   |  2 +-
 .../src/views/bill/modules/OtherInModal.vue   |  2 +-
 .../src/views/bill/modules/OtherOutModal.vue  |  2 +-
 .../views/bill/modules/PurchaseBackModal.vue  |  2 +-
 .../views/bill/modules/PurchaseInModal.vue    |  2 +-
 .../views/bill/modules/PurchaseOrderModal.vue |  2 +-
 .../views/bill/modules/RetailBackModal.vue    |  2 +-
 .../src/views/bill/modules/RetailOutModal.vue |  2 +-
 .../src/views/bill/modules/SaleBackModal.vue  |  2 +-
 .../src/views/bill/modules/SaleOrderModal.vue |  2 +-
 .../src/views/bill/modules/SaleOutModal.vue   |  2 +-
 .../financial/modules/AdvanceInModal.vue      |  2 +-
 .../src/views/financial/modules/GiroModal.vue |  2 +-
 .../views/financial/modules/ItemInModal.vue   |  2 +-
 .../views/financial/modules/ItemOutModal.vue  |  2 +-
 .../views/financial/modules/MoneyInModal.vue  |  2 +-
 .../views/financial/modules/MoneyOutModal.vue |  2 +-
 20 files changed, 53 insertions(+), 27 deletions(-)

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 @@
           <div v-if="dragSort" class="td td-ds" :style="style.tdLeftDs">
             <span></span>
           </div>
+          <div v-if="dragSortAndNumber" class="td td-ds" :style="style.tdLeftDs">
+            <span>#</span>
+          </div>
+          <div v-if="rowNumber" class="td td-num" :style="style.tdLeft">
+            <span>#</span>
+          </div>
           <div v-if="rowSelection" class="td td-cb" :style="style.tdLeft">
             <!--:indeterminate="true"-->
             <a-checkbox
@@ -50,9 +56,6 @@
               @change="handleChangeCheckedAll"
             />
           </div>
-          <div v-if="rowNumber" class="td td-num" :style="style.tdLeft">
-            <span>#</span>
-          </div>
           <!-- 右侧动态生成td -->
           <template v-for="col in columns">
             <div
@@ -120,6 +123,25 @@
                   </a-dropdown>
                 </div>
 
+                <div v-if="dragSortAndNumber" class="td td-ds" :style="style.tdLeftDs">
+                  <a-dropdown :trigger="['click']" :getPopupContainer="getParentContainer">
+                    <div class="td-ds-icons" title="点击不放可以拖动" style="text-align: center; line-height: 32px">
+                      <span>{{ rowIndex+1 }}</span>
+                    </div>
+
+                    <a-menu slot="overlay">
+                      <a-menu-item key="0" :disabled="rowIndex===0" @click="_handleRowMoveUp(rowIndex)">向上移</a-menu-item>
+                      <a-menu-item key="1" :disabled="rowIndex===(rows.length-1)" @click="_handleRowMoveDown(rowIndex)">向下移</a-menu-item>
+                      <!-- <a-menu-divider/>
+                      <a-menu-item key="3" @click="_handleRowInsertDown(rowIndex)">插入一行</a-menu-item> -->
+                    </a-menu>
+                  </a-dropdown>
+                </div>
+
+                <div v-if="rowNumber" class="td td-num" :style="style.tdLeft">
+                  <span>{{ rowIndex+1 }}</span>
+                </div>
+
                 <div v-if="rowSelection" class="td td-cb" :style="style.tdLeft">
                   <!-- 此 v-for 只是为了拼接 id 字符串 -->
                   <template v-for="(id,i) in [`${row.id}`]">
@@ -130,9 +152,7 @@
                       @change="handleChangeLeftCheckbox"/>
                   </template>
                 </div>
-                <div v-if="rowNumber" class="td td-num" :style="style.tdLeft">
-                  <span>{{ rowIndex+1 }}</span>
-                </div>
+
                 <!-- 右侧动态生成td -->
                 <div
                   class="td"
@@ -736,12 +756,13 @@
           >
             <div v-if="dragSort" class="td td-ds" :style="style.tdLeftDs">
             </div>
-            <div v-if="rowSelection" class="td td-cb" :style="style.tdLeft">
-
+            <div v-if="dragSortAndNumber" class="td td-ds" :style="style.tdLeftDs">
             </div>
             <div v-if="rowNumber" class="td td-num" :style="style.tdLeft">
               <span v-if="!rowSelection">统计</span>
             </div>
+            <div v-if="rowSelection" class="td td-cb" :style="style.tdLeft">
+            </div>
 
             <!-- 右侧动态生成td -->
             <template v-for="col in columns">
@@ -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" />