up

backend/routers/apiPurchase.go

@@ -50,7 +50,7 @@ func ApiPurchase(r *gin.RouterGroup) {
 
 				is_data_ok := true
 
-				if jsondata.Entries <= 0 {
+				if jsondata.Entries <= 0 || jsondata.Entries > 300 {
 					is_data_ok = false
 				}
 				if jsondata.Page <= 0 {
@@ -62,11 +62,11 @@ func ApiPurchase(r *gin.RouterGroup) {
 					//读取有多少条目
 					var count int64
 					models.DB.Model(&models.TabPurchaseOrder{}).Count(&count)
-					fmt.Println(count)
+					//fmt.Println(count)
 
 					//读取条目
 					var getorders []models.TabPurchaseOrder
-					models.DB.Order("created_at DESC").Limit(jsondata.Entries).Find(&getorders)
+					models.DB.Order("created_at DESC").Offset(jsondata.Entries * (jsondata.Page - 1)).Limit(jsondata.Entries).Find(&getorders)
 
 					ReturnJson(ctx, "apiOK", map[string]interface{}{
 						"all_count":  count,

frontent/ops_vue_js/src/i18n/en.json

@@ -58,7 +58,9 @@
     "entries": "entries",
     "search": "Search",
     "add_part": "Add Order",
-    "exp_report": "Export Report"
+    "exp_report": "Export Report",
+    "There_are_a_total_of": ",There are a total of",
+    "items": "items."
   },
   "purchase_addorder": {
     "add_order": "Add Order",
@@ -93,7 +95,7 @@
     "order_status": "Order Status",
     "modify_order_status": "Modify Order Status",
     "submit": "Submit",
-    "part_name":"Parts Name"
+    "part_name": "Parts Name"
   },
   "schedule": {
     "my_schedule": "My Schedule",

frontent/ops_vue_js/src/i18n/zh-CN.json

@@ -58,7 +58,9 @@
     "entries": "个物件",
     "search": "搜索",
     "add_part": "添加订单",
-    "exp_report": "生成报告"
+    "exp_report": "生成报告",
+    "There_are_a_total_of":"，一共",
+    "items":"个物件"
   },
   "purchase_addorder": {
     "add_order": "添加订单",

frontent/ops_vue_js/src/views/purchase/purchase.vue

@@ -8,24 +8,58 @@ import { myfuncs } from "@/myfunc";
 
 const { t, locale } = useI18n();
 
+const all_items = ref(0);
+const all_pages = ref(0);
+const page_items = ref(10);
+const now_page = ref(1);
+
 const all_orders = ref({});
 
+const page_start = ref(0);
+const page_end = ref(0);
+
+const page_input = ref();
+const page_items_items = ref("10");
+
 //获取订单列表
 function get_orders() {
   my_network_func.postJson(
     "/purchase/getorders",
     {
       search: "",
-      entries: 10,
+      entries: page_items.value,
-      page: 1,
+      page: now_page.value,
     },
     (r) => {
-      console.log(r);
+      //console.log(r);
       switch (r.statusCode) {
         case 200:
           switch (r.data.err_code) {
             case 0:
               all_orders.value = r.data.return.all_orders;
+              all_items.value = r.data.return.all_count;
+              all_pages.value = Math.ceil(all_items.value / page_items.value);
+              if (now_page.value < 3) {
+                page_start.value = 1;
+              } else {
+                if (now_page.value > all_pages.value - 3) {
+                  page_start.value = all_pages.value - 4;
+                  if (page_start.value <= 0) {
+                    page_start.value = 1;
+                  }
+                } else {
+                  page_start.value = now_page.value - 2;
+                }
+              }
+              if (now_page.value > all_pages.value - 3) {
+                page_end.value = all_pages.value;
+              } else {
+                if (now_page.value < 3) {
+                  page_end.value = 5;
+                } else {
+                  page_end.value = now_page.value + 2;
+                }
+              }
               break;
             default:
               mos.value?.showAlert("danger", t("message.server_error"), 5000);
@@ -40,9 +74,56 @@ function get_orders() {
   );
 }
 
+function change_page(page) {
+  now_page.value = page;
+  get_orders();
+}
+
 function functionupdataTitle() {
   document.title = "Operations." + t("appname.purchase");
 }
+
+function range(start, end) {
+  return Array.from({ length: end - start + 1 }, (_, i) => start + i);
+}
+
+function page_input_change(c) {
+  //console.log(page_input.value);
+
+  var t = parseInt(page_input.value);
+  if (t > 0) {
+    if (t <= all_pages.value) {
+      page_input.value = "";
+      change_page(t);
+    }
+  }
+}
+
+function page_input_input(c) {
+  page_input.value = page_input.value.replace(/[^\d]/g, "");
+
+  //console.log(c)
+}
+
+function page_items_input_change(c) {
+  var t = parseInt(page_items_items.value);
+  page_items.value = t;
+  now_page.value = 1;
+  get_orders();
+  //console.log(t)
+}
+
+function page_items_input_input(c) {
+  page_items_items.value = page_items_items.value.replace(/[^\d]/g, "");
+
+  var t = parseInt(page_items_items.value);
+  if (t > 300) {
+    page_items_items.value = "300";
+  }
+
+  //console.log(c)
+}
+
 onMounted(() => {
   functionupdataTitle();
 
@@ -159,8 +240,41 @@ watch(locale, () => {
                       {{ value.Title }}
                     </td>
                     <td>{{ value.Remark }}</td>
-                    <td></td>
+                    <td>
-                    <td>{{myfuncs.formatLocalizedDate(value.CreatedAt,locale)  }}</td>
+                      <!-- <div class="datagrid-content">
+                        <div class="avatar-list avatar-list-stacked">
+                          <span
+                            class="avatar avatar-xs rounded"
+                            style="
+                              background-image: url(./static/avatars/000m.jpg);
+                            "
+                          ></span>
+                          <span class="avatar avatar-xs rounded">JL</span>
+                          <span
+                            class="avatar avatar-xs rounded"
+                            style="
+                              background-image: url(./static/avatars/002m.jpg);
+                            "
+                          ></span>
+                          <span
+                            class="avatar avatar-xs rounded"
+                            style="
+                              background-image: url(./static/avatars/003m.jpg);
+                            "
+                          ></span>
+                          <span
+                            class="avatar avatar-xs rounded"
+                            style="
+                              background-image: url(./static/avatars/000f.jpg);
+                            "
+                          ></span>
+                          <span class="avatar avatar-xs rounded">+3</span>
+                        </div>
+                      </div> -->
+                    </td>
+                    <td>
+                      {{ myfuncs.formatLocalizedDate(value.CreatedAt, locale) }}
+                    </td>
                     <td>{{ myfuncs.formatLocalizedDate(value.UpdatedAt) }}</td>
                     <td></td>
                   </tr>
@@ -189,16 +303,59 @@ watch(locale, () => {
             </div>
             <div class="card-footer d-flex align-items-center">
               <p class="m-0 text-secondary">
-                Showing <span>1</span> to <span>8</span> of
+                {{ t("purchase.show") }}
-                <span>16</span> entries
               </p>
+              <div class="mx-2 d-inline-block">
+                <input
+                  type="text"
+                  class="form-control form-control-sm w-6"
+                  v-model="page_items_items"
+                  aria-label="Invoices count"
+                  @change="page_items_input_change"
+                  @input="page_items_input_input"
+                />
+              </div>
+              <p class="m-0 text-secondary">
+                {{ t("purchase.entries") }}
+                {{ t("purchase.There_are_a_total_of") }} {{ all_items }}
+                {{ t("purchase.entries") }}
+              </p>
+
               <ul class="pagination m-0 ms-auto">
-                <li class="page-item disabled">
+                <li class="page-item" :class="now_page == 1 ? 'disabled' : ''">
-                  <a
+                  <div
                     class="page-link"
-                    href="#"
+                    :tabindex="now_page == 1 ? '-1' : ''"
-                    tabindex="-1"
+                    :aria-disabled="now_page == 1 ? 'true' : ''"
-                    aria-disabled="true"
+                    @click="change_page(1)"
+                  >
+                    <!-- Download SVG icon from http://tabler-icons.io/i/chevron-left -->
+                    <svg
+                      xmlns="http://www.w3.org/2000/svg"
+                      width="24"
+                      height="24"
+                      viewBox="0 0 24 24"
+                      fill="none"
+                      stroke="currentColor"
+                      stroke-width="2"
+                      stroke-linecap="round"
+                      stroke-linejoin="round"
+                      class="icon icon-tabler icons-tabler-outline icon-tabler-arrow-bar-to-left"
+                    >
+                      <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+                      <path d="M10 12l10 0" />
+                      <path d="M10 12l4 4" />
+                      <path d="M10 12l4 -4" />
+                      <path d="M4 4l0 16" />
+                    </svg>
+                  </div>
+                </li>
+                <li class="page-item" :class="now_page == 1 ? 'disabled' : ''">
+                  <div
+                    class="page-link"
+                    :tabindex="now_page == 1 ? '-1' : ''"
+                    :aria-disabled="now_page == 1 ? 'true' : ''"
+                    @click="change_page(now_page - 1)"
                   >
                     <!-- Download SVG icon from http://tabler-icons.io/i/chevron-left -->
                     <svg
@@ -216,19 +373,31 @@ watch(locale, () => {
                       <path stroke="none" d="M0 0h24v24H0z" fill="none" />
                       <path d="M15 6l-6 6l6 6" />
                     </svg>
-                    prev
+                    <!-- prev -->
-                  </a>
+                  </div>
                 </li>
-                <li class="page-item"><a class="page-link" href="#">1</a></li>
+
-                <li class="page-item active">
+                <li
-                  <a class="page-link" href="#">2</a>
+                  v-for="value in range(page_start, page_end)"
+                  class="page-item"
+                  :class="value == now_page ? 'active' : ''"
+                >
+                  <div class="page-link" @click="change_page(value)">
+                    {{ value }}
+                  </div>
                 </li>
-                <li class="page-item"><a class="page-link" href="#">3</a></li>
+
-                <li class="page-item"><a class="page-link" href="#">4</a></li>
+                <li
-                <li class="page-item"><a class="page-link" href="#">5</a></li>
+                  class="page-item"
-                <li class="page-item">
+                  :class="now_page == all_pages ? 'disabled' : ''"
-                  <a class="page-link" href="#">
+                >
-                    next
+                  <div
+                    class="page-link"
+                    :tabindex="now_page == all_pages ? '-1' : ''"
+                    :aria-disabled="now_page == all_pages ? 'true' : ''"
+                    @click="change_page(now_page + 1)"
+                  >
+                    <!-- next -->
                     <!-- Download SVG icon from http://tabler-icons.io/i/chevron-right -->
                     <svg
                       xmlns="http://www.w3.org/2000/svg"
@@ -245,7 +414,48 @@ watch(locale, () => {
                       <path stroke="none" d="M0 0h24v24H0z" fill="none" />
                       <path d="M9 6l6 6l-6 6" />
                     </svg>
-                  </a>
+                  </div>
+                </li>
+
+                <li
+                  class="page-item"
+                  :class="now_page == all_pages ? 'disabled' : ''"
+                >
+                  <div
+                    class="page-link"
+                    :tabindex="now_page == all_pages ? '-1' : ''"
+                    :aria-disabled="now_page == all_pages ? 'true' : ''"
+                    @click="change_page(all_pages)"
+                  >
+                    <!-- Download SVG icon from http://tabler-icons.io/i/chevron-right -->
+                    <svg
+                      xmlns="http://www.w3.org/2000/svg"
+                      width="24"
+                      height="24"
+                      viewBox="0 0 24 24"
+                      fill="none"
+                      stroke="currentColor"
+                      stroke-width="2"
+                      stroke-linecap="round"
+                      stroke-linejoin="round"
+                      class="icon icon-tabler icons-tabler-outline icon-tabler-arrow-bar-to-right"
+                    >
+                      <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+                      <path d="M14 12l-10 0" />
+                      <path d="M14 12l-4 4" />
+                      <path d="M14 12l-4 -4" />
+                      <path d="M20 4l0 16" />
+                    </svg>
+                  </div>
+                </li>
+                <li>
+                  <input
+                    type="text"
+                    class="form-control form-control-sm w-6"
+                    @change="page_input_change"
+                    @input="page_input_input"
+                    v-model="page_input"
+                  />
                 </li>
               </ul>
             </div>