给单据明细的最左侧增加带拖动的序号

2024-03-19 14:18:57 +08:00 · 2024-03-19 14:18:57 +08:00 · c61684a6fa
commit c61684a6fa
parent 3dd5573c80
20 changed files with 53 additions and 27 deletions
--- 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'
--- 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">
--- 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"
--- 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"
--- 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">
--- 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">
--- 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">
--- 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">
--- 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">
--- 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">
--- 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">
--- 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">
--- 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">
--- 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">
--- 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" />
--- 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" />
--- 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" />
--- 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" />
--- 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" />
--- 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" />