xyvcard-paper-buyer 0.0.42 → 0.0.43

package/dist/{applyEdit-PZxjIdlm.mjs → applyEdit-DzxmV4oI.mjs}

@@ -3,8 +3,8 @@ import { useI18n as O } from "vue-i18n";
 import "element-plus";
 import { routerUtil as D } from "jmash-core";
 import { useRouter as Q, useRoute as W } from "vue-router";
-import { D as U } from "./index-CUfcoWMj.mjs";
-import { _ as X, u as Y } from "./userInvoice.vue_vue_type_script_setup_true_lang-BaWmhSHl.mjs";
+import { D as U } from "./index-BPKQNnjE.mjs";
+import { _ as X, u as Y } from "./userInvoice.vue_vue_type_script_setup_true_lang-D-3fXoBu.mjs";
 import { o as Z } from "./index-BKZPqxLM.mjs";
 import { E as x } from "./el-message-VSzNakoG.mjs";
 import { _ as ee } from "./_plugin-vue_export-helper-CHgC5LLL.mjs";

package/dist/{edit--iYDGPN6.mjs → edit-DwsTiwF8.mjs}

@@ -1,10 +1,11 @@
-import { defineComponent as S, mergeModels as y, ref as f, reactive as A, useModel as T, resolveComponent as m, createBlock as D, openBlock as J, withCtx as a, createVNode as l, unref as d, createElementVNode as z, createTextVNode as q, toDisplayString as R } from "vue";
+import { defineComponent as S, mergeModels as y, ref as c, reactive as A, useModel as T, resolveComponent as m, createBlock as D, openBlock as J, withCtx as a, createVNode as l, unref as d, createElementVNode as L, createTextVNode as R, toDisplayString as q } from "vue";
 import { ElMessage as w } from "element-plus";
-import { JmashRegionTree as C, dictRegionApi as G } from "jmash-region";
-import { useI18n as H } from "vue-i18n";
+import { JmashRegionTree as z, dictRegionApi as C } from "jmash-region";
+import { useI18n as G } from "vue-i18n";
 import { o as h } from "./index-BP8zUjOw.mjs";
