From 4c16617e6c7505c28cef495f878901c80315c464 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=96=87=E5=B3=B0?= Date: Tue, 14 Apr 2026 11:09:04 +0800 Subject: [PATCH] up --- .workbuddy/expert-history.json | 2 +- backend/my_work/routers/apiPurchase.go | 7 +++---- frontend/ops_vue_js/src/i18n/en.json | 2 +- frontend/ops_vue_js/src/i18n/zh-CN.json | 4 ++-- .../ops_vue_js/src/views/purchase/PurchaseList.vue | 10 +++++----- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.workbuddy/expert-history.json b/.workbuddy/expert-history.json index 29a355f..b044854 100644 --- a/.workbuddy/expert-history.json +++ b/.workbuddy/expert-history.json @@ -13,5 +13,5 @@ } ] }, - "lastUpdated": 1776086663736 + "lastUpdated": 1776135998489 } \ No newline at end of file diff --git a/backend/my_work/routers/apiPurchase.go b/backend/my_work/routers/apiPurchase.go index 5918730..07b13cb 100644 --- a/backend/my_work/routers/apiPurchase.go +++ b/backend/my_work/routers/apiPurchase.go @@ -2,7 +2,6 @@ package routers import ( "encoding/json" - "fmt" "ops/models" "strings" "time" @@ -324,7 +323,7 @@ func ApiPurchase(r *gin.RouterGroup) { var jsondata From_purchase_getorders if err := decodeJSON(data, &jsondata); err == nil { - fmt.Println(jsondata) + //fmt.Println(jsondata) is_data_ok := true @@ -373,7 +372,7 @@ func ApiPurchase(r *gin.RouterGroup) { //fmt.Println(user) //DebugPrintJson(data) var jsondata From_purchase_addorder - fmt.Println(data) + //fmt.Println(data) if err := decodeJSON(data, &jsondata); err == nil { //jsonStr, _ := json.MarshalIndent(jsondata, "", " ") @@ -402,7 +401,7 @@ func ApiPurchase(r *gin.RouterGroup) { //判断字符串是否包含标点符号 if models.IsContainsSpecialChar(jsondata.Photos[i]) { is_data_ok = false - fmt.Println("err4") + //fmt.Println("err4") } } diff --git a/frontend/ops_vue_js/src/i18n/en.json b/frontend/ops_vue_js/src/i18n/en.json index 11444c3..1afb601 100644 --- a/frontend/ops_vue_js/src/i18n/en.json +++ b/frontend/ops_vue_js/src/i18n/en.json @@ -80,7 +80,7 @@ "add_part": "Add Order", "exp_report": "Export Report", "There_are_a_total_of": ",There are a total of", - "items": "items.", + "items": "orders.", "order_detail": "Order Detail", "back_to_list": "Back to List", "order_not_found": "Order Not Found", diff --git a/frontend/ops_vue_js/src/i18n/zh-CN.json b/frontend/ops_vue_js/src/i18n/zh-CN.json index bdf9431..a607fff 100644 --- a/frontend/ops_vue_js/src/i18n/zh-CN.json +++ b/frontend/ops_vue_js/src/i18n/zh-CN.json @@ -75,12 +75,12 @@ "completed": "已完成", "pending": "待处理", "show": "显示", - "entries": "个物件", + "entries": "个订单", "search": "搜索", "add_part": "添加订单", "exp_report": "生成报告", "There_are_a_total_of": ",一共", - "items": "个物件", + "items": "个订单", "order_detail": "订单详情", "back_to_list": "返回列表", "order_not_found": "订单不存在", diff --git a/frontend/ops_vue_js/src/views/purchase/PurchaseList.vue b/frontend/ops_vue_js/src/views/purchase/PurchaseList.vue index a3e1637..ca15403 100644 --- a/frontend/ops_vue_js/src/views/purchase/PurchaseList.vue +++ b/frontend/ops_vue_js/src/views/purchase/PurchaseList.vue @@ -120,12 +120,12 @@ onMounted(fetchOrders) - - - + + + - - + +
No.{{ t('purchase.item_name') }}{{ t('purchase.purpose') }}No.{{ t('purchase.item_name') }}{{ t('purchase.purpose') }}{{ t('purchase.created_at') }}{{ t('purchase.status') }}{{ t('purchase.created_at') }}{{ t('purchase.status') }}