xyvcard-order 0.0.6 → 0.0.8

package/dts/src/api/order-logistics/types.d.ts

@@ -1,80 +1,21 @@
-import type { EntityApi, EntityReq, EntityModel, EntityList, EntityPage, EntityTotal, EntityKey, EntityKeyList, EntityCreateReq, EntityUpdateReq } from "jmash-core";
+import type { EntityApi, EntityKey, EntityList, EntityModel } from "jmash-core";
 export interface OrderLogisticsApi extends EntityApi {
 }
-export interface OrderLogisticsReq extends EntityReq {
-    logisticsId?: string;
-}
 export interface OrderLogisticsModel extends EntityModel {
     logisticsId?: string;
-    orderId?: string;
-    orderItemId?: string;
-    logisticsMchCode?: string;
-    logisticsMchName?: string;
-    logisticsNo?: string;
-    deliveryTime?: string;
-    status?: string;
-    isCheck?: boolean;
-    receiverTime?: string;
-    message?: string;
-    createTime?: string;
-    createBy?: string;
-    updateBy?: string;
-    updateTime?: string;
-}
-export interface OrderLogisticsList extends EntityList {
-    results: Array<OrderLogisticsModel>;
-}
-export interface OrderLogisticsPage extends EntityPage {
-    results: Array<OrderLogisticsModel>;
-    subTotalDto: OrderLogisticsModelTotal;
-    totalDto: OrderLogisticsModelTotal;
-}
-export interface OrderLogisticsModelTotal extends EntityTotal {
-    totalSize: number;
 }
 export interface OrderLogisticsKey extends EntityKey {
     tenant?: string;
     logisticsId?: string;
 }
-export interface OrderLogisticsKeyList extends EntityKeyList {
-    tenant?: string;
-    logisticsId?: Array<string>;
-}
-export interface OrderLogisticsCreateReq extends EntityCreateReq {
-    logisticsId?: string;
-    orderId?: string;
-    orderItemId?: string;
-    logisticsMchCode?: string;
-    logisticsMchName?: string;
-    logisticsNo?: string;
-    deliveryTime?: string;
-    status?: string;
-    isCheck?: boolean;
-    receiverTime?: string;
-    message?: string;
-}
-export interface OrderLogisticsUpdateReq extends EntityUpdateReq {
-    logisticsId?: string;
-    orderId?: string;
-    orderItemId?: string;
-    logisticsMchCode?: string;
-    logisticsMchName?: string;
-    logisticsNo?: string;
-    deliveryTime?: string;
-    status?: string;
-    isCheck?: boolean;
-    receiverTime?: string;
-    message?: string;
-}
-export type OrderLogisticsFormReq = OrderLogisticsCreateReq | OrderLogisticsUpdateReq;
 export interface LogisticsQueryReq {
     orderId?: string;
     orderItemId?: string;
 }