-import { _ as L } from "./_plugin-vue_export-helper-CHgC5LLL.mjs";
-const Q = { class: "dialog-footer" }, W = /* @__PURE__ */ S({
+import { validatePhoneOrLandline as H } from "jmash-core";
+import { _ as Q } from "./_plugin-vue_export-helper-CHgC5LLL.mjs";
+const W = { class: "dialog-footer" }, X = /* @__PURE__ */ S({
   __name: "edit",
   props: /* @__PURE__ */ y({
     entityKey: {
@@ -17,52 +18,51 @@ const Q = { class: "dialog-footer" }, W = /* @__PURE__ */ S({
     modelModifiers: {}
   }),
   emits: /* @__PURE__ */ y(["refresh"], ["update:modelValue"]),
-  setup(b, { emit: I }) {
-    const { t: u } = H(), g = f();
+  setup(g, { emit: I }) {
+    const { t: i } = G(), v = c();
     let t = A({
       requestId: Math.random() * 10 + "",
       updateMask: "note,userName,mobilePhone,provinceName,detailInfo"
     });
-    const $ = (e, r, o) => {
-      r && !/^(((\d{3,4}-)?[0-9]{7,8})|(1(3|4|5|6|7|8|9)\d{9}))$/.test(r) ? o(new Error(u("orderUserAddress.mobilePhoneTrueRequired"))) : o();
-    }, P = A({
+    const P = (e, r, o) => {
+      r && (H(r) || o(new Error(i("orderUserAddress.mobilePhoneTrueRequired")))), o();
+    }, $ = A({
       note: [
         {
           required: !0,
-          message: u("orderUserAddress.noteRequired"),
+          message: i("orderUserAddress.noteRequired"),
           trigger: "change"
         }
       ],
       userName: [
         {
           required: !0,
-          message: u("orderUserAddress.userNameRequired"),
+          message: i("orderUserAddress.userNameRequired"),
           trigger: "change"
         }
       ],
       mobilePhone: [
         {
-          required: !0,
-          validator: $,
+          validator: P,
           trigger: "blur"
         }
       ],
       detailInfo: [
         {
           required: !0,
-          message: u("orderUserAddress.detailInfoRequired"),
+          message: i("orderUserAddress.detailInfoRequired"),
           trigger: "change"
         }
       ],
       provinceName: [
         {
           required: !0,
-          message: u("orderUserAddress.provinceNameRequired"),
+          message: i("orderUserAddress.provinceNameRequired"),
           trigger: "change"
         }
       ]
-    }), i = T(b, "modelValue"), v = b, N = I, M = Object.keys(v.entityKey), _ = f(M.length >= 1);
-    _.value && h.findById(v.entityKey).then(({ data: e }) => {
+    }), u = T(g, "modelValue"), b = g, N = I, M = Object.keys(b.entityKey), _ = c(M.length >= 1);
+    _.value && h.findById(b.entityKey).then(({ data: e }) => {
       Object.assign(t, e);
     });
     function k() {
@@ -70,23 +70,23 @@ const Q = { class: "dialog-footer" }, W = /* @__PURE__ */ S({
         t.cityName = e;
       });
     }
-    const c = f(/* @__PURE__ */ new Map());
+    const f = c(/* @__PURE__ */ new Map());
     async function B(e) {
       if (!e)
         return "";
-      if (c.value.has(e))
-        return c.value.get(e) || e;
+      if (f.value.has(e))
+        return f.value.get(e) || e;
       try {
-        const r = await G.findByCode({
+        const r = await C.findByCode({
           regionCode: e
         });
         if (r.data) {
           const o = F(r.data);
-          return c.value.set(e, o), o;
+          return f.value.set(e, o), o;
         }
         return e;
       } catch {
-        return c.value.set(e, e), e;
+        return f.value.set(e, e), e;
       }
     }
     function F(e) {
@@ -98,56 +98,56 @@ const Q = { class: "dialog-footer" }, W = /* @__PURE__ */ S({
     }
     const j = async () => {
       var e;
-      await ((e = g.value) == null ? void 0 : e.validate((r) => {
+      await ((e = v.value) == null ? void 0 : e.validate((r) => {
         r && (_.value ? h.update(t).then((o) => {
           o.status === 200 && (w({
-            message: u("common.submitSuccess"),
+            message: i("common.submitSuccess"),
             type: "success"
-          }), i.value && (i.value = !1), N("refresh", o.status === 200));
+          }), u.value && (u.value = !1), N("refresh", o.status === 200));
         }) : h.create(t).then((o) => {
           o.status === 200 && (w({
-            message: u("common.submitSuccess"),
+            message: i("common.submitSuccess"),
             type: "success"
-          }), i.value && (i.value = !1), N("refresh", o.status === 200));
+          }), u.value && (u.value = !1), N("refresh", o.status === 200));
         }));
       }));
     };
-    function V() {
-      i.value && (i.value = !1);
+    function U() {
+      u.value && (u.value = !1);
     }
     return (e, r) => {
-      const o = m("el-input"), s = m("el-form-item"), p = m("el-col"), E = m("el-row"), K = m("el-form"), U = m("el-button"), O = m("el-dialog");
-      return J(), D(O, {
-        modelValue: i.value,
-        "onUpdate:modelValue": r[5] || (r[5] = (n) => i.value = n),
-        onClose: V
+      const o = m("el-input"), s = m("el-form-item"), p = m("el-col"), E = m("el-row"), O = m("el-form"), V = m("el-button"), K = m("el-dialog");
+      return J(), D(K, {
+        modelValue: u.value,
+        "onUpdate:modelValue": r[5] || (r[5] = (n) => u.value = n),
+        onClose: U
       }, {
         footer: a(() => [
-          z("div", Q, [
-            l(U, { onClick: V }, {
+          L("div", W, [
+            l(V, { onClick: U }, {
               default: a(() => [
-                q(R(e.$t("common.cancel")), 1)
+                R(q(e.$t("common.cancel")), 1)
               ]),
               _: 1
             }),
-            l(U, {
+            l(V, {
               type: "primary",
               onClick: j
             }, {
               default: a(() => [
-                q(R(e.$t("common.confirm")), 1)
+                R(q(e.$t("common.confirm")), 1)
               ]),
               _: 1
             })
           ])
         ]),
         default: a(() => [
-          l(K, {
+          l(O, {
             ref_key: "orderUserAddressFormRef",
-            ref: g,
+            ref: v,
             model: d(t),
             "label-position": "top",
-            rules: P
+            rules: $
           }, {
             default: a(() => [
               l(E, { gutter: 20 }, {
@@ -216,11 +216,11 @@ const Q = { class: "dialog-footer" }, W = /* @__PURE__ */ S({
                     default: a(() => [
                       l(s, {
                         prop: "provinceName",
-                        label: d(u)("orderUserAddress.detailInfo"),
+                        label: d(i)("orderUserAddress.detailInfo"),
                         class: "form-item"
                       }, {
                         default: a(() => [
-                          l(d(C), {
+                          l(d(z), {
                             modelValue: d(t).provinceName,
                             "onUpdate:modelValue": r[3] || (r[3] = (n) => d(t).provinceName = n),
                             placeholder: e.$t("orderUserAddress.provinceNameRequired"),
@@ -262,7 +262,7 @@ const Q = { class: "dialog-footer" }, W = /* @__PURE__ */ S({
       }, 8, ["modelValue"]);
     };
   }
-}), oe = /* @__PURE__ */ L(W, [["__scopeId", "data-v-42b751e7"]]);
+}), te = /* @__PURE__ */ Q(X, [["__scopeId", "data-v-390f0c01"]]);
 export {
-  oe as default
+  te as default
 };

package/dist/{edit-DxbJEXn-.mjs → edit-Omp_CxC3.mjs}

@@ -1,12 +1,13 @@
-import { defineComponent as B, mergeModels as b, ref as _, reactive as N, useModel as E, resolveComponent as i, createBlock as T, openBlock as j, withCtx as t, createVNode as o, unref as s, createElementVNode as D, createTextVNode as v, toDisplayString as V } from "vue";
-import { ElMessage as S } from "element-plus";
-import { JmashRegionTree as J, dictRegionApi as K } from "jmash-region";
-import { useI18n as O } from "vue-i18n";
-import { o as z } from "./index-BP8zUjOw.mjs";
+import { defineComponent as B, mergeModels as _, ref as b, reactive as v, useModel as E, resolveComponent as m, createBlock as T, openBlock as j, withCtx as t, createVNode as o, unref as s, createElementVNode as D, createTextVNode as N, toDisplayString as U } from "vue";
+import { ElMessage as O } from "element-plus";
+import { JmashRegionTree as S, dictRegionApi as J } from "jmash-region";
+import { useI18n as K } from "vue-i18n";
+import { o as L } from "./index-BP8zUjOw.mjs";
+import { validatePhoneOrLandline as z } from "jmash-core";
 import { _ as C } from "./_plugin-vue_export-helper-CHgC5LLL.mjs";
 const G = { class: "dialog-footer" }, H = /* @__PURE__ */ B({
   __name: "edit",
-  props: /* @__PURE__ */ b({
+  props: /* @__PURE__ */ _({
     entityKey: {
       type: Object,
       default: () => {
@@ -16,118 +17,117 @@ const G = { class: "dialog-footer" }, H = /* @__PURE__ */ B({
     modelValue: { type: Boolean },
     modelModifiers: {}
   }),
-  emits: /* @__PURE__ */ b(["refresh"], ["update:modelValue"]),
-  setup(U, { emit: A }) {
-    const { t: u } = O(), f = _();
-    let a = N({
+  emits: /* @__PURE__ */ _(["refresh"], ["update:modelValue"]),
+  setup(V, { emit: A }) {
+    const { t: i } = K(), c = b();
+    let a = v({
       requestId: Math.random() * 10 + "",
       updateMask: ""
     });
-    const q = (e, r, l) => {
-      r && !/^(((\d{3,4}-)?[0-9]{7,8})|(1(3|4|5|6|7|8|9)\d{9}))$/.test(r) ? l(new Error(u("orderUserAddress.mobilePhoneTrueRequired"))) : l();
-    }, R = N({
+    const R = (e, r, l) => {
+      r && (z(r) || l(new Error(i("orderUserAddress.mobilePhoneTrueRequired")))), l();
+    }, q = v({
       note: [
         {
           required: !0,
-          message: u("orderUserAddress.noteRequired"),
+          message: i("orderUserAddress.noteRequired"),
           trigger: "change"
         }
       ],
       userName: [
         {
           required: !0,
-          message: u("orderUserAddress.userNameRequired"),
+          message: i("orderUserAddress.userNameRequired"),
           trigger: "change"
         }
       ],
       mobilePhone: [
         {
-          required: !0,
-          validator: q,
+          validator: R,
           trigger: "blur"
         }
       ],
       detailInfo: [
         {
           required: !0,
-          message: u("orderUserAddress.detailInfoRequired"),
+          message: i("orderUserAddress.detailInfoRequired"),
           trigger: "change"
         }
       ],
       provinceName: [
         {
           required: !0,
-          message: u("orderUserAddress.provinceNameRequired"),
+          message: i("orderUserAddress.provinceNameRequired"),
           trigger: "change"
         }
       ]
-    }), m = E(U, "modelValue"), w = A;
+    }), u = E(V, "modelValue"), w = A;
     function y() {
-      a.provinceName && $(a.provinceName).then((e) => {
+      a.provinceName && I(a.provinceName).then((e) => {
         a.cityName = e;
       });
     }
-    const c = _(/* @__PURE__ */ new Map());
-    async function $(e) {
+    const f = b(/* @__PURE__ */ new Map());
+    async function I(e) {
       if (!e)
         return "";
-      if (c.value.has(e))
-        return c.value.get(e) || e;
+      if (f.value.has(e))
+        return f.value.get(e) || e;
       try {
-        const r = await K.findByCode({
+        const r = await J.findByCode({
           regionCode: e
         });
         if (r.data) {
-          const l = I(r.data);
-          return c.value.set(e, l), l;
+          const l = P(r.data);
+          return f.value.set(e, l), l;
         }
         return e;
       } catch {
-        return c.value.set(e, e), e;
+        return f.value.set(e, e), e;
       }
     }
-    function I(e) {
+    function P(e) {
       const r = [];
       function l(d) {
         d && d.regionName && r.push(d.regionName), d && d.children && d.children.length > 0 && l(d.children[0]);
       }
       return l(e), r.join("");
     }
-    const M = async () => {
+    const $ = async () => {
       var e;
-      await ((e = f.value) == null ? void 0 : e.validate((r) => {
-        r && z.create(a).then((l) => {
-          l.status === 200 && (S({
-            message: u("common.submitSuccess"),
+      await ((e = c.value) == null ? void 0 : e.validate((r) => {
+        r && L.create(a).then((l) => {
+          l.status === 200 && (O({
+            message: i("common.submitSuccess"),
             type: "success"
-          }), m.value && (m.value = !1), w("refresh", l.status === 200));
+          }), u.value && (u.value = !1), w("refresh", l.status === 200));
         });
       }));
     };
     function h() {
-      m.value && (m.value = !1);
+      u.value && (u.value = !1);
     }
     return (e, r) => {
-      const l = i("el-input"), d = i("el-form-item"), p = i("el-col"), P = i("el-row"), k = i("el-form"), g = i("el-button"), F = i("el-dialog");
+      const l = m("el-input"), d = m("el-form-item"), p = m("el-col"), M = m("el-row"), k = m("el-form"), g = m("el-button"), F = m("el-dialog");
       return j(), T(F, {
-        modelValue: m.value,
-        "onUpdate:modelValue": r[5] || (r[5] = (n) => m.value = n),
+        modelValue: u.value,
+        "onUpdate:modelValue": r[5] || (r[5] = (n) => u.value = n),
         onClose: h
       }, {
         footer: t(() => [
           D("div", G, [
             o(g, { onClick: h }, {
               default: t(() => [
-                v(V(e.$t("common.cancel")), 1)
+                N(U(e.$t("common.cancel")), 1)
               ]),
               _: 1
             }),
             o(g, {
               type: "primary",
-              onClick: M
+              onClick: $
             }, {
               default: t(() => [
-                v(V(e.$t("common.confirm")), 1)
+                N(U(e.$t("common.confirm")), 1)
               ]),
               _: 1
             })
@@ -136,13 +136,13 @@ const G = { class: "dialog-footer" }, H = /* @__PURE__ */ B({
         default: t(() => [
           o(k, {
             ref_key: "orderUserAddressFormRef",
-            ref: f,
+            ref: c,
             model: s(a),
             "label-position": "top",
-            rules: R
+            rules: q
           }, {
             default: t(() => [
-              o(P, { gutter: 20 }, {
+              o(M, { gutter: 20 }, {
                 default: t(() => [
                   o(p, { span: 24 }, {
                     default: t(() => [
@@ -208,11 +208,11 @@ const G = { class: "dialog-footer" }, H = /* @__PURE__ */ B({
                     default: t(() => [
                       o(d, {
                         prop: "provinceName",
-                        label: s(u)("orderUserAddress.detailInfo"),
+                        label: s(i)("orderUserAddress.detailInfo"),
                         class: "form-item"
                       }, {
                         default: t(() => [
-                          o(s(J), {
+                          o(s(S), {
                             modelValue: s(a).provinceName,
                             "onUpdate:modelValue": r[3] || (r[3] = (n) => s(a).provinceName = n),
                             placeholder: e.$t("orderUserAddress.provinceNameRequired"),
@@ -254,7 +254,7 @@ const G = { class: "dialog-footer" }, H = /* @__PURE__ */ B({
       }, 8, ["modelValue"]);
     };
   }
-}), x = /* @__PURE__ */ C(H, [["__scopeId", "data-v-31dcbcc0"]]);
+}), re = /* @__PURE__ */ C(H, [["__scopeId", "data-v-35c6c80a"]]);
 export {
-  x as default
+  re as default
 };

package/dist/{index-CUfcoWMj.mjs → index-BPKQNnjE.mjs}

@@ -1,11 +1,11 @@
-var v = Object.defineProperty;
-var I = (i, r, e) => r in i ? v(i, r, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[r] = e;
-var t = (i, r, e) => I(i, typeof r != "symbol" ? r + "" : r, e);
+var y = Object.defineProperty;
+var v = (i, r, e) => r in i ? y(i, r, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[r] = e;
+var t = (i, r, e) => v(i, typeof r != "symbol" ? r + "" : r, e);
 import { ref as h } from "vue";
-import { BizLayDict as l, CustomBizDict as p, EnumDict as d } from "jmash-core";
-import { goodsCategoryApi as P } from "xyvcard-paper-goods";
+import { BizLayDict as l, CustomBizDict as p, EnumDict as I } from "jmash-core";
+import { goodsCategoryApi as g } from "xyvcard-paper-goods";
 import { unionOrgApi as c } from "xyvcard-paper-union";
-import { EntryDict as T } from "jmash-dict";
+import { EntryDict as P } from "jmash-dict";
 class s {
 }
 //模块
@@ -14,8 +14,7 @@ t(s, "ENUM_ORDER_STATUS", h([
   { key: "unpay", value: "待付款" },
   { key: "unpost", value: "订阅成功" }
 ])), // 订单状态常量
-t(s, "UNPAY", "unpay"), t(s, "UNPOST", "unpost"), // 支付方式
-t(s, "ENUM_PAYMENT_WAY", "xyvcard.order.protobuf.PaymentWay"), // 发票票种
+t(s, "UNPAY", "unpay"), t(s, "UNPOST", "unpost"), // 发票票种
 t(s, "LQFP_FPPZ", "Fppz"), // 开票状态
 t(s, "INVOICE_STATUS", "xyvcard.order.protobuf.InvoiceStatus"), t(s, "UNINVOICE", "uninvoice"), t(s, "INVOICING", "invoicing"), t(s, "INVOICED", "invoiced"), // 基层工会
 t(s, "BASE_UNION", "base"), // 企业
@@ -26,10 +25,10 @@ t(s, "GMF_TYPE_VALUES", h([
   { key: "ent", value: "企业" },
   { key: "person", value: "个人" }
 ]));
-function y(i, r, e) {
+function d(i, r, e) {
   return !Array.isArray(i) || i.length === 0 ? [] : i.map((a) => {
     let o = [];
-    return Array.isArray(a.children) && a.children.length > 0 && (o = y(a.children, r, e)), {
+    return Array.isArray(a.children) && a.children.length > 0 && (o = d(a.children, r, e)), {
       value: a[e],
       label: a[r],
       parentId: a.parentId,
@@ -37,7 +36,7 @@ function y(i, r, e) {
     };
   });
 }
-class A extends l {
+class T extends l {
   // 实现 useValues 方法
   useValues() {
     return new Promise((r, e) => {
@@ -45,8 +44,8 @@ class A extends l {
         r(this.values);
         return;
       }
-      c.findList(this.query).then(({ data: u }) => {
-        const a = u.results;
+      c.findList(this.query).then(({ data: n }) => {
+        const a = n.results;
         this.values.length = 0, this.values.push(...this.convertToLayEntryArray(a)), r(this.values);
       }).catch(e);
     });
@@ -61,7 +60,7 @@ class A extends l {
     }));
   }
 }
-class g extends l {
+class f extends l {
   // 实现 useValues 方法
   useValues() {
     return new Promise((r, e) => {
@@ -69,11 +68,11 @@ class g extends l {
         r(this.values);
         return;
       }
-      const u = {
+      const n = {
         ...this.query,
         orgType: s.BASE_UNION
       };
-      c.findList(u).then(({ data: a }) => {
+      c.findList(n).then(({ data: a }) => {
         const o = a.results;
         this.values.length = 0, this.values.push(...this.convertToLayEntryArray(o)), r(this.values);
       }).catch(e);
@@ -90,7 +89,7 @@ class g extends l {
     }));
   }
 }
-class f extends l {
+class A extends l {
   // 实现 useValues 方法
   useValues() {
     return new Promise((r, e) => {
@@ -98,11 +97,11 @@ class f extends l {
         r(this.values);
         return;
       }
-      const u = {
+      const n = {
         ...this.query,
         orgType: s.BASE_UNION
       };
-      c.findList(u).then(({ data: a }) => {
+      c.findList(n).then(({ data: a }) => {
         const o = a.results;
         this.values.length = 0, this.values.push(...this.convertToLayEntryArray(o)), r(this.values);
       }).catch(e);
@@ -119,40 +118,36 @@ class f extends l {
     }));
   }
 }
-class E extends l {
+class m extends l {
   // 实现 useValues 方法
   useValues() {
     return new Promise((r, e) => {
-      P.findTreeListApi(this.query).then((u) => {
-        const { data: a } = u;
-        this.values.length = 0, this.values.push(...y(a.results, "label", "value")), r(this.values);
+      g.findTreeListApi(this.query).then((n) => {
+        const { data: a } = n;
+        this.values.length = 0, this.values.push(...d(a.results, "label", "value")), r(this.values);
       }).catch(e);
     });
   }
 }
-class n {
+class u {
 }
 // 订单状态
-t(n, "orderStatusEnum", new p(
+t(u, "orderStatusEnum", new p(
   s.ENUM_ORDER_STATUS,
   {}
-)), // 支付方式
-t(n, "paymentWayEnum", new d(
-  s.PAPER_DICT,
-  s.ENUM_PAYMENT_WAY
 )), // 所属工会
-t(n, "unionOrgBizLayDict", new A({})), t(n, "unionOrgPhoneBizLayDict", new g({})), t(n, "unionOrgPhoneInsBizLayDict", new f(
+t(u, "unionOrgBizLayDict", new T({})), t(u, "unionOrgPhoneBizLayDict", new f({})), t(u, "unionOrgPhoneInsBizLayDict", new A(
   {}
 )), // 发票票种
-t(n, "fppzDict", new T(s.LQFP_FPPZ)), // 开票状态
-t(n, "invoiceStatusEnum", new d(
+t(u, "fppzDict", new P(s.LQFP_FPPZ)), // 开票状态
+t(u, "invoiceStatusEnum", new I(
   s.PAPER_DICT,
   s.INVOICE_STATUS
 )), // 商品分类(发行频率)
-t(n, "goodsCategoryListBizLayDict", new E(
+t(u, "goodsCategoryListBizLayDict", new m(
   {}
-)), t(n, "gmfTypeDict", new p(s.GMF_TYPE_VALUES, {}));
+)), t(u, "gmfTypeDict", new p(s.GMF_TYPE_VALUES, {}));
 export {
   s as C,
-  n as D
+  u as D
 };