-export interface LogisticsInfoList {
+export interface LogisticsInfoList extends EntityList {
     list: Array<LogisticsInfoModel>;
 }
-export interface LogisticsInfoModel {
+export interface LogisticsInfoModel extends EntityModel {
     time?: string;
     context?: string;
     ftime?: string;

package/dts/src/api/order-refunds/index.d.ts

@@ -5,8 +5,6 @@ declare class OrderRefundsApiImpl implements OrderRefundsApi {
     findPage(query?: OrderRefundsReq): AxiosPromise<OrderRefundsPage>;
     findList(query?: OrderRefundsReq): AxiosPromise<OrderRefundsList>;
     findById(query: OrderRefundsKey): AxiosPromise<OrderInfoRefundModel>;
-    delete(query: OrderRefundsKey): AxiosPromise<OrderInfoRefundModel>;
-    batchDelete(keys: OrderRefundsKey[]): AxiosPromise<number>;
     update(data: OrderRefundsUpdateReq): AxiosPromise<OrderRefundsModel>;
     refund(data: OrderRefundReq): AxiosPromise<boolean>;
 }

package/dts/src/constant.d.ts

@@ -15,19 +15,21 @@ export declare class Constant {
     static readonly ENUM_PAYMENT_WAY = "xyvcard.order.protobuf.PaymentWay";
     static readonly ENUM_DELIVERY_WAY = "xyvcard.order.protobuf.DeliveryWay";
     static readonly ENUM_POST_TYPE = "xyvcard.order.protobuf.PostType";
-    static readonly logisticsDelivery = "logistics_delivery";
+    static readonly LOGISTICS_DELIVERY = "logistics_delivery";
     static readonly EXPRESS_COMPANY_CODE = "ExpressCompanyCode";
-    static readonly unpay = "unpay";
-    static readonly unpost = "unpost";
-    static readonly unreceive = "unreceive";
-    static readonly cancel = "cancel";
-    static readonly complete = "complete";
-    static readonly unpaid = "unpaid";
-    static readonly paid = "paid";
-    static readonly partPaid = "part_paid";
+    static readonly UNPAY = "unpay";
+    static readonly UNPOST = "unpost";
+    static readonly UNRECEIVE = "unreceive";
+    static readonly CANCEL = "cancel";
+    static readonly COMPLETE = "complete";
+    static readonly UNPAID = "unpaid";
+    static readonly PAID = "paid";
+    static readonly PART_PAID = "part_paid";
     static readonly REFUND_APPLY_STATUS = "xyvcard.order.protobuf.RefundApplyStatus";
+    static readonly PASS = "pass";
+    static readonly APPLY = "apply";
     static readonly ENUM_REFUND_TYPE = "xyvcard.order.protobuf.RefundType";
-    static readonly returnRefund = "RETURN_REFUND";
+    static readonly RETURN_REFUND = "RETURN_REFUND";
     static readonly AUDIT_OPINION: globalThis.Ref<{
         key: boolean;
         value: string;

package/dts/src/lang/order/zh-cn.d.ts

@@ -77,8 +77,8 @@ declare const _default: {
         viewLogist: string;
         postType: string;
         postTypeRequired: string;
-        logisticCode: string;
-        logisticCodeRequired: string;
+        logisticsCode: string;
+        logisticCodesRequired: string;
         logisticsNo: string;
         logisticsNoRequired: string;
     };

package/dts/src/main.d.ts

@@ -3,4 +3,3 @@ import "element-plus/dist/index.css";
 import "jmash-core/dist/style.css";
 import "jmash-dict/dist/style.css";
 import "jmash-rbac/dist/style.css";
-import "xyvcard-shop/dist/style.css";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xyvcard-order",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "private": false,
   "module": "dist/index.mjs",
   "types": "dts/src/index.d.ts",
@@ -11,14 +11,15 @@
   "peerDependencies": {
     "axios": "^1.7.7",
     "element-plus": "^2.8.7",
-    "jmash-core": "^0.0.102",
+    "jmash-core": "^0.0.108",
     "jmash-dict": "^0.0.44",
-    "jmash-rbac": "^0.0.35",
+    "jmash-rbac": "^0.0.40",
     "pinia": "^2.2.4",
     "vue": "^3.5.11",
     "vue-i18n": "^9.14.1",
     "vue-router": "^4.4.5",
-    "xyvcard-shop": "^0.0.17"
+    "xyvcard-shop": "^0.0.17",
+    "xyvcard-shell": "^0.0.8"
   },
   "devDependencies": {
     "@eslint/js": "^9.16.0",

package/dist/index-BGDa_EK1.mjs

@@ -1,439 +0,0 @@
-import { defineComponent as oe, getCurrentInstance as te, ref as R, reactive as re, resolveComponent as i, resolveDirective as ne, openBlock as p, createElementBlock as D, createElementVNode as s, createVNode as t, withCtx as r, unref as n, withKeys as $, createTextVNode as C, toDisplayString as a, withDirectives as I, createBlock as _, isRef as M, createCommentVNode as N } from "vue";
-import { ElMessageBox as ae, ElMessage as j } from "element-plus";
-import { useTableHooks as de } from "jmash-core";
-import { useI18n as ue } from "vue-i18n";
-import { o as q } from "./index-BnhfSp6U.mjs";
-import { _ as se } from "./review.vue_vue_type_script_setup_true_lang-BER9b6r2.mjs";
-import { _ as ie } from "./info.vue_vue_type_script_setup_true_lang-CHaAOFGr.mjs";
-import { D as w } from "./index-suIgymdy.mjs";
-const me = { class: "app-container" }, fe = { class: "search-container" }, pe = { class: "orderPrice" }, ce = ["onClick"], ve = ["onClick"], ye = ["onClick"], be = ["onClick"], Te = /* @__PURE__ */ oe({
-  __name: "index",
-  setup(Re) {
-    const { t: m } = ue(), { proxy: z } = te();
-    w.shopBizDict.useValues();
-    const k = R([]), d = R({
-      curPage: 1,
-      pageSize: 10
-    }), {
-      tableHooks: u,
-      multipleTableRef: B,
-      queryFormRef: Q,
-      listLoading: A,
-      tableData: K,
-      total: h
-    } = de(m, q, d);
-    let v = R([
-      {
-        label: "orderInfo.shopName",
-        prop: "shopId",
-        width: "200",
-        slotName: "shopId",
-        columnType: "slot",
-        isColumn: !0
-      },
-      {
-        label: "orderRefunds.createTime",
-        prop: "createTime",
-        width: "200",
-        slotName: "createTime",
-        columnType: "slot",
-        isColumn: !0
-      },
-      {
-        label: "orderRefunds.order",
-        prop: "order",
-        width: "250",
-        slotName: "order",
-        columnType: "slot",
-        isColumn: !0
-      },
-      {
-        label: "orderRefunds.refundStatus",
-        prop: "status",
-        width: "100",
-        slotName: "refundStatus",
-        columnType: "slot",
-        isColumn: !0
-      },
-      {
-        label: "orderRefunds.refundAmount",
-        prop: "refundAmount",
-        width: "100",
-        isColumn: !0
-      },
-      {
-        label: "orderRefunds.refundCode",
-        prop: "refundCode",
-        width: "250",
-        isColumn: !0
-      },
-      {
-        label: "orderRefunds.refundReson",
-        prop: "refundReson",
-        width: "200",
-        isColumn: !0
-      },
-      {
-        label: "orderRefunds.refuseRefundReson",
-        prop: "refuseRefundReson",
-        width: "200",
-        isColumn: !0
-      },
-      {
-        label: "common.operate",
-        width: "250",
-        slotName: "operation",
-        columnType: "slot",
-        fixed: "right",
-        isColumn: !0
-      }
-    ]);
-    const y = R({
-      title: m("orderRefunds.refundOperation"),
-      visible: !1
-    }), b = R({
-      title: m("orderRefunds.info"),
-      visible: !1
-    });
-    let g = re({});
-    function L(o) {
-      g.refundId = o.refundId, y.value.visible = !0;
-    }
-    const H = async (o) => {
-      ae.confirm(
-        m("orderRefunds.refundConfirm"),
-        m("orderRefunds.refund"),
-        {
-          confirmButtonText: m("common.confirm"),
-          cancelButtonText: m("common.cancel"),
-          type: "warning"
-        }
-      ).then(() => {
-        q.refund({
-          refundId: o.refundId,
-          requestId: Math.random() * 10 + ""
-        }).then((l) => {
-          l.status === 200 && (j({
-            message: m("orderRefunds.refundSuccess"),
-            type: "success"
-          }), u.handleQuery());
-        }).catch((l) => {
-          console.error("Error canceling order:", l), j({
-            message: m("orderRefunds.refundFailed"),
-            type: "error"
-          });
-        });
-      }).catch(() => {
-      });
-    };
-    function O(o) {
-      g.refundId = o.refundId, b.value.visible = !0;
-    }
-    function F(o) {
-      d.value.startCreateTime = o[0], d.value.endCreateTime = o[1];
-    }
-    function W() {
-      k.value = [], d.value.startCreateTime = "", d.value.endCreateTime = "", u.resetQuery();
-    }
-    function G(o) {
-      u.selectionRows.value = o;
-    }
-    function Y(o) {
-      o && u.getList();
-    }
-    return u.getList(), (o, l) => {
-      const E = i("jmash-select"), c = i("el-form-item"), f = i("el-col"), U = i("el-input"), V = i("el-row"), J = i("el-date-picker"), T = i("el-button"), X = i("el-form"), Z = i("jmash-column-select"), x = i("jmash-table"), ee = i("jmash-pagination"), le = i("el-card"), P = ne("hasPerm");
-      return p(), D("div", me, [
-        s("div", fe, [
-          t(X, {
-            ref_key: "queryFormRef",
-            ref: Q,
-            model: d.value,
-            inline: !0
-          }, {
-            default: r(() => [
-              t(V, null, {
-                default: r(() => [
-                  t(f, { span: 6 }, {
-                    default: r(() => [
-                      t(c, {
-                        label: o.$t("orderRefunds.shopName"),
-                        prop: "shopId"
-                      }, {
-                        default: r(() => [
-                          t(E, {
-                            modelValue: d.value.shopId,
-                            "onUpdate:modelValue": l[0] || (l[0] = (e) => d.value.shopId = e),
-                            data: n(w).shopBizDict.values,
-                            placeholder: o.$t("orderRefunds.shopNameRequired"),
-                            clearable: "",
-                            onKeyup: l[1] || (l[1] = $((e) => n(u).handleQuery(), ["enter"]))
-                          }, null, 8, ["modelValue", "data", "placeholder"])
-                        ]),
-                        _: 1
-                      }, 8, ["label"])
-                    ]),
-                    _: 1
-                  }),
-                  t(f, { span: 6 }, {
-                    default: r(() => [
-                      t(c, {
-                        label: o.$t("orderRefunds.refundCode"),
-                        prop: "likeOrderCode"
-                      }, {
-                        default: r(() => [
-                          t(U, {
-                            modelValue: d.value.likeOrderCode,
-                            "onUpdate:modelValue": l[2] || (l[2] = (e) => d.value.likeOrderCode = e),
-                            placeholder: o.$t("orderRefunds.refundCodeRequired"),
-                            clearable: "",
-                            onKeyup: l[3] || (l[3] = $((e) => n(u).handleQuery(), ["enter"])),
-                            class: "!w-[203px]"
-                          }, null, 8, ["modelValue", "placeholder"])
-                        ]),
-                        _: 1
-                      }, 8, ["label"])
-                    ]),
-                    _: 1
-                  }),
-                  t(f, { span: 6 }, {
-                    default: r(() => [
-                      t(c, {
-                        label: o.$t("orderRefunds.spuName"),
-                        prop: "likeSpuName"
-                      }, {
-                        default: r(() => [
-                          t(U, {
-                            modelValue: d.value.likeSpuName,
-                            "onUpdate:modelValue": l[4] || (l[4] = (e) => d.value.likeSpuName = e),
-                            placeholder: o.$t("orderRefunds.spuNameRequired"),
-                            clearable: "",
-                            onKeyup: l[5] || (l[5] = $((e) => n(u).handleQuery(), ["enter"])),
-                            class: "!w-[203px]"
-                          }, null, 8, ["modelValue", "placeholder"])
-                        ]),
-                        _: 1
-                      }, 8, ["label"])
-                    ]),
-                    _: 1
-                  }),
-                  t(f, { span: 6 }, {
-                    default: r(() => [
-                      t(c, {
-                        label: o.$t("orderRefunds.refundStatus"),
-                        prop: "refundStatus"
-                      }, {
-                        default: r(() => [
-                          t(E, {
-                            modelValue: d.value.refundStatus,
-                            "onUpdate:modelValue": l[6] || (l[6] = (e) => d.value.refundStatus = e),
-                            data: n(w).refundApplyEnum.values,
-                            placeholder: o.$t("orderRefunds.refundStatusRequired"),
-                            clearable: "",
-                            onKeyup: l[7] || (l[7] = $((e) => n(u).handleQuery(), ["enter"]))
-                          }, null, 8, ["modelValue", "data", "placeholder"])
-                        ]),
-                        _: 1
-                      }, 8, ["label"])
-                    ]),
-                    _: 1
-                  })
-                ]),
-                _: 1
-              }),
-              t(V, null, {
-                default: r(() => [
-                  t(f, { span: 6 }, {
-                    default: r(() => [
-                      t(c, {
-                        label: o.$t("orderRefunds.refundsTime"),
-                        prop: "startCreateTime"
-                      }, {
-                        default: r(() => [
-                          t(J, {
-                            modelValue: k.value,
-                            "onUpdate:modelValue": l[8] || (l[8] = (e) => k.value = e),
-                            class: "dropdown-left",
-                            type: "daterange",
-                            "start-placeholder": o.$t("orderRefunds.startCreateTime"),
-                            "end-placeholder": o.$t("orderRefunds.endCreateTime"),
-                            format: "YYYY-MM-DD",
-                            "value-format": "YYYY-MM-DD",
-                            onChange: F
-                          }, null, 8, ["modelValue", "start-placeholder", "end-placeholder"])
-                        ]),
-                        _: 1
-                      }, 8, ["label"])
-                    ]),
-                    _: 1
-                  }),
-                  t(f, { span: 18 }, {
-                    default: r(() => [
-                      t(c, { class: "search-btn" }, {
-                        default: r(() => [
-                          t(T, {
-                            type: "primary",
-                            onClick: l[9] || (l[9] = (e) => n(u).handleQuery())
-                          }, {
-                            default: r(() => [
-                              C(a(o.$t("common.search")), 1)
-                            ]),
-                            _: 1
-                          }),
-                          t(T, { onClick: W }, {
-                            default: r(() => [
-                              C(a(o.$t("common.reset")), 1)
-                            ]),
-                            _: 1
-                          })
-                        ]),
-                        _: 1
-                      })
-                    ]),
-                    _: 1
-                  })
-                ]),
-                _: 1
-              })
-            ]),
-            _: 1
-          }, 8, ["model"]),
-          l[18] || (l[18] = s("div", { class: "clear" }, null, -1))
-        ]),
-        t(le, {
-          shadow: "never",
-          class: "table-container"
-        }, {
-          header: r(() => [
-            t(V, null, {
-              default: r(() => [
-                t(f, { span: 17 }, {
-                  default: r(() => [
-                    I((p(), _(T, {
-                      type: "primary",
-                      onClick: l[10] || (l[10] = (e) => n(u).deleteRecords())
-                    }, {
-                      default: r(() => [
-                        C(a(o.$t("common.batchDelete")), 1)
-                      ]),
-                      _: 1
-                    })), [
-                      [P, ["order:order_refunds:delete"]]
-                    ])
-                  ]),
-                  _: 1
-                }),
-                t(f, {
-                  span: 7,
-                  class: "container-float"
-                }, {
-                  default: r(() => [
-                    t(Z, {
-                      modelValue: n(v),
-                      "onUpdate:modelValue": l[11] || (l[11] = (e) => M(v) ? v.value = e : v = e),
-                      "label-name": "order/order-refunds"
-                    }, null, 8, ["modelValue"])
-                  ]),
-                  _: 1
-                })
-              ]),
-              _: 1
-            })
-          ]),
-          footer: r(() => [
-            n(h) > 0 ? (p(), _(ee, {
-              key: 0,
-              total: n(h),
-              "onUpdate:total": l[12] || (l[12] = (e) => M(h) ? h.value = e : null),
-              "current-page": d.value.curPage,
-              "onUpdate:currentPage": l[13] || (l[13] = (e) => d.value.curPage = e),
-              "page-size": d.value.pageSize,
-              "onUpdate:pageSize": l[14] || (l[14] = (e) => d.value.pageSize = e),
-              onPagination: l[15] || (l[15] = (e) => n(u).getList())
-            }, null, 8, ["total", "current-page", "page-size"])) : N("", !0)
-          ]),
-          default: r(() => [
-            t(x, {
-              ref_key: "multipleTableRef",
-              ref: B,
-              "row-key": "refundId",
-              "list-loading": n(A),
-              data: n(K),
-              "table-label": n(v),
-              onSelectionChange: G
-            }, {
-              createTime: r((e) => [
-                s("span", null, a(n(z).$moment.formatDate(
-                  e.data.row.createTime,
-                  "YYYY-MM-DD HH:mm:ss"
-                )), 1)
-              ]),
-              order: r((e) => [
-                s("div", null, [
-                  s("div", null, a(o.$t("orderRefunds.orderCode")) + "：" + a(e.data.row.orderCode), 1),
-                  s("div", null, a(o.$t("orderRefunds.orderPrice")) + "：￥" + a(e.data.row.orderPrice), 1),
-                  s("div", null, a(o.$t("orderRefunds.freightPrice")) + "：+￥" + a(e.data.row.freightPrice), 1),
-                  s("div", null, a(o.$t("orderRefunds.paymentCouponPrice")) + "：-￥" + a(e.data.row.paymentCouponPrice), 1),
-                  s("div", pe, a(o.$t("orderRefunds.paidPrice")) + "： " + a(e.data.row.orderPrice + e.data.row.freightPrice - e.data.row.paymentCouponPrice), 1),
-                  s("div", null, a(o.$t("orderRefunds.paymentWay")) + "： " + a(n(w).paymentWayEnum.getEnumValue(e.data.row.paymentWay)), 1)
-                ])
-              ]),
-              refundStatus: r((e) => [
-                s("span", null, a(n(w).refundApplyEnum.getEnumValue(e.data.row.status)), 1)
-              ]),
-              operation: r((e) => [
-                I((p(), D("span", {
-                  class: "el-button-color dropdown-left",
-                  onClick: (S) => n(u).deleteRecord(e.data.row)
-                }, [
-                  C(a(o.$t("common.delete")), 1)
-                ], 8, ce)), [
-                  [P, ["order:order_refunds:delete"]]
-                ]),
-                I((p(), D("span", {
-                  class: "el-button-color dropdown-left",
-                  onClick: (S) => O(e.data.row)
-                }, [
-                  C(a(o.$t("common.view")), 1)
-                ], 8, ve)), [
-                  [P, ["order:order_refunds:view"]]
-                ]),
-                s("span", {
-                  class: "el-button-color dropdown-left",
-                  onClick: (S) => L(e.data.row)
-                }, a(o.$t("orderRefunds.refundReview")), 9, ye),
-                s("span", {
-                  class: "el-button-color dropdown-left",
-                  onClick: (S) => H(e.data.row)
-                }, a(o.$t("orderRefunds.refund")), 9, be)
-              ]),
-              _: 1
-            }, 8, ["list-loading", "data", "table-label"])
-          ]),
-          _: 1
-        }),
-        y.value.visible ? (p(), _(se, {
-          key: 0,
-          modelValue: y.value.visible,
-          "onUpdate:modelValue": l[16] || (l[16] = (e) => y.value.visible = e),
-          title: y.value.title,
-          "entity-key": n(g),
-          onRefresh: Y,
-          width: "800px"
-        }, null, 8, ["modelValue", "title", "entity-key"])) : N("", !0),
-        b.value.visible ? (p(), _(ie, {
-          key: 1,
-          modelValue: b.value.visible,
-          "onUpdate:modelValue": l[17] || (l[17] = (e) => b.value.visible = e),
-          title: b.value.title,
-          "entity-key": n(g),
-          onRefresh: Y,
-          width: "600px"
-        }, null, 8, ["modelValue", "title", "entity-key"])) : N("", !0)
-      ]);
-    };
-  }
-});
-export {
-  Te as default
-};